fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 034f83ea143b5612931f157c024ff7f9029276fb 1 parent 29142b0d

build

Inline Side-by-side
Showing 8 changed files with 163 additions and 19 deletions
... ... @@ -34,7 +34,7 @@ webpackJsonp([59],[
var HtmArr = [];
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-primary btn-xs info-modify">编辑</a>');
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-del">删除</a>');
/*HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-del">删除</a>');*/
if(items.status==0){
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-success btn-xs info-open">开启</a>');
}else{
... ...
... ... @@ -36,7 +36,8 @@ webpackJsonp([77],{
'<a id="editPool" class="btn btn-xs btn-primary" data-index="'+item.__index+'">编辑</a>' +
'<a id="emptyPool" class="btn btn-xs btn-warning" data-index="'+item.__index+'">清空</a>' +
'<a id="deletePool" class="btn btn-xs btn-danger" data-index="'+item.__index+'">删除</a>'+
'<a id="viewUrl" class="btn btn-xs btn-danger" data-index="'+item.__index+'">查看链接</a>';
'<a id="viewUrl" class="btn btn-xs btn-danger" data-index="'+item.__index+'">查看链接</a>'+
'<a id="batchDelPool" class="btn btn-xs btn-danger" data-index="'+item.__index+'">批量删除</a>';
}}
]
});
... ... @@ -139,6 +140,30 @@ webpackJsonp([77],{
}
});
},
batchDelPool: function (obj,index) {
common.dialog.confirm(
"批量删除",
common.util.__template2($("#batchDelTemplate").html(),obj),
function () {
}
);
//上传文件
common.edit.ajaxfileupload("#batchDelProductSkn", {
params: {
type: "productPoolBatchDel",
__type: "batch-import",
args:obj.id
},
onComplete: function (res) {
if (res.code == 200) {
common.util.__tip(res.message, 'success');
} else {
common.util.__tip(res.message);
}
}
});
},
//批量上传
batchAddPool: function (type,url,obj) {
... ... @@ -258,6 +283,11 @@ webpackJsonp([77],{
var item = g.rows[index];
Bll.emptyPool(item,index);
});
$(document).on("click", "#batchDelPool", function () {
var index = $(this).data("index");
var item = g.rows[index];
Bll.batchDelPool(item,index);
});
//删除商品池
$(document).on("click", "#deletePool", function () {
... ...
... ... @@ -516,7 +516,14 @@ webpackJsonp([148],{
// var $showDivide = $(this);
// if()
// })
$(document).on("change", ".observe2", function () {
var $this = $(this);
var index = $this.data("index");
var name = $this.data("field");
Bll.module.contentData.data[index].secList = common.util.__buildobj(name, '.', Bll.module.contentData.data[index].secList, function (obj, name) {
obj[name] = $this.val();
});
});
/*第五步 绑定监听事件*/
$(document).on("change", ".observe", function () {
var $this = $(this);
... ... @@ -705,6 +712,13 @@ webpackJsonp([148],{
el: ".shopsId"
});
});
$(document).on("click",".addSecBtn",function(){
//获得index
var index = $(this).data("index");
Bll.module.contentData.data[index].secList.push(addObj["textNavSec_data"]);
Bll.renderDialog("textNav-template");
});
$(document).on("click",".goResourceContent",function(){
var index = $(this).data("index");
var obj;
... ... @@ -743,7 +757,14 @@ webpackJsonp([148],{
el: ".shopsId"
});
});
$(document).on("click", ".delBtn2", function () {
//textNav-data index
var index = $(this).data("index");
//secList index
var idx = $(this).data("idx");
Bll.module.contentData.data[index].secList.splice(idx, 1);
Bll.renderDialog("textNav-template");
});
//输入领券码验证
$(document).on("change", "#couponID", function () {
var couponID = $(this).val();
... ... @@ -1459,7 +1480,10 @@ webpackJsonp([148],{
return {
src: item.images_url,
id: item.product_skn,
product_skc: item.product_skc
product_skc: item.product_skc,
sales_price:item.sales_price,
product_name:item.product_name,
product_skn:item.product_skn
}
})
// 线上bug修改，商品个数不超过150个
... ... @@ -3750,7 +3774,8 @@ webpackJsonp([148],{
"priceStyle":"",
"jumpType":"",
"recommendLogic":"",
"skns":""
"skns":"",
"platformType":"0"
},
"isNewFloor":"1"
},
... ... @@ -4155,7 +4180,19 @@ webpackJsonp([148],{
},
"showHotOrNew":"",
"showDivide":"",
"doc":""
"doc":"",
"secList":[]
},
textNavSec_data: {//文本导航->二级导航
"name": "",
"enName":"",
"url": {
"action": "",
"url": ""
},
"showHotOrNew2":"",
"showDivide":"",
"doc":"",
},
focus_data: {//焦点图->焦点
"src": "",
... ...
... ... @@ -49,7 +49,7 @@ var Iaccount = {
var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.202:8088/platform",
domain:"http://192.168.102.48:8088/platform",
//domain:"http://127.0.0.1:8088/platform",
// domain:"http://172.16.6.200:8088/platform",
//domain:"http://192.168.102.202:8088/platform",
... ...
... ... @@ -154,4 +154,36 @@
</div>
<div id="faGrid"></div>
</script>
<script type="text/template" id="batchDelTemplate">
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<div class="col-sm-9">
<div class="row">
<div class="col-sm-7">
<input id="bathcDelPath" class="form-control" type="text" disabled="disabled"
style="cursor:default; width: 218px">
</div>
<div class="col-sm-4" style="position: relative; padding-left: 0;">
<input id="batchDelProductSkn" name="productSkn" class="btn btn-default excel-upload"
type="file"
style="position: absolute; top: 0;left: 10px; height:37px">
<div class="file-name btn btn-info">请选择文件</div>
</div>
</div>
<div style="margin: 10px 0 0; color:#f0ad4e">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、Excel表头为<span style="color:red;">SKN</span><br>
3、第一行为表头内容，第二行开始为正式内容<br>
4、每个文件控制在5000行内<br>
5、<a href="/ajax/link/batchDelPool" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
</div>
</div>
</div>
</div>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -71,9 +71,9 @@
<td>安卓</td>
</tr>
<tr>
<td><input type="file" id="iosSmallImageN" name="iosSmallImageN" required="required" value="[[iosSmallImageN]]"></td>
<td><input type="file" id="iosBigImageN" name="iosBigImageN" required="required" value="[[iosBigImageN]]"></td>
<td><input type="file" id="androidImageN" name="androidImageN" required="required" value="[[androidImageN]]"></td>
<td><input type="file" id="iosSmallImageN" name="iosSmallImageN" value="[[iosSmallImageN]]"></td>
<td><input type="file" id="iosBigImageN" name="iosBigImageN" value="[[iosBigImageN]]"></td>
<td><input type="file" id="androidImageN" name="androidImageN" value="[[androidImageN]]"></td>
</tr>
</table>
... ... @@ -91,9 +91,9 @@
<td>安卓</td>
</tr>
<tr>
<td><input type="file" id="iosSmallImageN" name="iosSmallImageN" required="required" value="[[iosSmallImageN]]"></td>
<td><input type="file" id="iosBigImageN" name="iosBigImageN" required="required" value="[[iosBigImageN]]"></td>
<td><input type="file" id="androidImageN" name="androidImageN" required="required" value="[[androidImageN]]"></td>
<td><input type="file" id="iosSmallImageN" name="iosSmallImageN" value="[[iosSmallImageN]]"></td>
<td><input type="file" id="iosBigImageN" name="iosBigImageN" value="[[iosBigImageN]]"></td>
<td><input type="file" id="androidImageN" name="androidImageN" value="[[androidImageN]]"></td>
</tr>
</table>
... ... @@ -105,9 +105,9 @@
<div class="col-sm-8">
<table>
<tr>
<td><input type="file" id="iosSmallImage" name="iosSmallImage" required="required" value="[[iosSmallImage]]"></td>
<td><input type="file" id="iosBigImage" name="iosBigImage" required="required" value="[[iosBigImage]]"></td>
<td><input type="file" id="androidImage" name="androidImage" required="required" value="[[androidImage]]"></td>
<td><input type="file" id="iosSmallImage" name="iosSmallImage" value="[[iosSmallImage]]"></td>
<td><input type="file" id="iosBigImage" name="iosBigImage" value="[[iosBigImage]]"></td>
<td><input type="file" id="androidImage" name="androidImage" value="[[androidImage]]"></td>
</tr>
</table>
... ...
... ... @@ -1833,7 +1833,8 @@
</script>
<!--文本导航-->
<script type="text/template" id="textNav-template">
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" data-limit="10" value="添加一个" style="margin:10px;" data-event="textNav.data"></p>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" data-limit="10" value="添加一个" style="margin:10px;" data-event="textNav.data">
</p>
<ul class="draggable" data-array="data.list">
[[each contentData.data as item index]]
<li>
... ... @@ -1841,13 +1842,14 @@
<tbody>
<tr>
<td>
<input type="text" placeholder="导航中文" value="[[item.name]]" class="observe" data-field="[[index]].name" required="required">
<input type="text" placeholder="导航中文" value="[[item.name]]" class="observe" data-field="[[index]].name" required="required">
<input type="text" placeholder="导航英文" value="[[item.enName]]" class="observe" data-field="[[index]].enName" >
<select name="goTo" class="observe" value="[[item.url.action]]" data-field="[[index]].url.action">
[[layout action_template]]
</select>
<input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe" required="required"/>
<a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a>
<input type="button" name="second_add" class="btn btn-info btn-xs addSecBtn" data-index="[[index]]" value="添加二级导航" style="margin:10px;">
</td>
</tr>
<tr>
... ... @@ -1859,6 +1861,40 @@
<input type="checkbox" class="showDivide observe" name="showDivide_[[index]]" data-field="[[index]].showDivide" value="1" [[item.showDivide=="1"?"checked":""]]> 显示分隔
</td>
</tr>
<tr>
<td>
<ul class="draggable">
[[each item.secList as itn idx]]
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>
<input type="text" placeholder="导航中文" data-index="[[index]]" value="[[itn.name]]" class="observe2" data-field="[[idx]].name" required="required" style="margin-left:40px">
<input type="text" placeholder="导航英文" data-index="[[index]]" value="[[itn.enName]]" class="observe2" data-field="[[idx]].enName" >
<select name="goTo" class="observe2" data-index="[[index]]" value="[[itn.url.action]]" data-field="[[idx]].url.action">
[[layout action_template]]
</select>
<input type="text" placeholder="url" data-index="[[index]]" value="[[itn.url.url]]" data-field="[[idx]].url.url" class="observe2" required="required"/>
<a type="button" class="btn btn-danger btn-xs delBtn2" data-index="[[index]]" data-idx="[[idx]]">删除</a>
</td>
</tr>
<tr>
<td>
<input type="radio" class="showHotOrNew2_[[idx]] observe2" data-index="[[index]]" data-field="[[idx]].showHotOrNew2" name="showHotOrNew2_[[idx]]" value="" [[itn.showHotOrNew2==""?"checked":""]] style="margin-left:40px"> 不显示HOT/NEW
<input type="radio" class="showHotOrNew2_[[idx]] observe2" data-index="[[index]]" data-field="[[idx]].showHotOrNew2" name="showHotOrNew2_[[idx]]" value="1" [[itn.showHotOrNew2=="1"?"checked":""]]> 显示HOT
<input type="radio" class="showHotOrNew2_[[idx]] observe2" data-index="[[index]]" data-field="[[idx]].showHotOrNew2" name="showHotOrNew2_[[idx]]" value="2" [[itn.showHotOrNew2=="2"?"checked":""]]> 显示NEW&emsp;
<input type="text" placeholder="请输入文案" value="[[itn.doc]]" data-index="[[index]]" class="observe2" data-field="[[idx]].doc" >&emsp;
<input type="checkbox" class="showDivide observe2" name="showDivide_[[idx]]" data-index="[[index]]" data-field="[[idx]].showDivide" value="1" [[itn.showDivide=="1"?"checked":""]]> 显示分隔
</td>
</tr>
</tbody>
</table>
</li>
[[/each]]
</ul>
</td>
</tr>
</tbody>
</table>
</li>
... ...
... ... @@ -1453,6 +1453,15 @@
<input type="radio" name="jumpType" class="jumpType" value="2" [[contentData.data.jumpType=="2"?"checked":""]]> 店铺 &emsp;
</div>
</div>
<div class="row">
<label class="col-sm-2 control-label">平台类型:</label>
<div class="col-sm-8">
<select class="observe" name="platformType" value="[[contentData.data.platformType]]" data-field="platformType">
<option value="0">有货</option>
<option value="1">blk(无大数据推荐数据)</option>
</select>
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
... ...