Merge branch 'feat' into develop

README.md

@@ -187,4 +187,9 @@ feature
 ## v1.0.19
 `2023.2.25`
 fix
-- 修复 路由切换页面不刷新的问题
+- 修复 路由切换页面不刷新的问题
+
+## v1.0.20
+`2023.2.25`
+fix
+- 修复 调起微信支付异常的问题

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \AntpayFrontEnd\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.19F'; //版本号
+export const VERSION_MODEL = '1.0.20F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/router/index.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2022-01-19 10:08:26
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-25 15:56:31
+ * @LastEditTime: 2023-02-25 16:33:59
  * @FilePath: \TelpoH5FrontendWeb\src\router\index.js
  * @description:
  */
@@ -26,11 +26,11 @@ const router = new VueRouter({
   routes,
 });
 router.beforeEach((to, form, next) => {
-    Nprogress.start();
+    /* Nprogress.start(); */
     next();
 });
 router.afterEach(() => {
-    Nprogress.done();
+    /* Nprogress.done(); */
 });
 
 export default router;

src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div @click="onClick">测试</div>
+    <div></div>
 </template>
 
 <script>

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-25 15:52:29
+ * @LastEditTime: 2023-02-25 16:31:31
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -269,7 +269,7 @@ export default {
                     that.outTradeNo = wxData.out_trade_no;
                     console.log("wxData", wxData);
                     // 本地测试
-                    that.$router.push({
+                    /* that.$router.push({
                         name: "payResult",
                         query: {
                             outTradeNo: that.outTradeNo,
@@ -281,7 +281,7 @@ export default {
                             routerName: this.params.routerName,
                             issue: data.packageIssue
                         }
-                    });
+                    }); */
                     wx.chooseWXPay({
                         timestamp: wxData.timeStamp, // 支付签名时间戳，注意微信 jssdk 中的所有使用 timestamp 字段均为小写。但最新版的支付后台生成签名使用的 timeStamp 字段名需大写其中的 S 字符
                         nonceStr: wxData.nonceStr, // 支付签名随机串，不长于 32 位
@@ -306,14 +306,14 @@ export default {
                         },
                         fail: err => {
                             console.log("支付出错了::", err);
-                            this.$dialog.confirm({
+                            that.$dialog.confirm({
                                 title: "支付失败",
                                 message: "出错了，请您重新进入"
                             });
                         },
                         cancel: function(err) {
                             // 用户取消支付
-                            this.$dialog.confirm({
+                            that.$dialog.confirm({
                                 message: "您取消了支付"
                             });
                             console.log("用户取消了支付::", err);

src/views/pay-result/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 16:47:33
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-25 16:02:53
+ * @LastEditTime: 2023-02-25 16:30:36
  * @FilePath: \TelpoH5FrontendWeb\src\views\pay-result\index.vue
  * @description:
 -->
@@ -41,7 +41,7 @@
                 <!-- <div class="back-btn" @click="onNavBack" v-show="!isPayStatus">
                     <p>返回重新选择套餐购买</p>
                 </div> -->
-                <div class="back-btn" @click="onNext" v-show="!isPayStatus">
+                <div class="back-btn" @click="onNext" v-show="isPayStatus">
                     <p>激活电话卡</p>
                 </div>
             </div>