diff --git a/app.js b/app.js
new file mode 100644
index 0000000..47bb739
--- /dev/null
+++ b/app.js
@@ -0,0 +1,420 @@
+var t = require("setting.js"), o = require("./utils/auth.js"), a = require("./utils/request.js"), e = require("./utils/common.js"), ut = require("./utils/util.js");
+var os=t;
+var regeneratorRuntime = require('./utils/runtime.js');
+var api = require("./api/api.js")
+
+//公共方法和变量
+App({
+    globalData: {
+        setting: t,
+        wechatUser: null,
+        userInfo: null,
+        config: null,   //门店参数
+        config2: null,  //门店配置
+        code: null,
+        heigth:0,
+        user_id:null,// 3674923,// 4379287,//  null,// 5682068,
+        buy_now:null,
+        picklist:null,    //门店列表
+        wuliuprice: null, //物流价格表
+        wuliu: null,      //物流公司
+        baddr:null,
+        mobile: null,    //记录手机
+        getu:null,       //记录会员信息
+        sessionKey: null,//记录会员信息
+        openid: null,    //记录会员信息
+
+        to_group:null,      //参团传递的数据
+        wxapp_buy_obj:null, //微信小程序购买的Object
+        pk_store:null,      //选择的门店
+
+    },
+    auth: o,
+    request: a,
+    onLaunch: function() {
+        this.initExt();
+        var t = this.globalData.setting;
+        t.resourceUrl = t.url + "/template/mobile/rainbow";
+        var clientWidth = wx.getSystemInfoSync().windowWidth;
+        var rpxR = 750 / clientWidth;
+        var calc = wx.getSystemInfoSync().windowHeight * rpxR;
+        this.globalData.heigth=calc;
+
+        var app=this;
+        if(!app.globalData.userInfo){
+            var user = wx.getStorageSync("userinfo");
+            if (user && user.user_id){
+               app.globalData.userInfo=wx.getStorageSync("userinfo");
+               app.globalData.user_id= app.globalData.userInfo.user_id;
+            }
+        }
+    },
+
+    //---初始化第三方----
+    initExt: function() {
+        var tt=t;
+        console.log("initExt");
+        console.log(11);
+        var t = wx.getExtConfigSync(), o = this.globalData.setting;
+        console.log(t);
+        t.appName ? (o.appName = t.appName, o.stoid = t.stoid) : tt=1;
+
+
+    },
+
+    //首页的第一次登录
+    getUserFir(t){
+      var s = this;
+      if (o.isAuth()) "function" == typeof t && t(s.globalData.userInfo, s.globalData.wechatUser); else {
+        if (!o.isAuth()) return o.wxLogin_fir(t);
+        if (null == s.globalData.userInfo) {
+          return o.wxLogin_fir(t);
+        }
+      }
+    },
+
+    getUserInfo: function(t, n, i) {
+        var s = this;
+        if (o.isAuth()) "function" == typeof t && t(s.globalData.userInfo, s.globalData.wechatUser); else {
+          if (!o.isAuth()) return o.auth(t);
+          if (null == s.globalData.userInfo){
+            return o.auth(t);
+          }
+          /*---
+            a.get("/api/user/userInfo", {
+                isShowLoading: void 0 === i || i,
+                success: function(o) {
+                    s.globalData.userInfo = o.data.result, s.globalData.userInfo.head_pic = e.getFullUrl(s.globalData.userInfo.head_pic),
+                    "function" == typeof t && t(s.globalData.userInfo, s.globalData.wechatUser);
+                }
+            });--*/
+        }
+    },
+    //----------------获取配置参数--------------------
+    getConfig: function(t, o) {
+      var e = this; if(this.globalData.config==undefined) this.globalData.config=null;
+      this.globalData.config ? "function" == typeof t && t(this.globalData.config) : e.request.get("/api/weshop/store/get/" + e.globalData.setting.stoid, {
+            success: function(o) {
+                console.log('getConfig');
+		            if(o.data.code==0){
+                    e.globalData.config = o.data.data, "function" == typeof t && t(e.globalData.config);
+                }
+            }
+        });
+    },
+
+    //----------------获取配置参数--------------------
+    getConfig2: function (t, o) {
+      var e = this;
+      this.globalData.config2 && !o ?
+        "function" == typeof t && t(this.globalData.config2) : a.get("/api/weshop/storeconfig/get/" + e.globalData.setting.stoid, {
+        success: function (o) {
+          console.log('getConfig2');
+          if (o.data.code == 0) {
+            e.globalData.config2 = o.data.data, "function" == typeof t && t(e.globalData.config2);
+          }
+        }
+      });
+    },
+
+  //----------------获取商家开启的物流--------------------
+  getwuliu: function (t, o){
+    var th = this, st = this.globalData.setting;
+    this.globalData.wuliu && !o ?
+      "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
+        data: { store_id: st.stoid, status: 1, pageSize:600 },
+        success: function (o) {
+          console.log('getwuliu');
+          console.log(o);
+          if (o.data.code == 0) {
+            var arr = o.data.data.pageData;
+            console.log(arr);
+            arr.forEach(function(item,index){
+                arr[index].code = item.shipping_code; arr[index].name = item.shipping_name;
+            })
+            th.globalData.wuliu = arr, "function" == typeof t && t(arr);
+          }
+        }
+      });
+  },
+
+  //----------------获取物流价格表--------------------
+  getwuliuprice: function (t, o) {
+    var e = this,th=e, st = this.globalData.setting;
+    this.globalData.wuliuprice && !o ?
+      "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{
+        data: { store_id: st.stoid,pageSize: 600 },
+        success: function (o) {
+          console.log('getwuliuprice');
+          console.log(o);
+          if (o.data.code == 0) {
+               var arr=o.data.data.pageData;
+               console.log(arr);
+               if (arr.length>0){
+                  for (var i = 0; i < arr.length;i++){
+                       arr[i].code = arr[i].shipping_code;
+                       if (arr[i].json_config != "" && arr[i].json_config != undefined && arr[i].json_config != null )
+                             arr[i].config = JSON.parse(arr[i].json_config);
+                  }
+               }
+              th.globalData.wuliuprice = o.data.data, "function" == typeof t && t(e.globalData.wuliuprice);
+          }
+        }
+      });
+  },
+    //----------------设置立即购买数组--------------------
+   set_b_now: function (d) { this.globalData.buy_now=d;},
+   get_b_now: function () {return this.globalData.buy_now},
+
+    getPrevPageData: function(t) {
+        void 0 === t && (t = 1);
+        var o = getCurrentPages();
+        return o[o.length - t - 1].data;
+    },
+    showLoading: function(t, o) {
+        void 0 === o && (o = 1500), wx.showToast({
+            title: "加载中",
+            icon: "loading",
+            duration: o,
+            mask: !0,
+            complete: function() {
+                "function" == typeof t && setTimeout(t, o);
+            }
+        });
+    },
+    showSuccess: function(t, o, a) {
+        void 0 === a && (a = 1e3), wx.showToast({
+            title: t,
+            icon: "success",
+            duration: a,
+            mask: !0,
+            complete: function() {
+                "function" == typeof o && setTimeout(o, a);
+            }
+        });
+    },
+    showWarning: function(t, o, a, e) {
+        //var imghost=this.globalData.setting.imghost;
+        !a && (a = 1500), void 0 === e && (e = !0), wx.showToast({
+            title: t,
+            mask: e,
+            duration: a,
+            image:"/images/gt.png",
+            complete: function() {
+                "function" == typeof o && setTimeout(o, a);
+            }
+        });
+    },
+
+    confirmBox: function(t, o) {
+        wx.showModal({
+            title: t,
+            showCancel: !1,
+            complete: function() {
+                "function" == typeof o && o();
+            }
+        });
+    },
+
+    //----------获取所有的门店------------
+    get_allsto(func){
+        var th=this;
+        if (this.globalData.picklist!=null){
+           "function" == typeof func && func(th.globalData.picklist);
+        }else{
+          th.request.get("/api/weshop/pickup/page", {
+            data: { store_id: th.globalData.setting.stoid, pageSize: 600 },
+            success: function (da) {
+               //设置门店
+               //th.setData({ allsto: da.data.data.pageData });
+               th.globalData.picklist = da.data.data.pageData;
+              "function" == typeof func && func(th.globalData.picklist);
+            }
+          })
+        }
+    },
+
+    //同步化，在调用的时候要await
+   async get_isbuy() {
+
+      var th=this;
+      await api.check_isbuy({ store_id: t.stoid, type: 5 }).then(res=>{
+         var o=res;
+         if (o.data.code == 0) {
+          var ob = { isout: 0, isbuy: 1 };
+          var arr = o.data.data.pageData;
+          var isbuy = 0;
+          //----如果数组不为空----
+          if (arr.length > 0) {
+            arr.forEach(function (val, ind) {
+              if (val.is_sy == 0 && val.type == 5) {
+                isbuy = 1;
+                var now = ut.gettimestamp();
+                if (now > val.end_time) ob.isout = 1;
+                return false;
+              }
+            })
+          }
+          ob.isbuy = isbuy;
+          th.globalData.wxapp_buy_obj=ob;
+        }
+      })
+    },
+
+    //--同步化，在调用的时候要await,获取商家config--
+    async getConfig_ays(){
+      if(this.globalData.config!=null) return false;
+      var th=this;
+      await api.get_config(this.globalData.setting.stoid).then(res=>{
+        var o=res;
+        if(o.data.code==0){
+          th.globalData.config = o.data.data;
+        }
+      })
+    },
+
+    //----智能跳转，判断 非tabBar,tabBar页面的跳转----
+    goto:function (url) {
+        var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList",
+                       "/pages/goods/categoryList/categoryList?type=2",
+                       "/pages/goods/categoryList/categoryList?type=1",
+                       "/pages/cart/cart/cart","/pages/user/index/index"];
+        if(arr_tabbar.indexOf(url)!=-1){
+             if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
+             if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
+             wx.switchTab({ url: url, })  //跳到tabbar页
+        }else{
+            wx.navigateTo({ url: url, })  //跳到非tabbar页
+        }
+    },
+
+    //显示提示，word提示内容，type 0失败，提示   1成功
+    my_warnning(word,type,that,width){
+        var warn = that.selectComponent("#warn"); //组件的id
+        warn.open(word,type,width);
+        return 1;
+    },
+
+    //获取会员门店
+    get_user_store:function (func)
+    {
+        var th=this;
+        this.getConfig2(function (conf) {
+            //---空会员的情况---
+            if(!th.globalData.userInfo){
+                return func(null);
+            }
+            if(!th.globalData.pk_store){
+                var pick_id=0;
+                //先找一个会员是否有设置默认的地址
+                if(th.globalData.userInfo.def_pickup_id){
+                    pick_id= th.globalData.userInfo.def_pickup_id
+                }
+                //查找会员的注册的地址
+                else if(th.globalData.userInfo.pickup_id){
+                    //--购买门店是否默认登记门店--
+                    if(conf.switch_list){
+                        var t_swi=JSON.parse(conf.switch_list);
+                        if(t_swi.is_regstores){
+                            pick_id= th.globalData.userInfo.pickup_id
+                        }
+                    }
+
+                }
+                //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
+                if(pick_id==0)  return func(null);
+                //获取用户注册时候的门店,这个门店不能关闭，同时这个门店的分类不能关闭
+                th.request.get("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{
+                    data:{},
+                    success:function (res) {
+                        th.globalData.pk_store=null;
+                        if(res.data.code==0 && res.data.data && res.data.data.isstop==0){
+                            if(res.data.data.category_id){
+                                th.request.get( "/api/weshop/storagecategory/get/"+os.stoid+"/"+res.data.data.category_id, {
+                                    data: {},
+                                    success: function (ee) {
+                                        if(ee.data.code==0 && ee.data.data ){
+                                               if(ee.data.data.is_show==1){
+                                                   th.globalData.pk_store = res.data.data;
+                                                   func(th.globalData.pk_store);
+                                               }else{
+                                                   func(null);
+                                               }
+                                        }else{
+                                            func(null);
+                                        }
+                                    }
+                                })
+                            }else{
+                                th.globalData.pk_store = res.data.data;
+                                func(th.globalData.pk_store);
+                            }
+                        }else{
+                            func(null);
+                        }
+                    }
+                })
+            }else{
+                func(th.globalData.pk_store);
+            }
+        })
+
+    },
+
+    //-------获取购物车数量----------
+    requestCardNum: function() {
+        var th = this;
+        th.request.get("/api/weshop/cart/page", {
+            data: {
+                store_id: th.globalData.setting.stoid,
+                user_id: th.globalData.user_id,
+            },
+            success: function(e) {
+                var num = 0;
+                for (var i = 0; i < e.data.data.pageData.length; i++) {
+                    num += e.data.data.pageData[i].goods_num;
+                }
+                wx.setTabBarBadge({ //tabbar右上角添加文本
+                    index: 2, ////tabbar下标
+                    text: '' + num //显示的内容
+                });
+            }
+        });
+    },
+	
+	//------定时等待某个值,有值才进行运算--------
+	waitfor:function(page,key,pop_value,func){
+		var n=0;
+		if(!page.data[key]){
+			page.data[key]=setInterval(function(){
+				console.log(page.data[key]);n++;
+				if(pop_value) {
+					clearInterval(page.data[key]);
+					func();
+				}				
+				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]);
+                    func();
+                }
+			},1000);
+		}
+	}
+	
+
+});
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 0799676..bb3a0f7 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -122,16 +122,27 @@ Page({
         store_id: oo.stoid,
         pageSize: 600
       },
-      success: function(su) {
+      success:async function(su) {
         //按门店分类的数组
         var arr = new Array(),
           carr = su.data.data.pageData;
         var all_num = 0;
 
         for (var i = 0; i < carr.length; i++) {
-			
-		
           var item = carr[i];
+          var good=null;
+          await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+item.goods_id,{}).then(res=>{
+              good=res.data.data;
+          })
+          var tt=ut.gettimestamp();
+          if((good.down_time>0 && good.down_time<tt) || good.is_on_sale==0 ){
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+              a.delete(url, {
+                  success: function(t) { }
+              });
+              //商品已经下架
+              continue;
+          }
           all_num += item.goods_num;
           item.original_img = oo.imghost + item.original_img;
           item.selected = 0;
diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js
index 6610de1..bc5144e 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.js
+++ b/pages/giftpack/birthdaygift/birthdaygift.js
@@ -140,7 +140,8 @@ Page({
         "actType": 4, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
index 442f981..189fda9 100644
--- a/pages/giftpack/evaluategift/evaluategift.js
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -157,7 +157,8 @@ Page({
         "orderNumber": th.data.orderNumber,
         "orderType": th.data.orderType,
         "orderGoodsId": th.data.orderGoodsId,
-        "giftBagId": th.data.giftBagId
+        "giftBagId": th.data.giftBagId,
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
diff --git a/pages/giftpack/festival/festival.js b/pages/giftpack/festival/festival.js
index a0e28e7..473f42f 100644
--- a/pages/giftpack/festival/festival.js
+++ b/pages/giftpack/festival/festival.js
@@ -147,7 +147,8 @@ Page({
         "actType": 3, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       }
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js
index 601e05c..30f0261 100644
--- a/pages/giftpack/newvipgift/newvipgift.js
+++ b/pages/giftpack/newvipgift/newvipgift.js
@@ -139,7 +139,8 @@ Page({
         "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index e8dfa5c..fd4e63f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -341,7 +341,10 @@ Page({
 
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
-      if(!ee) return false;
+      if(!ee) {
+        th.data.fir_def_store={}; //赋值空对象
+        return false;
+      }
 	  var appd=getApp().globalData;
       var w_time = setInterval(function() {
         if (that.data.is_get_local_ok == 0) return false;
@@ -631,7 +634,7 @@ Page({
 			  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){
+						    if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
 								var lock=0,plist=null;
 								//先读取门店的lock,采用链式写法，少用await
 								getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
@@ -1851,7 +1854,7 @@ Page({
 										   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){	
+										   if(th.data.fir_def_store && 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})											   
@@ -1868,10 +1871,10 @@ Page({
 						em.data.data.total=new_list.length;
 						em.data.data.pageData=new_list;																														
 						
-						if(th.data.fir_def_store && !is_find_def_store){
+						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
 							  th.data.fir_def_store.CanOutQty=0;							  
 							  //--当选择的门店是客户默认的门店的时候--
-							  if(th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
+							  if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
 								    th.setData({def_pick_store:th.data.fir_def_store});
 									em.data.data.pageData.unshift(th.data.def_pick_store);	
 							  }else{
@@ -3649,7 +3652,7 @@ Page({
 	     func(); return false;  		 
 	  }
 	      
-	  if(this.data.sales_rules!=2 && this.data.is_newsales_rules!=1){
+	  if(this.data.sales_rules!=2){
 		  func();
 	  }else{         
 		 		  	  
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index c77705e..f05f48d 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -24,7 +24,7 @@
            </view>
            <view class="xc-wc fs24">
             <view>
-              <view class="">已拼{{teamlist.buy_num}}份</view>
+              <view class="">已拼{{teamlist.buy_num}}件</view>
               <view class="flex xc-valframe t-c"> 
                 <view class="xc-frame-img"> 
                 <image class="picture"src="{{imageurl}}/miniapp/images/bai-ren.png"></image>
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index f1f043e..888145c 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -23,7 +23,7 @@
         </view>
         <view class="xc-wc fs24">
           <view>
-            <view class="">已拼{{teamlist.buy_num}}份</view>
+            <view class="">已拼{{teamlist.buy_num}}件</view>
             <view class="flex xc-valframe t-c">
               <view class="xc-frame-img">
                 <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>