updata

src/components/upload/Upload.vue

@@ -25,6 +25,7 @@
       :before-upload="beforeUpload"
       :on-success="handleSuccess"
       :on-exceed="handleExceed"
+      :on-remove="handleRemove"
       list-type="picture-card"
       :data="data"
       v-bind="$attrs"

src/modules/home/components/OfflinePay.vue

 <template>
   <div class="offline-box">
-    <div class="call" v-if="data.offline_info">活动方联系方式：{{ data.offline_info }}</div>
+    <div class="call" v-if="data.offline_info">线下支付联系方式：{{ data.offline_info }}</div>
     <div class="remarks">
       <div class="title">备注信息：</div>
       <div class="textarea-content">
@@ -44,6 +44,7 @@ export default {
   },
   methods: {
     input(imgs) {
+      console.log(imgs, 'imgs')
       this.form.voucher = imgs
     },
     uploadPay() {
@@ -51,6 +52,7 @@ export default {
         voucher: this.form.voucher.join(','),
         comment: this.form.comment
       }
+      console.log(params, 'par')
       uploadPay(Object.assign(this.data.params, params)).then(res => {
         if (this.stepList.length !== this.data.num) {
           this.$router.go(0)

src/modules/home/views/Index.vue

@@ -205,10 +205,9 @@ export default {
           }
         }
       } else if (time >= endTime) {
-        console.log('444')
-        Toast(`该活动已于${item.end_time}结束报名`)
+        Toast(`该活动将于${item.end_time}结束报名`)
       } else if (time < startTime) {
-        Toast(`该活动已于${item.start_time}开始报名`)
+        Toast(`该活动将于${item.start_time}开始报名`)
       }
     }
   },

src/modules/home/views/MyOrder.vue

@@ -87,7 +87,6 @@ export default {
           const listItem = item.list[0]
           if (listItem) {
             const findItem = item.activity.details.find(i => i.id === listItem.pay_record.activity_detail_id)
-            console.log(findItem, 'list')
             item.activity.name = `${item.activity.name}-${findItem.title}`
           }
           return item
@@ -117,7 +116,8 @@ export default {
       delete item.activity.details
       stepDetails.activityInfo = item.activity
       stepDetails.join_rand = item.join_rand
-      stepDetails.pay_price = item.amount
+      stepDetails.pay_price = item.list[0].pay_record.pay_amount
+      console.log(item)
       window.localStorage.orderStepDetails = JSON.stringify([stepDetails])
       this.$router.push({
         path: '/SignMainPage'

src/modules/home/views/OrderConfirm.vue

@@ -31,7 +31,7 @@
                   <span class="price">¥</span>
                   <span class="price_num" v-html="getPayPrice()"></span>
                 </div>
-                <div class="card_fotter_left card_fotter_right">
+                <div class="card_fotter_left card_fotter_right" v-if="data.can_company">
                   <span class="price">单位已优惠</span>
                   <span class="price">¥</span>
                   <span class="price_num" v-html="getCompanyPrice(item)"></span>
@@ -77,7 +77,7 @@
             <div class="total_sign">¥</div>
             <div class="price" v-html="getTotalPrice()"></div>
           </div>
-          <div class="main_footer_total_bottom">
+          <div class="main_footer_total_bottom" v-if="data.can_company">
             <div class="company_yh">共优惠</div>
             <div class="company_sign">¥</div>
             <div class="company_yh" v-html="totalCompanyPrice"></div>
@@ -144,7 +144,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.data.pay_type[0], '000')
+    console.log(this.data.payData, '000')
     this.payMode = this.data.pay_type[0]
   },
   methods: {
@@ -172,6 +172,7 @@ export default {
     // 实付价样式
     getPayPrice() {
       const splitPrice = this.payPrice.toString().split('.')
+      console.log(this.payPrice, '123')
       // //2.重新赋值
       return `<span style="font-size:0.34rem;">${splitPrice[0]}</span>.<span style="font-size:0.2rem;">${splitPrice[1]}</span>`
     },
@@ -230,6 +231,7 @@ export default {
         // 获取支付二维码 订单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

src/modules/home/views/PayDetail.vue

@@ -2,7 +2,7 @@
   <div class="main">
     <commonheader :title="title" />
     <div class="main_content">
-      <div class="main_content_desc">打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。</div>
+      <div class="main_content_desc">{{ data.payMode != 1 ? '打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。' : '微信扫码支付' }}</div>
       <div class="main_content_qdCode">
         <qrcode-vue :value="payDetail.url" size="180" ref="qrcode" />
       </div>

src/modules/home/views/SignMainPage.vue

@@ -79,14 +79,14 @@ export default {
         if (startTime > time || endTime < time) {
           Dialog.alert({
             title: '提示',
-            message: `该活动已于${data.activity.start_time}开始报名`
+            message: `该活动将于${data.activity.start_time}开始报名`
           }).then(() => {
             this.$router.push('/')
           })
         } else if (endTime < time) {
           Dialog.alert({
             title: '提示',
-            message: `该活动已于${data.activity.end_time}结束报名`
+            message: `该活动将于${data.activity.end_time}结束报名`
           }).then(() => {
             this.$router.push('/')
           })
@@ -197,6 +197,7 @@ export default {
               num: b.num,
               offline_info: b.offline_info,
               pay_type: b.pay_type.split(',')
+              // pay_price: b.pay_price
             }
             // 开启支付成功跳转的功能
             if (b.can_jump) {
@@ -209,7 +210,6 @@ export default {
       }, [])
       this.stepList.map((item, index) => {
         item.num = index + 1
-        console.log(data, 'dddd')
         if (!this.$route.query.id) {
           if (item.type === 3) {
             item.payData = {
@@ -222,7 +222,6 @@ export default {
         return item
       })
       !this.$route.query.id && this.stepIndex++
-      console.log(this.stepList, 'steplist')
     },
     handlePrev() {
       if (this.stepIndex <= 0) {
@@ -235,7 +234,6 @@ export default {
       if (this.setpItem.num !== this.stepList[this.stepList.length - 1].num) {
         this.stepIndex++
         if (data) {
-          console.log(data, 'data')
           this.setpItem.payData = data
         }
       }