fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit 12521242af8e9195f8d317a6692daa9e2a1cfea0 1 parent 082285fb

测试环境端口

Inline Side-by-side
Showing 4 changed files with 15 additions and 21 deletions
@@ -31,7 +31,7 @@ var config = { @@ -31,7 +31,7 @@ var config = {
31 host:'localhost' 31 host:'localhost'
32 }, 32 },
33 apiKey:'sd4H1ecAqlp', 33 apiKey:'sd4H1ecAqlp',
34 - domain:'http://192.168.102.202:8081/platform', 34 + domain:'http://192.168.102.202:8088/platform',
35 logsFile:'/Data/logs/node/yohobuy-portal-log/', 35 logsFile:'/Data/logs/node/yohobuy-portal-log/',
36 loggers: { 36 loggers: {
37 api: { 37 api: {
@@ -248,7 +248,7 @@ exports.res = [ @@ -248,7 +248,7 @@ exports.res = [
248 reqDepartment: "零售运营部/平台运营", 248 reqDepartment: "零售运营部/平台运营",
249 limitTimes: 1, 249 limitTimes: 1,
250 userUseLimit: 1, 250 userUseLimit: 1,
251 - userTypeLimit: '1|2|3|4|5|6' 251 + userTypeLimit: '新注册|注册未购买|普通会员|银卡会员|金卡会员|白金会员'
252 } 252 }
253 }, 253 },
254 src:'/market/limitcode-edit' 254 src:'/market/limitcode-edit'
@@ -280,6 +280,7 @@ exports.res = [ @@ -280,6 +280,7 @@ exports.res = [
280 method: 'GET', 280 method: 'GET',
281 view: 'pages/market/limitcode-info', 281 view: 'pages/market/limitcode-info',
282 url:"/limitCode/getLimitCode", 282 url:"/limitCode/getLimitCode",
  283 + src: "/market/limitcode-info",
283 isJsonRaw: true, 284 isJsonRaw: true,
284 params: [ 285 params: [
285 {name: 'id',type: 'String'} 286 {name: 'id',type: 'String'}
@@ -114,25 +114,25 @@ @@ -114,25 +114,25 @@
114 <label for="name" class="col-sm-2 control-label">会员身份<i class="red">*</i></label> 114 <label for="name" class="col-sm-2 control-label">会员身份<i class="red">*</i></label>
115 <div class="col-sm-10"> 115 <div class="col-sm-10">
116 <label class="checkbox-inline"> 116 <label class="checkbox-inline">
117 - <input type="checkbox" value="1" name="userTypeLimit" > 新注册 117 + <input type="checkbox" value="新注册" name="userTypeLimit" > 新注册
118 </label> 118 </label>
119 <label class="checkbox-inline"> 119 <label class="checkbox-inline">
120 - <input type="checkbox" value="2" name="userTypeLimit"> 注册未购买 120 + <input type="checkbox" value="注册未购买" name="userTypeLimit"> 注册未购买
121 </label> 121 </label>
122 <label class="checkbox-inline"> 122 <label class="checkbox-inline">
123 - <input type="checkbox" value="3" name="userTypeLimit"> 普通会员 123 + <input type="checkbox" value="普通会员" name="userTypeLimit"> 普通会员
124 </label> 124 </label>
125 <label class="checkbox-inline"> 125 <label class="checkbox-inline">
126 - <input type="checkbox" value="4" name="userTypeLimit"> 银卡会员 126 + <input type="checkbox" value="银卡会员" name="userTypeLimit"> 银卡会员
127 </label> 127 </label>
128 <label class="checkbox-inline"> 128 <label class="checkbox-inline">
129 - <input type="checkbox" value="5" name="userTypeLimit"> 金卡会员 129 + <input type="checkbox" value="金卡会员" name="userTypeLimit"> 金卡会员
130 </label> 130 </label>
131 <label class="checkbox-inline"> 131 <label class="checkbox-inline">
132 - <input type="checkbox" value="6" name="userTypeLimit"> 白金会员 132 + <input type="checkbox" value="白金会员" name="userTypeLimit"> 白金会员
133 </label> 133 </label>
134 <label class="checkbox-inline"> 134 <label class="checkbox-inline">
135 - <input type="checkbox" value="7" name="userTypeLimit"> 指定用户 135 + <input type="checkbox" value="指定用户" name="userTypeLimit"> 指定用户
136 </label> 136 </label>
137 </div> 137 </div>
138 138
@@ -17,10 +17,7 @@ @@ -17,10 +17,7 @@
17 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">数量 :</div> 17 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">数量 :</div>
18 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ limitTimes}}</div> 18 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ limitTimes}}</div>
19 </div> 19 </div>
20 - <div class="row show-grid">  
21 - <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">使用次数 :</div>  
22 - <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ userUseLimit}}</div>  
23 - </div> 20 +
24 <div class="row show-grid"> 21 <div class="row show-grid">
25 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">申请部门 :</div> 22 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">申请部门 :</div>
26 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ reqDepartment}}</div> 23 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ reqDepartment}}</div>
@@ -38,6 +35,10 @@ @@ -38,6 +35,10 @@
38 <div id="userUseLimit" class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ userTypeLimit}}</div> 35 <div id="userUseLimit" class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ userTypeLimit}}</div>
39 </div> 36 </div>
40 <div class="row show-grid"> 37 <div class="row show-grid">
  38 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">限用次数 :</div>
  39 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ userUseLimit}}</div>
  40 + </div>
  41 + <div class="row show-grid">
41 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">指定商品 :</div> 42 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">指定商品 :</div>
42 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{limitSkn}}</div> 43 <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{limitSkn}}</div>
43 </div> 44 </div>
@@ -53,11 +54,3 @@ @@ -53,11 +54,3 @@
53 {{/data}} 54 {{/data}}
54 </div> 55 </div>
55 </div> 56 </div>
56 -  
57 -<script type="text/javascript">  
58 - var userUseLimitTip = {1: '新注册', 2: '注册未购买', 3: '普通会员',  
59 - 4: '银卡会员', 5: '金卡会员', 6: '白金会员', 7: '指定用户'},  
60 - userUseLimit = document.getElementById('userUseLimit');  
61 -  
62 - userUseLimit.innerText = userUseLimitTip[userUseLimit.innerHTML];  
63 -</script>