update

src/modules/home/views/Index.vue

@@ -204,7 +204,6 @@ export default {
             })
           // 没有需要填写的步骤
         } else if (!this.detailList.other_fill_in.need_fill_in_status) {
-
           if (this.detailList.self_fill_in.need_fill_in_status) {
             this.$router.push({
               path: '/SignMainPage',

src/modules/home/views/OrderConfirm.vue

@@ -69,7 +69,13 @@
         <div class="title">选择支付方式</div>
       </div> -->
       <div class="main_footer" id="main_footer">
-        <van-checkbox v-model="isAll" :disabled="!data.payData.list.filter(item => ['0', '3'].includes(item.pay_record.pay_status)).length" @click="checkAll" class="checkAll">全选</van-checkbox>
+        <van-checkbox
+          v-model="isAll"
+          :disabled="!data.payData.list.filter(item => ['0', '3'].includes(item.pay_record.pay_status)).length"
+          @click="checkAll"
+          class="checkAll"
+          >全选</van-checkbox
+        >
         <div class="main_footer_total">
           <div class="main_footer_total_top"></div>
           <div class="main_footer_total_top">
@@ -89,7 +95,12 @@
     </div>
     <div v-else>
       <template v-if="payMode != 3">
-        <pay-detail v-if="Object.keys(payDetail).length" @next="$emit('next')" :stepList="stepList" :data="payDetail"></pay-detail>
+        <pay-detail
+          v-if="Object.keys(payDetail).length"
+          @next="$emit('next')"
+          :stepList="stepList"
+          :data="payDetail"
+        ></pay-detail>
       </template>
       <offline-pay v-else :stepList="stepList" :data="data"></offline-pay>
     </div>
@@ -140,7 +151,11 @@ export default {
     // 共优惠价格
     totalCompanyPrice() {
       return this.selctOrderData
-        .map(item => Number(this.payPrice) - Number(item.pay_record.pay_amount) < 0 ? 0 : Number(this.payPrice) - Number(item.pay_record.pay_amount))
+        .map(item =>
+          Number(this.payPrice) - Number(item.pay_record.pay_amount) < 0
+            ? 0
+            : Number(this.payPrice) - Number(item.pay_record.pay_amount)
+        )
         .reduce((pre, nex) => (pre += nex), 0)
         .toFixed(2)
     }
@@ -236,19 +251,25 @@ export default {
     onSubmit() {
       this.getPayDetail()
     },
-    getPayDetail() { // let ua = window.navigator.userAgent.toLowerCase()
+    getPayDetail() {
+      // let ua = window.navigator.userAgent.toLowerCase()
       // 选择微信和支付宝支付走这
       if (this.payMode !== '3') {
         // const ua = window.navigator.userAgent.toLowerCase()
         // 写到这了，本地保存了支付还有页面的信息。此信息用于支付回调渲染页面使用
-        let payType = this.payMode === '1' ? '1' : '11'
-        if (/AlipayClient/.test(window.navigator.userAgent)) {
-          payType = '12'
-        }
         const params = {
           pay_record_ids: this.selctOrderData.map(item => item.pay_record.id).toString(),
           join_rand: this.data.payData.join_rand,
-          pay_type: payType
+          pay_type: this.payMode === '1' ? '1' : '11'
+        }
+        if (/AlipayClient/.test(window.navigator.userAgent)) {
+          params.pay_type = '12'
+          const url =
+            window.location.href.indexOf('?') === -1
+              ? `${encodeURIComponent(window.location.href)}?qr=1`
+              : `${encodeURIComponent(window.location.href)}&qr=1`
+          params.redirect_url =
+            window.location.href.indexOf('qr') !== -1 ? encodeURIComponent(window.location.href) : url
         }
         // 获取支付二维码 订单id
         getPayInfo(params).then(res => {
@@ -257,6 +278,10 @@ export default {
             this.payDetail = Object.assign({ qrData: res.data }, this.data)
             this.payDetail.order_id = res.data.order_id
             window.localStorage.payDetail = JSON.stringify(this.payDetail)
+            if (/AlipayClient/.test(window.navigator.userAgent)) {
+              window.localStorage.payUrl = res.data.url
+              window.location.href = res.data.url
+            }
             this.isQrPageShow = true
           }
           if (res.code === 100) {

src/modules/home/views/PayDetail.vue

@@ -2,8 +2,9 @@
   <div class="main">
     <commonheader :title="title" />
     <div class="main_content">
-      <div class="main_content_desc">{{ data.payMode != 1 ? '打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。' : '微信扫码支付' }}</div>
-      <div class="main_content_qdCode">
+      <div class="main_content_desc" v-if="$route.query.qr">{{ data.payMode != 1 ? '支付宝支付' : '微信扫码支付' }}</div>
+      <div class="main_content_desc" v-else>{{ data.payMode != 1 ? '打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。' : '微信扫码支付' }}</div>
+      <div class="main_content_qdCode" v-if="!$route.query.qr">
         <qrcode-vue :value="payDetail.url" size="180" ref="qrcode" />
       </div>
       <div class="main_btn">
@@ -13,6 +14,7 @@
         <van-button round class="main_btn_home" @click="$router.go(0)" v-if="!isLastStep && status == 1"
           >继续报名</van-button
         >
+        <van-button round class="main_btn_order" @click="repayments" v-if="status != 1">重新支付</van-button>
         <van-button round class="main_btn_order" @click="$router.push('/MyOrder')">我的订单</van-button>
       </div>
       <div id="value">{{ payDetail.url }}</div>
@@ -61,6 +63,9 @@ export default {
     }
   },
   methods: {
+    repayments() {
+      window.location.href = window.localStorage.payUrl
+    },
     // 获取二维码
     getQrcodeUrl() {
       this.qrcodeUrl = this.$refs.qrcode.$el

src/modules/home/views/SignMainPage.vue

@@ -72,11 +72,17 @@ export default {
   //   }
   // },
   mounted() {
+    if (this.$route.query.qr === undefined) {
       if (this.$route.query.id) {
         this.getActivityDetail()
       } else {
         this.setData(JSON.parse(window.localStorage.orderStepDetails))
       }
+    } else {
+      const data = JSON.parse(window.localStorage.stepData)
+      this.stepList = data.stepList
+      this.stepIndex = data.index
+    }
   },
   methods: {
     // 获取活动详情