免费券详情页面领券失败问题

@@ -60,7 +60,8 @@ Page({
     },
     },
     // 提交订单(免费券)
     // 提交订单(免费券)
     submitOrder: util.throttle(function () {
     submitOrder: util.throttle(function () {
-        if (this.data.detail.aexpiration && this.data.detail.aexpiration.valid_forever != '1' && (this.data.dataStr > (this.data.detail.etime * 1))) {
+        let eTime = this.data.detail.useEtime ? new Date(this.data.detail.useEtime).getTime()/1000 : '0';
+        if (this.data.detail.aexpiration && this.data.detail.aexpiration.valid_forever != '1' && (this.data.dataStr > eTime )) {
             return wx.showToast({
             return wx.showToast({
                 title: '优惠券已过期，不可购买！',
                 title: '优惠券已过期，不可购买！',
                 duration: 2000,
                 duration: 2000,

@@ -80,7 +80,7 @@ Page({
     getCouponDetail(e){
     getCouponDetail(e){
         const item= e.currentTarget.dataset['item'];
         const item= e.currentTarget.dataset['item'];
         wx.navigateTo({
         wx.navigateTo({
-          url: `./seeRecharge?id=${item.id}&name=${this.data.opt.name}`,
+          url: `./receiveCoupon?id=${item.id}&name=${this.data.opt.name}&types=5&sid=${this.data.opt.sid}`,
         })
         })
     },
     },
     submitOrder(){
     submitOrder(){

@@ -30,13 +30,19 @@ Page({
             sid:this.data.sid
             sid:this.data.sid
         }).then(res => {
         }).then(res => {
             let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
             let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
-            let style =arr.includes(parseInt(res.data.type))
+            let StyleType = res.data.type;
+            let style =arr.includes(parseInt(StyleType))
             let url = ''
             let url = ''
             if (!style) {
             if (!style) {
-                url = `/pack-invitation/pages/detail_owner_invitation${res.data.type}?id=${that.data.oid}`;
+                url = `/pack-invitation/pages/detail_owner_invitation${StyleType}?id=${that.data.oid}`;
             } else {
             } else {
                 url = `/pack-invitation/pages/detail_owner_invitation9?id=${that.data.oid}`;
                 url = `/pack-invitation/pages/detail_owner_invitation9?id=${that.data.oid}`;
             }
             }
+            if(StyleType == '18' || StyleType == '21') url = `/pack-invitation/pages/detail_owner_invitation11?id=${that.data.oid}`;
+            if(StyleType == '19' || StyleType == '22') url = `/pack-invitation/pages/detail_owner_invitation12?id=${that.data.oid}`;
+            if(StyleType == '20') url = `/pack-invitation/pages/detail_owner_invitation10?id=${that.data.oid}`;
+            if(StyleType == '18' || StyleType == '19') url += '&bookType=1';
+            if(StyleType == '21' || StyleType == '22') url += '&bookType=2';
             return wx.reLaunch({
             return wx.reLaunch({
                 url
                 url
             })
             })