Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
64f1f09f by simon
Options

默认提交

1 parent 689dd682
Inline Side-by-side
Showing 9 changed files with 92 additions and 17 deletions
...@@ -13,7 +13,7 @@ Component({ ...@@ -13,7 +13,7 @@ Component({
13 }, 13 },
14 innerText: { 14 innerText: {
15 type: String, 15 type: String,
16 value: '', 16 value: '只有通过审核的会员才可参与活动',
17 }, 17 },
18 innerButton: { 18 innerButton: {
19 type: String, 19 type: String,
...@@ -34,7 +34,7 @@ Component({ ...@@ -34,7 +34,7 @@ Component({
34 // 隐藏蒙层 34 // 隐藏蒙层
35 hideMask() { 35 hideMask() {
36 this.triggerEvent('evtcomp', { 36 this.triggerEvent('evtcomp', {
37 name: "_evt_hide_mask" 37 name: "_evt_not_verify"
38 }); 38 });
39 }, 39 },
40 // 点击自定义按钮 40 // 点击自定义按钮
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <view class="cspace"></view> 2 <view class="cspace"></view>
3 <view class="cont"> 3 <view class="cont">
4 <view class="tit"> 4 <view class="tit">
5 <text>只有通过审核的会员才可参与签到</text> 5 <text>{{innerText}}</text>
6 </view> 6 </view>
7 <view class="tips"> 7 <view class="tips">
8 <text></text> 8 <text></text>
......
...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index'); ...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
2 2
3 const APPID = '' 3 const APPID = ''
4 /** ====每次发布版本记得修改此环境配置==== */ 4 /** ====每次发布版本记得修改此环境配置==== */
5 const ENV = 'Prod'; // Dev Prod 5 const ENV = 'Dev'; // Dev Prod
6 const NET_CONFIG = ENV_CONFIG[ENV]; 6 const NET_CONFIG = ENV_CONFIG[ENV];
7 const MOCKAPI = ENV_CONFIG.mockApi; 7 const MOCKAPI = ENV_CONFIG.mockApi;
8 8
......
...@@ -15,6 +15,7 @@ Page({ ...@@ -15,6 +15,7 @@ Page({
15 auctionBidSuccessVisible: false, 15 auctionBidSuccessVisible: false,
16 auctionBidFailVisible: false, 16 auctionBidFailVisible: false,
17 commonTipsCompVisible: false, 17 commonTipsCompVisible: false,
18 signTipsCompVisible: false,
18 innerTitle: "提示", 19 innerTitle: "提示",
19 innerText: "", 20 innerText: "",
20 userInfo: {}, 21 userInfo: {},
...@@ -178,16 +179,16 @@ Page({ ...@@ -178,16 +179,16 @@ Page({
178 // }) 179 // })
179 resolve(); 180 resolve();
180 }).catch((err) => { 181 }).catch((err) => {
181 // clearTimeout(_this.data.navBackTimeout); 182 if (err.code == 1002) {
182 // _this.data.navBackTimeout = setTimeout(() => { 183 _this.setData({
183 // wx.navigateBack({ 184 signTipsCompVisible: true,
184 // delta: 1 185 })
185 // }); 186 } else {
186 // }, 1000);
187 _this.setData({ 187 _this.setData({
188 commonTipsCompVisible: true, 188 commonTipsCompVisible: true,
189 innerText: err.errMsg || "您未达到进入条件" 189 innerText: err.errMsg || "您未达到进入条件"
190 }) 190 })
191 }
191 }); 192 });
192 }) 193 })
193 }, 194 },
...@@ -405,8 +406,23 @@ Page({ ...@@ -405,8 +406,23 @@ Page({
405 auctionBidVisible: false, 406 auctionBidVisible: false,
406 auctionBidSuccessVisible: false, 407 auctionBidSuccessVisible: false,
407 auctionBidFailVisible: false, 408 auctionBidFailVisible: false,
409 commonTipsCompVisible: false,
410 signTipsCompVisible: false,
411 })
412 },
413
414
415
416 /**
417 * 去验证
418 */
419 toVipLoginHandler() {
420 app.router.push({
421 openType: "redirect",
422 path: "vipLogin"
408 }) 423 })
409 }, 424 },
425
410 // 子组件事件 426 // 子组件事件
411 evtcomp(evt) { 427 evtcomp(evt) {
412 let { 428 let {
...@@ -444,11 +460,28 @@ Page({ ...@@ -444,11 +460,28 @@ Page({
444 460
445 // 通用按钮 461 // 通用按钮
446 case "_evt_common_comp_button": 462 case "_evt_common_comp_button":
463 this.hideMask();
447 wx.navigateBack({ 464 wx.navigateBack({
448 delta: 1 465 delta: 1
449 }); 466 });
450 break; 467 break;
451 468
469
470 // 去验证
471 case "_evt_to_verify":
472 this.hideMask();
473 this.toVipLoginHandler();
474 break;
475
476 // 暂不验证
477 case "_evt_not_verify":
478 this.hideMask();
479 wx.navigateBack({
480 delta: 1
481 });
482 break;
483
484
452 default: 485 default:
453 break; 486 break;
454 } 487 }
......
...@@ -99,3 +99,6 @@ ...@@ -99,3 +99,6 @@
99 <van-popup show="{{ commonTipsCompVisible }}"> 99 <van-popup show="{{ commonTipsCompVisible }}">
100 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp> 100 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
101 </van-popup> 101 </van-popup>
102 <van-popup show="{{ signTipsCompVisible }}">
103 <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
104 </van-popup>
......
...@@ -13,6 +13,7 @@ Page({ ...@@ -13,6 +13,7 @@ Page({
13 authorizeVisible: false, 13 authorizeVisible: false,
14 seckillOrderVisible: false, 14 seckillOrderVisible: false,
15 commonTipsCompVisible: false, 15 commonTipsCompVisible: false,
16 signTipsCompVisible: false,
16 innerTitle: "提示", 17 innerTitle: "提示",
17 innerText: "", 18 innerText: "",
18 userInfo: {}, 19 userInfo: {},
...@@ -149,16 +150,17 @@ Page({ ...@@ -149,16 +150,17 @@ Page({
149 console.log("result:", result); 150 console.log("result:", result);
150 resolve(); 151 resolve();
151 }).catch((err) => { 152 }).catch((err) => {
152 // clearTimeout(_this.data.navBackTimeout); 153 if (err.code == 1002) {
153 // _this.data.navBackTimeout = setTimeout(() => { 154 _this.setData({
154 // wx.navigateBack({ 155 signTipsCompVisible: true,
155 // delta: 1 156 })
156 // }); 157 } else {
157 // }, 1000);
158 _this.setData({ 158 _this.setData({
159 commonTipsCompVisible: true, 159 commonTipsCompVisible: true,
160 innerText: err.errMsg || "您未达到进入条件" 160 innerText: err.errMsg || "您未达到进入条件"
161 }) 161 })
162 }
163
162 }); 164 });
163 }) 165 })
164 }, 166 },
...@@ -238,8 +240,22 @@ Page({ ...@@ -238,8 +240,22 @@ Page({
238 this.setData({ 240 this.setData({
239 authorizeVisible: false, 241 authorizeVisible: false,
240 seckillOrderVisible: false, 242 seckillOrderVisible: false,
243 commonTipsCompVisible: false,
244 signTipsCompVisible: false,
245 })
246 },
247
248
249 /**
250 * 去验证
251 */
252 toVipLoginHandler() {
253 app.router.push({
254 openType: "redirect",
255 path: "vipLogin"
241 }) 256 })
242 }, 257 },
258
243 // 子组件事件 259 // 子组件事件
244 evtcomp(evt) { 260 evtcomp(evt) {
245 let { 261 let {
...@@ -270,6 +286,21 @@ Page({ ...@@ -270,6 +286,21 @@ Page({
270 286
271 // 通用按钮 287 // 通用按钮
272 case "_evt_common_comp_button": 288 case "_evt_common_comp_button":
289 this.hideMask();
290 wx.navigateBack({
291 delta: 1
292 });
293 break;
294
295 // 去验证
296 case "_evt_to_verify":
297 this.hideMask();
298 this.toVipLoginHandler();
299 break;
300
301 // 暂不验证
302 case "_evt_not_verify":
303 this.hideMask();
273 wx.navigateBack({ 304 wx.navigateBack({
274 delta: 1 305 delta: 1
275 }); 306 });
......
...@@ -57,3 +57,6 @@ ...@@ -57,3 +57,6 @@
57 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp> 57 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
58 </van-popup> 58 </van-popup>
59 59
60 <van-popup show="{{ signTipsCompVisible }}">
61 <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
62 </van-popup>
......
...@@ -323,6 +323,11 @@ Page({ ...@@ -323,6 +323,11 @@ Page({
323 this.toVipLoginHandler(); 323 this.toVipLoginHandler();
324 break; 324 break;
325 325
326 // 暂不验证
327 case "_evt_not_verify":
328 this.hideMask();
329 break;
330
326 // 隐藏弹窗 331 // 隐藏弹窗
327 case "_evt_hide_mask": 332 case "_evt_hide_mask":
328 this.hideMask(); 333 this.hideMask();
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp> 129 <common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
130 </van-popup> 130 </van-popup>
131 <van-popup show="{{ signTipsCompVisible }}"> 131 <van-popup show="{{ signTipsCompVisible }}">
132 <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp> 132 <sign-tips-comp inner-text="只有通过审核的会员才可参与签到" bind:evtcomp="evtcomp"></sign-tips-comp>
133 </van-popup> 133 </van-popup>
134 <van-popup show="{{ giftSignTipsCompVisible }}"> 134 <van-popup show="{{ giftSignTipsCompVisible }}">
135 <gift-sign-tips-comp bind:evtcomp="evtcomp" prize-info="{{signPrize}}"></gift-sign-tips-comp> 135 <gift-sign-tips-comp bind:evtcomp="evtcomp" prize-info="{{signPrize}}"></gift-sign-tips-comp>
......