修改样式

src/modules/home/components/OfflinePay.vue

@@ -84,6 +84,10 @@ export default {
       ::v-deep{
         p{
           font-size: .3rem;
+          img{
+            width: 100%;
+            display: block;
+          }
         }
       }
     }

src/modules/home/components/SignForm.vue

@@ -193,20 +193,11 @@ export default {
       // 表单提交company_id
       params.users_info.forEach(item => {
         if (item.company) {
-          console.log(this.$store.state.allSettings.company_map, 'gs')
           const companyData = this.$store.state.allSettings.company_map || JSON.parse(window.localStorage.allSetting).company_map
           const findData = companyData.find(name => name.company_name === item.company)
           if (findData) {
             item.company_id = findData.id
           }
-          // companyData.forEach(it => {
-          //   console.log(item.company, 'it', it.company_name)
-          //   if (item.company === it.company_name) {
-          //     item.company_id = it.id
-          //   } else {
-          //     item.company_id = ''
-          //   }
-          // })
         }
       })
       let flag = false
@@ -303,7 +294,7 @@ export default {
   background-color: #f7f7f7;
 
   .main_content {
-    // padding: 0.21rem 0.3rem 4.13rem 0.3rem;
+    padding: 0.21rem 0.3rem 4.13rem 0.3rem;
     .main_content_banner {
       margin-top: 0.84rem;
       width: 100%;

src/modules/home/views/OrderConfirm.vue

@@ -88,7 +88,9 @@
       </div>
     </div>
     <div v-else>
-      <pay-detail v-if="payMode != 3" @next="$emit('next')" :stepList="stepList" :data="payDetail"></pay-detail>
+      <template v-if="payMode != 3">
+        <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>
   </div>
@@ -112,7 +114,7 @@ export default {
   data() {
     return {
       payMode: '3',
-      isQrPageShow: false,
+      isQrPageShow: this.$route.query.qr || false,
       title: '订单确认',
       isAll: false,
       numVsible: true,
@@ -143,8 +145,13 @@ export default {
         .toFixed(2)
     }
   },
+  created() {
+    if (this.$route.query.qr !== undefined) {
+      this.payDetail = JSON.parse(window.localStorage.payDetail)
+    }
+  },
   mounted() {
-    console.log(this.data, 'data')
+    // console.log(JSON.parse(window.localStorage.stepData), 'data')
     this.payMode = this.data.pay_type[0]
   },
   methods: {
@@ -215,21 +222,27 @@ export default {
     onSubmit() {
       this.getPayDetail()
     },
-    getPayDetail() {
+    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: this.payMode === '1' ? '1' : '11'
+          pay_type: payType
         }
         // 获取支付二维码 订单id
         getPayInfo(params).then(res => {
-          console.log(this.data, 'this.data')
           this.data.payMode = this.payMode
           if (res.code === 0) {
             this.payDetail = Object.assign({ qrData: res.data }, this.data)
             this.payDetail.order_id = res.data.order_id
+            window.localStorage.payDetail = JSON.stringify(this.payDetail)
             this.isQrPageShow = true
           }
           if (res.code === 100) {

src/modules/home/views/PayDetail.vue

@@ -48,7 +48,8 @@ export default {
       time: null,
       detailList: {},
       activity_detail_id: '',
-      lastStepId: ''
+      lastStepId: '',
+      initData: {}
     }
   },
   computed: {

src/modules/home/views/SignMainPage.vue

@@ -60,6 +60,17 @@ export default {
       // return this.stepList[this.$route.query.id ? this.stepIndex : this.stepIndex + 1]
     }
   },
+  // watch: {
+  //   '$route.query': {
+  //     immediate: true,
+  //     handler(query) {
+  //       console.log(query)
+  //       if (query.stepIndex) {
+  //         this.stepIndex = query.stepIndex
+  //       }
+  //     }
+  //   }
+  // },
   mounted() {
     if (this.$route.query.id) {
       this.getActivityDetail()
@@ -101,6 +112,7 @@ export default {
         }
         // console.log(this.userMobile, 'phone')
         // 初始化拿到数据做的第一步处理：取到需要展示出来的所有页面
+        console.log(data.activity, 'data.ac')
         function initInfo(fields) {
           if (fields) {
             // *** 继续报名数 || 第一次进报名，据初始化
@@ -108,7 +120,7 @@ export default {
             sliceData = data.activity.details.slice(index, data.activity.details.length)
             // list 人员信息
             sliceData.map(item => {
-              item.activityInfo = data.activity
+              item.activityInfo = Object.assign({}, data.activity)
               // 判断有没有返回人员 没返回吧自己的信息push进去
               if (data[fields].list.length) {
                 // list有可能不会返回自己的信息，不返回push进去
@@ -136,10 +148,10 @@ export default {
             })
           } else {
             // 重新报名初始化数据
-            sliceData = data.activity.details
+            sliceData = Object.assign({}, data.activity.details)
             sliceData.map(item => {
               item.list = []
-              item.activityInfo = data.activity
+              item.activityInfo = Object.assign({}, data.activity)
               item.list.push(data.info)
               return item
             })
@@ -223,6 +235,9 @@ export default {
         return item
       })
       !this.$route.query.id && this.stepIndex++
+      if (this.$route.query.stepIndex !== undefined) {
+        this.stepIndex = this.$route.query.stepIndex
+      }
     },
     handlePrev() {
       if (this.stepIndex <= 0) {
@@ -237,6 +252,16 @@ export default {
         if (data) {
           this.setpItem.payData = data
         }
+        // const stringData = {
+        //   index: this.stepIndex,
+        //   stepList: this.stepList.map(item => {
+        //     if (item.activityInfo) {
+        //       item.activityInfo.details.map(fi => delete fi.activityInfo)
+        //     }
+        //     return item
+        //   })
+        // }
+        // window.localStorage.stepData = JSON.stringify(stringData)
       }
     }
   }