fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit 44cdfce5557d4db165ed4bb97c5c752700f47376 2 parents 003f0626 554b46c5

Merge branch 'master' into dev6.5

Inline Side-by-side
Showing 6 changed files with 26 additions and 22 deletions
... ... @@ -52,7 +52,7 @@
[[each goodsSizeList as item __index]]
<div class="form-group">
<!-- <label class="col-sm-1 red">*</label> -->
<div class="col-sm-1">
<div class="col-sm-2" style='width: 14%'>
<select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码">
<option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option>
</select>
... ... @@ -60,10 +60,10 @@
<div class="col-sm-1">
<input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-1">
... ... @@ -72,10 +72,10 @@
<option value="Y">可补货</option>
</select>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style="width: 10%">
<input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]>
</div>
<div class="col-sm-1">
... ...
... ... @@ -77,7 +77,7 @@ var apiCofig = {
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
host: 'redis.platform.yohoops.org'
});
}
... ... @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
... ...
... ... @@ -215,13 +215,15 @@ var g=new common.grid({
html.push("<p>色系:&nbsp;"+item.goodsName+"</p>");
}
html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>');
html.push("<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />");
return html.join("");
}},
}}/*,
{
display:"图片",render:function(item){
return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />";
}
},
}*/,
{
display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){
if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
... ... @@ -229,7 +231,7 @@ var g=new common.grid({
}
var html=[];
html.push("<div class='form-group' style='padding-bottom: 0'><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("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2'>UPC条码</div><div class='col-sm-2'>支付尾款时间</div></div></div>");
html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1' style='width: 14%'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2' style='width: 13%'>条码</div><div class='col-sm-2' style='width: 13%'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2' style='width: 13%'>UPC条码</div><div class='col-sm-2' style='width: 10%'>支付尾款时间</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}));
... ...
... ... @@ -219,13 +219,15 @@ webpackJsonp([33],[
html.push("<p>色系:&nbsp;"+item.goodsName+"</p>");
}
html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>');
html.push("<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />");
return html.join("");
}},
}}/*,
{
display:"图片",render:function(item){
return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />";
}
},
}*/,
{
display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){
if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
... ... @@ -233,7 +235,7 @@ webpackJsonp([33],[
}
var html=[];
html.push("<div class='form-group' style='padding-bottom: 0'><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("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2'>UPC条码</div><div class='col-sm-2'>支付尾款时间</div></div></div>");
html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1' style='width: 14%'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2' style='width: 13%'>条码</div><div class='col-sm-2' style='width: 13%'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2' style='width: 13%'>UPC条码</div><div class='col-sm-2' style='width: 10%'>支付尾款时间</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}));
... ...
... ... @@ -77,7 +77,7 @@ var apiCofig = {
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
host: 'redis.platform.yohoops.org'
});
}
... ... @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
... ...
... ... @@ -52,7 +52,7 @@
[[each goodsSizeList as item __index]]
<div class="form-group">
<!-- <label class="col-sm-1 red">*</label> -->
<div class="col-sm-1">
<div class="col-sm-2" style='width: 14%'>
<select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码">
<option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option>
</select>
... ... @@ -60,10 +60,10 @@
<div class="col-sm-1">
<input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-1">
... ... @@ -72,10 +72,10 @@
<option value="Y">可补货</option>
</select>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style='width: 13%'>
<input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input>
</div>
<div class="col-sm-2">
<div class="col-sm-2" style="width: 10%">
<input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]>
</div>
<div class="col-sm-1">
... ...