Merge branch 'feat' into develop

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-28 16:44:15
+ * @LastEditTime: 2023-02-28 17:33:41
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -361,7 +361,7 @@ export default {
             // 需要区分是要用微信支付还是支付宝花呗支付
             if (this.payType === '2') {
                 this.payProductId =  process.env.NODE_ENV === "production" ? '1629407413618294784' : '1629405716684029952', //支付宝全额支付
-                this.packageIssue = 1;
+                this.packageIssue = 0;
                 this.aliPay(data);
             } else if (this.payType === '3') {
                 this.payProductId =  process.env.NODE_ENV === "production" ? '1629407705558630400': '1629405558344859648', //支付宝花呗支付
@@ -412,6 +412,10 @@ export default {
                         setTimeout(() => {
                             this.wxPay(orderData);
                         }, 1000);
+                    } else if (res.data.code === 104) {
+                        this.$dialog.confirm({
+                            message: `${res.data.message}`
+                        })
                     }
                     let that = this;
                     let wxData = res.data.data;

src/views/pay-result/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 16:47:33
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-26 16:03:53
+ * @LastEditTime: 2023-02-28 18:33:53
  * @FilePath: \TelpoH5FrontendWeb\src\views\pay-result\index.vue
  * @description:
 -->
@@ -25,7 +25,8 @@
             <div class="details">
                 <div class="details-item">
                     <p class="left-text">订单状态</p>
-                    <p>{{isPayStatus ? '支付成功' : '查询失败'}}</p>
+                    <p v-if="isPayStatus">支付成功</p>
+                    <p v-else class="error">查询失败</p>
                 </div>
                 <div class="details-item">
                     <p class="left-text">订单尾号</p>
@@ -355,6 +356,10 @@ export default {
             .left-text {
                 color: gray;
             }
+            .error {
+                color: red;
+                font-size: 24px;
+            }
         }
         .price {
             padding: 20px 0;