fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 5a6f42c43c0a54138f92a8d65817d4b2181f6288 1 parent cb093d3c

build

Inline Side-by-side
Showing 7 changed files with 63 additions and 14 deletions
... ... @@ -95,6 +95,8 @@ webpackJsonp([32],[
common.edit.ajaxfileupload('#nationalCodeModify', batchExport('#nationalCodeProperty', 'nationalCodeImportService'));
common.edit.ajaxfileupload('#sknCouponRelate', batchExport('#sknCouponProperty', 'sknCouponRelateImportService'));
var isbrandId=false,isshops=false,issellType=false;
function jiekai(){
... ...
... ... @@ -1499,6 +1499,10 @@ webpackJsonp([151],{
Bll.renderDialog("focus-template");
});
$(document).on("change", '#categoryType', function () {
Bll.module.contentData.categoryType = $(this).val();
});
$(document).on("change", '#version_control', function () {
Bll.module.contentData.version_control = $(this).val();
Bll.renderDialog("splitJointImg-template");
... ... @@ -3012,7 +3016,8 @@ webpackJsonp([151],{
"alt": "",
"url": {},
}
]
],
"categoryType":"1"
},
{
template_intro: "添加商品",
... ... @@ -4628,9 +4633,10 @@ webpackJsonp([151],{
button_name: "Tab切",
dialog: "tabFloor-template",
template_name: "tabFloor",
data: {
"list":[]
},
data: [{
"tabName":"",
"code":""
}],
"isNewFloor":"1"
},
{
... ... @@ -5275,7 +5281,7 @@ webpackJsonp([151],{
"alt": "",
"src": "",
},
tabFloor_list:{
tabFloor_data:{
"tabName":"",
"code":""
},
... ...
... ... @@ -44,6 +44,9 @@ module.exports = {
iosSmallImageN: {type: String},
iosBigImageN: {type: String},
androidImageN: {type: String},
iosSmallImageFirst: {type: String},
iosBigImageFirst: {type: String},
androidImageFirst: {type: String},
}
},
uploadZip:{
... ...
... ... @@ -139,6 +139,20 @@
3、<a href="/ajax/link/nationalCode">下载样例</a>
</td>
</tr>
<tr>
<td rowspan="2">批量新增秒杀优惠券</td>
<td>上传EXCEL:</td>
<td style="position: relative;"><input id="sknCouponRelate" name="file" data-type="sknCouponProperty" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
</tr>
<tr>
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">SKN|优惠券ID</span><br>
3、<a href="/ajax/link/sknCouponRelate">下载样例</a>
</td>
</tr>
</table>
</div>
<div class="panel-body red" id="message">
... ...
... ... @@ -99,9 +99,8 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">选中：</label>
<div class="form-group">
<label class="col-sm-2 control-label">选中：</label>
<div class="col-sm-8">
<table>
<tr>
... ... @@ -111,6 +110,19 @@
</tr>
</table>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">初次动图：</label>
<div class="col-sm-8">
<table>
<tr>
<td><input type="file" id="iosSmallImageFirst" name="iosSmallImageFirst" value="[[iosSmallImageFirst]]"></td>
<td><input type="file" id="iosBigImageFirst" name="iosBigImageFirst" value="[[iosSmallImageFirst]]"></td>
<td><input type="file" id="androidImageFirst" name="androidImageFirst" value="[[androidImageFirst]]"></td>
</tr>
</table>
</div>
</div>
[[/if]]
... ...
... ... @@ -2145,6 +2145,18 @@
<input type="button" class="btn btn-info btn-xs addBtn" data-event="category.data" value="添加图片" style="margin:10px;"><br>
<div class="form-group">
<div class="col-sm-10">
<label>品类：</label>
<select class="form-control input-form" id="categoryType" value="[[contentData.categoryType]]" >
<option value="1">商品</option>
<option value="2">店铺</option>
</select>
&emsp;&emsp;&emsp;&emsp;
</div>
</div>
<ul class="draggable" data-array="data">
[[each contentData.data as item index]]
<li>
... ... @@ -2174,7 +2186,7 @@
<td>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="skn" value="[[item.skn]]" class="observe form-control" data-field="[[index]].skn"/>
<input type="text" placeholder="skn|shopId" value="[[item.skn]]" class="observe form-control" data-field="[[index]].skn"/>
</div>
</div>
</td>
... ...
... ... @@ -1998,12 +1998,12 @@
</script>
<script type="text/template" id="tabFloor-template">
<input type="button" class="btn btn-info btn-xs addBtn" data-event="tabFloor.list" value="添加Tab" style="margin:10px;">
<input type="button" class="btn btn-info btn-xs addBtn" data-event="tabFloor.data" value="添加Tab" style="margin:10px;">
<br>
<div class="rows">
<div>
<ul class="draggable" data-array="data">
[[each contentData.data.list as item index]]
[[each contentData.data as item index]]
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
... ... @@ -2011,19 +2011,19 @@
<td align="center">[[index+1]]</td>
<td align="center">
<input class="form-control observe" value="[[item.tabName?item.tabName:'']]" placeholder="输入Tab名称"
data-field='list.[[index]].tabName' required/>
data-field='[[index]].tabName' required/>
</td>
<td>
<div class="form-group">
<div class="col-sm-10">
<input class="form-control observe" placeholder="code码" data-field="list.[[index]].code"
<input class="form-control observe" placeholder="code码" data-field="[[index]].code"
value="[[item.code?item.code:'']]" required/>
</div>
</div>
</td>
<td>
<a target="_blank" class="btn btn-xs btn-primary goResourceContent" data-index="[[index]]">内容编辑</a>
<button class="btn btn-danger btn-sm delBtn" data-event="tabFloor.list" type="button" data-index="[[index]]">删除</button></td>
<button class="btn btn-danger btn-sm delBtn" data-event="tabFloor.data" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ...