From ed42e3cde837083af1516cc87a2ff09890311b10 Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Thu, 2 Mar 2023 01:31:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20=E5=B7=B2=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E6=9C=AA=E6=BF=80=E6=B4=BB=E5=AE=B9=E9=94=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/package-home/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/package-home/index.vue b/src/views/package-home/index.vue
index 1948610..2510fec 100644
--- a/src/views/package-home/index.vue
+++ b/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("当前浏览器内核并非支付宝或者微信");
             }
         },

From 26251069574f22df524b0465c4bbc7df70f01010 Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Thu, 2 Mar 2023 01:46:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=AD=A5=E6=95=B0?=
 =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay-result/index.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/pay-result/index.vue b/src/views/pay-result/index.vue
index 2e0ab62..2a6196a 100644
--- a/src/views/pay-result/index.vue
+++ b/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();