64f1f09f by simon

默认提交

1 parent 689dd682
......@@ -13,7 +13,7 @@ Component({
},
innerText: {
type: String,
value: '',
value: '只有通过审核的会员才可参与活动',
},
innerButton: {
type: String,
......@@ -34,7 +34,7 @@ Component({
// 隐藏蒙层
hideMask() {
this.triggerEvent('evtcomp', {
name: "_evt_hide_mask"
name: "_evt_not_verify"
});
},
// 点击自定义按钮
......
......@@ -2,7 +2,7 @@
<view class="cspace"></view>
<view class="cont">
<view class="tit">
<text>只有通过审核的会员才可参与签到</text>
<text>{{innerText}}</text>
</view>
<view class="tips">
<text></text>
......
......@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
const APPID = ''
/** ====每次发布版本记得修改此环境配置==== */
const ENV = 'Prod'; // Dev Prod
const ENV = 'Dev'; // Dev Prod
const NET_CONFIG = ENV_CONFIG[ENV];
const MOCKAPI = ENV_CONFIG.mockApi;
......
......@@ -15,6 +15,7 @@ Page({
auctionBidSuccessVisible: false,
auctionBidFailVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false,
innerTitle: "提示",
innerText: "",
userInfo: {},
......@@ -178,16 +179,16 @@ Page({
// })
resolve();
}).catch((err) => {
// clearTimeout(_this.data.navBackTimeout);
// _this.data.navBackTimeout = setTimeout(() => {
// wx.navigateBack({
// delta: 1
// });
// }, 1000);
_this.setData({
commonTipsCompVisible: true,
innerText: err.errMsg || "您未达到进入条件"
})
if (err.code == 1002) {
_this.setData({
signTipsCompVisible: true,
})
} else {
_this.setData({
commonTipsCompVisible: true,
innerText: err.errMsg || "您未达到进入条件"
})
}
});
})
},
......@@ -405,8 +406,23 @@ Page({
auctionBidVisible: false,
auctionBidSuccessVisible: false,
auctionBidFailVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false,
})
},
/**
* 去验证
*/
toVipLoginHandler() {
app.router.push({
openType: "redirect",
path: "vipLogin"
})
},
// 子组件事件
evtcomp(evt) {
let {
......@@ -444,11 +460,28 @@ Page({
// 通用按钮
case "_evt_common_comp_button":
this.hideMask();
wx.navigateBack({
delta: 1
});
break;
// 去验证
case "_evt_to_verify":
this.hideMask();
this.toVipLoginHandler();
break;
// 暂不验证
case "_evt_not_verify":
this.hideMask();
wx.navigateBack({
delta: 1
});
break;
default:
break;
}
......
......@@ -99,3 +99,6 @@
<van-popup show="{{ commonTipsCompVisible }}">
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
......
......@@ -13,6 +13,7 @@ Page({
authorizeVisible: false,
seckillOrderVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false,
innerTitle: "提示",
innerText: "",
userInfo: {},
......@@ -149,16 +150,17 @@ Page({
console.log("result:", result);
resolve();
}).catch((err) => {
// clearTimeout(_this.data.navBackTimeout);
// _this.data.navBackTimeout = setTimeout(() => {
// wx.navigateBack({
// delta: 1
// });
// }, 1000);
_this.setData({
commonTipsCompVisible: true,
innerText: err.errMsg || "您未达到进入条件"
})
if (err.code == 1002) {
_this.setData({
signTipsCompVisible: true,
})
} else {
_this.setData({
commonTipsCompVisible: true,
innerText: err.errMsg || "您未达到进入条件"
})
}
});
})
},
......@@ -238,8 +240,22 @@ Page({
this.setData({
authorizeVisible: false,
seckillOrderVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false,
})
},
/**
* 去验证
*/
toVipLoginHandler() {
app.router.push({
openType: "redirect",
path: "vipLogin"
})
},
// 子组件事件
evtcomp(evt) {
let {
......@@ -270,6 +286,21 @@ Page({
// 通用按钮
case "_evt_common_comp_button":
this.hideMask();
wx.navigateBack({
delta: 1
});
break;
// 去验证
case "_evt_to_verify":
this.hideMask();
this.toVipLoginHandler();
break;
// 暂不验证
case "_evt_not_verify":
this.hideMask();
wx.navigateBack({
delta: 1
});
......
......@@ -57,3 +57,6 @@
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
......
......@@ -323,6 +323,11 @@ Page({
this.toVipLoginHandler();
break;
// 暂不验证
case "_evt_not_verify":
this.hideMask();
break;
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
......
......@@ -129,7 +129,7 @@
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
<sign-tips-comp inner-text="只有通过审核的会员才可参与签到" bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
<van-popup show="{{ giftSignTipsCompVisible }}">
<gift-sign-tips-comp bind:evtcomp="evtcomp" prize-info="{{signPrize}}"></gift-sign-tips-comp>
......