diff --git a/README.md b/README.md index 852c9da..f26bab9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -241,4 +241,5 @@ update feature - 增加 已购买未激活容错页面 - 修复 已购买未激活未跳转容错页面的问题 -- 修改 激活界面文字提示 \ No newline at end of file +- 修改 激活界面文字提示 +- 修改 页面支付逻辑,由未激活充值购买变成已激活充值购买 \ No newline at end of file diff --git a/src/views/package-home/index.vue b/src/views/package-home/index.vue index 814af95..e6b81c8 100644 --- a/src/views/package-home/index.vue +++ b/src/views/package-home/index.vue @@ -1,7 +1,7 @@ @@ -28,10 +28,10 @@ export default { this.getToken(); this.getAuth(); this.getParams(); - this.checkImei(); + //this.checkImei(); }, mounted() { - //this.checkBrowser(); + this.checkBrowser(); }, methods: { checkImei() { @@ -46,7 +46,6 @@ export default { this.isRecharge = data.isRecharge; console.log("是否已经支付", this.isRecharge); }; - this.checkBrowser(); }).catch(e => { console.log("e", e.message); }) @@ -76,7 +75,7 @@ export default { this.getWxCode(); } } else { - /* this.getWxCode(); */ + //this.getWxCode(); console.log("当前浏览器内核并非支付宝或者微信"); } }, @@ -113,7 +112,11 @@ export default { getWxCode() { let params = this.params; let commonUrl = process.env.VUE_APP_BASE_API; - if(this.isRecharge) { + 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; + // todo 暂时去掉 + /* if(this.isRecharge) { // 如果是已经支付,但未激活,跳转激活界面 this.$router.replace({ name: 'cardActive', @@ -126,7 +129,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传过来的参数 diff --git a/src/views/package-list/index.vue b/src/views/package-list/index.vue index 01f8d19..397b3b5 100644 --- a/src/views/package-list/index.vue +++ b/src/views/package-list/index.vue @@ -1,7 +1,7 @@ @@ -45,7 +45,7 @@
- 低至 + ¥{{(item.packagePrice/(item.packageIssue === 0 ? 1: item.packageIssue)).toFixed(0)}}元/月,
@@ -59,7 +59,7 @@
可切换支付方式:
+支付方式:
第二步:去使用功能