fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit ee05d827174c5489d475485241eff10b14d84044 1 parent be7f1372

店铺添加BLK类型

Inline Side-by-side
Showing 7 changed files with 42 additions and 6 deletions
@@ -17,7 +17,8 @@ module.exports={ @@ -17,7 +17,8 @@ module.exports={
17 {name:"otherUrl",type:"String"}, 17 {name:"otherUrl",type:"String"},
18 {name:"shopAddress",type:"String"}, 18 {name:"shopAddress",type:"String"},
19 {name:"onCheck",type:"Number"}, 19 {name:"onCheck",type:"Number"},
20 - {name:"shopRelation",type:"String"} 20 + {name:"shopRelation",type:"String"},
  21 + {name:"appType",type:"Number"}
21 ] 22 ]
22 }, 23 },
23 24
@@ -14,7 +14,8 @@ module.exports={ @@ -14,7 +14,8 @@ module.exports={
14 {name: 'vipStatus', type: 'Number'}, 14 {name: 'vipStatus', type: 'Number'},
15 {name: 'vipFlag', type: 'String'}, 15 {name: 'vipFlag', type: 'String'},
16 {name: 'size', type: 'Number'}, 16 {name: 'size', type: 'Number'},
17 - {name: 'page', type: 'Number'} 17 + {name: 'page', type: 'Number'},
  18 + {name:"appType",type:"Number"}
18 ] 19 ]
19 }, 20 },
20 21
@@ -34,7 +35,8 @@ module.exports={ @@ -34,7 +35,8 @@ module.exports={
34 {name:"shopLogo",type:"String"}, 35 {name:"shopLogo",type:"String"},
35 {name:"shopIntro",type:"String"}, 36 {name:"shopIntro",type:"String"},
36 {name:"onCheck",type:"Number"}, 37 {name:"onCheck",type:"Number"},
37 - {name:"shopRelation",type:"String"} 38 + {name:"shopRelation",type:"String"},
  39 + {name:"appType",type:"Number"}
38 ] 40 ]
39 }, 41 },
40 42
@@ -48,6 +48,18 @@ @@ -48,6 +48,18 @@
48 </div> 48 </div>
49 <div class="form-group"> 49 <div class="form-group">
50 <div class="col-sm-1 control-label"> 50 <div class="col-sm-1 control-label">
  51 + <label>是否BLK店铺:<span class="red">*</span></label>
  52 + </div>
  53 + <div class="col-sm-8">
  54 + <label class="radio-inline">
  55 + <input type="radio" name="appType" value="1"/>是</label>
  56 + <label class="radio-inline">
  57 + <input type="radio" name="appType" value="0"/>否</label>
  58 + </div>
  59 + <input type="hidden" id="appType" value="<%data.appType%>" for="radio" required>
  60 + </div>
  61 + <div class="form-group">
  62 + <div class="col-sm-1 control-label">
51 <label>官方网址:</label> 63 <label>官方网址:</label>
52 </div> 64 </div>
53 <div class="col-sm-9"> 65 <div class="col-sm-9">
@@ -52,6 +52,13 @@ @@ -52,6 +52,13 @@
52 </select> 52 </select>
53 </div> 53 </div>
54 <div class="panel-col2"> 54 <div class="panel-col2">
  55 + <select name="appType" id="appType" style="width: 280px;" tabindex="-1" title="" class="form-control">
  56 + <option value="" selected="">是否BLK店铺</option>
  57 + <option value="1">是</option>
  58 + <option value="0">否</option>
  59 + </select>
  60 + </div>
  61 + <div class="panel-col2">
55 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> 62 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
56 <a id="all-btn" href="" class="btn btn-info">全部</a> 63 <a id="all-btn" href="" class="btn btn-info">全部</a>
57 </div> 64 </div>
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
22 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.shopDomain%></div> 22 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.shopDomain%></div>
23 </div> 23 </div>
24 <div class="row show-grid"> 24 <div class="row show-grid">
  25 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">是否BLK店铺：</div>
  26 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
  27 + <input id="appType" type="hidden" value="<%data.appType%>">
  28 + </div>
  29 + </div>
  30 + <div class="row show-grid">
25 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div> 31 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div>
26 <div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8"> 32 <div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
27 <input id="otherUrl" type="hidden" value="<%data.otherUrl%>"> 33 <input id="otherUrl" type="hidden" value="<%data.otherUrl%>">
@@ -4,7 +4,8 @@ var $ = require('jquery'), @@ -4,7 +4,8 @@ var $ = require('jquery'),
4 common=require('../../common/common'); 4 common=require('../../common/common');
5 5
6 var ENUM={// 审核状态；100 暂存 200 待审核 300 审核通过 900 驳回 6 var ENUM={// 审核状态；100 暂存 200 待审核 300 审核通过 900 驳回
7 - status:{100:'暂存',200:'审核中',300:'通过',900:'驳回'} 7 + status : {100:'暂存',200:'审核中',300:'通过',900:'驳回'},
  8 + appType : {1:'是', 0 : '否'}
8 }; 9 };
9 10
10 //basicTab 11 //basicTab
@@ -82,7 +83,8 @@ var g = new common.grid({ @@ -82,7 +83,8 @@ var g = new common.grid({
82 "operationStatus": authority.operationStatus, 83 "operationStatus": authority.operationStatus,
83 "checkStatusArr": authority.checkStatusArr, 84 "checkStatusArr": authority.checkStatusArr,
84 "blkCheckStatus": 200, 85 "blkCheckStatus": 200,
85 - "shopsId": common.util.__input("shop-name") 86 + "shopsId": common.util.__input("shop-name"),
  87 + "appType": common.util.__input("appType")
86 }; 88 };
87 }, 89 },
88 columns: [ 90 columns: [
@@ -104,6 +106,11 @@ var g = new common.grid({ @@ -104,6 +106,11 @@ var g = new common.grid({
104 }, 106 },
105 {display: "创建时间", name: "createTime"}, 107 {display: "创建时间", name: "createTime"},
106 {display: "更新时间", name: "updateTime"}, 108 {display: "更新时间", name: "updateTime"},
  109 + {display: "是否BLK", name: "appType", render: function (item)
  110 + {
  111 + return ENUM.appType[item.appType];
  112 + }
  113 + },
107 { 114 {
108 display: "状态", name: "checkStatus", render: function (item) { 115 display: "状态", name: "checkStatus", render: function (item) {
109 var status = ''; 116 var status = '';
@@ -13,7 +13,8 @@ var ENUM={ @@ -13,7 +13,8 @@ var ENUM={
13 shopsType:{1:'单品店',2:'多品店'}, 13 shopsType:{1:'单品店',2:'多品店'},
14 checkStatus:{100:'暂存',200:'审核中',300:'通过',900:'驳回'}, 14 checkStatus:{100:'暂存',200:'审核中',300:'通过',900:'驳回'},
15 opt:{"add":"添加","delete":"删除"}, 15 opt:{"add":"添加","delete":"删除"},
16 - href:{"info":"/supplier/store/index","info2":"/supplier/check/index","info3":"/supplier/store/examine"} 16 + href:{"info":"/supplier/store/index","info2":"/supplier/check/index","info3":"/supplier/store/examine"},
  17 + appType:{1:'是',0:'否'}
17 }; 18 };
18 19
19 var Bll={ 20 var Bll={