From ea78f162f7ceca71ae72bbf0fae71243b53550cc Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 8 Oct 2021 10:12:08 +0800
Subject: [PATCH] 预售商品详情页

---
 packageC/pages/presell/goodsInfo/goodsInfo.js | 27 ++++++++++++++++++++++++---
 utils/util.js                                 | 11 ++++++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 35f405e..f3561eb 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -3942,12 +3942,35 @@ Page({
 
 
     if (!presell_id) {
-      wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 })
+      wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
+      ut.wx_back();
       return false;
     }
     //------获取预售主表----------
     await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {}).then(res => {
       if (res.data.code == 0 && res.data.data) {
+        var act_data=res.data.data;
+        if(act_data.is_end){
+            wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
+            ut.wx_back();
+            return false;
+        }
+        if(act_data.isuse==0){
+              wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+              ut.wx_back();
+              return false;
+         }
+
+         var end_time=act_data.pay_enddate;
+         if(act_data.presell_type==1){
+             end_time=act_data.end_time;
+         }
+         if(end_time<ut.gettimestamp()){
+             wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
+             ut.wx_back();
+             return false;
+         }
+
         th.setData({
           presellForm: res.data.data,
         });
@@ -3972,8 +3995,6 @@ Page({
         pre_arr = e.data.data.pageData[idx];
         th.setData({ pre_arr: pre_arr })
         th.data.prom_buy_limit=pre_arr.vip_butyqty;
-
-
       }
     })
     if (!pre_arr) {
diff --git a/utils/util.js b/utils/util.js
index 9d52c7e..54e556a 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -481,6 +481,14 @@ function ajax_ok2(res){
 	return 0;
 }
 
+function wx_back() {
+    var arr=getCurrentPages();
+    if(arr.length<=2){
+        getApp().goto("/pages/index/index/index");
+    }else{
+        wx.navigateBack();
+    }
+}
 
 module.exports = {
     formatTime: function(e, r) {
@@ -591,5 +599,6 @@ module.exports = {
 	sha1:sha1,                //sha1进行签名
 	convert_arr_key:convert_arr_key, //将JS数组对象按其某个键值重组成Map对象
 	ajax_ok:ajax_ok, //将JS数组对象按其某个键值重组成Map对象
-	ajax_ok2:ajax_ok2 //将JS数组对象按其某个键值重组成Map对象
+	ajax_ok2:ajax_ok2, //将JS数组对象按其某个键值重组成Map对象
+    wx_back:wx_back
 };
--
libgit2 0.21.4