fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 马力
Commit 43e7d1d67e0ce67575329bdfe1a78880686442fc 2 parents a0dc8c92 47e6f705

Merge branch 'dev_商品话题' into gray 

# Conflicts:
#	code/apps/goods/views/basegoods/Edit.html
#	code/apps/goods/views/basegoods/Info.html
#	code/apps/goods/views/netsale/partials/basic-info.html
Inline Side-by-side
Showing 9 changed files with 65 additions and 28 deletions
... ... @@ -90,7 +90,10 @@ module.exports={
{name: 'middleSortId',type: 'Number'},
{name: 'smallSortId',type: 'Number'},
{name: 'seasons', type: 'String'},
{name: 'productStandardRelationStr',type: 'String'}
{name: 'productStandardRelationStr',type: 'String'},
{name: 'classic', type: 'Number'},
{name: 'brandSaleTimeStr', type: 'String'},
{name: 'expectSaleTimeStr', type: 'String'}
]
},
deleteBaseProduct:{
... ...
... ... @@ -97,7 +97,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号(选填)、一级分类、二级分类、三级分类、四级分类（目前不用）、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型编码、尺码、条码、能否补货、SKN计数、年龄层(多个用'|'分隔)、重点款型、UPM条码（选填）</span><br>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号(选填)、一级分类、二级分类、三级分类、四级分类（目前不用）、性别、货品年、货品季、品牌上市日期、预计上市日期、品牌经典款、吊牌价、销售价、色系、厂家颜色、款型编码、尺码、条码、能否补货、SKN计数、年龄层(多个用'|'分隔)、UPM条码（选填）</span><br>
3、<a href="/ajax/link/baseproduct">下载样例</a>
</td>
</tr>
... ...
... ... @@ -154,10 +154,28 @@
</select>
</div>
</div>
<!-- <div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label">品牌上市日期 <span class="red">*</span></label>
<div class="col-sm-2">
<input type="text" style="background-color: #fff" id="brandSaleTimeStr" jsaction="date" value="[[brandSaleTimeStr]]" class="form-control" readonly="readonly" required placeholder="品牌上市日期" />
</div>
<label class="col-sm-1 control-label">预计上市日期 <span class="red">*</span></label>
<div class="col-sm-2">
<input type="text" style="background-color: #fff" id="expectSaleTimeStr" jsaction="date" value="[[expectSaleTimeStr]]" class="form-control" readonly="readonly" required placeholder="预计上市日期" />
</div>
<label class="col-sm-1 control-label">品牌经典款 <span class="red">*</span></label>
<div class="col-sm-2" id="classicDiv">
<label class="radio-inline">
<input type="radio" name="classic" value="1">是</label>
<label class="radio-inline">
<input type="radio" name="classic" value="0">否</label>
<input type="hidden" id="classic" name="classic" value="[[classic||'0']]" for="radio" required />
</div>
</div>
<!-- <div class="form-group" id="productTagDiv">
<label class="col-sm-2 control-label">商品话题</label>
<div class="col-sm-10">
<input type="text" id="productTag" class="form-control" value="[[productTag]]" />
<input type="text" id="productTag" class="form-control" value="[[productTag]]" readonly="readonly" />
</div>
</div> -->
<div class="form-group">
... ... @@ -187,22 +205,22 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">重点款<span class="red">*</span></label>
<!-- <label class="col-sm-2 control-label">重点款<span class="red">*</span></label>
<div class="col-sm-2">
<label class="radio-inline">
<input type="radio" name="grade" value="1">是</label>
<label class="radio-inline">
<input type="radio" name="grade" value="0">否</label>
</div>
</div> -->
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
<label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
<div class="col-sm-4">
<label class="radio-inline">
<input type="checkbox" name="seasons" value="spring">春</label>
<input type="checkbox" name="seasons" value="spring">春秋</label>
<label class="radio-inline">
<input type="checkbox" name="seasons" value="summer">夏</label>
<label class="radio-inline">
<input type="checkbox" name="seasons" value="autumn">秋</label>
<!-- <label class="radio-inline">
<input type="checkbox" name="seasons" value="autumn">秋</label> -->
<label class="radio-inline">
<input type="checkbox" name="seasons" value="winter">冬</label>
<label class="radio-inline">
... ...
... ... @@ -45,6 +45,11 @@
<div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
</div>
<div class="form-group">
<div class="col-sm-4">品牌上市日期：[[brandSaleTimeStr]]</div>
<div class="col-sm-4">预计上市日期：[[expectSaleTimeStr]]</div>
<div class="col-sm-4">品牌经典款：[[classic]]</div>
</div>
<!-- <div class="form-group">
<div class="col-sm-2">SKN：[[productSkn]]</div>
<div class="col-sm-2">商品话题：[[productTag]]</div>
... ... @@ -58,13 +63,8 @@
<div class="form-group">
<div class="col-sm-3">年龄层：[[ageLevel]]</div>
<div class="col-sm-3">性别：[[gender]]</div>
<div class="col-sm-3">重点款：[[grade||""]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">限量款：[[isLimited]]</div>
</div>
<div class="form-group">
<div class="col-sm-4">预售: [[isAdvance]]</div>
<!-- <div class="col-sm-4">预付定金: [[deposit]]</div> -->
... ...
... ... @@ -60,7 +60,12 @@
[[/if]]
</div>
<!-- <div class="form-group">
<div class="form-group">
<div class="col-sm-4">品牌上市日期：[[brandSaleTimeStr]]</div>
<div class="col-sm-4">预计上市日期：[[expectSaleTimeStr]]</div>
<div class="col-sm-4">品牌经典款：[[classic]]</div>
</div>
<!-- <div class="form-group">
<div class="col-sm-12">商品话题：[[productTag]]</div>
</div> -->
... ... @@ -73,24 +78,24 @@
<label>年龄层：[[ageLevel]]
</label>
</div>
<div class="col-sm-3">
<!-- <div class="col-sm-3">
<label>重点款<span class="red">*</span>：</label>
<label >
<input type="radio" name="grade" value="1">是</label>
<label >
<input type="radio" name="grade" value="0">否</label>
</div>
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/> -->
</div>
<div class="form-group">
<div class="col-sm-3">
<label>适销季<span class="red">*</span>：</label>
<label>
<input type="checkbox" name="seasons" value="spring">春</label>
<input type="checkbox" name="seasons" value="spring">春秋</label>
<label >
<input type="checkbox" name="seasons" value="summer">夏</label>
<label >
<input type="checkbox" name="seasons" value="autumn">秋</label>
<!-- <label >
<input type="checkbox" name="seasons" value="autumn">秋</label> -->
<label >
<input type="checkbox" name="seasons" value="winter">冬</label>
<label >
... ...
... ... @@ -111,8 +111,11 @@ if(param&&(RESPONSEDATA.isAuditing==100)){
tabTree.isfeeze=true;
}
if(RESPONSEDATA.isAuditing==200){
$("#goodsYears").add("#goodsSeason").add("#attribute")
.add("#retailPriceStr").add("#salesPriceStr").add("#stock").prop("disabled",true);
$("#goodsYears").add("#goodsSeason").add("#attribute")
.add("#retailPriceStr").add("#salesPriceStr").add("#stock").add("#brandSaleTimeStr").add("#expectSaleTimeStr").add("#classicDiv input").prop("disabled",true);
}else {
// 新增页面隐藏话题字段
$("#productTagDiv").hide();
}
... ... @@ -387,9 +390,9 @@ $(document).on("change",":checkbox[name=seasons]",function(){
var c=$(":checkbox[name=seasons]");
if($(this).is(":checked")){
if(value=="seasons"){
c.slice(0,4).prop("checked",false);
c.slice(0,3).prop("checked",false);
}else{
c.eq(4).prop("checked",false);
c.eq(3).prop("checked",false);
}
}
var arr=[];
... ...
... ... @@ -17,6 +17,7 @@ data.data.isPromotionalGifts={"N":"否","Y":"是"}[""+data.data.isPromotionalGif
data.data.isLimited={"N":"否","Y":"是"}[""+data.data.isLimited];
data.data.isLimitbuy={"N":"否","Y":"是"}[""+data.data.isLimitbuy];
data.data.isAdvance={"N":"否","Y":"是"}[""+data.data.isAdvance];
data.data.classic={"0":"否","1":"是"}[""+data.data.classic];
var goodList = data.data.baseGoodList;
$.each(goodList, function(index, item) {
... ...
... ... @@ -62,6 +62,10 @@ var ENUM = {
'Y': "奥莱",
'N': "非奥莱",
'B':"非奥莱"
},
classic: {
'1': '是',
'0': '否'
}
};
... ...
... ... @@ -61,15 +61,18 @@ var basicInfohtml = '',
},
seasons: {
'seasons': '四季',
'spring': '春',
'spring': '春秋',
'summer': '夏',
'autumn': '秋',
'winter': '冬'
},
isVip: {
'Y': '是',
'N': '否',
'B': '品牌设置'
},
classic: {
'1': '是',
'0': '否'
}
},
basicInfo = NETSALEDATA.baseProductInfo.baseProduct || '',
... ... @@ -209,9 +212,9 @@ $(document).on("change",":checkbox[name=seasons]",function(){
var c=$(":checkbox[name=seasons]");
if($(this).is(":checked")){
if(value=="seasons"){
c.slice(0,4).prop("checked",false);
c.slice(0,3).prop("checked",false);
}else{
c.eq(4).prop("checked",false);
c.eq(3).prop("checked",false);
}
}
var arr=[];
... ...