OA单的优化

yvan.ni
1 parent b7d45a18
Showing 19 changed files with 359 additions and 162 deletions
app.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/prom_list/prom_list.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.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
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
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/index/index/index.wxml
pages/user/order_list/order_list.js
utils/more_cx.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;
@@ -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">
@@ -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>
@@ -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;
@@ -1993,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;
@@ -2065,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){
@@ -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);
@@ -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,
       },
       //------初始化加载----------
@@ -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>
@@ -2315,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) {
@@ -2391,6 +2392,7 @@ Page({
           user_id: getApp().globalData.user_id,
           goods_id: good.goods_id,
           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;