Authored by weiqingting

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

... ... @@ -3,7 +3,7 @@
var $ = require('jquery'),
common=require('../common/common');
var pricePercent = 20; //yoho币审核比例线
var pricePercent = 0.2; //yoho币审核比例线
var loadModal = null;
var importYohoCoinData = null;
var isNeedAudit = false;
... ... @@ -18,6 +18,10 @@ var ENUM = {
1: '<b style="color:#428bca">待审核</b>',
2: '<b style="color:#5cb85c">通过</b>',
3: '<b style="color:#ff0000">驳回</b>'
},
auditor: {
2965: 'Tracy',
10235: 'David Wong'
}
}
... ... @@ -56,15 +60,17 @@ var g = new common.grid({
sortId: select[3] ? select[3].id : ""
};
},
columns: [{
display: '',
render: function(item){
columns: [
{display: '', type: 'checkbox'},
{display: '', render: function(item){
var html = "";
if(item.__index == 0){
$("#yohoCoin_table").find("thead tr th").html($("#coinListHead").html());
$("#yohoCoin_table").find("thead tr th").eq(1).html($("#coinListHead").html());
}
item.genderName = ENUM.gender[item.gender];
item.statusName = ENUM.status[item.productPrice.coinStatus];
if(item.productPrice.auditorId){item.auditorName = ENUM.auditor[item.productPrice.auditorId];}
if(item.productPrice.auditDt){item.updateTime = getTime(item.productPrice.auditDt);}
html += common.util.__template2($("#coinList").html(),item);
return html;
... ... @@ -89,8 +95,7 @@ function ajaxSave(productSkn, yohoCoin, auditorId, salesPrice){
"auditorId": auditorId
}
},function(rs){
console.log("yoho币保存返回" + rs);
freshYohoCoinRowData(rs.data.productSkn, rs.data.returnCoin, rs.data.coinStatus);
freshYohoCoinRowData(rs.data);
});
}
... ... @@ -132,7 +137,6 @@ function ajaxUpload(){
//批量上传确认
function ajaxUploadSubmit(importAuditorId){
console.log(JSON.stringify(importYohoCoinData));
common.util.__ajax({
url:'/good/yohoCoin/insertBatch',
data: {
... ... @@ -140,9 +144,12 @@ function ajaxUploadSubmit(importAuditorId){
productPrices: JSON.stringify(importYohoCoinData)
}
},function(rs){
//common.util.__tip("保存成功!");
//location.href = '';
});
if(rs.code == 200){
common.util.__tip("批量导入保存成功!", "success");
}else{
common.util.__tip(rs.message);
}
},true);
}
/**********************业务方法*************************/
... ... @@ -221,10 +228,23 @@ function checkAuditor(auditor){
}
//保存单行数据刷新
function freshYohoCoinRowData(productSkn, yohoCoin, status){
function freshYohoCoinRowData(data){
var productSkn = data.productSkn;
var yohoCoin = data.returnCoin;
var status = data.coinStatus;
var founderName = data.founderName;
var updateTime = getTime(data.auditDt);
var auditorId = data.auditorId;
var SknDom = $('._' + productSkn);
SknDom.find(".returnYohoCoin").text(yohoCoin);
SknDom.find(".coinStatus").html(ENUM.status[status]);
var OperatInfoHtml = "<p>操作人:"+ founderName +"</p>";
if(status == 1 && auditorId) OperatInfoHtml += "<p>审核人:"+ ENUM.auditor[auditorId] +"</p>";
OperatInfoHtml += "<div style='color: #999; font-size: 12px'>"+ updateTime + "</div>";
SknDom.find(".OperatInfo").html(OperatInfoHtml);
if(status == 1){
SknDom.find(".operation").empty();
}else{
... ... @@ -233,6 +253,17 @@ function freshYohoCoinRowData(productSkn, yohoCoin, status){
SknDom.find(".dataForEditor td").hide();
}
//找到以选中的商品的SKN
function findCheckedSknList(){
var sknList = new Array();
var checkedItems = $("#yohoCoin_table").find(".wqt_checkbox:checked");
$.each(checkedItems, function(index,value){
var skn = $(value).parent().next().find(".dataForShow").data("skn");
sknList.push(skn);
});
return sknList;
}
//关闭loading
function loadingClose(){
if (loadModal) {
... ... @@ -240,6 +271,13 @@ function loadingClose(){
}
}
//时间转换
function getTime(time){
var t = new Date(time);
var formattedTime = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
return formattedTime;
}
/**********************事件*************************/
//批量导入结果列表删除
... ... @@ -249,7 +287,6 @@ $(document).on('click', '.btn-delete-yohoCoin', function() {
[].splice.call(importYohoCoinData,index,1);
$("#importResultTable").html(common.util.__template2($("#yohoCoinImportResultTable").html(),{"successList":importYohoCoinData}));
}
console.log(importYohoCoinData);
});
//批量导入结果列表确定
... ... @@ -309,8 +346,24 @@ $(document).on('click', '#import-btn', function() {
});
//导出
$(document).on('click', '#Outport-btn', function() {
$(document).on('click', '#export-btn', function() {
var exportSknList = findCheckedSknList();
if(exportSknList.length > 0){
var exportSknListShow = "";
for(var i=0; i<exportSknList.length; i++){
exportSknListShow += "<span style='margin-right: 10px; font-weight: bold; color: #5cb85c; display: inline-block'>"+ exportSknList[i] +"</span>"
}
common.dialog.confirm(
"批量导出确认",
"<div><p>请确认&nbsp;&nbsp;<b style='color:#428bca'>导出</b>&nbsp;&nbsp;SKN为:</p><p>"+ exportSknListShow +"</p></div>",
function(){
window.open("/ajax/down?queryConf=" + exportSknList.join("|") + "&type=yohoCoin");
},
function(){}
);
}else{
common.util.__tip("没有选择任何商品!");
}
});
//返回列表
... ...
... ... @@ -20,7 +20,6 @@ var ENUM = {
10235: 'David Wong'
}
}
var gridParams = function() {
var select = tabTree.getAddress();
return {
... ... @@ -36,7 +35,6 @@ var gridParams = function() {
sortId: select[3] ? select[3].id : ""
};
}
var COLUMNS = {
c1: [ //待审核列表
{display: '', type: 'checkbox'},
... ... @@ -61,10 +59,10 @@ var COLUMNS = {
}},
{display: '吊牌价', name: 'retailPrice'},
{display: '销售价', name: 'salesPrice'},
{display: '执行返币', name: 'returnCoin', render: function(item) {
{display: '执行返币金额', name: 'returnCoin', render: function(item) {
return item.productPrice.returnCoin;
}},
{display: '待审核返币数', name: 'returnCoin', render: function(item) {
{display: '审核返币金额', name: 'returnCoin', render: function(item) {
return item.productPrice.needAuditCoin;
}},
{display: '状态', name: 'status', render: function(item) {
... ... @@ -72,8 +70,8 @@ var COLUMNS = {
}},
{display: '操作信息', name: 'operateInfo', render: function(item) {
var html = '';
if (item.productPrice.founder) {html += '<p>' + item.productPrice.founder + '</p>';}
if (item.productPrice.updateTime) {html += '<p>' + item.productPrice.updateTime + '</p>';}
if (item.productPrice.founderName) {html += '<p>操作人:' + item.productPrice.founderName + '</p>';}
if (item.productPrice.auditDt) {html += '<div style="color: #999; font-size: 12px;">' + getTime(item.productPrice.auditDt) + '</div>';}
return html;
}},
{display: '操作', render: function(item) {
... ... @@ -103,23 +101,23 @@ var COLUMNS = {
}},
{display: '吊牌价', name: 'retailPrice'},
{display: '销售价', name: 'salesPrice'},
{display: '返币数', name: 'returnCoin', render: function(item) {
{display: '审核返币金额', name: 'returnCoin', render: function(item) {
return item.productPrice.needAuditCoin;
}},
{display: '状态', name: 'status', render: function(item) {
var html = ENUM.status[item.productPrice.coinStatus] + "<br>";
var html = ENUM.status[item.productPrice.coinStatus]+"<br>";
if(item.productPrice.coinStatus == 3){
html += '<a class="noCheckReason" href="javascript:" data-text="'+ item.productPrice.comment +'" style="color: #ec971f;text-decoration: underline">驳回理由</a>';
}
return html;
}},
{display: '审批人', name: 'auditor', render: function(item) {
return ENUM.auditor[item.productPrice.auditorName];
return ENUM.auditor[item.productPrice.auditorId];
}},
{display: '操作信息', name: 'operateInfo', render: function(item) {
var html = '';
if (item.productPrice.founder) {html += '<p>' + item.productPrice.founder + '</p>';}
if (item.productPrice.updateTime) {html += '<p>' + item.productPrice.updateTime + '</p>';}
if (item.productPrice.founderName) {html += '<p>操作人:' + item.productPrice.founderName + '</p>';}
if (item.productPrice.auditDt) {html += '<div style="color: #999; font-size: 12px;">' + getTime(item.productPrice.auditDt) + '</div>';}
return html;
}}
]
... ... @@ -171,7 +169,7 @@ function ajaxCheckOkBatch(productSkns){
common.util.__ajax({
url:'/good/yohoCoin/passBatch',
data: {
"productSkns": productSkns
"productSkns": JSON.stringify(productSkns)
}
},function(rs){
g.reload();
... ... @@ -196,7 +194,7 @@ function ajaxCheckNoBatch(productSkns, comment){
common.util.__ajax({
url:'/good/yohoCoin/rejectBatch',
data: {
"productSkns": productSkns,
"productSkns": JSON.stringify(productSkns),
"comment": comment
}
},function(rs){
... ... @@ -212,10 +210,16 @@ function findCheckedSknList(){
var skn = $(value).parent().next().text();
sknList.push(skn);
});
console.log(sknList)
return sknList;
}
//时间转换
function getTime(time){
var t = new Date(time);
var formattedTime = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
return formattedTime;
}
//批量审批通过
$(document).on('click', '#all-checkOk', function() {
var checkOkList = findCheckedSknList();
... ...
... ... @@ -243,7 +243,16 @@ var Button = [
"title": ""
},
"is_show_name": "N",
"list": []
"list": [],
"image":{
"src": "",
"alt": "",
"url":{
"action":"",
"url":""
}
}
}
},
{
... ...
... ... @@ -702,9 +702,9 @@ $(document).on("click", ".removepic", function () {
}));
});
$(document).on("mouseover", "#add-content .dragItem", function () {
var drag = new common.drag("#add-content", Bll.contentDatas, function (data) {
Bll.contentDatas = data;
Bll.__render("#add-content", "template_content", {modules: Bll.contentDatas});
var drag = new common.drag("#add-content", Bll.contentDatas[currIndex], function (data) {
Bll.contentDatas[currIndex] = data;
Bll.__render("#add-content", "template_content", {modules: Bll.contentDatas[currIndex]});
})
drag.Initialize();
});
... ...
... ... @@ -407,4 +407,16 @@ pc端店铺模板css
margin-top: 20px;
}
/*资源位样式*/
.wordText{
text-align: center;
font-size: 22px;
font-weight: bold;
height: 60px;
line-height: 60px;
border: 1px dashed #bce8f1;
width: 90%;
margin: 5px auto;
background: #d9edf7;
}
... ...
#yohoCoin_table tbody td, #yohoCoin_table thead th {
padding: 0;
text-align: center;
vertical-align: inherit;
}
#yohoCoin_table thead th:first-child{
width: 40px;
}
#yohoCoin_table .coinListHead{
... ... @@ -17,6 +22,9 @@
padding: 10px;
border-left: 1px solid #ddd;
}
#yohoCoin_table .left{
text-align: left;
}
#yohoCoin_table .center{
text-align: center;
}
... ...
... ... @@ -25,7 +25,7 @@ exports.res = [
sortTree: true,
returnCoinTime: false,
bulkImport: true,
bulkOutport: true
bulkExport: true
},
gridurl: '/good/yohoCoin/queryPageList'
}
... ...
... ... @@ -112,12 +112,12 @@
<div class="panel-col" style="width: auto">
{{# bulkImport}}
<a id="import-btn" href="javascript:;" class="btn btn-info">批量导入</a>
<a id="import-btn" href="javascript:;" class="btn btn-primary">批量导入</a>
{{/ bulkImport}}
{{# bulkOutport}}
<a id="Outport-btn" href="javascript:;" class="btn btn-info">导出</a>
{{/ bulkOutport}}
{{# bulkExport}}
<a id="export-btn" href="javascript:;" class="btn btn-primary">导出</a>
{{/ bulkExport}}
</div>
</div>
</div>
... ... @@ -145,7 +145,7 @@
2、Excel表头为:<span style="color: #67D267;">SKN、品牌、吊牌价、返币金额(大于零,最多俩位小数)</span><br>
3、第一行为表头内容,第二行开始为正式内容<br>
4、每个文件控制在2500行以内<br>
5、<a href="#" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
5、<a href="/ajax/link/batchImportYohoCoin" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
</td>
</tr>
</table>
... ... @@ -200,12 +200,12 @@
<table><tbody>
<tr>
<td style="width: 10%">SKN</td>
<td style="width: 25%">商品信息</td>
<td style="width: 24%">商品信息</td>
<td style="width: 20%">供应商 / 店铺</td>
<td style="width: 5%">性别</td>
<td style="width: 5%">吊牌价</td>
<td style="width: 5%">销售价</td>
<td style="width: 5%">返币数</td>
<td style="width: 6%">返币金额</td>
<td style="width: 8%">状态</td>
<td style="width: 12%">操作信息</td>
<td style="width: 5%">操作</td>
... ... @@ -215,11 +215,11 @@
</script>
<script id="coinList" type="text/template">
<div class="dataForShow _[[productSkn]]">
<div class="dataForShow _[[productSkn]]" data-skn="[[productSkn]]">
<table><tbody>
<tr>
<td rowspan="2" span="2" class="center" style="width: 10%">[[productSkn]]</td>
<td class="" style="width: 25%">
<td rowspan="2" span="2" style="width: 10%">[[productSkn]]</td>
<td class="left" style="width: 24%">
<p>名称:[[productName]]</p>
<p>品牌:[[brandName]]</p>
<div>
... ... @@ -228,25 +228,26 @@
[[if smallSortName]]&nbsp;>&nbsp;[[smallSortName]][[/if]]
</div>
</td>
<td style="width: 20%">
<td class="left" style="width: 20%">
[[if supplierName]][[supplierName]][[/if]]
[[if shopName]]&nbsp;/&nbsp;[[shopName]][[/if]]
</td>
<td class="center" style="width: 5%">[[genderName]]</td>
<td class="center retailPrice" style="width: 5%">[[retailPrice]]</td>
<td class="center salesPrice" style="width: 5%">[[salesPrice]]</td>
<td class="center returnYohoCoin" style="width: 5%">[[productPrice.returnCoin]]</td>
<td class="center coinStatus" style="width: 8%">
<td style="width: 5%">[[genderName]]</td>
<td class="retailPrice" style="width: 5%">[[retailPrice]]</td>
<td class="salesPrice" style="width: 5%">[[salesPrice]]</td>
<td class="returnYohoCoin" style="width: 6%">[[productPrice.returnCoin]]</td>
<td class="coinStatus" style="width: 8%">
[[statusName]]<br>
[[if productPrice.coinStatus == 3]]
<a class="noCheckReason" href="javascript:" data-text="[[productPrice.comment]]" style="color: #ec971f;text-decoration: underline">驳回理由</a>
[[/if]]
</td>
<td style="width: 12%">
[[if productPrice.founder]]<p>[[productPrice.founder]]</p>[[/if]]
[[if productPrice.updateTime]]<p>[[productPrice.updateTime]]</p>[[/if]]
<td class="left OperatInfo" style="width: 12%">
[[if productPrice.founderName]]<p>操作人:[[productPrice.founderName]]</p>[[/if]]
[[if productPrice.coinStatus == 1 && productPrice.auditorId]]<p>审核人:[[auditorName]]</p>[[/if]]
[[if productPrice.auditDt]]<div style="color: #999; font-size: 12px;">[[updateTime]]</div>[[/if]]
</td>
<td class="center operation" style="width: 5%">
<td class="operation" style="width: 5%">
[[if productPrice.coinStatus == 0]]
<button type="button" name="设置" class="btn btn-primary btn-sm btn-modify">设置</button>
[[/if]]
... ... @@ -259,9 +260,9 @@
<tr class="dataForEditor">
<td colspan="9" style="padding: 0">
<table>
<tr class="center">
<tr>
<!--td width="50%"><b>反币时间</b></td-->
<td width="40%"><b>返回YOHO</b></td>
<td width="40%"><b>反币金额</b></td>
<td width="40%"><b>审核人</b></td>
<td width="20%"><b>操作</b></td>
</tr>
... ... @@ -280,22 +281,22 @@
</label>
</div>
</td-->
<td class="center">
<input type="text" class="form-control center editor-yohoCoin" placeholder="YOHO币数量" value="[[productPrice.returnCoin]]" style="width: 100px">
<td>
<input type="text" class="form-control center editor-yohoCoin" placeholder="反币金额" value="[[productPrice.returnCoin]]" style="width: 100px">
</td>
<td class="center">
<td>
<select class="form-control center editor-auditor" style="width: 150px">
<option value="">-- 请选择审核人 --</option>
<option value="2965">Tracy</option>
<option value="10235">David Wong</option>
</select>
</td>
<td class="center">
<td>
<button type="submit" class="btn btn-success btn-sm btn-save" data-productskn="[[productSkn]]">保存</button>
</td>
</tr>
<tr>
<td class="editorTip" colspan="3">* 提示:若返币YOHO币金额&nbsp;&nbsp;<b>大于等于</b>&nbsp;&nbsp;销售价的20%,审核人必须填写,审核通过后才能进入该状态。</td>
<td class="left editorTip" colspan="3">* 提示:若返币金额&nbsp;&nbsp;<b>大于等于</b>&nbsp;&nbsp;销售价的20%,审核人必须填写,审核通过后才能进入该状态。</td>
</tr>
</table>
</td>
... ... @@ -323,12 +324,12 @@
<td>[[item.brandName]]</td>
<td>[[item.retailPrice]]</td>
<td>
[[if item.returnCoin >= item.retailPrice * 20]]
<font color="#ff0000">[[item.returnCoin]]</font><br>
[[if item.needAuditCoin >= item.retailPrice * 0.2]]
<font color="#ff0000">[[item.needAuditCoin]]</font><br>
[[else]]
[[item.returnCoin]]<br>
[[item.needAuditCoin]]<br>
[[/if]]
<font color="#999999">[ [[item.preReturnCoin]] ]</font>
<font color="#999999">[ [[item.returnCoin]] ]</font>
</td>
<td><a href="javascript:;" class="btn btn-xs btn-danger btn-delete-yohoCoin" data-index="[[_index]]">删除</a></td>
</tr>
... ...
... ... @@ -33,13 +33,13 @@
<p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>
</div>
<div class="form-group ">
<input value="[[item.alt]]" class="form-control observe" required="required"
<input value="[[item.alt]]" class="form-control observe"
data-field="[[index]].alt" placeholder="图片描述"/>
</div>
[[if contentData.template_name=='addfloor']]
<div class="form-group ">
<input value="[[item.altEn]]" class="form-control observe" required="required"
<input value="[[item.altEn]]" class="form-control observe"
data-field="[[index]].altEn" placeholder="英文描述"/>
</div>
[[/if]]
... ... @@ -57,7 +57,7 @@
</script>
<!-- 推荐品牌-->
<script type="text/template" id="brands-template">
<div class="rows">
<div class="panel-body">
[[if contentData.template_name=='appHotBrands']]
<div class="form-group">
<label class="col-sm-1 control-label">标题</label>
... ... @@ -75,6 +75,35 @@
</div>
<input type="hidden" id="is_show_name_brand" value="[[contentData.data.is_show_name]]" for="radio"/>
</div>
<div class="form-group">
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>
<input type="file" name="file" value="[[contentData.data.image.src]]" class="observe" data-field="image.src"/>
</td>
<td>
<div class="form-group ">
<select name="goTo" class="form-control observe" value="[[contentData.data.image.url.action]]" data-field="image.url.action">
[[layout action_template]]
</select>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.url.url]]" class="form-control observe"
data-field="image.url.url" placeholder="图片链接"/>
<p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.alt]]" class="form-control observe"
data-field="image.alt" placeholder="图片描述"/>
</div>
</td>
</tr>
</tbody>
</table>
</div>
[[/if]]
[[if contentData.template_name=='customBrands']]
<div class="form-group ">
... ...
... ... @@ -225,7 +225,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="big_image.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="big_image.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="big_image.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -253,7 +253,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="list.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="list.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -309,7 +309,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="big_image.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="big_image.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="big_image.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -337,7 +337,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="list.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="list.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -370,7 +370,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="big_image.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="big_image.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="big_image.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -516,7 +516,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="list.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="list.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -570,7 +570,7 @@
<input value="[[item.url.url]]" placeholder="url" class="form-control observe" required="required" data-field="list.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" data-field="list.[[index]].title" class="form-control observe" required="required" />
<input placeholder="图片描述" value="[[item.title]]" data-field="list.[[index]].title" class="form-control observe" />
</div>
</td>
</tr>
... ... @@ -657,7 +657,7 @@
<input type="text" placeholder="url" value="[[item.url.url]]" class="form-control observe" required="required" data-field="banner_image.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input type="text" placeholder="图片描述" value="[[item.title]]" class="form-control observe" required="required" data-field="banner_image.[[index]].title"/>
<input type="text" placeholder="图片描述" value="[[item.title]]" class="form-control observe" data-field="banner_image.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -692,7 +692,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="left.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="left.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="left.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -720,7 +720,7 @@
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="big_image.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="big_image.[[index]].title"/>
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="big_image.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -748,7 +748,7 @@
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="right.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="right.[[index]].title"/>
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="right.[[index]].title"/>
</div>
</td>
</tr>
... ... @@ -834,7 +834,7 @@
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="blocks.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="blocks.[[index]].title"/>
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="blocks.[[index]].title"/>
</div>
</td>
<td><button class="btn btn-danger btn-sm delBtn" data-event="hotCategory.blocks" type="button" data-index="[[index]]">删除</button></td>
... ... @@ -883,7 +883,7 @@
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="imgs.[[index]].url.url"/>
</div>
<div class="col-sm-12">
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" required="required" data-field="imgs.[[index]].title"/>
<input type="text" placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="imgs.[[index]].title"/>
</div>
</td>
<td><button class="btn btn-danger btn-sm delBtn" data-event="hotCategory.imgs" type="button" data-index="[[index]]">删除</button></td>
... ...
... ... @@ -75,24 +75,33 @@
</div>
[[else if module.contentData.template_name=='trendsetterCollocation']]
<div class="big-pic">
<div class="list">
<img src="/js/source/plugins/trendsetter/trend.png" width="96%">
<div class="wordText">
<span>潮人搭配</span>
</div>
</div>
[[else if module.contentData.template_name=='trendgoodsTopic']]
<div class="big-pic">
<div class="list">
<img src="/js/source/plugins/trendgoodsTopic/trend.png" width="96%">
<div class="wordText">
<span>潮品话题</span>
</div>
</div>
[[else if module.contentData.template_name=='appHotBrands']]
<div class="custom-pic">
<div class="hot-brand-title row title">[[module.contentData.data.title.title]]</div>
<ul class="custom-pic clearfix">
[[each module.contentData.data.list as item index]]
<li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
[[/each]]
</ul>
<div class="form-group">
<div class="row title">
[[module.contentData.data.title.title]]
</div>
<div class="col-sm-12">
<ul class="custom-pic clearfix">
[[each module.contentData.data.list as item index]]
<li>
<img src="[[item.src]]" class="custom-pic-img" style="margin:2px;">
</li>
[[/each]]
<li>
<img src="[[module.contentData.data.image.src]]">
</li>
</ul>
</div>
</div>
[[else if module.contentData.template_name=='customBrands']]
<div class="custom-pic">
... ... @@ -105,7 +114,10 @@
</div>
[[else if module.contentData.template_name=='promotion']]
<div class="link">
<div class="list"><img src="/js/source/plugins/promotion/bigPic.jpg" width="96%/"></div>
<div class="wordText">
<span>促销专区</span>
</div>
</div>
[[else if module.contentData.template_name=='carouselBanner']]
<div class="focus">
... ... @@ -161,7 +173,9 @@
</div>
[[else if module.contentData.template_name=='textNav']]
<div class="textNav">
<div class="list"><img src="/js/source/plugins/textNav/bigPic.jpg" width="96%/"></div>
<div class="wordText">
<span>文本导航</span>
</div>
</div>
[[else if module.contentData.template_name=='imageList']]
<div class="custom-pic">
... ... @@ -175,9 +189,9 @@
</div>
[[else if module.contentData.template_name=='title']]
<div class="custom-pic">
<div class="list">
<img src="/js/source/plugins/title/bigPic.jpg" width="96%">
</div>
<div class="wordText">
<span>标题标签</span>
</div>
</div>
[[else if module.contentData.template_name=='editorTalk']]
<div class="editorTalk_content">
... ... @@ -202,7 +216,9 @@
</div>
[[else if module.contentData.template_name=='hotCategory']]
<div class="hotCategory">
<div class="hotCategory-info"><img src="/js/source/plugins/hotCategory/hotCategory.png" style="width:99%"></div>
<div class="wordText">
<span>热门品类</span>
</div>
</div>
[[else if module.contentData.template_name=='debrisSlider']]
<div class="debris_slider">
... ... @@ -212,8 +228,9 @@
<li><img width="80px" height="76px" src="[[item.src]]"></li>
[[/each]]
</ul>
<div style="float:left;width:160px;"><img width="160px" height="180px"
src="[[module.contentData.data.big_image[0].src]]"></div>
<div style="float:left;width:160px;">
<img width="160px" height="180px" src="[[module.contentData.data.big_image[0].src]]">
</div>
<ul style="float:left;width:80px;">
[[each module.contentData.data.right as item index]]
<li><img width="80px" height="76px" src="[[item.src]]"></li>
... ... @@ -240,14 +257,18 @@
</div>
[[else if module.contentData.template_name=='paramsGroup']]
<div class="custom-group-list">
<div class="image-group-box"><img src="/js/source/plugins/paramsGroup/params.jpg" style="height: 80px;"></div>
<div class="wordText">
<span>自定义参数</span>
</div>
</div>
[[else if module.contentData.template_name=='自定义参数图片']]
<div class="custom-group-list">
</div>
[[else if module.contentData.template_name=='announcement']]
<div class="custom-group-list">
<div class="image-group-box"><img src="/js/source/plugins/announcement/notice.jpg" style="height: 80px;"></div>
<div class="wordText">
<span>站内公告</span>
</div>
</div>
[[else if module.contentData.template_name=='titleImage']]
<div class="editorTalk_content">
... ...
... ... @@ -22,7 +22,9 @@
[[/each]]
[[else if module.contentData.template_name=='link']]
<div class="col-sm-12">
<h3>添加链接</h3>
<div class="wordText">
<span>一个链接</span>
</div>
</div>
[[else if module.contentData.template_name=='goodsGroup']]
<div class="form-group">
... ...