fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 马力
Commit e5b628895d033596fe960a0cd12dff312482f94c 1 parent f0c276b1

商家端隐藏字段

Inline Side-by-side
Showing 16 changed files with 64 additions and 66 deletions
... ... @@ -7,7 +7,7 @@
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<table class="table table-bordered">
<tr>
<!-- <tr>
<td rowspan="2">补货</td>
<td>上传EXCEL:</td>
<td style="position: relative;"><input id="supplyModify" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
... ... @@ -33,7 +33,7 @@
2、第一行标题栏：<span style="color: #67D267;">SKN|奥莱</span><br>
3、<a href="/ajax/link/batchModifyOutlet">下载样例</a>
</td>
</tr>
</tr> -->
<tr>
<td rowspan="2">批量修改条码</td>
<td>上传EXCEL:</td>
... ...
... ... @@ -99,13 +99,13 @@
</select>
</div>
<label class="col-sm-2 control-label">JIT供应商</label>
<!-- <label class="col-sm-2 control-label">JIT供应商</label>
<div class="col-sm-2">
<select id="supplierId" class="form-control">
<option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>
</select>
<div class="col-sm-12 control-label red">JIT商品必须选择JIT供应商</div>
</div>
</div> -->
</div>
<div class="form-group">
... ... @@ -145,21 +145,21 @@
<option value="6">秋冬</option>
</select>
</div>
<label class="col-sm-1 control-label">商品属性<span class="red">*</span></label>
<!-- <label class="col-sm-1 control-label">商品属性<span class="red">*</span></label>
<div class="col-sm-2">
<select id="attribute" class="form-control" value="[[attribute]]">
<option value="1">普通商品</option>
<option value="2">赠品</option>
<option value="3">虚拟商品</option>
</select>
</div>
</div> -->
</div>
<div class="form-group">
<!-- <div class="form-group">
<label class="col-sm-2 control-label">商品话题</label>
<div class="col-sm-10">
<input type="text" id="productTag" class="form-control" value="[[productTag]]" />
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-2 control-label">年龄层<span class="red">*</span></label>
<div class="col-sm-2">
... ... @@ -223,7 +223,7 @@
<input id="isLimited" type="hidden" value="[[isLimited||'N']]" for="radio" />
[[if isAuditing==200]]
[[if isAuditing==200]]
<label class="col-sm-1 control-label">是否预售</label>
<div class="col-sm-2">
<label class="radio-inline">
... ... @@ -236,7 +236,7 @@
</div>
[[if isAuditing==200]]
<!-- [[if isAuditing==200]]
<div class="form-group">
<label class="col-sm-2 control-label">是否奥莱</label>
<div class="col-sm-2">
... ... @@ -249,9 +249,9 @@
</div>
[[/if]]
[[/if]] -->
[[if isAuditing==200]]
<!-- [[if isAuditing==200]]
<div class="form-group">
<label class="col-sm-2 control-label">是否VIP</label>
<div class="col-sm-2">
... ... @@ -265,7 +265,7 @@
</div>
</div>
[[/if]]
-->
<div class="form-group">
<label class="col-sm-2 control-label">吊牌价<span class="red">*</span></label>
... ... @@ -291,7 +291,7 @@
</div>
[[/if]]
</div>
</div>
</div>
</script>
... ...
... ... @@ -18,21 +18,21 @@
<div class="panel-col">
<input type="text" id="productName" class="form-control" placeholder="商品名称"/>
</div>
<div class="panel-col">
<!-- <div class="panel-col">
<input type="text" id="founderName" class="form-control" placeholder="创建人"/>
</div>
</div> -->
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<!-- <div class="panel-col">
<select id="isOutLets" class="form-control">
<option value="-1">是否奥莱</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
</div> -->
<div class="panel-col">
<select id="isAdvance" class="form-control">
<option value="-1">是否预售</option>
... ...
... ... @@ -67,7 +67,7 @@
<div class="form-group">
<div class="col-sm-4">预售: [[isAdvance]]</div>
<div class="col-sm-4">预付定金: [[deposit]]</div>
<!-- <div class="col-sm-4">预付定金: [[deposit]]</div> -->
</div>
<div class="form-group">
... ... @@ -101,8 +101,8 @@
<th>款型编码</th>
<th>条码</th>
<th>厂家颜色</th>
<th>能否补货</th>
<th>支付尾款时间</th>
<!-- <th>能否补货</th>
<th>支付尾款时间</th> -->
</tr>
</thead>
<tbody>
... ... @@ -121,12 +121,12 @@
<th>[[item.factoryCode]]</th>
<th>[[_item.factoryCode]]</th>
<th>[[item.factoryGoodsName]]</th>
[[if _item.isSuppled=="Y"]]
<!-- [[if _item.isSuppled=="Y"]]
<th>是</th>
[[else]]
<th>否</th>
[[/if]]
<th>[[_item.balanceTime]]</th>
<th>[[_item.balanceTime]]</th> -->
</tr>
[[/each]]
[[/each]]
... ...
... ... @@ -5,7 +5,7 @@
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<table class="table table-bordered">
<tr>
<!-- <tr>
<td rowspan="2">排序</td>
<td>上传EXCEL:</td>
<td style="position: relative;"><input id="sort-file" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
... ... @@ -34,7 +34,7 @@
4、每个文件控制在500行以内<br>
5、<a href="/ajax/link/brandModelSeries">下载样例</a>
</td>
</tr>
</tr> -->
<tr>
<td rowspan="2">批量下架</td>
<td>上传EXCEL:</td>
... ...
... ... @@ -38,7 +38,7 @@
<div class="panel-body" style="display: none;" >
<%include 'partials/add-info'%>
<%include 'partials/editor-recommend'%>
<!-- <%include 'partials/editor-recommend'%> -->
<%include 'partials/model'%>
<%include 'partials/close-match'%>
</div>
... ... @@ -65,15 +65,15 @@
<li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li> -->
</ul>
</li>
<li name="position8" data-pos="搜索/标签">
<!-- <li name="position8" data-pos="搜索/标签">
<a href="javascript:;">搜索关键词</a>
</li>
</li> -->
<li name="position9">
<a href="javascript:;">上架后补全</a>
<ul class="sub-floatnav">
<li name="position10"><a href="javascript:;">模特</a></li>
<!-- <li name="position11"><a href="javascript:;">品牌关联</a></li> -->
<li name="position12"><a href="javascript:;">小编推荐</a></li>
<!-- <li name="position12"><a href="javascript:;">小编推荐</a></li> -->
<li name="position13"><a href="javascript:;">搭配</a></li>
</ul>
</li>
... ...
... ... @@ -71,14 +71,14 @@
<div class="panel-col2">
<div id="sortTree" class="form-control height40" style="border: 0px; padding: 0px;"></div>
</div>
<div class="panel-col">
<!-- <div class="panel-col">
<select name="isOutLets" id="isOutLets" tabindex="-1" title="" class="form-control height40">
<option value="-1">是否奥莱</option>
<option value="Y">奥莱</option>
<option value="N">非奥莱</option>
<option value="B">品牌设置</option>
</select>
</div>
</div> -->
<div class="panel-col">
<select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
<option value="">上下架状态</option>
... ... @@ -109,13 +109,13 @@
<div class="panel-col">
<input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
</div>
<div class="panel-col">
<!-- <div class="panel-col">
<select id="isScreen" class="form-control height40">
<option value="-1">是否已摄影传图</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
</div> -->
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
... ...
... ... @@ -26,7 +26,7 @@
<div class="form-group">
<div class="col-sm-3">店铺：[[shopName]]</div>
<div class="col-sm-3">品牌：[[brandName]]</div>
<div class="col-sm-3">供应商：[[supplierName]]</div>
<!-- <div class="col-sm-3">供应商：[[supplierName]]</div> -->
[[if renderType=='edit']]
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
[[else]]
... ... @@ -60,9 +60,9 @@
[[/if]]
</div>
<div class="form-group">
<!-- <div class="form-group">
<div class="col-sm-12">商品话题：[[productTag]]</div>
</div>
</div> -->
<div class="form-group">
<div class="col-sm-3">
... ... @@ -107,14 +107,14 @@
</div>
<input id="isLimited" type="hidden" value="[[isLimited||'N']]" for="radio" />
<div class="col-sm-3">
<!-- <div class="col-sm-3">
<label>是否奥莱：</label>
<label >
<input type="radio" name="isOutLets" value="Y">是</label>
<label >
<input type="radio" name="isOutLets" value="N">否</label>
<input type="hidden" id="isOutlets" value="[[isOutLets||'N']]" for="radio" />
</div>
</div> -->
</div>
<div class="form-group">
... ... @@ -128,9 +128,9 @@
<div class="col-sm-3">吊牌价：[[retailPrice]]</div>
<div class="col-sm-3">销售价：[[salesPrice]]</div>
</div>
<div class="form-group">
<!-- <div class="form-group">
<div class="col-sm-3">是否VIP：[[isVip]]</div>
</div>
</div> -->
</script>
... ... @@ -147,7 +147,7 @@
</div>
[[/if]]
</div>
<div class="form-group">
<!-- <div class="form-group">
<label class="col-sm-1 control-label">是否新品：</label>
<div class="col-sm-4">
<label ><input type="radio" name="isNew" value="Y">是</label>
... ... @@ -161,7 +161,7 @@
<label ><input type="checkbox" name="sellChannels" value="3">场地</label>
<input id="sellChannels" value="[[sellChannels||'1|2']]" type="hidden" for="checkbox">
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-1 control-label">展示时间：</label>
<label class="col-sm-1 control-label">售罄</label>
... ...
<div class="panel panel-default">
<!-- <div class="panel panel-default">
<div class="panel-heading">
<a class="netsale-position" href="javascript:;" name="position12"></a>
... ... @@ -33,4 +33,4 @@
[[/each]]
</div>
[[/each]]
</script>
\ No newline at end of file
</script> -->
\ No newline at end of file
... ...
<div class="panel panel-default">
<!--<div class="panel panel-default">
<div class="panel-heading">
<a class="netsale-position" href="javascript:;" name="position7"></a>
... ... @@ -13,7 +13,7 @@
<div class="col-sm-2">
<input type="text" class="form-control" id="sort0" value="0" required />
</div>
<!--
<label class="col-sm-1 control-label" for="sort1">奥莱</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="sort1" value="0" required />
... ... @@ -22,7 +22,7 @@
<div class="col-sm-2">
<input type="text" class="form-control" id="sort2" value="0" required />
</div>
-->
<label class="col-sm-1 control-label" for="sort3">店铺</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="sort3" value="0" required modelId="1" projectId="5"/>
... ... @@ -33,4 +33,4 @@
<div class="panel-footer">
<button class="btn btn-primary" id="sort-save">保存</button>
</div>
</div>
\ No newline at end of file
</div>-->
\ No newline at end of file
... ...
<div class="panel panel-default">
<!-- <div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<a class="netsale-position" href="javascript:;" name="position10"></a>
... ... @@ -27,4 +27,4 @@
<h4>尺码规范：</h4>
</div>
</form>
</div>
\ No newline at end of file
</div> -->
\ No newline at end of file
... ...
<div class="panel panel-primary">
<!-- <div class="panel panel-primary">
<div class="panel-heading">
<a class="netsale-position" href="javascript:;" name="position8"></a>
<div class="panel-btns" style="display: none;">
... ... @@ -26,4 +26,4 @@
<div class="panel-footer" style="display: none;">
<button class="btn btn-primary" id="save-searchKey">保存</button>
</div>
</div>
\ No newline at end of file
</div> -->
\ No newline at end of file
... ...
... ... @@ -170,7 +170,7 @@ var g=new common.grid({
}
var html=[];
html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>");
html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>是否补货</div><div class='col-sm-2'>UPM条码</div></div></div>");
html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div></div></div>");
html.push('<div class="rows" id="rows__'+item.__index+'">');
item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)];
html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList}));
... ...
... ... @@ -113,7 +113,7 @@ var t = new common.tab2({
var columnname=t.options.columns[t.options.active].name;
g.options.columns[6].hidden = true;
g.options.columns[6].hidden = true; // 奥莱在商家端不展示
g.options.columns[9].hidden = true; //隐藏【创建时间】
g.options.columns[10].hidden = true; //隐藏【创建人】
g.options.columns[11].hidden = true; //隐藏【驳回时间】
... ... @@ -124,7 +124,7 @@ var t = new common.tab2({
g.options.columns[16].hidden = true; //隐藏【操作信息】
if (columnname == "all") {
g.options.columns[6].hidden = false;
/*g.options.columns[6].hidden = false;*/
g.options.columns[15].hidden = false; //显示【状态】
g.options.columns[16].hidden = false; //显示【操作信息】
$("#daochu").hide();
... ... @@ -149,7 +149,7 @@ var t = new common.tab2({
case 'passAuditNum':
{ // 待审核
g.options.columns[6].hidden = false;
/*g.options.columns[6].hidden = false;*/
g.options.columns[13].hidden = false; //显示【通过时间】
g.options.columns[14].hidden = false; //显示【通过人】
}
... ... @@ -257,14 +257,14 @@ var g = new common.grid({
html.push("<p>销售价：" + item.salesPrice + "</p>");
//待审核和驳回列表中只显示吊牌价和销售价，通过的列表中显示
if (item.isAuditing === 200) {
/*if (item.isAuditing === 200) {
html.push("<p>是否VIP：" + YNEnum.enum[item.isVip] + "</p>");
if(item.productPrice&&item.productPrice.returnCoinMoney){
html.push("<p>返yoho币金额：" + item.productPrice.returnCoinMoney + "</p>");
}else{
html.push("<p>返yoho币金额：0</p>");
}
}
}*/
return html.join('');
}
},
... ...
... ... @@ -211,14 +211,13 @@ var g = new common.grid({
salesPrice = item.salesPrice ? item.salesPrice : '';
var html = '<p><strong>吊牌价：</strong>' + retailPrice + '</p>' +
'<p><strong>销售价：</strong>' + salesPrice + '</p>' +
'<p><strong>是否VIP：</strong>' + vip + '</p>';
'<p><strong>销售价：</strong>' + salesPrice + '</p>';
if (item.returnCoinMoney) {
/*if (item.returnCoinMoney) {
html += "<p><strong>返yoho币金额：</strong>" + item.returnCoinMoney + "</p>";
} else {
html += "<p><strong>返yoho币金额：</strong>0</p>";
}
}*/
return html;
}
}, {
... ... @@ -253,9 +252,9 @@ var g = new common.grid({
if (item.appType || item.appType == 0) {
html.push("<p>"+ENUM.APPType[item.appType]+"</p>");
}
if (item.isOutlets) {
/* if (item.isOutlets) {
html.push("<p>"+ENUM.isOutLets[item.isOutlets]+"</p>");
}
}*/
return html.join('');
}
}, {
... ...
... ... @@ -109,8 +109,7 @@ var g = new common.grid({
return html;
}},
{display: '操作', render: function(item) {
return '<a href="javascript:;" class="btn btn-info btn-xs modify-btn" data-skn="' + item.product_skn + '">修改</a><br>' +
'<a href="javascript:;" class="btn btn-primary btn-xs history-btn" data-skn="' + item.product_skn + '" style="margin-top: 10px">变价记录</a>'
return '<a href="javascript:;" class="btn btn-primary btn-xs history-btn" data-skn="' + item.product_skn + '" style="margin-top: 10px">变价记录</a>'
}
}]
});
... ...