diff --git a/README.md b/README.md
index f26bab9..6df813a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
@@ -242,4 +242,5 @@ feature
- 增加 已购买未激活容错页面
- 修复 已购买未激活未跳转容错页面的问题
- 修改 激活界面文字提示
-- 修改 页面支付逻辑,由未激活充值购买变成已激活充值购买
\ No newline at end of file
+- 修改 页面支付逻辑,由未激活充值购买变成已激活充值购买
+- 增加 已购买未激活容错页面
\ No newline at end of file
diff --git a/src/views/card-active/index.vue b/src/views/card-active/index.vue
index e5e15a3..d33a112 100644
--- a/src/views/card-active/index.vue
+++ b/src/views/card-active/index.vue
@@ -35,19 +35,21 @@ export default {
methods: {
onShowDialog() {
// 检测到您已充值、但未激活电话卡。。。。
+ // 您已充值,按确定继续使用
let that = this;
this.$dialog.confirm({
- title: '激活提示',
- message: `检测到您已充值、但未激活电话卡请点击确认前往激活电话卡。`,
+ title: '使用提示',
+ message: `您已充值、按确定继续使用`,
showCancelButton: false
}).then(() => {
- that.$router.replace({
+ /* that.$router.replace({
name: 'activeStatus',
query: {
serialNo: this.$route.query.imei,
iccid: this.$route.query.iccid || '',
}
- })
+ }) */
+ document.location.replace("https://xrpt.jiankangtongxue.cn/WCUParentWebUI.WX/Home/SmartDigitalSsjl");
})
},
// 激活接口
@@ -115,7 +117,7 @@ export default {
})
},
onBackHome() {
- document.location.replace(" https://xrpt.jiankangtongxue.cn/WCUParentWebUI.WX/Home/")
+ document.location.replace("https://xrpt.jiankangtongxue.cn/WCUParentWebUI.WX/Home/SmartDigitalSsjl");
}
}
}
diff --git a/src/views/package-home/index.vue b/src/views/package-home/index.vue
index e6b81c8..1948610 100644
--- a/src/views/package-home/index.vue
+++ b/src/views/package-home/index.vue
@@ -28,10 +28,10 @@ export default {
this.getToken();
this.getAuth();
this.getParams();
- //this.checkImei();
+ this.checkImei();
},
mounted() {
- this.checkBrowser();
+
},
methods: {
checkImei() {
@@ -46,6 +46,7 @@ export default {
this.isRecharge = data.isRecharge;
console.log("是否已经支付", this.isRecharge);
};
+ this.checkBrowser();
}).catch(e => {
console.log("e", e.message);
})
@@ -112,11 +113,11 @@ export default {
getWxCode() {
let params = this.params;
let commonUrl = process.env.VUE_APP_BASE_API;
- let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${params.appId}&iccid=${params.iccid}`);
+ /* let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${params.appId}&iccid=${params.iccid}`);
let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${params.appId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
- window.location.href = url;
+ window.location.href = url; */
// todo 暂时去掉
- /* if(this.isRecharge) {
+ if(this.isRecharge) {
// 如果是已经支付,但未激活,跳转激活界面
this.$router.replace({
name: 'cardActive',
@@ -129,7 +130,7 @@ export default {
let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${params.appId}&iccid=${params.iccid}`);
let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${params.appId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
window.location.href = url;
- } */
+ }
},
// 获取url传过来的参数