记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 63fdc8a0 authored by wangyifan's avatar wangyifan
Browse files
Options

Merge branch 'dev-wyf-1.5' into container-test

parents e858deb2 953e6dae
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 8 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/artist/create.html
View file @ 63fdc8a0
......@@ -180,6 +180,16 @@
height: 200,
lang: 'zh-CN',
placeholder: '请输入艺人简介，最多输入2000个字',
toolbar: [
['style', ['style']],
['font', ['bold', 'italic', 'underline', 'clear']],
['fontname', ['fontname']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']],
['insert', ['link', 'picture']],
['view', ['fullscreen', 'codeview']]
],
callbacks: {
onChange: function(contents, $editable) {
var text = $('<div>').html(contents).text();
......@@ -191,6 +201,32 @@
} else {
$('#introCount').removeClass('text-danger');
}
},
onImageUpload: function(files) {
var data = new FormData();
data.append("file", files[0]);
data.append("pathName", "artist/introduction");
data.append("buckType", 1);
$.ajax({
url: platformUrl + "/platform/basicServices/alOss/upload/unsm",
type: "post",
data: data,
cache: false,
contentType: false,
processData: false,
success: function(result) {
if (result.code == 0 || result.code == 200) {
var imgPath = result.data.ossPath;
var fullUrl = "https://img.zhengzai.tv/" + imgPath;
$('#introduction').summernote('insertImage', fullUrl);
} else {
$.modal.alertWarning(result.msg || "图片上传失败");
}
},
error: function() {
$.modal.alertWarning("图片上传服务异常");
}
});
}
}
});
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/artist/detail.html
View file @ 63fdc8a0
......@@ -231,7 +231,7 @@
<!-- 艺人简介 -->
<div class="artist-intro">
<div class="info-label" style="margin-bottom: 8px;">艺人介绍：</div>
<div class="info-label" style="margin-bottom: 8px;">艺人简介：</div>
<div class="info-value" th:utext="*{introduction} ?: '暂无介绍'">
摩登天空是中国知名音乐厂牌，致力于推广独立音乐。
</div>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/artist/update.html
View file @ 63fdc8a0
......@@ -233,6 +233,16 @@
height: 200,
lang: 'zh-CN',
placeholder: '请输入艺人简介，最多输入2000个字',
toolbar: [
['style', ['style']],
['font', ['bold', 'italic', 'underline', 'clear']],
['fontname', ['fontname']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']],
['insert', ['link', 'picture']],
['view', ['fullscreen', 'codeview']]
],
callbacks: {
onChange: function(contents, $editable) {
var text = $('<div>').html(contents).text();
......@@ -244,6 +254,32 @@
} else {
$('#introCount').removeClass('text-danger');
}
},
onImageUpload: function(files) {
var data = new FormData();
data.append("file", files[0]);
data.append("pathName", "artist/introduction");
data.append("buckType", 1);
$.ajax({
url: platformUrl + "/platform/basicServices/alOss/upload/unsm",
type: "post",
data: data,
cache: false,
contentType: false,
processData: false,
success: function(result) {
if (result.code == 0 || result.code == 200) {
var imgPath = result.data.ossPath;
var fullUrl = "https://img.zhengzai.tv/" + imgPath;
$('#introduction').summernote('insertImage', fullUrl);
} else {
$.modal.alertWarning(result.msg || "图片上传失败");
}
},
error: function() {
$.modal.alertWarning("图片上传服务异常");
}
});
}
}
});
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/artistLineup.html
View file @ 63fdc8a0
......@@ -353,13 +353,13 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox">
<div class="ibox-title">
<h5>演出阵容管理</h5>
<div class="ibox-tools">
<span th:text="${performanceTitle}"
style="font-size:15px;font-weight:600;color:#333;vertical-align:middle;"></span>
</div>
</div>
<!-- <div class="ibox-title">-->
<!-- <h5>演出阵容管理</h5>-->
<!-- <div class="ibox-tools">-->
<!-- <span th:text="${performanceTitle}"-->
<!-- style="font-size:15px;font-weight:600;color:#333;vertical-align:middle;"></span>-->
<!-- </div>-->
<!-- </div>-->
<div class="ibox-content">
<div style="margin-bottom:15px;">
<button class="btn btn-primary btn-sm" id="edit-lineup-btn">编辑演出阵容</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment