fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ZhongW
Commit 8e89dc94113299df3ad724971d78ae8dba93bd04 2 parents 68eeedfc 48a61fac

Merge branch 'portal_dev_4.9' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into portal_dev_4.9

Inline Side-by-side
Showing 5 changed files with 40 additions and 6 deletions
@@ -45,6 +45,7 @@ module.exports={ @@ -45,6 +45,7 @@ module.exports={
45 url: '/salesCategory/addSC', 45 url: '/salesCategory/addSC',
46 params: [ 46 params: [
47 {name: 'categoryName', type: 'string'}, 47 {name: 'categoryName', type: 'string'},
  48 + {name: 'appType', type: 'number'},
48 {name: 'relationParameter', type: 'string'}, 49 {name: 'relationParameter', type: 'string'},
49 {name: 'relationUrl', type: 'string'}, 50 {name: 'relationUrl', type: 'string'},
50 {name: 'parentId', type: 'string'}, 51 {name: 'parentId', type: 'string'},
@@ -58,6 +59,7 @@ module.exports={ @@ -58,6 +59,7 @@ module.exports={
58 params: [ 59 params: [
59 {name: 'categoryId', type: 'string'}, 60 {name: 'categoryId', type: 'string'},
60 {name: 'categoryName', type: 'string'}, 61 {name: 'categoryName', type: 'string'},
  62 + {name: 'appType', type: 'number'},
61 {name: 'relationParameter', type: 'string'}, 63 {name: 'relationParameter', type: 'string'},
62 {name: 'relationUrl', type: 'string'}, 64 {name: 'relationUrl', type: 'string'},
63 {name: 'parentId', type: 'string'}, 65 {name: 'parentId', type: 'string'},
@@ -30,6 +30,15 @@ @@ -30,6 +30,15 @@
30 {{/unless}} 30 {{/unless}}
31 31
32 <div class="form-group"> 32 <div class="form-group">
  33 + <label class="col-sm-2 control-label">是否BLK:</label>
  34 + <div class="col-sm-8">
  35 + <select class="form-control" id="appType" value="[[appType]]">
  36 + <option value="0">否</option>
  37 + <option value="1">是</option>
  38 + </select>
  39 + </div>
  40 + </div>
  41 + <div class="form-group">
33 <label class="col-sm-2 control-label">分类名称</label> 42 <label class="col-sm-2 control-label">分类名称</label>
34 <div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="{{categoryName}}"></div> 43 <div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="{{categoryName}}"></div>
35 </div> 44 </div>
@@ -37,6 +37,26 @@ @@ -37,6 +37,26 @@
37 <div class="col-sm-8 height40">[[parentName]]</div> 37 <div class="col-sm-8 height40">[[parentName]]</div>
38 </div> 38 </div>
39 <div class="form-group"> 39 <div class="form-group">
  40 + <label class="col-sm-2 control-label">是否BLK:</label>
  41 +
  42 + [[if parentId==0]]
  43 + <div class="col-sm-8">
  44 + <select class="form-control" id="appType" value="[[appType]]">
  45 + <option value="0">否</option>
  46 + <option value="1">是</option>
  47 + </select>
  48 + </div>
  49 + [[/if]]
  50 + [[if parentId>0]]
  51 + <div class="col-sm-8">
  52 + <select class="form-control" id="appType" value="[[appType]]" disabled>
  53 + <option value="0">否</option>
  54 + <option value="1">是</option>
  55 + </select>
  56 + </div>
  57 + [[/if]]
  58 + </div>
  59 + <div class="form-group">
40 <label class="col-sm-2 control-label">分类名称：</label> 60 <label class="col-sm-2 control-label">分类名称：</label>
41 <div class="col-sm-8"> 61 <div class="col-sm-8">
42 <div class="form-inline"> 62 <div class="form-inline">
@@ -87,7 +107,8 @@ @@ -87,7 +107,8 @@
87 <div class="level-hd clearfix"> 107 <div class="level-hd clearfix">
88 <span class="folder"></span> 108 <span class="folder"></span>
89 <span style="width: 5%">ID</span> 109 <span style="width: 5%">ID</span>
90 - <span style="width: 20%">品类名称</span> 110 + <span style="width: 5%">BLK商品</span>
  111 + <span style="width: 15%">品类名称</span>
91 <span>所属分类</span> 112 <span>所属分类</span>
92 <span>分类图标</span> 113 <span>分类图标</span>
93 <span class="orderby">排序</span> 114 <span class="orderby">排序</span>
@@ -199,7 +220,8 @@ @@ -199,7 +220,8 @@
199 <script type="text/template" id="tableTemp2"> 220 <script type="text/template" id="tableTemp2">
200 <span class="folder"></span> 221 <span class="folder"></span>
201 <span style="width: 5%">[[categoryId]]</span> 222 <span style="width: 5%">[[categoryId]]</span>
202 - <span style="width: 20%">[[categoryName]]</span> 223 + <span style="width: 5%">[[if appType=="1"]]是[[/if]][[if appType=="0"]]否[[/if]]</span>
  224 + <span style="width: 15%">[[categoryName]]</span>
203 <span>[[levelNumber]]级分类</span> 225 <span>[[levelNumber]]级分类</span>
204 <span><img src="[[icon]]" alt=""></span> 226 <span><img src="[[icon]]" alt=""></span>
205 <span class="orderby"> <input type="text" class="form-control saleCategoryNumInput" value="[[orderBy]]" categoryId="[[categoryId]]" /></span> 227 <span class="orderby"> <input type="text" class="form-control saleCategoryNumInput" value="[[orderBy]]" categoryId="[[categoryId]]" /></span>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <div class="panel-col"> 23 <div class="panel-col">
24 <select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control"> 24 <select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control">
25 <option value="" selected="">有货状态</option> 25 <option value="" selected="">有货状态</option>
26 - <option value="0">待装修</option> 26 + <option value="1">待装修</option>
27 <option value="100">暂存</option> 27 <option value="100">暂存</option>
28 <option value="200">待审核</option> 28 <option value="200">待审核</option>
29 <option value="300">审核通过</option> 29 <option value="300">审核通过</option>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="panel-col"> 33 <div class="panel-col">
34 <select name="status" id="blkStatus" tabindex="-1" title="" class="form-control"> 34 <select name="status" id="blkStatus" tabindex="-1" title="" class="form-control">
35 <option value="" selected="">BLK状态</option> 35 <option value="" selected="">BLK状态</option>
36 - <option value="0">待装修</option> 36 + <option value="1">待装修</option>
37 <option value="100">暂存</option> 37 <option value="100">暂存</option>
38 <option value="200">待审核</option> 38 <option value="200">待审核</option>
39 <option value="300">审核通过</option> 39 <option value="300">审核通过</option>
@@ -190,8 +190,9 @@ $(document).on('click', '.add-sub-category', function() { @@ -190,8 +190,9 @@ $(document).on('click', '.add-sub-category', function() {
190 data.curParent = res.data.categoryName; 190 data.curParent = res.data.categoryName;
191 data.subCategoryName = res.data.categoryName; 191 data.subCategoryName = res.data.categoryName;
192 data.parentId = res.data.categoryId; 192 data.parentId = res.data.categoryId;
193 - initForm(data);  
194 - 193 + data.sub="sub"; //添加子分类时不允许编辑BLK判断用
  194 + initForm(data);
  195 + console.info(data.parentId);
195 tabTreeArr = []; 196 tabTreeArr = [];
196 tabTree = new common.tabTree(".sortTree", { 197 tabTree = new common.tabTree(".sortTree", {
197 status: 1, 198 status: 1,