yanj 1 месяц назад
Родитель
Сommit
8f9f333f19
2 измененных файлов с 11 добавлено и 5 удалено
  1. 1 1
      pages/checkIn/checkInRoute.vue
  2. 10 4
      pages/user/award.vue

+ 1 - 1
pages/checkIn/checkInRoute.vue

@@ -115,7 +115,7 @@
     </scroll-view>
     <van-overlay :show="mapShow">
       <view class="overlay_wrapper">
-        <image :src="mapUrl" style="width: 90%;" mode="widthFix"></image>
+        <image draggable :src="mapUrl" style="width: 90%;" mode="widthFix"></image>
         <view class="iconfont icon-Cancel-copy" @click="hideOverlay"></view>
       </view>
     </van-overlay>

+ 10 - 4
pages/user/award.vue

@@ -151,9 +151,7 @@ export default {
       show_qr: false,
       qr_code: '',
       check_finish: false,
-      current_gift: {
-
-      },
+      current_gift: {},
       timer: null,
       rule: '',
       rule_title: '',
@@ -269,7 +267,8 @@ export default {
       }).then(res => {
         if (res.code === 0) {
           this.qr_code = res.data.qrcode_url
-          if(res.data.verify_note) {
+          this.is_receipts = 1
+          if (res.data.verify_note) {
             this.verify_note.company_name = res.data.verify_note.company_name
             this.verify_note.verify_name = res.data.verify_note.verify_name
             this.verify_note.verify_phone = res.data.verify_note.verify_phone
@@ -279,6 +278,12 @@ export default {
           if (this.current_gift.route_count === 9) {
             //轮询确认核销后,展示抽奖环节
             this.pop_up = true
+          } else {
+            this.show_qr = true
+            this.checkGiftState(() => {
+              this.getGiftListEvent()
+              this.getCheckinCount()
+            })
           }
 
         }
@@ -618,6 +623,7 @@ export default {
         border-radius: 50rpx;
         font-size: 24rpx;
         color: #ffffff;
+
         &.disabled {
           background: #94A3B8;
         }