diff --git a/app.js b/app.js
index 90f5a8b..9a126d6 100644
--- a/app.js
+++ b/app.js
@@ -395,6 +395,23 @@ App({
 				if(n>15) clearInterval(page.data[key]);
 			},1000);
 		}
+	},
+	
+	
+	//------定时等待某个值,有值才进行运算--------
+	waitfor2:function(page,key,pop_value_key,func){
+		var n=0;
+		if(!page.data[key]){
+			page.data[key]=setInterval(function(){
+				console.log(page.data[key]);n++;
+				if(page.data[pop_value_key]) {
+					clearInterval(page.data[key]);
+					func();
+				}				
+				if(n>15) clearInterval(page.data[key]);
+			},1000);
+		}
 	}
+	
 
 });
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index f99152a..0799676 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1,6 +1,7 @@
 var t = getApp(),
   a = t.request,
   oo = t.globalData.setting,
+  os=oo,
   app = getApp(),
   rq = t.request,
   ut = require("../../../utils/util.js");
@@ -26,13 +27,24 @@ Page({
     isadd: 0, //是否可以加商品数量
 
     card_field:"",
+	bconf:null,
+	
   },
 
   onLoad: function() {
+	var a = this,ee=a;	 
+	//----获取系统参数-----
+	getApp().getConfig2(function(e) {
+	  ee.setData({
+	    bconfig: e,
+		sales_rules:e.sales_rules
+	  });
+	})
+	  
     wx.setNavigationBarTitle({
       title: "购物车",
     })
-    var a = this;
+   
     //判断是否有登陆
     t.auth.hadAuth() && t.getUserInfo(function() {
       a.getCardList();
@@ -117,6 +129,8 @@ Page({
         var all_num = 0;
 
         for (var i = 0; i < carr.length; i++) {
+			
+		
           var item = carr[i];
           all_num += item.goods_num;
           item.original_img = oo.imghost + item.original_img;
@@ -427,7 +441,7 @@ Page({
 
   //----------------------更新购物数量，加减,调用接口---------------------
   postCardList: function(t, item, pitem) {
-    var e = this;
+    var e = this,th=e;
     var user_id = getApp().globalData.user_id;
     console.log('update');
     console.log(t);
@@ -436,11 +450,12 @@ Page({
       async success(d) {
         var limit = d.data.data.viplimited;
         var store_count = d.data.data.store_count;
+		var wareIds=d.data.data.erpwareid;
 
         var goodsinfo = e.data.requestData[pitem].goods[item];
         var promgoodsbuynum = 0;
         var goodsbuynum = 0;
-
+	
         //--要获得商品，该用户买了多少件,同步应用--
         await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
           data: {
@@ -455,6 +470,7 @@ Page({
           if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
           goodsbuynum = buy_num_data.goodsbuynum;
         })
+		
 
         var buyed_mum2 = t.goods_num + goodsbuynum;
         if (buyed_mum2 > limit && limit > 0) {
@@ -463,86 +479,206 @@ Page({
             content: '购买数量超出商品限购'
           });
           var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-          var cbuy = limit - buyed_mum;
+          var cbuy = limit - buyed_mum2;
           e.setData({
             [txt]: cbuy > 0 ? cbuy : 0,
           });
           e.doCheckAll();
+		  
+		  t.goods_num=cbuy > 0 ? cbuy : 0,
+		  e.update_cart(t, pitem, item);		  
           return false;
         }
 
-        if (t.goods_num > store_count) {
-          wx.showModal({
-            title: '提示',
-            content: '购买数量超出商品库存'
-          });
-          var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-          e.setData({
-            [txt]: store_count
-          });
-          e.doCheckAll();
-          return false;
-        }
-
+       
         if (goodsinfo.prom_type == 1) {
-          //读取秒杀
-          rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, {
+            //读取秒杀
+            rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, {
             isShowLoading: 0,
             success: function(res_d) {
-              var false_data = res_d.data.data;
-
-              //--判断库存--
-              if (t.goods_num > false_data.goods_num - false_data.buy_num) {
-                wx.showModal({
-                  title: '提示',
-                  content: '购买数量超出活动库存'
-                });
-                var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-                e.setData({
-                  [txt]: false_data.goods_num - false_data.buy_num
-                });
-                e.doCheckAll();
-                return false;
-              }
-
-              //--判断redis数量是否已经超出--
-              if (t.goods_num > false_data.redisnum) {
-                wx.showModal({
-                  title: '提示',
-                  content: '购买数量超出商品库存'
-                });
-                var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-                e.setData({
-                  [txt]: false_data.redisnum
-                });
-                e.doCheckAll();
-                return false;
-              }
-
-              //--活动的限购是不是要判断--
-              if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) {
-                wx.showModal({
-                  title: '提示',
-                  content: '购买数量超出秒杀限购'
-                });
-                var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-                e.setData({
-                  [txt]: false_data.false_data.buy_limit
-                });
-                e.doCheckAll();
-                return false;
-              }
-              e.update_cart(t, pitem, item);
+				
+				if(res_d.data.code==0){					
+					if (t.goods_num > store_count) {
+					  wx.showModal({
+					    title: '提示',
+					    content: '购买数量超出商品库存'
+					  });
+					  var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+					  e.setData({
+					    [txt]: store_count
+					  });
+					  e.doCheckAll();
+					  
+					  t.goods_num=store_count;
+					  e.update_cart(t, pitem, item);	
+					  
+					  return false;
+					}
+										
+					var false_data = res_d.data.data;
+					//--判断库存--
+					if (t.goods_num > false_data.goods_num - false_data.buy_num) {
+					  wx.showModal({
+					    title: '提示',
+					    content: '购买数量超出活动库存'
+					  });
+					  var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+					  e.setData({
+					    [txt]: false_data.goods_num - false_data.buy_num
+					  });
+					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.goods_num - false_data.buy_num;
+					  e.update_cart(t, pitem, item);	
+					  
+					  return false;
+					}
+					
+					//--判断redis数量是否已经超出--
+					if (t.goods_num > false_data.redisnum) {
+					  wx.showModal({
+					    title: '提示',
+					    content: '购买数量超出商品库存'
+					  });
+					  var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+					  e.setData({
+					    [txt]: false_data.redisnum
+					  });
+					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.redisnum;
+					  e.update_cart(t, pitem, item);	
+					  
+					  
+					  return false;
+					}
+					
+					//--活动的限购是不是要判断--
+					if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) {
+					  wx.showModal({
+					    title: '提示',
+					    content: '购买数量超出秒杀限购'
+					  });
+					  var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+					  e.setData({
+					    [txt]: false_data.false_data.buy_limit
+					  });
+					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.false_data.buy_limit;
+					  e.update_cart(t, pitem, item);	
+					  
+					  return false;
+					}
+				}else{
+					//--- 看一下是不是线下库存 ---
+					if(th.data.sales_rules==2){
+						 th.check_down_line(t, pitem, item,wareIds); 
+					}else{
+						if (t.goods_num > store_count) {
+						  wx.showModal({
+						    title: '提示',
+						    content: '购买数量超出商品库存'
+						  });
+						  var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+						  e.setData({
+						    [txt]: store_count
+						  });
+						  e.doCheckAll();
+						  return false;
+						}
+						e.update_cart(t, pitem, item);					
+					}
+				}				          			  
+               
             }
           })
-        } else {
-          e.update_cart(t, pitem, item);
+        } else {			
+	      //--- 看一下是不是线下库存 ---
+	      if(th.data.sales_rules==2){
+	      	   th.check_down_line(t, pitem, item,wareIds); 
+	      }else{
+	      	 if (t.goods_num > store_count) {
+	      	   wx.showModal({
+	      	     title: '提示',
+	      	     content: '购买数量超出商品库存'
+	      	   });
+	      	   var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+	      	   e.setData({
+	      	     [txt]: store_count
+	      	   });
+	      	   e.doCheckAll();
+	      	   t.goods_num=store_count;
+	      	 }
+	      	 e.update_cart(t, pitem, item);		
+	      }		      
         }
       }
     });
   },
-
-  //更新购物车
+  
+  //---检验线下库存的数量---
+ async check_down_line(t, pitem, item,erpwareid){	  
+	  var ob={},th=this;
+	  await this.check_down_line_next(t, pitem, item,erpwareid,function(res){
+		  ob=res;
+	  });	  
+	  var log=0;
+	  if(ob.code==-1){
+		   wx.showModal({
+	      	     title: '提示',
+	      	     content: '购买数量超出商品库存'
+	      	   });
+	      	   var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+	      	   th.setData({
+	      	     [txt]: ob.CanOutQty
+	      	   });
+	      	   th.doCheckAll();
+	      	   t.goods_num=ob.CanOutQty;
+	  }
+	  this.update_cart(t, pitem, item);			  
+  },
+  
+  //---检验线下库存的数量的子函数---
+  async check_down_line_next(t, pitem, item,erpwareid,func){
+	  var goodsinfo = this.data.requestData[pitem].goods[item];
+	  var lock=0,pick_no,plist;
+	  //先读取门店的lock
+	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+		  data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_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/pickup/get/"+os.stoid+"/"+goodsinfo.pick_id,{
+		  data:{storeId:os.stoid,goodsId:t.goods_id,pickupId:goodsinfo.pick_id}
+	  }).then(res=>{
+		  if(res.data.code==0){
+			  pick_no=res.data.data.pickup_no;
+		  }
+	  })	   
+	  //读取线下的门店库存 
+	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+	  }).then(res=>{
+		  if(res.data.code==0){
+			  plist=res.data.data.pageData[0];		 
+		  }
+	  })	  
+	  var ob={}; ob.code=1;	  
+	  if(t.goods_num>plist.CanOutQty-lock){
+		 ob.code=-1; 
+		 ob.CanOutQty=plist.CanOutQty-lock
+		 if(ob.CanOutQty<0) ob.CanOutQty=0;  
+	  }
+	  func(ob)  
+  },
+  
+ 
+  //--更新购物车---
   update_cart: function(t, pitem, item) {
     var e = this;
     getApp().request.put("/api/weshop/cart/update", {
@@ -573,7 +709,7 @@ Page({
     var th = this;
 
     var ab = 0; //选中
-    console.log('checkout');
+    wx.showLoading(); 
     for (var i = 0; i < this.data.requestData.length; i++) {
       var i_arr = this.data.requestData[i].goods;
       for (var j = 0; j < i_arr.length; j++) {
@@ -594,6 +730,25 @@ Page({
           }
           glist += i_arr[j].goods_id + ",";
           ab = 1;
+		  //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算---
+		  if(i_arr[j].prom_type==0 && th.data.sales_rules==2){			  
+			  //--获取商品的线下商品ID--
+			  var gd=null;
+			  await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id,{}).then(res=>{
+				  if(res.data.code==0) gd=res.data.data;
+			  })
+			  //--判断商品是线下库存-- 		  
+			  var ob={}
+			  await th.check_down_line_next(i_arr[j],i,j,gd.erpwareid,function(rs){
+				  ob=rs;
+			  });
+			  if(ob.code==-1){
+				  t.my_warnning(gd.goods_name+"门店库存不足", 0, th);
+				  wx.hideLoading();
+				  return false;
+			  }
+		  }		  
+		 		  
         } else {
           rq.put("/api/weshop/cart/update", {
             data: {
@@ -610,6 +765,7 @@ Page({
     }
     if (ab == 0) {
       t.my_warnning("未选择商品", 0, th);
+	  wx.hideLoading();
       return false;
     }
 
@@ -657,7 +813,8 @@ Page({
           }
 
           try {
-            ddata.forEach(function(val, ind) {
+            for(var ind in ddata) {
+			  var val=ddata[ind];
               var num = map.get(val.goods_id + "");
               if (num <= 0) {
                 isok = 0;
@@ -665,12 +822,25 @@ Page({
                 throw "购买数量不能为0";
                 return false;
               }
-              if (num > val.store_count) {
-                isok = 0;
-                gname = val.goods_name;
-                throw "超出库存";
-                return false;
-              }
+			  
+			  if(val.prom_type==1 || val.prom_type==6){
+				  if (num > val.store_count) {
+				    isok = 0;
+				    gname = val.goods_name;
+				    throw "超出库存";
+				    return false;
+				  }
+			  }
+			  
+			  if(th.data.sales_rules!=2){
+				  if (num > val.store_count) {
+					isok = 0;
+					gname = val.goods_name;
+					throw "超出库存";
+					return false;
+				  }
+			  }
+			              
               if (num > val.redisnum && val.redisnum) {
                 isok = 0;
                 gname = val.goods_name;
@@ -712,7 +882,7 @@ Page({
 					          throw "商品价格已经变化";
 						}   
 				  }else{
-            if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) {
+                     if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) {
 					    isok = 0;
 					    gname = val.goods_name;
 					    throw "商品价格已经变化";
@@ -733,14 +903,16 @@ Page({
                 }
               }
 
-            })
+            }
           } catch (e) {
             err = e;
           }
           if (isok == 0) {
             t.confirmBox(gname + ":" + err);
+			wx.hideLoading();
             return false;
           }
+		  wx.hideLoading();
           wx.navigateTo({
             url: "/pages/cart/cart2/cart2"
           });
@@ -821,6 +993,8 @@ Page({
     wx.switchTab({
       url: '/pages/index/index/index',
     })
-  }
+  },
+  
+  
 
 });
\ No newline at end of file
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 0c1d7de..4351297 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1,6 +1,6 @@
 var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
   s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
-var oo=t.globalData.setting;
+var oo=t.globalData.setting,os=oo;
 var regeneratorRuntime = require('../../../utils/runtime.js');
 var util_pay = require("../../../utils/pay.js");
 
@@ -84,6 +84,9 @@ Page({
     is_coupon:null,     //选择券的控制属性
     is_shipping_code:"",//插入用户默认地址
     wu_arr_txt:"",      //要更新的物流的字段
+	
+	sales_rules:1,  //默认是显示线上库存
+		
   },
   onLoad: function(t) {
 
@@ -101,7 +104,7 @@ Page({
       //先获取是否有关闭使用优惠券
       getApp().getConfig2(function (ee) {
           var json_d = JSON.parse(ee.switch_list);
-          th.setData({ is_close_quan: json_d.is_close_quan });
+          th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules });
           //-----先获取物流，再获取用户信息，再展示页面-----
           th.get_wuliu(th.get_info(th.show_page));
       })
@@ -698,7 +701,7 @@ Page({
   },
 
   //--------------------提交订单-----------------------
-  submitForm: function(t) {
+  async submitForm(t){
     if(this.data.is_summit_ing==1) return false; //--提交中退出--
     this.data.is_summit_ing=1;
     var th=this,pdata=new Array();
@@ -772,7 +775,20 @@ Page({
         'prom_type':th.data.bn_goods.prom_type,  //促销活动类型
         'prom_id': th.data.bn_goods.prom_id,     //促销活动id
       };
-
+	  
+	  //如果不立即购买或者秒杀，如果是线下库存购买的时候
+	  if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){
+		  var isok=1;
+		  await th.check_store_num(goods.goods_id,th.data.bn_pick, gg.goods_num,function(res){
+			  isok=res;
+		  });
+		  if(!isok){
+			  getApp().confirmBox("商品的门店库存不足");
+			  th.data.is_summit_ing=0;
+			  return false;
+		  }
+	  }
+	  
       //--组装优惠券的钱--
       if(th.data.formData.coupon_price){
         item.coupon_price=th.data.formData.coupon_price;
@@ -868,6 +884,20 @@ Page({
           }else{
             goods.prom_type = 0;goods.prom_id =0;
           }
+		  
+		  //如果不立即购买或者秒杀，如果是线下库存购买的时候
+		  if(goods.prom_type==0 && th.data.sales_rules==2){
+		  		  var isok=1;
+		  		  await th.check_store_num(goods.goods_id, t_item.pickup_id,goods.goods_num,function(res){
+		  			  isok=res;
+		  		  });
+		  		  if(!isok){
+		  			  getApp().confirmBox( goods.goods_name+"的门店库存不足");
+		  			  th.data.is_summit_ing=0;
+		  			  return false;
+		  		  }
+		  }
+		 	  
           item.order_goods.push(goods);
         }
         pdata.push(item);
@@ -975,6 +1005,50 @@ Page({
     })
 
   },
+  
+  //---确认线下门店的数量足不足---
+  async check_store_num(goods_id,pick,goods_num,func){	    
+	  	  var lock=0,pick_no,plist,erpwareid;
+	  	  //先读取门店的lock
+	  	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+	  		  data:{store_id:os.stoid,wareId:goods_id,storageId:pick,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/pickup/get/"+os.stoid+"/"+pick,{
+	  		  data:{storeId:os.stoid,goodsId:t.goods_id,pickupId:pick}
+	  	  }).then(res=>{
+	  		  if(res.data.code==0){
+	  			  pick_no=res.data.data.pickup_no;
+	  		  }
+	  	  })	   
+		  //先获取商品的线下库存
+		  await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+goods_id,{
+		  	  data:{storeId:os.stoid,goodsId:t.goods_id,pickupId:pick}
+		  }).then(res=>{
+		  	  if(res.data.code==0){
+		  	  	 erpwareid=res.data.data.erpwareid;
+		  	  }
+		  })
+	  	  //读取线下的门店库存 
+	  	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+	  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+	  	  }).then(res=>{
+	  		  if(res.data.code==0){
+	  			  plist=res.data.data.pageData[0];		 
+	  		  }
+	  	  })	  
+	  	  var isok=1;
+	  	  if(goods_num>plist.CanOutQty-lock){
+	  		isok=0;
+	  	  }
+	  	  func(isok);   
+  },
+  
 
   useCoupon: function() {
     if (this.data.order.couponNum <= 0) {
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 0849202..c8dba07 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -376,7 +376,7 @@
                       <block>{{item.Sum}}元优惠券</block>
                     </view>
                     <view class="coupon-time">
-                    {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
+                    {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
                    </view>
                </view>
                    <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}"  data-now="{{filter.format_time(now)}}">
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 131c251..e8dfa5c 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -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
-
+    fir_pick_index: 0, //第一级门店选择ID	
+	all_pick_list:null,//所有的门店先记录起来
     //同一条形码的所有商品
     sku_g: null,
     sku_g_pt: null, //---拼单的普通购买---
@@ -219,6 +219,7 @@ Page({
     new_user: 0, //新用户
 
     def_pick_store: null, // 默认的门店
+	fir_def_store:null,  //客户默认的门店的
     lat: null, //维度
     lon: null, //经度
 
@@ -233,11 +234,13 @@ Page({
     is_collect_load:0,     //是不是处理
 	is_newsales_rules:0,   //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
 	sales_rules:1,	       //默认是线上销售
+	
+	wait_for_user_store:null,
+
   },
 
   //------初始化加载----------
   onLoad: function(t) {
-
     wx.setNavigationBarTitle({
       title: "商品详情",
     })
@@ -279,6 +282,7 @@ Page({
       var json_d = JSON.parse(e.switch_list);
       ee.setData({
         store_config: e,
+		sys_switch:json_d,
         is_closecoupon: json_d.is_closecoupon,
 		is_newsales_rules:json_d.is_newsales_rules
       });
@@ -296,31 +300,30 @@ Page({
 	  //---如果后台又开等级卡的开关---
 	  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 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)
 	  			  })
 
 	  }
@@ -337,46 +340,46 @@ Page({
     });
 
     //获取用户的默认门店
-    getApp().get_user_store(function(e) {
-      if(!e) return false;
+    getApp().get_user_store(function(ee) {
+      if(!ee) return false;
 	  var appd=getApp().globalData;
       var w_time = setInterval(function() {
         if (that.data.is_get_local_ok == 0) return false;
 		clearInterval(w_time);
         var distance = null;
+		var e=JSON.parse(JSON.stringify(ee));
 		
 		//如果有开启近距离的话,同时距离优不一样了
         if (that.data.lat != null) {        
 		  //如果经纬度有变化的话
 		  if( appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
+			  that.data.fir_def_store=e;
 			  that.setData({
 			    def_pick_store: e,
 			    sto_sele_name: e.pickup_name,
 			    sto_sele_id: e.pickup_id,
 			    sto_sele_distr: e.distr_type
 			  })
-		  }else{
-			  //要用接口是获取距离，js的计算不准
-			  getApp().request.get("/api/weshop/pickup/list",{
-			  			 data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
-			  			 success:function (res) {
-			  				  if(res.data.code==0){
-			  					   e=res.data.data.pageData[0];				 
-			  					   if (e){
-									    appd.pk_store=e;		
-										that.setData({
-										  def_pick_store: e,
-										  sto_sele_name: e.pickup_name,
-										  sto_sele_id: e.pickup_id,
-										  sto_sele_distr: e.distr_type
-										})
-								   }
-								   
-								   
-								  
-			  				  }
-			  			 }			  
-			  }) 
+		  }else{			    
+				//要用接口是获取距离，js的计算不准
+				getApp().request.promiseGet("/api/weshop/pickup/list",{
+					data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, 			 		  
+				}).then(res=>{				 
+					if(res.data.code==0){
+						   e=res.data.data.pageData[0];				 
+						   if (e){
+								appd.pk_store=e;	
+								that.data.fir_def_store=e;
+								that.setData({
+								  def_pick_store: e,
+								  sto_sele_name: e.pickup_name,
+								  sto_sele_id: e.pickup_id,
+								  sto_sele_distr: e.distr_type
+								})
+						   }
+																						  
+					}		 						 
+				})				  
 		  }
 		  		  
           //e.distance = distance;
@@ -386,18 +389,16 @@ Page({
         }else{
 			 if (e) {
 				 e.distance = null;
+				 that.data.fir_def_store=e;
 				 that.setData({
 				   def_pick_store: e,
 				   sto_sele_name: e.pickup_name,
 				   sto_sele_id: e.pickup_id,
 				   sto_sele_distr: e.distr_type
 				 })
-			 }
-			 
-			
+			 }			
 		}
-       
-        
+             
       }, 500)
     });
 
@@ -548,7 +549,7 @@ Page({
 
   //---展示---
   onShow: function() {
-    var goods_list = null,th = this;
+    var goods_list = null,th = this,that=this;
     var ui = setInterval(function () {
       goods_list = th.selectComponent("#goods_list");
       if (goods_list) {
@@ -620,13 +621,56 @@ Page({
           ee.setData({
             data: t.data.data,
             sele_g: t.data.data,
+			userInfo:getApp().globalData.userInfo
           });
 
-          //获取门店
-          ee.get_sto();
+        
           //获取统一条形码,普通商品和优惠促销的商品
-          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5)
-            ee.get_sku(o.stoid, t.data.data.sku, gid);
+          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){						  
+				      //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
+				      getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){						  
+						    if(th.data.fir_def_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.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});
+									//获取门店
+									ee.get_sto();
+								})
+							}else{
+								//--获取门店--
+								ee.get_sto();
+							}						   
+					  })				 										    
+			  }else{
+				  //获取门店
+				  ee.get_sto();
+			  }
+			  	  		 
+			  ee.get_sku(o.stoid, t.data.data.sku, gid);
+		  }            
           else {
             var gg = "",
               item = t.data.data;
@@ -693,11 +737,6 @@ Page({
     });
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
 
-
-
-
-
-
   },
   enterAddress: function() {
     this.data.enterAddressPage = !0, wx.navigateTo({
@@ -810,6 +849,7 @@ Page({
   addCart: function(t) {
     var th = this;
     var ind = t.currentTarget.dataset.openSpecModal_ind;
+    if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
     th.setData({
       open_ind_store: ind
     });
@@ -836,9 +876,8 @@ Page({
     var e = this,
       th = e,
       a = 0,
-      o = this.data.sele_g;
-    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-    a = o.goods_id;
+      o = this.data.sele_g;  
+      a = o.goods_id;
 
     //----------添加到购物车时，要判断限购数量，--------
     e.get_buy_num(o, function(ee) {
@@ -864,7 +903,6 @@ Page({
       }
 
       if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.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: ""
@@ -889,20 +927,81 @@ 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;
-      } else if (th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
+		
+		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);  //加入购物车下一步
+		}		
+      }	  
+    })
+  },
+  
+  //---加入购物车的最后一步---
+  add_cart_next(e,t,a,o,newd,CanOutQty){
+	  var th=this;
 	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
 	  if(o.prom_type!=1 && o.prom_type!=6){
 	  		   var conf=th.data.bconfig;
-	  		   if(conf.switch_list){
+      if (conf.switch_list && getApp().globalData.userInfo['card_field']){
 	  			   var s_list=JSON.parse(conf.switch_list);
-	  			   //如果后台有开启等级价的功能
-	  			   if(parseInt(s_list.rank_switch)==2){
+				   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
@@ -912,64 +1011,82 @@ Page({
 	  			   }
 	  		   }
 	  }
-
-
-      //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
-      if ("add" == t.currentTarget.dataset.action) {
-        //----先看会员在购物车中是否加入了该商品-----
-        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];
-              var updata = {
-                id: item.id,
-                goods_num: e.data.goodsInputNum + item.goods_num,
-                goods_price: newd.goods_price,
-                store_id: th.data.stoid,
-              };
-
-              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 {
-        newd['pick_name'] = th.data.sto_sele_name;
-        newd['pick_dis'] = th.data.sto_sele_distr;
-        th.buyNow(newd);
-      }
-    })
+	  	  
+	  //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
+	  if ("add" == t.currentTarget.dataset.action) {
+	    //----先看会员在购物车中是否加入了该商品-----
+	    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,
+	            store_id: th.data.stoid,
+	          };
+	  
+	          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 {
+	    newd['pick_name'] = th.data.sto_sele_name;
+	    newd['pick_dis'] = th.data.sto_sele_distr;
+	    th.buyNow(newd);
+	  }
   },
+  
+  
+  
+  
   //----------购买虚拟商品------
   buyVirtualGoods: function(e) {
     Object.assign(e, {
@@ -1018,10 +1135,17 @@ Page({
 
       //--判断商品是否超出限购--
       if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-        if (t + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
+		  
+		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})	
           return false;
         }
       }
@@ -1032,6 +1156,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})	  		  
           return false;
         }
       }
@@ -1049,17 +1177,31 @@ Page({
         if (t > redis_num) {
           wx.showModal({
             title: '超出商品活动库存',
-          });
+          });		  
+		  th.setData({goodsInputNum:redis_num})	  
           return false;
         }
 
       }
 
-      var e = th.data.sele_g.store_count;
-      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 });
+	       
     })
   },
 
@@ -1273,7 +1415,7 @@ Page({
 
   //----------装载同一条形码的商品----------
   async get_sku(stoid, sku, g_id, is_normal, func) {
-    var tt = this;
+    var tt = this,arrdata=null;
     await getApp().request.promiseGet("/api/weshop/goods/page", {
       data: {
         store_id: o.stoid,
@@ -1282,17 +1424,38 @@ Page({
         is_on_sale: 1
       }
     }).then(res => {
-      var e = res;
-      var arrsku = new Array();
-      var gitem = null;
-      if (e.data.code == 0) {
-        var arrdata = e.data.data.pageData,
-          gb = 1,
-          gg = "";
-        for (var i = 0; i < arrdata.length; i++) {
-          var item = arrdata[i],
-            gg = "";
-
+      var e = res; 
+      if (e.data.code == 0) arrdata = e.data.data.pageData;           
+    })
+	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="";
 
@@ -1324,13 +1487,12 @@ Page({
             sku_g: arrsku,
             sele_g: gitem
           });
-        }
-      }
-    })
+        }	
   },
 
   //-----------选择属性的按钮事件----------
   sele_spec: function(e) {
+	var that=this,ee=this,th=this; 
     var gid = e.currentTarget.dataset.gid;
     var sku_g = this.data.sku_g;
     var item = null;
@@ -1343,11 +1505,93 @@ Page({
     if (item) this.setData({
       sele_g: item,
       gid: 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();	
+  },
+  
+  //选择了不同的规格的时候要判断是不是有活动正在进行中
+  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,
+		 })
+		 
+  },
+ 
+ 
   //---------拿出门店分类和门店------------
   get_sto(e) {
-    var th = this;
+    var th = this,that=this;
     var timer_get = setInterval(function() {
       if (th.data.is_get_local_ok == 0) return false;
       var dd = null,
@@ -1358,13 +1602,13 @@ Page({
           store_id: o.stoid,
           distr_type: g_distr_type,
           isstop: 0,
-          pageSize: 300
+          pageSize: 2000
         }
       } else {
         dd = {
           store_id: o.stoid,
           isstop: 0,
-          pageSize: 300
+          pageSize: 2000
         }
       }
       //如果有距离的话
@@ -1379,15 +1623,16 @@ Page({
       }).then(res => {
         var e = res;
         if (e.data.code == 0) {
-
+			
           //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
-          if(dd.lat && !th.data.def_pick_store){
+          if(dd.lat && !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
             });
+			th.data.fir_def_store=e.data.data.pageData[0];
           }
 
           //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
@@ -1401,152 +1646,260 @@ Page({
             e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
           }
 		  
-		  /*----
-		  //--获取线下库存--
-		  if(th.data.sales_rules){
-			  
-		  }---*/
 		  
-
-          //单总量超出5个的时候
-          if (e.data.data.total > 5) {
-              i.get("/api/weshop/storagecategory/page", {
-              data: {
-                store_id: o.stoid,
-                is_show: 1,
-                pageSize: 300
-              },
-              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.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
-              })
-            }
-          }
-        }
+		  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;
+	  //单总量超出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 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}		  
+	      })
+	  }).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(n_item.StorageNo==th.data.fir_def_store.pickup_no){	
+											   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.CanOutQty=0;							  
+							  //--当选择的门店是客户默认的门店的时候--
+							  if(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;
   },
 
   //----------取货门店被点击的效果------
@@ -1707,6 +2060,7 @@ Page({
                     isshow: 1,
                   });
                   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+				  ee.get_sto();
                   return false;
                 }
                 //----已经过期-----
@@ -1727,6 +2081,7 @@ Page({
                     isshow: 1,
                   });
                   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+				  ee.get_sto();
                   return false;
                 }
 
@@ -1744,6 +2099,8 @@ Page({
                   prom_start_time: prom_start_time,
                   isshow: 1,
                 });
+				
+				ee.get_sto();
 
 
                 var newTime = ut.gettimestamp();
@@ -1798,6 +2155,7 @@ Page({
                     isshow: 1,
                   });
                   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+				  ee.get_sto();
                   return false;
                 }
                 //----已经结束-----
@@ -1817,6 +2175,7 @@ Page({
                     isshow: 1,
                   });
                   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+				  ee.get_sto();
                   return false;
                 }
 
@@ -1827,6 +2186,7 @@ Page({
                     isshow: 1,
                   });
                   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+				  ee.get_sto();
                   return false;
                 }
 
@@ -1891,7 +2251,7 @@ Page({
                   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 (val.rynum > max_num) max_num = val.rynum;
+                    if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
                   })
                   t.data.data.max_ct_num = max_num;
                 }
@@ -1908,6 +2268,8 @@ Page({
                   prom_start_time: prom_start_time,
                   isshow: 1,
                 });
+				
+				ee.get_sto();
 
                 var newTime = now;
                 var endTime2 = t.data.data.end_time;
@@ -2257,6 +2619,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})		  		  
           return false;
         }
       }
@@ -2267,6 +2633,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})		  
           return false;
         }
       }
@@ -2286,12 +2656,19 @@ Page({
 			  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) 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: ""
@@ -3107,9 +3484,24 @@ Page({
   // 选择门店
   choice_store: function(ee) {
     var th = this;
-    //var ind=ee.currentTarget.dataset.ind;
+    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 (bconfig.is_sort_storage) {
       wx.getLocation({
         type: 'wgs84',
@@ -3147,23 +3539,64 @@ Page({
       th.data.is_get_local_ok = 1;
       th.get_sto();
     }
-
-    this.setData({
-      //open_ind_store: ind,
-      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;
     this.setData({
       store: 0,
       choice_sort_store: 0,
-      sort_store: 0
+      sort_store: 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
+	  })
+	}
+	
+	
   },
+  
   //选择更多门店
   more_store: function() {
     this.setData({
@@ -3193,16 +3626,61 @@ Page({
       sec_pick_index: 0
     });
   },
-
-
-
+  
   choose_for_store_fir: function(e) {
     var index_c = e.currentTarget.dataset.ind;
-
-    this.setData({
-      fir_pick_index: index_c
+	var th=this;		
+    th.setData({
+		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 && this.data.is_newsales_rules!=1){
+		  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) {
@@ -3222,142 +3700,142 @@ Page({
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-    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;
-
-    this.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) {
     var th = this;
     var item = null;
-
     if (th.data.choice_sort_store == 0) {
-
       var index = th.data.fir_pick_index;
-
       if (th.data.is_show_sto_cat == 1) {
         item = th.data.def_pickpu_list[index];
       } else {
         item = th.data.only_pk[index]; //当没有门店分类的时候
-
       }
     } else {
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-
-    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() {
@@ -3453,7 +3931,19 @@ Page({
    },
    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;
+			}
+	   }	   
    }
+   
+  
 
 
 });
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 0130c2d..66eaaba 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -94,7 +94,7 @@
               <view class="word-line fs20 xc-qtunit-price">零售价￥{{data.market_price}}</view>
             </view>
             <view class="abs white xc-nanber">
-              <text class="fs22">已拼{{prom_act.buy_num}}份</text>
+              <text class="fs22">已拼{{prom_act.buy_num}}件</text>
               <view class="flex" style='margin-top:-34rpx'>
                 <view class="xc-people-img">
                   <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
@@ -404,7 +404,15 @@
                       距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
                      
                      </view>
-                  </view>
+                  </view>				  
+				  <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+				  <block wx:else>
+							 <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+							 <block wx:else>
+								  <view class="no_store" wx:if="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+							 </block>				       
+				  </block>
+				  
                   <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
                   </view>
                  </view>   
@@ -733,10 +741,16 @@
 
   <!-------------------底部按钮-------------------->
   <view class="join-cart">
-    <view bindtap="contactService" class="custom-service cart-ico new_split">
+	<!-- bindtap="contactService" -->  	  
+    <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
-    </view>
+    </button>
+	<view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
+		<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+		<view>客服</view>
+	</view>
+	
     <view bindtap="collectGoods" class="custom-service cart-ico new_split">
       <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
       <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image>
@@ -751,18 +765,17 @@
     </view>
     <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
 
-    <!---- 普通商品购买 ----->
+    <!-- 普通商品购买 -->
     <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
 
-    <block wx:if="{{sele_g.store_count>0}}">
+    <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
+    <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
       <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
       <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
       </block>
-       <block wx:else>
-      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
-      库存不足
-      </view>
-      </block>
+    <block wx:else>
+      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
+    </block>
 
     </block>
 
@@ -862,7 +875,13 @@
           <block wx:if="{{prom_type==0}}">
           <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+			<block wx:if="{{sales_rules==2}}">		
+                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
+				<view class="spec-goods-stock" wx:else>可售:0</view>
+			</block>
+			<block wx:else>
+               <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+			</block>
        
             </view>
           </block>
@@ -872,7 +891,7 @@
             <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
             <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
 
-          
+         
                </view>
           </block>
         </view>
@@ -889,23 +908,31 @@
                      </view>
 
                      <!-- 没有门店的时候 -->
-                     <view  class="flex" bindtap="choice_store"wx:else>
-                          <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                           <view class="fs28 xc-ash-9f">选择门店</view>
+                     <view  class="flex" bindtap="choice_store" wx:else>
+                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                           <view class="fs28 xc-ash-9f">选择门店</view>						  
                       </view>
 
                       <view class="red-co fs28" bindtap="choice_store" >
                          更多门店
                          <text class="right-arrow"></text>
                       </view>
-                  </view>
-                  <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+                   </view>
+				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+				   <block wx:else>
+				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+						 <block wx:else>
+					     	  <view wx:if="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+						 </block>				       
+				   </block>
+				   	   
+                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
          </view>
 
       <!----商品的属性项目---->
       <view  class="xc-goods-attribute">
       <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
-      <view hidden="{{ismend==1}}" class="flex">
+      <view hidden="{{ismend==1}}"  style="max-height: 120rpx;overflow-y: auto;">
         <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
           {{item.gg}}
         </view>
@@ -922,12 +949,57 @@
           </view>
         </view>
       </view>
-       <view class="spec-cart-btns">
-   
-    
-        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
-    
+       <view class="spec-cart-btns">	
+	       <!-- 根本就找不到门店 -->
+	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
+			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
+		   </block>		 
+		   <block wx:else>
+		   
+		 			  
+			  <block wx:if="{{only_pk.length && !only_pk.length}}">
+				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
+			  </block>  	  
+			  <block wx:else>
+			      <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+		  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
+				 </block>
+				 <block wx:else>
+					 <block wx:if="{{!def_pick_store}}">
+						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
+					 </block>					 
+					 <block wx:else>	 						 						  
+						 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+						 <block wx:if="{{sales_rules==2 && prom_type==0}}">
+							 <block wx:if="{{!def_pick_store.CanOutQty}}">
+								   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>						 
+							 </block>
+							 <block wx:else>
+								  <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
+								       class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+								  <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" 
+								       class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> 
+							 </block>			 
+						 </block>
+						 <!-- 线上销售 -->
+						 <block wx:else>
+							 <block wx:if="{{sele_g.store_count<=0}}">
+								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
+							 </block>
+							 <block wx:else>
+								 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
+								     class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+								 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
+								     class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> 
+							 </block>
+						 </block>
+					 </block>									 
+				 </block>
+		  </block>  
+		 
+			
+		</block>	
+			   
     </view>
 
       <view class="clear"></view>
@@ -1062,7 +1134,7 @@
           <view>购买数量</view>
           <view class="count">
             <view bindtap="subCartNum" class="sub">-</view>
-            <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
+            <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
             <view bindtap="addCartNum" class="add">+</view>
           </view>
         </view>
@@ -1281,7 +1353,8 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+							  距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
                         </view>
                       </view>
                       <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 70b40d8..af9058f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -599,7 +599,8 @@ border-radius: 0 56rpx 55rpx 0;
     text-align: center;
 }
 .spec_bt{
-  background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc;
+  background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; display: inline-block;
+  border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc; margin: 10rpx; height: 40rpx; line-height: 40rpx;
 }
 .spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
 .sub {
@@ -2253,7 +2254,7 @@ right:17rpx; top:55rpx;
 height: 90rpx;
 }
 .sn_height{
-  height: 170rpx;
+  min-height: 170rpx; height: auto;padding: 10rpx 0;
 }
 .xc-address_frame .address_frame{
   width: 92%;
@@ -2560,4 +2561,10 @@ border-radius: 55rpx;
 .carde_frame{
   height: 50rpx;
   line-height: 18rpx
-}
\ No newline at end of file
+}
+
+button.custom-service { line-height: normal; border: 0;}
+button.custom-service::after{
+	border: 0;
+}
+.no_store{color:#d60021; font-size: 26rpx;}
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 5a6d098..76d79d8 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -97,10 +97,15 @@ Page({
     },
     requestGoodsList: function(t) {
         var e = this;
-        this.data.requestUrl = t,     
-        t += "&orderField=" + e.data.tabname;
-        t += "&orderType=" + e.data.adname; 
-        t +="&page=" + e.data.currentPage, 
+        this.data.requestUrl = t;
+			
+		//不是商品分组的，不是默认排序的	
+		if(t.indexOf("group_id")==-1 || e.data.tabname!="goods_id" ){					
+           t += "&orderField=" + e.data.tabname;
+           t += "&orderType=" + e.data.adname; 
+		}
+		
+        t +="&page=" + e.data.currentPage;
         a.request(t, 
           function(t) {
             e.setData({is_go:1});
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 59a8d7a..4706a81 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -149,7 +149,8 @@ Page({
       data: {
         store_id: os.stoid,
         pageSize: 5,
-        is_show: 1
+        is_show: 1,
+        level:1
       }
     }).then(res => {
       if (res.data.data) {
@@ -181,7 +182,7 @@ Page({
     //读取全局是否有弄自定义模板
     await api.get_template_fir(o.stoid).then(res => {
       var data = res.data.data;
-      if (data.length > 0) {
+      if (data && data.length > 0) {
         var temp_data = data[0];
         var t_arr = JSON.parse(temp_data.json_str);
         th.setData({
diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js
index ce198f7..ad0b36a 100644
--- a/pages/user/address_list/address_list.js
+++ b/pages/user/address_list/address_list.js
@@ -154,5 +154,59 @@ Page({
 
       
     
-  } 
+  } ,
+  
+   //获取微信地址
+    get_wx:function(){
+      var th=this;
+      wx.getSetting({
+        success(res) {
+          console.log("vres.authSetting['scope.address']：", res.authSetting['scope.address'])
+          if (res.authSetting['scope.address']) {
+            wx.chooseAddress({
+              success(res) {
+                th.save_wx_addr(res);
+              }
+            })
+  
+          } else {
+            if (res.authSetting['scope.address'] == false) {
+              console.log("222")
+              wx.openSetting({
+                success(res) {}
+              })
+            } else {
+  
+              wx.chooseAddress({
+                success(res) {
+                  th.save_wx_addr(res);
+                }
+              })
+            }
+          }
+        }
+      })
+    },
+  
+    save_wx_addr:function (res) {
+      var pd={},th=this;
+      pd.store_id=os.stoid;
+      pd.user_id=getApp().globalData.user_id;
+      pd.userName=res.userName;
+      pd.provinceName=res.provinceName;
+      pd.countryName=res.countyName;
+      pd.cityName=res.cityName;
+      pd.detailInfo=res.detailInfo;
+      pd.postalCode=res.postalCode;
+      pd.telNumber=res.telNumber;
+      getApp().request.promisePost("/api/weshop/useraddress/saveWx",{data:pd}).then(res=>{
+        if(res.data.code==0){
+          getApp().my_warnning("保存成功",1,th);
+          setTimeout(function () {
+            th.onShow();
+          },1000)
+        }
+      })
+  
+    }
 });
\ No newline at end of file
diff --git a/pages/user/address_list/address_list.json b/pages/user/address_list/address_list.json
index 7bc362b..467c798 100644
--- a/pages/user/address_list/address_list.json
+++ b/pages/user/address_list/address_list.json
@@ -1,3 +1,6 @@
 {
-    "navigationBarTitleText": "收货地址"
+    "navigationBarTitleText": "收货地址",
+	"usingComponents": {	    
+	    "warn": "/components/long_warn/long_warn"	   
+	}
 }
\ No newline at end of file
diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml
index 26def32..f624fda 100644
--- a/pages/user/address_list/address_list.wxml
+++ b/pages/user/address_list/address_list.wxml
@@ -28,8 +28,19 @@
     <view>暂无收货地址</view>
   </view>
 
-  <view class="address flex-level">
-    <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">添加收货地址</navigator>
+  <view class="address flex jc_sb" style="width:76%; margin-left:12%">
+  
+      <navigator bindtap="get_wx" class="ye">
+        <view class="add">+</view>
+        <view class="addAddress">获取微信地址</view>
+      </navigator>
+  
+      <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+        <view class="add">+</view>
+        <view class="addAddress">新建收货地址</view>
+      </navigator>
+
+
   </view>
 </view>
 
@@ -69,12 +80,17 @@
 
   </view>
 
-  <!-- 新建收货地址 -->
-  <view class="new">
-    <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
-      <view class="add">+</view>
-      <view class="addAddress">新建收货地址</view>
-    </navigator>
-  </view>
-
-</view>
\ No newline at end of file
+   <!-- 新建收货地址 -->
+    <view class="new flex jc_sb">
+      <navigator bindtap="get_wx" class="ye">
+        <view class="add">+</view>
+        <view class="addAddress">获取微信地址</view>
+      </navigator>
+  
+      <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+        <view class="add">+</view>
+        <view class="addAddress">新建收货地址</view>
+      </navigator>
+    </view>
+</view>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/address_list/address_list.wxss b/pages/user/address_list/address_list.wxss
index d6a4958..d20eeaa 100644
--- a/pages/user/address_list/address_list.wxss
+++ b/pages/user/address_list/address_list.wxss
@@ -213,14 +213,14 @@ page {
 }
 
 .container .new {
-  width: 100%;
+  width: 86%;
   display: flex;
-  justify-content: center;
   position: fixed;
   bottom: 0rpx;
   height: 204rpx;
   align-items: center;
   background-color: rgb(255, 255, 255);
+  margin-left:7% 
 }
 
 .container .new .add {
@@ -229,7 +229,7 @@ page {
 
 .container navigator {
   display: flex;
-  width: 430rpx;
+  width: 300rpx;
   height: 62rpx;
   background-color: rgb(239, 22, 51);
   border-radius: 40rpx;
@@ -238,3 +238,10 @@ page {
   color: rgb(255, 255, 255);
   font-size: 27rpx;
 }
+
+.container navigator.ye{
+  background-color: #fc872d;
+}
+.nothing .address navigator.ye{
+  background-color: #fc872d;
+}
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 2f99c7e..01c93a3 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -1,5 +1,7 @@
 var e = getApp(), r = e.request,rq=r,t = require("../../../utils/util.js"), o = require("../../../utils/common.js"),oo=e.globalData,os=oo.setting;
 var regeneratorRuntime = require('../../../utils/runtime.js');
+var ut= require('../../../utils/util.js');
+
 
 Page({
     data: {
@@ -270,10 +272,206 @@ Page({
     },
 
     //--------立即支付----------
-    jumpToCart4: function(e) {
-        this.data.optionIsGoup ? wx.navigateTo({
-            url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
-        }) : o.jumpToCart4({
+    async jumpToCart4(e) {
+		var th=this;	
+        if(this.data.optionIsGoup) 
+		     wx.navigateTo({
+                 url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
+             }) 		   
+		var order=this.data.order;
+		var order_goods=order.order_goods;   
+		
+		for(var i in order_goods){
+			var good=order_goods[i];
+			//如果不是小程序有的功能，直接提示要去3.0处理
+			if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+				wx.showModal({
+				  title: '提示',
+				  content: '小程序还未有该活动，请到3.0公众号支付'
+				});
+				return false;
+			}
+			
+			//要每件每件的商品进行检查，看有么有超出库存，超出限购
+			var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null;
+			//获取单品的现在的活动状态
+			await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {		
+			}).then(res=>{
+				gg=res.data.data;
+			})		
+			var limit = gg.viplimited;
+			var store_count = gg.store_count;
+			
+			//---要获得商品，该用户买了多少件,同步应用---
+			await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+			  data: {
+			    store_id: os.stoid,
+			    user_id: getApp().globalData.user_id,
+			    goods_id: good.goods_id,
+			    prom_type: good.prom_type,
+			    prom_id: good.prom_id
+			  },
+			}).then(res => {
+			   var buy_num_data = res.data.data;
+			   if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+			   goodsbuynum = buy_num_data.goodsbuynum;
+			})
+			
+			var buyed_mum2=goodsbuynum+good.goods_num;		
+			if (buyed_mum2 > limit && limit > 0) {
+			  wx.showModal({
+			    title: '提示',
+			    content: gg.goods_name+'购买数量超出商品限购'
+			  });
+			  return false;
+			}
+			
+			  if(good.prom_type==1 || good.prom_type==6){
+				   if(gg.prom_type!=good.prom_type)	{
+					   wx.showModal({
+					     title: '提示',
+					     content: gg.goods_name+'商品的活动发生了变化'
+					   });
+					   return false;		   
+				   }
+					
+			  }else{
+				  
+				  if(gg.prom_type==1 || gg.prom_type==6){
+					  var prom=null;
+					  //---如果是活动的时候---
+					  var prom=null,th=this;
+					  if(gg.prom_type==1){	
+					  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{		  		
+					  			  }).then(res=>{
+					  				  if(res.data.code==0){
+					  					  prom=res.data.data;
+					  				  }
+					  			  })
+					  }	  
+					  if(gg.prom_type==6){
+					  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
+					  			}).then(res=>{
+					  				  if(res.data.code==0){
+					  					  prom=res.data.data;
+					  				  }
+					  			})	  
+					  }	 
+										
+					  if(prom){
+						  var t_now=ut.gettimestamp();
+						  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
+							  wx.showModal({
+							    title: '提示',
+							    content: gg.goods_name+'商品的活动发生了变化'
+							  });
+							  return false;	
+						  }
+					  } 				  
+				  }
+				  
+				  			  
+				  var isok=1;
+				  var card_field=th.data.card_field;
+				  //如果会员是等级会员,商品有等级价,且不是活动商品
+				  if(card_field && gg[card_field]>0){
+					 if (good.goods_price != gg[card_field])  isok = 0;
+				  }else{
+					 if (good.goods_price != gg.shop_price)  isok = 0;
+						
+				  }	
+				  if(!isok){
+					  wx.showModal({
+					    title: '提示',
+					    content: gg.goods_name+'商品的价格发生了变化'
+					  });
+					  return false;		
+				  }		
+				
+				  //--如果是线下库存的时候--		
+				  if(th.data.conf.sales_rules==2){
+					   var ob={};
+					   await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
+						   ob=obj;
+					   })
+					   if(ob.code==-1){
+						   wx.showModal({
+						     title: '提示',
+						     content: gg.goods_name+'门店库存不足'
+						   });
+						   return false;		
+					   }				   
+					   
+				  }else{
+					  if(good.goods_num>store_count){
+						   wx.showModal({
+							 title: '提示',
+							 content: gg.goods_name+'商品的库存不足'
+						   });
+						   return false;		
+					  }
+					  
+				  }			  
+			  }
+			
+			  var prom=null;
+			  //---如果是活动的时候---
+			  var prom=null,goodsinfo=good,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;
+					  }
+				})	  
+			  }	  
+			  //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
+			  if(prom){
+				  var now=ut.gettimestamp();
+				  if(prom.is_end==1 && prom.end_time<now){			   
+					wx.showModal({
+					  title: '提示',
+					  content: goodsinfo.goods_name+'商品的活动已经结束'
+					});
+					return false;		
+				  }
+				  
+				  buyed_mum2=promgoodsbuynum+good.goods_num;
+				  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
+				    wx.showModal({
+				      title: '提示',
+				      content: goodsinfo.goods_name+'购买数量超出商品活动限购'
+				    });
+				    return false;
+				  }
+				  
+				  var redis_num = 0;
+				  //------判断活动是否抢光-----
+				  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+				    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
+				    }).then(res => {
+				      redis_num = res.data.data;
+				  });
+				  
+				  if (good.goods_num > redis_num) {
+				    wx.showModal({
+				       title: gg.goods_name+'超出商品活动库存',
+				    });
+				    return false;
+				  }	
+			  }			  
+			  		
+		}
+	  	
+		o.jumpToCart4({
             order_sn: this.data.order.order_sn,
             order_amount: this.data.order.order_amount
         }, 1);
@@ -344,14 +542,18 @@ Page({
     //-----删除订单-----
     deleteOrderData: function(t) {
         var th=this;
-        var order_id=t.currentTarget.dataset.order_id;
+        var order_id=t.currentTarget.dataset.order_id;		
+	    var	up_data={
+		  order_id: order_id,isdel:1
+		};	
+		if(th.data.order.order_status!=6){
+			up_data.order_status=5;
+		}		
         wx.showModal({
             title: "是否删除订单？",
             success: function(tt) {
-                t.confirm && rq.put("/api/weshop/order/updatebyId", {
-                    data: {
-                      order_id: order_id, order_status: 5
-                    },
+                tt.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: up_data,
                     success: function (t) {
                         getApp().my_warnning("删除成功",1,th);
                         setTimeout(function () {
@@ -389,7 +591,48 @@ Page({
             if(item.order_amount==0 || item.user_money==0) return true;
         }
         return false;
-    }
+    },
+	
+	
+
+	//---检验线下库存的数量的子函数---
+	async check_down_line_next(gg,num,pick_id,func){
+	 
+	  var lock=0,pick_no,plist;
+	  //先读取门店的lock
+	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+		  data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id}
+	  }).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/pickup/get/"+os.stoid+"/"+pick_id,{
+		  data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id}
+	  }).then(res=>{
+		  if(res.data.code==0){
+			  pick_no=res.data.data.pickup_no;
+		  }
+	  })	   
+	  //读取线下的门店库存 
+	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+		  data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid}
+	  }).then(res=>{
+		  if(res.data.code==0){
+			  plist=res.data.data.pageData[0];		 
+		  }
+	  })	  
+	  var ob={}; ob.code=1;	  
+	  if(num>plist.CanOutQty-lock){
+		 ob.code=-1; 
+		 ob.CanOutQty=plist.CanOutQty-lock
+		 if(ob.CanOutQty<0) ob.CanOutQty=0;  
+	  }
+	  func(ob)  
+	},
+
 
 
 
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index a3c5550..292b975 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -137,6 +137,9 @@
         <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
            <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
         </block>
+		
+		<view class="tips-btn" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
+		
 
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
 
@@ -146,7 +149,7 @@
                           <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
          </block>
          <block wx:else>
-                          <view class="tips-btn" wx:if="{{order.is_all_return_status==2}}"  bindtap="deleteOrderData" order_id="{{order.order_id}}" >删除订单</view>
+                          <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 103dd9b..25ed2f6 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -11,6 +11,7 @@ var t = function(t) {
   a = require("../../../utils/common.js"),
   s = new t.default();
 var regeneratorRuntime = require('../../../utils/runtime.js');
+var ut= require('../../../utils/util.js');
 
 Page({
   data: {
@@ -39,18 +40,36 @@ Page({
     //已经读取过接口
     is_get: 0,
     conf: null,
-    iscodeall: null
+    iscodeall: null,
+	
+	//会员的等级价位
+	card_field:null,
   },
   onLoad: function(t) {
     var th = this;
     if (t.type != undefined) this.setData({
       activeCategoryId: t.type
     })
-    s.init(this, "", "orderList");
+    s.init(this, "", "orderList");	
+	//---查看会员的等级价---
     getApp().getConfig2(function(e) {
-      th.setData({
-        conf: e
-      });
+			th.setData({conf: e });		
+	        //--- 看后台是不是有开通等级卡 ---
+	  		if(e.switch_list){
+	  			   var s_list=JSON.parse(e.switch_list);
+	  			   //如果后台有开启等级价的功能
+	  			   if(parseInt(s_list.rank_switch)==2){	   
+	  				   var user=getApp().globalData.userInfo;				   
+	  				   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){
+	  					   th.setData({card_field:user.card_field})
+	  				   }	   
+	  			   }
+	  		}	  
     })
   },
   onShow: function() {
@@ -79,6 +98,7 @@ Page({
       case "4":
         r += "&order_status=2"; break;
     }
+	r+="&isdel=0";
     this.setData({ activeCategoryId: t }); r = r + "&page=" + e.data.currentPage;
     s.request(r, function (t) {
 
@@ -251,8 +271,7 @@ Page({
 
   /*-----------确认收货-----------*/
   confirmOrder: function(t) {
-    var e = this,
-      a = t.currentTarget.dataset.id;
+    var e = this,a = t.currentTarget.dataset.id;
     var is_zsorder = t.currentTarget.dataset.zsorder;
     var th = this;
 
@@ -283,14 +302,17 @@ Page({
   deleteOrderData: function(t) {
     var th = this;
     var order_id = t.currentTarget.dataset.order_id;
+    var index = t.currentTarget.dataset.index;
+	var up_data={order_id: order_id,isdel:1};
+	var order=th.data.orderList[index];
+	if(order.order_status!=6){
+		up_data.order_status=5;
+	}	
     wx.showModal({
       title: "是否删除订单？",
       success: function(tt) {
         tt.confirm && rq.put("/api/weshop/order/updatebyId", {
-          data: {
-            order_id: order_id,
-            order_status: 5
-          },
+          data: up_data,
           success: function(t) {
             for (var e = 0; e < th.data.orderList.length; e++)
               if (th.data.orderList[e].order_id == order_id) {
@@ -348,40 +370,278 @@ Page({
   },
 
   /*----------跳转支付-----------*/
-  jumpToCart4: function(t) {
+  async jumpToCart4(t) {
     var o_index = t.currentTarget.dataset.idx;
     var e = this.data.orderList[t.currentTarget.dataset.idx];
     var th = this;
-
-    console.log("jumpToCart4");
-    console.log(e);
-
-    if (e.order_amount == 0) {
-      var dd = {
-        parent_sn: e.order_sn,
-        store_id: e.store_id,
-        type: 1,
-      };
-      getApp().request.post("/api/weshop/order/pay/createOrder", {
-        data: dd,
-        success: function(t) {
-          if (t.data.code == 0) {
-            th.onload();
-          } else {
-            getApp().confirmBox(t.data.msg + "请您取消该订单");
-          }
-        }
-      })
-      return false;
-    }
-
-    a.jumpToCart4({
-      order_sn: e.order_sn,
-      order_amount: e.order_amount,
-      type: 1 //正常单
-    });
+	var order=e ;	
+	var order_goods=e.order_goods;
+		
+	for(var i in order_goods){		
+		var good=order_goods[i];
+		//如果不是小程序有的功能，直接提示要去3.0处理
+		if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+			wx.showModal({
+			  title: '提示',
+			  content: '小程序还未有该活动，请到3.0公众号支付'
+			});
+			return false;
+		}
+		
+		//要每件每件的商品进行检查，看有么有超出库存，超出限购
+		var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null;
+		//获取单品的现在的活动状态
+		await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {		
+		}).then(res=>{
+			gg=res.data.data;
+		})		
+		var limit = gg.viplimited;
+		var store_count = gg.store_count;
+		
+		//---要获得商品，该用户买了多少件,同步应用---
+		await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+		  data: {
+		    store_id: os.stoid,
+		    user_id: getApp().globalData.user_id,
+		    goods_id: good.goods_id,
+		    prom_type: good.prom_type,
+		    prom_id: good.prom_id
+		  },
+		}).then(res => {
+		   var buy_num_data = res.data.data;
+		   if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+		   goodsbuynum = buy_num_data.goodsbuynum;
+		})
+		
+		var buyed_mum2=goodsbuynum+good.goods_num;		
+		if (buyed_mum2 > limit && limit > 0) {
+		  wx.showModal({
+		    title: '提示',
+		    content: gg.goods_name+'购买数量超出商品限购'
+		  });
+		  return false;
+		}
+		
+		
+		 console.log("-----------------111-------------------");
+		
+		  if(good.prom_type==1 || good.prom_type==6){
+			   if(gg.prom_type!=good.prom_type)	{
+				   wx.showModal({
+				     title: '提示',
+				     content: gg.goods_name+'商品的活动发生了变化'
+				   });
+				   return false;		   
+			   }
+			
+		  }else{
+			  
+			  if(gg.prom_type==1 || gg.prom_type==6){
+				  var prom=null;
+				  //---如果是活动的时候---
+				  var prom=null,th=this;
+				  if(gg.prom_type==1){	
+				  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{		  		
+				  			  }).then(res=>{
+				  				  if(res.data.code==0){
+				  					  prom=res.data.data;
+				  				  }
+				  			  })
+				  }	  
+				  if(gg.prom_type==6){
+				  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
+				  			}).then(res=>{
+				  				  if(res.data.code==0){
+				  					  prom=res.data.data;
+				  				  }
+				  			})	  
+				  }	 
+									
+				  if(prom){
+					  var t_now=ut.gettimestamp();
+					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
+						  wx.showModal({
+						    title: '提示',
+						    content: gg.goods_name+'商品的活动发生了变化'
+						  });
+						  return false;	
+					  }
+				  } 				  
+			  }
+			  
+			  			  
+			  var isok=1;
+			  var card_field=th.data.card_field;
+			  //如果会员是等级会员,商品有等级价,且不是活动商品
+			  if(card_field && gg[card_field]>0){
+				 if (good.goods_price != gg[card_field])  isok = 0;
+			  }else{
+				 if (good.goods_price != gg.shop_price)  isok = 0;
+					
+			  }	
+			  if(!isok){
+				  wx.showModal({
+				    title: '提示',
+				    content: gg.goods_name+'商品的价格发生了变化'
+				  });
+				  return false;		
+			  }		
+			
+			  //--如果是线下库存的时候--		
+			  if(th.data.conf.sales_rules==2){
+				   var ob={};
+				   await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
+					   ob=obj;
+				   })
+				   if(ob.code==-1){
+					   wx.showModal({
+					     title: '提示',
+					     content: gg.goods_name+'门店库存不足'
+					   });
+					   return false;		
+				   }				   
+				   
+			  }else{
+				  if(good.goods_num>store_count){
+					   wx.showModal({
+						 title: '提示',
+						 content: gg.goods_name+'商品的库存不足'
+					   });
+					   return false;		
+				  }
+				  
+			  }			  
+		  }
+		  
+		  console.log("------------------------------------");
+		
+		  var prom=null;
+		  //---如果是活动的时候---
+		  var prom=null,goodsinfo=good,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;
+				  }
+			})	  
+		  }	  
+		  //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
+		  if(prom){
+			  var now=ut.gettimestamp();
+			  if(prom.is_end==1 && prom.end_time<now){			   
+				wx.showModal({
+				  title: '提示',
+				  content: goodsinfo.goods_name+'商品的活动已经结束'
+				});
+				return false;		
+			  }
+			  
+			  buyed_mum2=promgoodsbuynum+good.goods_num;
+			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
+			    wx.showModal({
+			      title: '提示',
+			      content: goodsinfo.goods_name+'购买数量超出商品活动限购'
+			    });
+			    return false;
+			  }
+			  
+			  var redis_num = 0;
+			  //------判断活动是否抢光-----
+			  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+			    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
+			    }).then(res => {
+			      redis_num = res.data.data;
+			  });
+			  
+			  if (good.goods_num > redis_num) {
+			    wx.showModal({
+			       title: gg.goods_name+'超出商品活动库存',
+			    });
+			    return false;
+			  }	
+		  }
+		  
+		  		
+	}
+	th.pay_next(e);   
   },
-
+  
+  
+  pay_next(e){
+	  if (e.order_amount == 0) {
+	    var dd = {
+	      parent_sn: e.order_sn,
+	      store_id: e.store_id,
+	      type: 1,
+	    };
+	    getApp().request.post("/api/weshop/order/pay/createOrder", {
+	      data: dd,
+	      success: function(t) {
+	        if (t.data.code == 0) {
+	          th.onload();
+	        } else {
+	          getApp().confirmBox(t.data.msg + "请您取消该订单");
+	        }
+	      }
+	    })
+	    return false;
+	  }	  
+	  a.jumpToCart4({
+	    order_sn: e.order_sn,
+	    order_amount: e.order_amount,
+	    type: 1 //正常单
+	  });
+  },
+  
+    //---检验线下库存的数量的子函数---
+    async check_down_line_next(gg,num,pick_id,func){
+  	 
+  	  var lock=0,pick_no,plist;
+  	  //先读取门店的lock
+  	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+  		  data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id}
+  	  }).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/pickup/get/"+os.stoid+"/"+pick_id,{
+  		  data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id}
+  	  }).then(res=>{
+  		  if(res.data.code==0){
+  			  pick_no=res.data.data.pickup_no;
+  		  }
+  	  })	   
+  	  //读取线下的门店库存 
+  	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid}
+  	  }).then(res=>{
+  		  if(res.data.code==0){
+  			  plist=res.data.data.pageData[0];		 
+  		  }
+  	  })	  
+  	  var ob={}; ob.code=1;	  
+  	  if(num>plist.CanOutQty-lock){
+  		 ob.code=-1; 
+  		 ob.CanOutQty=plist.CanOutQty-lock
+  		 if(ob.CanOutQty<0) ob.CanOutQty=0;  
+  	  }
+  	  func(ob)  
+    },
+  
+  
+  
   //------图片失败，默认图片---------
   bind_bnerr: function(e) {
     var _errImg = e.currentTarget.dataset.errorimg;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 078d4b9..335bf1a 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -24,16 +24,20 @@
         <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
         <view wx:if="{{(item.order_status==2)}}">待评价</view>
         <view wx:if="{{item.order_status==4}}">已评价</view>
-        <view wx:if="{{item.order_status==3 && item.pt_status!=6}}">已取消</view>
+        <view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view> 
+		    <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+	    </view>
         <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
         <view wx:if="{{item.order_status==6}}">退款成功</view>
         <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
       </block>
       <block wx:else>退款中</block>
+	  <!--
       <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
         <view class="lin"></view>
-        <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-order_id="{{item.order_id}}"></image>
-      </view>
+        <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+      </view>-->
+	  
     </view>
   </view>
 
@@ -126,8 +130,6 @@
         </view>
         <view class="links flex-right-vertical fs30">
           <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
-
-          <view class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3}}">已取消</view>
           <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
           <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
           <!---has_rt部分退---->
@@ -136,7 +138,7 @@
             <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
           </block>
           <block wx:else>
-            <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}">删除订单</view>
+            <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2  && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
             <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
             <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
           </block>
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index c5f5be2..a63509b 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -152,8 +152,8 @@ page {
 }
 
 .Commodity_number .lin {
-  border-left: 2rpx solid rgb(129, 65, 81);
-  margin: 0rpx 15rpx;
+  border-right: 1rpx solid #C4182E;
+  margin: 0rpx 11rpx; width: 2rpx;
   height: 31rpx;
 }