Merge branch 'develop' into test

src/views/package-home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 14:18:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-02 00:20:21
+ * @LastEditTime: 2023-03-02 01:30:58
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
  * @description:
 -->
@@ -71,12 +71,13 @@ export default {
                     if (isNotNull(code)) {
                         this.$store.commit("wxAuthCode", code);
                         /* this.getOpenId(); */
+                        this.getWxCode();
                     }
                 } else {
                     this.getWxCode();
                 }
             } else {
-                //this.getWxCode();
+                this.getWxCode();
                 console.log("当前浏览器内核并非支付宝或者微信");
             }
         },

src/views/pay-result/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 16:47:33
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-02 00:52:22
+ * @LastEditTime: 2023-03-02 01:44:33
  * @FilePath: \TelpoH5FrontendWeb\src\views\pay-result\index.vue
  * @description:
 -->
@@ -46,7 +46,7 @@
                     <p>激活电话卡</p>
                 </div> -->
                 <div class="back-btn" @click="onBackHome">
-                    <p>第二步：去使用功能</p>
+                    <p>第{{isAliPay ? '三' : '二'}}步：去使用功能</p>
                 </div>
             </div>
         </div>
@@ -73,13 +73,18 @@ export default {
             payStatus: null, //支付状态
             price: this.$route.query.price, //价格
             outTradeNo: this.$route.query.outTradeNo, //支付订单号
-            isIos: null //是否是ios
+            isIos: null, //是否是ios,
         };
     },
     created() {
         this.checkParams();
         this.closeTime();
     },
+    computed: {
+        isAliPay() {
+            return this.$route.query.rechargeUrl !==''  && this.$route.query.alipayForm !== ''
+        }
+    },
     mounted() {
         //this.checkParams();
         //this.closeTime();