taocan

 <!--components/2.0/taocan/card.wxml-->
 <!--components/2.0/taocan/card.wxml-->
+<navigator url="/pages/taocan/index?sid={{detail.sid}}&pid={{detail.id}}" hover-class="navigator-hover">
 <view class="view flex margin-bottom-lg card">
 <view class="view flex margin-bottom-lg card">
     <view class="view thumb" style="background-image: url('{{detail.main_url}}?imageView2/2/w/320')"></view>
     <view class="view thumb" style="background-image: url('{{detail.main_url}}?imageView2/2/w/320')"></view>
     <view class="view margin-left">
     <view class="view margin-left">
@@ -21,7 +22,6 @@
             <view class="view margin-left-xs txt-24-h">{{(detail.discount*10)}}折</view>
             <view class="view margin-left-xs txt-24-h">{{(detail.discount*10)}}折</view>
         </view>
         </view>
     </view>
     </view>
-    <navigator url="/pages/taocan/index?sid={{detail.sid}}&pid={{detail.id}}" hover-class="navigator-hover">
-        <view class="button bg-blue-blue txt-28-h text-bold flex align-center justify-center">抢购</view>
-    </navigator>
+    <view class="button bg-blue-blue txt-28-h text-bold flex align-center justify-center">抢购</view>
 </view>
 </view>
+</navigator>

@@ -28,6 +28,13 @@ Page({
         r.sid=this.data.sid
         r.sid=this.data.sid
         packs[r.id]=r
         packs[r.id]=r
       })
       })
+      do{
+        packs[Math.random()]={}
+      }while(Object.keys(packs).length<3)
+      if(!packs[this.activityId]){
+        util.toast('套餐已下架','none')
+        this.activityId=res.data[0].id
+      }
       this.setData({
       this.setData({
         packs:packs,
         packs:packs,
         activityId:this.activityId,
         activityId:this.activityId,
@@ -95,10 +102,12 @@ Page({
     }else{
     }else{
       current=index>0?(index-1):0
       current=index>0?(index-1):0
     }
     }
-    return current
+    return current>0?current:0
   },
   },
   touchTab(e){
   touchTab(e){
-    this.activityId=util.attr(e,'id')
+    let activityId=util.attr(e,'id')
+    if(!activityId) return;
+    this.activityId=activityId
     let obj={
     let obj={
       activityId:this.activityId,
       activityId:this.activityId,
     }
     }

 {
 {
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
   "usingComponents": {
   "usingComponents": {
     "nav":"/components/nav/nav"
     "nav":"/components/nav/nav"
   }
   }

@@ -87,7 +87,7 @@ Page({
       ufid: this.options.id,
       ufid: this.options.id,
     }).then(async res=>{
     }).then(async res=>{
       let qrcode=''
       let qrcode=''
-      if(true || res.data.order_info.status==2){
+      if(res.data.order_info.status==2){
         qrcode=util.http_build_query({
         qrcode=util.http_build_query({
           path:'pages/writeoff/setmeal',
           path:'pages/writeoff/setmeal',
           //path:'pages/me/s_index',
           //path:'pages/me/s_index',