Merge branch 'feat' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-01 18:28:19
+ * @LastEditTime: 2023-03-02 00:24:48
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -241,4 +241,5 @@ update
 feature
 - 增加 已购买未激活容错页面
 - 修复 已购买未激活未跳转容错页面的问题
-- 修改 激活界面文字提示
+- 修改 激活界面文字提示
+- 修改 页面支付逻辑，由未激活充值购买变成已激活充值购买

src/views/package-home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 14:18:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-01 17:50:46
+ * @LastEditTime: 2023-03-02 00:20:21
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
  * @description:
 -->
@@ -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传过来的参数

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-01 17:51:58
+ * @LastEditTime: 2023-03-02 00:31:50
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -45,7 +45,7 @@
                         </div>
                         <div class="details">
                             <p>
-                                低至
+
                                 <span class="orange large">￥{{(item.packagePrice/(item.packageIssue === 0 ? 1: item.packageIssue)).toFixed(0)}}</span>元/月，
                             </p>
                             <p class="total">
@@ -59,7 +59,7 @@
                         </div>
                         <div class="radios-con">
                             <div class="pay-type">
-                                <p>可切换支付方式：</p>
+                                <p>支付方式：</p>
                             </div>
                             <van-radio-group v-model="radio" direction="horizontal"  @change="onRaidoChange">
                                 <van-radio name="1">
@@ -81,7 +81,7 @@
                                 <van-radio name="3">
                                     <template #default>
                                         <div class="radio-con">
-                                            <span>花呗</span>
+                                            <span>12期花呗</span>
                                             <img src="../../assets/antpay.png"/>
                                         </div>
                                     </template>
@@ -106,11 +106,11 @@ export default {
     name: "packageList",
     data() {
         return {
-            topupTitle: "请选择套餐充值激活电话卡", //充值页面标题
+            topupTitle: "请选择套餐充值电话卡", //充值页面标题
             // 套餐列表， todo 需要从接口获取
             packageOrderList: [
                 {
-                    packageName: '移动语音卡套餐(1年)',
+                    packageName: '语音卡套餐(1年)',
                     packagePayType: 1,
                     packagePrice: 240,
                     packageIssue: 12,

src/views/pay-result/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 16:47:33
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-01 15:56:15
+ * @LastEditTime: 2023-03-02 00:33:35
  * @FilePath: \TelpoH5FrontendWeb\src\views\pay-result\index.vue
  * @description:
 -->
@@ -42,11 +42,11 @@
                 <!-- <div class="back-btn" @click="onNavBack" v-show="!payStatus">
                     <p>返回重新选择套餐购买</p>
                 </div> -->
-                <div class="back-btn" @click="onNext" v-show="payStatus">
+                <!-- <div class="back-btn" @click="onNext" v-show="payStatus">
                     <p>激活电话卡</p>
-                </div>
-                <div class="back-btn" @click="onBackHome" v-show="!payStatus">
-                    <p>返回首页</p>
+                </div> -->
+                <div class="back-btn" @click="onBackHome">
+                    <p>第二步：去使用功能</p>
                 </div>
             </div>
         </div>