1. 导航购物车数量的显示居中

2. 商品生产分享图片的返回以前版本

1. 导航购物车数量的显示居中
2. 商品生产分享图片的返回以前版本
yvan.ni
1 parent 7e0c9671
Showing 2 changed files with 1515 additions and 1526 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/tabbar/tabbar.wxml
 var t = require("../../../utils/util.js"),
-  ut = t,
-  e = require("../../../utils/common.js"),
-  a = require("../../../utils/wxParse/wxParse.js"),
-  s = getApp(),
-  i = s.request,
-  rq = i,
-  oo = s.globalData,
-  o = s.globalData.setting,
-  os = o;
+    ut = t,
+    e = require("../../../utils/common.js"),
+    a = require("../../../utils/wxParse/wxParse.js"),
+    s = getApp(),
+    i = s.request,
+    rq = i,
+    oo = s.globalData,
+    o = s.globalData.setting,
+    os = o;
 //评价加载更多
 var more = function(e) {
-    return e && e.__esModule ? e : {
-      default: e
-    };
-  }(require("../../../utils/LoadMore.js")),
-  n = new more.default();
+      return e && e.__esModule ? e : {
+        default: e
+      };
+    }(require("../../../utils/LoadMore.js")),
+    n = new more.default();
 var utils = require('../../../utils/util.js');
 var regeneratorRuntime = require('../../../utils/runtime.js');
@@ -76,10 +76,10 @@ Page({
     }],
     activeCategoryId3: 1,
     categories3: [{
-        name: "全部",
-        id: 1,
-        num: 0
-      },
+      name: "全部",
+      id: 1,
+      num: 0
+    },
       {
         name: "有图",
         id: 5,
@@ -125,8 +125,8 @@ Page({
     pickpu_list: null, //读出的所有门店list
     def_pickpu_list: null, //一开始5个门店list
     sec_pick_index: 0, //第二级门店选择ID
-    fir_pick_index: 0, //第一级门店选择ID	
-	all_pick_list:null,//所有的门店先记录起来
+    fir_pick_index: 0, //第一级门店选择ID
+    all_pick_list:null,//所有的门店先记录起来
     //同一条形码的所有商品
     sku_g: null,
     sku_g_pt: null, //---拼单的普通购买---
@@ -219,7 +219,7 @@ Page({
     new_user: 0, //新用户
     def_pick_store: null, // 默认的门店
-	fir_def_store:null,  //客户默认的门店的
+    fir_def_store:null,  //客户默认的门店的
     lat: null, //维度
     lon: null, //经度
@@ -232,14 +232,14 @@ Page({
     comments_no_more:0,
     get_c:0,               //获取评价是不是成
     is_collect_load:0,     //是不是处理
-	is_newsales_rules:0,   //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
-	sales_rules:1,	       //默认是线上销售
-	
-	wait_for_user_store:null,
-	
-	prom_goods:null,       //商品优惠列表
-	order_prom:null,       //订单优惠
-	collocationGoods:null, //搭配购
+    is_newsales_rules:0,   //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
+    sales_rules:1,	       //默认是线上销售
+
+    wait_for_user_store:null,
+
+    prom_goods:null,       //商品优惠列表
+    order_prom:null,       //订单优惠
+    collocationGoods:null, //搭配购
   },
@@ -249,11 +249,11 @@ Page({
       title: "商品详情",
     })
     var ee = this,
-      that = ee,
-      th = ee,
-      gid = t.goods_id,
-      first_leader=t.first_leader,
-      room_id=t.room_id;
+        that = ee,
+        th = ee,
+        gid = t.goods_id,
+        first_leader=t.first_leader,
+        room_id=t.room_id;
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
@@ -267,18 +267,18 @@ Page({
     }
     ee.setData({ gid: gid});
     if(first_leader){
-        getApp().globalData.first_leader=first_leader;
-        //调用接口判断是不是会员
-        getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
-           if(res.data.code==0){
-              getApp().globalData.guide_id=res.data.data.id;
-           }
-        })
+      getApp().globalData.first_leader=first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.guide_id=res.data.data.id;
+        }
+      })
     }
     if(room_id){
-       getApp().globalData.room_id=room_id;
-       getApp().globalData.room_goods_id=gid;
+      getApp().globalData.room_id=room_id;
+      getApp().globalData.room_goods_id=gid;
     }
@@ -291,7 +291,7 @@ Page({
     getApp().getConfig2(function(e) {
       ee.setData({
         bconfig: e,
-		sales_rules:e.sales_rules
+        sales_rules:e.sales_rules
       });
       if (e.categoryset.indexOf("," + 1 + ",") != -1) {
@@ -313,9 +313,9 @@ Page({
       var json_d = JSON.parse(e.switch_list);
       ee.setData({
         store_config: e,
-		sys_switch:json_d,
+        sys_switch:json_d,
         is_closecoupon: json_d.is_closecoupon,
-		is_newsales_rules:json_d.is_newsales_rules
+        is_newsales_rules:json_d.is_newsales_rules
       });
       ee.init(gid);
       //------几人评价-------
@@ -325,39 +325,39 @@ Page({
         supportPageScroll: !0
       });
-	  //计算等级价相关
-	  var swithc_list=e.switch_list;
-	  var sw_arr=JSON.parse(swithc_list);
-	  //---如果后台又开等级卡的开关---
-	  if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
-	  	    th.setData({rank_switch:true});
-	  			  //---回调卡的列表---
-	  			  th.getPlusCardType(function(ob){
-	  			  	   th.setData({card_list:ob.card_list});
-						 var ti = setInterval(function () {
-							var user = getApp().globalData.userInfo;
-							if (!user) return false;
-							clearInterval(ti);
-
-							if(user.card_field ){
-							  var str = user['card_expiredate'].replace(/-/g, '/');
-							  var end = new Date(str);
-							  end = Date.parse(end) / 1000;
-							  var now = ut.gettimestamp();
-							  //--- 判断是等级会员，且在有效期范围内 ---
-							  if(user.card_field && now<end){
-							  var card_name=ob.name_map.get(user.card_field);
-							  if(card_name.length>5) card_name=card_name.substring(0,5);
-
-							  var is_near_date=0;
-							  if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
-								  th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});
-							  }
-						  }
-						}, 500)
-	  			  })
-
-	  }
+      //计算等级价相关
+      var swithc_list=e.switch_list;
+      var sw_arr=JSON.parse(swithc_list);
+      //---如果后台又开等级卡的开关---
+      if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
+        th.setData({rank_switch:true});
+        //---回调卡的列表---
+        th.getPlusCardType(function(ob){
+          th.setData({card_list:ob.card_list});
+          var ti = setInterval(function () {
+            var user = getApp().globalData.userInfo;
+            if (!user) return false;
+            clearInterval(ti);
+
+            if(user.card_field ){
+              var str = user['card_expiredate'].replace(/-/g, '/');
+              var end = new Date(str);
+              end = Date.parse(end) / 1000;
+              var now = ut.gettimestamp();
+              //--- 判断是等级会员，且在有效期范围内 ---
+              if(user.card_field && now<end){
+                var card_name=ob.name_map.get(user.card_field);
+                if(card_name.length>5) card_name=card_name.substring(0,5);
+
+                var is_near_date=0;
+                if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
+                th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});
+              }
+            }
+          }, 500)
+        })
+
+      }
     });
@@ -372,7 +372,7 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
-      
+
       if(!ee) {
         th.data.fir_def_store={}; //赋值空对象
         return false;
@@ -454,15 +454,15 @@ Page({
   //------------程序初始化入口-------------
   async init(gid) {
     var ee = this,
-      th = ee,
-      gallery = null,
-      is_collect = 0,
-      collect_id = 0,
-      categories3 = ee.data.categories3,
-      fir_com = null,
-      fir_quan = null,
-      mapurl = null,
-      mapurl_f_img = null;
+        th = ee,
+        gallery = null,
+        is_collect = 0,
+        collect_id = 0,
+        categories3 = ee.data.categories3,
+        fir_com = null,
+        fir_quan = null,
+        mapurl = null,
+        mapurl_f_img = null;
     //------图片滚动----------
@@ -609,8 +609,8 @@ Page({
     this.data.is_timer = 1;
     var ee = this,
-      gid = this.data.gid,
-      i = getApp().request;
+        gid = this.data.gid,
+        i = getApp().request;
     this.wait_for_store_config();
@@ -659,7 +659,7 @@ Page({
           t.data.data['disc'] = txt;
           if (t.data.data.original_img.indexOf(o.imghost) == -1)
-              t.data.data.original_img = o.imghost + t.data.data.original_img;
+            t.data.data.original_img = o.imghost + t.data.data.original_img;
           if (t.data.data.goods_content == null) t.data.data.goods_content = "";
@@ -671,56 +671,56 @@ Page({
           ee.setData({
             data: t.data.data,
             sele_g: t.data.data,
-			userInfo:getApp().globalData.userInfo
+            userInfo:getApp().globalData.userInfo
           });
-        
+
           //获取统一条形码,普通商品和优惠促销的商品
-          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2  || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){					  			  
-			  //默认门店要拿下门店库存
-			  if(that.data.sales_rules==2 && that.data.is_newsales_rules){
-                //获取门店
-                ee.get_sto();
-                //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
-                getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
-                  if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
-                    var lock=0,plist=null;
-                    //先读取门店的lock,采用链式写法，少用await
-                    getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-                      data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
-                    }).then(res=>{
-                      if(res.data.code==0 && res.data.data.total>0){
-                        for(var i in res.data.data.pageData)
-                          lock+=res.data.data.pageData[i].outQty
-                      }
-                      //---通过接口获取门店的线下库存信息--
-                      return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-                        data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
-                      })
-                    }).then(res=>{
-                      if(res.data.code==0 && res.data.data.total>0){
-                        plist=res.data.data.pageData[0];
-                      }
-                      if(plist && plist.CanOutQty-lock>0){
-                        that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
-                      }else{
-                        that.data.fir_def_store.CanOutQty=0;
-                      }
-                      //--给门店赋值线下库存--
-                      th.setData({def_pick_store:that.data.fir_def_store});
+          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2  || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){
+            //默认门店要拿下门店库存
+            if(that.data.sales_rules==2 && that.data.is_newsales_rules){
+              //获取门店
+              ee.get_sto();
+              //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
+              getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
+                if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
+                  var lock=0,plist=null;
+                  //先读取门店的lock,采用链式写法，少用await
+                  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+                    data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
+                  }).then(res=>{
+                    if(res.data.code==0 && res.data.data.total>0){
+                      for(var i in res.data.data.pageData)
+                        lock+=res.data.data.pageData[i].outQty
+                    }
+                    //---通过接口获取门店的线下库存信息--
+                    return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+                      data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
                     })
-                  }
-                })
-              }else{
-				  //获取门店
-				  ee.get_sto();
-			  }
-			  	  		 
-			  ee.get_sku(o.stoid, t.data.data.sku, gid);
-		  }            
+                  }).then(res=>{
+                    if(res.data.code==0 && res.data.data.total>0){
+                      plist=res.data.data.pageData[0];
+                    }
+                    if(plist && plist.CanOutQty-lock>0){
+                      that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
+                    }else{
+                      that.data.fir_def_store.CanOutQty=0;
+                    }
+                    //--给门店赋值线下库存--
+                    th.setData({def_pick_store:that.data.fir_def_store});
+                  })
+                }
+              })
+            }else{
+              //获取门店
+              ee.get_sto();
+            }
+
+            ee.get_sku(o.stoid, t.data.data.sku, gid);
+          }
           else {
             var gg = "",
-              item = t.data.data;
+                item = t.data.data;
             if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec="";
             if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
@@ -837,7 +837,7 @@ Page({
   //商品详情的时候调用
   tabGoodsContent: function() {
     var th = this,
-      i = getApp().request;
+        i = getApp().request;
     this.setData({
       activeCategoryId: 1
     });
@@ -882,8 +882,8 @@ Page({
   //获取redis中的数量
   async getactLen(func) {
     var r_num = 0,
-      prom_type = this.data.prom_type,
-      prom_id = this.data.prom_id;
+        prom_type = this.data.prom_type,
+        prom_id = this.data.prom_id;
     await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
       1: 1
     }).then(res => {
@@ -924,10 +924,10 @@ Page({
       return s.my_warnning("还未登录！", 0, this);
     }
     var e = this,
-      th = e,
-      a = 0,
-      o = this.data.sele_g;  
-      a = o.goods_id;
+        th = e,
+        a = 0,
+        o = this.data.sele_g;
+    a = o.goods_id;
     //----------添加到购物车时，要判断限购数量，--------
     e.get_buy_num(o, function(ee) {
@@ -1005,208 +1005,208 @@ Page({
       if (th.data.prom_type == 1) {
         newd.goods_price = th.data.prom_price;
         newd.member_goods_price = th.data.prom_price,
-        newd.prom_type = th.data.prom_type;
+            newd.prom_type = th.data.prom_type;
         newd.prom_id = th.data.prom_id;
-		
-		if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);	
-		if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);			
-		
-		th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
-		
+
+        if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+        if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
+
+        th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
+
       }
       else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
         newd.prom_type = 0;
         newd.prom_id = 0;
-        
-		//---如果是线下门店销售的时候---
-		if(th.data.sales_rules==2){
-			var pick=th.get_pick_from_list(th.data.sto_sele_id)
-			//---通过接口获取门店的线下库存信息--
-			getApp().request.get("/api/weshop/goods/getWareStorages",{
-				  data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid},
-				  success:function(res){
-					 if(res.data.code==0){																	 
-						   if(res.data.data.pageData.length>0){
-							    var CanOutQty=res.data.data.pageData[0].CanOutQty;
-								if(CanOutQty<e.data.goodsInputNum){
-									 return s.my_warnning("库存不足！", 0, th);	
-								}								
-								//在调一次接口,读取商品的预出库的数量，lock
-								getApp().request.get("/api/weshop/order/ware/lock/page",{
-									data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000},
-									success:function(res_data){
-										 if(res_data.data.code==0 &&  res_data.data.data.total>0){
-											  
-											   var lock=0;
-											   for(var i in res_data.data.data.pageData){
-												   lock+=res_data.data.data.pageData[i].outQty;
-											   }
-											  											  											  
-											  if(CanOutQty<=lock){
-												   return s.my_warnning("库存不足！", 0, th);	
-											  }
-											  th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);  
-										 }else{
-											 th.add_cart_next(e,t,a,o,newd,CanOutQty);  
-										 }
-									}
-								})														
-						    }else{
-								return s.my_warnning("库存不足！", 0, th);	
-							} 
-					    
-					   }				
-				  }
-			})			
-		}else{
-			if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);	
-			if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);		
-			th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
-		}		
-      }	  
+
+        //---如果是线下门店销售的时候---
+        if(th.data.sales_rules==2){
+          var pick=th.get_pick_from_list(th.data.sto_sele_id)
+          //---通过接口获取门店的线下库存信息--
+          getApp().request.get("/api/weshop/goods/getWareStorages",{
+            data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid},
+            success:function(res){
+              if(res.data.code==0){
+                if(res.data.data.pageData.length>0){
+                  var CanOutQty=res.data.data.pageData[0].CanOutQty;
+                  if(CanOutQty<e.data.goodsInputNum){
+                    return s.my_warnning("库存不足！", 0, th);
+                  }
+                  //在调一次接口,读取商品的预出库的数量，lock
+                  getApp().request.get("/api/weshop/order/ware/lock/page",{
+                    data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000},
+                    success:function(res_data){
+                      if(res_data.data.code==0 &&  res_data.data.data.total>0){
+
+                        var lock=0;
+                        for(var i in res_data.data.data.pageData){
+                          lock+=res_data.data.data.pageData[i].outQty;
+                        }
+
+                        if(CanOutQty<=lock){
+                          return s.my_warnning("库存不足！", 0, th);
+                        }
+                        th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);
+                      }else{
+                        th.add_cart_next(e,t,a,o,newd,CanOutQty);
+                      }
+                    }
+                  })
+                }else{
+                  return s.my_warnning("库存不足！", 0, th);
+                }
+
+              }
+            }
+          })
+        }else{
+          if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+          if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
+          th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
+        }
+      }
     })
   },
-  
+
   //---加入购物车的最后一步---
   add_cart_next(e,t,a,o,newd,CanOutQty){
-	  var th=this,i=getApp().request;
-	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-	  if(o.prom_type!=1 && o.prom_type!=6){
-	  		   var conf=th.data.bconfig;
+    var th=this,i=getApp().request;
+    //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
+    if(o.prom_type!=1 && o.prom_type!=6){
+      var conf=th.data.bconfig;
       if (conf.switch_list && getApp().globalData.userInfo['card_field']){
-	  			   var s_list=JSON.parse(conf.switch_list);
-				   var now=ut.gettimestamp();				   
-				   var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
-				   var end = new Date(str);
-				   end = Date.parse(end) / 1000;
-				   
-	  			   //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
-	  			   if(parseInt(s_list.rank_switch)==2 && end>now){
-	  				    var card_price=o[getApp().globalData.userInfo['card_field']];
-	  				    //如果会员有等级价
-	  					if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
-	  					    && getApp().globalData.userInfo['card_field']!="" && card_price>0){
-	  						  newd.goods_price=card_price;
-							  newd.member_goods_price=card_price;
-	  					}
-	  			   }
-	  		   }
-	  }
-
-	  //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
-	  if ("add" == t.currentTarget.dataset.action) {
-
-        if(th.data.prom_goods){
-          newd.prom_type = 3;
-          newd.prom_id = th.data.prom_goods[0].prom_id;
+        var s_list=JSON.parse(conf.switch_list);
+        var now=ut.gettimestamp();
+        var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
+        var end = new Date(str);
+        end = Date.parse(end) / 1000;
+
+        //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
+        if(parseInt(s_list.rank_switch)==2 && end>now){
+          var card_price=o[getApp().globalData.userInfo['card_field']];
+          //如果会员有等级价
+          if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
+              && getApp().globalData.userInfo['card_field']!="" && card_price>0){
+            newd.goods_price=card_price;
+            newd.member_goods_price=card_price;
+          }
         }
+      }
+    }
-	    //----先看会员在购物车中是否加入了该商品-----
-	    i.get("/api/weshop/cart/page", {
-	      data: {
-	        store_id: e.data.stoid,
-	        user_id: oo.user_id,
-	        goods_id: a,
-	        pick_id: e.data.sto_sele_id,
-	      },
-	      success: function(re) {			 
-			
-	        //-------如果购物车中有相关的数据---------
-	        if (re.data.data.total > 0) {
-			
-			   var item = re.data.data.pageData[0];	
-					
-			   //判断数量，要看下购物车中有没有该商品
-			  if(CanOutQty){
-					 if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
-						 return s.my_warnning("库存不足！", 0, th);		
-					 }
-				}else{
-					if(item.goods_num+ th.data.goodsInputNum>o.store_count){
-						return s.my_warnning("库存不足！", 0, th);						 
-					}
-				}  	
-
-	          var updata = {
-	            id: item.id,
-	            goods_num: e.data.goodsInputNum + item.goods_num,
-	            goods_price: newd.goods_price,
-				member_goods_price:newd.goods_price,
-	            store_id: th.data.stoid,
-	          };
-
-              //---是不是从收藏夹出来的---
-              if(th.data.c_guide_id){
-                  updata['guide_id'] = th.data.c_guide_id;
-                  updata['guide_type']=3;   //加入购物车之后就变成了3
-              }else {
-                if (getApp().globalData.guide_id) {
-                   updata['guide_id'] = getApp().globalData.guide_id;
-                   updata['guide_type'] = 0;
-                }
+    //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
+    if ("add" == t.currentTarget.dataset.action) {
+
+      if(th.data.prom_goods){
+        newd.prom_type = 3;
+        newd.prom_id = th.data.prom_goods[0].prom_id;
+      }
+
+      //----先看会员在购物车中是否加入了该商品-----
+      i.get("/api/weshop/cart/page", {
+        data: {
+          store_id: e.data.stoid,
+          user_id: oo.user_id,
+          goods_id: a,
+          pick_id: e.data.sto_sele_id,
+        },
+        success: function(re) {
+
+          //-------如果购物车中有相关的数据---------
+          if (re.data.data.total > 0) {
+
+            var item = re.data.data.pageData[0];
+
+            //判断数量，要看下购物车中有没有该商品
+            if(CanOutQty){
+              if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
+                return s.my_warnning("库存不足！", 0, th);
+              }
+            }else{
+              if(item.goods_num+ th.data.goodsInputNum>o.store_count){
+                return s.my_warnning("库存不足！", 0, th);
+              }
+            }
+
+            var updata = {
+              id: item.id,
+              goods_num: e.data.goodsInputNum + item.goods_num,
+              goods_price: newd.goods_price,
+              member_goods_price:newd.goods_price,
+              store_id: th.data.stoid,
+            };
+
+            //---是不是从收藏夹出来的---
+            if(th.data.c_guide_id){
+              updata['guide_id'] = th.data.c_guide_id;
+              updata['guide_type']=3;   //加入购物车之后就变成了3
+            }else {
+              if (getApp().globalData.guide_id) {
+                updata['guide_id'] = getApp().globalData.guide_id;
+                updata['guide_type'] = 0;
+              }
+            }
+
+            i.put("/api/weshop/cart/update", {
+              data: updata,
+              success: function(t) {
+                getApp().my_warnning('加入购物车成功', 1, th, 450);
+                var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+                th.setData({
+                  cartGoodsNum: c_num
+                });
+                th.closeSpecModal();
               }
+            });
+          } else {
+
+
+            i.post("/api/weshop/cart/save", {
+              data: newd,
+              success: function(t) {
+                getApp().my_warnning('加入购物车成功', 1, th, 450);
+                var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
+                th.setData({
+                  cartGoodsNum: c_num
+                });
+                th.closeSpecModal();
+              }
+            });
+          }
+        }
+      });
+    }
+    //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d);
+    else {
+
+      if(th.data.prom_goods){
+        var prom_d=th.data.prom_goods;
+        for(var  i in prom_d){
+          //判断活动有俩种条件，0元 1件
+          var condition_t=prom_d[i].prom_type;
+          switch(condition_t) {
+            case 0: //按钱
+              if(newd.goods_price>=condition_t){
+                newd.prom_type = 3;
+                newd.prom_id = prom_d[i].prom_id;
+              }
+              break
+            case 1://按购买数量
+              if(newd.goods_num>=condition_t){
+                newd.prom_type = 3;
+                newd.prom_id = prom_d[i].prom_id;
+              }
+              break;
+          }
+        }
-	          i.put("/api/weshop/cart/update", {
-	            data: updata,
-	            success: function(t) {
-	              getApp().my_warnning('加入购物车成功', 1, th, 450);
-	              var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-	              th.setData({
-	                cartGoodsNum: c_num
-	              });
-	              th.closeSpecModal();
-	            }
-	          });
-	        } else {
-
-
-	          i.post("/api/weshop/cart/save", {
-	            data: newd,
-	            success: function(t) {
-	              getApp().my_warnning('加入购物车成功', 1, th, 450);
-	              var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
-	              th.setData({
-	                cartGoodsNum: c_num
-	              });
-	              th.closeSpecModal();
-	            }
-	          });
-	        }
-	      }
-	    });
-	  }
-	  //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d);
-	  else {
-		 
-		if(th.data.prom_goods){
-			 var prom_d=th.data.prom_goods;
-			 for(var  i in prom_d){
-				  //判断活动有俩种条件，0元 1件
-				  var condition_t=prom_d[i].prom_type;
-				  switch(condition_t) {
-					   case 0: //按钱
-					      if(newd.goods_price>=condition_t){
-							  newd.prom_type = 3;
-							  newd.prom_id = prom_d[i].prom_id;
-						  }		   
-					      break
-					   case 1://按购买数量
-					       if(newd.goods_num>=condition_t){
-					   		  newd.prom_type = 3;
-					   		  newd.prom_id = prom_d[i].prom_id;
-					      }		   
-					      break;
-				  }				 
-			 }
-
-		}  	
-					   
-	    newd['pick_name'] = th.data.sto_sele_name;
-	    newd['pick_dis'] = th.data.sto_sele_distr;
-	    th.buyNow(newd);
-	  }
+      }
+
+      newd['pick_name'] = th.data.sto_sele_name;
+      newd['pick_dis'] = th.data.sto_sele_distr;
+      th.buyNow(newd);
+    }
   },
-  
+
   //----------购买虚拟商品------
   buyVirtualGoods: function(e) {
@@ -1256,17 +1256,17 @@ Page({
       //--判断商品是否超出限购--
       if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-		  
-		var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);  
-		  
+
+        var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
+
         if (t + gd_buy_num > th.data.sele_g.viplimited) {
           wx.showModal({
             title: '超出商品限购',
           });
-		  
-		  var num= th.data.sele_g.viplimited-gd_buy_num;
-		  if(num<0) num=0;		  
-		  th.setData({goodsInputNum:num})	
+
+          var num= th.data.sele_g.viplimited-gd_buy_num;
+          if(num<0) num=0;
+          th.setData({goodsInputNum:num})
           return false;
         }
       }
@@ -1277,10 +1277,10 @@ Page({
           wx.showModal({
             title: '超出商品活动限购',
           });
-		  
-		  var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
-		  if(num<0) num=0;		  
-		  th.setData({goodsInputNum:num})	  		  
+
+          var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
+          if(num<0) num=0;
+          th.setData({goodsInputNum:num})
           return false;
         }
       }
@@ -1289,40 +1289,40 @@ Page({
         var redis_num = 0;
         //------判断活动是否抢光-----
         await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-          os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
-            1: 1
-          }).then(res => {
+            os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
+          1: 1
+        }).then(res => {
           redis_num = res.data.data;
         });
         if (t > redis_num) {
           wx.showModal({
             title: '超出商品活动库存',
-          });		  
-		  th.setData({goodsInputNum:redis_num})	  
+          });
+          th.setData({goodsInputNum:redis_num})
+          return false;
+        }
+
+      }
+
+      var e = th.data.sele_g.store_count;
+      if(th.data.sales_rules==2){
+        if(!th.data.def_pick_store){
+          wx.showModal({ title: '请选择门店', });
           return false;
+        }else{
+          e=th.data.def_pick_store.CanOutQty;
         }
+      }
+      //库存不足，不增加
+      if(e<t){ wx.showModal({ title: '库存不足', });
+        if(e<0) e=0;
+        th.setData({ goodsInputNum: e });   return false;
       }
+      t > e || 0 == e ? t = e : t < 1 && (t = 1);
+      th.setData({ goodsInputNum: t });
-      var e = th.data.sele_g.store_count;  
-	  if(th.data.sales_rules==2){
-		  if(!th.data.def_pick_store){
-			   wx.showModal({ title: '请选择门店', });
-			   return false;
-		  }else{
-			  e=th.data.def_pick_store.CanOutQty;		 
-		  }		  
-	  }
-	  
-	  //库存不足，不增加
-	  if(e<t){ wx.showModal({ title: '库存不足', }); 
-	          if(e<0) e=0;    
-			  th.setData({ goodsInputNum: e });   return false;
-		}		 		  		 
-	  t > e || 0 == e ? t = e : t < 1 && (t = 1);
-	  th.setData({ goodsInputNum: t });
-	       
     })
   },
@@ -1359,7 +1359,7 @@ Page({
   //---------点击收藏和不收藏------------
   collectGoods: function() {
     var t = this,
-      i = getApp().request;
+        i = getApp().request;
     var user_id = s.globalData.user_id;
     if (user_id == '') {
       getApp().getUserFir(function() {});
@@ -1483,7 +1483,7 @@ Page({
   previewGoodsCommentImgs: function(t) {
     var e = this,
-      a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+        a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
     a = a.map(function(t) {
       return e.data.url + t;
     }), wx.previewImage({
@@ -1518,7 +1518,7 @@ Page({
     }
     var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
     if(getApp().globalData.user_id){
-       url+="&first_leader="+getApp().globalData.user_id;
+      url+="&first_leader="+getApp().globalData.user_id;
     }
     return {
@@ -1557,82 +1557,82 @@ Page({
         is_on_sale: 1
       }
     }).then(res => {
-      var e = res; 
-      if (e.data.code == 0) arrdata = e.data.data.pageData;           
+      var e = res;
+      if (e.data.code == 0) arrdata = e.data.data.pageData;
     })
-	if(!arrdata) return fasle;
-	
-	var arrsku = new Array();
+    if(!arrdata) return fasle;
+
+    var arrsku = new Array();
     var gitem = null;
-	var gb = 1,gg = "";	
-	for (var i = 0; i < arrdata.length; i++) {	
-		  var goodsinfo=arrdata[i],prom=null;	
-          if (goodsinfo.goods_id != g_id) {	  
-			  if(goodsinfo.prom_type==1){	
-					await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{		  		
-					}).then(res=>{
-						  if(res.data.code==0) prom=res.data.data;					  
-					})
-			  }	  
-			  if(goodsinfo.prom_type==6){
-					await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-					}).then(res=>{
-						if(res.data.code==0) prom=res.data.data;
-					})	  
-			  }	  
-		  }				  
-		  //---如果有活动，不算在一起---
-          if(prom){
-			  if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){	  			  
-				 continue;
-	  		  }			  
-		  }		  
-							
-          var item = arrdata[i],gg = "";
-          if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec="";
-          if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
-
-          if (item.goods_spec != "" && item.goods_color != "") {
-            gg = item.goods_spec + "/" + item.goods_color;
-          } else if (item.goods_spec != "" || item.goods_color != "") {
-            gg = item.goods_spec + item.goods_color;
-          } else {
-            gg = "规格" + gb;
-            gb++;
-          }
-          item.gg = gg;
+    var gb = 1,gg = "";
+    for (var i = 0; i < arrdata.length; i++) {
+      var goodsinfo=arrdata[i],prom=null;
+      if (goodsinfo.goods_id != g_id) {
+        if(goodsinfo.prom_type==1){
+          await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+          }).then(res=>{
+            if(res.data.code==0) prom=res.data.data;
+          })
+        }
+        if(goodsinfo.prom_type==6){
+          await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+          }).then(res=>{
+            if(res.data.code==0) prom=res.data.data;
+          })
+        }
+      }
+      //---如果有活动，不算在一起---
+      if(prom){
+        if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
+          continue;
+        }
+      }
-          if(item.spec_img)
-		      item.original_img=os.imghost+item.spec_img;
-          else
-             item.original_img=os.imghost+item.original_img;
+      var item = arrdata[i],gg = "";
+      if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec="";
+      if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
-		   
-          if (item.goods_id == g_id) {
-            gitem = item;
-          } else {
-            arrsku.push(item);
-          }
-        }
-        //-----------排列在最前面-------------
-        arrsku.splice(0, 0, gitem);
-        if (is_normal == 1) {
-          tt.setData({
-            sku_g_pt: arrsku,
-            sele_g: gitem
-          });
-          func();
-        } else {
-          tt.setData({
-            sku_g: arrsku,
-            sele_g: gitem
-          });
-        }	
+      if (item.goods_spec != "" && item.goods_color != "") {
+        gg = item.goods_spec + "/" + item.goods_color;
+      } else if (item.goods_spec != "" || item.goods_color != "") {
+        gg = item.goods_spec + item.goods_color;
+      } else {
+        gg = "规格" + gb;
+        gb++;
+      }
+      item.gg = gg;
+
+      if(item.spec_img)
+        item.original_img=os.imghost+item.spec_img;
+      else
+        item.original_img=os.imghost+item.original_img;
+
+
+      if (item.goods_id == g_id) {
+        gitem = item;
+      } else {
+        arrsku.push(item);
+      }
+    }
+    //-----------排列在最前面-------------
+    arrsku.splice(0, 0, gitem);
+    if (is_normal == 1) {
+      tt.setData({
+        sku_g_pt: arrsku,
+        sele_g: gitem
+      });
+      func();
+    } else {
+      tt.setData({
+        sku_g: arrsku,
+        sele_g: gitem
+      });
+    }
   },
   //-----------选择属性的按钮事件----------
   sele_spec: function(e) {
-	var that=this,ee=this,th=this; 
+    var that=this,ee=this,th=this;
     var gid = e.currentTarget.dataset.gid;
     var sku_g = this.data.sku_g;
     var item = null;
@@ -1650,95 +1650,95 @@ Page({
     that.check_is_youhui(gid)
-		this.get_sto();
-	    //默认门店要拿下门店库存
-	    if(that.data.sales_rules==2 && that.data.def_pick_store){			    
-			  var lock=0,plist=null;
-			  //先读取门店的lock,采用链式写法，少用await
-			  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-				  data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000}
-			  }).then(res=>{
-				  if(res.data.code==0 && res.data.data.total>0){
-					  for(var i in res.data.data.pageData)
-						 lock+=res.data.data.pageData[i].outQty
-				  }
-				  //---通过接口获取门店的线下库存信息--
-				  return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-					  data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}		  
-				  })
-			  }).then(res=>{
-					if(res.data.code==0 && res.data.data.total>0){
-						 plist=res.data.data.pageData[0];		 
-					}
-					if(plist && plist.CanOutQty-lock>0){
-						 that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock;
-					}else{
-						that.data.def_pick_store.CanOutQty=0;
-					}
-					//--给门店赋值线下库存--
-					th.setData({def_pick_store:that.data.def_pick_store});
-			  })								
-	     }
-
-	
-	this.sele_spec_chech_activity();	
+    this.get_sto();
+    //默认门店要拿下门店库存
+    if(that.data.sales_rules==2 && that.data.def_pick_store){
+      var lock=0,plist=null;
+      //先读取门店的lock,采用链式写法，少用await
+      getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+        data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000}
+      }).then(res=>{
+        if(res.data.code==0 && res.data.data.total>0){
+          for(var i in res.data.data.pageData)
+            lock+=res.data.data.pageData[i].outQty
+        }
+        //---通过接口获取门店的线下库存信息--
+        return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+          data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
+        })
+      }).then(res=>{
+        if(res.data.code==0 && res.data.data.total>0){
+          plist=res.data.data.pageData[0];
+        }
+        if(plist && plist.CanOutQty-lock>0){
+          that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock;
+        }else{
+          that.data.def_pick_store.CanOutQty=0;
+        }
+        //--给门店赋值线下库存--
+        th.setData({def_pick_store:that.data.def_pick_store});
+      })
+    }
+
+
+    this.sele_spec_chech_activity();
   },
-  
+
   //选择了不同的规格的时候要判断是不是有活动正在进行中
   async sele_spec_chech_activity(){
-	      //---如果是活动的时候---
-	  	  var prom=null,goodsinfo=this.data.sele_g,th=this;
-	  	  if(goodsinfo.prom_type==1){	
-	  		  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{		  		
-	  		  }).then(res=>{
-	  			  if(res.data.code==0){
-	  				  prom=res.data.data;
-	  			  }
-	  		  })
-	  	  }	  
-	  	  if(goodsinfo.prom_type==6){
-	  	  	await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-	  	  	}).then(res=>{
-	  			  if(res.data.code==0){
-	  				  prom=res.data.data;
-	  			  }
-	  	  	})	  
-	  	  }	  
-	  	  //----------如果有活动，并且在进行中，就不计算线下库存---------------
-	  	  var now=ut.gettimestamp();
-	  	  if(prom){
-	  		  if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
-	  			   th.setData({
-					   prom_type:goodsinfo.prom_type,
-					   prom_price:prom.price,
-					   prom_buy_limit:prom.buy_limit,
-					   prom_end_time:prom.end_time,
-					   prom_start_time:prom.start_time,
-					   prom_st:1,
-				 })
-				 return false;
-	  		  }
-	  	 }
-		 //---设置普通商品---
-		 th.setData({
-			   prom_type:0,
-			   prom_price:null,
-			   prom_buy_limit:null,
-			   prom_end_time:null,
-			   prom_start_time:null,
-			   prom_st:null,
-		 })
-		 
+    //---如果是活动的时候---
+    var prom=null,goodsinfo=this.data.sele_g,th=this;
+    if(goodsinfo.prom_type==1){
+      await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+      }).then(res=>{
+        if(res.data.code==0){
+          prom=res.data.data;
+        }
+      })
+    }
+    if(goodsinfo.prom_type==6){
+      await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+      }).then(res=>{
+        if(res.data.code==0){
+          prom=res.data.data;
+        }
+      })
+    }
+    //----------如果有活动，并且在进行中，就不计算线下库存---------------
+    var now=ut.gettimestamp();
+    if(prom){
+      if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
+        th.setData({
+          prom_type:goodsinfo.prom_type,
+          prom_price:prom.price,
+          prom_buy_limit:prom.buy_limit,
+          prom_end_time:prom.end_time,
+          prom_start_time:prom.start_time,
+          prom_st:1,
+        })
+        return false;
+      }
+    }
+    //---设置普通商品---
+    th.setData({
+      prom_type:0,
+      prom_price:null,
+      prom_buy_limit:null,
+      prom_end_time:null,
+      prom_start_time:null,
+      prom_st:null,
+    })
+
   },
- 
- 
+
+
   //---------拿出门店分类和门店------------
   get_sto(e) {
     var th = this,that=this;
     var timer_get = setInterval(function() {
       if (th.data.is_get_local_ok == 0) return false;
       var dd = null,
-        i = getApp().request;
+          i = getApp().request;
       var g_distr_type = th.data.sele_g.distr_type;
       if (g_distr_type != 0) {
         dd = {
@@ -1762,7 +1762,7 @@ Page({
       clearInterval(timer_get);
       if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
-         th.setData({def_pick_store:null});
+        th.setData({def_pick_store:null});
       }
@@ -1772,7 +1772,7 @@ Page({
       }).then(res => {
         var e = res;
         if (e.data.code == 0) {
-			
+
           //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
           if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){
             th.setData({
@@ -1781,7 +1781,7 @@ Page({
               sto_sele_id: e.data.data.pageData[0].pickup_id,
               sto_sele_distr: e.data.data.pageData[0].distr_type
             });
-			th.data.fir_def_store=e.data.data.pageData[0];
+            th.data.fir_def_store=e.data.data.pageData[0];
           }
           //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
@@ -1794,266 +1794,266 @@ Page({
             }
             e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
           }
-		  
-		  
-		  th.setData({all_pick_list:e.data.data.pageData});
-		 		
-		  //--获取线下库存,而且不是新的门店规则,同时不能是活动--
-		  if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){			  
-			  setTimeout(function(){
-				   th.deal_pickup_dline(e);
-			  },800)			 
-		  }else{
-			  setTimeout(function(){
-			      th.deal_pickup(e);  //--普通门店排版--
-			  },800)
-		  }      
-		}
+
+
+          th.setData({all_pick_list:e.data.data.pageData});
+
+          //--获取线下库存,而且不是新的门店规则,同时不能是活动--
+          if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){
+            setTimeout(function(){
+              th.deal_pickup_dline(e);
+            },800)
+          }else{
+            setTimeout(function(){
+              th.deal_pickup(e);  //--普通门店排版--
+            },800)
+          }
+        }
       })
     }, 200)
   },
-  
+
   //------------处理门店---------------
   deal_pickup(e){
-	  var th=this;
-
-	  var g_distr_type=th.data.sele_g.distr_type;
-
-	  //单总量超出5个的时候
-	  if (e.data.data.total > 5) {
-	     getApp().request.get("/api/weshop/storagecategory/page", {
-	      data: {
-	        store_id: o.stoid,
-	        is_show: 1,
-	        pageSize: 1000
-	      },
-	      success: function(ee) {
-	        if (ee.data.code == 0) {
-	          if (ee.data.data && ee.data.data.pageData &&  ee.data.data.pageData.length > 0) {
-	            var def_arr = new Array();
-	            var ishas = 0;
-	            //-- 开始就看5个门店 --
-	            for (var k = 0; k < 5; k++) {
-	              if (k == e.data.data.pageData.length) break;
-	              def_arr.push(e.data.data.pageData[k]);
-	            }
-	  
-	            th.setData({
-	              def_pickpu_list: def_arr,
-	              pickpu_list: ee.data.data.pageData
-	            });
-	            var sto_cate = ee.data.data.pageData;
-	            var sto_arr = e.data.data.pageData;
-	            var newarr = new Array();
-	            var qita = new Array();
-	  
-	            //----要进行门店分组--------
-	            for (var i = 0; i < sto_arr.length; i++) {
-	              //找一下这个门店有没有在分类数组内
-	              var find2 = 0,
-	                find2name = "";
-	              for (var m = 0; m < sto_cate.length; m++) {
-	                if (sto_arr[i].category_id == sto_cate[m].cat_id) {
-	                  find2 = sto_cate[m].cat_id;
-	                  find2name = sto_cate[m].cat_name;
-	                  break;
-	                }
-	              }
-	  
-	              if (newarr.length > 0) {
-	                var find = 0;
-	                //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-	                if (find2 != 0) {
-	                  for (var ii = 0; ii < newarr.length; ii++) {
-	                    if (sto_arr[i].category_id == newarr[ii].cat_id) {
-	                      newarr[ii].s_arr.push(sto_arr[i]);
-	                      find = 1;
-	                      break;
-	                    }
-	                  }
-	                  if (find == 0) {
-	                    var arr0 = new Array();
-	                    arr0.push(sto_arr[i]);
-	                    var item = {
-	                      cat_id: find2,
-	                      name: find2name,
-	                      s_arr: arr0
-	                    };
-	                    newarr.push(item);
-	                  }
-	                } else {
-	                  qita.push(sto_arr[i]);
-	                }
-	              } else {
-	                //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-	                if (find2 != 0) {
-	                  var arr0 = new Array();
-	                  arr0.push(sto_arr[i]);
-	                  var item = {
-	                    cat_id: find2,
-	                    name: find2name,
-	                    s_arr: arr0
-	                  };
-	                  newarr.push(item);
-	                } else {
-	                  qita.push(sto_arr[i]);
-	                }
-	              }
-	            }
-	  
-	            //----安排其他的分类-----
-	            if (qita.length > 0) {
-	              var item = {
-	                cat_id: -1,
-	                name: "其他",
-	                s_arr: qita
-	              };
-	              newarr.push(item);
-	            }
-	            th.setData({
-	              is_show_sto_cat: 1,
-	              all_sto: newarr
-	            });
-	  
-	          } else {
-	               th.setData({
-	                 is_show_sto_cat: -1,
-	                 only_pk: e.data.data.pageData
-	               });
-	              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
-	              if (!th.data.def_pick_store) {
-	                 th.setData({def_pick_store:e.data.data.pageData[0]})
-	              }
-	          }
-	        } else {
-	          th.setData({
-	            is_show_sto_cat: -1,
-	            only_pk: e.data.data.pageData
-	          });
-	          //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
-	          if (!th.data.def_pick_store) {
-	            th.setData({def_pick_store:e.data.data.pageData[0]})
-	          }
-	  
-	        }
-	      }
-	    });
-	  } else {
-	    th.setData({
-	      is_show_sto_cat: 0,
-	      only_pk: e.data.data.pageData
-	    });
-	    //-----如果没有默认门店，要取第一个门店作为默认店------
-	    if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) {
-	      th.setData({
-	        def_pick_store:e.data.data.pageData[0],
-	        sto_sele_name: e.data.data.pageData[0].pickup_name,
-	        sto_sele_id: e.data.data.pageData[0].pickup_id,
-	        sto_sele_distr: e.data.data.pageData[0].distr_type
-	      })
-	    }
-	}
+    var th=this;
+
+    var g_distr_type=th.data.sele_g.distr_type;
+
+    //单总量超出5个的时候
+    if (e.data.data.total > 5) {
+      getApp().request.get("/api/weshop/storagecategory/page", {
+        data: {
+          store_id: o.stoid,
+          is_show: 1,
+          pageSize: 1000
+        },
+        success: function(ee) {
+          if (ee.data.code == 0) {
+            if (ee.data.data && ee.data.data.pageData &&  ee.data.data.pageData.length > 0) {
+              var def_arr = new Array();
+              var ishas = 0;
+              //-- 开始就看5个门店 --
+              for (var k = 0; k < 5; k++) {
+                if (k == e.data.data.pageData.length) break;
+                def_arr.push(e.data.data.pageData[k]);
+              }
+
+              th.setData({
+                def_pickpu_list: def_arr,
+                pickpu_list: ee.data.data.pageData
+              });
+              var sto_cate = ee.data.data.pageData;
+              var sto_arr = e.data.data.pageData;
+              var newarr = new Array();
+              var qita = new Array();
+
+              //----要进行门店分组--------
+              for (var i = 0; i < sto_arr.length; i++) {
+                //找一下这个门店有没有在分类数组内
+                var find2 = 0,
+                    find2name = "";
+                for (var m = 0; m < sto_cate.length; m++) {
+                  if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                    find2 = sto_cate[m].cat_id;
+                    find2name = sto_cate[m].cat_name;
+                    break;
+                  }
+                }
+
+                if (newarr.length > 0) {
+                  var find = 0;
+                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                  if (find2 != 0) {
+                    for (var ii = 0; ii < newarr.length; ii++) {
+                      if (sto_arr[i].category_id == newarr[ii].cat_id) {
+                        newarr[ii].s_arr.push(sto_arr[i]);
+                        find = 1;
+                        break;
+                      }
+                    }
+                    if (find == 0) {
+                      var arr0 = new Array();
+                      arr0.push(sto_arr[i]);
+                      var item = {
+                        cat_id: find2,
+                        name: find2name,
+                        s_arr: arr0
+                      };
+                      newarr.push(item);
+                    }
+                  } else {
+                    qita.push(sto_arr[i]);
+                  }
+                } else {
+                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                  if (find2 != 0) {
+                    var arr0 = new Array();
+                    arr0.push(sto_arr[i]);
+                    var item = {
+                      cat_id: find2,
+                      name: find2name,
+                      s_arr: arr0
+                    };
+                    newarr.push(item);
+                  } else {
+                    qita.push(sto_arr[i]);
+                  }
+                }
+              }
+
+              //----安排其他的分类-----
+              if (qita.length > 0) {
+                var item = {
+                  cat_id: -1,
+                  name: "其他",
+                  s_arr: qita
+                };
+                newarr.push(item);
+              }
+              th.setData({
+                is_show_sto_cat: 1,
+                all_sto: newarr
+              });
+
+            } else {
+              th.setData({
+                is_show_sto_cat: -1,
+                only_pk: e.data.data.pageData
+              });
+              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+              if (!th.data.def_pick_store) {
+                th.setData({def_pick_store:e.data.data.pageData[0]})
+              }
+            }
+          } else {
+            th.setData({
+              is_show_sto_cat: -1,
+              only_pk: e.data.data.pageData
+            });
+            //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+            if (!th.data.def_pick_store) {
+              th.setData({def_pick_store:e.data.data.pageData[0]})
+            }
+
+          }
+        }
+      });
+    } else {
+      th.setData({
+        is_show_sto_cat: 0,
+        only_pk: e.data.data.pageData
+      });
+      //-----如果没有默认门店，要取第一个门店作为默认店------
+      if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) {
+        th.setData({
+          def_pick_store:e.data.data.pageData[0],
+          sto_sele_name: e.data.data.pageData[0].pickup_name,
+          sto_sele_id: e.data.data.pageData[0].pickup_id,
+          sto_sele_distr: e.data.data.pageData[0].distr_type
+        })
+      }
+    }
   },
   //------------处理线下门店库存--------
   deal_pickup_dline(e){
-	  var pkno=[],th=this;
-	  if(this.data.def_pick_store){
-		  pkno.push(this.data.def_pick_store.pickup_no);
-	  }
-	  for(var i in e.data.data.pageData){
-		  var item=e.data.data.pageData[i];
-		  if(pkno.indexOf(item.pickup_no)<0)
-		       pkno.push(item.pickup_no);
-	  }	  
-	  var pkno_str=pkno.join(",");
-	  var o_plist=e.data.data.pageData;
-	  var new_list=[];
-	  var is_find_def_store=0;
-
-
-	  var g_distr_type=th.data.sele_g.distr_type;
-	  var lock=[];
-	  //先读取门店的lock,采用链式写法，少用await
-	  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000}
-	  }).then(res=>{
-		  if(res.data.code==0 && res.data.data.total>0){
-			  lock=res.data.data.pageData
-		  }
-		  //---通过接口获取门店的线下库存信息--
-		  return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		      data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000}		  
-	      })
-	  }).then(res=>{	
-			  if(res.data.code==0){				   
-				   if(res.data.data.pageData){
-						var plist=res.data.data.pageData;	
-						var def_pick_store=th.data.def_pick_store;				
-						//以原来的数组为外循环，保证距离的顺序
-						for(var kk in o_plist){
-							   for(var ii in plist){
-								   //线下的门店小心
-								   var n_item=plist[ii];								  
-								   if(n_item.StorageNo==o_plist[kk].pickup_no){
-									  								 
-									   //拿到锁库的数量
-									   var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);	
-									   //可出库数大于预出库库存的数量，可以判断为有库存
-									   if(n_item.CanOutQty>lock_num){									   
-										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;														 
-										   new_list.push(o_plist[kk]);  
-										   //--如果找到默认门店,同时也应该判断配送方式对不对--
-										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no  &&  (g_distr_type==0 ||  th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
-											   th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;												   
-											   if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
-											        th.setData({def_pick_store:th.data.fir_def_store})											   
-											   is_find_def_store=1;													  
-										   }
-										}
-										break;
-								   }
-							}
-						}		
-						
-						//数据组装下
-						var em={};em.data={};em.data.data={};
-						em.data.data.total=new_list.length;
-						em.data.data.pageData=new_list;
-
-                        //--如果找到默认门店,同时也应该判断配送方式对不对--
-						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&  (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
-							  th.data.fir_def_store.CanOutQty=0;							  
-							  //--当选择的门店是客户默认的门店的时候--
-							  if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
-								    th.setData({def_pick_store:th.data.fir_def_store});
-									em.data.data.pageData.unshift(th.data.def_pick_store);	
-							  }else{
-								   em.data.data.pageData.splice(1,0,th.data.fir_def_store);	
-							  }													 
-						}
-												
-						//---把数组组装进去---
-						th.deal_pickup(em);																														
-				   }else{
-						th.setData({def_pick_store:null,all_sto:null,only_pk:null})
-				   }				   
-			  }else{
-				  th.setData({def_pick_store:null,all_sto:null,only_pk:null})
-			  }		  
-	  })	  	  
+    var pkno=[],th=this;
+    if(this.data.def_pick_store){
+      pkno.push(this.data.def_pick_store.pickup_no);
+    }
+    for(var i in e.data.data.pageData){
+      var item=e.data.data.pageData[i];
+      if(pkno.indexOf(item.pickup_no)<0)
+        pkno.push(item.pickup_no);
+    }
+    var pkno_str=pkno.join(",");
+    var o_plist=e.data.data.pageData;
+    var new_list=[];
+    var is_find_def_store=0;
+
+
+    var g_distr_type=th.data.sele_g.distr_type;
+    var lock=[];
+    //先读取门店的lock,采用链式写法，少用await
+    getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+      data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000}
+    }).then(res=>{
+      if(res.data.code==0 && res.data.data.total>0){
+        lock=res.data.data.pageData
+      }
+      //---通过接口获取门店的线下库存信息--
+      return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+        data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000}
+      })
+    }).then(res=>{
+      if(res.data.code==0){
+        if(res.data.data.pageData){
+          var plist=res.data.data.pageData;
+          var def_pick_store=th.data.def_pick_store;
+          //以原来的数组为外循环，保证距离的顺序
+          for(var kk in o_plist){
+            for(var ii in plist){
+              //线下的门店小心
+              var n_item=plist[ii];
+              if(n_item.StorageNo==o_plist[kk].pickup_no){
+
+                //拿到锁库的数量
+                var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);
+                //可出库数大于预出库库存的数量，可以判断为有库存
+                if(n_item.CanOutQty>lock_num){
+                  o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;
+                  new_list.push(o_plist[kk]);
+                  //--如果找到默认门店,同时也应该判断配送方式对不对--
+                  if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no  &&  (g_distr_type==0 ||  th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
+                    th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;
+                    if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
+                      th.setData({def_pick_store:th.data.fir_def_store})
+                    is_find_def_store=1;
+                  }
+                }
+                break;
+              }
+            }
+          }
+
+          //数据组装下
+          var em={};em.data={};em.data.data={};
+          em.data.data.total=new_list.length;
+          em.data.data.pageData=new_list;
+
+          //--如果找到默认门店,同时也应该判断配送方式对不对--
+          if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&  (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
+            th.data.fir_def_store.CanOutQty=0;
+            //--当选择的门店是客户默认的门店的时候--
+            if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
+              th.setData({def_pick_store:th.data.fir_def_store});
+              em.data.data.pageData.unshift(th.data.def_pick_store);
+            }else{
+              em.data.data.pageData.splice(1,0,th.data.fir_def_store);
+            }
+          }
+
+          //---把数组组装进去---
+          th.deal_pickup(em);
+        }else{
+          th.setData({def_pick_store:null,all_sto:null,only_pk:null})
+        }
+      }else{
+        th.setData({def_pick_store:null,all_sto:null,only_pk:null})
+      }
+    })
   },
   find_lock_num(pick_id,lock){
-	  var lock_num=0;
-	  if(!lock) return 0;	  
-	  if(lock.length<0) return 0;
-	  for(var i in lock){
-		  if(pick_id==lock[i].pickupId){
-			   lock_num+=lock[i].outQty;
-		  }
-	  }
-	  return lock_num;
+    var lock_num=0;
+    if(!lock) return 0;
+    if(lock.length<0) return 0;
+    for(var i in lock){
+      if(pick_id==lock[i].pickupId){
+        lock_num+=lock[i].outQty;
+      }
+    }
+    return lock_num;
   },
   //----------取货门店被点击的效果------
@@ -2113,12 +2113,12 @@ Page({
       var tot = res.data.data.total;
       e.data.c_curr_p++;
       e.setData({
-          com_num: tot, //已经有加载
+        com_num: tot, //已经有加载
       });
       if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-         rs_data=res.data.data.pageData;
+        rs_data=res.data.data.pageData;
       }else{
-         th.setData({comments_no_more:1,auto:1});
+        th.setData({comments_no_more:1,auto:1});
       }
     })
@@ -2126,30 +2126,30 @@ Page({
       //var cda = th.data.comments;
       var cda = rs_data,com_data=th.data.comments;
       for (var ind in cda) {
-          var ep = cda[ind];
-          if (cda[ind].head_pic == '') {
-              cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png";
-          }
-          if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) {
-             cda[ind].weapp_img = JSON.parse(ep.weapp_img);
-          }
-          if (ep.img != "" && ut.isString(ep.img)) {
-             cda[ind].img = ut.unserialize(ep.img);
-          }
+        var ep = cda[ind];
+        if (cda[ind].head_pic == '') {
+          cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png";
+        }
+        if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) {
+          cda[ind].weapp_img = JSON.parse(ep.weapp_img);
+        }
+        if (ep.img != "" && ut.isString(ep.img)) {
+          cda[ind].img = ut.unserialize(ep.img);
+        }
-          //--测量多有字的宽带，计算有多少行--
-          var widh=ut.measureText(ep.content,30);
-          var lines=widh/712;
-          cda[ind].seeMore=false;
-          if(lines>3) cda[ind].seeMore=true;
-
-          await getApp().request.promiseGet("/api/weshop/comment/pageComment", {
-            data: {store_id: o.stoid, parent_id: ep.comment_id }
-          }).then(res => {
-            if (res.data.data.pageData && res.data.data.pageData.length > 0) {
-                cda[ind].replay_list = res.data.data.pageData;
-            }
-          })
+        //--测量多有字的宽带，计算有多少行--
+        var widh=ut.measureText(ep.content,30);
+        var lines=widh/712;
+        cda[ind].seeMore=false;
+        if(lines>3) cda[ind].seeMore=true;
+
+        await getApp().request.promiseGet("/api/weshop/comment/pageComment", {
+          data: {store_id: o.stoid, parent_id: ep.comment_id }
+        }).then(res => {
+          if (res.data.data.pageData && res.data.data.pageData.length > 0) {
+            cda[ind].replay_list = res.data.data.pageData;
+          }
+        })
       }
       if (!com_data) com_data = cda;
@@ -2174,7 +2174,7 @@ Page({
   //--------检查是否活动，活动是否开始，或者是否结束-------
   async check_prom(gid, prom_type, prom_id) {
     var ee = this,
-      th = ee;
+        th = ee;
     if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4 || prom_type == 5) {
       this.setData({
         prom_type: 0,
@@ -2197,91 +2197,91 @@ Page({
           });
           //拿取价格并且判断时间--
           getApp().request.get("/api/ms/flash_sale/get/" +
-            os.stoid + "/" + prom_id, {
-              success: function(t) {
-                if (t.data.code != 0) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                  return false;
-                }
-                //----已经结束-----
-                if (t.data.data.is_end == 1) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-				  ee.get_sto();
-                  return false;
-                }
-                //----已经过期-----
-                var now = ut.gettimestamp();
-                if (t.data.data.end_time < now) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                  return false;
-                }
-
-                /*-- 还没有开始预热的也不显示 --*/
-                if (t.data.data.show_time > now) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-				  ee.get_sto();
-                  return false;
-                }
-
-                var t_gd = ee.data.data;
-                var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
-                var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
+              os.stoid + "/" + prom_id, {
+            success: function(t) {
+              if (t.data.code != 0) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                return false;
+              }
+              //----已经结束-----
+              if (t.data.data.is_end == 1) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sto();
+                return false;
+              }
+              //----已经过期-----
+              var now = ut.gettimestamp();
+              if (t.data.data.end_time < now) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                return false;
+              }
+              /*-- 还没有开始预热的也不显示 --*/
+              if (t.data.data.show_time > now) {
                 ee.setData({
-                  prom_price: t.data.data.price,
-                  prom_type: 1,
-                  prom_id: prom_id,
-                  prom_buy_limit: t.data.data.buy_limit,
-                  prom_act: t.data.data,
-                  prom_end_time: prom_end_time,
-                  prom_start_time: prom_start_time,
+                  prom_type: 0,
                   isshow: 1,
                 });
-				
-				ee.get_sto();
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sto();
+                return false;
+              }
+
+              var t_gd = ee.data.data;
+              var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
+              var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
+
+              ee.setData({
+                prom_price: t.data.data.price,
+                prom_type: 1,
+                prom_id: prom_id,
+                prom_buy_limit: t.data.data.buy_limit,
+                prom_act: t.data.data,
+                prom_end_time: prom_end_time,
+                prom_start_time: prom_start_time,
+                isshow: 1,
+              });
+
+              ee.get_sto();
-                var newTime = ut.gettimestamp();
-                var endTime2 = t.data.data.end_time;
-                var endTime1 = t.data.data.start_time;
+              var newTime = ut.gettimestamp();
+              var endTime2 = t.data.data.end_time;
+              var endTime1 = t.data.data.start_time;
-                //---苹果机不兼容---
-                /*----
-                var endTime2 = new Date(prom_end_time).getTime();
-                var endTime1 = new Date(prom_start_time).getTime();----*/
+              //---苹果机不兼容---
+              /*----
+              var endTime2 = new Date(prom_end_time).getTime();
+              var endTime1 = new Date(prom_start_time).getTime();----*/
-                if (endTime1 > newTime) {
+              if (endTime1 > newTime) {
+                ee.setData({
+                  prom_time_text: '距秒杀开始还有'
+                })
+                ee.countDown(endTime1, 0);
+              } else {
+                if (endTime2 > newTime) {
                   ee.setData({
-                    prom_time_text: '距秒杀开始还有'
+                    prom_time_text: '距秒杀结束还有',
+                    prom_st: 1
                   })
-                  ee.countDown(endTime1, 0);
-                } else {
-                  if (endTime2 > newTime) {
-                    ee.setData({
-                      prom_time_text: '距秒杀结束还有',
-                      prom_st: 1
-                    })
-                    ee.countDown(endTime2);
-                  }
+                  ee.countDown(endTime2);
                 }
               }
-            });
+            }
+          });
         }
       })
     }
@@ -2301,152 +2301,152 @@ Page({
           });
           //拿取价格并且判断时间--
           getApp().request.get("/api/weshop/teamlist/get/" +
-            os.stoid + "/" + prom_id, {
-              success: function(t) {
-                if (t.data.code != 0) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-				  ee.get_sto();
-                  return false;
-                }
-                //----已经结束-----
-                if (t.data.data.is_end == 1) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                  return false;
-                }
-                //----已经过期-----
-                var now = ut.gettimestamp();
-                if (t.data.data.end_time < now) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-				  ee.get_sto();
-                  return false;
-                }
+              os.stoid + "/" + prom_id, {
+            success: function(t) {
+              if (t.data.code != 0) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sto();
+                return false;
+              }
+              //----已经结束-----
+              if (t.data.data.is_end == 1) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                return false;
+              }
+              //----已经过期-----
+              var now = ut.gettimestamp();
+              if (t.data.data.end_time < now) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sto();
+                return false;
+              }
-                /*-- 还没有开始预热的也不显示 --*/
-                if (t.data.data.show_time > now) {
-                  ee.setData({
-                    prom_type: 0,
-                    isshow: 1,
-                  });
-                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
-				  ee.get_sto();
-                  return false;
-                }
+              /*-- 还没有开始预热的也不显示 --*/
+              if (t.data.data.show_time > now) {
+                ee.setData({
+                  prom_type: 0,
+                  isshow: 1,
+                });
+                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sto();
+                return false;
+              }
-                //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
-                getApp().request.get("/api/weshop/order/page", {
-                  data: {
-                    pt_prom_id: prom_id,
-                    user_id: oo.user_id,
-                    store_id: os.stoid,
-                    pageSize: 1,
-                    page: 1
-                  },
-                  success: function(e) {
-                    if (e.data.code == 0 && e.data.data.pageData.length > 0) {
-                      var odr = e.data.data.pageData[0];
-                      th.data.buy_order = odr;
-                      if (odr.pt_status == 0 && odr.order_status == 1) {
+              //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
+              getApp().request.get("/api/weshop/order/page", {
+                data: {
+                  pt_prom_id: prom_id,
+                  user_id: oo.user_id,
+                  store_id: os.stoid,
+                  pageSize: 1,
+                  page: 1
+                },
+                success: function(e) {
+                  if (e.data.code == 0 && e.data.data.pageData.length > 0) {
+                    var odr = e.data.data.pageData[0];
+                    th.data.buy_order = odr;
+                    if (odr.pt_status == 0 && odr.order_status == 1) {
+                      th.setData({
+                        user_order_pt_state: 1
+                      });
+                    }
+                    if (odr.pt_status == 1 && odr.order_status == 1) {
+                      if (odr.is_zsorder == 4) {
+                        getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
+                          data: {
+                            store_id: os.stoid,
+                            team_id: odr.pt_prom_id,
+                            listno: odr.pt_listno
+                          }
+                        }).then(res => {
+                          var now = ut.gettimestamp();
+                          var tgr = res.data.data.pageData[0];
+                          //如果团的时间已经到了
+                          if (now >= tgr.kt_end_time) {
+                            th.update_jiti(tgr.id);
+                          } else {
+                            th.setData({
+                              user_order_pt_state: 2
+                            });
+                          }
+                        })
+
+                      } else {
                         th.setData({
-                          user_order_pt_state: 1
+                          user_order_pt_state: 2
                         });
                       }
-                      if (odr.pt_status == 1 && odr.order_status == 1) {
-                        if (odr.is_zsorder == 4) {
-                          getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
-                            data: {
-                              store_id: os.stoid,
-                              team_id: odr.pt_prom_id,
-                              listno: odr.pt_listno
-                            }
-                          }).then(res => {
-                            var now = ut.gettimestamp();
-                            var tgr = res.data.data.pageData[0];
-                            //如果团的时间已经到了
-                            if (now >= tgr.kt_end_time) {
-                              th.update_jiti(tgr.id);
-                            } else {
-                              th.setData({
-                                user_order_pt_state: 2
-                              });
-                            }
-                          })
-
-                        } else {
-                          th.setData({
-                            user_order_pt_state: 2
-                          });
-                        }
-                      }
+                    }
-                      if (odr.pt_status == 2 && odr.is_zsorder == 4) {
-                        th.setData({
-                          user_order_pt_state: 3,
-                        });
-                        th.data.wk_order_id = odr.order_id;
-                      }
+                    if (odr.pt_status == 2 && odr.is_zsorder == 4) {
+                      th.setData({
+                        user_order_pt_state: 3,
+                      });
+                      th.data.wk_order_id = odr.order_id;
                     }
-                  },
-                });
+                  }
+                },
+              });
-                //----------查看阶梯团------------
-                if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
-                  t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
-                  var max_num = 0;
-                  t.data.data.ct_rylist.forEach(function(val, ind) {
-                    if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
-                  })
-                  t.data.data.max_ct_num = max_num;
-                }
+              //----------查看阶梯团------------
+              if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
+                t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
+                var max_num = 0;
+                t.data.data.ct_rylist.forEach(function(val, ind) {
+                  if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
+                })
+                t.data.data.max_ct_num = max_num;
+              }
-                var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
-                var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
-                ee.setData({
-                  prom_price: t.data.data.price,
-                  prom_type: 6,
-                  prom_id: prom_id,
-                  prom_buy_limit: t.data.data.buy_limit,
-                  prom_act: t.data.data,
-                  prom_end_time: prom_end_time,
-                  prom_start_time: prom_start_time,
-                  isshow: 1,
-                });
-				
-				ee.get_sto();
+              var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
+              var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
+              ee.setData({
+                prom_price: t.data.data.price,
+                prom_type: 6,
+                prom_id: prom_id,
+                prom_buy_limit: t.data.data.buy_limit,
+                prom_act: t.data.data,
+                prom_end_time: prom_end_time,
+                prom_start_time: prom_start_time,
+                isshow: 1,
+              });
-                var newTime = now;
-                var endTime2 = t.data.data.end_time;
-                var endTime1 = t.data.data.start_time;
+              ee.get_sto();
-                if (endTime1 > newTime) {
+              var newTime = now;
+              var endTime2 = t.data.data.end_time;
+              var endTime1 = t.data.data.start_time;
+
+              if (endTime1 > newTime) {
+                ee.setData({
+                  prom_time_text: '距拼单开始还剩:'
+                })
+                ee.countDown(endTime1, 0);
+              } else {
+                if (endTime2 > newTime) {
                   ee.setData({
-                    prom_time_text: '距拼单开始还剩:'
+                    prom_time_text: '距拼单结束还剩:',
+                    prom_st: 1
                   })
-                  ee.countDown(endTime1, 0);
-                } else {
-                  if (endTime2 > newTime) {
-                    ee.setData({
-                      prom_time_text: '距拼单结束还剩:',
-                      prom_st: 1
-                    })
-                    ee.countDown(endTime2);
-                  }
+                  ee.countDown(endTime2);
                 }
-                //-------查看有多少人在开这个团-------
-                th.get_team_group(prom_id);
               }
-            });
+              //-------查看有多少人在开这个团-------
+              th.get_team_group(prom_id);
+            }
+          });
         }
       })
     }
@@ -2456,8 +2456,8 @@ Page({
   //--获取有多少人在开团--
   async get_team_group(prom_id) {
     var teamgroup = [],
-      th = this,
-      grounp_tatal = 0;
+        th = this,
+        grounp_tatal = 0;
     //如果活动是开团不是商家团
     if (this.data.prom_act.kttype > 1) {
       //获取活动从表信息team_id
@@ -2573,8 +2573,8 @@ Page({
   //-------------获取购买数量的总函数----------------
   get_buy_num: function(gd, func) {
     var map = this.data.g_buy_num,
-      th = this,
-      user_id = getApp().globalData.user_id;
+        th = this,
+        user_id = getApp().globalData.user_id;
     if (user_id == null) {
       map.set(gd.goods_id, 0);
       th.setData({
@@ -2759,8 +2759,8 @@ Page({
       return;
     }
     var e = this,
-      th = e,
-      o = this.data.sele_g;
+        th = e,
+        o = this.data.sele_g;
     if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
     //----------添加到购物车时，要判断限购数量，--------
@@ -2773,10 +2773,10 @@ Page({
             title: '提示',
             content: '超出商品限购'
           });
-		  
-		  var num=th.data.prom_buy_limit-th.data.prom_buy_num;
-		  if(num<0) num=0;		
-		   th.setData({goodsInputNum:num})		  		  
+
+          var num=th.data.prom_buy_limit-th.data.prom_buy_num;
+          if(num<0) num=0;
+          th.setData({goodsInputNum:num})
           return false;
         }
       }
@@ -2787,42 +2787,42 @@ Page({
             title: '提示',
             content: '超出商品活动限购'
           });
-		  
-		  var num=th.data.prom_buy_limit-th.data.prom_buy_num;
-		  if(num<0) num=0;		  
-		  th.setData({goodsInputNum:num})		  
+
+          var num=th.data.prom_buy_limit-th.data.prom_buy_num;
+          if(num<0) num=0;
+          th.setData({goodsInputNum:num})
           return false;
         }
       }
       var redis_num = 0
-	  //不是普通购买的时候
-	  if(th.data.is_normal!=1){
-		  //-------判断活动是否抢光---------
-		  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
-			1: 1
-		  }).then(res => {
-			redis_num = res.data.data;
-		  })
-
-		  if (th.data.goodsInputNum > redis_num) {
-			wx.showModal({
-			  title: '提示',
-			  content: '超出商品活动库存'
-			});
-			
-			th.setData({goodsInputNum:redis_num})
-			
-			return false;
-		  }
-	  }
+      //不是普通购买的时候
+      if(th.data.is_normal!=1){
+        //-------判断活动是否抢光---------
+        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
+          1: 1
+        }).then(res => {
+          redis_num = res.data.data;
+        })
+
+        if (th.data.goodsInputNum > redis_num) {
+          wx.showModal({
+            title: '提示',
+            content: '超出商品活动库存'
+          });
+
+          th.setData({goodsInputNum:redis_num})
+
+          return false;
+        }
+      }
       if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.goodsInputNum > o.store_count) {		  
-		   	th.setData({goodsInputNum:o.store_count})
-			return s.my_warnning("超出商品库存", 0, th);
-	  }
-	  	    
+      if (th.data.goodsInputNum > o.store_count) {
+        th.setData({goodsInputNum:o.store_count})
+        return s.my_warnning("超出商品库存", 0, th);
+      }
+
       if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
         this.setData({
           sto_sele_name: ""
@@ -2860,30 +2860,30 @@ Page({
           newd.room_id=getApp().globalData.room_id;
         }
       }else{
-         if(newd.goods_id==getApp().globalData.room_goods_id){
-             newd.room_id=getApp().globalData.room_id;
-         }
+        if(newd.goods_id==getApp().globalData.room_goods_id){
+          newd.room_id=getApp().globalData.room_id;
+        }
       }
-	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
+      //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-	  if(th.data.is_normal == 1){
-		   var conf=th.data.bconfig;
-		   if(conf.switch_list){
-			   var s_list=JSON.parse(conf.switch_list);
-			   //如果后台有开启等级价的功能
-			   if(parseInt(s_list.rank_switch)==2){
-					var card_price=o[getApp().globalData.userInfo['card_field']];
-					//如果会员有等级价
-					if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
-						&& getApp().globalData.userInfo['card_field']!="" && card_price>0){
-						  newd.goods_price=card_price;
-					}
-			   }
-		   }
-	  }
+      if(th.data.is_normal == 1){
+        var conf=th.data.bconfig;
+        if(conf.switch_list){
+          var s_list=JSON.parse(conf.switch_list);
+          //如果后台有开启等级价的功能
+          if(parseInt(s_list.rank_switch)==2){
+            var card_price=o[getApp().globalData.userInfo['card_field']];
+            //如果会员有等级价
+            if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
+                && getApp().globalData.userInfo['card_field']!="" && card_price>0){
+              newd.goods_price=card_price;
+            }
+          }
+        }
+      }
       //-----如果是秒杀，团购，积分购,拼团,且不是普通购买-----
@@ -3046,7 +3046,7 @@ Page({
     var com_id = e.currentTarget.dataset.com_id;
     var item_id = e.currentTarget.dataset.item_id;
     var app = getApp(),
-      th = this;
+        th = this;
     if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) {
       app.confirmBox("您还未登录");
@@ -3162,14 +3162,14 @@ Page({
     var item = this.data.quan_list[index];
-	//--先判断会员状态--
-	var user_info = getApp().globalData.userInfo;
-	if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-	  wx.navigateTo({
-		url: '/pages/getphone/getphone',
-	  })
-	  return false;
-	}
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
     //如果券还在领取中，不能再点
@@ -3193,7 +3193,7 @@ Page({
       'type': 5
     };
     var app = getApp(),
-      th = this;
+        th = this;
     app.request.post("/api/weshop/couponList/saveCouponList", {
       data: pdata,
       success: function(res) {
@@ -3220,23 +3220,23 @@ Page({
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function() {
     //--先判断会员状态--
-    // var user_info = getApp().globalData.userInfo;
-    // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-    //   //getApp().my_warnning("请先登录",0,this);
-    //   wx.navigateTo({ url: '/pages/getphone/getphone', })
-    //   return false;
-    // }
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      //getApp().my_warnning("请先登录",0,this);
+      wx.navigateTo({ url: '/pages/getphone/getphone', })
+      return false;
+    }
     //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
-    // var type = this.data.prom_type;
-    // if (type == 6) type = 2;
-    // if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
+    var type = this.data.prom_type;
+    if (type == 6) type = 2;
+    if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
     wx.showLoading({
       title: '生成中...',
     })
     var that = this,
-      th = that;
+        th = that;
     //设置画板显示，才能开始绘图
     that.setData({
       canvasHidden: false
@@ -3253,9 +3253,9 @@ Page({
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+        os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
-    console.log('xiaochengxu----->',path3);
+    console.log(path3);
     //读取文件成功则OK--
     wx.getImageInfo({
@@ -3285,164 +3285,155 @@ Page({
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
           context.setFillStyle("black");
           context.setFontSize(21.3 * unit)
-          th.draw_Text(context, th.data.data.goods_name, 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+          th.draw_Text(context, th.data.data.goods_name,
+              38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
           //------产品的价格-------
-          // context.setFontSize(23 * unit)
-          // context.setFillStyle("red")
-          // context.fillText("￥", 416 * unit, 185 * unit);
-          // context.setFontSize(31 * unit)
-          // var pri0 = th.data.data.shop_price;
-          // if (th.data.prom_act)
-          //   pri0 = th.data.prom_act.price;
-
-          // pri0 = parseFloat(pri0).toFixed(2);
-          // context.fillText(pri0, 438 * unit, 185 * unit);
+          context.setFontSize(23 * unit)
+          context.setFillStyle("red")
+          context.fillText("￥", 416 * unit, 185 * unit);
+          context.setFontSize(31 * unit)
+          var pri0 = th.data.data.shop_price;
+          if (th.data.prom_act)
+            pri0 = th.data.prom_act.price;
+
+          pri0 = parseFloat(pri0).toFixed(2);
+          context.fillText(pri0, 438 * unit, 185 * unit);
           //---市场价划掉---
-          // context.setFillStyle("gray")
-          // context.setFontSize(22 * unit)
-          // context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
-          // context.setStrokeStyle('gray')
-          // context.setLineWidth(1 * unit)
-          // context.moveTo(426 * unit, 206 * unit)
-          // context.lineTo(510 * unit, 206 * unit)
-          // context.stroke();
+          context.setFillStyle("gray")
+          context.setFontSize(22 * unit)
+          context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
+          context.setStrokeStyle('gray')
+          context.setLineWidth(1 * unit)
+          context.moveTo(426 * unit, 206 * unit)
+          context.lineTo(510 * unit, 206 * unit)
+          context.stroke();
           //---中间大图---
           context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
-          
-          //---文字---
-          context.setFontSize(22 * unit)
-          context.setFillStyle("black")
-          context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
-          context.fillText("长按识别小程序码", 40 * unit, 826 * unit);
-          //---二维吗图---
-          context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
-
-
           //-------大图后面就不一样了-----------
-          // switch (type) {
-          //   case 0: //普通商品的展示
+          switch (type) {
+            case 0: //普通商品的展示
               //中间的几个字
-              // var g_path = "../../../images/share/s_gou.png";
-              // context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-              // context.setFillStyle("red")
-              // context.setFontSize(18 * unit)
-              // context.fillText("正品保证", 84 * unit, 690 * unit);
-
-              // context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-              // context.setFillStyle("red")
-              // context.setFontSize(18 * unit)
-              // context.fillText("纯实体店", 246 * unit, 690 * unit);
-
-              // context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-              // context.setFillStyle("red")
-              // context.setFontSize(18 * unit)
-              // context.fillText("官方验证", 420 * unit, 690 * unit);
+              var g_path = "../../../images/share/s_gou.png";
+              context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
+              context.setFillStyle("red")
+              context.setFontSize(18 * unit)
+              context.fillText("正品保证", 84 * unit, 690 * unit);
+
+              context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
+              context.setFillStyle("red")
+              context.setFontSize(18 * unit)
+              context.fillText("纯实体店", 246 * unit, 690 * unit);
+
+              context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
+              context.setFillStyle("red")
+              context.setFontSize(18 * unit)
+              context.fillText("官方验证", 420 * unit, 690 * unit);
               //---画线---
-              // context.setLineWidth(1 * unit)
-              // context.moveTo(32 * unit, 710 * unit)
-              // context.lineTo(520 * unit, 710 * unit)
-              // context.stroke();
+              context.setLineWidth(1 * unit)
+              context.moveTo(32 * unit, 710 * unit)
+              context.lineTo(520 * unit, 710 * unit)
+              context.stroke();
               //---文字---
-          //     context.setFontSize(22 * unit)
-          //     context.setFillStyle("black")
-          //     context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
-          //     context.fillText("长按识别小程序码", 40 * unit, 826 * unit);
-          //     //---二维吗图---
-          //     context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
-          //     break;
-          //   case 1: //秒杀商品的展示
-          //     //---画线---
-          //     context.setLineWidth(1 * unit)
-          //     context.moveTo(32 * unit, 670 * unit)
-          //     context.lineTo(520 * unit, 670 * unit)
-          //     context.stroke();
-
-          //     //画秒杀的图片
-          //     var miaos_path = '../../../images/share/miao_share.png';
-          //     context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
-
-          //     //---文字---
-          //     context.setFontSize(22 * unit)
-          //     context.setFillStyle("black")
-          //     context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
-          //     context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
-          //     //---二维吗图---
-          //     context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
-          //     break;
-
-          //   case 2: //会员团和商家团的展示
-          //     //---画线---
-          //     context.setLineWidth(1 * unit)
-          //     context.moveTo(32 * unit, 670 * unit)
-          //     context.lineTo(520 * unit, 670 * unit)
-          //     context.stroke();
-          //     //---文字---
-          //     context.setFontSize(22 * unit)
-          //     context.font = 'normal bold';
-          //     context.setFillStyle("black")
-          //     context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-
-          //     //绘制成团图片
-          //     var ct_img = "../../../images/share/ct_num.png";
-          //     context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
-          //     var ct_num = th.data.prom_act.ct_num;
-          //     context.setFontSize(14 * unit)
-          //     context.font = 'normal';
-          //     context.setFillStyle("red")
-          //     if (ct_num < 10) {
-          //       context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
-          //     } else {
-          //       context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
-          //     }
-          //     context.setFontSize(22 * unit)
-          //     context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
-          //     context.setFillStyle("gray")
-          //     context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit);
-          //     context.setFillStyle("black")
-          //     context.font = 'normal bold 18px sans-serif';
-          //     context.setFontSize(21.3 * unit)
-          //     context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
-          //     //---二维吗图---
-          //     context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-          //     break
-          //   case 3: //阶梯团的展示
-          //     //---画线---
-          //     context.setLineWidth(1 * unit)
-          //     context.moveTo(32 * unit, 670 * unit)
-          //     context.lineTo(520 * unit, 670 * unit)
-          //     context.stroke();
-          //     //---文字---
-          //     context.setFontSize(22 * unit)
-          //     context.font = 'normal bold';
-          //     context.setFillStyle("black")
-          //     context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-          //     //---绘制中间阶梯的价格---
-          //     var list = th.data.prom_act.ct_rylist;
-          //     for (var i = 0; i < list.length; i++) {
-          //       var item = list[i];
-          //       var wi = i * 90 * unit;
-          //       context.font = 'normal';
-          //       context.setFontSize(16 * unit)
-          //       context.setFillStyle("red")
-          //       context.fillText("￥", 40 * unit + wi, 756 * unit);
-          //       context.setFontSize(22 * unit)
-          //       var pri = parseFloat(item.price).toFixed(2);
-          //       context.fillText(pri, 56 * unit + wi, 756 * unit);
-          //       context.setFillStyle("gray")
-          //       context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
-          //     }
-          //     //----------------下面部分----------------
-          //     context.setFillStyle("gray")
-          //     context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
-          //     context.setFillStyle("black")
-          //     context.font = 'normal bold 18px sans-serif';
-          //     context.setFontSize(22 * unit)
-          //     context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-          //     //---二维吗图---
-          //     context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-
-          //     break
-          // }
+              context.setFontSize(22 * unit)
+              context.setFillStyle("black")
+              context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+              context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+              //---二维吗图---
+              context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
+              break;
+            case 1: //秒杀商品的展示
+              //---画线---
+              context.setLineWidth(1 * unit)
+              context.moveTo(32 * unit, 670 * unit)
+              context.lineTo(520 * unit, 670 * unit)
+              context.stroke();
+
+              //画秒杀的图片
+              var miaos_path = '../../../images/share/miao_share.png';
+              context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
+
+              //---文字---
+              context.setFontSize(22 * unit)
+              context.setFillStyle("black")
+              context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
+              context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
+              //---二维吗图---
+              context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
+              break;
+
+            case 2: //会员团和商家团的展示
+              //---画线---
+              context.setLineWidth(1 * unit)
+              context.moveTo(32 * unit, 670 * unit)
+              context.lineTo(520 * unit, 670 * unit)
+              context.stroke();
+              //---文字---
+              context.setFontSize(22 * unit)
+              context.font = 'normal bold';
+              context.setFillStyle("black")
+              context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+
+              //绘制成团图片
+              var ct_img = "../../../images/share/ct_num.png";
+              context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+              var ct_num = th.data.prom_act.ct_num;
+              context.setFontSize(14 * unit)
+              context.font = 'normal';
+              context.setFillStyle("red")
+              if (ct_num < 10) {
+                context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
+              } else {
+                context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
+              }
+              context.setFontSize(22 * unit)
+              context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
+              context.setFillStyle("gray")
+              context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit);
+              context.setFillStyle("black")
+              context.font = 'normal bold 18px sans-serif';
+              context.setFontSize(21.3 * unit)
+              context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+              //---二维吗图---
+              context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+              break
+            case 3: //阶梯团的展示
+              //---画线---
+              context.setLineWidth(1 * unit)
+              context.moveTo(32 * unit, 670 * unit)
+              context.lineTo(520 * unit, 670 * unit)
+              context.stroke();
+              //---文字---
+              context.setFontSize(22 * unit)
+              context.font = 'normal bold';
+              context.setFillStyle("black")
+              context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+              //---绘制中间阶梯的价格---
+              var list = th.data.prom_act.ct_rylist;
+              for (var i = 0; i < list.length; i++) {
+                var item = list[i];
+                var wi = i * 90 * unit;
+                context.font = 'normal';
+                context.setFontSize(16 * unit)
+                context.setFillStyle("red")
+                context.fillText("￥", 40 * unit + wi, 756 * unit);
+                context.setFontSize(22 * unit)
+                var pri = parseFloat(item.price).toFixed(2);
+                context.fillText(pri, 56 * unit + wi, 756 * unit);
+                context.setFillStyle("gray")
+                context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
+              }
+              //----------------下面部分----------------
+              context.setFillStyle("gray")
+              context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
+              context.setFillStyle("black")
+              context.font = 'normal bold 18px sans-serif';
+              context.setFontSize(22 * unit)
+              context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+              //---二维吗图---
+              context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+
+              break
+          }
           //---绘制圆形要放在最后----
           context.save();
@@ -3682,22 +3673,22 @@ Page({
     var th = this;
     var ind=ee.currentTarget.dataset.ind;
     var bconfig = th.data.bconfig;
-	
-	if(!th.data.only_pk && !th.data.def_pickpu_list){
-		getApp().confirmBox("门店库存不足", null, 25000, !1);
-		return false;
-	}
-		
-	if(th.data.only_pk && !th.data.only_pk.length){
-		getApp().confirmBox("门店库存不足", null, 25000, !1);
-		return false;
-	}	
-	if(th.data.def_pickpu_list &&  !th.data.def_pickpu_list.length){
-		getApp().confirmBox("门店库存不足", null, 25000, !1);
-		return false;
-	}
-	
-	
+
+    if(!th.data.only_pk && !th.data.def_pickpu_list){
+      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      return false;
+    }
+
+    if(th.data.only_pk && !th.data.only_pk.length){
+      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      return false;
+    }
+    if(th.data.def_pickpu_list &&  !th.data.def_pickpu_list.length){
+      getApp().confirmBox("门店库存不足", null, 25000, !1);
+      return false;
+    }
+
+
     if (bconfig.is_sort_storage) {
       wx.getLocation({
         type: 'wgs84',
@@ -3714,7 +3705,7 @@ Page({
         },
         fail: function(res) {
           //th.onShow();
-		  th.data.is_get_local_ok = 1;
+          th.data.is_get_local_ok = 1;
           th.get_sto();
           if (res.errCode == 2) {
             th.setData({
@@ -3735,64 +3726,64 @@ Page({
       th.data.is_get_local_ok = 1;
       th.get_sto();
     }
-	
-	if(ind!=undefined && ind!=null ){
-		this.setData({
-		  open_ind_store: ind,
-		  store: 1,
-		  openSpecModal: !1,
-		  openSpecModal_pt: !1
-		})
-	}else{
-		this.setData({
-		  store: 1,
-		  openSpecModal: !1,
-		  openSpecModal_pt: !1
-		})
-	} 
+
+    if(ind!=undefined && ind!=null ){
+      this.setData({
+        open_ind_store: ind,
+        store: 1,
+        openSpecModal: !1,
+        openSpecModal_pt: !1
+      })
+    }else{
+      this.setData({
+        store: 1,
+        openSpecModal: !1,
+        openSpecModal_pt: !1
+      })
+    }
   },
   //关闭选择门店
   close_popup: function(e) {
-	var th=this;
+    var th=this;
     this.setData({
       store: 0,
       choice_sort_store: 0,
       sort_store: 0,
-	  fir_pick_index:0,
-	  sec_pick_index:0
+      fir_pick_index:0,
+      sec_pick_index:0
     })
-	
-	var openindstore=this.data.open_ind_store;	
-	if (openindstore == 1) {
-	  th.setData({
-	    openSpecModal: !0,
-	    openSpecModal_ind: openindstore,
-	  });
-	} else if (openindstore == 2) {
-	  th.setData({
-	    openSpecModal: !0,
-	    openSpecModal_ind: openindstore,
-	  });
-	}
-	else if (openindstore == 4) { //4就是拼团
-	  th.setData({
-	    openSpecModal_pt: 1,      //打开拼团购买界面
-	    store: 0,                 //关闭门店
-	    choice_sort_store: 0,     //关闭门店2级
-	    sort_store: 0,             //关闭门店2级
-	  });
-	}		  
-	else {
-	  th.setData({
-	    store: 0,
-	    choice_sort_store: 0,
-	    sort_store: 0
-	  })
-	}
-	
-	
+
+    var openindstore=this.data.open_ind_store;
+    if (openindstore == 1) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+      });
+    } else if (openindstore == 2) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+      });
+    }
+    else if (openindstore == 4) { //4就是拼团
+      th.setData({
+        openSpecModal_pt: 1,      //打开拼团购买界面
+        store: 0,                 //关闭门店
+        choice_sort_store: 0,     //关闭门店2级
+        sort_store: 0,             //关闭门店2级
+      });
+    }
+    else {
+      th.setData({
+        store: 0,
+        choice_sort_store: 0,
+        sort_store: 0
+      })
+    }
+
+
   },
-  
+
   //选择更多门店
   more_store: function() {
     this.setData({
@@ -3822,61 +3813,61 @@ Page({
       sec_pick_index: 0
     });
   },
-  
+
   choose_for_store_fir: function(e) {
     var index_c = e.currentTarget.dataset.ind;
-	var th=this;		
+    var th=this;
     th.setData({
-		fir_pick_index: index_c
+      fir_pick_index: index_c
     })
   },
-  
+
   //如果开启线下库存，已经急速库存才会使用
   async check_the_pick(item,func){
-	  var th=this;
-	  var goodsinfo=th.data.sele_g;
-	  var erpwareid=goodsinfo.erpwareid;
-	  var plist=null;
-      var lock=0;
-	  
-	  //---如果是活动的时候---
-	  if(th.data.prom_type==1 || th.data.prom_type==6){	 
-	     func(); return false;  		 
-	  }
-	      
-	  if(this.data.sales_rules!=2){
-		  func();
-	  }else{         
-		 		  	  
-		  //先读取门店的lock
-		  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  		  data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000}
-		  }).then(res=>{
-		  		  if(res.data.code==0 && res.data.data.total>0){
-					  for(var i in res.data.data.pageData )					  
-		  			      lock+=res.data.data.pageData[i].outQty;
-		  		  }
-		  })		  
-		  //读取线下的门店库存
-		  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		  		  data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
-		  }).then(res=>{
-		  		  if(res.data.code==0 && res.data.data.total>0){
-		  			  plist=res.data.data.pageData[0];		 
-		  		  }
-		  })	  
-		
-		  if(plist && plist.CanOutQty-lock>0){
-			     item.CanOutQty=plist.CanOutQty-lock;			  			     		  
-		     	 func();  
-				 return false;
-		  }
-		  getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);		
-				   
-	  }
+    var th=this;
+    var goodsinfo=th.data.sele_g;
+    var erpwareid=goodsinfo.erpwareid;
+    var plist=null;
+    var lock=0;
+
+    //---如果是活动的时候---
+    if(th.data.prom_type==1 || th.data.prom_type==6){
+      func(); return false;
+    }
+
+    if(this.data.sales_rules!=2){
+      func();
+    }else{
+
+      //先读取门店的lock
+      await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+        data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000}
+      }).then(res=>{
+        if(res.data.code==0 && res.data.data.total>0){
+          for(var i in res.data.data.pageData )
+            lock+=res.data.data.pageData[i].outQty;
+        }
+      })
+      //读取线下的门店库存
+      await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+        data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+      }).then(res=>{
+        if(res.data.code==0 && res.data.data.total>0){
+          plist=res.data.data.pageData[0];
+        }
+      })
+
+      if(plist && plist.CanOutQty-lock>0){
+        item.CanOutQty=plist.CanOutQty-lock;
+        func();
+        return false;
+      }
+      getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);
+
+    }
   },
-  
+
   //确定def_pick为选择的门店
   sure_pick: function(e) {
@@ -3896,56 +3887,56 @@ Page({
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-	
-	//--回调函数的用法--
-	th.check_the_pick(item,function(){
-		  th.setData({
-		    def_pick_store: item,
-		    sto_sele_name: item.pickup_name,
-		    sto_sele_id: item.pickup_id,
-		    sto_sele_distr: item.distr_type,
-		    store: 0,
-		    choice_sort_store: 0,
-		    fir_pick_index: 0
-		  });
-		  
-		  if (openindstore == 1) {
-		    th.setData({
-		      openSpecModal: !0,
-		      openSpecModal_ind: openindstore,
-		    });
-		  } else if (openindstore == 2) {
-		    th.setData({
-		      openSpecModal: !0,
-		      openSpecModal_ind: openindstore,
-		    });
-		  }
-		  else if (openindstore == 4) { //4就是拼团
-		    th.setData({
-		      openSpecModal_pt: 1,      //打开拼团购买界面
-		      store: 0,                 //关闭门店
-		      choice_sort_store: 0,     //关闭门店2级
-		      sort_store: 0,             //关闭门店2级
-		    });
-		  }		  
-		  else {
-		    th.setData({
-		      store: 0,
-		      choice_sort_store: 0,
-		      sort_store: 0
-		    })
-		  }
-	})
+
+    //--回调函数的用法--
+    th.check_the_pick(item,function(){
+      th.setData({
+        def_pick_store: item,
+        sto_sele_name: item.pickup_name,
+        sto_sele_id: item.pickup_id,
+        sto_sele_distr: item.distr_type,
+        store: 0,
+        choice_sort_store: 0,
+        fir_pick_index: 0
+      });
+
+      if (openindstore == 1) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore,
+        });
+      } else if (openindstore == 2) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore,
+        });
+      }
+      else if (openindstore == 4) { //4就是拼团
+        th.setData({
+          openSpecModal_pt: 1,      //打开拼团购买界面
+          store: 0,                 //关闭门店
+          choice_sort_store: 0,     //关闭门店2级
+          sort_store: 0,             //关闭门店2级
+        });
+      }
+      else {
+        th.setData({
+          store: 0,
+          choice_sort_store: 0,
+          sort_store: 0
+        })
+      }
+    })
   },
   //---点击二级之后的选择---
   choose_for_store: function(e) {
     var index_c = e.currentTarget.dataset.ind;
-	var th=this;	
-	th.setData({
-		  sec_pick_index: index_c,
-		  fir_pick_index: index_c
-	})
-		
+    var th=this;
+    th.setData({
+      sec_pick_index: index_c,
+      fir_pick_index: index_c
+    })
+
   },
   //把选择的门店设置成默认的门店def_pick
   set_def_pick: function(e) {
@@ -3962,76 +3953,76 @@ Page({
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-	
-	//先设置之前,要判断是不是有库存
-	th.check_the_pick(item,function(){
-		  var store_id = o.stoid;
-		  var user_id = getApp().globalData.user_id;
-		  var def_pickup_id = item.pickup_id;
-		  
-		  getApp().request.put('/api/weshop/users/update', {
-		    data: {
-		      user_id,
-		      def_pickup_id
-		    },
-		    success: function(res) {
-		      if (res.data.code == 0) {
-		        if (th.data.choice_sort_store == 0) th.setData({
-		          fir_pick_index: 0
-		        });
-		        getApp().globalData.pk_store = item;
-		      } else {
-		        //s.showWarning("设置默认门店地址失败", null, 500, !1);
-		        getApp().my_warnning("设置默认门店地址失败",0,th)
-		      }
-		  
-		    }
-		  });
-		  
-		  th.setData({
-		    def_pick_store: item,
-		    sto_sele_name: item.pickup_name,
-		    sto_sele_id: item.pickup_id,
-		    sto_sele_distr: item.distr_type,
-		    store: 0,
-		    choice_sort_store: 0
-		  });
-		  		  
-		  var openindstore = th.data.open_ind_store;
-		  if (openindstore == 1) {
-		    th.setData({
-		      openSpecModal: !0,
-		      openSpecModal_ind: openindstore,
-		      store: 0,
-		      choice_sort_store: 0,
-		      sort_store: 0,
-		    });
-		  } else if (openindstore == 2) {
-		    th.setData({
-		      openSpecModal: !0,
-		      openSpecModal_ind: openindstore,
-		      store: 0,
-		      choice_sort_store: 0,
-		      sort_store: 0,
-		    });
-		  }
-		  else if (openindstore == 4) { //4就是拼团
-		      th.setData({
-		           openSpecModal_pt: 1,      //打开拼团购买界面
-		           store: 0,                 //关闭门店
-		           choice_sort_store: 0,     //关闭门店2级
-		           sort_store: 0,             //关闭门店2级
-		     });
-		  }
-		  
-		   else {
-		    th.setData({
-		      store: 0,
-		      choice_sort_store: 0,
-		      sort_store: 0,
-		    })
-		  }
-	})
+
+    //先设置之前,要判断是不是有库存
+    th.check_the_pick(item,function(){
+      var store_id = o.stoid;
+      var user_id = getApp().globalData.user_id;
+      var def_pickup_id = item.pickup_id;
+
+      getApp().request.put('/api/weshop/users/update', {
+        data: {
+          user_id,
+          def_pickup_id
+        },
+        success: function(res) {
+          if (res.data.code == 0) {
+            if (th.data.choice_sort_store == 0) th.setData({
+              fir_pick_index: 0
+            });
+            getApp().globalData.pk_store = item;
+          } else {
+            //s.showWarning("设置默认门店地址失败", null, 500, !1);
+            getApp().my_warnning("设置默认门店地址失败",0,th)
+          }
+
+        }
+      });
+
+      th.setData({
+        def_pick_store: item,
+        sto_sele_name: item.pickup_name,
+        sto_sele_id: item.pickup_id,
+        sto_sele_distr: item.distr_type,
+        store: 0,
+        choice_sort_store: 0
+      });
+
+      var openindstore = th.data.open_ind_store;
+      if (openindstore == 1) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore,
+          store: 0,
+          choice_sort_store: 0,
+          sort_store: 0,
+        });
+      } else if (openindstore == 2) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore,
+          store: 0,
+          choice_sort_store: 0,
+          sort_store: 0,
+        });
+      }
+      else if (openindstore == 4) { //4就是拼团
+        th.setData({
+          openSpecModal_pt: 1,      //打开拼团购买界面
+          store: 0,                 //关闭门店
+          choice_sort_store: 0,     //关闭门店2级
+          sort_store: 0,             //关闭门店2级
+        });
+      }
+
+      else {
+        th.setData({
+          store: 0,
+          choice_sort_store: 0,
+          sort_store: 0,
+        })
+      }
+    })
   },
   wait_for_store_config: function() {
@@ -4074,7 +4065,7 @@ Page({
   //显示全部
   toggleHandler: function(e) {
     var that = this,
-      index = e.currentTarget.dataset.index;
+        index = e.currentTarget.dataset.index;
     for (var i = 0; i < that.data.comments.length; i++) {
       if (index == i) {
         for (var i = 0; i < that.data.comments.length; i++) {
@@ -4091,7 +4082,7 @@ Page({
   //收起更多
   toggleContent: function(e) {
     var that = this,
-    index = e.currentTarget.dataset.index;
+        index = e.currentTarget.dataset.index;
     for (var i = 0; i < that.data.comments.length; i++) {
       if (index == i) {
         that.data.comments[index].auto = true;
@@ -4105,84 +4096,82 @@ Page({
   //---  获取卡类列表 ---
   getPlusCardType: function (func) {
-     var storid = os.stoid;
-     var th = this;
-     var user=getApp().globalData.userInfo;
-     getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-       var plusCard = res.data.data;
-       var arr = [1219, 2089, 3031];
-       var new_arr = new Array();
-  		  var card_name_map=new Map();
-       for (var i = 0; i < plusCard.length; i++) {
-            if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue;
-  			var name="card"+plusCard[i].CorrPrice.toLowerCase();
-  			card_name_map.set(name,plusCard[i].CardName);
-       }
-
-  		  var ob={"card_list":plusCard,"name_map":card_name_map};
-  		  func(ob);
-     })
-   },
-
-   go_plus:function(){
-	   getApp().goto("/pages/user/plus/plus");
-   },
-   go_card_info:function(){
-   	   getApp().goto("/pages/user/cardinfo/cardinfo");
-   },
-   //-- 根据ID拿出门店 --
-   get_pick_from_list(pid){
-	   var all_pick_list=this.data.all_pick_list;
-	   for(var i in all_pick_list){
-		    var item=all_pick_list[i];
-			if(item.pickup_id==pid){
-				return item;
-			}
-	   }	   
-   },
-   //-----显示优惠券的时候情况-----
-  show_more_cx:function () {
-      if(this.data.is_more_cx){
-         this.setData({is_more_cx:0});
-      }else{
-         this.setData({is_more_cx:1});
+    var storid = os.stoid;
+    var th = this;
+    var user=getApp().globalData.userInfo;
+    getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+      var plusCard = res.data.data;
+      var arr = [1219, 2089, 3031];
+      var new_arr = new Array();
+      var card_name_map=new Map();
+      for (var i = 0; i < plusCard.length; i++) {
+        if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue;
+        var name="card"+plusCard[i].CorrPrice.toLowerCase();
+        card_name_map.set(name,plusCard[i].CardName);
       }
+
+      var ob={"card_list":plusCard,"name_map":card_name_map};
+      func(ob);
+    })
+  },
+
+  go_plus:function(){
+    getApp().goto("/pages/user/plus/plus");
+  },
+  go_card_info:function(){
+    getApp().goto("/pages/user/cardinfo/cardinfo");
+  },
+  //-- 根据ID拿出门店 --
+  get_pick_from_list(pid){
+    var all_pick_list=this.data.all_pick_list;
+    for(var i in all_pick_list){
+      var item=all_pick_list[i];
+      if(item.pickup_id==pid){
+        return item;
+      }
+    }
+  },
+  //-----显示优惠券的时候情况-----
+  show_more_cx:function () {
+    if(this.data.is_more_cx){
+      this.setData({is_more_cx:0});
+    }else{
+      this.setData({is_more_cx:1});
+    }
   },
   //----跳转到搭配购买----
   go_prom_list:function () {
     wx.navigateTo({ url: "../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid, })
   },
-  
+
   //---检查有没有优惠活动---
   check_is_youhui:function(gid){
-	   var th=this;	   
-	   //调用接口判断订单优惠，
-	   getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {}).then(res => {
-	        if(res.data.code==0){
-				 var r_data=res.data.data;
-				 var max=0,min=0;
-				 if(r_data.collocationList){
-				     for(var i in r_data.collocationList){
-				          if(max==0) max=r_data.collocationList[i].price;
-				          if(min==0) min=r_data.collocationList[i].price;
-
-				          if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price;
-                          if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price;
-                     }
-                    r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2);
-                    r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2);
-                 }
-				 th.setData({
-					 order_prom:r_data.promOrder,
-					 collocationGoods:r_data.collocationPromList,
-					 prom_goods:r_data.promGoodsLists,
-				})
-			} 
-	   }) 
+    var th=this;
+    //调用接口判断订单优惠，
+    getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {}).then(res => {
+      if(res.data.code==0){
+        var r_data=res.data.data;
+        var max=0,min=0;
+        if(r_data.collocationList){
+          for(var i in r_data.collocationList){
+            if(max==0) max=r_data.collocationList[i].price;
+            if(min==0) min=r_data.collocationList[i].price;
+
+            if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price;
+            if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price;
+          }
+          r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2);
+          r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2);
+        }
+        th.setData({
+          order_prom:r_data.promOrder,
+          collocationGoods:r_data.collocationPromList,
+          prom_goods:r_data.promGoodsLists,
+        })
+      }
+    })
   }
-  
-  
@@ -76,7 +76,7 @@
     <!-- 3 -->
     <block wx:if="{{tabBar.active!='/pages/cart/cart/cart'}}">
         <navigator url="/pages/cart/cart/cart" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-          <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%">
+          <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%;display: flex;align-items: center;justify-content: center;">
           {{tabBar.cartGoodsNum}}
           </view><view style="width:30%;height:54rpx;margin-left:35%;">
               <image src="{{tabBar.url}}/miniapp/images/bar/car.png"  class="img" style="width:100%;height:100%"></image>
@@ -86,7 +86,7 @@
      </block>
      <block wx:else>
           <view class="tabbar_item {{tabBar.clas}}" style="color:  #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-             <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%">
+             <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%;display: flex;align-items: center;justify-content: center;">
                     {{tabBar.cartGoodsNum}}
              </view><view style="width:30%;height:54rpx;margin-left:35%;">
                     <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png"  class="img" style="width:100%;height:100%"></image>