提前点餐、剩余优惠券字段

@@ -99,7 +99,7 @@ Page({
     },
     },
     // 提交订单
     // 提交订单
     submitOrder() {
     submitOrder() {
-        if(this.data.detail.grant_num=='0'){
+        if(this.data.detail.grant_last=='0'){
             return wx.showToast({
             return wx.showToast({
                 title:'您来晚了，当前优惠券已经售罄，请与商家联系！',
                 title:'您来晚了，当前优惠券已经售罄，请与商家联系！',
                 duration:2000,
                 duration:2000,
@@ -107,7 +107,7 @@ Page({
                 icon:'none'
                 icon:'none'
             })
             })
         }
         }
-        if(this.data.detail.grant_num && (this.data.detail.grant_num*1)<(this.data.num*1)){
+        if(this.data.detail.grant_last && (this.data.detail.grant_last*1)<(this.data.num*1)){
             return wx.showToast({
             return wx.showToast({
                 title:'优惠券剩余数量不足！',
                 title:'优惠券剩余数量不足！',
                 duration:2000,
                 duration:2000,

@@ -59,12 +59,12 @@
 	<text wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}" class="info info_right text_info font32r text_info1" >
 	<text wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}" class="info info_right text_info font32r text_info1" >
 		{{exp_date.week_show?exp_date.week_show:''}}
 		{{exp_date.week_show?exp_date.week_show:''}}
 	</text>
 	</text>
-	<view class="info" wx:if="{{detail.grant_num}}">
+	<view class="info" wx:if="{{detail.grant_last}}">
 		<view class="info_left font32r">
 		<view class="info_left font32r">
 			剩余数量：
 			剩余数量：
 		</view>
 		</view>
 		<view class="info_right text_info font32r">
 		<view class="info_right text_info font32r">
-			{{detail.grant_num}}
+			{{detail.grant_last}}
 		</view>
 		</view>
 	</view>
 	</view>
 	<view wx:if="{{detail.explain}}" class="info">
 	<view wx:if="{{detail.explain}}" class="info">
@@ -82,6 +82,6 @@
 	<view class="content font24r">
 	<view class="content font24r">
 		总计：<text>￥{{totalize}}</text>元
 		总计：<text>￥{{totalize}}</text>元
 	</view>
 	</view>
-	<button class="font32r {{(detail.grant_num=='0' || (this.data.detail.grant_num && (detail.grant_num*1)<(num*1)))?'btns btnsDisabled':'btns'}}" bindtap="submitOrder">提交订单
+	<button class="font32r {{(detail.grant_last=='0' || (this.data.detail.grant_last && (detail.grant_last*1)<(num*1)))?'btns btnsDisabled':'btns'}}" bindtap="submitOrder">提交订单
 	</button>
 	</button>
 </view>
 </view>

@@ -309,8 +309,16 @@ Page({
             })
             })
         }
         }
         if (this.data.opt.types == '2') {
         if (this.data.opt.types == '2') {
+            let cookbookObj = {
+                sid: this.data.opt.sid,
+                sellerName: this.data.opt.sellerName,
+                oid: this.data.opt.oid,
+                hasSuccess: '1',
+                rid: this.data.opt.rid?this.data.opt.rid:''
+            }
+            let url = `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`;
             return wx.reLaunch({
             return wx.reLaunch({
-                url: '/pack-cookbook/pages/success_new',
+                url
             })
             })
         }
         }
         if (this.data.opt.types == '3') {
         if (this.data.opt.types == '3') {