Showing
4 changed files
with
11 additions
and
12 deletions
| @@ -83,12 +83,13 @@ var SORTDATA={ | @@ -83,12 +83,13 @@ var SORTDATA={ | ||
| 83 | otherParam:function(){ | 83 | otherParam:function(){ |
| 84 | return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId")} | 84 | return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId")} |
| 85 | }, | 85 | }, |
| 86 | - complete:function(data){ | 86 | + complete:function(data,bool){ |
| 87 | if(data.length>2){ | 87 | if(data.length>2){ |
| 88 | Bll.productNameArr[2]=data[data.length-1].sortName; | 88 | Bll.productNameArr[2]=data[data.length-1].sortName; |
| 89 | Bll.setProductName(); | 89 | Bll.setProductName(); |
| 90 | } | 90 | } |
| 91 | - if(data[0]&&data[0].text&&data[0].text.indexOf("潮童")>-1){ | 91 | + if(!bool){ |
| 92 | + if(data[0]&&data[0].text&&data[0].text.indexOf("2")>-1){ | ||
| 92 | $("#ageLevel").val("2|3"); | 93 | $("#ageLevel").val("2|3"); |
| 93 | 94 | ||
| 94 | }else{ | 95 | }else{ |
| @@ -101,6 +102,7 @@ var SORTDATA={ | @@ -101,6 +102,7 @@ var SORTDATA={ | ||
| 101 | $(this).prop("checked",true) | 102 | $(this).prop("checked",true) |
| 102 | } | 103 | } |
| 103 | }); | 104 | }); |
| 105 | + } | ||
| 104 | // console.log(data); | 106 | // console.log(data); |
| 105 | } | 107 | } |
| 106 | }; | 108 | }; |
| @@ -145,11 +145,11 @@ tabTree.prototype= { | @@ -145,11 +145,11 @@ tabTree.prototype= { | ||
| 145 | g.getData(g._getParam(_next)) | 145 | g.getData(g._getParam(_next)) |
| 146 | } else { | 146 | } else { |
| 147 | g.active_count = 0; | 147 | g.active_count = 0; |
| 148 | - g.setHeadVal(); | 148 | + g.setHeadVal(true); |
| 149 | g.reset() | 149 | g.reset() |
| 150 | } | 150 | } |
| 151 | } else { | 151 | } else { |
| 152 | - g.setHeadVal(); | 152 | + g.setHeadVal(true); |
| 153 | g.reset() | 153 | g.reset() |
| 154 | } | 154 | } |
| 155 | }, | 155 | }, |
| @@ -210,7 +210,7 @@ tabTree.prototype= { | @@ -210,7 +210,7 @@ tabTree.prototype= { | ||
| 210 | g.rows.length = 0; | 210 | g.rows.length = 0; |
| 211 | if (items.data.length == 0) { | 211 | if (items.data.length == 0) { |
| 212 | g.active_count = 0; | 212 | g.active_count = 0; |
| 213 | - g.setHeadVal(); | 213 | + g.setHeadVal(true); |
| 214 | g.reset(); | 214 | g.reset(); |
| 215 | }else{ | 215 | }else{ |
| 216 | $.each(items.data, function(count, item) { | 216 | $.each(items.data, function(count, item) { |
| @@ -225,16 +225,13 @@ tabTree.prototype= { | @@ -225,16 +225,13 @@ tabTree.prototype= { | ||
| 225 | g.records.push(count); | 225 | g.records.push(count); |
| 226 | g.rows.push(item) | 226 | g.rows.push(item) |
| 227 | }); | 227 | }); |
| 228 | - if ($("iframe", g.dom["citybox"]).length > 0) { | ||
| 229 | - $("iframe", g.dom["citybox"]).height(g.element[0].offsetHeight) | ||
| 230 | - } | ||
| 231 | } | 228 | } |
| 232 | }, | 229 | }, |
| 233 | error: function(e1, e2) {} | 230 | error: function(e1, e2) {} |
| 234 | }; | 231 | }; |
| 235 | $.ajax(ajaxOptions) | 232 | $.ajax(ajaxOptions) |
| 236 | }, | 233 | }, |
| 237 | - setHeadVal: function() { | 234 | + setHeadVal: function(bool) { |
| 238 | var g = this, | 235 | var g = this, |
| 239 | p = this.options; | 236 | p = this.options; |
| 240 | var arr=[]; | 237 | var arr=[]; |
| @@ -247,7 +244,7 @@ tabTree.prototype= { | @@ -247,7 +244,7 @@ tabTree.prototype= { | ||
| 247 | p.datas.push(item) | 244 | p.datas.push(item) |
| 248 | }); | 245 | }); |
| 249 | if (p.complete != null) { | 246 | if (p.complete != null) { |
| 250 | - p.complete(p.datas, false) | 247 | + p.complete(p.datas, bool) |
| 251 | } | 248 | } |
| 252 | }, | 249 | }, |
| 253 | renderHeader: function() { | 250 | renderHeader: function() { |
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | <td>说明：</td> | 69 | <td>说明：</td> |
| 70 | <td colspan="2"> | 70 | <td colspan="2"> |
| 71 | 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> | 71 | 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> |
| 72 | - 2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数</span><br> | 72 | + 2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，小童），重点款，预计上架时间</span><br> |
| 73 | 3、<a href="/ajax/link/baseproduct">下载样例</a> | 73 | 3、<a href="/ajax/link/baseproduct">下载样例</a> |
| 74 | </td> | 74 | </td> |
| 75 | </tr> | 75 | </tr> |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | <input type="checkbox" name="ageLevel" value="2">大童</label> | 199 | <input type="checkbox" name="ageLevel" value="2">大童</label> |
| 200 | <label class="radio-inline"> | 200 | <label class="radio-inline"> |
| 201 | <input type="checkbox" name="ageLevel" value="3">小童</label> | 201 | <input type="checkbox" name="ageLevel" value="3">小童</label> |
| 202 | - <input type="hidden" id="ageLevel" name="ageLevel" value="[[ageLevel||'1']]" for="checkbox" placeholder="年龄层" required /> | 202 | + <input type="hidden" id="ageLevel" name="ageLevel" value="[[ageLevel]]" for="checkbox" placeholder="年龄层" required /> |
| 203 | </div> | 203 | </div> |
| 204 | <label class="col-sm-1 control-label">性别<span class="red">*</span></label> | 204 | <label class="col-sm-1 control-label">性别<span class="red">*</span></label> |
| 205 | <div class="col-sm-2"> | 205 | <div class="col-sm-2"> |
-
Please register or login to post a comment