Merge branch 'dev' into 'test'

Dev See merge request !830

Merge branch 'dev' into 'test'
Dev See merge request !830
后端研发-苏明海
2 parents cc298cef 48f2c01e
Showing 2 changed files with 14 additions and 2 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/cart/cart2/cart2.wxss
@@ -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,
@@ -250,13 +250,15 @@ margin:auto; */
     font-size: 24rpx;
     margin-left: 20rpx;
 	  display: flex;
+		flex-grow: 1;
     align-items: center;
     height: 50rpx;
-    width: 500rpx;
+    /* width: 500rpx; */
 }
  
 .word-box {
     font-size: 26rpx;
+		width: 100%;
     /* width: 600rpx; */
     /* padding: 10rpx;
     height: 28rpx;