tangning 2 vuotta sitten
vanhempi
commit
589b21ec8c
2 muutettua tiedostoa jossa 10 lisäystä ja 12 poistoa
  1. 7 9
      src/views/detail/payment.vue
  2. 3 3
      src/views/home/list.vue

+ 7 - 9
src/views/detail/payment.vue

@@ -20,7 +20,7 @@
 import { ref, onMounted, unref, computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useUserStore } from '/@/store/modules/user';
-
+import { showSuccessToast, showToast } from 'vant'
 import { repairDetails, wechatMobilePay } from '/@/api';
 const router = useRouter();
 const userStore = useUserStore();
@@ -69,14 +69,6 @@ async function onBridgeReady() {
     repairId:id,
     wxPayType:'1',
   });
-  console.log('params',data,'jsapi',{
-      appId: data.appid,//'wx2421b1c4370ec43b', //公众号ID,由商户传入
-      timeStamp: data.timeStamp,//'1395712654', //时间戳,自1970年以来的秒数
-      nonceStr: data.nonce_str,//'e61463f8efa94090b1f366cccfbbb444', //随机串
-      package: `prepay_id=${data.prepay_id}`,
-      signType: data.signType,//'RSA', //微信签名方式:
-      paySign:data.paySign, //微信签名
-    })
   WeixinJSBridge.invoke(
     'getBrandWCPayRequest',
     {
@@ -91,7 +83,13 @@ async function onBridgeReady() {
       if (res.err_msg == 'get_brand_wcpay_request:ok') {
         // 使用以上方式判断前端返回,微信团队郑重提示:
         //res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。
+        showSuccessToast('支付成功');
+      }else{//失败
+        showToast('支付失败');
       }
+      setTimeout(() => {
+        router.go(-1);
+      }, 200);
     },
   );
 }

+ 3 - 3
src/views/home/list.vue

@@ -18,10 +18,10 @@
           <div class="time">报修日期 {{ dayjs(item.createTime).format('YYYY-MM-DD') }}</div>
           <div class="butList">
             <!-- <van-button @click.stop="goRoute(`payment/${item}`)" hairline size="small" type="primary" >支付</van-button> -->
-            <van-button v-if="item.status == 3" @click.stop="goRoute(`payment/${item.repairId}`)" plain hairline size="small">支付</van-button>
-            <van-button v-if="item.status == 9" @click.stop="goRoute(`repair/${item.repairId}`)" plain hairline size="small">待确认</van-button>
+            <van-button v-if="item.status == 3" @click.stop="goRoute(`payment/${item.repairId}`)" plain hairline size="small">待确认</van-button>
+            <van-button v-if="item.status == 9" @click.stop="goRoute(`repair/${item.repairId}`)" plain hairline size="small">支付</van-button>
             <van-button v-if="item.status == 13" @click.stop="goRoute(`evaluate/${item.repairId}`)" plain hairline size="small">评价</van-button>
-            <van-button v-if="item.status == 23" @click.stop="goRoute(`invoice/${item.repairId}`)" plain hairline size="small">申请开票</van-button>
+            <van-button v-if="item.status == 10" @click.stop="goRoute(`invoice/${item.repairId}`)" plain hairline size="small">申请开票</van-button>
           </div>
         </div>
       </div>