优化小程序代码

pages.json

@@ -199,7 +199,7 @@
 			{
 				"name": "单页面",
 				//模式名称
-				"path": "pages/user/index",
+				"path": "pages/user/award",
 				//启动页面，必选
 				"query": "tab=exhibitor"
 				//启动参数，在页面的onLoad函数里面得到

pages/checkIn/checkInRoute.vue

@@ -61,7 +61,8 @@
                   </view>
                 </view>
                 <view class="progress">
-                  <view class="text">打卡已完成{{ getProcess(route.exhibitors, false) }}</view>
+                  <view class="text" v-if="getProcess(route.exhibitors,true)">打卡已完成{{ getProcess(route.exhibitors, false) }}</view>
+                  <view class="text disable_text" v-else>未开始{{ getProcess(route.exhibitors, false) }}</view>
                   <view class="inner">
                     <view :style="{width:getProcess(route.exhibitors,true)*100+'%'}" class="inner-process">
                       <view class="text" :style="{width:'calc(100% / '+getProcess(route.exhibitors,true)+')'}">
@@ -144,7 +145,7 @@ export default {
     return {
       scrollIntoViewId: '',
       scene: '',
-      activeNames: [],
+      activeNames: [0],
       mapShow: false,
       mapUrl: '',
       current_page: true,
@@ -598,7 +599,7 @@ export default {
       .item-head {
         .route-name {
           position: absolute;
-          left: 50rpx;
+          left: 30rpx;
           top: -16rpx;
           color: white;
           border: solid 6rpx white;
@@ -677,6 +678,10 @@ export default {
             font-size: 20rpx;
             line-height: 36rpx;
             text-align: center;
+            /*&.disable_text {
+              text-align: left;
+              left: 24rpx;
+            }*/
           }
         }
       }

pages/checkIn/index.vue

@@ -112,7 +112,7 @@ export default {
     },
     gotoPrizes() {
       uni.navigateTo({
-        url: '/pages/checkIn/myPrizes'
+        url: '/pages/user/award'
       })
     }
   },

pages/user/award.vue

@@ -178,7 +178,7 @@ export default {
     		  	subList.unshift(this.giftList[i].route_count - this.giftList[i-1].route_count)
     		  }
     		  subList.unshift(this.giftList[0].route_count)
-    		  
+
     		  let process = 0
     		  let count = this.checked
     		  let per_process = 100/this.giftList.length
@@ -257,15 +257,19 @@ export default {
           success: (res) => {
             if (res.confirm) {
               this.current_gift = item
+              console.log(item)
               claim({
                 gift_id: item.id,
               }).then(res => {
-                if (item.route_count === 9) {
-                  this.pop_up = true
-                } else {
-                  this.qr_code = res.data.qrcode_url
-                  this.show_qr = true
-                  this.checkGiftState()
+                console.log(res,'rrrrrrrrr')
+                if(res.code === 0) {
+                  if (item.route_count === 9) {
+                    this.pop_up = true
+                  } else {
+                    this.qr_code = res.data.qrcode_url
+                    this.show_qr = true
+                    this.checkGiftState()
+                  }
                 }
               })
             }