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

season
2 parents a069cd42 d087ff41
Showing 29 changed files with 629 additions and 306 deletions
app.js
components/diy_goodsGroup/diy_goodsGroup.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/prom_list/prom_list.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageC/pages/group_list/group_list.js
packageC/pages/group_list/group_list.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageE/pages/cart/cart2/cart2.js
packageG/pages/customer_chat/customer_chat.js
packageG/pages/group_buy/goodsInfo/goodsInfo.wxml
packageG/pages/team/team_show/team_show.js
packageG/pages/user/order_detail/order_detail.js
packageG/pages/user/userinfo/userinfo.js
@@ -145,7 +145,7 @@ App({
             //         }
             //     })
             // }
-            // else if(app.globalData.user_id){  //-- 启用默认的user_id --
+            // if(app.globalData.user_id){  //-- 启用默认的user_id --
             //
             //     app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{
             //         app.globalData.is_get_login=1;
@@ -216,6 +216,10 @@ App({
                     this.globalData.isIpx = true
                 }
+                if (res["platform"].toLowerCase()=== 'ios') {
+                    this.globalData.is_iPhone=1;
+                }
+
                 /*-- 判断是不是PC端打开的 */
                 if (res && ["windows", "mac"].some((v) => v === res["platform"])) {
                     app.globalData.is_pc=1;
@@ -237,6 +237,7 @@ Component({
 						isonsale: 1,
 						orderField: "sort",
 						orderType: 'asc',
+					    isnewwhere:1
 					};
 					if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
 					if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
@@ -281,7 +281,9 @@ Page({
     };
-    //-- 设置顶部高度 --
+
+
+      //-- 设置顶部高度 --
     let height= getApp().globalData.navBarHeight;
     ee.setData({ gid: gid,top_nav:height});
@@ -645,14 +647,7 @@ Page({
     var ee = this,gid = this.data.gid, i = getApp().request;
     //判断是不是要跳转到拼团服务卡
-    getApp().check_go_fw(gid,function (act,url){
-
-        if(act){
-            wx.redirectTo({
-                url:url
-            })
-            return false;
-        }
+    this.check_go_act_fw(gid,function (){
         th.data.is_timer = 1;
         //获取用户的默认门店
@@ -881,10 +876,6 @@ Page({
         if(!th.data.prom_type) th.get_sto();
     })
-
-
-
-
   },
@@ -4460,6 +4451,64 @@ Page({
     },
+    async check_go_act_fw(gid,func){
+
+        if(this.data.options.prom_type==1){
+            func();
+            return false;
+        }
+
+        var th=this;
+        var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+        var req_d = {
+            "store_id": getApp().globalData.setting.stoid,
+            "goods_id": gid,
+            "user_id": getApp().globalData.user_id || 0,
+            "goods_type":1
+        }
+        var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+        var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
+        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+            var arr = res.data.data;
+            let times = new Date().getTime();
+            //-- 预热也要计算 --
+            var arr2 = arr.filter(function (e) {
+                return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+            })
+            if(arr2.length==1) {
+                switch(arr2[0].prom_type){
+                    case 1:
+                        //url+="&prom_type=1&prom_id="+arr2[0].act_id;
+                        th.data.options.prom_id=arr2[0].act_id;
+                        th.data.options.prom_type=1;
+                        url='';
+                        break;
+                    case 2:
+                        url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+                        break;
+                    case 6:
+                        url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
+                        break;
+                    case 8:
+                        url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
+                        break;
+                }
+                if(url){
+                    wx.redirectTo({
+                        url: url,
+                    });
+                    return false;
+
+                }
+            }
+
+        }
+
+        func();
+    }
+
+
 });
@@ -128,7 +128,7 @@
 								<view class="goods-title">
-									<view class="goods-name elli">{{data.goods_name}}</view>
+									<view class="goods-name elli"><text  selectable='true' user-select="true">{{data.goods_name}}</text></view>
 								</view>
 							</view>
@@ -2093,7 +2093,7 @@ Page({
 		return 1;
 	},
-	set_sele:function (e) {
+	set_sele:async function (e) {
 		 var th=this;
 		 var index=e.currentTarget.dataset.ind;
 		 var set=e.currentTarget.dataset.set;
@@ -2125,8 +2125,44 @@ Page({
 					  }
 				  }
 			 }
-					 
+
+			 //判断搭配商品的限购
+			 var gd= await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + click_item.goods_id, {});
+			 if(gd && gd.data.code==0 && gd.data.data && gd.data.data.viplimited>0){
+
+				 gd=gd.data.data;
+				 var g_buy_num=0;
+
+				 //----获取商品购买数----
+				 var buyed=await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+					 data: {
+						 store_id: os.stoid,
+						 user_id: getApp().globalData.user_id,
+						 goods_id: gd.goods_id, isnew: 1,
+						 timetype: gd.viplimited_timetype
+					 }
+				 })
+
+				 if(buyed && buyed.data.code==0){
+					 g_buy_num = buyed.data.data.goodsbuynum;
+				 }
+
+				 if(g_buy_num>=gd.viplimited){
+					 wx.showToast({
+						 title: "搭配商品超出限购",
+						 icon: 'none',
+						 duration: 2000
+					 })
+					 return false;
+				 }
+
+			 }
+
+
 		 }
+
+
+
 		 var ob={};
 		 ob[text]= parseInt(set);
@@ -138,7 +138,7 @@
 				      <!-- 许程 商家团主页 -->
 				      <view class="xc-goods-explain flex-vertical-between">
 				        <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
-				          {{data.goods_name}}
+							<text  selectable='true' user-select="true">{{data.goods_name}}</text>
 				        </view>
 				        <!-- 这个是分享按钮 -->
 				        <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
@@ -19,7 +19,8 @@ Page({
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
-	    time_arr:[]
+	    time_arr:[],
+	    timer: null,
   },
   /**
@@ -296,8 +297,6 @@ Page({
 		var th = this;
 		// 获取当前时间，同时得到活动结束时间数组
 		let newTime = ut.gettimestamp();
-
-
         var time_arr=[];
 		for (let j = 0; j < this.data.list.length; j++) {
@@ -309,43 +308,66 @@ Page({
 			// 对结束时间进行处理渲染到页面
 			for (var i = 0; i < endTimeList.length; i++) {
-				var o = endTimeList[i];
-				var endTime = this.data.type == 1 ? o.end_time : o.start_time;
+
 				// if(th.data.type==0) endTime = o.start_time;
-				let obj = null;
-				// 如果活动未结束，对时间进行处理
-				if (endTime - newTime > 0) {
-					let time = (endTime - newTime);
-					// 获取天、时、分、秒
-					let day = parseInt(time / (60 * 60 * 24));
-					let hou = parseInt(time % (60 * 60 * 24) / 3600);
-					let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-					let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-					obj = {
-						day: this.timeFormat(day),
-						hou: this.timeFormat(hou),
-						min: this.timeFormat(min),
-						sec: this.timeFormat(sec),
-						hide: 1
-					}
-				} else {
-					//活动已结束，全部设置为'00'
-					obj = {day: '00', hou: '00', min: '00', sec: '00'}
-				}
-				//var txt = "goodlist[" + i + "].djs";
-				//th.setData({[txt]: obj});
-				var e={djs:obj};
-				arr_new.push(e);
+				// 创建查询对象
+				let query = wx.createSelectorQuery();
+				// 获取目标元素，并获取目标元素的信息
+				query.select("#l_item_"+j+"_"+i).boundingClientRect();
+				// 获取视口，并获取视口信息
+				query.selectViewport().boundingClientRect();
+				//--  执行查询,元素要在显示中的才显示定时器 --
+				query.exec(([target, view]) => {
+
+					if (!th.data.is_timer) return;
+					if (!target) return;
+					if (!target.id) return;
+
+					let idx_str=  target.id.replace('l_item_','');
+					idx_str=idx_str.split('_');
+
+					var o = this.data.list[idx_str[0]][idx_str[1]];
+					var endTime = this.data.type == 1 ? o.end_time : o.start_time;
+
+					// 条件1：当目标顶部距离视口顶部距离小于视口的高度时
+					// 条件2：当目标底部距离视口顶部距离大于0时
+					// 当以上两个条件同时成立时，目标元素在视口中
+					if (target.top < view.height && target.bottom > 0) {
+
+						let obj = null;
+						// 如果活动未结束，对时间进行处理
+						if (endTime - newTime > 0) {
+							let time = (endTime - newTime);
+							// 获取天、时、分、秒
+							let day = parseInt(time / (60 * 60 * 24));
+							let hou = parseInt(time % (60 * 60 * 24) / 3600);
+							let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+							let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+							obj = {
+								day: this.timeFormat(day),
+								hou: this.timeFormat(hou),
+								min: this.timeFormat(min),
+								sec: this.timeFormat(sec),
+								hide: 1
+							}
+						} else {
+							//活动已结束，全部设置为'00'
+							obj = {day: '00', hou: '00', min: '00', sec: '00'}
+						}
+
+						var txt = "time_arr[" + idx_str[0] + "][" + idx_str[1] + "].djs";
+						th.setData({[txt]: obj});
+					}
+				});
+				//var e={djs:obj};
+				//arr_new.push(e);
 			}
-			time_arr.push(arr_new);
-
-
+			//time_arr.push(arr_new);
 		}
-
-		this.setData({time_arr:time_arr});
+		//this.setData({time_arr:time_arr});
 	},
@@ -4,7 +4,7 @@
 	<block wx:for="{{list}}" wx:for-item="p_item" wx:for-index="p_idx">
 	   <block wx:for="{{p_item}}">
-		  <view class="list-item" bindtap="goto"  data-pidx="{{p_idx}}"  data-index="{{index}}" >
+		  <view id="l_item_{{p_idx}}_{{index}}" class="list-item" bindtap="goto"  data-pidx="{{p_idx}}"  data-index="{{index}}" >
 			<view class="img-container">
 				<image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
 					   data-errorimg="list[{{p_idx}}][{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
@@ -303,6 +303,17 @@ Page({
     fir_set_sto:1,     //最初始的一下，获取门店
     front_pick:null,  //在详情页面上显示的门店
+    //苹果机都为真
+    gn_sele_fir:true,
+    gn_sele_sec:getApp().globalData.is_iPhone?true:false,
+    sn_sele_sec:getApp().globalData.is_iPhone?true:false,
+    sku_sele_sec:getApp().globalData.is_iPhone?true:false,
+    cate_sele_sec:getApp().globalData.is_iPhone?true:false,
+    brand_sele_sec:getApp().globalData.is_iPhone?true:false,
+    nation_sele_sec:getApp().globalData.is_iPhone?true:false,
+    guige_sele_sec:getApp().globalData.is_iPhone?true:false,
+    ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
+
   },
   //------初始化加载----------
@@ -1427,8 +1438,13 @@ Page({
     var e = t.currentTarget.id;
     this.setData({
       activeCategoryId: e
-    }),
-      1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
+    }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
+
+    if(e>0){
+      wx.pageScrollTo({
+        scrollTop:0
+      })
+    }
   },
@@ -7429,5 +7445,42 @@ Page({
   },
+  handtouch(e){
+    //苹果机都为真
+    if(getApp().globalData.is_iPhone){
+      return false;
+    }
+    var name=e.currentTarget.dataset.name;
+    var set_data={
+      gn_sele_fir:false,
+      gn_sele_sec:false,
+      sn_sele_sec:false,
+      sku_sele_sec:false,
+      cate_sele_sec:false,
+      brand_sele_sec:false,
+      nation_sele_sec:false,
+      guige_sele_sec:false,
+      ontime_sele_sec:false
+    }
+
+    switch (name){
+      case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
+      case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
+      case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
+      case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
+      case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
+      case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
+      case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
+      case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
+      case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
+    }
+
+    this.setData(set_data)
+    this.setData({
+      [name]:true
+    })
+
+  }
+
 });
@@ -211,7 +211,7 @@
 							<view class="goods-title">
-							  <view class="goods-name elli">{{data.goods_name}}</view>
+                              <view class="goods-name elli" bindtouchstart="handtouch"  data-name="gn_sele_fir" ><text  selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{data.goods_name}} </text> </view>
 							</view>
@@ -619,64 +619,64 @@
                 <view class="item_left">
                   <text>商品名称</text>
                 </view>
-                <view class="item_right">
-                  <text>{{data.goods_name}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="gn_sele_sec">
+                  <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>商品编号</text>
                 </view>
-                <view class="item_right">
-                  <text>{{data.goods_sn}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="sn_sele_sec">
+                  <text selectable='{{sn_sele_sec}}'  user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>商品条码</text>
                 </view>
-                <view class="item_right">
-                  <text>{{data.sku}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="sku_sele_sec">
+                  <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
                 <view class="item_left">
                   <text>品类</text>
                 </view>
-                <view class="item_right">
-                  <text>{{cat_name}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="cate_sele_sec">
+                  <text  selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
                 <view class="item_left">
                   <text>品牌</text>
                 </view>
-                <view class="item_right">
-                  <text>{{brand_name}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="brand_sele_sec">
+                  <text selectable='{{brand_sele_sec}}'  user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
                 <view class="item_left">
                   <text>国别</text>
                 </view>
-                <view class="item_right">
-                  <text>{{nation_name}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="nation_sele_sec">
+                  <text selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}">{{nation_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>规格</text>
                 </view>
-                <view class="item_right">
-                  <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="guige_sele_sec">
+                  <text selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"  >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>上架时间</text>
                 </view>
-                <view class="item_right">
-                  <text>{{data.on_time}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="ontime_sele_sec">
+                  <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
                 </view>
               </view>
             </view>
@@ -712,64 +712,64 @@
             <view class="item_left">
               <text>商品名称</text>
             </view>
-            <view class="item_right">
-              <text>{{data.goods_name}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="gn_sele_sec">
+              <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>商品编号</text>
             </view>
-            <view class="item_right">
-              <text>{{data.goods_sn}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="sn_sele_sec">
+              <text selectable='{{sn_sele_sec}}'  user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>商品条码</text>
             </view>
-            <view class="item_right">
-              <text>{{data.sku}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="sku_sele_sec">
+              <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
             <view class="item_left">
               <text>品类</text>
             </view>
-            <view class="item_right">
-              <text>{{cat_name}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="cate_sele_sec">
+              <text  selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
             <view class="item_left">
               <text>品牌</text>
             </view>
-            <view class="item_right">
-              <text>{{brand_name}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="brand_sele_sec">
+              <text selectable='{{brand_sele_sec}}'  user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
             <view class="item_left">
               <text>国别</text>
             </view>
-            <view class="item_right">
-              <text>{{nation_name}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="nation_sele_sec">
+              <text selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}">{{nation_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>规格</text>
             </view>
-            <view class="item_right">
-              <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="guige_sele_sec">
+              <text selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"  >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>上架时间</text>
             </view>
-            <view class="item_right">
-              <text>{{data.on_time}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="ontime_sele_sec">
+              <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
             </view>
           </view>
         </view>
@@ -127,8 +127,8 @@
           <!-- --显示团类型和团价格-- -->
           <view class="pt_fir_title ">
             <view class="xc-goods-explain flex-vertical-between">
-              <view class="xc-explain fs32 ellipsis-2">
-                  {{data.goods_name}}
+               <view class="xc-explain fs32 ellipsis-2">
+                 <text  selectable='true' user-select="true">{{data.goods_name}}</text>
                 </view>
               <!-- 这个是分享按钮 -->
               <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
@@ -3334,7 +3334,7 @@ Page({
         prom_type: good.prom_type,
         prom_id: good.prom_id,
         isnew: 1,
-        timetype:good.viplimited_timetype
+        timetype:gg.viplimited_timetype
       },
     }).then(res => {
       var buy_num_data = res.data.data;
@@ -269,7 +269,18 @@ Page({
     nav_backgroundColor: "#ffffff",
     nav_type: 2,  //导航类型
     istop: 0,     //是否置顶风格为1
-    searchbox_transparent: 1
+    searchbox_transparent: 1,
+
+    //苹果机都为真
+    gn_sele_fir: true,
+    gn_sele_sec:getApp().globalData.is_iPhone?true:false,
+    sn_sele_sec:getApp().globalData.is_iPhone?true:false,
+    sku_sele_sec:getApp().globalData.is_iPhone?true:false,
+    cate_sele_sec:getApp().globalData.is_iPhone?true:false,
+    brand_sele_sec:getApp().globalData.is_iPhone?true:false,
+    nation_sele_sec:getApp().globalData.is_iPhone?true:false,
+    guige_sele_sec:getApp().globalData.is_iPhone?true:false,
+    ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
   },
@@ -1051,6 +1062,12 @@ Page({
     this.setData({
       activeCategoryId: e
     }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
+
+    if(e>0){
+      wx.pageScrollTo({
+        scrollTop:0
+      })
+    }
   },
   tabClick2: function (t) {
     this.setData({
@@ -5003,4 +5020,42 @@ Page({
   },
+  handtouch(e){
+    //苹果机都为真
+    if(getApp().globalData.is_iPhone){
+      return false;
+    }
+    var name=e.currentTarget.dataset.name;
+    var set_data={
+      gn_sele_fir:false,
+      gn_sele_sec:false,
+      sn_sele_sec:false,
+      sku_sele_sec:false,
+      cate_sele_sec:false,
+      brand_sele_sec:false,
+      nation_sele_sec:false,
+      guige_sele_sec:false,
+      ontime_sele_sec:false
+    }
+
+    switch (name){
+      case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
+      case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
+      case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
+      case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
+      case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
+      case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
+      case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
+      case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
+      case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
+    }
+
+    this.setData(set_data)
+    this.setData({
+      [name]:true
+    })
+
+  }
+
+
 });
@@ -131,8 +131,8 @@
           <view class="pt_fir_title ">
             <view class="xc-goods-explain flex-vertical-between">
               <view class="xc-explain fs32 ellipsis-2">
-                  {{data.goods_name}}
-                </view>
+                   <text bindtouchstart="handtouch"  data-name="gn_sele_fir" selectable='{{gn_sele_fir}}'   user-select="{{gn_sele_fir}}" >{{data.goods_name}}</text>
+              </view>
               <!-- 这个是分享按钮 -->
               <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
                 <view class="iconfont icon-share"></view>
@@ -284,64 +284,64 @@
               <view class="item_left">
                 <text>商品名称</text>
               </view>
-              <view class="item_right">
-                <text>{{data.goods_name}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="gn_sele_sec">
+                <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
               </view>
             </view>
             <view class="tb_item tb-l">
               <view class="item_left">
                 <text>商品编号</text>
               </view>
-              <view class="item_right">
-                <text>{{data.goods_sn}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="sn_sele_sec">
+                <text selectable='{{sn_sele_sec}}'  user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
               </view>
             </view>
             <view class="tb_item tb-l">
               <view class="item_left">
                 <text>商品条码</text>
               </view>
-              <view class="item_right">
-                <text>{{data.sku}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="sku_sele_sec">
+                <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
               </view>
             </view>
             <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
               <view class="item_left">
                 <text>品类</text>
               </view>
-              <view class="item_right">
-                <text>{{cat_name}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="cate_sele_sec">
+                <text  selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
               </view>
             </view>
             <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
               <view class="item_left">
                 <text>品牌</text>
               </view>
-              <view class="item_right">
-                <text>{{brand_name}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="brand_sele_sec">
+                <text selectable='{{brand_sele_sec}}'  user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
               </view>
             </view>
             <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
               <view class="item_left">
                 <text>国别</text>
               </view>
-              <view class="item_right">
-                <text>{{nation_name}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="nation_sele_sec">
+                <text selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}">{{nation_name}}</text>
               </view>
             </view>
             <view class="tb_item tb-l">
               <view class="item_left">
                 <text>规格</text>
               </view>
-              <view class="item_right">
-                <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="guige_sele_sec">
+                <text selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"  >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
               </view>
             </view>
             <view class="tb_item tb-l">
               <view class="item_left">
                 <text>上架时间</text>
               </view>
-              <view class="item_right">
-                <text>{{data.on_time}}</text>
+              <view class="item_right"  bindtouchstart="handtouch" data-name="ontime_sele_sec">
+                <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
               </view>
             </view>
           </view>
@@ -381,74 +381,74 @@
     </view>
     <!-- ----------商品详情图片页面-------------- -->
     <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
+
       <view class="table_s">
         <view class="tb_item tb-l">
           <view class="item_left">
             <text>商品名称</text>
           </view>
-          <view class="item_right">
-            <text>{{data.goods_name}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="gn_sele_sec">
+            <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
           </view>
         </view>
         <view class="tb_item tb-l">
           <view class="item_left">
             <text>商品编号</text>
           </view>
-          <view class="item_right">
-            <text>{{data.goods_sn}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="sn_sele_sec">
+            <text selectable='{{sn_sele_sec}}'  user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
           </view>
         </view>
         <view class="tb_item tb-l">
           <view class="item_left">
             <text>商品条码</text>
           </view>
-          <view class="item_right">
-            <text>{{data.sku}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="sku_sele_sec">
+            <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
           </view>
         </view>
         <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
           <view class="item_left">
             <text>品类</text>
           </view>
-          <view class="item_right">
-            <text>{{cat_name}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="cate_sele_sec">
+            <text  selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
           </view>
         </view>
         <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
           <view class="item_left">
             <text>品牌</text>
           </view>
-          <view class="item_right">
-            <text>{{brand_name}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="brand_sele_sec">
+            <text selectable='{{brand_sele_sec}}'  user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
           </view>
         </view>
         <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
           <view class="item_left">
             <text>国别</text>
           </view>
-          <view class="item_right">
-            <text>{{nation_name}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="nation_sele_sec">
+            <text selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}">{{nation_name}}</text>
           </view>
         </view>
         <view class="tb_item tb-l">
           <view class="item_left">
             <text>规格</text>
           </view>
-          <view class="item_right">
-            <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="guige_sele_sec">
+            <text selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"  >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
           </view>
         </view>
         <view class="tb_item tb-l">
           <view class="item_left">
             <text>上架时间</text>
           </view>
-          <view class="item_right">
-            <text>{{data.on_time}}</text>
+          <view class="item_right"  bindtouchstart="handtouch" data-name="ontime_sele_sec">
+            <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
           </view>
         </view>
       </view>
-
       <!-- 详情广告顶部-->
       <view class="wxParse">
         <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
@@ -1394,7 +1394,9 @@ Page({
         if (arr[k].show_can_cx) {
           for (let key_o in arr[k].show_can_cx) {
             let k_arr = key_o.split(',');
-            if (k_arr.indexOf(item1.goods_id + '') > -1) {
+
+            //秒杀，团购等活动不参与计算
+            if (k_arr.indexOf(item1.goods_id + '') > -1 &&  ![1,2,4,6,8,9].includes(parseInt(item1.prom_type+''))){
               //-- 如果初始活动在计算的时候，是不满足的时候，就要把活动清理掉 --
               var is_no_ok = arr[k].show_can_cx[key_o].cur_act.is_no_ok;
               if (is_no_ok == 1) {
@@ -25,9 +25,9 @@ Page({
       return false;
     }
-    let url= os.h5_host+"/mchat/mbchat/index?goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+    let url= os.h5_host+"/mchat/mbchat/index?is_webview=1&goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
     if(type)
-      url= os.h5_host+"/mchat/mbchat/index?card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+      url= os.h5_host+"/mchat/mbchat/index?is_webview=1&card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
     console.log("chat"+url);
     this.setData({
@@ -114,7 +114,7 @@
 								<!-- 手店价 -->
 								<view class="co-red" wx:if="{{prom_type == 0}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
 								<view class="goods-title">
-									<view class="goods-name elli">{{data.goods_name}}</view>
+									<view class="goods-name elli"><text  selectable='true' user-select="true">{{data.goods_name}}</text></view>
 								</view>
 							</view>
@@ -91,7 +91,9 @@ Page({
 	sort_store: 0, //门店分类
 	choice_sort_store: 0, //选择分类门店
-  template_id:[],//订阅消息id
+    template_id:[],//订阅消息id
+
+    paying:0,  //避免多次点击
   },
   onLoad: async function(options) {
       wx.setNavigationBarTitle({ title: "拼团订单",})
@@ -158,6 +160,8 @@ Page({
   //显示加载
   onShow:function(){
+    this.data.paying=0;
+
     //-- 看一下隐私政策要不要显示 --
     var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
     if (privacy_pop) {
@@ -820,18 +824,29 @@ Page({
   //------去支付，购买-------
   go_pay:function () {
+
+      if(this.data.paying) return false;
+      this.data.paying=1;
+
       var th=this;
 	  var def_pick_store=this.data.def_pick_store;
 	  if(def_pick_store && def_pick_store.pickup_id) {
 		  th.data.pick_id=def_pick_store.pickup_id;  //选择门店	 
 		  th.data.end_name=def_pick_store.pickup_name; 
 	  } 	  
-      if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
-	  if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
+      if (!th.data.pick_id) {
+        this.data.paying=0;
+        return s.my_warnning("请选择门店", 0, th);
+      }
+	  if (th.data.pick_id==0){
+        this.data.paying=0;
+        return s.my_warnning("请选择门店", 0, th);
+      }
       //----判断起购数----
       var qnum=parseFloat(th.data.teamlist.minbuynum);
       if(qnum>0 && qnum>th.data.num ){
+        this.data.paying=0;
         getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
         return false;
       }
@@ -844,9 +859,11 @@ Page({
           }else{
             getApp().showWarning("拼单已经抢光");
           }
-           return false;
+          th.data.paying=0;
+          return false;
         }
         if(th.data.teamlist.kttype==2 && 1>arr[1]){
+          th.data.paying=0;
           getApp().showWarning("拼团已满");
           return false;
         }
@@ -917,7 +934,10 @@ Page({
   async buy_check_redis(func){
      var ck= await this.check_num(this.data.num,1);
-     if(!ck)  return false;
+     if(!ck) {
+       this.data.paying=0;
+       return false;
+     }
       //获取redis中的数量
       var r_num=0,prom_type=6,prom_id=this.data.teamlist.id;
@@ -505,7 +505,7 @@ Page({
             })
             var buyed_mum2 = goodsbuynum + good.goods_num;
-            if (buyed_mum2 > limit && limit > 0) {
+            if (buyed_mum2 > limit && limit > 0 && !good.is_gift) {
                 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
                 th.toast(content);
                 th.setData({ paying: 0 });
@@ -1151,6 +1151,8 @@ Page({
             //---如果是活动的时候---
             var prom = null, goodsinfo = good, th = this;
+
+            goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
             if (goodsinfo.prom_type == 1) {
                 await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
                     if (res.data.code == 0) {
@@ -1185,8 +1187,16 @@ Page({
                     }
                 })
             }
+
+            if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
+                wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
+                th.setData({ paying: 0 });
+                return false;
+            }
+
             //----------如果有活动，并且在进行中，就不计算线下库存---------------
             if (prom) {
+
                 let c_type=parseInt(goodsinfo.prom_type+'');
                 var act_type='';
                 switch (c_type){
@@ -1207,13 +1217,20 @@ Page({
                 }
                 var now = ut.gettimestamp();
-                if (prom.is_end == 1 && prom.end_time < now) {
+                if (prom.is_end == 1 || prom.end_time < now) {
                     var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
                     th.toast(content);
                     th.setData({ paying: 0 });
                     return false;
                 }
+                if(prom.is_show==0){
+                    wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+
+
                 buyed_mum2 = promgoodsbuynum + good.goods_num;
                 if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
@@ -1904,23 +1921,23 @@ Page({
 				  //-- 看一下购物车上有多少商品 --
 				  var cart_num=0;				  
-				  await getApp().request.promiseGet("/api/weshop/cart/page", {				  	
-					 data: {
-						store_id: os.stoid,
-						user_id: getApp().globalData.user_id,
-						state:0, is_gift:0,
-						goods_id:good.goods_id,
-						pick_id: b_item.pickup_id
-					 }
-				  }).then(res=>{
-					  var num = 0;
-					  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-						  for (var i = 0; i < res.data.data.pageData.length; i++) {
-							  num += res.data.data.pageData[i].goods_num;
-						  }
-					  }
-					  cart_num=num;						 
-				  })
+				  // await getApp().request.promiseGet("/api/weshop/cart/page", {
+					//  data: {
+					// 	store_id: os.stoid,
+					// 	user_id: getApp().globalData.user_id,
+					// 	state:0, is_gift:0,
+					// 	goods_id:good.goods_id,
+					// 	pick_id: b_item.pickup_id
+					//  }
+				  // }).then(res=>{
+					//   var num = 0;
+					//   if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+					// 	  for (var i = 0; i < res.data.data.pageData.length; i++) {
+					// 		  num += res.data.data.pageData[i].goods_num;
+					// 	  }
+					//   }
+					//   cart_num=num;
+				  // })
 				  var lock=0,plist=null;
@@ -1976,7 +1993,8 @@ Page({
 				      store_id: os.stoid,
 				      user_id: getApp().globalData.user_id,
 				      goods_id: good.goods_id,
-                      timetype:good.viplimited_timetype
+                      timetype:good.viplimited_timetype,
+                      isnew:1,
 				  };
                   if(b_item.prom_type==7){
                       req_data.prom_type=7;
@@ -2016,22 +2034,22 @@ Page({
 			  }else{
 				  //-- 看一下购物车上有多少商品 --
 				  var cart_num=0;				  
-				  await getApp().request.promiseGet("/api/weshop/cart/page", {				  	
-						 data: {
-							store_id: os.stoid,
-							user_id: getApp().globalData.user_id,
-							state:0, is_gift:0,
-							goods_id:good.goods_id			  					
-						 }
-				  }).then(res=>{
-						  var num = 0;
-						  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-							  for (var i = 0; i < res.data.data.pageData.length; i++) {
-								  num += res.data.data.pageData[i].goods_num;
-							  }
-						  }
-						  cart_num=num;						 
-				  })
+				  // await getApp().request.promiseGet("/api/weshop/cart/page", {
+					// 	 data: {
+					// 		store_id: os.stoid,
+					// 		user_id: getApp().globalData.user_id,
+					// 		state:0, is_gift:0,
+					// 		goods_id:good.goods_id
+					// 	 }
+				  // }).then(res=>{
+					// 	  var num = 0;
+					// 	  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+					// 		  for (var i = 0; i < res.data.data.pageData.length; i++) {
+					// 			  num += res.data.data.pageData[i].goods_num;
+					// 		  }
+					// 	  }
+					// 	  cart_num=num;
+				  // })
 				  if(good.store_count<=0){
 					  err_text+= good['goods_name']+"库存不足\n";
@@ -2048,7 +2066,8 @@ Page({
 			          store_id: os.stoid,
 			          user_id: getApp().globalData.user_id,
 			          goods_id: good.goods_id,
-                      timetype:good.viplimited_timetype
+                      timetype:good.viplimited_timetype,
+                      isnew:1,
 			      };
 			      if(prom){
@@ -2087,7 +2106,7 @@ Page({
 				  //---- 要计算商品的限购 -----	  
 				  if(good['viplimited']>0){ 				  												  
-					  if(cart_num+buynum>good['viplimited']){
+					  if(cart_num+buynum>=good['viplimited']){
 						   err_text+= good['goods_name']+"超出限购\n";
 						   continue;
 					  }				  
@@ -920,6 +920,7 @@ Page({
   },
+
   //------卡片的显示和关闭--------
   show_tc: function() {
     var that=this;
@@ -938,7 +939,8 @@ Page({
             return;
           }
           //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-          var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
+          var val =  getApp().globalData.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
+
           val = "^" + ut.base64_encode(val);
           let userInfo = getApp().globalData.userInfo;
           qrcode('qrcode', val, 350, 350, that);
@@ -97,7 +97,7 @@ Page({
   onHide: function () {
     //--清理定时器--
-    clearInterval(this.timer);
+    clearInterval(this.data.timer);
     this.setData({
       isshow: 0
     });
@@ -111,15 +111,15 @@ Page({
   //----倒计时函数-----
   countDown() {
     if (!this.data.goodlist) return false;
+    if (!this.data.is_timer) return false;
+
     var th = this;
     // 获取当前时间，同时得到活动结束时间数组
     var newTime = ut.gettimestamp();
     var endTimeList = this.data.goodlist;
     // 对结束时间进行处理渲染到页面
     for (var i = 0; i < endTimeList.length;i++){
-         var o = endTimeList[i];
-         var endTime = o.end_time;
-         if(th.data.type==0) endTime = o.start_time;
+
           // 创建查询对象
           let query = wx.createSelectorQuery();
@@ -134,6 +134,11 @@ Page({
             if (!target) return;
             if (!target.id) return;
             let idx=  target.id.replace('kill-item','');
+
+            var o = endTimeList[idx];
+            var endTime = o.end_time;
+            if(th.data.type==0) endTime = o.start_time;
+
             // 条件1：当目标顶部距离视口顶部距离小于视口的高度时
             // 条件2：当目标底部距离视口顶部距离大于0时
             // 当以上两个条件同时成立时，目标元素在视口中
@@ -115,6 +115,7 @@ Page({
   //----倒计时函数,优化定时器只显示在可视范围内的-----
   countDown() {
+    if (!this.data.goodlist) return false;
     if (!this.data.is_timer) return false;
     var th = this;
@@ -124,14 +125,11 @@ Page({
     if (endTimeList == null) return null
     // 对结束时间进行处理渲染到页面
     for (var i = 0; i < endTimeList.length; i++) {
+      var oo = endTimeList[i];
+      if(!oo) continue;
       if (!this.data.is_timer) break;
-      var o = endTimeList[i];
-      if(!o) continue;
-      var endTime = o.end_time;
-      if (th.data.type == 0) endTime = o.start_time;
-
       // 创建查询对象
       let query = wx.createSelectorQuery();
       // 获取目标元素，并获取目标元素的信息
@@ -146,6 +144,11 @@ Page({
         if (!target.id) return;
         let idx=  target.id.replace('kill-item','');
+        var o=endTimeList[idx];
+        var endTime = o.end_time;
+        if (th.data.type == 0) endTime = o.start_time;
+
+
         // 条件1：当目标顶部距离视口顶部距离小于视口的高度时
         // 条件2：当目标底部距离视口顶部距离大于0时
         // 当以上两个条件同时成立时，目标元素在视口中
@@ -187,8 +190,6 @@ Page({
         }
       });
-
-
     }
   },
@@ -5841,5 +5841,17 @@ Page({
   },
+  //-- 图片失败，默认图片,赠品图片的处理 --
+  bind_bnerr_gift: function (e) {
+    var pid = e.target.dataset.pid;
+    var idxx = e.target.dataset.idxx;
+    var cart_zp=this.data.cart_zp;
+    cart_zp[pid].goods[idxx].original_img= oo.imghost + "/miniapp/images/default_g_img.png";
+    this.setData({
+      cart_zp
+    })
+  },
+
+
 });
 \ No newline at end of file
@@ -161,23 +161,23 @@
           <!-- 判断有没有赠品2024-2-1 -->
           <block wx:if="{{cart_zp[item.pid] && cart_zp[item.pid].goods.length>0 }}">
-              <block  wx:for="{{cart_zp[item.pid].goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{idx}}">
-                  <view class="order-item" data-item="{{idx}}">
+              <block  wx:for="{{cart_zp[item.pid].goods}}" wx:for-item="itemss" wx:for-index="idxx" wx:key="{{idxx}}">
+                  <view class="order-item" data-item="{{idxx}}">
                       <view class="order-raido flex-vertical " style="width: 45rpx"></view>
-                      <navigator class="goods-img rel" bindtap="go_gd" data-item="{{items}}"  data-gd="{{items.goods_id}}">
-                          <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
-                          <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view>
+                      <navigator class="goods-img rel" bindtap="go_gd" data-item="{{itemss}}"  data-gd="{{itemss.goods_id}}">
+                          <image class="wh100" src="{{itemss.original_img}}" binderror="bind_bnerr_gift" data-pid="{{item.pid}}" data-idxx="{{idxx}}" data-url="{{itemss.original_img}}"></image>
+                          <view style="background-color:red" class="abs flex-center fs26">赠品</view>
                       </navigator>
                       <view class="goods-cont">
                           <view class="goods-name">
-                              <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-item="{{items}}"   data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
+                              <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-item="{{itemss}}"   data-gd="{{itemss.goods_id}}">{{itemss.goods_name}}</navigator>
                               <view class="specifications  ellipsis-1">
-                                  <view  wx:if="{{items.goods_color || items.goods_spec}}">
-                                      {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
+                                  <view  wx:if="{{itemss.goods_color || itemss.goods_spec}}">
+                                      {{itemss.goods_color}}{{itemss.goods_color?"/":''}}{{itemss.goods_spec}}</view>
                                   <view  wx:else>规格1</view>
                               </view>
-                              <view>{{items.goods_num}}件</view>
+                              <view>{{itemss.goods_num}}件</view>
                           </view>
                       </view>
                   </view>
@@ -295,6 +295,17 @@ Page({
         front_pick:null,  //在详情页面上显示的门店
         get_sto_ing:1,  //默认是不让弹出框的
+
+        //苹果机都为真
+        gn_sele_fir:true,
+        gn_sele_sec:getApp().globalData.is_iPhone?true:false,
+        sn_sele_sec:getApp().globalData.is_iPhone?true:false,
+        sku_sele_sec:getApp().globalData.is_iPhone?true:false,
+        cate_sele_sec:getApp().globalData.is_iPhone?true:false,
+        brand_sele_sec:getApp().globalData.is_iPhone?true:false,
+        nation_sele_sec:getApp().globalData.is_iPhone?true:false,
+        guige_sele_sec:getApp().globalData.is_iPhone?true:false,
+        ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
       },
       //------初始化加载----------
@@ -5097,7 +5108,7 @@ Page({
                           });
                           //拿取价格并且判断时间,并判断会员的身分--
                           getApp().request.get("/api/weshop/teamlist/getUser/" +
-                            os.stoid + "/" + prom_id+"/"+getApp().globalData.user_id, {
+                            os.stoid + "/" + prom_id+"/"+user_id, {
                               success: async function (t) {
                                 if (t.data.code != 0) {
                                   ee.get_normal(gid);
@@ -9452,5 +9463,43 @@ Page({
                                 },
+                                handtouch(e){
+                                    //苹果机都为真
+                                    if(getApp().globalData.is_iPhone){
+                                      return false;
+                                    }
+                                    var name=e.currentTarget.dataset.name;
+                                    var set_data={
+                                      gn_sele_fir:false,
+                                      gn_sele_sec:false,
+                                      sn_sele_sec:false,
+                                      sku_sele_sec:false,
+                                      cate_sele_sec:false,
+                                      brand_sele_sec:false,
+                                      nation_sele_sec:false,
+                                      guige_sele_sec:false,
+                                      ontime_sele_sec:false
+                                    }
+
+                                    switch (name){
+                                      case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
+                                      case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
+                                      case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
+                                      case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
+                                      case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
+                                      case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
+                                      case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
+                                      case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
+                                      case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
+                                    }
+
+                                    this.setData(set_data)
+                                    this.setData({
+                                      [name]:true
+                                    })
+
+                                }
+
+
       })
 \ No newline at end of file
@@ -200,7 +200,7 @@
               <!-- 许程 商家团主页 -->
               <view class="xc-goods-explain flex-vertical-between">
                 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
-                  {{front_g.goods_name}}
+                  <text bindtouchstart="handtouch"  data-name="gn_sele_fir" selectable='{{gn_sele_fir}}'   user-select="{{gn_sele_fir}}"   >{{front_g.goods_name}}</text>
                 </view>
                 <!-- 这个是分享按钮 -->
                 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
@@ -306,7 +306,7 @@
             </view>
             <view class="goods-title">
               <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
-              <view class="goods-name elli">{{front_g.goods_name}}</view>
+              <view class="goods-name elli"><text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text></view>
             </view>
             <view class="goods-num">
               <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
@@ -427,7 +427,7 @@
             <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
               <view class="goods-title">
                 <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
-                <view class="goods-name elli">{{front_g.goods_name}}</view>
+                <view class="goods-name elli"><text bindtouchstart="handtouch"  data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{front_g.goods_name}}</text></view>
               </view>
             </view>
             <view class="goods-num" wx:if="{{prom_type!=1 && prom_type!=2}}">
@@ -457,11 +457,11 @@
             <!-- 秒杀的活动名称 -->
             <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4  && prom_type!=2}}">
-              {{front_g.goods_name}}
+              <text bindtouchstart="handtouch" data-name="gn_sele_fir"  selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text>
             </view>
             <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}">
-              <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{front_g.goods_name}}</view>
+              <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;"><text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text></view>
               <!-- 这个是分享按钮 -->
               <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
                 <view class="iconfont icon-share"></view>
@@ -819,64 +819,64 @@
                 <view class="item_left">
                   <text>商品名称</text>
                 </view>
-                <view class="item_right">
-                  <text>{{front_g.goods_name}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
+                  <text   selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{front_g.goods_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>商品编号</text>
                 </view>
-                <view class="item_right">
-                  <text>{{front_g.goods_sn}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec" >
+                  <text  selectable='{{sn_sele_sec}}'  user-select="{{sn_sele_sec}}" >{{front_g.goods_sn}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>商品条码</text>
                 </view>
-                <view class="item_right">
-                  <text>{{front_g.sku}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec" >
+                  <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{front_g.sku}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
                 <view class="item_left">
                   <text>品类</text>
                 </view>
-                <view class="item_right">
-                  <text>{{cat_name}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec" >
+                  <text  selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
                 <view class="item_left">
                   <text>品牌</text>
                 </view>
-                <view class="item_right">
-                  <text>{{brand_name}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec" >
+                  <text  selectable='{{brand_sele_sec}}'  user-select="{{brand_sele_sec}}"  >{{brand_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
                 <view class="item_left">
                   <text>国别</text>
                 </view>
-                <view class="item_right">
-                  <text>{{nation_name}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="nation_sele_sec" >
+                  <text  selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}" >{{nation_name}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>规格</text>
                 </view>
-                <view class="item_right">
-                  <text>{{filters.show_gui_ge(front_g.goods_spec,front_g.goods_color)}}</text>
+                <view class="item_right"  bindtouchstart="handtouch" data-name="guige_sele_sec" >
+                  <text selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"  >{{filters.show_gui_ge(front_g.goods_spec,front_g.goods_color)}}</text>
                 </view>
               </view>
               <view class="tb_item tb-l">
                 <view class="item_left">
                   <text>上架时间</text>
                 </view>
-                <view class="item_right">
-                  <text>{{front_g.on_time}}</text>
+                <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
+                  <text   selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}"  >{{front_g.on_time}}</text>
                 </view>
               </view>
             </view>
@@ -913,64 +913,64 @@
             <view class="item_left">
               <text>商品名称</text>
             </view>
-            <view class="item_right">
-              <text>{{front_g.goods_name}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
+              <text selectable='{{gn_sele_sec}}'  user-select="{{gn_sele_sec}}"  >{{front_g.goods_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>商品编号</text>
             </view>
-            <view class="item_right">
-              <text>{{front_g.goods_sn}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec" >
+              <text  selectable='{{sn_sele_sec}}'   user-select="{{sn_sele_sec}}" >{{front_g.goods_sn}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>商品条码</text>
             </view>
-            <view class="item_right">
-              <text>{{front_g.sku}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
+              <text  selectable='{{sku_sele_sec}}'  user-select="{{sku_sele_sec}}" >{{front_g.sku}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
             <view class="item_left">
               <text>品类</text>
             </view>
-            <view class="item_right">
-              <text>{{cat_name}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec" >
+              <text   selectable='{{cate_sele_sec}}'  user-select="{{cate_sele_sec}}"  >{{cat_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
             <view class="item_left">
               <text>品牌</text>
             </view>
-            <view class="item_right">
-              <text>{{brand_name}}</text>
+            <view class="item_right"  bindtouchstart="handtouch" data-name="brand_sele_sec" >
+              <text  selectable='{{brand_sele_sec}}'   user-select="{{brand_sele_sec}}"  >{{brand_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
             <view class="item_left">
               <text>国别</text>
             </view>
-            <view class="item_right">
-              <text>{{nation_name}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec" >
+              <text  selectable='{{nation_sele_sec}}'  user-select="{{nation_sele_sec}}"   >{{nation_name}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>规格</text>
             </view>
-            <view class="item_right">
-              <text>{{front_g.goods_spec==""?"规格1":front_g.goods_spec}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec" >
+              <text  selectable='{{guige_sele_sec}}'   user-select="{{guige_sele_sec}}"   >{{front_g.goods_spec==""?"规格1":front_g.goods_spec}}</text>
             </view>
           </view>
           <view class="tb_item tb-l">
             <view class="item_left">
               <text>上架时间</text>
             </view>
-            <view class="item_right">
-              <text>{{front_g.on_time}}</text>
+            <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
+              <text  selectable='{{ontime_sele_sec}}'  user-select="{{ontime_sele_sec}}"    >{{front_g.on_time}}</text>
             </view>
           </view>
         </view>
@@ -1429,39 +1429,9 @@
             </view>
           </block>
         </view>
-        <!-- 选择门店模块 -->
-        <view class="flex-space-between address ai_end xc-width ">
-          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name bold  {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
-            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
-              距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-            </view>
-          </view>
-          <!-- 没有门店的时候 -->
-          <view class="flex" bindtap="choice_store" wx:else>
-            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-            <view class="fs30" style="color:black;">选择门店</view>
-          </view>
-          <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
-        </view>
-        <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-        <block wx:else>
-          <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-          <block wx:else>
-            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
-            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
-            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id }}">
-              (库存不足)
-            </view>
-          </block>
-        </block>
-        <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
-          地址:{{def_pick_store.fulladdress}}
-        </view>
       </view>
+
       <!-- 商品的属性项目 -->
       <view class="xc-goods-attribute">
         <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
@@ -1591,6 +1561,8 @@
       </block>
     </view>
     <view class="clear"></view>
+
+
     <!-- 选择门店的列表 -->
     <view hidden="{{ismend==0}}" class="sto_v">
       <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend">
@@ -455,9 +455,9 @@
             <block wx:if="{{item.ename=='searchbox'}}">
               <searchbox object="{{item.content}}" transparent="{{searchbox_transparent}}" nav_backgroundColor="{{nav_backgroundColor  ? '#fff' :'#fff'}}"></searchbox>
             </block>
-            <!-- <block wx:if="{{item.ename=='store_select'}}">
+            <block wx:if="{{item.ename=='store_select'}}">
               <store_select object="{{item.content}}"></store_select>
-            </block> -->
+            </block>
           </block>
         </block>
       </view>
@@ -486,9 +486,9 @@
             <block wx:if="{{item.ename=='searchbox'}}">
               <searchbox object="{{item.content}}"></searchbox>
             </block>
-            <!--            <block wx:if="{{item.ename=='store_select'}}">-->
-            <!--              <store_select object="{{item.content}}"></store_select>-->
-            <!--            </block>-->
+            <block wx:if="{{item.ename=='store_select'}}">
+              <store_select object="{{item.content}}"></store_select>
+            </block>
           </block>
         </block>
@@ -820,7 +820,7 @@ Page({
       })
       var buyed_mum2 = goodsbuynum + good.goods_num;
-      if (buyed_mum2 > limit && limit > 0) {
+      if (buyed_mum2 > limit && limit > 0  && !good.is_gift) {
         var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
         th.toast(content);
         th.setData({ paying: 0 });
@@ -1480,6 +1480,8 @@ Page({
       //---如果是活动的时候---
       var prom = null, goodsinfo = good, th = this;
+
+      goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
       if (goodsinfo.prom_type == 1) {
         await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
           if (res.data.code == 0) {
@@ -1514,8 +1516,16 @@ Page({
           }
         })
       }
+
+      if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
+        wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
+        th.setData({ paying: 0 });
+        return false;
+      }
+
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
+
         let c_type=parseInt(goodsinfo.prom_type+'');
         var act_type='';
         switch (c_type){
@@ -1537,13 +1547,20 @@ Page({
         }
         var now = ut.gettimestamp();
-        if (prom.is_end == 1 && prom.end_time < now) {
+        if (prom.is_end == 1 || prom.end_time < now) {
           var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
           th.toast(content);
           th.setData({ paying: 0 });
           return false;
         }
+        if(prom.is_show==0){
+          wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+          th.setData({ paying: 0 });
+          return false
+        }
+
+
         buyed_mum2 = promgoodsbuynum + good.goods_num;
         if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
@@ -2231,23 +2248,23 @@ Page({
         //-- 看一下购物车上有多少商品 --
         var cart_num = 0;
-        await getApp().request.promiseGet("/api/weshop/cart/page", {
-          data: {
-            store_id: os.stoid,
-            user_id: getApp().globalData.user_id,
-            state: 0, is_gift: 0,
-            goods_id: good.goods_id,
-            pick_id: b_item.pickup_id
-          }
-        }).then(res => {
-          var num = 0;
-          if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-            for (var i = 0; i < res.data.data.pageData.length; i++) {
-              num += res.data.data.pageData[i].goods_num;
-            }
-          }
-          cart_num = num;
-        })
+        // await getApp().request.promiseGet("/api/weshop/cart/page", {
+        //   data: {
+        //     store_id: os.stoid,
+        //     user_id: getApp().globalData.user_id,
+        //     state: 0, is_gift: 0,
+        //     goods_id: good.goods_id,
+        //     pick_id: b_item.pickup_id
+        //   }
+        // }).then(res => {
+        //   var num = 0;
+        //   if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+        //     for (var i = 0; i < res.data.data.pageData.length; i++) {
+        //       num += res.data.data.pageData[i].goods_num;
+        //     }
+        //   }
+        //   cart_num = num;
+        // })
         var lock = 0, plist = null;
@@ -2298,7 +2315,8 @@ Page({
           store_id: os.stoid,
           user_id: getApp().globalData.user_id,
           goods_id: good.goods_id,
-          timetype:good.viplimited_timetype
+          timetype:good.viplimited_timetype,
+          isnew:1,
         };
         if (b_item.prom_type == 7) {
@@ -2340,22 +2358,22 @@ Page({
         //-- 看一下购物车上有多少商品 --
         var cart_num = 0;
-        await getApp().request.promiseGet("/api/weshop/cart/page", {
-          data: {
-            store_id: os.stoid,
-            user_id: getApp().globalData.user_id,
-            state: 0, is_gift: 0,
-            goods_id: good.goods_id
-          }
-        }).then(res => {
-          var num = 0;
-          if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-            for (var i = 0; i < res.data.data.pageData.length; i++) {
-              num += res.data.data.pageData[i].goods_num;
-            }
-          }
-          cart_num = num;
-        })
+        // await getApp().request.promiseGet("/api/weshop/cart/page", {
+        //   data: {
+        //     store_id: os.stoid,
+        //     user_id: getApp().globalData.user_id,
+        //     state: 0, is_gift: 0,
+        //     goods_id: good.goods_id
+        //   }
+        // }).then(res => {
+        //   var num = 0;
+        //   if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+        //     for (var i = 0; i < res.data.data.pageData.length; i++) {
+        //       num += res.data.data.pageData[i].goods_num;
+        //     }
+        //   }
+        //   cart_num = num;
+        // })
         if (good.store_count <= 0) {
@@ -2373,7 +2391,8 @@ Page({
           store_id: os.stoid,
           user_id: getApp().globalData.user_id,
           goods_id: good.goods_id,
-          timetype:good.viplimited_timetype
+          timetype:good.viplimited_timetype,
+          isnew:1,
         };
         if (prom) {
@@ -434,6 +434,8 @@ module.exports = {
             if(!c_item.selected) continue;
             //如果是秒杀之类是商品
             if([1,2,4,6,8,9].indexOf(c_item.prom_type)>-1) continue;
+            //如果是搭配的时候商品
+            if(c_item.is_collocation) continue;
             //-- 把活动进行规整 --
             var more_cx=c_item.more_cx;