Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents eb35b466 06cb2605
Showing 1 changed file with 11 additions and 1 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -2707,7 +2707,8 @@ Page({
       if (!user_id) scene += "_0";
       scene += "_" + getApp().globalData.room_id;
     }
-
+	
+	
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
       os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/presell/goodsInfo/goodsInfo";
@@ -3913,6 +3914,15 @@ Page({
                     gnext=0;
                     return false;
                 }
+					
+				if (act_data.start_time > ut.gettimestamp()) {
+					wx.showToast({title:"活动还未开始", icon: 'none', duration: 3000});
+					setTimeout(function () {
+						ut.wx_back();
+					}, 2000)
+					gnext=0;
+					return false;
+				}
                 th.setData({
                     presellForm: res.data.data,