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

后端研发-苏泰源
2 parents 3ed9ffdf 0a9264d9
Showing 93 changed files with 2767 additions and 1495 deletions
app.js
app.json
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.json
components/diy_goodsGroup/diy_goodsGroup.wxml
packageA/pages/activity_share/activity_share.js
packageA/pages/checkin/checkin.wxml
packageA/pages/prom_list/prom_list.js
packageA/pages/quan_list/quan_list.js
packageA/pages/quan_pro/quan_pro.js
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/pregoodsInfo/goodsInfo.js
packageD/pages/AI-test-skin/success_result/success_result.wxml
packageD/pages/AI-test-skin/success_result/success_result.wxss
pages/user/coupons/coupons.js → packageD/pages/user/coupons/coupons.js
pages/user/coupons/coupons.json → packageD/pages/user/coupons/coupons.json
pages/user/coupons/coupons.wxml → packageD/pages/user/coupons/coupons.wxml
pages/user/coupons/coupons.wxss → packageD/pages/user/coupons/coupons.wxss
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id: null,//5682094,6520044,6520119   qa    4687  6519901
+        user_id: null,//5682094,6520044,6520119   qa  4687  6519901  zs 10153869
         buy_now: null,
         picklist: null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -61,7 +61,6 @@ App({
         getu: null,       //记录会员信息
         sessionKey: null,//记录会员信息
         openid: null,    //记录会员信息
-
         to_group: null,      //参团传递的数据
         wxapp_buy_obj: null, //微信小程序购买的Object
         pk_store: null,      //选择的门店
@@ -363,7 +362,7 @@ App({
             title: t,
             mask: e,
             duration: a,
-						icon: 'error',
+            icon: 'error',
             // image: "/images/gt.png",
             complete: function () {
                 "function" == typeof o && setTimeout(o, a);
@@ -430,12 +429,12 @@ App({
         })
     },
     //获取场景值 判断是否是单页面
-    is_Single_page(_this,func) {
-        let scene = wx.getLaunchOptionsSync().scene; 
+    is_Single_page(_this, func) {
+        let scene = wx.getLaunchOptionsSync().scene;
         //--判断是否是单页面--
-        if(scene !== 1154){
-            typeof func =="function" && func.bind(_this)();
-        }else{
+        if (scene !== 1154) {
+            typeof func == "function" && func.bind(_this)();
+        } else {
             return false;
         }
         // return  scene == 1154? false:true;
@@ -672,11 +671,11 @@ App({
  
     //清空登录时候缓存的值
     onHide: function () {
-        var th=this;
+        var th = this;
         setTimeout(function () {
             console.log("app onhide");
             console.log(th.globalData.no_clear);
-            if(!th.globalData.no_clear) {
+            if (!th.globalData.no_clear) {
                 th.globalData.is_test = 0;
                 th.globalData.guide_id = null;                     //导购清空
                 th.globalData.first_leader = null;                 //分享的会员清空
@@ -691,10 +690,10 @@ App({
                 th.globalData.dis_buy_obj = null;   //等级卡的购买记录
                 th.globalData.storeFooter = null;   //底部的导航
                 th.globalData.full_screen = null;   //全屏
-            }else{
-                th.globalData.no_clear=0;
+            } else {
+                th.globalData.no_clear = 0;
             }
-        },600)
+        }, 600)
  
     },
  
@@ -803,7 +802,7 @@ App({
         if (wx.canIUse('getUpdateManager')) {
             //创建 UpdateManager 实例
             const updateManager = wx.getUpdateManager();
-            if(!updateManager) {
+            if (!updateManager) {
                 return false;
             }
             //检测版本更新
@@ -836,42 +835,42 @@ App({
     },
  
     //重复函数，统一调用，
-    pre_img(path){
-        this.globalData.no_clear=1;
+    pre_img(path) {
+        this.globalData.no_clear = 1;
         wx.previewImage({
             //将图片预览出来
             urls: [path]
         });
     },
     //b是数组，t是wxml元素返回的
-    pre_img2(b,t){
-        this.globalData.no_clear=1;
+    pre_img2(b, t) {
+        this.globalData.no_clear = 1;
         wx.previewImage({
             current: b[t.currentTarget.dataset.id],
             urls: b
         });
     },
  
-    con_wx(th){
-        var url=th.data.sys_switch.weapp_customertype_url;
-        var id=th.data.sys_switch.weapp_customertype_appid;
-        this.globalData.no_clear=1;
+    con_wx(th) {
+        var url = th.data.sys_switch.weapp_customertype_url;
+        var id = th.data.sys_switch.weapp_customertype_appid;
+        this.globalData.no_clear = 1;
         wx.openCustomerServiceChat({
-            extInfo: {url: url},
+            extInfo: { url: url },
             corpId: id,
-            success(res) {}
+            success(res) { }
         })
     },
  
-    con_Service(){
-        var th=this;
-        var oss= this.globalData.setting;
-        this.getConfig(function(t) {
+    con_Service() {
+        var th = this;
+        var oss = this.globalData.setting;
+        this.getConfig(function (t) {
             if (t.store_tel == undefined) {
                 th.request.get("/api/weshop/store/get/" + oss.stoid, {
                     isShowLoading: 1,
                     data: {},
-                    success: function(rs) {
+                    success: function (rs) {
                         th.globalData.config = rs.data.data;
                         if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
                             wx.showToast({
@@ -881,46 +880,65 @@ App({
                             })
                             return false;
                         }
-                        th.globalData.no_clear=1;
+                        th.globalData.no_clear = 1;
                         wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
                     }
                 })
             } else {
-                th.globalData.no_clear=1;
+                th.globalData.no_clear = 1;
                 wx.makePhoneCall({ phoneNumber: t.store_tel, })
             }
         });
     },
-		
-	com_call(self) {
-			self.getTel()
-			.then(() => {
-				if(self.data.store_tel) {
-					wx.showModal({
-						title: '联系客服',
-						content: '客服热线:' + self.data.store_tel,
-						confirmText: '拨打',
-						success(res) {
-							if(res.confirm) {
-								getApp().globalData.no_clear = 1;
-								wx.makePhoneCall({
-									phoneNumber: self.data.store_tel,
-								})
-							};
-						},
-					});
-				};
-			});
-		},
+
+    user_tools_endTime(type) {
+        //调用接口判断商家工具有没有过期
+        return this.request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=" + type + "", {}).then(res => {
+            if (res.data.code == 0) {
+                var arr = res.data.data.pageData;
+                if (arr.length > 0) {
+                    var item = arr[0];
+                    if (item.is_sy == 0) {
+                        var now = Date.parse(new Date()); now = now / 1000;
+                        if (item.end_time < now) {
+                           return 0
+                        }
+                        return 1;
+                    }
+                }
+            }
+        })
+    },
+
+    com_call(self) {
+        self.getTel()
+            .then(() => {
+                if (self.data.store_tel) {
+                    wx.showModal({
+                        title: '联系客服',
+                        content: '客服热线:' + self.data.store_tel,
+                        confirmText: '拨打',
+                        success(res) {
+                            if (res.confirm) {
+                                getApp().globalData.no_clear = 1;
+                                wx.makePhoneCall({
+                                    phoneNumber: self.data.store_tel,
+                                })
+                            };
+                        },
+                    });
+                };
+            });
+    },
  
     //检验能不能分享
-    check_can_share(){
-        if(!this.globalData.user_id) wx.hideShareMenu();
-        else  wx.showShareMenu();
+    check_can_share() {
+        if (!this.globalData.user_id) wx.hideShareMenu();
+        else wx.showShareMenu();
     }
  
  
-		
+
  
  
 });
@@ -31,16 +31,9 @@
         "pages/team/team_ping/team_ping",
         "pages/cart/cart2_pt/cart2_pt",
         "pages/cart/cart_wk/cart_wk",
-        "pages/user/member/menber",
-        "pages/user/member/bring/bring",
-        "pages/user/member/bring/msg/msg",
-        "pages/user/member/account/account",
-        "pages/user/member/account_unable/account_unable",
-        "pages/user/member/cash_record/cash_record",
-        "pages/user/coupons/coupons",
-        "pages/user/integral/integral",
-        "pages/user/integral/query/index",
-        "pages/user/integral/msg/msg",
+       
+        
+   
         "pages/user/userqy/userqy",
         "pages/user/user_spsy/user_spsy",
         "pages/user/user_fw/user_fw",
@@ -74,9 +67,7 @@
         "pages/cart/cart2_inte/cart2_inte",
         "pages/giftpack/festival/festival",
         "pages/team/team_more/team_more",
-        "pages/user/deposit/deposit",
-        "pages/user/deposit/prepaid/msg/msg",
-        "pages/user/deposit/prepaid/prepaid",
+    
         "pages/distribution/distribution",
         "pages/template/index"
     ],
@@ -189,7 +180,21 @@
                 "pages/AI-test-skin/select_photo/select_photo",
                 "pages/AI-test-skin/fail_result/fail_result",
                 "pages/AI-test-skin/success_result/success_result",
-                "pages/AI-test-skin/analyse/analyse"
+                "pages/AI-test-skin/analyse/analyse",
+
+                "pages/user/coupons/coupons",
+                "pages/user/integral/integral",
+                "pages/user/integral/query/index",
+                "pages/user/integral/msg/msg",
+                "pages/user/deposit/deposit",
+                "pages/user/deposit/prepaid/msg/msg",
+                "pages/user/deposit/prepaid/prepaid",
+                "pages/user/member/menber",
+                "pages/user/member/bring/bring",
+                "pages/user/member/bring/msg/msg",
+                "pages/user/member/account/account",
+                "pages/user/member/account_unable/account_unable",
+                "pages/user/member/cash_record/cash_record"
             ]
         }
  
@@ -29,7 +29,7 @@ Component({
 		currentPage: 1,
 		requestData: null,
 		requestUrl: "",
-		goods_array: null,
+		goods_array: [],
 		total: null,
 		prom_id: 0,
 		classstyle_id: null,
@@ -424,7 +424,7 @@ Component({
  
  
 			this.data.currentPage = 1;
-			this.setData({ goods_array: null, total: null, title_index: title_idx });
+			this.setData({ goods_array: [], total: null, title_index: title_idx });
 			//初始化 	
 			this.init(this.data.classstyle_id, this.data.wgroup);
 			setTimeout(function () { wx.hideLoading(); }, 1000)
@@ -467,7 +467,6 @@ Component({
 				item.cardprice3 = val.cardprice3;
 				item.prom_type = val.prom_type;
 				item.prom_id = val.prom_id;
-
 				if (val.prom_price) item.prom_price = val.prom_price;
 				if (val.prom_integral) item.prom_integral = val.prom_integral;
  
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "mp-loading": "weui-miniprogram/loading/loading"
+  }
 }
 \ No newline at end of file
@@ -3,6 +3,7 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
  
 <!-- 要不要顶部标题 -->
+<mp-loading show ="{{goods_array.length== 0}}" type="circle"></mp-loading>
 <block wx:if="{{is_nav}}">
     <view class="flex gr_title_list" style="overflow-x: auto;">
         <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
@@ -10,9 +11,6 @@
         </view>
     </view>
 </block>
-
-
-
 <view style="background-color: {{bg_color}};">
     <!--1个列表的时候-->
     <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
@@ -397,7 +397,7 @@ Page({
 	get_colloction: async function(){
 		var list=null;
 		//-- 获取搭配购的从商品的信息 --
-	    await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2",{}).then(res=>{
+	    await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+getApp().globalData.user_id,{}).then(res=>{
 			if(res.data.code==0){
 				list=res.data.data.collocationList;				
 			}
@@ -4,7 +4,7 @@
 <view class="checkin-container">
 	<view class="rule-container flex">
 		<view class="rule" bindtap="showRules">规则</view>
-		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral">
+		<view class="points" bindtap="goto" data-url="/packageD/pages/user/integral/integral">
 			<image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分
 		</view>
 	</view>
@@ -268,7 +268,7 @@ Page({
     				if (!ee.data.collocationList) {
     					/*---获取活动的重表---*/
     					//调用接口判断订单优惠，
-    					getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2", {}).then(res => {
+    					getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => {
     						if (res.data.code == 0) {
 									var r_data = res.data.data;
  
 var t = require("../../../utils/util.js"), ut = t,
-  e = require("../../../utils/common.js"),
-  oo = getApp().globalData,
-  os = getApp().globalData.setting;
-var utils = require('../../../utils/util.js'),ut=utils;
+	e = require("../../../utils/common.js"),
+	oo = getApp().globalData,
+	os = getApp().globalData.setting;
+var utils = require('../../../utils/util.js'), ut = utils;
  
  
  
 Page({
-  data: {
-    stoid: os.stoid,
-    url: os.url,
-    resourceUrl: os.resourceUrl,
-    iurl: os.imghost,
-    defaultAvatar: os.resourceUrl + "/static/images/user68.jpg",
-    dataList: null,
-    config2:null,
-    curpage:1,
-    loading:0,
-    get_item:null,
-    show_success:0,
-    getcurday:null,
-  },
-  //------初始化加载----------
-  onLoad: function(t) {
-     var th=this;
-     getApp().getConfig2(function (conf) {
-        if(conf.couponset) conf.couponset=conf.couponset.replace(/\<img/g,'<img style="width:100%;height:auto;display:block"');
-        th.setData({config2:conf});
-     })
-  },
-  //---展示---
-  onShow: function() {
+	data: {
+		stoid: os.stoid,
+		url: os.url,
+		resourceUrl: os.resourceUrl,
+		iurl: os.imghost,
+		defaultAvatar: os.resourceUrl + "/static/images/user68.jpg",
+		dataList: null,
+		config2: null,
+		curpage: 1,
+		loading: 0,
+		get_item: null,
+		show_success: 0,
+		getcurday: null,
+	},
+	//------初始化加载----------
+	onLoad: function (t) {
+		var th = this;
+		getApp().getConfig2(function (conf) {
+			if (conf.couponset) conf.couponset = conf.couponset.replace(/\<img/g, '<img style="width:100%;height:auto;display:block"');
+			th.setData({ config2: conf });
+		})
+	},
+	//---展示---
+	onShow: function () {
  
-    console.log("onShow:1");
-    this.data.curpage=1;
-    this.setData({dataList:null});
-    console.log("onShow:2");
-    this.get_quan_list();
-    //券的模拟数据
-    //var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
-    //th.setData({dataList: data});
-    this.setData({getcurday:ut.gettimestamp()});
-  },
+		console.log("onShow:1");
+		this.data.curpage = 1;
+		this.setData({ dataList: null });
+		console.log("onShow:2");
+		this.get_quan_list();
+		//券的模拟数据
+		//var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
+		//th.setData({dataList: data});
+		this.setData({ getcurday: ut.gettimestamp() });
+	},
  
-  onHide: function() {
-    
-  },
+	onHide: function () {
  
-  //--券的列表页面的函数--
-  get_quan_list:function(){
-    console.log("onShow:3");
-    var th=this;
-    if(th.data.loading) return false;
-    th.data.loading=1;
-    var user_id=getApp().globalData.user_id;
-    console.log("onShow:4");
-    var data={store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id,is_share:0};
-    console.log(data);
-    getApp().request.get("/api/weshop/prom/coupon/pageCouponList", {
-       data:data,
-       success:function (res){
-           console.log("onShow:5");
-           console.log(res);
-           th.data.loading=0;
-           if(res.data.code==0){
-             if(!th.data.dataList) th.data.dataList=new Array();
-             th.data.dataList=th.data.dataList.concat(res.data.data.pageData);
-             th.data.curpage++;
-             th.setData({dataList:th.data.dataList});
-           }
-       },
-       fail:function (e){
-         console.log("onShow:6");
-         console.log(e);
-       }
-    });
-  },
+	},
  
-  //---加载更多是靠这个函数----
-  onReachBottom: function() {
-    this.get_quan_list();
-  },
+	//--券的列表页面的函数--
+	get_quan_list: function () {
+		console.log("onShow:3");
+		var th = this;
+		if (th.data.loading) return false;
+		th.data.loading = 1;
+		var user_id = getApp().globalData.user_id;
+		console.log("onShow:4");
+		var data = { store_id: os.stoid, type: 1, pageSize: 10, page: th.data.curpage, user_id: user_id, is_share: 0 };
+		console.log(data);
+		getApp().request.get("/api/weshop/prom/coupon/pageCouponList", {
+			data: data,
+			success: function (res) {
+				console.log("onShow:5");
+				console.log(res);
+				th.data.loading = 0;
+				if (res.data.code == 0) {
+					if (!th.data.dataList) th.data.dataList = new Array();
+					th.data.dataList = th.data.dataList.concat(res.data.data.pageData);
+					th.data.curpage++;
+					th.setData({ dataList: th.data.dataList });
+				}
+			},
+			fail: function (e) {
+				console.log("onShow:6");
+				console.log(e);
+			}
+		});
+	},
  
+	//---加载更多是靠这个函数----
+	onReachBottom: function () {
+		this.get_quan_list();
+	},
  
-  //--滚动到顶部--
-  doScrollTop: function() {
-    wx.pageScrollTo({ scrollTop: 0 });
-  },
  
-  //-----领取券-----
-  get_quan: function(e) {
-    var cid = e.currentTarget.dataset.cid;
-    var index = e.currentTarget.dataset.ind;
-    var item = this.data.dataList[index];
+	//--滚动到顶部--
+	doScrollTop: function () {
+		wx.pageScrollTo({ scrollTop: 0 });
+	},
  
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/togoin/togoin',
-      })
-      return false;
-    }
+	//-----领取券-----
+	get_quan: function (e) {
+		var cid = e.currentTarget.dataset.cid;
+		var index = e.currentTarget.dataset.ind;
+		var item = this.data.dataList[index];
+		var good = new Array();  //单品且是免费领取专门使用
+		//--先判断会员状态--
+		var user_info = getApp().globalData.userInfo;
+		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+			wx.navigateTo({
+				url: '/pages/togoin/togoin',
+			})
+			return false;
+		}
  
-    //如果券还在领取中，不能再点
-    if (item.linging == 1) {
-      getApp().my_warnning('领取中..', 0, this);
-      return false;
-    }
-
-    //如果领取的次数到了
-    if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) {
-      getApp().my_warnning('领取失败，您已领完该券', 0, this);
-      return false;
-    }
-    var lq_num = item.lqnum;
-    var pdata = {
-      'uid': oo.user_id,
-      'cid': cid,
-      'store_id': os.stoid,
-      'type': 5
-    };
-	//-- 导购ID --
-	if(getApp().globalData.guide_id){
-		pdata.guide_id=getApp().globalData.guide_id;
-	}
-    var app = getApp(),
-        th = this;
-    app.request.post("/api/weshop/couponList/saveCouponList", {
-      data: pdata,
-      success: function(res) {
-        if (res.data.code == 0) {
-          var text = "dataList[" + index + "].is_get";
-          var text2 = "dataList[" + index + "].linging";
-          var text3 = "get_item";
-          var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1;
-          th.setData(obj);
-        } else {
-          app.confirmBox(res.data.msg);
-          var text2 = "dataList[" + index + "].linging";
-          th.setData({[text2]:0});
-        }
-      }
-    })
-  },
-  close_show:function () {
-      this.setData({show_success:0,get_item:null})
-  },
-  go_quan:function () {
-     getApp().goto("/pages/user/coupons/coupons");
-  },
-  go_detail:function (e) {
-      var index=e.currentTarget.dataset.ind;
-      var item=this.data.dataList[index];
-      getApp().goto("/packageA/pages/quan_pro/quan_pro?id="+item.id);
-  }
+		//如果券还在领取中，不能再点
+		if (item.linging == 1) {
+			getApp().my_warnning('领取中..', 0, this);
+			return false;
+		}
  
+		//如果领取的次数到了
+		if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) {
+			getApp().my_warnning('领取失败，您已领完该券', 0, this);
+			return false;
+		}
+		var lq_num = item.lqnum;
+		var pdata = {
+			'uid': oo.user_id,
+			'cid': cid,
+			'store_id': os.stoid,
+			'type': 5
+		};
+		if (item.useobjecttype == 20 && item.type == 1) {
+			getApp().request.get('/api/weshop/goods/list', {
+				data: {
+					store_id: os.stoid,
+					erpwareid: item.useobjectid,
+				},
+				success(res) {
+					if (ut.ajax_ok2(res)) {
+						good = res.data.data;
+					}
+				}
+			})
+		}
+		//-- 导购ID --
+		if (getApp().globalData.guide_id) {
+			pdata.guide_id = getApp().globalData.guide_id;
+		}
+		var app = getApp(),
+			th = this;
+		app.request.post("/api/weshop/couponList/saveCouponList", {
+			data: pdata,
+			success: function (res) {
+				if (res.data.code == 0) {
+					var text = "dataList[" + index + "].is_get";
+					var text2 = "dataList[" + index + "].linging";
+					var text3 = "get_item";
+					var obj = {}; obj[text] = 1; obj[text2] = 0; obj[text3] = item;
+					th.setData(obj);
+					if (good.length > 0) {
+						wx.showToast({
+							title: '领取成功',
+							success() {
+								let item = good[0];
+								let url = `/pages/goods/goodsInfo/goodsInfo?goods_id=${item.goods_id}&prom_type=${item.prom_type}&prom_id=${item.prom_id}`
+								setTimeout(()=>{
+									getApp().goto(url)
+								},500)
+							}
+						})
  
+					} else {
+						th.setData({
+							show_success: 1,
+						})
+					}
+				} else {
+					app.confirmBox(res.data.msg);
+					var text2 = "dataList[" + index + "].linging";
+					th.setData({ [text2]: 0 });
+				}
+			}
+		})
+	},
+	close_show: function () {
+		this.setData({ show_success: 0, get_item: null })
+	},
+	go_quan: function () {
+		getApp().goto("/pages/user/coupons/coupons");
+	},
+	go_detail: function (e) {
+		var index = e.currentTarget.dataset.ind;
+		var item = this.data.dataList[index];
+		getApp().goto("/packageA/pages/quan_pro/quan_pro?id=" + item.id);
+	}
 });
@@ -132,7 +132,7 @@ Page({
    this.setData({
     show_success:0
   })
-	 getApp().goto("/pages/user/coupons/coupons");  
+	 getApp().goto("/packageD/pages/user/coupons/coupons");  
   },
  
   close_show(){
@@ -1279,7 +1279,7 @@ Page({
 		};
 		switch(type) {
 			case 1: {
-				url = '/pages/user/integral/integral';
+				url = '/packageD/pages/user/integral/integral';
 				break;
 			};
 			case 2: {
@@ -1287,7 +1287,7 @@ Page({
 				break;
 			};
 			case 3: {
-				url = '/pages/user/coupons/coupons';
+				url = '/packageD/pages/user/coupons/coupons';
 				break;
 			};
 			case 4: {
@@ -2256,7 +2256,7 @@ Page({
         //如果优惠促销和搭配购的时候
         if ((good.prom_type == 3 || good.prom_type == 5) && good.is_collocation != 1 && good.is_gift != 1) {
             var p_ok = 1;
-            await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
+            await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
                 if (res.data.code == 0) {
                     var r_data = res.data.data;
                     if (!r_data.collocationPromList && good.prom_type == 5) {
@@ -2336,7 +2336,7 @@ Page({
                 //不是赠品的时候
                 if (!good.is_gift && good.prom_type != 3) {
                     var t_ok = 1;
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
+                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
                         if (res.data.code == 0) {
                             var r_data = res.data.data;
                             //-- 参加了全局的优惠活动 --
@@ -1281,7 +1281,7 @@ Page({
       callback();
     } else {
       //-- 判断有没有优惠活动 --
-      getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => {
+      getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
         if (res.data.code == 0) {
           var r_data = res.data.data;
           th.data.prom_goods = r_data.promGoodsLists;
@@ -1278,7 +1278,7 @@ Page({
       callback();
     } else {
       //-- 判断有没有优惠活动 --
-      getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => {
+      getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
         if (res.data.code == 0) {
           var r_data = res.data.data;
           th.data.prom_goods = r_data.promGoodsLists;
@@ -7,7 +7,7 @@
                 <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
             </scroll-view> -->
 <view style="height: 100rpx;">
-    <scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-x class="tab_scroll">
+    <scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-x>
         <view class="flex" style="height: 100%;">
             <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
                 {{item.name}}
@@ -6,7 +6,7 @@ page {
 }
  
 .tab_scroll {
-    position: fixed;
+    position: sticky;
     top: 0;
     z-index: 99;
     display: flex;
@@ -2,14 +2,14 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../utils/util.js"),
+  i = require("../../../../utils/util.js"),
   ut = i,
-  s = require("../../../utils/common.js");
-var regeneratorRuntime = require('../../../utils/runtime.js');
+  s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 const {
   barcode,
   qrcode
-} = require('../../../utils/index.js');
+} = require('../../../../utils/index.js');
 let _this = null;
  
 Page({
 <wxs module="filter" src="filter.wxs"></wxs>
-<wxs module="time" src="../../../utils/filter.wxs"></wxs>
+<wxs module="time" src="../../../../utils/filter.wxs"></wxs>
  
 <view>
  
@@ -57,8 +57,8 @@
 						</view>
 					</view>
 					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
-						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1!=''}}"><text style="margin-right: 15rpx">使用说明:</text>{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}}</view>
-						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else><text style="margin-right: 15rpx">使用说明:</text> {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}}</view>
+						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1!=''}}"><text style="margin-right: 15rpx">使用说明:</text>{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}};活动名称：{{detail.ActName}}、活动编号：{{detail.ActNo}}</view>
+						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else><text style="margin-right: 15rpx">使用说明:</text> {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};活动名称：{{detail.ActName}}、活动编号：{{detail.ActNo}}</view>
 					</view>
 				</block>
 			</view>
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../utils/util.js"),
+  i = require("../../../../utils/util.js"),
   ut = i,
-  s = require("../../../utils/common.js");
-var regeneratorRuntime = require('../../../utils/runtime.js');
+  s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
   data:{
     yucun_money:0,
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
       data: {
         iurl: o.imghost,
@@ -3,9 +3,9 @@ var e = function (e) {
   return e && e.__esModule ? e : {
     default: e
   };
-}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
-  i = require("../../../utils/util.js"), ut = i, b = require("../../../app.js"), app = b, s = require("../../../utils/common.js"), n = new e.default();
-var regeneratorRuntime = require('../../../utils/runtime.js');
+}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, b = require("../../../../app.js"), app = b, s = require("../../../../utils/common.js"), n = new e.default();
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
  
   /**
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
  
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     details:[],//数据
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     details: [],//数据
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 var oo = t.globalData.setting;
 Page({
   /**
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     parameter: false,//控制有没有数据的时候
@@ -2,9 +2,9 @@ var e = function (e) {
   return e && e.__esModule ? e : {
     default: e
   };
-}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
-  i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
-var regeneratorRuntime = require('../../../utils/runtime.js');
+}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"), n = new e.default();
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
   /**
    * 页面的初始数据
@@ -402,7 +402,7 @@ Page({
                             })
  
                             if (is_g_prom) {
-                                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
+                                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => {
                                     if (res.data.code == 0) {
                                         var r_data = res.data.data;
                                         if (!r_data.promGoodsLists) {
@@ -611,7 +611,7 @@ Page({
                         else if(item.prom_type == 0) {
  
                             //如果有优惠活动，要更新活动
-                            await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
+                            await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => {
                                 if (res.data.code == 0) {
                                     var r_data = res.data.data;
                                     if (r_data.promGoodsLists) {
@@ -2482,7 +2482,7 @@ Page({
                             //如果是优惠活动话，要看活动有没有过期
                             if (i_arr[j].prom_type == 3) {
                                 //判断有没有活动
-                                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + i_arr[j].goods_id + "/1", {}).then(res => {
+                                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + i_arr[j].goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => {
                                     if (res.data.code == 0) {
                                         if (!res.data.data.promGoodsLists) {
                                             t.my_warnning(i_arr[j].goods_name + "优惠活动已经过期", 0, th);
@@ -1802,7 +1802,7 @@ Page({
                     var order_m = 0;
                     //---判断是不是有订单优惠---
                     await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-                        data: { store_id: os.stoid, orderAmount: o_condition }
+                        data: { store_id: os.stoid, orderAmount: o_condition,user_id:getApp().globalData.user_id}
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
@@ -4052,7 +4052,7 @@ Page({
         if (this.data.is_b_now == 1) pick = this.data.bn_pick;
         //---获取订单优惠---
         getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-            data: { store_id: os.stoid, orderAmount: condition }
+            data: { store_id: os.stoid, orderAmount: condition,user_id:getApp().globalData.user_id }
         }).then(res => {
             if (res.data.code == 0) {
                 var data = res.data.data;
@@ -14,7 +14,7 @@
 	<view>
 		<view class="flex ai-center jc_sb pd2622 bdb arrow-r" bindtap="goto">
 			<view><text class="iconfont icon-jine pdr10 ctb"></text>可提现金额</view>
-			<view class="ctb money" data-url="/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view>
+			<view class="ctb money" data-url="/packageD/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view>
 		</view>
  
 		<view class="flex jc_sa t-c">
 var i = require("../../../utils/util.js");
+var com = require("../public/buy_com.js");
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
@@ -27,6 +28,44 @@ Page({
     total: 0, //总数量
     ad_data: null,
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
+
+      //门店相关
+      ismend: 0,
+      is_sec_mend: 0,
+      sto_sele_name: "", //选中的门店名称
+      sto_sele_id: "", //选中的门店id
+      sto_sele_distr: "", //选择的门店的配送方式
+      is_show_sto_cat: 1, //是否显示门店分类
+      only_pk: null,
+      all_sto: null,
+      sec_sto: null, //选择了的门店分类
+      pickpu_list: null, //读出的所有门店list
+      def_pickpu_list: null, //一开始5个门店list
+      sec_pick_index: 0, //第二级门店选择ID
+      fir_pick_index: 0, //第一级门店选择ID
+      all_pick_list: null,//所有的门店先记录起来
+
+      select_store: 0, //选择更多
+      index: 1,
+      more_store: 0, //选择门店
+      sort_store: 0, //门店分类
+      choice_sort_store: 0, //选择分类门店
+      new_user: 0, //新用户
+
+      def_pick_store: null, // 默认的门店
+      fir_def_store: null,  //客户默认的门店的
+      lat: null, //维度
+      lon: null, //经度
+
+      is_get_local_ok: 0, //获取坐标是否完成
+      region_name: "门店分类", //区域的名字
+      is_gps: 1,
+      open_ind_store: 0, //哪里打开的门店列表的控制属性
+      default_store: {}, //创建添加默认门店地址的对象
+
+      store:0,
+      openSpecModal:0
+
   },
   onLoad: function (options) {
     this.setData({
@@ -80,6 +119,7 @@ Page({
   },
   onShow: function () {
       getApp().check_can_share();
+      var th=this;
     //--先判断会员状态--
     getApp().is_Single_page(this, function () {
       var user_info = getApp().globalData.userInfo;
@@ -87,170 +127,112 @@ Page({
         getApp().goto('/pages/togoin/togoin');
         return false;
       }
+        com.wait_for_store_config(th);
+        com.set_user_mo_store(th,os);
+
     })
     this.init();
   },
  
   //购买礼包
   GetBuyPrice: function (e) {
-    var that = this.data;
-    var th = this;
-    var id = e.currentTarget.dataset.id; //活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    var order_sn = e.currentTarget.dataset.order_sn; //订单号
-    var money = e.currentTarget.dataset.money; //支付金额
-    my_confirm.open(
-      "是否确定购买该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '2', //1=积分兑换 2=余额购买
-          "giftBagId": id, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader,
-        };
  
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
+    var th = this;
+    var index = e.currentTarget.dataset.index; //活动id
+    var sele_g=th.data.wareCard[index];
+    th.setData({sele_g:sele_g,buyType:2,})
+    if(sele_g.is_pickup){
+        if(sele_g.pickup_list && th.data.def_pick_store){
+           com.check_def_pk(th);
         }
-
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0 && res.data.data) {
-              var order_sn = res.data.data.orderSn;
-              res = res.data.data.result;
-              if (!res) return false;
-              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
-              wx.requestPayment({
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.packageValue,
-                signType: res.signType,
-                paySign: res.paySign,
-                success: function (res) {
-                  getApp().goto(url);
-                },
-                fail: function (res) {
-                  getApp().my_warnning("取消支付", 0, th);
-                }
-              });
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
+        com.get_sto(th,os)
+        th.setData({
+            openSpecModal:1
+        })
+    }else{
+        var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+        my_confirm.open(
+            "是否确定购买该礼包",
+            "取消",
+            "确定",
+            function () {
+                my_confirm.open_cancel(0);
+            },
+            function () {
+                my_confirm.open_cancel(0);
+                com.buy_libao(th)
             }
-          },
-          function (res) {
-
-          }
  
         )
+    }
  
  
-      }
  
-    )
  
  
   },
   // 积分兑换
   GetBuyIntegral: function (e) {
-    var that = this.data;
-    var th = this;
-    var id = e.currentTarget.dataset.id; //活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-
-    my_confirm.open(
-      "是否确定兑换该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '1', //1=积分兑换 2=余额购买  3=免费领取
-          "giftBagId": id, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader
-        };
-
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
-        }
-        console.log(json, 'json');
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0) {
-              getApp().my_warnning("兑换成功！", 1, th);
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          },
-          function (res) { })
-
-      })
+      var th = this;
+      var index = e.currentTarget.dataset.index; //活动id
+      var sele_g=th.data.wareCard[index];
+      th.setData({sele_g:sele_g, buyType:1,})
+      if(sele_g.is_pickup){
+          if(sele_g.pickup_list && th.data.def_pick_store){
+              com.check_def_pk(th);
+          }
+          com.get_sto(th,os)
+          th.setData({
+              openSpecModal:1
+          })
+      }else {
+          var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+          my_confirm.open(
+              "是否确定兑换该礼包",
+              "取消",
+              "确定",
+              function () {
+                  my_confirm.open_cancel(0);
+              },
+              function () {
+                  my_confirm.open_cancel(0);
+                  com.buy_libao(th)
+              })
+      }
  
   },
   //免费领取
   GetFree: function (e) {
-    var that = this.data;
-    var th = this;
-    var id = e.currentTarget.dataset.id; //活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定领取该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '3', //1=积分兑换 2=余额购买  3=免费领取
-          "giftBagId": id, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader
-        };
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
-        }
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0) {
-              getApp().my_warnning("领取成功！", 1, th);
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          },
-          function (res) { })
-      })
+
+      var th = this;
+      var index = e.currentTarget.dataset.index; //活动id
+      var sele_g=th.data.wareCard[index];
+      th.setData({sele_g:sele_g, buyType:3,})
+
+      if(sele_g.is_pickup){
+          if(sele_g.pickup_list && th.data.def_pick_store){
+              com.check_def_pk(th);
+          }
+          com.get_sto(th,os)
+          th.setData({
+              openSpecModal:1
+          })
+      }else {
+
+
+          var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+          my_confirm.open(
+              "是否确定领取该礼包",
+              "取消",
+              "确定",
+              function () {
+                  my_confirm.open_cancel(0);
+              },
+              function () {
+                  my_confirm.open_cancel(0);
+                  com.buy_libao(th)
+              })
+      }
   },
  
   getList: function (e) {
@@ -327,6 +309,7 @@ Page({
   },
  
   onShareAppMessage: function (e) {
+    getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -341,6 +324,7 @@ Page({
  
   // 分享朋友圈
   onShareTimeline() {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -354,4 +338,271 @@ Page({
     }
   },
  
+
+    //--- 设置一下默认库存的数量 ----
+    set_def_storage(ee) {
+        var that = this, th = this;
+        that.data.fir_def_store = ee;
+        that.setData({
+            def_pick_store: ee,
+            sto_sele_name: ee.pickup_name,
+            sto_sele_id: ee.pickup_id,
+            sto_sele_distr: ee.distr_type
+        })
+    },
+    // 选择门店
+    choice_store: function (ee) {
+        var th = this;
+        var ind = ee.currentTarget.dataset.ind;
+        var bconfig = th.data.bconfig;
+
+        if (!th.data.only_pk && !th.data.def_pickpu_list) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
+        }
+
+        if (th.data.only_pk && !th.data.only_pk.length) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
+        }
+        if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
+        }
+
+
+        if (bconfig && bconfig.is_sort_storage) {
+            wx.getLocation({
+                type: 'gcj02',
+                success: function (res) {
+
+                    th.data.lat = res.latitude;
+                    th.data.lon = res.longitude;
+                    th.data.is_get_local_ok = 1;
+                    th.setData({
+                        is_gps: 1
+                    });
+                    //th.onShow();
+                    com.get_sto(th,os);
+                },
+                fail: function (res) {
+                    //th.onShow();
+                    th.data.is_get_local_ok = 1;
+                    com.get_sto(th,os);
+                    if (res.errCode == 2) {
+                        th.setData({
+                            is_gps: 0
+                        });
+                        if (th.data.is_gps == 0) {
+                            getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+                        }
+                    } else {
+                        th.setData({
+                            is_gps: "3"
+                        });
+                    }
+
+                }
+            })
+        } else {
+            th.data.is_get_local_ok = 1;
+            com.get_sto(th,os);
+        }
+
+        if (ind != undefined && ind != null) {
+            this.setData({
+                open_ind_store: ind,
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1,
+                openSpecModal_flash_normal: !1,
+            })
+        } else {
+            this.setData({
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1,
+                openSpecModal_flash_normal: !1
+
+            })
+        }
+    },
+    //关闭选择门店
+    close_popup: function (e) {
+        var th = this;
+        this.setData({
+            store: 0,
+            choice_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({
+            sort_store: 1
+        });
+    },
+    // 返回按钮
+    returns: function () {
+        this.setData({
+            sort_store: 0,
+            choice_sort_store: 0
+        });
+    },
+    //---选择分类门店---
+    choice_sort_store: function (e) {
+        var index = e.currentTarget.dataset.index;
+        var region_name = e.currentTarget.dataset.region;
+        var item = this.data.all_sto[index];
+        this.setData({
+            region_name: region_name,
+            sort_store: 0,
+            choice_sort_store: 1,
+            sec_sto: item,
+            sec_pick_index: 0
+        });
+    },
+
+    choose_for_store_fir: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            fir_pick_index: index_c
+        })
+
+    },
+
+    //确定def_pick为选择的门店
+    sure_pick: function (e) {
+        var th = this;
+        var item = null;
+        var openindstore = th.data.open_ind_store;
+
+        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];
+        }
+
+        if (!th.data.sele_g) return false;
+
+            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,
+                openSpecModal: !0,
+            });
+
+
+    },
+    //---点击二级之后的选择---
+    choose_for_store: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            sec_pick_index: index_c,
+            fir_pick_index: index_c
+        })
+
+    },
+    //把选择的门店设置成默认的门店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];
+        }
+
+        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,
+                openSpecModal: !0,
+            });
+
+        var user_id=getApp().globalData.user_id;
+        var def_pickup_id = item.pickup_id;
+        getApp().request.put('/api/weshop/users/update', {
+            data: {
+                user_id: user_id,
+                def_pickup_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 {
+                    getApp().my_warnning("设置默认门店地址失败", 0, th)
+                }
+
+            }
+        });
+
+
+
+    },
+    closeSpecModal: function () {
+        this.setData({openSpecModal: 0});
+    },
+
+    buy_libao:function () {
+        com.buy_libao(this)
+    }
 })
 \ No newline at end of file
@@ -62,30 +62,30 @@
         <view class="flex-vertical">
           <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
             <block wx:if="{{items.payMoney>0}}">
-              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}" data-money="{{items.payMoney}}">
+              <view class="flex" bindtap="GetBuyPrice" data-index="{{index}}">
                 <button class="box_button_dui">立即购买</button>
               </view>
             </block>
             <block wx:if="{{items.payIntegral>0}}">
-              <view class="flex" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
+              <view class="flex" bindtap="GetBuyIntegral" data-index="{{index}}">
                 <button class="box_button_dui box_button_buy">立即兑换</button>
               </view>
             </block>
           </block>
           <block wx:else>
             <block wx:if="{{items.payMoney>0}}">
-              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}" data-money="{{items.payMoney}}">
+              <view class="flex" bindtap="GetBuyPrice" data-index="{{index}}">
                 <button class="box_button_dui box_button_buy">立即购买</button>
               </view>
             </block>
             <block wx:if="{{items.payIntegral>0}}">
-              <view class="flex" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
+              <view class="flex" bindtap="GetBuyIntegral" data-index="{{index}}">
                 <button class="box_button_dui box_button_buy">立即兑换</button>
               </view>
             </block>
           </block>
           <block wx:if="{{!items.payMoney && !items.payIntegral}}">
-              <view class="flex" bindtap="GetFree" data-id="{{items.lbId}}">
+              <view class="flex" bindtap="GetFree" data-index="{{index}}">
                 <button class="box_button_dui box_button_buy">免费领取</button>
               </view>
           </block>
@@ -116,4 +116,6 @@
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
-<my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
+<my_confirm id="my_confirm"></my_confirm>
+
+<include src="../public/buy_com.wxml"></include>
 \ No newline at end of file
 /*引用样式路径*/
 @charset "UTF-8";
-
-/* Author XGQ
- * 2019-11-12
- */
+@import '../../goods/goodsInfo/goodsInfo.wxss';
  
 page {
   /* background-color: #fb7454; */
@@ -4,6 +4,7 @@ var e = getApp(),
   t = e.request,
   d = e.globalData;
 var ut = require("../../../utils/util.js");
+var com = require("../public/buy_com.js");
  
 Page({
   data: {
@@ -30,6 +31,43 @@ Page({
     is_lb: 0, //是否有礼包
     default_color: null,
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
+
+      //门店相关
+      ismend: 0,
+      is_sec_mend: 0,
+      sto_sele_name: "", //选中的门店名称
+      sto_sele_id: "", //选中的门店id
+      sto_sele_distr: "", //选择的门店的配送方式
+      is_show_sto_cat: 1, //是否显示门店分类
+      only_pk: null,
+      all_sto: null,
+      sec_sto: null, //选择了的门店分类
+      pickpu_list: null, //读出的所有门店list
+      def_pickpu_list: null, //一开始5个门店list
+      sec_pick_index: 0, //第二级门店选择ID
+      fir_pick_index: 0, //第一级门店选择ID
+      all_pick_list: null,//所有的门店先记录起来
+
+      select_store: 0, //选择更多
+      index: 1,
+      more_store: 0, //选择门店
+      sort_store: 0, //门店分类
+      choice_sort_store: 0, //选择分类门店
+      new_user: 0, //新用户
+
+      def_pick_store: null, // 默认的门店
+      fir_def_store: null,  //客户默认的门店的
+      lat: null, //维度
+      lon: null, //经度
+
+      is_get_local_ok: 0, //获取坐标是否完成
+      region_name: "门店分类", //区域的名字
+      is_gps: 1,
+      open_ind_store: 0, //哪里打开的门店列表的控制属性
+      default_store: {}, //创建添加默认门店地址的对象
+
+      store:0,
+      openSpecModal:0
   },
   onLoad: function (options) {
     this.setData({
@@ -87,81 +125,36 @@ Page({
   GetBuyPrice: function (e) {
     var that = this.data;
     var th = this;
-    // var id = e.currentTarget.dataset.id;//活动id
     //如果还没有开始的话
     if (th.data.isStart != 1) {
       getApp().my_warnning("活动还没有开始", 0, th);
       return false;
     }
  
-
-    var money = e.currentTarget.dataset.money;
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定购买该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '2', //1=积分兑换 2=余额购买
-          "giftBagId": that.getGiftID, //礼包Id
-          "storeId": a.stoid, //商家Id
-          "userId": d.user_id, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader,
-        };
-
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
-        }
-
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0) {
-              var res = res.data.data;
-              if (!res) return false;
-              if (!res.result) return false;
-
-              var order_sn = res.orderSn;
-              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
-              wx.requestPayment({
-                timeStamp: String(res.result.timeStamp),
-                nonceStr: res.result.nonceStr,
-                package: res.result.packageValue,
-                signType: res.result.signType,
-                paySign: res.result.paySign,
-                success: function (n) {
-                  getApp().goto(url);
-                },
-                fail: function (n) {
-                  getApp().my_warnning("取消支付", 0, th);
-                }
-              });
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
+    th.setData({ buyType:2 })
+    if(th.data.sele_g.is_pickup){
+        th.setData({
+            openSpecModal:1
+        })
+    }else{
+        var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+        my_confirm.open(
+            "是否确定购买该礼包",
+            "取消",
+            "确定",
+            function () {
+                my_confirm.open_cancel(0);
+            },
+            function () {
+                my_confirm.open_cancel(0);
+                com.buy_libao(th)
             }
-          },
-          function (res) {
-
-          }
  
         )
+    }
  
  
-      }
  
-    )
  
   },
   GetBuyIntegral: function (e) {
@@ -173,48 +166,28 @@ Page({
       getApp().my_warnning("活动还没有开始", 0, th);
       return false;
     }
-    // var id = e.currentTarget.dataset.id;//活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定兑换该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '1', //1=积分兑换 2=余额购买
-          "giftBagId": that.getGiftID, //礼包Id
-          "storeId": a.stoid, //商家ID
-          "userId": d.user_id, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader,
-        };
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
-        }
  
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0) {
-              getApp().my_warnning("兑换成功！", 1, th);
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          },
-          function (res) {
+    th.setData({ buyType:1 });
+    if(th.data.sele_g.is_pickup){
+        th.setData({
+            openSpecModal:1
+        })
+    }else {
+        var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+        my_confirm.open(
+            "是否确定兑换该礼包",
+            "取消",
+            "确定",
+            function () {
+                my_confirm.open_cancel(0);
+            },
+            function () {
+                my_confirm.open_cancel(0);
+                com.buy_libao(th)
+            })
+    }
  
-          }
  
-        )
-      })
  
  
   },
@@ -334,7 +307,20 @@ Page({
             actTitle: res.data.data.actTitle,
             wareCard: res.data.data.wareCard,
             isStart: isStart,
+            sele_g:res.data.data
           })
+
+
+            var sele_g=res.data.data;
+            com.wait_for_store_config(_this2);
+            com.set_user_mo_store(_this2,os,function () {
+                if(sele_g.pickup_list && _this2.data.def_pick_store){
+                    com.check_def_pk(_this2);
+                }
+            });
+            com.get_sto(_this2,os);
+
+
         } else {
           getApp().my_warnning(res.data.msg, 0, _this2);
           return false;
@@ -421,6 +407,7 @@ Page({
  
   //--- 分享设置 --
   onShareAppMessage: function (e) {
+    getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -443,6 +430,7 @@ Page({
    * 用户分享朋友圈
    */
   onShareTimeline() {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -471,50 +459,298 @@ Page({
       getApp().my_warnning("活动还没有开始", 0, th);
       return false;
     }
-    // var id = e.currentTarget.dataset.id;//活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定领取该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '3', //1=积分兑换 2=余额购买
-          "giftBagId": that.getGiftID, //礼包Id
-          "storeId": a.stoid, //商家ID
-          "userId": d.user_id, //用户ID
-          "buyFrom": 2,
-          "first_leader": that.first_leader,
-        };
-
-        //-- 分享导购要记录 --
-        if (getApp().globalData.guide_id) {
-          json.guide_id = getApp().globalData.guide_id;
+
+    th.setData({ buyType:3 });
+      if(th.data.sele_g.is_pickup){
+          th.setData({
+              openSpecModal:1
+          })
+      }else {
+
+
+          // var id = e.currentTarget.dataset.id;//活动id
+          var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+          my_confirm.open(
+              "是否确定领取该礼包",
+              "取消",
+              "确定",
+              function () {
+                  my_confirm.open_cancel(0);
+              },
+              function () {
+                  my_confirm.open_cancel(0);
+                  com.buy_libao(th)
+              })
+      }
+
+
+  },
+
+    //--- 设置一下默认库存的数量 ----
+    set_def_storage(ee) {
+        var that = this, th = this;
+        that.data.fir_def_store = ee;
+
+        that.setData({
+            def_pick_store: ee,
+            sto_sele_name: ee.pickup_name,
+            sto_sele_id: ee.pickup_id,
+            sto_sele_distr: ee.distr_type
+        })
+    },
+    // 选择门店
+    choice_store: function (ee) {
+        var th = this;
+        var ind = ee.currentTarget.dataset.ind;
+        var bconfig = th.data.bconfig;
+
+        if (!th.data.only_pk && !th.data.def_pickpu_list) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
+        }
+
+        if (th.data.only_pk && !th.data.only_pk.length) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
+        }
+        if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) {
+            getApp().confirmBox("门店库存不足", null, 25000, !1);
+            return false;
         }
  
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url, json,
-          function (res) {
-            if (res.data.code == 0) {
-              getApp().my_warnning("领取成功！", 1, th);
+
+        if (bconfig && bconfig.is_sort_storage) {
+            wx.getLocation({
+                type: 'gcj02',
+                success: function (res) {
+
+                    th.data.lat = res.latitude;
+                    th.data.lon = res.longitude;
+                    th.data.is_get_local_ok = 1;
+                    th.setData({
+                        is_gps: 1
+                    });
+                    //th.onShow();
+                    com.get_sto(th,os);
+                },
+                fail: function (res) {
+                    //th.onShow();
+                    th.data.is_get_local_ok = 1;
+                    com.get_sto(th,os);
+                    if (res.errCode == 2) {
+                        th.setData({
+                            is_gps: 0
+                        });
+                        if (th.data.is_gps == 0) {
+                            getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+                        }
+                    } else {
+                        th.setData({
+                            is_gps: "3"
+                        });
+                    }
+
+                }
+            })
+        } else {
+            th.data.is_get_local_ok = 1;
+            com.get_sto(th,os);
+        }
+
+        if (ind != undefined && ind != null) {
+            this.setData({
+                open_ind_store: ind,
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1,
+                openSpecModal_flash_normal: !1,
+            })
+        } else {
+            this.setData({
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1,
+                openSpecModal_flash_normal: !1
+
+            })
+        }
+    },
+    //关闭选择门店
+    close_popup: function (e) {
+        var th = this;
+        this.setData({
+            store: 0,
+            choice_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({
+            sort_store: 1
+        });
+    },
+    // 返回按钮
+    returns: function () {
+        this.setData({
+            sort_store: 0,
+            choice_sort_store: 0
+        });
+    },
+    //---选择分类门店---
+    choice_sort_store: function (e) {
+        var index = e.currentTarget.dataset.index;
+        var region_name = e.currentTarget.dataset.region;
+        var item = this.data.all_sto[index];
+        this.setData({
+            region_name: region_name,
+            sort_store: 0,
+            choice_sort_store: 1,
+            sec_sto: item,
+            sec_pick_index: 0
+        });
+    },
+
+    choose_for_store_fir: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            fir_pick_index: index_c
+        })
+
+    },
+
+    //确定def_pick为选择的门店
+    sure_pick: function (e) {
+        var th = this;
+        var item = null;
+        var openindstore = th.data.open_ind_store;
+
+        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 {
-              getApp().my_warnning(res.data.msg, 0, th);
+                item = th.data.only_pk[index]; //当没有门店分类的时候
             }
-          },
-          function (res) { }
  
-        )
-      })
+        } else {
+            var index = th.data.sec_pick_index;
+            item = th.data.sec_sto.s_arr[index];
+        }
  
+        if (!th.data.sele_g) return false;
+
+        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,
+            openSpecModal: !0,
+        });
+
+
+    },
+    //---点击二级之后的选择---
+    choose_for_store: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            sec_pick_index: index_c,
+            fir_pick_index: index_c
+        })
+
+    },
+    //把选择的门店设置成默认的门店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];
+        }
+        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,
+            openSpecModal: !0,
+        });
+
+        var user_id=getApp().globalData.user_id;
+        var def_pickup_id = item.pickup_id;
+        getApp().request.put('/api/weshop/users/update', {
+            data: {
+                user_id: user_id,
+                def_pickup_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 {
+                    getApp().my_warnning("设置默认门店地址失败", 0, th)
+                }
  
-  },
+            }
+        });
+
+
+    },
+    closeSpecModal: function () {
+        this.setData({openSpecModal: 0});
+    },
+
+    buy_libao:function () {
+        com.buy_libao(this)
+    }
  
  
  
@@ -100,7 +100,7 @@
             </block>-->
  
             <block wx:if="{{isBuy==0&item.lbType==2}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image>
             </block>
             <block wx:if="{{isBuy==0&item.lbType==3}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
@@ -190,4 +190,6 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b id="nav_b"></nav_b>
+
+<include src="../public/buy_com.wxml"></include>
 \ No newline at end of file
 @charset "UTF-8";
-
-/* Author XGQ
- * 2019-12-12
- */
+@import '../../goods/goodsInfo/goodsInfo.wxss';
  
 .box.data-v-3a5b7e36 {
   -webkit-align-content: center;
+module.exports = {
+    //开启定位
+    wait_for_store_config: function (th) {
+        var t_time = setInterval(function () {
+            if (th.data.bconfig == null) false;
+            var e = th.data.bconfig;
+            if (e && e.is_sort_storage) {
+                wx.getLocation({
+                    type: 'gcj02',
+                    success: function (res) {
+                        th.data.lat = res.latitude;
+                        th.data.lon = res.longitude;
+                        th.data.is_get_local_ok = 1;
+                    },
+                    fail: function (res) {
+                        if (res.errCode == 2) {
+                            th.setData({
+                                is_gps: 0
+                            });
+                            if (th.data.is_gps == 0) {
+                                getApp().confirmBox("请开启GPS定位", null, 10000, !1);
+                            }
+
+                        } else {
+                            th.setData({
+                                is_gps: "3"
+                            });
+                        }
+
+                        th.data.is_get_local_ok = 1;
+                    }
+                })
+            } else {
+                th.data.is_get_local_ok = 1;
+            }
+            clearInterval(t_time);
+        }, 500)
+    },
+	set_user_mo_store(th,os,func){
+    	var that=th;
+        //获取用户的默认门店
+        getApp().get_user_store(function (e) {
+            if (!e) {
+                th.data.fir_def_store = {}; //赋值空对象
+                return false;
+            }
+            var ee = JSON.parse(JSON.stringify(e));
+            //--定时器推迟一下--
+            setTimeout(function () {
+                if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type;
+                //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对--
+                if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) {
+                    ee.is_no_dis = 1;
+                }
+
+                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 (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) {
+                            that.set_def_storage(e);
+                            if(func) func();
+                        } 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,
+                                    isstop: 0,
+                                    is_pos: 1
+                                },
+                            }).then(res => {
+                                if (res.data.code == 0) {
+                                    e = res.data.data.pageData[0];
+                                    if (e) {
+                                        e.is_no_dis = ee.is_no_dis;
+                                        appd.pk_store = e;
+                                        that.set_def_storage(e);
+                                    }
+
+                                }
+                                if(func) func();
+                            })
+                        }
+                        //e.distance = distance;
+                        appd.lat = that.data.lat;
+                        appd.lon = that.data.lon;
+
+                    } else {
+                        if (e) {
+                            e.distance = null;
+                            that.set_def_storage(e);
+                        }
+                        if(func) func();
+                    }
+                }, 500)
+             }, 700)
+	    })
+
+    },
+
+    //---------拿出门店分类和门店------------
+    get_sto(th,os) {
+    var that = th;
+        var self=this;
+    var timer_get = setInterval(function () {
+        if (th.data.is_get_local_ok == 0) return false;
+        var dd = null;
+
+        dd = {
+            store_id: os.stoid,
+            isstop: 0,
+            is_pos: 1,
+            pageSize: 2000,
+        }
+
+        //如果有距离的话
+        if (th.data.lat != null) {
+            dd.lat = th.data.lat;
+            dd.lon = th.data.lon;
+        }
+
+        if(th.data.sele_g && th.data.sele_g.pickup_list){
+            dd.ids=th.data.sele_g.pickup_list
+        }
+
+        clearInterval(timer_get);
+
+        //如果会员是有默认的门店话
+        if (!th.data.def_pick_store && th.data.fir_def_store) {
+            th.setData({def_pick_store: th.data.fir_def_store});
+        }
+        wx.showLoading({
+            title: '加载中.'
+        });
+        //----------获取门店----------------
+        getApp().request.promiseGet("/api/weshop/pickup/list", {
+            data: dd,
+        }).then(res => {
+            var e = res;
+
+            if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
+
+                var his_cate_num = 0;
+                for (let i in e.data.data.pageData) {
+                    let item = e.data.data.pageData[i];
+                    if (item.category_id > 0) {
+                        his_cate_num = 1;
+                        break;
+                    }
+                }
+                e.his_cate_num = his_cate_num;
+
+                //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+                if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && 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];
+                }
+
+                //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+                if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+                    for (var k = 0; k < e.data.data.pageData.length; k++) {
+                        if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+                            e.data.data.pageData.splice(k, 1); //删除
+                            break;
+                        }
+                    }
+                    e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+                }
+
+                th.setData({all_pick_list: e.data.data.pageData});
+
+                setTimeout(function () {
+                    self.deal_pickup(e,th,os);  //--普通门店排版--
+                }, 800)
+
+            }
+        })
+    }, 200)
+
+   },
+
+    //-- 统一购买 --
+    buy_libao:function (th) {
+        if(th.data.sele_g.is_pickup){
+            if(!th.data.def_pick_store && !th.data.def_pick_store.pickup_id){
+                getApp().my_warnning("请先选择门店", 1, th);
+                return false;
+            }
+
+            if(th.data.def_pick_store.is_no_dis){
+                getApp().my_warnning("门店不匹配，请重新选择", 1, th);
+                return false;
+            }
+        }
+
+        th.setData({submit:1})
+        var id=th.data.sele_g.lbId;
+        var that=th;
+        var json = {
+            "actId": '', //活动Id
+            "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+            "buyType":""+that.data.buyType, //1=积分兑换 2=余额购买
+            "giftBagId": id, //礼包Id
+            "storeId": that.data.getStorageID, //商家Id
+            "userId": that.data.getUserID, //用户ID
+            "buyFrom": 2,
+        };
+
+        if(that.data.first_leader){
+            json.first_leader=that.data.first_leader
+        }
+        if(that.data.guide_id){
+            json.guide_id=that.data.guide_id
+        }
+
+        if(that.data.def_pick_store){
+            json.pickup_id=that.data.def_pick_store.pickup_id;
+        }
+
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+            json.guide_id = getApp().globalData.guide_id;
+        }
+
+        var url ="/api/weshop/marketing/buy/receive/gift/record/insert";
+        getApp().request.json_post(url, json,
+            function (res) {
+                if (res.data.code == 0 && res.data.data) {
+                    switch(that.data.buyType){
+                        case 1://立即兑换
+                            th.setData({submit:0})
+                            getApp().my_warnning("兑换成功！", 1, th);
+                            th.closeSpecModal();
+                            break;
+                        case 2://立即购买
+                            var order_sn = res.data.data.orderSn;
+                            res = res.data.data.result;
+                            if (!res) return false;
+                            var money=that.data.payMoney;
+                            var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
+                            wx.requestPayment({
+                                timeStamp: String(res.timeStamp),
+                                nonceStr: res.nonceStr,
+                                package: res.packageValue,
+                                signType: res.signType,
+                                paySign: res.paySign,
+                                success: function (res) {
+                                    th.setData({submit:0})
+                                    getApp().goto(url);
+                                },
+                                fail: function (res) {
+                                    th.setData({submit:0})
+                                    getApp().my_warnning("取消支付", 0, th);
+                                }
+                            });
+                            break;
+                        case 3://立即领取
+                            th.setData({submit:0})
+                            getApp().my_warnning("领取成功！", 1, th);
+                            th.closeSpecModal();
+                            break;
+                    }
+
+                } else {
+                    th.setData({submit:0})
+                    getApp().my_warnning(res.data.msg, 0, th);
+                }
+            },
+            function (res) {
+                th.setData({submit:0})
+            }
+        )
+
+    },
+
+    //------------处理门店---------------
+    deal_pickup(e,th,os) {
+
+        if (!th.data.sele_g) return false
+        wx.hideLoading();
+
+        //单总量超出10个的时候，同时门店有分类
+        if (e.data.data.total > 10 && e.his_cate_num) {
+            getApp().request.get("/api/weshop/storagecategory/page", {
+                data: {
+                    store_id: os.stoid,
+                    pageSize: 1000,
+                    orderField: "sort",
+                    orderType: 'asc',
+                },
+                success: function (ee) {
+                    if (ee.data.code == 0) {
+                        var check_all_cate = 0;
+                        if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
+                            for (let i in ee.data.data.pageData) {
+                                let item = ee.data.data.pageData[i];
+                                if (item.is_show == 1) {
+                                    check_all_cate = 1;
+                                    break
+                                }
+                            }
+                        }
+                        if (check_all_cate) {
+                            var sto_cate = ee.data.data.pageData;
+                            var sto_arr = e.data.data.pageData;
+                            var newarr = new Array();
+                            var qita = new Array();
+
+
+                            var is_del_pk = 0;
+                            //----要进行门店分组--------
+                            for (var i = 0; i < sto_arr.length; i++) {
+                                //找一下这个门店有没有在分类数组内
+                                var find2 = 0, find2name = "", sort = 0;
+                                is_del_pk = 0;
+                                for (var m = 0; m < sto_cate.length; m++) {
+                                    if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                                        if (sto_cate[m].is_show != 1) {
+                                            is_del_pk = 1;
+                                            sto_arr.splice(i, 1);
+                                            i--;
+                                        } else {
+                                            find2 = sto_cate[m].cat_id;
+                                            find2name = sto_cate[m].cat_name;
+                                            sort = sto_cate[m].sort;
+                                            is_del_pk = 0;
+                                        }
+                                        break;
+                                    }
+                                }
+                                if (is_del_pk) continue;
+
+                                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,
+                                                sort: sort,
+                                                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,
+                                            sort: sort,
+                                            s_arr: arr0
+                                        };
+                                        newarr.push(item);
+                                    } else {
+                                        qita.push(sto_arr[i]);
+                                    }
+                                }
+                            }
+
+                            var def_arr = new Array();
+                            //-- 开始就看10个门店 --
+                            for (var k = 0; k < 10; k++) {
+                                if (k == sto_arr.length) break;
+                                def_arr.push(sto_arr[k]);
+                            }
+
+                            th.setData({
+                                def_pickpu_list: def_arr,
+                                pickpu_list: ee.data.data.pageData
+                            });
+
+
+                            //门店分类要排序下
+                            function compare(property) {
+                                return function (a, b) {
+                                    var value1 = a[property];
+                                    var value2 = b[property];
+                                    return value1 - value2;
+                                }
+                            }
+
+                            if (newarr.length > 0)
+                                newarr.sort(compare("sort"));
+
+
+                            //----安排其他的分类-----
+                            if (qita.length > 0) {
+                                var item = {
+                                    cat_id: -1,
+                                    name: "其他",
+                                    s_arr: qita
+                                };
+                                newarr.push(item);
+                            }
+
+                            var sd = {
+                                all_sto: newarr,
+                                is_show_sto_cat: 1
+                            }
+                            if (!sto_arr || sto_arr.length <= 10) {
+                                sd.is_show_sto_cat = -1;
+                                sd.only_pk = sto_arr;
+                            }
+                            th.setData(sd);
+
+                        } 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],
+                                    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
+                                })
+                            }
+                        }
+                    } 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],
+                                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
+                            })
+                        }
+
+                    }
+                }
+            });
+        } else {
+            th.setData({
+                is_show_sto_cat: 0,
+                only_pk: e.data.data.pageData
+            });
+            //-----如果没有默认门店，要取第一个门店作为默认店------
+            if (!th.data.def_pick_store && th.data.bconfig && 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
+                })
+            }
+        }
+    },
+
+    check_def_pk:function (th) {
+        var def_pick_store=th.data.def_pick_store
+        var sele_g=th.data.sele_g;
+        var arr=sele_g.pickup_list.split(',');
+
+        var idx=arr.findIndex(function (e) {
+            return e==def_pick_store.pickup_id;
+        })
+
+        if(idx==-1){
+            def_pick_store.is_no_dis=1;
+            th.setData({def_pick_store})
+        }
+
+
+    }
+
+
+
+
+}
 \ No newline at end of file
+<!-- 选择门店的弹框，1.1版最新的 -->
+<block wx:if="{{store}}">
+  <view class="mongolia-layer" bindtap="close_popup"></view>
+  <view class="popup-frame">
+    <block wx:if="{{sort_store==0}}">
+      <!-- 头部 标题 -->
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+        <view>
+          <view>
+            <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+          </view>
+          <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+            <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" ></view>
+          </view>
+        </view>
+      </view>
+      <!-- 门店列表，最外层的门店列表，一开始 -->
+      <view class="store-list">
+        <!-- 如果还没有点击更多门店的时候 -->
+        <block wx:if="{{choice_sort_store==0}}">
+          <!-- 需要for循环 -->
+          <block wx:if="{{is_show_sto_cat==1}}">
+            <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+              <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
+                <block wx:else>
+                  <view class="circle  xc-hooks"></view>
+                </block>
+                <view class="address-frame xc-ash">
+                  <view class="flex-vertical-between butttem5">
+                    <view class="flex xc-ash">
+                      <view class="fs30 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>
+                  </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                </view>
+              </view>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+              <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
+                <block wx:else>
+                  <view class="circle  xc-hooks"></view>
+                </block>
+                <view class="address-frame xc-ash">
+                  <view class="flex-vertical-between ">
+                    <view class="flex xc-ash">
+                      <view class="fs30 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>
+                  </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                </view>
+              </view>
+            </view>
+          </block>
+        </block>
+        <block wx:else>
+          <!-- 如果是点击选择门店分类后显示分类下的门店 -->
+          <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+            <view class="store flex-vertical">
+              <!-- 需要点击事件 -->
+              <block wx:if="{{index==sec_pick_index}}">
+                <view class="circle white xc-hook fs20 red-b">Г</view>
+              </block>
+              <block wx:else>
+                <view class="circle  xc-hooks"></view>
+              </block>
+              <view class="address-frame xc-ash">
+                <view class="flex-vertical-between ">
+                  <view class="flex xc-ash">
+                    <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>
+                </view>
+                <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+      <!-- 门店列表底部 -->
+      <view class="store-bottom-frame">
+        <view class="store-bottom flex-vertical-between">
+          <view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">
+            确定
+          </view>
+          <view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">
+            设为默认
+          </view>
+        </view>
+      </view>
+    </block>
+    <block wx:else>
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">门店分类选择</text>
+        <view>
+          <view>
+            <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+          </view>
+          <view class="felx choose_mores" bindtap="returns">
+            <text class="fs26 red-co">返回</text>
+          </view>
+        </view>
+      </view>
+      <view class="sort_store_list">
+        <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+          <view class="sort-store flex-vertical-between">
+            <view class="fs30" di>{{item.name}}</view>
+            <view class="black_rights-frame">
+              <view class="black_rights"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </block>
+  </view>
+</block>
+<!-- --弹起来,选择规格数量,普通商品购买和秒杀---- -->
+<view hidden="{{!openSpecModal}}">
+  <view bindtap="closeSpecModal" class="cover-layer"></view>
+  <view class="spec-model">
+    <view class="pding">
+      <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
+      <view class="spec-goods">
+        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl+(sele_g.cover_img?sele_g.cover_img:sele_g.lbUrl)}}" binderror="pop_err_img" data-errorimg=""></image>
+        <view class="spec-goods-info">
+          <view class="spec-goods-name ellipsis-2">{{sele_g.giftTitle}}</view>
+          <view class="flex ai_end xc-val-money">
+            <view class="spec-goods-price">
+              <block wx:if="{{sele_g.payMoney>0}}">
+                <text>{{"￥"+sele_g.payMoney}}</text>
+              </block>
+              <block wx:if="{{sele_g.payMoney>0&&sele_g.payIntegral>0}}">
+                <text>/</text>
+              </block>
+              <block wx:if="{{sele_g.payIntegral>0}}">
+                <view class="flex">
+                  <text class="ellipsis-1">{{sele_g.payIntegral}}</text>
+                  <view>积分</view>
+                </view>
+              </block>
+
+            </view>
+          </view>
+
+
+          <view class="flex">
+            <view class="spec-goods-stock" >已售：{{sele_g.giftQty}}</view>
+            <view class="spec-goods-stock">可售：{{sele_g.lbnum-sele_g.giftQty+(sele_g.virtualsales?sele_g.virtualsales:0)}}</view>
+          </view>
+
+        </view>
+        <!-- 选择门店模块 -->
+        <view class="flex-space-between address ai_end xc-width ">
+          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
+              距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+            </view>
+          </view>
+          <!-- 没有门店的时候 -->
+          <view class="flex" bindtap="choice_store" wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs30" style="color:black;">选择门店</view>
+          </view>
+          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
+        </view>
+        <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+        <block wx:else>
+          <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+          <block wx:else>
+            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+            <view wx:elif="{{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}}">
+          地址:{{def_pick_store.fulladdress}}
+        </view>
+      </view>
+      <!-- 商品的属性项目 -->
+
+
+    </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 && !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="{{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>
+                <button  bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add">
+                  <text wx:if="{{buyType==1}}">立即兑换</text>
+                  <text wx:if="{{buyType==2}}">立即购买</text>
+                  <text wx:if="{{buyType==3}}">立即领取</text>
+                </button>
+              </block>
+
+            </block>
+          </block>
+        </block>
+      </block>
+
+    </view>
+    <view class="clear"></view>
+
+  </view>
+</view>
 \ No newline at end of file
@@ -2138,7 +2138,7 @@ Page({
             callback();
         } else {
             //-- 判断有没有优惠活动 --
-            getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => {
+            getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+usr.user_id, {}).then(res => {
                 if (res.data.code == 0) {
                     var r_data = res.data.data;
                     th.data.prom_goods = r_data.promGoodsLists;
@@ -6118,9 +6118,8 @@ Page({
  
         } else {
             //调用接口判断订单优惠，
-            getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0", {
+            getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0"+"/"+user_id, {
                 success: function (res) {
-
                     if (res.data.code == 0 && res.data.data) {
                         var r_data = res.data.data;
                         var max = 0, min = 0;
@@ -79,7 +79,7 @@
                 </block>
               </block>
               <block wx:if="{{item.lbType==2}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image>
               </block>
               <block wx:if="{{item.lbType==3}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
@@ -182,7 +182,7 @@ Page({
      var index=e.currentTarget.dataset.ind;
      switch (index) {
        case "0": getApp().goto("/pages/index/index/index");break;
-       case "1": getApp().goto("/pages/user/coupons/coupons"); break;
+       case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break;
        case "2": getApp().goto("/pages/user/userqy/userqy"); break;
      }
   },
 var auth = require("../../../utils/auth.js"),
-  rq = require("../../../utils/request.js");
+	rq = require("../../../utils/request.js");
 var e = getApp(),
-  app = e,
-  s = e.globalData.setting,
-  os = s,
-  app_d = e.globalData;
+	app = e,
+	s = e.globalData.setting,
+	os = s,
+	app_d = e.globalData;
 var regeneratorRuntime = require('../../../utils/runtime.js');
 const {
-  barcode,
-  qrcode
+	barcode,
+	qrcode
 } = require('../../../utils/index.js');
 var ut = require("../../../utils/util.js");
 let self = null;
  
 Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    length: 150,
-    iurl: s.imghost,
-    defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg",
-    userInfo: null,
-    toji: null, //统计相关
-    txmon: 0,
-    byquan: 0,
-    yuer: 0,
-    is_no_plus:1,
-    currentPage: 1,
-    recommend_list: [],
-    tc_hide: true,
-    sw_index: 0,
-    qy_list: null,
-    gradeId: null,
-    is_init: 0,
-    cz_val: 0,
-    full_cz_val: 0,
-    is_dengji: 0, //是不是等级
-    is_banner: 0, //是不是有生日活动
-    giftbagid: "", //生日活动的类型
-    actId: "", //生日活动的id
-    actImg: "",
-    is_assistance: 0, //助力活动
-    ad_img:"",
-    add_card_data:'',  //等级卡的内容
-
-    hiddenCS: true,
-  },
-  goto_nav: function(e) {
-    var th = this;
-    var url = e.currentTarget.dataset.url;
-    if (th.data.userInfo != null) {
-      getApp().goto(url);
-    } else {
-      wx.navigateTo({
-        url: '/pages/togoin/togoin',
-      })
-    }
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function(options) {	
-			self = this;
-      var th=this;
-      getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
-          data: {
-              enabled: 1
-          },
-          success:function(res){
-              if(res.data.code==0 && res.data.data  && res.data.data.pageData && res.data.data.pageData.length){
-                  var item=res.data.data.pageData[0];
-                  if (item && item.ad_code)  th.setData({ad_img:item.ad_code})
-              }
-          }
-      })
-      app.getUserFir();
-     this.init_user_tool()
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function() {
-      getApp().check_can_share();
-      //看一下小程序是不是过期了
-      getApp().getConfig2(function(config2){
-          if(config2 && config2.is_overdue==1){
-              getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.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.setappdata(ob);
-                  }
-              })
-          }
-      })
-
-       //调用接口判断商家plus有没有过期
-       rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
-        if (res.data.code == 0) {
-            var arr = res.data.data.pageData;
-            if (arr.length > 0) {
-                var item = arr[0];
-                if (item.is_sy == 0) {
-                    var now = Date.parse(new Date()); now = now / 1000;
-                    if (item.end_time < now) {
-                        th.setData({ is_no_plus: 0 })
-                    }
-                }
-            }
-        }
-    })
-    var th=this;
-		
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		length: 150,
+		iurl: s.imghost,
+		defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg",
+		userInfo: null,
+		toji: null, //统计相关
+		txmon: 0,
+		byquan: 0,
+		yuer: 0,
+		is_no_plus: 1,
+		currentPage: 1,
+		recommend_list: [],
+		tc_hide: true,
+		sw_index: 0,
+		qy_list: null,
+		gradeId: null,
+		is_init: 0,
+		cz_val: 0,
+		full_cz_val: 0,
+		is_dengji: 0, //是不是等级
+		is_banner: 0, //是不是有生日活动
+		giftbagid: "", //生日活动的类型
+		actId: "", //生日活动的id
+		actImg: "",
+		is_assistance: 0, //助力活动
+		ad_img: "",
+		add_card_data: '',  //等级卡的内容
+
+		hiddenCS: true,
+	},
+	goto_nav: function (e) {
+		var th = this;
+		var url = e.currentTarget.dataset.url;
+		if (th.data.userInfo != null) {
+			getApp().goto(url);
+		} else {
+			wx.navigateTo({
+				url: '/pages/togoin/togoin',
+			})
+		}
+	},
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function (options) {
+		self = this;
+		var th = this;
+		getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
+			data: {
+				enabled: 1
+			},
+			success: function (res) {
+				if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) {
+					var item = res.data.data.pageData[0];
+					if (item && item.ad_code) th.setData({ ad_img: item.ad_code })
+				}
+			}
+		})
+		app.getUserFir();
+		this.init_user_tool()
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function () {
+		getApp().check_can_share();
+		//看一下小程序是不是过期了
+		getApp().getConfig2(function (config2) {
+			if (config2 && config2.is_overdue == 1) {
+				getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.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.setappdata(ob);
+					}
+				})
+			}
+		})
+
+		//调用接口判断商家plus有没有过期
+		rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+			if (res.data.code == 0) {
+				var arr = res.data.data.pageData;
+				if (arr.length > 0) {
+					var item = arr[0];
+					if (item.is_sy == 0) {
+						var now = Date.parse(new Date()); now = now / 1000;
+						if (item.end_time < now) {
+							th.setData({ is_no_plus: 0 })
+						}
+					}
+				}
+			}
+		})
+		var th = this;
+
 		// 判断是否开启美业
 		getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
-			if(res.data.code == 0) {
+			if (res.data.code == 0) {
 				th.setData({
 					enableMeiye: res.data.data.EnableMeiye,
 				});
 			};
 		});
-		
-		
-    getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
-      if(res.data.code==0){
-        var plusCard = res.data.data;
-        for (var i = 0; i < plusCard.length; i++) {
-          if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break;  }
-        }
-      }
-    })
-	    
-	if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-				  var index=getApp().getPageIndex(this);			 
-	     this.getTabBar().setData({
-	       active: index //数字是当前页面在tabbar的索引
-	     });
-		 //getApp().requestCardNum(this);
-	}
-
-
-    var stoid = app_d.setting.stoid;
-    var s = this, th = s,
-      need_money = 0,
-      cur_g_num = 0;
-
-    /*------会员登录------*/
-    var e=getApp().globalData.userInfo;
-    if (e != undefined && e != null && e.mobile) {
-
-        this.birthday();
-        this.is_assistance();
-
-        s.setData({
-          userInfo: e
-        });
-		
-		//-- 要调用接口，获取卡的钱 --
-		var url="/api/weshop/wxuser/getWxCardInfo?storeId="+os.stoid+"&userId="+e.user_id;
-		rq.get(url,{
-            isShowLoading:0,
-			success: function(su) {
-			  if(su.data.code==0){
-				  s.setData({
-				    add_card_data: su.data.data,
-				  });
-			  }			  
+
+
+		getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
+			if (res.data.code == 0) {
+				var plusCard = res.data.data;
+				for (var i = 0; i < plusCard.length; i++) {
+					if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
+				}
 			}
+		})
+
+		if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+			var index = getApp().getPageIndex(this);
+			this.getTabBar().setData({
+				active: index //数字是当前页面在tabbar的索引
+			});
+			//getApp().requestCardNum(this);
+		}
+
+
+		var stoid = app_d.setting.stoid;
+		var s = this, th = s,
+			need_money = 0,
+			cur_g_num = 0;
+
+		/*------会员登录------*/
+		var e = getApp().globalData.userInfo;
+		if (e != undefined && e != null && e.mobile) {
+
+			this.birthday();
+			this.is_assistance();
+
+			s.setData({
+				userInfo: e
+			});
+
+			//-- 要调用接口，获取卡的钱 --
+			var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id;
+			rq.get(url, {
+				isShowLoading: 0,
+				success: function (su) {
+					if (su.data.code == 0) {
+						s.setData({
+							add_card_data: su.data.data,
+						});
+					}
+				}
+			});
+
+			/*-----统计-----*/
+			rq.get("/api/weshop/order/waitlist", {
+				isShowLoading: 0,
+				data: {
+					user_id: app_d.user_id
+				},
+				success: function (su) {
+					s.setData({
+						toji: su.data.data,
+					});
+				}
+			})
+			/*-----获取线下会员的预存款和优惠券的数量-----*/
+			rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
+				isShowLoading: 0,
+				success: function (su) {
+					if (su.data.code == 0 && su.data.data) {
+						var data = su.data.data;
+						if (!data) data = {};
+						data.cashcount = parseInt(data.cashcount);
+						s.setData({
+							udata: data,
+						});
+					}
+
+				}
+			})
+			/*-----获取会员提现金额-----*/
+			rq.get("/api/weshop/withdrawals/summoney", {
+				isShowLoading: 0,
+				data: {
+					user_id: e.user_id,
+					store_id: os.stoid,
+					status: 0
+				},
+				success: function (su) {
+					if (su.data.code == 0) {
+						var yuer = parseFloat(th.data.userInfo.user_money -
+							th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
+						th.setData({
+							txmon: su.data.data.summoney,
+							yuer: yuer
+						});
+					}
+				}
+			})
+
+			/*-----获取会员包邮券的数量-----*/
+			rq.get("/api/weshop/userfeemail/page", {
+				isShowLoading: 0,
+				data: {
+					user_id: e.user_id,
+					store_id: os.stoid,
+					pageSize: 1,
+					isuse: 0
+				},
+				success: function (su) {
+					if (su.data.code == 0) {
+						th.setData({
+							byquan: parseInt(su.data.data.total)
+						});
+					}
+				}
+			});
+
+			/*-----物流信息提醒-----*/
+			rq.get('/api/weshop/order/countDadaOrder', {
+				isShowLoading: 0,
+				data: {
+					user_id: e.user_id,
+					store_id: os.stoid,
+				},
+				success: function (su) {
+					if (su.data.code == 0) {
+						th.setData({
+							countDadaOrder: su.data.data
+						});
+					}
+				}
+			});
+
+
+
+
+			//--初始化是否有打勾--
+			getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+				data: {
+					storeId: os.stoid
+				},
+				success: function (rs) {
+					if (rs.data.code == 0 && rs.data.data.isBool) {
+						th.setData({ is_init: 1 });
+						/*-----获取会员权益列表-----*/
+						rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
+							isShowLoading: 0,
+							data: {
+								storeId: os.stoid,
+								pageSize: 100
+							},
+							success: async function (res) {
+
+								//判断有没有值，没有值返回
+								if (!ut.ajax_ok(res)) return false;
+
+								var arr_data = res.data.data.pageData;
+								var gid = null,
+									g_qy_list = null,
+									cz_vals = 0,
+									need_money = 0,
+									backClass = null,
+
+									GradeName = '';
+
+								//获取成长值
+								await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
+									data: {
+										storeId: os.stoid,
+										userId: app_d.user_id
+									}
+								}).then(res => {
+									if (res.data.code == 0 && res.data.data) {
+										gid = res.data.data.GradeId;
+										var cz_val = res.data.data.GradeSum;
+										cz_vals = parseInt(cz_val);
+										GradeName = res.data.data.GradeName;
+									}
+									//th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
+								})
+								var obj = {
+									cz_val: cz_vals,
+									GradeName: GradeName,
+									gradeId: gid,
+									is_grad_get: 1
+								};
+
+								//  获取最大值
+								await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
+									data: {
+										storeId: os.stoid
+									}
+								}).then(res => {
+									if (res.data.data)
+										backClass = res.data.data.pageData;
+									if (backClass) {
+										var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
+										//th.setData({ full_cz_val: full_cz_val});
+										obj.full_cz_val = full_cz_val
+									}
+								})
+
+								//--会员权益中心页的修改--
+								for (var i in backClass) {
+									var im = backClass[i];
+									if (cz_vals < im.BuyGradeSum && need_money == 0) {
+										need_money = im.BuyGradeSum;
+										obj.need_money = need_money;
+									}
+								}
+
+								//获取当前等级的特权
+								await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
+									data: {
+										storeId: os.stoid,
+										GradeId: gid,
+										userId: app_d.user_id,
+										pageSize: 100
+									}
+								}).then(res => {
+									if (res.data.data)
+										g_qy_list = res.data.data.pageData;
+								});
+
+								for (var i in arr_data) {
+									var item = arr_data[i];
+									var FromId = th.check_is_has_qy(item, g_qy_list);
+									arr_data[i].ishas = 0;
+									if (FromId) {
+										arr_data[i].ishas = 1;
+										arr_data[i].FromId = FromId;
+									}
+								}
+								arr_data.sort(function (a, b) {
+									return b.ishas - a.ishas
+								})
+
+								//4个4个一组
+								var arr = new Array();
+								for (var i = 0; i < arr_data.length; i += 4) {
+									arr.push(arr_data.slice(i, i + 4));
+								}
+								//th.setData({ qy_list: arr, need_money: need_money});
+								obj.qy_list = arr;
+								th.setData(obj);
+							}
+						})
+					}
+				}
+			})
+
+			/*-- 获取 --*/
+			th.requestRecommend();
+
+			/*-------系统是否开通等级卡，会员是等级卡-----*/
+			getApp().getConfig2(function (e) {
+				var t_swi = e.switch_list;
+				if (t_swi) t_swi = JSON.parse(t_swi)
+				if (t_swi) {
+					th.setData({ sys_switch: t_swi });
+					var user_tool = [];
+					if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool);
+					th.setData({ c_list: user_tool })
+				}
+				if (parseInt(t_swi.rank_switch) == 2) {
+					var userInfo = th.data.userInfo;
+					if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
+						var now = ut.gettimestamp();
+						var str = userInfo.card_expiredate;
+						var end = new Date(str);
+						end = Date.parse(end) / 1000;
+						//---判断是不是有过期---
+						if (now < end) {
+							th.setData({
+								is_dengji: 1
+							})
+						} else {
+							th.setData({
+								is_dengji: 3
+							})
+						}
+					} else {
+						th.setData({
+							is_dengji: 2
+						})
+					}
+				}
+			})
+			//th.requestRecommend();
+		}
+
+		//自定义组件一定要等到页面加载完了，才来调用selectComponnent
+		setTimeout(function () {
+			if (getApp().globalData.user_id) getApp().requestCardNum(th);
+			var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+			goods_list.init();
+			goods_list.get_list();
+		}, 800)
+	},
+
+	//判断会员是后有改服务项目
+	check_is_has_qy: function (item, g_qy_list) {
+		if (!g_qy_list) return false;
+
+		for (var i in g_qy_list) {
+			var iter = g_qy_list[i];
+			if (iter.FormId == item.Id) return g_qy_list[i].FormId;
+		}
+		return false;
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function () {
+		for (var i = 1; i < 100; i++) {
+			clearInterval(i);
+		}
+	},
+	setappdata: function (t) {
+		var t = getApp().globalData.wxapp_buy_obj;
+		if (t && t.isout == 1)
+			wx.navigateTo({
+				url: "/pages/error/error?msg=小程序已经过期",
+			});
+		if (t && t.isbuy == 0)
+			wx.navigateTo({
+				url: "/pages/error/error?msg=还未购买小程序",
+			});
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function () {
+		//!this.nomore && this.requestRecommend();
+		var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+		goods_list.init();
+		setTimeout(function () {
+			goods_list.get_list();
+		}, 300)
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function () { getApp().globalData.no_clear = 1; },
+
+	//------卡片的显示和关闭--------
+	show_tc: function () {
+		if (!this.data.userInfo) return false;
+		//base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+		var val = this.data.userInfo.mobile + "|" + ut.formatTime();
+		val = "^" + ut.base64_encode(val);
+
+		qrcode('qrcode', val, 480, 480, this);
+		this.setData({
+			tc_hide: false,
 		});
-				
-        /*-----统计-----*/
-        rq.get("/api/weshop/order/waitlist", {
-          isShowLoading:0,
-          data: {
-            user_id: app_d.user_id
-          },
-          success: function(su) {
-            s.setData({
-              toji: su.data.data,
-            });
-          }
-        })
-        /*-----获取线下会员的预存款和优惠券的数量-----*/
-        rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
-          isShowLoading:0,
-          success: function(su) {
-			 if(su.data.code==0 && su.data.data ) {
-				 var data = su.data.data;
-				 if(!data) data={};
-				 data.cashcount = parseInt(data.cashcount);
-				 s.setData({
-				   udata: data,
-				 });
-			 }
-           
-          }
-        })
-        /*-----获取会员提现金额-----*/
-        rq.get("/api/weshop/withdrawals/summoney", {
-          isShowLoading:0,
-          data: {
-            user_id: e.user_id,
-            store_id: os.stoid,
-            status: 0
-          },
-          success: function(su) {
-            if (su.data.code == 0) {
-              var yuer = parseFloat(th.data.userInfo.user_money -
-                th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
-              th.setData({
-                txmon: su.data.data.summoney,
-                yuer: yuer
-              });
-            }
-          }
-        })
-
-        /*-----获取会员包邮券的数量-----*/
-        rq.get("/api/weshop/userfeemail/page", {
-          isShowLoading:0,
-          data: {
-            user_id: e.user_id,
-            store_id: os.stoid,
-            pageSize: 1,
-            isuse: 0
-          },
-          success: function(su) {
-            if (su.data.code == 0) {
-              th.setData({
-                byquan: parseInt(su.data.data.total)
-              });
-            }
-          }
-        });
-				
-				/*-----物流信息提醒-----*/
-				rq.get('/api/weshop/order/countDadaOrder', {
-				  isShowLoading:0,
-				  data: {
-				    user_id: e.user_id,
-				    store_id: os.stoid,
-				  },
-				  success: function(su) {
-				    if (su.data.code == 0) {
-				      th.setData({
-				        countDadaOrder: su.data.data
-				      });
-				    }
-				  }
-				});
-				
-				
-				
-
-        //--初始化是否有打勾--
-        getApp().request.get("/api/weshop/users/grade/vip/init/get", {
-            data: {
-                storeId: os.stoid
-            },
-            success:function (rs) {
-                 if(rs.data.code==0 && rs.data.data.isBool){
-                     th.setData({is_init:1});
-                     /*-----获取会员权益列表-----*/
-                     rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
-                         isShowLoading:0,
-                         data: {
-                             storeId: os.stoid,
-                             pageSize: 100
-                         },
-                         success: async function(res) {
-
-                             //判断有没有值，没有值返回
-                             if(!ut.ajax_ok(res)) return false;
-
-                             var arr_data = res.data.data.pageData;
-                             var gid = null,
-                                 g_qy_list = null,
-                                 cz_vals = 0,
-                                 need_money = 0,
-                                 backClass = null,
-
-                                 GradeName = '';
-
-                             //获取成长值
-                             await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
-                                 data: {
-                                     storeId: os.stoid,
-                                     userId: app_d.user_id
-                                 }
-                             }).then(res => {
-                                 if (res.data.code == 0 && res.data.data) {
-                                     gid = res.data.data.GradeId;
-                                     var cz_val = res.data.data.GradeSum;
-                                     cz_vals = parseInt(cz_val);
-                                     GradeName = res.data.data.GradeName;
-                                 }
-                                 //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
-                             })
-                             var obj = {
-                                 cz_val: cz_vals,
-                                 GradeName: GradeName,
-                                 gradeId: gid,
-                                 is_grad_get:1
-                             };
-
-                             //  获取最大值
-                             await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
-                                 data: {
-                                     storeId: os.stoid
-                                 }
-                             }).then(res => {
-                                 if (res.data.data)
-                                     backClass = res.data.data.pageData;
-                                 if (backClass) {
-                                     var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
-                                     //th.setData({ full_cz_val: full_cz_val});
-                                     obj.full_cz_val = full_cz_val
-                                 }
-                             })
-
-                             //--会员权益中心页的修改--
-                             for (var i in backClass) {
-                                 var im = backClass[i];
-                                 if (cz_vals < im.BuyGradeSum && need_money == 0) {
-                                     need_money = im.BuyGradeSum;
-                                     obj.need_money = need_money;
-                                 }
-                             }
-
-                             //获取当前等级的特权
-                             await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
-                                 data: {
-                                     storeId: os.stoid,
-                                     GradeId: gid,
-                                     userId: app_d.user_id,
-                                     pageSize: 100
-                                 }
-                             }).then(res => {
-                                 if (res.data.data)
-                                     g_qy_list = res.data.data.pageData;
-                             });
-
-                             for (var i in arr_data) {
-                                 var item = arr_data[i];
-                                 var FromId = th.check_is_has_qy(item, g_qy_list);
-                                 arr_data[i].ishas = 0;
-                                 if (FromId) {
-                                     arr_data[i].ishas = 1;
-                                     arr_data[i].FromId = FromId;
-                                 }
-                             }
-                             arr_data.sort(function(a, b) {
-                                 return b.ishas - a.ishas
-                             })
-
-                             //4个4个一组
-                             var arr = new Array();
-                             for (var i = 0; i < arr_data.length; i += 4) {
-                                 arr.push(arr_data.slice(i, i + 4));
-                             }
-                             //th.setData({ qy_list: arr, need_money: need_money});
-                             obj.qy_list = arr;
-                             th.setData(obj);
-                         }
-                     })
-                 }
-            }
-        })
-      
-
-
-        /*-- 获取 --*/
-        th.requestRecommend();
-
-        /*-------系统是否开通等级卡，会员是等级卡-----*/
-        getApp().getConfig2(function(e) {
-          var t_swi = e.switch_list;
-          if (t_swi) t_swi = JSON.parse(t_swi)
-          if(t_swi){			  	   
-             th.setData({sys_switch:t_swi});
-			 
-			 var user_tool=[];
-			 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
-			 th.setData({c_list:user_tool})		
-			 
-          }
-
-
-          if (parseInt(t_swi.rank_switch) == 2) {
-            var userInfo = th.data.userInfo;
-            if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
-              var now = ut.gettimestamp();
-              var str = userInfo.card_expiredate;
-              var end = new Date(str);
-              end = Date.parse(end) / 1000;
-              //---判断是不是有过期---
-              if (now < end) {
-                th.setData({
-                  is_dengji: 1
-                })
-              } else {
-                th.setData({
-                  is_dengji: 3
-                })
-              }
-            } else {
-              th.setData({
-                is_dengji: 2
-              })
-            }
-          }
-        })
-        //th.requestRecommend();
-				
-				
-				
-				
-				
-     }
-	   
-	 /*-- 
-	 var t_swi= getApp().globalData.config2.switch_list
-	 if (t_swi){
-		 t_swi = JSON.parse(t_swi);
-		 var user_tool=[];
-		 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
-	     th.setData({c_list:user_tool})		  
-	 } --*/
-
-      //自定义组件一定要等到页面加载完了，才来调用selectComponnent
-      setTimeout(function () {
-          if (getApp().globalData.user_id) getApp().requestCardNum(th);
-          var goods_list = th.selectComponent("#goods_recommend"); //组件的id
-          goods_list.init();
-          goods_list.get_list();
-      },800)
-
-
-
-  },
-
-
-
-  //判断会员是后有改服务项目
-  check_is_has_qy: function(item, g_qy_list) {
-    if (!g_qy_list) return false;
-
-    for (var i in g_qy_list) {
-      var iter = g_qy_list[i];
-      if (iter.FormId == item.Id) return g_qy_list[i].FormId;
-    }
-    return false;
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function() {
-    for(var i = 1; i < 100; i++) {
-      clearInterval(i);
-    }
-  },
-  setappdata: function(t) {
-    var t=getApp().globalData.wxapp_buy_obj;
-    if (t && t.isout == 1)
-      wx.navigateTo({
-        url: "/pages/error/error?msg=小程序已经过期",
-      });
-    if (t && t.isbuy == 0)
-      wx.navigateTo({
-        url: "/pages/error/error?msg=还未购买小程序",
-      });
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function() {
-    //!this.nomore && this.requestRecommend();
-    var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-    goods_list.init();
-    setTimeout(function() {
-      goods_list.get_list();
-    }, 300)
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function() {   getApp().globalData.no_clear=1; },
-
-  //------卡片的显示和关闭--------
-  show_tc: function() {
-    if (!this.data.userInfo) return false;
-    //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-    var val=this.data.userInfo.mobile+"|"+ut.formatTime();
-    val="^"+ut.base64_encode(val);
-
-    qrcode('qrcode', val, 480, 480, this);
-    this.setData({
-      tc_hide: false,
-    });
-  },
-  hide_tc: function() {
-    this.setData({
-      tc_hide: true,
-    });
-  },
-
-  //--跳转到预存款页面--
-  deposit: function() {
-    if (!this.data.userInfo) return false;
-    wx.navigateTo({
-      url: '../deposit/deposit',
-    })
-  },
-  //--跳转到余额页面--
-  balance: function() {
-    if (!this.data.userInfo) return false;
-    wx.navigateTo({
-      url: '../member/menber',
-    })
-  },
-  //--跳转到优惠券--
-  coupon: function() {
-    var th = this;
-    if (!this.data.userInfo) return false;
-    //  th.sendsm();
-    wx.navigateTo({
-      url: '../coupons/coupons',
-    })
-  },
-  //--跳转到积分--
-  integral: function() {
-    if (!this.data.userInfo) return false;
-    wx.navigateTo({
-      url: '../integral/integral',
-    })
-  },
-  //--跳到绑定页面--
-  gobindtel: function() {
-    wx.navigateTo({
-      url: '/pages/togoin/togoin',
-    })
-  },
-
-  go_order: function(e) {
-    if (!this.data.userInfo) return false;
-    var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: url,
-    })
-
-  },
-
-  //--加载更多商品--
-  requestRecommend: function() {
-    var e = this,
-      t = '/api/weshop/goods/page?page=' + e.data.currentPage;
-    var th_recommend_list = e.data.recommend_list;
-    getApp().request.get(t, {
-      data: {
-        is_mainshow: 1,
-        isonsale: 1,
-        is_recommend: 1,
-        is_on_sale: 1,
-        store_id: os.stoid,
-        pageSize: 10
-      },
-      success: function(ee) {
-        var recommend_list = ee.data.data.pageData;
-        if (recommend_list && recommend_list.length > 0) {
-          var dd = [...th_recommend_list, ...recommend_list];
-          e.setData({
-            recommend_list,
-            dd
-          });
-          e.data.currentPage++;
-        } else {
-          e.setData({
-            nomore: 1
-          });
-        }
-      }
-    })
-  },
-
-  //--跳转到权益页面--
-  go_qy: function() {
-    if (!this.data.userInfo) return false;
-    var url = "/pages/user/userqy/userqy";
-    getApp().goto(url);
-  },
-
-  //--跳转到商品详情页面--
-  go_goods: function(e) {
-    var gid = e.currentTarget.dataset.gid;
-    var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
-    getApp().goto(url);
-  },
-
-  click_next: function() {
-    var index = this.data.sw_index;
-    index++;
-    if (index >= this.data.qy_list.length) return;
-    this.setData({
-      sw_index: index
-    })
-  },
-
-  click_pre: function() {
-    var index = this.data.sw_index;
-    index--;
-    if (index < 0) return;
-    this.setData({
-      sw_index: index
-    })
-  },
-
-  onSli: function(e) {
-    var that = this;
-    that.setData({
-      sw_index: e.detail.current
-    })
-  },
-
-  //--权益使用--
-  go_qy_url: function(e) {
-    var th = this;
-    var no = e.currentTarget.dataset.no;
-    var ind = e.currentTarget.dataset.ind;
-    var find = e.currentTarget.dataset.find;
-    var item = th.data.qy_list[find][ind];
-    if (item.ishas == undefined || !item.ishas) {
-      var qt_txt = th.selectComponent("#pop_txt"); //组件的id
-      var ob = {
-        title: "温馨提示",
-        content: "当前会员暂无此权益"
-      };
-      qt_txt.open(ob);
-      return false;
-    }
-
-    var url = e.currentTarget.dataset.img;
-    if(!url || url==""){
-      url=`/public/upload/userqy/quanbg.jpg`
-    }
-    switch (no) {
-      case "01":
-        getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +
-          url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
-        break;
-      case "02":
-        getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
-        break;
-      case "03":
-        getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
-        url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
-        break;
-      case "10":
-        getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
-          data: {
-            storeId: os.stoid,
-            formId: item.Id,
-            userId: getApp().globalData.user_id,
-            gradeId: th.data.gradeId
-          },
-          success: function(res) {
-            var val = res.data.data.Remark;
-            var title = res.data.data.PrivilegeName;
-            var qt_txt = th.selectComponent("#pop_txt"); //组件的id
-            var ob = {
-              title: title,
-              content: val
-            };
-            qt_txt.open(ob);
-          }
-        })
-        break;
-    }
-  },
-
-  //跳转到链接
-  goto: function(e) {
-    var url = e.currentTarget.dataset.url;
-    getApp().goto(url);
-  },
-
-  //---------联系客服------------
-  contactService: function() {
+	},
+	hide_tc: function () {
+		this.setData({
+			tc_hide: true,
+		});
+	},
+
+	//--跳转到预存款页面--
+	deposit: function () {
+		if (!this.data.userInfo) return false;
+		wx.navigateTo({
+			url: '/packageD/pages/user/deposit/deposit',
+		})
+	},
+	//--跳转到余额页面--
+	balance: function () {
+		if (!this.data.userInfo) return false;
+		wx.navigateTo({
+			url: '/packageD/pages/user/member/menber',
+		})
+	},
+	//--跳转到优惠券--
+	coupon: function () {
+		var th = this;
+		if (!this.data.userInfo) return false;
+		//  th.sendsm();
+		wx.navigateTo({
+			url: '/packageD/pages/user/coupons/coupons',
+		})
+	},
+	//--跳转到积分--
+	integral: function () {
+		if (!this.data.userInfo) return false;
+		wx.navigateTo({
+			url: '/packageD/pages/user/integral/integral',
+		})
+	},
+	//--跳到绑定页面--
+	gobindtel: function () {
+		wx.navigateTo({
+			url: '/pages/togoin/togoin',
+		})
+	},
+
+	go_order: function (e) {
+		if (!this.data.userInfo) return false;
+		var url = e.currentTarget.dataset.url;
+		wx.navigateTo({
+			url: url,
+		})
+
+	},
+
+	//--加载更多商品--
+	requestRecommend: function () {
+		var e = this,
+			t = '/api/weshop/goods/page?page=' + e.data.currentPage;
+		var th_recommend_list = e.data.recommend_list;
+		getApp().request.get(t, {
+			data: {
+				is_mainshow: 1,
+				isonsale: 1,
+				is_recommend: 1,
+				is_on_sale: 1,
+				store_id: os.stoid,
+				pageSize: 10
+			},
+			success: function (ee) {
+				var recommend_list = ee.data.data.pageData;
+				if (recommend_list && recommend_list.length > 0) {
+					var dd = [...th_recommend_list, ...recommend_list];
+					e.setData({
+						recommend_list,
+						dd
+					});
+					e.data.currentPage++;
+				} else {
+					e.setData({
+						nomore: 1
+					});
+				}
+			}
+		})
+	},
+
+	//--跳转到权益页面--
+	go_qy: function () {
+		if (!this.data.userInfo) return false;
+		var url = "/pages/user/userqy/userqy";
+		getApp().goto(url);
+	},
+
+	//--跳转到商品详情页面--
+	go_goods: function (e) {
+		var gid = e.currentTarget.dataset.gid;
+		var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
+		getApp().goto(url);
+	},
+
+	click_next: function () {
+		var index = this.data.sw_index;
+		index++;
+		if (index >= this.data.qy_list.length) return;
+		this.setData({
+			sw_index: index
+		})
+	},
+
+	click_pre: function () {
+		var index = this.data.sw_index;
+		index--;
+		if (index < 0) return;
+		this.setData({
+			sw_index: index
+		})
+	},
+
+	onSli: function (e) {
+		var that = this;
+		that.setData({
+			sw_index: e.detail.current
+		})
+	},
+
+	//--权益使用--
+	go_qy_url: function (e) {
+		var th = this;
+		var no = e.currentTarget.dataset.no;
+		var ind = e.currentTarget.dataset.ind;
+		var find = e.currentTarget.dataset.find;
+		var item = th.data.qy_list[find][ind];
+		if (item.ishas == undefined || !item.ishas) {
+			var qt_txt = th.selectComponent("#pop_txt"); //组件的id
+			var ob = {
+				title: "温馨提示",
+				content: "当前会员暂无此权益"
+			};
+			qt_txt.open(ob);
+			return false;
+		}
+
+		var url = e.currentTarget.dataset.img;
+		if (!url || url == "") {
+			url = `/public/upload/userqy/quanbg.jpg`
+		}
+		switch (no) {
+			case "01":
+				getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +
+					url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
+				break;
+			case "02":
+				getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
+				break;
+			case "03":
+				getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
+					url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
+				break;
+			case "10":
+				getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
+					data: {
+						storeId: os.stoid,
+						formId: item.Id,
+						userId: getApp().globalData.user_id,
+						gradeId: th.data.gradeId
+					},
+					success: function (res) {
+						var val = res.data.data.Remark;
+						var title = res.data.data.PrivilegeName;
+						var qt_txt = th.selectComponent("#pop_txt"); //组件的id
+						var ob = {
+							title: title,
+							content: val
+						};
+						qt_txt.open(ob);
+					}
+				})
+				break;
+		}
+	},
+
+	//跳转到链接
+	goto: function (e) {
+		var url = e.currentTarget.dataset.url;
+		getApp().goto(url);
+	},
+
+	//---------联系客服------------
+	contactService: function () {
 		getApp().com_call(this);
 	},
-	
+
 	// 获取客服热线
 	getTel() {
 		return new Promise((resolve, reject) => {
 			var self = this;
 			var s = getApp();
-			s.getConfig(function(t) {
-			  if (t.store_tel == undefined) {
-			    getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-			      isShowLoading: 1,
-			      data: {},
-			      success: function(rs) {
-			        getApp().globalData.config = rs.data.data;
-			        if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-			          getApp().showWarning("商家未设置电话");
-			          return false;
-			        } else {
+			s.getConfig(function (t) {
+				if (t.store_tel == undefined) {
+					getApp().request.get("/api/weshop/store/get/" + os.stoid, {
+						isShowLoading: 1,
+						data: {},
+						success: function (rs) {
+							getApp().globalData.config = rs.data.data;
+							if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+								getApp().showWarning("商家未设置电话");
+								return false;
+							} else {
 								self.setData({
 									store_tel: rs.data.data.store_tel,
 								});
 								// s.confirmBox("客服热线：" + rs.data.data.store_tel);
 							};
-			        
-			      }
-			    })
-			  } else {
+
+						}
+					})
+				} else {
 					self.setData({
 						store_tel: t.store_tel,
 					});
-			    // s.confirmBox("客服热线：" + t.store_tel);
-			  }
+					// s.confirmBox("客服热线：" + t.store_tel);
+				}
 				resolve();
 			});
 		});
 	},
-	
-
-  go_info: function() {
-    getApp().goto("/pages/user/userinfo/userinfo");
-  },
-
-  jump: function() {
-    getApp().goto("/pages/user/grow_value/grow_value")
-  },
-  // 判断生日营销的页面是不是存在
-  birthday: function() {
-
-    var th = this;
-    rq.get("/api/weshop/marketing/birthday/act/judge", {
-      data: { storeId: os.stoid, userId: app_d.user_id },
-      success: function (res) {
-
-        var code = res.data.code;
-        if (code == 0) {
-          var giftbagid = res.data.data.giftBagId;
-          var actId = res.data.data.id;
-          var actImg = res.data.data.actImg;
-          th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
-          th.setData({is_banner:1});
-        }
-
-      }
-    })
-  },
-  clike_banne: function() {
-    var th = this;
-    var actId = th.data.actId;
-    var giftbagid = th.data.giftbagid;
-
-    if (actId != "" && giftbagid != "") {
-
-      getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3);
-    } else {
-
-      getApp().showWarning("请稍后重试");
-    }
-  },
-
-  // 判断助力活动是不是存在
-  is_assistance: function() {
-    var th = this,r=Math.random()*100;
-    rq.get("/api/weshop/marketing/help/act/judge", {
-      data: {
-        storeId: os.stoid,
-        userId: app_d.user_id,
-				r:r,
-      },
-      success: function(res) {
-        var code = res.data.code;
-        if (code == 0) {
-          th.setData({
-            is_assistance: 1
-          });
-        }else{
+
+
+	go_info: function () {
+		getApp().goto("/pages/user/userinfo/userinfo");
+	},
+
+	jump: function () {
+		getApp().goto("/pages/user/grow_value/grow_value")
+	},
+	// 判断生日营销的页面是不是存在
+	birthday: function () {
+
+		var th = this;
+		rq.get("/api/weshop/marketing/birthday/act/judge", {
+			data: { storeId: os.stoid, userId: app_d.user_id },
+			success: function (res) {
+
+				var code = res.data.code;
+				if (code == 0) {
+					var giftbagid = res.data.data.giftBagId;
+					var actId = res.data.data.id;
+					var actImg = res.data.data.actImg;
+					th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
+					th.setData({ is_banner: 1 });
+				}
+
+			}
+		})
+	},
+	clike_banne: function () {
+		var th = this;
+		var actId = th.data.actId;
+		var giftbagid = th.data.giftbagid;
+
+		if (actId != "" && giftbagid != "") {
+
+			getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3);
+		} else {
+
+			getApp().showWarning("请稍后重试");
+		}
+	},
+
+	// 判断助力活动是不是存在
+	is_assistance: function () {
+		var th = this, r = Math.random() * 100;
+		rq.get("/api/weshop/marketing/help/act/judge", {
+			data: {
+				storeId: os.stoid,
+				userId: app_d.user_id,
+				r: r,
+			},
+			success: function (res) {
+				var code = res.data.code;
+				if (code == 0) {
+					th.setData({
+						is_assistance: 1
+					});
+				} else {
 					th.setData({
 						is_assistance: 0
 					});
 				}
  
-      }
-    })
-  },
-
-  //导航跳转
-  nav_goto:function(e){
-  		  var url=e.currentTarget.dataset.url;
-  		  if(!url || url=='') return; 
-  		  if(url[0]!='/') url='/'+url;
-  		  getApp().goto(url);
-   },
-   
-   //添加卡包
-   addcard:function(){	   
-	   var res=this.data.add_card_data;	
-	   if(!res) return false;	
-		
-	   var arr = new Array(6)
-	   arr[0] = res.code;
-	   arr[1] = res.timestamp;
-	   arr[2] = res.jsapiTicket;
-	   arr[3] = res.openid;
-	   arr[4] = res.cardid;
-	   arr[5] = res.nonceStr;
-	   var c=arr.sort();
-	   var newstr="";
-	   for  (var i=0;i<c.length;i++)
-	   {
-	       newstr+=c[i];
-	   }
-   
-	   var sh1=	 ut.sha1(newstr);	 	 
-	   wx.addCard({
-	       cardList: [
-	       {
-	        cardId: res.cardid,
-	        cardExt: '{"code": "'+res.code+'", "openid": "'+res.openid+'","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}'
-	       }
-	   
-	       ],
-	       success: function (res) {},
-	       cancel: function (res) {}
-	   });
-   },
-
-   //订阅消息提醒
-  sendsm:function()
-    {  
-      var template_id = "";
-      rq.get("/api/wx/weappSendlist/page", {
-        data: {
-          store_id: os.stoid,
-          typeid: "1020"
-        },
-        success: function(res) {
-          if (res.data.code == 0 && res.data.data.pageData.length > 0) {
-            template_id = res.data.data.pageData[0].template_id;
-              // //授权订阅
-            wx.requestSubscribeMessage({
-              tmplIds: [template_id],
-              success(res) {
-                
-              },
-              fail(res) {
-              
-              }
-            })
-          }
-        }
-      })   
-    },
-
-    con_weixin:function () {
-        getApp().con_wx(this);
-    },
-
-    //初始话按钮图标
-    init_user_tool:async function () {
-        var d_list=null;
-        //读取user_tool按钮图标
-        await  getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, {
-        }).then(res=>{
-            if(ut.ajax_ok(res)) {
-                d_list=res.data.data.pageData;
-            }
-        })
-        if(!d_list) return false;
-        //过滤掉分销关闭的
-        await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
-           if(rs.data.code==0){
-               var dis=rs.data.data;
-               for(var i in d_list){
-                   if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){
-                       d_list.splice(i,1);
-                   }
-               }
-           }
-        })
-
-        //判断右没有开AI测肤
-        await getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+os.stoid,{}).then(rs=>{
-            if(rs.data.code!=0 || !rs.data.data){
-                for(var i in d_list){
-                    if(d_list[i].name=='AI测肤'){
-                        d_list.splice(i,1);
-                    }
-                }
-            }
-        })
-        this.setData({user_tool:d_list});
-    },
-
-
-    click_contact:function () {
-        getApp().globalData.no_clear=1;
-    },
+			}
+		})
+	},
+
+	//导航跳转
+	nav_goto: function (e) {
+		var url = e.currentTarget.dataset.url;
+		if (!url || url == '') return;
+		if (url[0] != '/') url = '/' + url;
+		getApp().goto(url);
+	},
+
+	//添加卡包
+	addcard: function () {
+		var res = this.data.add_card_data;
+		if (!res) return false;
+
+		var arr = new Array(6)
+		arr[0] = res.code;
+		arr[1] = res.timestamp;
+		arr[2] = res.jsapiTicket;
+		arr[3] = res.openid;
+		arr[4] = res.cardid;
+		arr[5] = res.nonceStr;
+		var c = arr.sort();
+		var newstr = "";
+		for (var i = 0; i < c.length; i++) {
+			newstr += c[i];
+		}
+
+		var sh1 = ut.sha1(newstr);
+		wx.addCard({
+			cardList: [
+				{
+					cardId: res.cardid,
+					cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}'
+				}
+
+			],
+			success: function (res) { },
+			cancel: function (res) { }
+		});
+	},
+
+	//订阅消息提醒
+	sendsm: function () {
+		var template_id = "";
+		rq.get("/api/wx/weappSendlist/page", {
+			data: {
+				store_id: os.stoid,
+				typeid: "1020"
+			},
+			success: function (res) {
+				if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+					template_id = res.data.data.pageData[0].template_id;
+					// //授权订阅
+					wx.requestSubscribeMessage({
+						tmplIds: [template_id],
+						success(res) {
+
+						},
+						fail(res) {
+
+						}
+					})
+				}
+			}
+		})
+	},
+
+	con_weixin: function () {
+		getApp().con_wx(this);
+	},
+
+	//初始话按钮图标
+	init_user_tool: async function () {
+		var d_list = null;
+		//读取user_tool按钮图标
+		await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, {
+		}).then(res => {
+			if (ut.ajax_ok(res)) {
+				d_list = res.data.data.pageData;
+			}
+		})
  
-		//打开客服操作菜单
-		openCS() {
-			// 判断会员状态
-			let user_info = getApp().globalData.userInfo;
-			if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
-				wx.navigateTo({
-						url: '/pages/togoin/togoin',
-				})
-				return false;
-			};
-			// csType/在线客服设置：
-			// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
-			// 1小程序客服、
-			// 2企业微信客服
-			if(this.data.sys_switch) {
-				let csType = this.data.sys_switch.weapp_customertype;
-				if(csType == 0) {
-					// 拨打电话号码
-					this.contactService();
-				} else {
-					this.getTel()
+		if (!d_list) return false;
+		//过滤掉分销关闭的
+		let distribut_end_time = await getApp().user_tools_endTime(2);//过滤掉分销到期的
+		await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => {
+			if (rs.data.code == 0) {
+				var dis = rs.data.data;
+				for (var i in d_list) {
+					if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0) || (d_list[i].name == '我的分销' && !distribut_end_time)) {
+						d_list.splice(i, 1);
+					}
+				}
+			}
+		})
+
+		//判断有没有开AI测肤
+		await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => {
+			if (rs.data.code != 0 || !rs.data.data) {
+				for (var i in d_list) {
+					if (d_list[i].name == 'AI测肤') {
+						d_list.splice(i, 1);
+					}
+				}
+			}
+		})
+		this.setData({ user_tool: d_list });
+	},
+
+
+	click_contact: function () {
+		getApp().globalData.no_clear = 1;
+	},
+
+	//打开客服操作菜单
+	openCS() {
+		// 判断会员状态
+		let user_info = getApp().globalData.userInfo;
+		if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+			wx.navigateTo({
+				url: '/pages/togoin/togoin',
+			})
+			return false;
+		};
+		// csType/在线客服设置：
+		// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
+		// 1小程序客服、
+		// 2企业微信客服
+		if (this.data.sys_switch) {
+			let csType = this.data.sys_switch.weapp_customertype;
+			if (csType == 0) {
+				// 拨打电话号码
+				this.contactService();
+			} else {
+				this.getTel()
 					.then(() => {
 						self.setData({
 							hiddenCS: false,
 						});
 					});
-				};
 			};
-			
-		},
-		
-		//关闭客服操作菜单
-		closeCS() {
-			this.setData({
-				hiddenCS: true,
-			});
-		},
+		};
+
+	},
+
+	//关闭客服操作菜单
+	closeCS() {
+		this.setData({
+			hiddenCS: true,
+		});
+	},
  
  
  
@@ -39,7 +39,8 @@
  
 		    <view class="flex-center fs24 itemCount">
 		      <view>剩余次数：</view>
-		      <view>{{item.ObtainTimes}}</view>
+		      <view wx:if="{{item.DisplayQty==true || DisplayQty==1}}">无限次</view>
+					<view wx:else>{{item.ObtainTimes}}</view>
 		    </view>
  
 		    <view class="flex-center fs24 itemEffective">
@@ -464,7 +464,7 @@ Page({
                     }
                 })
                 if(is_g_prom){
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
+                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
                         if (res.data.code == 0) {
                             var r_data = res.data.data;
                             if (!r_data.collocationPromList && good.prom_type == 5) {
@@ -585,7 +585,7 @@ Page({
                           //不是赠品的时候
 				  	      if(!good.is_gift && good.prom_type!=3){
 							  var t_ok=1;
-							  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+							  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0"+"/"+getApp().globalData.user_id, {}).then(res => {
 								  if(res.data.code==0){
 									  var r_data=res.data.data;
 									  //-- 参加了全局的优惠活动 --
@@ -1047,7 +1047,7 @@ Page({
 				})
  
 				//调用接口判断订单优惠，
-				const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {})
+				const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0"+"/"+getApp().globalData.user_id, {})
 				if (res.data.code == 0 && res.data.data) {
 						var r_data = res.data.data;
 						if (r_data.ladderLists) {
@@ -1215,7 +1215,7 @@ Page({
                       }
                   })
                   if(is_g_prom) {
-                      await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
+                      await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => {
                           if (res.data.code == 0) {
                               var r_data = res.data.data;
                               if (r_data.promGoodsLists) {
@@ -717,7 +717,7 @@ Page({
                     }
                 })
                 if(is_g_prom){
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
+                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
                         if (res.data.code == 0) {
                             var r_data = res.data.data;
                             if (!r_data.collocationPromList && good.prom_type == 5) {
@@ -838,7 +838,7 @@ Page({
                 else {
                     if (!good.is_gift && good.prom_type != 3) {
                         var t_ok = 1;
-                        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
+                        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
                             if (res.data.code == 0) {
                                 var r_data = res.data.data;
                                 //-- 参加了全局的优惠活动 --
@@ -1457,7 +1457,7 @@ Page({
                         }
                     })
                     if(is_g_prom) {
-                        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
+                        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => {
                             if (res.data.code == 0) {
                                 var r_data = res.data.data;
                                 if (r_data.promGoodsLists) {