Merge branch 'test' into 'qa'

Test See merge request !1056

Merge branch 'test' into 'qa'
Test See merge request !1056
后端研发-苏明海
2 parents 91a93a88 de1859cb
Showing 41 changed files with 1335 additions and 331 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/jfbuy/jfbuy.js
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStreamDetails/liveStreamDetails.js
packageA/pages/profile/profile.js
packageA/pages/prom_list/prom_list.js
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/preindex/index.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -534,8 +534,8 @@
     <!-- 列表显示 -->
     <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
         <block wx:for="{{goods_array}}">
-            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}">
+            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}">
+                <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}">
                     <view class='zs_top_x'>
                         <block wx:if="{{object.big_order_type==3}}">
                             <view style="position: relative; width: 100%; height: 100%">
@@ -567,9 +567,8 @@
                             <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
-
                     <view class='zs_center_x'>
-                        <view class='zs_wz1_x ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                        <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                         <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
                             <block wx:if="{{item.prom_price || item.prom_integral}}">
@@ -698,7 +697,6 @@
 												</view>
                     </view>
-
                 </view>
             </navigator>
         </block>
@@ -139,7 +139,7 @@
   border-bottom: 2rpx #eee solid;
   /* padding: 10rpx; */
   background-color: white;
-	padding: 20rpx;
+	margin: 20rpx;
 	/* background-color: pink; */
 	box-sizing: border-box;
 }
@@ -149,7 +149,7 @@
   min-height: 300rpx;
   display: flex;
   /* border-bottom: 2rpx #eee solid; */
-  padding: 10rpx;
+  margin: 10rpx;
   background-color: white;
 }
@@ -901,6 +901,10 @@ top: 10rpx;
 	border-radius: 40rpx;
 }
+.zs_goods_xiao_wai{ padding-top:1rpx }
+.s1_gk_a1.list_border{ display: block; border-bottom: 1rpx solid #eee}
+
+
@@ -2932,14 +2932,38 @@ Page({
 	onShareTimeline() {
         getApp().globalData.no_clear=1
-		var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
-		if(!store_name)
-		   store_name=getApp().globalData.setting.appName;
-		
-		return {
-			title:this.data.data.goods_name + '-' + store_name,
-			imageUrl:this.data.gallery[0].image_url,
-		}
+
+        var th = this;
+        var price = th.data.data.shop_price;
+        if (th.data.prom_act) {
+            price = th.data.prom_act.price;
+
+        }
+        var title= th.data.data.goods_name;
+        var img=th.data.data.original_img;
+        if(th.data.prom_type==6){
+            title=th.data.prom_act.share_title;
+            img=th.data.iurl+th.data.prom_act.share_imgurl;
+        }
+
+        var url="goods_id=" + th.data.gid;
+        if(getApp().globalData.user_id) {
+            url+="&first_leader="+getApp().globalData.user_id;
+        }
+
+        //-- 如果房间分享，且不是会员分享的 --
+        if(getApp().globalData.room_id &&
+            th.data.data.goods_id==getApp().globalData.room_goods_id &&
+            !getApp().globalData.room_user_share
+        ){
+            url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1";
+        }
+
+        return {
+            title:price + "元  " +title,
+            imageUrl:img,
+            query: url
+        }
 	},
@@ -267,23 +267,21 @@ Page({
 	  // }
   },
-	
-	
-	onShareTimeline() {
-   	    getApp().globalData.no_clear=1;
-		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
-		
-		var pagePath = this.route; //当前页面url
-		
-		if(!store_name) store_name = getApp().globalData.setting.appName;
-		if(pagePath.indexOf('/') != 0) {
-		  pagePath = '/' + pagePath;
-		}
-		return {
-		  title: store_name + '-积分购',
-		  path: pagePath,
-		}
-	},
+
+
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+        if(!store_name) store_name = getApp().globalData.setting.appName;
+
+        return {
+            title: store_name + '-积分购',
+            query: 'first_leader='+user_id
+        }
+    },
 	//-- 点击tab --
@@ -365,23 +365,18 @@ Page({
     }
   },
-  onShareTimeline: function (res) {
-   	getApp().globalData.no_clear=1;
-    if (res.from === 'button') {
-      // 来自页面内转发按钮
-      // console.log(res.target)
-    }
-    return {
-      title: '直播列表'
-      // path: '/page/user?id=123'
-    }
-  },
-	
-	
-	
-	
-	
+   onShareTimeline: function (res) {
+        getApp().globalData.no_clear=1;
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: '直播列表',
+            query: 'first_leader='+user_id
+        }
+    },
+
 	/**
 	 * 请求数据
 	 */
@@ -630,17 +630,17 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
     }
   },
-  onShareTimeline: function (res) {
-      getApp().globalData.no_clear=1;
-    if (res.from === 'button') {
-      // 来自页面内转发按钮
-      console.log(res.target)
-    }
-    return {
-      title: this.data.details.name
-      // path: '/page/user?id=123'
-    }
-  },
+    onShareTimeline: function (res) {
+        getApp().globalData.no_clear=1;
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: this.data.details.name,
+            query: 'first_leader='+user_id+"&id="+this.data.id
+        }
+    },
 	imageResize(imgWidth, imgHeight) { 
@@ -1126,10 +1126,10 @@ Page({
 			if(this.data.reg_info.introducer_state){
 				let tjrname = this.data.referee;
 				if (tjrname == "" || tjrname == null) {
-				  app.my_warnning("请输入推荐人", 0, this);
-				  return false;
+				  //app.my_warnning("请输入推荐人", 0, this);
+				  //return false;
 				};
-				data.tjrname=tjrname;						
+				if(tjrname) data.tjrname=tjrname;
 			}
 	    	//-- 需要姓名 --
@@ -1150,7 +1150,6 @@ Page({
 			   };
 			   data.sex=sex;
 			}
-			
 			//需要生日
 			if(this.data.reg_info.birthday_state){
 				let birthday = this.data.datet;
@@ -234,7 +234,6 @@ Page({
     				}
     				t.data.data.gg = gg;
-
     				//--看一下有没有开启等级卡---
     				if (ee.data.rank_switch) {
     					//---回调卡的列表---
@@ -468,18 +468,19 @@ Page({
     onShareTimeline() {
         getApp().globalData.no_clear=1;
         var title = this.data.act.name;
-        var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
-        if (getApp().globalData.user_id) {
-            url += "&first_leader=" + getApp().globalData.user_id;
-        }
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
         var ob = {
             title: title,
-            path: url,
+            query: 'first_leader='+user_id+"&id=" + this.data.act.id
         };
         if (this.data.act.img_url)
             ob.imageUrl = this.data.iurl + this.data.act.img_url;
         return ob;
     },
+
     /**
      * 点击规则详情,弹出规则
      */
@@ -470,18 +470,19 @@ Page({
     onShareTimeline() {
         getApp().globalData.no_clear=1;
         var title = this.data.act.name;
-        var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
-        if (getApp().globalData.user_id) {
-            url += "&first_leader=" + getApp().globalData.user_id;
-        }
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
         var ob = {
             title: title,
-            path: url,
+            query: 'first_leader='+user_id+"&id=" + this.data.act.id
         };
         if (this.data.act.img_url)
             ob.imageUrl = this.data.iurl + this.data.act.img_url;
         return ob;
     },
+
     /**
      * 点击规则详情,弹出规则
      */
@@ -1619,7 +1619,11 @@ Page({
                                         break;
                                     case 1:
                                         //order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                        order_prom_amount = ord_prom['expression'];
+                                        var bs=1;
+                                        if(ord_prom.is_bz){
+                                             bs=Math.floor(o_condition/ord_prom.money);
+                                        }
+                                        order_prom_amount = bs*ord_prom['expression'];
                                         break;
                                 }
                             }
@@ -1976,8 +1980,13 @@ Page({
                                         order_prom_amount = (o_condition - order_m).toFixed(2);
                                         break;
                                     case 1:
-                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                        order_prom_amount = ord_prom['expression'];
+
+                                        var bs=1;
+                                        if(ord_prom.is_bz){
+                                            bs=Math.floor(o_condition/ord_prom.money);
+                                        }
+                                        order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = bs*ord_prom['expression'];
                                         break;
                                 }
                             }
@@ -242,6 +242,20 @@ Page({
 				var gd = t.data.data;
 				if (!gd) return false;
+                //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+                if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
+                    getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+                        if(res.data.code==0){
+                            var pk=res.data.data;
+                            if(pk && pk.is_same_city){
+                                th.setData({show_same_city:1})
+                            }}
+
+                    })
+
+                }
+
+
 				t.data.data.original_img = oo.imghost + t.data.data.original_img;
 				t.data.data['buynum'] = gg.goods_num;
 				// console.log(t.data.data);
@@ -406,12 +420,14 @@ Page({
 			th.data.json_d = json_d;
 			th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
 			var is_default_logistics = json_d.is_default_logistics;
+            var is_same_city = json_d.is_same_city;
 			th.setData({
 				is_close_quan: json_d.is_close_quan,
 				sales_rules: ee.sales_rules,
 				rank_switch: json_d.rank_switch,
-				is_default_logistics: is_default_logistics
+				is_default_logistics: is_default_logistics,
+                is_same_city: is_same_city
 			});
 			var rank_switch = json_d.rank_switch;
@@ -499,9 +515,7 @@ Page({
 		console.log('calculatePrice2');
 		var th = this,
 			good = this.data.bn_goods;
-			
-		th.setData({is_show_sub:0});	
-			
+
 		//-----------计算商品总价--------------
 		var allpice = th.data.param.goods_price;
 		allpice = parseFloat(allpice).toFixed(2);
@@ -510,6 +524,8 @@ Page({
 			[txt]: allpice,
 		});
+		this.setData({sub:1});
+
 		wx.showLoading({
             title: "处理中.",
             mask:true
@@ -544,8 +560,9 @@ Page({
                         let item = gd_arr_list[i];
                         if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                            if (goods_weight < 0) goods_weight = 0;
+
 							if (item['exp_sum_type'] == 2) {
+                                if (goods_weight < 0) goods_weight = 0;
 								goods_weight += item['weight'] * item['buynum'];
                                 cut_good_weight += item['weight'] * item['buynum'];
                             }
@@ -611,7 +628,7 @@ Page({
                         wx.showToast({
                             title: "计算物流错误", icon: 'none',duration: 2000
                         })
-                        th.setData({ show_submit:0 });
+                        th.setData({ show_submit:0,sub:0 });
                         wx.hideLoading();
                     }
@@ -622,12 +639,62 @@ Page({
 						[wl_txt]: shipping_price,
 					})
-				} else {
+				} else if(th.data.bn_exp_type==1) {
 					var wl_txt = "formData.shipping_price";
 					th.setData({
 						[wl_txt]: 0,
 					})
 				}
+
+
+				//判断是否同城配送,而且没有调用过
+				if(th.data.bn_exp_type==2 && th.data.user_addr) {
+
+					var lon=0;var lat=0;
+					//-- 获取距离  --
+					await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+						is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+					}).then(res=>{
+						if(res.data.code==0){
+							var data= JSON.parse(res.data.data);
+							if(data.status==0){
+								lon=data.result.location.lng;
+								lat=data.result.location.lat;
+							}
+						}
+					})
+
+
+					var gd_w = good['weight'] * good['buynum'];
+					//-- 获取距离  --
+					var req_data = {
+						store_id: os.stoid,
+						order_amount:th.data.param.goods_price,
+						lon: lon, lat: lat,
+						pickup_id: th.data.bn_pick,
+						goods_weight: gd_w
+					}
+
+					var is_next=1;
+					//获取同城配送参数
+					await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+						is_json: 1,
+						data: req_data
+					}).then(res => {
+						if (res.data.code == 0) {
+							var wl_txt = "formData.shipping_price";
+							th.setData({ [wl_txt]: res.data.data, })
+						}else{
+							is_next=0;
+							wx.showToast({
+								title: res.data.msg, icon: 'none',  duration: 2000
+							})
+						}
+					})
+					if(!is_next) return false
+				}
+
+
 				//-----------------总价-----------------
 				// 幸运购 01
 				// var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price);
@@ -648,7 +715,7 @@ Page({
 						th.setData({
 							[txt]: total_m,
 							[txt2]: 0,
-                            is_show_sub:1
+                            is_show_sub:1,sub:0
 						})
 					} else {
 						order_m = parseFloat(order_m) - parseFloat(th.data.yuer);
@@ -656,14 +723,14 @@ Page({
 						th.setData({
 							[txt]: th.data.yuer,
 							[txt2]: order_m,
-                            is_show_sub:1
+                            is_show_sub:1,sub:0
 						})
 					}
 				} else {
 					th.setData({
 						[txt]: 0,
 						[txt2]: order_m,
-                        is_show_sub:1
+                        is_show_sub:1,sub:0
 					})
 				}
                 wx.hideLoading();
@@ -10,6 +10,11 @@
 					<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" 
 					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+
+                    <!-- 同城配送 -->
+                    <block wx:if="{{show_same_city}}">
+                        <view hidden="{{bn_t_exp_t==3}}" bindtap='setexptype' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+                    </block>
 			</view>
 		</view>
@@ -160,7 +165,7 @@
 					<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
 					<!-- <view class="co-red big"></view> -->
 			</view>
-			<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+			<button disabled="{{sub}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
      </view>
 </form>
@@ -528,8 +528,9 @@ Page({
     });
     //更新点击量
-    getApp().request.put("/api/weshop/goods/updateClick", {
-      data: { store_id: os.stoid, goods_id: gid }
+    //noinspection JSUnresolvedFunction
+      getApp().request.put("/api/weshop/goods/updateClick", {
+      data: { store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 }
     });
@@ -2450,14 +2451,15 @@ Page({
     if (pagePath.indexOf('/') != 0) {
       pagePath = '/' + pagePath;
     }
-    // if(getApp().globalData.user_id){
-    //     if(pagePath.indexOf("?")>0){
-    //         pagePath+="&first_leader="+getApp().globalData.user_id;
-    //     }else{
-    //         pagePath+="?first_leader="+getApp().globalData.user_id;
-    //     }
-    // }
+    if(getApp().globalData.user_id){
+        if(pagePath.indexOf("?")>0){
+            pagePath+="&first_leader="+getApp().globalData.user_id;
+        }else{
+            pagePath+="?first_leader="+getApp().globalData.user_id;
+        }
+    }
+
     return {
       title: "邀您一起参加幸运购",
       path: pagePath,
@@ -6197,12 +6199,19 @@ Page({
   onShareTimeline() {
       getApp().globalData.no_clear=1;
-    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-    if (!store_name)
-      store_name = getApp().globalData.setting.appName;
+      var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+      if (!store_name)
+          store_name = getApp().globalData.setting.appName;
+
+      var pagePath = `goods_id=${this.data.sele_g.goods_id}&prom_type=9&group_id=${this.data.group_id}`; //当前页面url
+      if(getApp().globalData.user_id){
+          pagePath+="&first_leader="+getApp().globalData.user_id;
+      }
+
     return {
       title: this.data.data.goods_name + '-' + store_name,
       imageUrl: this.data.gallery[0].image_url,
+        query: pagePath
     }
   },
@@ -205,12 +205,14 @@ Page({
             th.data.json_d = json_d;
             th.data.ispt_goods = json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
             var is_default_logistics = json_d.is_default_logistics;
+            var is_same_city = json_d.is_same_city;
             th.setData({
                 is_close_quan: json_d.is_close_quan,
                 sales_rules: ee.sales_rules,
                 rank_switch: json_d.rank_switch,
                 is_default_logistics: is_default_logistics,
+                is_same_city: is_same_city,
                 sys_switch: json_d,
             });
@@ -500,6 +502,21 @@ Page({
             order.show_img = oo.imghost + goods.original_img;
         });
+        //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+        if(goods.is_same_city && th.data.is_same_city && goods.whsle_id<=0){
+
+            getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}).then(res=>{
+                if(res.data.code==0){
+                    var pk=res.data.data;
+                    if(pk && pk.is_same_city){
+                        th.setData({show_same_city:1})
+                    }
+                }
+
+            })
+
+        }
+
         var g_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + order_goods.goods_id + "&pre_id=" + pre_arr.id;
         if (act.is_end || th.data.act.end_time < ut.gettimestamp()) {
@@ -590,6 +607,11 @@ Page({
                 break; //物流
         }
+        if (th.data.exp_type) {
+            exp_type=th.data.exp_type
+        }
+
+
         //等待发货的时候
         if (th.data.wait_fh) {
             var send_time = th.data.act.delivery_date;
@@ -626,15 +648,19 @@ Page({
     },
-    async calculatePrice2() {
+   async calculatePrice2() {
         var th = this;
         if (!this.data.pre_arr) return false;
-		th.setData({ show_submit: 0,})
+		th.setData({ show_submit: 0,disabled_btn:0})
         //--计算物流--
         if (this.data.exp_type == 0) {
             this.calculate_wuliu();
-        } else {
+        }else   if (this.data.exp_type == 2) {
+            this.calculate_same_city();
+        }
+
+        else {
             var allpice = this.data.pre_arr.presell_price * this.data.order_goods.goods_num;
             allpice = allpice.toFixed(2);
             //--看一下有没有订单优惠--
@@ -698,8 +724,14 @@ Page({
                                     order_prom_amount = (all_1 - o_condition1).toFixed(2);
                                     break;
                                 case 1:
-                                    o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
+
+                                    var bs=1;
+                                    if(ord_prom.is_bz){
+                                        bs=Math.floor(o_condition/ord_prom.money);
+                                    }
+
+                                    o_condition1 = ord_price - bs*ord_prom['expression'];//满额优惠金额
+                                    order_prom_amount = bs*ord_prom['expression'];
                                     break;
                             }
                         }
@@ -1824,8 +1856,9 @@ Page({
                             let item = gd_arr_list[i];
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                if (goods_weight < 0) goods_weight = 0;
+
                                 if (item['exp_sum_type'] == 2) {
+                                    if (goods_weight < 0) goods_weight = 0;
                                     goods_weight += item['weight'] * item['buynum'];
 								 	cut_good_weight += item['weight'] * item['buynum'];
                                 }
@@ -1908,6 +1941,68 @@ Page({
                 }
             //});
     },
+    async calculate_same_city() {
+        var th = this,
+            good = th.data.goods,
+            quan_price = 0,
+            exp_price = 0;
+
+                var quan_no = null;
+                var bn_pick = th.data.pickup.pickup_id;
+                var allpice = th.data.all_price;
+
+                good.buynum=th.data.order.order_goods.goods_num;
+
+                if (th.data.using_quan[bn_pick] != null && th.data.using_quan[bn_pick] != undefined)
+                    quan_no = th.data.using_quan[bn_pick].coupon_no;
+
+                if (quan_no) {
+                    if (th.data.using_quan[bn_pick].isby != 1) {
+                        //---获取优惠券优惠---
+                        await getApp().request.promiseGet("/api/weshop/couponList/getUseCouponPrice", {
+                            data: {
+                                storeId: oo.stoid,
+                                CashRepNo: quan_no,
+                                WaresSum: th.data.ckeck_quan_price,
+                                WareIds: th.data.check_quan_ware_list
+                            }
+                        }).then(res => {
+                            if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                                quan_price = res.data.data[0].WareCashSum;
+                            }
+                        })
+
+                        if (quan_price > 0) {
+                            if (quan_price < th.data.tail_pay) th.setData({ quan_price: quan_price })
+                            else {
+                                th.setData({ quan_price: th.data.tail_pay })
+                                quan_price = th.data.tail_pay;
+                            }
+                        } else {
+                            th.setData({ quan_price: 0 })
+                        }
+                    } else {
+                        th.setData({ quan_price: 0 })
+                    }
+                } else {
+                    th.setData({ quan_price: 0 })
+                }
+
+                //-----------当地址不为空，且是物流时，计算物流费用----------
+                if (th.data.user_addr != null) {
+                    th.wuliu_next(allpice, quan_price, 0);
+                } else {
+                    wx.showToast({
+                        title: '请先选择收货地址', icon: 'none',  duration: 2000
+                    })
+                    return false;
+                }
+            //});
+    },
+
+
+
+
     //相同的东西统一在一起
     wuliu_next(allpice, quan_price, exp_price) {
         var th = this;
@@ -1915,7 +2010,7 @@ Page({
         if (o_condition < 0) o_condition = 0;
         //如果同意参与订单优惠
         if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
-            th.check_is_order_prom(o_condition, function (ord_price) {
+            th.check_is_order_prom(o_condition,async function (ord_price) {
                 var bn_pick = th.data.pickup.pickup_id
                 var order_prom_amount = 0;
                 var order_prom_id = 0;
@@ -1950,9 +2045,59 @@ Page({
                     th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
                 }
+                if(th.data.exp_type == 2) {
+                    var good = th.data.goods;
+                    //--------------开始计算物流------------------
+                    var shipping_price = 0;
+                    var lon = 0;
+                    var lat = 0;
+                    //-- 获取距离  --
+                    await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                        is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address}
+                    }).then(res => {
+                        if (res.data.code == 0) {
+                            var data = JSON.parse(res.data.data);
+                            if (data.status == 0) {
+                                lon = data.result.location.lng;
+                                lat = data.result.location.lat;
+                            }
+                        }
+                    })
+                    var gd_w = good['weight'] * good['buynum'];
+                    //-- 获取距离  --
+                    var req_data = {
+                        store_id: os.stoid,
+                        order_amount: parseFloat(ord_price),
+                        lon: lon, lat: lat,
+                        pickup_id: bn_pick,
+                        goods_weight: gd_w
+                    }
+
+                    var is_next = 1;
+                    //获取同城配送参数
+                    await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+                        is_json: 1,
+                        data: req_data
+                    }).then(res => {
+                        if (res.data.code == 0) {
+                            shipping_price = res.data.data;
+                        } else {
+                            is_next = 0;
+                            wx.showToast({
+                                title: res.data.msg, icon: 'none', duration: 2000
+                            })
+                        }
+                    })
+                    if (!is_next) {
+                        th.setData({show_submit: 1, disabled_btn: 1})
+                        return false
+                    }
+                    exp_price = parseFloat(shipping_price).toFixed(2);
+                }
                 ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit);
                 if (ord_price < 0) ord_price = 0;
+
                 th.setData({ exp_price: exp_price, order_m: ord_price + parseFloat(exp_price), show_submit: 1, })
             })
@@ -2,7 +2,7 @@
 <wxs src="filter.wxs" module="util"></wxs>
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
-<form bindsubmit="submitForm" wx:if="{{show_submit}}">
+<form bindsubmit="submitForm">
     <view class="container">
         <!-- 支付进度 -->
         <view class="information bdr14 mgt20">
@@ -120,6 +120,12 @@
                       class="tab {{exp_type== 0 ? 'active':''}}"
                       data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄
                 </view>
+
+                <!-- 同城配送 -->
+                <block wx:if="{{show_same_city}}">
+                    <view  bindtap='set_wuliu' data-type='2' class="tab {{exp_type== 2 ? 'active':''}}"
+                           data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+                </block>
             </view>
             <!----要进行判断地址是否显示---->
             <view bindtap="enterAddressPage" class="user-mes mgt20"
@@ -359,7 +365,7 @@
             请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消
         </view>
-        <view class="btn-wrap">
+        <view class="btn-wrap" hidden="{{disabled_btn}}">
             <view class="pay-amount">
                 <view class="payable">应付金额：
                     <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
@@ -153,9 +153,7 @@ Page({
     //----------子页返回父页触发----------
     onShow: function () {
         var th = this;
-        th.setData({ show_submit: 0 }); //让提交先掩藏
         th.data.g_cart_q_time = null;
-
         if (th.data.isclose == 0) {
             wx.navigateTo({
                 url: "/pages/index/index/index"
@@ -217,12 +215,14 @@ Page({
             th.data.json_d = json_d;
             th.data.ispt_goods = json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
             var is_default_logistics = json_d.is_default_logistics;
+            var is_same_city = json_d.is_same_city;
             th.setData({
                 is_close_quan: json_d.is_close_quan,
                 sales_rules: ee.sales_rules,
                 rank_switch: json_d.rank_switch,
-                is_default_logistics: is_default_logistics
+                is_default_logistics: is_default_logistics,
+                is_same_city: is_same_city
             });
             var rank_switch = json_d.rank_switch;
@@ -384,6 +384,21 @@ Page({
                 var gd = t.data.data;
                 if (!gd) return false;
+                //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+                if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
+
+                    getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+th.data.gg.pick_id, {}).then(res=>{
+                        if(res.data.code==0){
+                            var pk=res.data.data;
+                            if(pk && pk.is_same_city){
+                                th.setData({show_same_city:1})
+                            }
+                        }
+
+                    })
+
+                }
+
                 t.data.data.original_img = oo.imghost + t.data.data.original_img;
                 t.data.data['buynum'] = th.data.gg.goods_num;
                 var distr_t = 0, et = 0
@@ -581,6 +596,8 @@ Page({
             return false;
         }
+        th.setData({dis_btn:1})
+
         wx.showLoading({
             title: "处理中.",mask:true
         })
@@ -699,8 +716,9 @@ Page({
                             let item = gd_arr_list[i];
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                if (goods_weight < 0) goods_weight = 0;
+
                                 if (item['exp_sum_type'] == 2) {
+                                     if (goods_weight < 0) goods_weight = 0;
                                      cut_good_weight += item['weight'] * item['buynum'];
 									 goods_weight += item['weight'] * item['buynum'];
@@ -785,7 +803,7 @@ Page({
                     var wl_txt = "formData.shipping_price";
                     th.setData({[wl_txt]: shipping_price,})
-                } else {
+                } else if(th.data.bn_exp_type==1) {
                     var wl_txt = "formData.shipping_price";
                     th.setData({ [wl_txt]: 0, })
                 }
@@ -807,8 +825,11 @@ Page({
                 }
                 //--看一下有没有订单优惠--
                 var o_condition = parseFloat(order_m);
+
+
+
                 if (o_condition > 0 && th.data.act.is_useorderyh) {
-                    th.check_is_order_prom(o_condition, function () {
+                    th.check_is_order_prom(o_condition, async function () {
                         var order_prom_amount = 0;
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick]) {
@@ -821,8 +842,14 @@ Page({
                                         order_prom_amount = (o_condition - order_m).toFixed(2);
                                         break;
                                     case 1:
-                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                        order_prom_amount = ord_prom['expression'];
+
+                                        var bs=1;
+                                        if(ord_prom.is_bz){
+                                            bs=Math.floor(o_condition/ord_prom.money);
+                                        }
+
+                                        order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = bs*ord_prom['expression'];
                                         break;
                                 }
                             }
@@ -834,6 +861,55 @@ Page({
                             th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount })
                         }
+                        //判断是否同城配送,而且没有调用过
+                        if(th.data.bn_exp_type==2 && th.data.user_addr) {
+
+                            var lon=0;var lat=0;
+                            //-- 获取距离  --
+                            await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                                is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+                            }).then(res=>{
+                                if(res.data.code==0){
+                                    var data= JSON.parse(res.data.data);
+                                    if(data.status==0){
+                                        lon=data.result.location.lng;
+                                        lat=data.result.location.lat;
+                                    }
+                                }
+                            })
+
+
+                            var gd_w = good['weight'] * good['buynum'];
+                            //-- 获取距离  --
+                            var req_data = {
+                                store_id: os.stoid,
+                                order_amount: parseFloat(order_m),
+                                lon: lon, lat: lat,
+                                pickup_id: bn_pick,
+                                goods_weight: gd_w
+                            }
+
+                            var is_next=1;
+                            //获取同城配送参数
+                            await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+                                is_json: 1,
+                                data: req_data
+                            }).then(res => {
+                                if (res.data.code == 0) {
+                                    var wl_txt = "formData.shipping_price";
+                                    th.setData({ [wl_txt]: res.data.data, })
+                                }else{
+                                    is_next=0;
+                                    wx.showToast({
+                                        title: res.data.msg, icon: 'none',  duration: 2000
+                                    })
+                                }
+                            })
+                            if(!is_next) return false
+                        }
+
+
+
                         total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                         order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
@@ -851,14 +927,14 @@ Page({
                         if (th.data.bn_use_money == 1) {
                             if (amoney > order_m) {
                                 order_m = parseFloat(order_m).toFixed(2);
-                                th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 })
+                                th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                             } else {
                                 order_m = parseFloat(order_m) - parseFloat(amoney);
                                 order_m = order_m.toFixed(2);
-                                th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
+                                th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                             }
                         } else {
-                            th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
+                            th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                         }
                         //优惠活动送积分
                         if (good.s_intValue) {
@@ -889,6 +965,52 @@ Page({
                     var order_prom_txt2 = "formData.order_prom_amount";
                     th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
+
+                    //判断是否同城配送,而且没有调用过
+                    if(th.data.bn_exp_type==2 && th.data.user_addr) {
+                        var lon=0;var lat=0;
+                        //-- 获取距离  --
+                        await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                            is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+                        }).then(res=>{
+                            if(res.data.code==0){
+                                var data= JSON.parse(res.data.data);
+                                if(data.status==0){
+                                    lon=data.result.location.lng;
+                                    lat=data.result.location.lat;
+                                }
+                            }
+                        })
+
+                        var gd_w = good['weight'] * good['buynum'];
+                        //-- 获取距离  --
+                        var req_data = {
+                            store_id: os.stoid,
+                            order_amount:parseFloat(order_m),
+                            lon: lon, lat: lat,
+                            pickup_id: bn_pick,
+                            goods_weight: gd_w
+                        }
+
+                        var is_next=1;
+                        //获取同城配送参数
+                        await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+                            is_json: 1,
+                            data: req_data
+                        }).then(res => {
+                            if (res.data.code == 0) {
+                                var wl_txt = "formData.shipping_price";
+                                th.setData({ [wl_txt]: res.data.data, })
+                            }else{
+                                is_next=0;
+                                wx.showToast({
+                                    title: res.data.msg, icon: 'none',  duration: 2000
+                                })
+                            }
+                        })
+                        if(!is_next) return false
+                    }
+
                     total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                     order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
                     var atxt = "formData.total_amount";
@@ -906,14 +1028,14 @@ Page({
                     if (th.data.bn_use_money == 1) {
                         if (amoney > order_m) {
                             order_m = parseFloat(order_m).toFixed(2);
-                            th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 })
+                            th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                         } else {
                             order_m = parseFloat(order_m) - parseFloat(amoney);
                             order_m = order_m.toFixed(2);
-                            th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
+                            th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                         }
                     } else {
-                        th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
+                        th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                     }
                     //优惠活动送积分
                     if (good.s_intValue) {
@@ -13,6 +13,10 @@
 						<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" 
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+						<!-- 同城配送 -->
+						<block wx:if="{{show_same_city}}">
+							<view hidden="{{bn_t_exp_t==3}}" bindtap='setexptype' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+						</block>
 				</view>
 			</view>
@@ -239,7 +243,7 @@
 		<view class="pay-amount">
 			<view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
 		</view>
-		<button  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+		<button disabled="{{dis_btn}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
 	</view>
 </form>
@@ -580,6 +580,8 @@ Page({
       }
     })
+    this.getHistoryBuy(); //获取历史购买
+
     ee.setData({
       gallery: gallery,
       is_collect: is_collect,
@@ -3183,6 +3185,27 @@ Page({
     this.setData(ob);
   },
+  //历史购买
+  getHistoryBuy() {
+    let _this = this;
+    let req_data = {
+        store_id: os.stoid,
+        goods_id: this.data.gid,
+        pay_status: 1,
+        rndid: 1
+    };
+    getApp().request.promiseGet('/api/weshop/ordergoods/list', {
+        data: req_data,
+    })
+        .then(res => {
+            if (t.ajax_ok(res)) {
+                _this.setData({
+                    historyBuyInfo: res.data.data.pageData,
+                })
+            }
+        })
+},
+
   //--调用更新阶梯团的接口--
   update_jiti: function (id) {
     var th = this;
@@ -17,21 +17,22 @@
   <view class="goods-detail">
     <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
-    <!-- 历史购买记录 -->
-    <view class="swiper-container">
+   	<!-- 左上角轮播 历史购买记录 -->
+     <view class="swiper-container" wx:if="{{historyBuyInfo.length}}">
 					<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
-						<swiper-item class="swiper-item" wx:for="">
+						<swiper-item class="swiper-item" wx:for="{{historyBuyInfo}}" wx:key="order_id">
 							<view class="item">
                 <view class="avatar-container">
-                  <image src=""></image>
+                  <image src="{{item.head_pic}}"></image>
                 </view>
 								<view class="flex ai_c pd10">
-									<view class="nickname ellipsis-1x">abson下单成功</view>
+									<view class="nickname ellipsis-1x">{{item.nickname}}下单成功</view>
 								</view>
 							</view>
 						</swiper-item>
 					</swiper>
 				</view>
+
       <!-- 视频 -->
       <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
 	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
@@ -425,7 +425,7 @@ Page({
     });
     //更新点击量
     getApp().request.put("/api/weshop/goods/updateClick", {
-      data: { store_id: os.stoid, goods_id: gid }
+      data: { store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0  }
     })
   },
@@ -3801,17 +3801,35 @@ Page({
     getApp().pre_img(this.data.shareImgPath);
   },
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-    if (!store_name)
-      store_name = getApp().globalData.setting.appName;
-    return {
-      title: this.data.data.goods_name + '-' + store_name,
-      imageUrl: this.data.gallery[0].image_url,
-    }
-  },
+        var th=this;
+        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+        if (!store_name)
+            store_name = getApp().globalData.setting.appName;
+
+
+        var url = "goods_id=" + th.data.gid+"&pre_id="+th.data.pre_arr.id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+
+        //-- 如果房间分享，且不是会员分享的 --
+        if (getApp().globalData.room_id &&
+            th.data.data.goods_id == getApp().globalData.room_goods_id &&
+            !getApp().globalData.room_user_share
+        ) {
+            url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
+        }
+
+
+        return {
+            title: this.data.data.goods_name + '-' + store_name,
+            imageUrl: this.data.gallery[0].image_url,
+            query: url
+        }
+    },
   clickCollapse() {
     this.setData({ flag: !this.data.flag, })
@@ -28,8 +28,17 @@ Page({
 			}  
 		  }
 		});  
-		  
-        this.yuck();
+
+		if(getApp().globalData.user_id){
+            this.yuck();
+        }
+		else{
+            wx.showToast({ title: "您还未登陆，请先授权",  icon: 'none',  duration: 2000 })
+            setTimeout(function () {
+                getApp().goto("/pages/togoin/togoin");
+            },1200)
+        }
+
       },
       /*预存款的劵*/
       async yuck() {
@@ -49,7 +58,7 @@ Page({
          // var perpaid = res.data.data;
           console.log( "是什么", perpaids);
           e.setData({
-            perpaid: perpaids
+            perpaid: perpaids,is_get:1
           });
         })
@@ -85,6 +94,11 @@ Page({
     wx.setNavigationBarTitle({
       title: "流动资金转预存",
     })
+
+    if(getApp().globalData.user_id && !this.data.is_get){
+       this.yuck();
+    }
+
   },
       //确定充值
       determine: function(e) {
@@ -249,15 +249,20 @@ Page({
     }
   },
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-    if (!store_name)
-      store_name = getApp().globalData.setting.appName;
-    return {
-      title: '秒杀活动-' + store_name,
-    }
-  },
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+        if (!store_name)
+            store_name = getApp().globalData.setting.appName;
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+        return {
+            title: '拼团活动-' + store_name,
+            query: 'first_leader='+user_id
+
+        }
+    },
+
   go_url(e){
     let url=e.currentTarget.dataset.url;
     if(url){
@@ -267,15 +267,20 @@ Page({
     }
   },
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-    if (!store_name)
-      store_name = getApp().globalData.setting.appName;
-    return {
-      title: '秒杀活动-' + store_name,
-    }
-  },
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+        if (!store_name)
+            store_name = getApp().globalData.setting.appName;
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: '秒杀活动-' + store_name,
+            query: 'first_leader='+user_id
+        }
+    },
   imageLoad: function (e) {
     var imgwidth = e.detail.width;
@@ -180,7 +180,6 @@ Page({
     //----------子页返回父页触发----------
     onShow: function () {
         var th = this;
-        th.setData({ show_submit: 0 }); //让提交先掩藏
         th.data.g_cart_q_time = null;
         if (th.data.isclose == 0) {
@@ -243,12 +242,14 @@ Page({
             th.data.json_d = json_d;
             th.data.ispt_goods = json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
             var is_default_logistics = json_d.is_default_logistics;
+            var is_same_city = json_d.is_same_city;
             th.setData({
                 is_close_quan: json_d.is_close_quan,
                 sales_rules: ee.sales_rules,
                 rank_switch: json_d.rank_switch,
-                is_default_logistics: is_default_logistics
+                is_default_logistics: is_default_logistics,
+                is_same_city: is_same_city,
             });
             var rank_switch = json_d.rank_switch;
@@ -369,23 +370,20 @@ Page({
                     th.setData({ user_addr: addr });
                     //--------------------------立即购买------------------
                     if (ta.is_bnow == 1) {
-                        console.log('is_bnow');
                         //读取门店
-                        to.get_allsto(function (e) {
-                            th.setData({ allsto: e });
+                        //to.get_allsto(function (e) {
+                        //th.setData({ allsto: e });
                             //获取立即购买的商品信息
                             th.get_buy_goods(ta.goods_id);
-                        });
+                        //});
                     } else {
                         //------------------------购物车结算----------------------
                         //读取门店
-                        to.get_allsto(function (e) {
-                            th.setData({ allsto: e });
-                            //-------获取购物车已经选择的商品--------
-                            console.log('购物车结算');
-
+                        //to.get_allsto(function (e) {
+                        //th.setData({ allsto: e });
+                        //-------获取购物车已经选择的商品--------
                             th.get_cart();
-                        })
+                        //})
                     }
                 });
@@ -421,6 +419,25 @@ Page({
                 //按门店分类的数组
                 var arr = new Array();
                 var carr = su.data.data.pageData;
+
+                th.setData({ is_all_zt: 1 });
+
+                //-- 找出所有的门店 --
+                var pick_id_arr=[]; var len=carr.length;
+                for(var i=0;i<len;i++){
+                    if(pick_id_arr.length==0 || pick_id_arr.indexOf(carr[i].pick_id)==-1)
+                        pick_id_arr.push(carr[i].pick_id);
+                }
+                var req_d={
+                    store_id:os.stoid,ids:pick_id_arr.join(',')
+                }
+                //-- 获取门店的列表 --
+                await getApp().request.promiseGet("/api/weshop/pickup/list", {data:req_d }).then(res=>{
+                  if(ut.ajax_ok(res)){
+                      th.data.allsto=res.data.data.pageData;
+                  }
+                })
+
                 th.data.cartlist_y = carr;  //存储原始购物车列表
                 th.data.in_zhact_gdmap = {};
@@ -629,7 +646,7 @@ Page({
                                     }
                                     arr[j].exp_type = e_t;
                                     if (e_t == 0) th.setData({ is_all_zt: 0 });
-                                    else if (e_t == 1) th.setData({ is_all_zt: 1 });
+                                    //else if (e_t == 1) th.setData({ is_all_zt: 1 });
                                 }
                                 //-- 把等级卡会优惠多少钱装进去 --
@@ -673,7 +690,7 @@ Page({
                         }
                         //如果是物流的话，全部自提的控制要弄成0
                         if (e_t == 0) th.setData({ is_all_zt: 0 });
-                        else th.setData({ is_all_zt: 1 });
+                        //else th.setData({ is_all_zt: 1 });
                         var narr = new Array();
                         narr.push(car_item);
@@ -702,13 +719,13 @@ Page({
                             user_money: 0,
                             total_amount: 0,
                             order_amount: 0,
-                            user_note: ""
+                            user_note: "",
+                            sto:sto
                         };
                         //-- 把等级卡会优惠多少钱装进去 --
                         if (car_item.cut_price1) ie.card_cut_price += car_item.cut_price1;
                         arr.push(ie);
-
                     }
                 }
                 //-- 如果是回退回来的情况 --
@@ -721,8 +738,7 @@ Page({
                                 ie.wind = parseInt(th.data.cartlist[kj].wind);
                                 //-- 是不是全部自提清空 --
-                                if (ie.exp_type == 0) th.setData({ is_all_zt: 0 });
-
+                                if (ie.exp_type == 0 || ie.exp_type == 2) th.setData({ is_all_zt: 0 });
                                 break;
                             }
                         }
@@ -788,11 +804,26 @@ Page({
                     ladder_calc.fir_set_arr(u_item, th);
                 }
+
+
+                //----- 判断每一个商品的配送方式，和门店的配送方式 -------
+                for(var ik=0;ik<arr.length;ik++){
+                    if(!arr[ik].sto.is_same_city) continue;
+                    var fd=arr[ik].goods.filter(function (e) {
+                       return e.is_same_city!=1 || e.whsle_id>0
+                    })
+                    if(!fd || fd.length==0){
+                        arr[ik].show_same_city=1;
+                        th.setData({is_all_zt:0})
+                    }
+                }
+
                 //深拷贝
                 th.data.old_cartlist = JSON.parse(JSON.stringify(arr));
                 th.setData({
                     cartlist: arr,
                 });
+
                 //--- 获取一下看有没有优惠券 ----
                 setTimeout(function () {
                     var frozenQuan = null;
@@ -823,6 +854,21 @@ Page({
                     var gd = t.data.data;
                     if (!gd) return false;
+                    //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+                    if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
+
+                       await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+                          if(res.data.code==0){
+                              var pk=res.data.data;
+                              if(pk && pk.is_same_city){
+                                  th.setData({show_same_city:1})
+                              }
+                          }
+
+                        })
+
+                    }
+
                     t.data.data.original_img = oo.imghost + t.data.data.original_img;
                     t.data.data['buynum'] = gg.goods_num;
                     var distr_t = 0, et = 0
@@ -972,7 +1018,6 @@ Page({
                                 if (gg.prom_type == 5) {
                                     t.data.data.prom_id = gg.prom_id;
                                     t.data.data.prom_type = 5;
-                                    // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
                                     th.is_coupon = gg.is_coupon;
                                     th.setData({
                                         is_coupon: gg.is_coupon
@@ -1006,6 +1051,12 @@ Page({
                                         if (dis_t > 0) {
                                             distr_t = dis_t;
                                         }
+
+                                        //-- 如果有一件代发的商品或者不是同城配送的配送 --
+                                        if(narr[hi].is_same_city!=1 || narr[hi].whsle_id>0){
+                                            th.setData({show_same_city:0})
+                                        }
+
                                     }
                                     //自选的时候，系统配置了默认的配送方式是物流的时候
                                     if (distr_t == 0 && th.data.json_d.pickupway && th.data.json_d.pickupway == 1) {
@@ -1464,7 +1515,7 @@ Page({
     },
     //-------------------计算订单价格-------------------
-    calculatePrice:async function (t, s) {
+    calculatePrice:async function (qfunc) {
         var th = this;
         th.setData({submit:1});
@@ -1516,6 +1567,9 @@ Page({
                 await th.get_cart_quan(c_arr);
+
+                //-- 经纬度不循环调用接口 --
+                var lon=0; var lat=0;
                 //---循环购物车---
                 for (var i in c_arr) {
                     //因为搭配购买也是再这里计算，搭配购的is_b_now==1
@@ -1526,13 +1580,14 @@ Page({
                         if (th.data.cartlist[i].check_quan_price_list) c_arr[i].check_quan_price_list = th.data.cartlist[i].check_quan_price_list;  //优惠券优惠什么商品价格
                         if (th.data.cartlist[i].check_quan_ware_list) c_arr[i].check_quan_ware_list = th.data.cartlist[i].check_quan_ware_list;    //优惠券优惠什么商品
                     } else {
-                        c_arr[i].exp_type = th.data.bn_exp_type;  //配送方式
-                        c_arr[i].wind = th.data.index;            //立即购买选择的物流
+                        c_arr[i].exp_type = th.data.bn_exp_type;   //配送方式
+                        c_arr[i].wind = th.data.index;             //立即购买选择的物流
                         //c_arr[i].=th.data.                        //立即购买的使用余额
                         if (th.data.cartlist) c_arr[i].check_quan_price_list = th.data.cartlist[i].check_quan_price_list;  //优惠券优惠什么商品价格
                         if (th.data.cartlist) c_arr[i].check_quan_ware_list = th.data.cartlist[i].check_quan_ware_list;    //优惠券优惠什么商品
                     }
+
                     var cart_item = c_arr[i];      //就是每一单的意思
                     var pickid = cart_item.pickup_id;
                     var o_price = 0;
@@ -1766,8 +1821,9 @@ Page({
                             }
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) {
-                                if (goods_weight < 0) goods_weight = 0;
+
 								if (item[j]['exp_sum_type'] == 2) {
+                                    if (goods_weight < 0) goods_weight = 0;
                                     cut_good_weight += item[j]['weight'] * item[j]['goods_num'];
 									goods_weight += item[j]['weight'] * item[j]['goods_num'];
                                 }
@@ -1847,7 +1903,7 @@ Page({
                         if (!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby != 1) {
                             if (cart_item.shipping_price == 0) th.data.is_by[pickid] = 1; //已经全场包邮，就不要选择券了
                         }
-                    } else {
+                    } else if(cart_item.exp_type==1) {
                         cart_item.shipping_price = 0;
                     }
@@ -1859,11 +1915,13 @@ Page({
                     var order_prom_amount = 0;
                     var order_prom_id = 0;
                     var o_condition = cart_item.order_amount;
+                    var t_o_condition=cart_item.order_amount;
+
+
                     //看一下是不是不用组合购的订单优惠的叠加
                     if (is_has_zh) {
                         o_condition = o_price_no_zh - quan_price;
                     }
-
                     //看一下是不是不用组合购的订单优惠的叠加
                     if (is_has_ladder) {
                         o_condition = o_price_no_zh - quan_price;
@@ -1871,8 +1929,11 @@ Page({
                     if(whsle_goods_price>0){
                         o_condition=o_condition-whsle_goods_price;
+                        t_o_condition=t_o_condition-whsle_goods_price;
                     }
+                  
+
                     var order_m = 0;
                     //---判断是不是有订单优惠---
                     await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
@@ -1914,6 +1975,62 @@ Page({
                         coupon_price = o_price;
                     }
+
+                      //-- 在选择到同城配送的时候 --
+                      if(c_arr[i].exp_type==2  && th.data.user_addr){
+
+                        var gd_w=0;
+                        for (let ib in c_arr[i].goods) {
+                            let item_bb = c_arr[i].goods[ib];
+                            gd_w += item_bb['weight'] * item_bb['goods_num'];
+                        }
+
+                        if(!lon) {
+                            //-- 获取距离  --
+                            await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                                is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address}
+                            }).then(res => {
+                                if (res.data.code == 0) {
+                                    var data = JSON.parse(res.data.data);
+                                    if (data.status == 0) {
+                                        lon = data.result.location.lng;
+                                        lat = data.result.location.lat;
+                                    }
+                                }
+                            })
+                        }
+
+
+                        var req_data={
+                            store_id:os.stoid, order_amount: parseFloat(cart_item.order_amount),
+                            lon:lon,lat:lat, pickup_id:c_arr[i].pickup_id, goods_weight:gd_w
+                        }
+                        var is_next=1;
+
+                        //获取同城配送参数
+                        await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {is_json:1,data:req_data}).then(res=>{
+                            if(res.data.code==0){
+                                cart_item.shipping_price = res.data.data;
+                            }else{
+                                is_next=0;
+
+                                if(qfunc) qfunc();
+                                else{
+                                    wx.showToast({
+                                        title: res.data.msg,
+                                        icon: 'none',
+                                        duration: 2000
+                                    })
+                                }
+                            }
+                        })
+                        if(!is_next) return false
+                    }
+
+
+
+
+
                     cart_item.total_amount = parseFloat(cart_item.total_amount) + parseFloat(cart_item.shipping_price);  //总金额
                     cart_item.order_amount = parseFloat(cart_item.order_amount) + parseFloat(cart_item.shipping_price);  //总金额
                     cart_item.total_amount = cart_item.total_amount.toFixed(2);
@@ -2020,7 +2137,7 @@ Page({
             }
             //-- 包邮券 --
             var by_quan = th.data.get_by_quan_list_cart[pkid];
-            if (by_quan) {
+            if (by_quan && c_item.exp_type==0) {
                 for (var iter2 in by_quan) {
                     //判断是不是其他订单有选用
                     var is_other_is_use = th.check_other_use_by(by_quan[iter2], pkid);
@@ -2034,7 +2151,7 @@ Page({
     //---------计算立即购买----------
-    calculatePrice2: async function () {
+    calculatePrice2: async function (qfunc) {
         var th = this, good = this.data.bn_goods;
         if (!good) return false;
@@ -2050,6 +2167,7 @@ Page({
             title: "处理中.",
             mask:true
         })
+
         //-----------计算商品总价--------------
         var allpice = good.shop_price * good.buynum;
         var cut_price = 0;
@@ -2205,8 +2323,8 @@ Page({
                                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                    if (goods_weight < 0) goods_weight = 0;
                                     if (item['exp_sum_type'] == 2) {
+                                        if (goods_weight < 0) goods_weight = 0;
                                         goods_weight += item['weight'] * item['buynum'];
 										cut_good_weight += item['weight'] * item['buynum'];										
                                     }
@@ -2293,7 +2411,7 @@ Page({
                         var wl_txt = "formData.shipping_price";
                         th.setData({[wl_txt]: shipping_price,})
-                } else {
+                } else if(th.data.bn_exp_type == 1 ) {
                     var wl_txt = "formData.shipping_price";
                     th.setData({ [wl_txt]: 0, })
                 }
@@ -2318,9 +2436,8 @@ Page({
                 if(th.data.bn_goods.whsle_id>0){
                     o_condition=0;
                 }
-
                 if (o_condition > 0) {
-                    th.check_is_order_prom(o_condition, function () {
+                    th.check_is_order_prom(o_condition,async function () {
                         var order_prom_amount = 0;
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick] && th.data.order_prom[th.data.bn_pick]['money'] <= o_condition) {
@@ -2355,6 +2472,60 @@ Page({
                             th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
                         }
+                        //判断是否同城配送,而且没有调用过
+                        if(th.data.bn_exp_type==2 && th.data.user_addr) {
+                            var gd_w = 0, lon = 0, lat = 0;
+                            for (let ib in gd_arr_list) {
+                                let item_b = gd_arr_list[ib];
+                                gd_w += item_b['weight'] * item_b['buynum'];
+                            }
+
+                            //-- 获取距离  --
+                            await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                                is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+                            }).then(res=>{
+                                if(res.data.code==0){
+                                    var data= JSON.parse(res.data.data);
+                                    if(data.status==0){
+                                        lon=data.result.location.lng;
+                                        lat=data.result.location.lat;
+                                    }
+                                }
+                            })
+
+                            var req_data = {
+                                store_id: os.stoid, order_amount: parseFloat(order_m),
+                                lon: lon, lat: lat, pickup_id: bn_pick,goods_weight: gd_w
+                            }
+
+                            var is_next=1;
+
+                            //获取同城配送参数
+                            await  getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+                                is_json: 1,data: req_data
+                            }).then(res => {
+                                if (res.data.code == 0) {
+                                    var wl_txt = "formData.shipping_price";
+                                    th.setData({ [wl_txt]: res.data.data, })
+
+                                }else{
+                                    is_next=0;
+                                    if(qfunc){
+                                        qfunc();
+                                    }else{
+                                        wx.showToast({
+                                            title: res.data.msg,
+                                            icon: 'none',
+                                            duration: 2000
+                                        })
+                                    }
+
+                                }
+                            })
+                            if(!is_next) return false
+                        }
+
+
                         total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                         order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
@@ -2421,6 +2592,59 @@ Page({
                     var order_prom_txt2 = "formData.order_prom_amount";
                     th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
+                    //判断是否同城配送,而且没有调用过
+                    if(th.data.bn_exp_type==2 && th.data.user_addr) {
+                        var gd_w = 0, lon = 0, lat = 0;
+                        for (let ib in gd_arr_list) {
+                            let item_b = gd_arr_list[ib];
+                            gd_w += item_b['weight'] * item_b['buynum'];
+                        }
+
+                        //-- 获取距离  --
+                        await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                            is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+                        }).then(res=>{
+                            if(res.data.code==0){
+                                var data= JSON.parse(res.data.data);
+                                if(data.status==0){
+                                    lon=data.result.location.lng;
+                                    lat=data.result.location.lat;
+                                }
+                            }
+                        })
+
+                        var req_data = {
+                            store_id: os.stoid, order_amount: parseFloat(order_m),
+                            lon: lon, lat: lat, pickup_id: bn_pick,goods_weight: gd_w
+                        }
+
+                        var is_next=1;
+
+                        //获取同城配送参数
+                        await  getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+                            is_json: 1,data: req_data
+                        }).then(res => {
+                            if (res.data.code == 0) {
+                                var wl_txt = "formData.shipping_price";
+                                th.setData({ [wl_txt]: res.data.data, })
+
+                            }else{
+                                is_next=0;
+                                if(qfunc){
+                                    qfunc();
+                                }else{
+                                    wx.showToast({
+                                        title: res.data.msg,
+                                        icon: 'none',
+                                        duration: 2000
+                                    })
+                                }
+
+                            }
+                        })
+                        if(!is_next) return false
+                    }
+
                     total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                     order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
@@ -2520,6 +2744,10 @@ Page({
     //--------------------提交订单-----------------------
     async submit_func() {
+
+        if(this.data.is_summit_ing) return false;
+        this.data.is_summit_ing = 1;
+
         var th = this, pdata = new Array();
         var ff = true;
         //------------立即购买-------------
@@ -3119,6 +3347,7 @@ Page({
         wx.showLoading({ title: "加载中" });
+        th.setData({ submit: 1,})
         wx.request({
             url: oo.url + '/api/weshop/order/createWxdOrder',
             data: str,
@@ -3131,7 +3360,7 @@ Page({
                 if (res.statusCode == 200) {
                     var data = res.data;
                     if (data.code == 0) {
-                        console.log(th.data.is_b_now);
+                        th.setData({ submit: 1,})
                         //如果是购物车结算，还要删除购物车
                         if (th.data.is_b_now == 0) {
                             console.log(th.data.cartlist_y);
@@ -3221,24 +3450,31 @@ Page({
                                 }
                             })
                             return;
+                        }else{
+                            if (msg.length > 13) {
+                                msg = msg.slice(0, 13) + "\r\n" + msg.slice(13);
+                            }
+                            getApp().confirmBox(msg);
+                            th.data.is_summit_ing = 0;  //是否提交中
+                            th.setData({
+                                submit: 0,
+                            })
                         }
-                        if (msg.length > 13) {
-                            msg = msg.slice(0, 13) + "\r\n" + msg.slice(13);
-                        }
-                        getApp().confirmBox(msg);
-                        th.data.is_summit_ing = 0;  //是否提交中
+                       
+                    
                     }
                 } else {
                     th.data.is_summit_ing = 0;  //是否提交中
                     console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+                    th.setData({
+                        submit: 0,
+                    })
                 }
             },
             fail: function () {
                 th.data.is_summit_ing = 0;
                 wx.hideLoading();
                 console.log("index.js wx.request CheckCallUser fail");
-            },
-            complete: function () {
                 th.setData({
                     submit: 0,
                 })
@@ -3326,7 +3562,7 @@ Page({
         } else {
             for (var i = 0; i < th.data.cartlist.length; i++) {
                 var item = th.data.cartlist[i];
-                if (item.exp_type == 0) {
+                if (item.exp_type == 0 || item.exp_type==2 ) {
                     iszt = 0;
                     break;
                 }
@@ -3751,8 +3987,11 @@ Page({
     },
     //----把券插入之后的操作，同时还要重新计算价格----
-    insert_into_using_quan: function (item, using_quan, pickid, isby) {
+    insert_into_using_quan:async function (item, using_quan, pickid, isby) {
+
+
         var th = this;
+        var old_quan=null;
         if (isby == 1) {
             using_quan[pickid] = {
                 coupon_no: item.no,
@@ -3763,14 +4002,35 @@ Page({
             };
             using_quan[pickid].isby = 1;
         } else {
+            if(using_quan[pickid]) old_quan=using_quan[pickid];
             using_quan[pickid] = { coupon_no: item.CashRepNo, money: item.Sum, is_nouse_red: 0 };
             using_quan[pickid].isby = 0;
         }
         this.setData({ using_quan: using_quan });
         if (th.data.is_b_now == 1) {
-            th.calculatePrice2();
+            th.calculatePrice2(function () {
+
+                if(old_quan) using_quan[pickid]=old_quan;
+                else using_quan[pickid]=null;
+                th.setData({ using_quan: using_quan,submit:0 });
+                wx.showToast({
+                    title: "不能使用优惠券，同城起送价不足",
+                    icon: 'none',
+                    duration: 2000
+                })
+
+            });
         } else {
-            th.calculatePrice();
+            th.calculatePrice(function () {
+                if(old_quan) using_quan[pickid]=old_quan;
+                else using_quan[pickid]=null;
+                th.setData({ using_quan: using_quan ,submit:0 });
+                wx.showToast({
+                    title: "不能使用优惠券，同城起送价不足",
+                    icon: 'none',
+                    duration: 2000
+                })
+            });
         }
         th.setData({ open_quan: 0 });
     },
@@ -4611,15 +4871,9 @@ Page({
             tmplIds: [template_id],
             success(res) {
                 func();
-                th.setData({
-                    submit: 0,
-                })
             },
             fail(res) {
                 func();
-                th.setData({
-                    submit: 0,
-                })
             }
         })
@@ -13,6 +13,11 @@
 					<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype2' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄</view>
+                    <!-- 同城配送 -->
+                    <block wx:if="{{show_same_city}}">
+					<view hidden="{{bn_t_exp_t==3}}" bindtap='setexptype2' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+					</block>
+
 				</view>
 			</view>
 		</block>
@@ -24,13 +29,18 @@
 					<view hidden="{{cartlist[0].distr_t==1}}" bindtap='setexptype_w2' data-ind="0" data-t='0' class="tab {{cartlist[0].exp_type== 0 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄</view>
+					<!-- 判断能不能显示同城配送 -->
+					<block wx:if="{{cartlist[0].show_same_city}}">
+						<view hidden="{{cartlist[0].distr_t==3}}" bindtap='setexptype_w2' data-ind="0" data-t='2' class="tab {{cartlist[0].exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+					</block>
+
 				</view>
 			</view>
 		</block>
 		</block>
 		<!--要进行判断地址是否显示---->
-		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'>
+		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0 )}}'>
 			<!---默认地址显示------>
 			<block wx:if="{{user_addr!=null}}">
@@ -135,7 +145,7 @@
 								<block wx:if="{{item.exp_type==1}}">
 									<!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
-									<icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon>
+									<icon data-t='1' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon>
 								</block>
 								<block wx:else>
 									<view class="circle  xc-hookts on"></view>
@@ -154,11 +164,25 @@
 								<view bindtap='setexptype_w2' data-t='0' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind' class="yu_er">快递邮寄</view>
 							</view>
+
+							<!-- 同城配送 -->
+							<view data-t='2' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style=" margin-left: 5rpx;display:{{!item.show_same_city?'none':'flex;align-items: center'}};">
+
+								<block wx:if="{{item.exp_type==2}}">
+									<icon data-t='2' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hookts on"></view>
+								</block>
+
+								<view bindtap='setexptype_w2' data-t='2' data-ind="{{pidx}}"
+									  data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind' class="yu_er">同城配送</view>
+							</view>
 						</view>
 						<!-- 点击显示物流选择,如果是默认使用的情况不成立 -->
-						<view wx:if="{{!is_default_logistics && item.exp_type!=1}}" class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}" style="padding-right:6rpx;">
+						<view wx:if="{{!is_default_logistics && item.exp_type!=1 && item.exp_type!=2}}" class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}" style="padding-right:6rpx;">
 							<view>{{wu_arr[item.wind].name}}</view>
 							<view class="xc-right"></view>
 						</view>
@@ -215,7 +239,7 @@
 				</view>
 				<!-----使用优惠券------>
-				<view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
+				<view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null && item.can_num>0}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
 					<view class="work-frame flex-space-between">
 						<view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view>
 						<view class="xc-right-frame">
@@ -415,10 +439,12 @@
 					<icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
 				</view>
-				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" wx:if="{{is_coupon > 0 && ((selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null)}}">
+				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}"
+					  hidden="{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list && bn_exp_type==0?get_by_quan_list.length:0)<=0}}"
+					  wx:if="{{is_coupon > 0 && ((selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null)}}">
 					<view class="work-frame flex-space-between">
 						<view class="work">
-							优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text>
+							优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list && bn_exp_type==0?get_by_quan_list.length:0)}}张可用</text>
 						</view>
 						<view class="xc-right-frame">
 							<text wx:if="{{using_quan[bn_pick].is_nouse}}">不使用</text>
@@ -95,7 +95,9 @@ Page({
       th.data.json_d = json_d;
       th.data.ispt_goods = json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
       var is_default_logistics = json_d.is_default_logistics;
-      th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics });
+      var is_same_city = json_d.is_same_city;
+      th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules,
+          rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics,is_same_city:is_same_city });
       var rank_switch = json_d.rank_switch;
       var max_price = -1;
@@ -165,7 +167,7 @@ Page({
         //th.data.prom_goods_map={};	
         //更换地址回来要重新调用计算价钱的接口
         if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) {
-          th.setData({ user_addr: ie, show_submit: 0 });
+          th.setData({ user_addr: ie });
           if (th.data.is_b_now == 1) {
             if (th.data.bn_goods) {
               th.setData({ add_back: 1 });
@@ -290,6 +292,22 @@ Page({
           var gd = t.data.data;
           if (!gd) return false;
+            //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+            if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
+
+                getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+                    if(res.data.code==0){
+                        var pk=res.data.data;
+                        if(pk && pk.is_same_city){
+                            th.setData({show_same_city:1})
+                        }
+                    }
+
+                })
+
+            }
+
+
           t.data.data.original_img = oo.imghost + t.data.data.original_img;
           t.data.data['buynum'] = gg.goods_num;
           var distr_t = 0, et = 0
@@ -409,6 +427,8 @@ Page({
   //---------计算立即购买----------
   calculatePrice2:async function () {
     var th = this, good = this.data.bn_goods;
+
+    this.setData({submit:1})
     wx.showLoading({ title: "处理中.", mask:true })
     //-----------计算商品总价--------------
     var allpice = good.shop_price * good.buynum;
@@ -519,11 +539,11 @@ Page({
                     shipping_price=res.data.data; is_ok=1;
                 }
             })
+
             if(!is_ok){
                 wx.showToast({
                     title: "计算物流错误", icon: 'none',duration: 2000
                 })
-                th.setData({ show_submit:0 });
                 wx.hideLoading();
                 return false;
             }
@@ -537,7 +557,7 @@ Page({
             var wl_txt = "formData.shipping_price";
             th.setData({ [wl_txt]: shipping_price, })
-        } else {
+        } else if(th.data.bn_exp_type == 1 ) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: 0, })
         }
@@ -552,6 +572,55 @@ Page({
           order_m = 0; coupon_price = parseFloat(order_m).toFixed(2);
         }
+        //判断是否同城配送,而且没有调用过
+       if(th.data.bn_exp_type==2 && th.data.user_addr) {
+
+           var lon=0;var lat=0;
+           //-- 获取距离  --
+           await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+               is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+           }).then(res=>{
+               if(res.data.code==0){
+                   var data= JSON.parse(res.data.data);
+                   if(data.status==0){
+                       lon=data.result.location.lng;
+                       lat=data.result.location.lat;
+                   }
+               }
+           })
+
+
+           var gd_w = good['weight'] * good['buynum'];
+           //-- 获取距离  --
+           var req_data = {
+               store_id: os.stoid,
+               order_amount: order_m,
+               lon: lon, lat: lat,
+               pickup_id: bn_pick,
+               goods_weight: gd_w
+           }
+
+           var is_next=1;
+           //获取同城配送参数
+           await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+               is_json: 1,
+               data: req_data
+           }).then(res => {
+               if (res.data.code == 0) {
+                   var wl_txt = "formData.shipping_price";
+                   th.setData({ [wl_txt]: res.data.data, })
+               }else{
+                   is_next=0;
+                   wx.showToast({
+                       title: res.data.msg, icon: 'none',  duration: 2000
+                   })
+               }
+           })
+           if(!is_next) return false
+       }
+
+
+
         //--看一下有没有订单优惠--0
         total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
         order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
@@ -567,14 +636,14 @@ Page({
         if (th.data.bn_use_money == 1) {
           if (amoney > order_m) {
             order_m = order_m.toFixed(2);
-            th.setData({ [txt]: order_m, [txt2]: 0, [txt4]: all_integral, show_submit: 1 })
+            th.setData({ [txt]: order_m, [txt2]: 0, [txt4]: all_integral, show_submit: 1,submit:0 })
           } else {
             order_m = parseFloat(order_m - amoney);
             order_m = order_m.toFixed(2);
-            th.setData({ [txt]: amoney, [txt2]: order_m, [txt4]: all_integral, show_submit: 1 })
+            th.setData({ [txt]: amoney, [txt2]: order_m, [txt4]: all_integral, show_submit: 1,submit:0 })
           }
         } else {
-          th.setData({ [txt]: 0, [txt2]: order_m, [txt4]: all_integral, show_submit: 1 })
+          th.setData({ [txt]: 0, [txt2]: order_m, [txt4]: all_integral, show_submit: 1,submit:0})
         }
         wx.hideLoading();
@@ -586,6 +655,7 @@ Page({
   //--------------------提交订单-----------------------
   async submitForm(t) {
     var sub_value = t;
+    this.setData({submit:1})
     if (this.data.is_summit_ing == 1) return false; //--提交中退出--
     this.data.is_summit_ing = 1;
@@ -739,16 +809,13 @@ Page({
         'content-type': 'application/json'
       },// 设置请求的 header
       success: function (res) {
-
-        th.data.is_summit_ing = 0;  //是否提交中
         wx.hideLoading();
         if (res.statusCode == 200) {
           var data = res.data;
           if (data.code == 0) {
-            console.log(th.data.is_b_now);
+
             //如果是购物车结算，还要删除购物车
             if (th.data.is_b_now == 0) {
-              console.log(th.data.cartlist_y);
               var list = th.data.cartlist_y;
               for (var i = 0; i < list.length; i++) {
                 //删除购物车
@@ -820,7 +887,8 @@ Page({
                 showCancel: true,
                 success(res) {
                   if (res.cancel) {
-                    return;
+                      th.setData({submit:0})
+                      return;
                   } else if (res.confirm) {
                     th.data.is_continue = 1;
                     th.submitForm(sub_value);
@@ -832,13 +900,17 @@ Page({
             if (msg.length > 13) {
               msg = msg.slice(0, 13) + "\r\n" + msg.slice(13);
             }
-            getApp().confirmBox(msg);
+              getApp().confirmBox(msg);
+              th.data.is_summit_ing = 0;  //是否提交中
           }
         } else {
-          console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+            th.setData({submit:0})
+            th.data.is_summit_ing = 0;  //是否提交中
+            console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
       },
       fail: function () {
+        th.setData({submit:0})
         th.data.is_summit_ing = 0;
         wx.hideLoading();
         console.log("index.js wx.request CheckCallUser fail");
@@ -12,6 +12,11 @@
 					<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" 
 					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+
+					<!-- 同城配送 -->
+					<block wx:if="{{show_same_city}}">
+						<view hidden="{{bn_t_exp_t==3}}" bindtap='setexptype' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+					</block>
 			</view>
 		</view>
@@ -160,7 +165,7 @@
 			<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
 			<view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
 		</view>
-		<button  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+		<button disabled="{{submit}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
 	</view>
 </form>
@@ -148,14 +148,16 @@ Page({
         th.get_buy_goods();
         //获取提现金额
-        getApp().request.get("/api/weshop/withdrawals/summoney", {
+        //noinspection JSUnresolvedFunction
+          getApp().request.get("/api/weshop/withdrawals/summoney", {
           data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 },
           success: function (su) {
             if (su.data.code == 0) {
               var yuer = parseFloat(th.data.userinfo.user_money -
                 (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2);
               if (yuer < 0) yuer = 0;
-              th.setData({ txmon: su.data.data.summoney, yuer: yuer });
+              //noinspection JSUnresolvedVariable
+                th.setData({ txmon: su.data.data.summoney, yuer: yuer });
             }
           }
         });
@@ -173,6 +175,22 @@ Page({
         var gd = t.data.data;
         if (!gd) return false;
+
+          //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+          if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
+
+              getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+                  if(res.data.code==0){
+                      var pk=res.data.data;
+                      if(pk && pk.is_same_city){
+                          th.setData({show_same_city:1})
+                      }
+                  }
+
+              })
+
+          }
+
         t.data.data.original_img = oo.imghost + t.data.data.original_img;
         t.data.data['buynum'] = gg.goods_num;
         console.log(t.data.data);
@@ -315,8 +333,10 @@ Page({
       th.data.json_d = json_d;
       th.data.ispt_goods = json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
       var is_default_logistics = json_d.is_default_logistics;
+      var is_same_city = json_d.is_same_city;
-      th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics });
+      th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules,is_same_city:is_same_city,
+          rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics });
       var rank_switch = json_d.rank_switch;
       var max_price = -1;
@@ -398,7 +418,6 @@ Page({
   calculatePrice2:async function () {
     this.setData({submit:1});
-
     wx.showLoading({
           title: "处理中.",
           mask:true
@@ -441,7 +460,7 @@ Page({
                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                  if (item['exp_sum_type'] == 2) {
+                   if(item['exp_sum_type'] == 2) {
                          if (goods_weight < 0) goods_weight = 0;
                          cut_good_weight += item['weight'] * item['buynum'];
 						 goods_weight += item['weight'] * item['buynum'];
@@ -520,10 +539,54 @@ Page({
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: shipping_price, })
-        } else {
+        } else if(th.data.bn_exp_type == 1 ) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: 0, })
         }
+
+       //判断是否同城配送,而且没有调用过
+       if(th.data.bn_exp_type==2 && th.data.user_addr){
+               var lon=0;var lat=0;
+               //-- 获取距离  --
+               await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                   is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+               }).then(res=>{
+                   if(res.data.code==0){
+                       var data= JSON.parse(res.data.data);
+                       if(data.status==0){
+                           lon=data.result.location.lng;
+                           lat=data.result.location.lat;
+                       }
+                   }
+               })
+
+              var gd_w=good['weight'] * good['buynum'];
+              //-- 获取距离  --
+              var req_data={
+                  store_id:os.stoid,
+                  order_amount:allpice,
+                  lon:lon,lat:lat,
+                  pickup_id:th.data.bn_pick,
+                  goods_weight:gd_w
+              }
+
+              var is_next=1;
+              //获取同城配送参数
+              await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {is_json:1,data:req_data}).then(res=>{
+                  if(res.data.code==0){
+                      var wl_txt = "formData.shipping_price";
+                      th.setData({ [wl_txt]: res.data.data, })
+                  }else{
+                      is_next=0;
+                      wx.showToast({
+                          title: res.data.msg, icon: 'none',  duration: 2000
+                      })
+                  }
+              })
+              if(!is_next) return false
+       }
+
+
         //-----------------总价-----------------
         var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price);
         total_m = parseFloat(total_m).toFixed(2);
@@ -10,6 +10,11 @@
 					<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" 
 					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+
+                    <!-- 同城配送 -->
+                    <block wx:if="{{show_same_city}}">
+                        <view  bindtap='setexptype' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+                    </block>
 			</view>
 		</view>
@@ -41,6 +41,7 @@ Page({
     teamgroup: null,
     submit:1, //默认按钮是灰色
+    show_submit:0, //不线上
   },
   /**
@@ -62,7 +63,8 @@ Page({
       var json_d = JSON.parse(e.switch_list);
       th.data.json_d = json_d;
       var is_default_logistics = json_d.is_default_logistics;
-      th.setData({ is_default_logistics: is_default_logistics });
+      var is_same_city = json_d.is_same_city;
+      th.setData({ is_default_logistics: is_default_logistics,is_same_city:is_same_city });
       th.get_wuliu(th.get_info(th.show_page));
     }, 1)
@@ -91,6 +93,11 @@ Page({
       if (th.data.exp_type == 0 && th.data.goods) {
         th.calculate_wuliu();
       }
+
+      if (th.data.exp_type == 2 && th.data.goods) {
+         th.calculate_same_city();
+      }
+
     })
   },
@@ -265,7 +272,23 @@ Page({
     else
       distr_type = pickup.distr_type;
-    switch (distr_type) {
+
+      //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+      if(goods.is_same_city && th.data.is_same_city && goods.whsle_id<=0){
+          getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}).then(res=>{
+              if(res.data.code==0){
+                  var pk=res.data.data;
+                  if(pk && pk.is_same_city){
+                      th.setData({show_same_city:1})
+                  }
+              }
+          })
+      }
+
+
+
+
+      switch (distr_type) {
       case 0:
         exp_type = 1;
         //-- 系统后台有设置要默认的 --
@@ -297,7 +320,7 @@ Page({
     } else {
       var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money;
       allpice = allpice.toFixed(2);
-      th.setData({ exp_price: 0, allpice: allpice,submit:0 })
+      th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1 })
     }
   },
@@ -326,22 +349,19 @@ Page({
     this.setData({
       exp_type: type
     });
-
-
-
     //--计算物流的值--
     if (type == 0) {
-
-      th.setData({submit:0})
       th.calculate_wuliu();
-    } else {
+    } else if(type==1){
       var allpice = parseFloat(th.data.order.order_amount)
         + parseFloat(th.data.order.user_money)
         + parseFloat(th.data.order.tail_money);
       allpice = allpice.toFixed(2);
       this.setData({
-        allpice: allpice, exp_price: 0,
+        allpice: allpice, exp_price: 0,show_submit:1,submit:0
       });
+    }else{
+        th.calculate_same_city();
     }
   },
@@ -400,6 +420,12 @@ Page({
       dd.shipping_price = parseFloat(th.data.exp_price);
       dd.addressid = th.data.user_addr.address_id;
     }
+
+    //如果是同城配送的时候
+    if(th.data.exp_type==2){
+        dd.shipping_price = parseFloat(th.data.exp_price);
+    }
+
     if(getApp().globalData.scene){
       dd.scene=getApp().globalData.scene;
     }
@@ -589,7 +615,7 @@ Page({
                 }
             })
             if(!is_ok){
-                th.setData({ submit:0 });
+                th.setData({ submit:0,show_submit:1 });
                 wx.hideLoading();
                 return false;
             }
@@ -599,16 +625,89 @@ Page({
             allpice = allpice.toFixed(2);
             exp_price = parseFloat(exp_price);
-            th.setData({ exp_price: exp_price, allpice: allpice,submit:0 })
+            th.setData({ exp_price: exp_price, allpice: allpice,submit:0,show_submit:1 })
         } else {
           var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money;
           allpice = allpice.toFixed(2);
-          th.setData({ exp_price: 0, allpice: allpice,submit:0})
+          th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1})
         }
       //});
   },
+  //----计算物流的钱---
+  async calculate_same_city() {
+        //让按钮变灰色
+        this.setData({submit:1});
+        var th = this;
+        var good = th.data.goods;
+        good.buynum=th.data.order.order_goods['goods_num'];
+
+        //--全部金额--
+        var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.pt_tail_money;
+        //-----------当地址不为空，且是物流时，计算物流费用----------
+        if (th.data.user_addr != null) {
+
+
+                var lon=0;var lat=0;
+                //-- 获取距离  --
+                await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+                    is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
+                }).then(res=>{
+                    if(res.data.code==0){
+                        var data= JSON.parse(res.data.data);
+                        if(data.status==0){
+                            lon=data.result.location.lng;
+                            lat=data.result.location.lat;
+                        }
+                    }
+                })
+
+               var gd_w = good['weight'] * good['buynum'];
+               //--------------开始计算物流------------------
+               var shipping_price =0;
+
+               //-- 获取距离  --
+               var req_data={
+                    store_id:os.stoid,
+                    order_amount:allpice,
+                    lon:lon,lat:lat,
+                    pickup_id:th.data.pickup.pickup_id,
+                    goods_weight:gd_w
+                }
+
+                var is_next=1;
+                //获取同城配送参数
+                await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {is_json:1,data:req_data}).then(res=>{
+                    if(res.data.code==0){
+                        shipping_price=res.data.data;
+                    }else{
+                        is_next=0;
+                        wx.showToast({
+                            title: res.data.msg, icon: 'none',  duration: 2000
+                        })
+                    }
+                })
+                if(!is_next) return false
+
+                var exp_price = parseFloat(shipping_price).toFixed(2);
+                allpice = parseFloat(exp_price) + parseFloat(allpice);
+                allpice = allpice.toFixed(2);
+
+                exp_price = parseFloat(exp_price);
+                th.setData({ exp_price: exp_price, allpice: allpice,submit:0,show_submit:1 })
+
+
+
+        } else {
+            var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money;
+            allpice = allpice.toFixed(2);
+            th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1})
+        }
+
+
+    },
+
   //---------------检查是否有收货地址-------------------
   checkAddressList: function () {
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
   <!-- 先选择配送方式，2021.7修改 -->
+  <block wx:if="{{show_submit}}">
   <view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
 			<view class="tab-wrapper">			
 					<view hidden="{{distr_type==2}}" bindtap='set_wuliu' data-type='1' class="tab {{exp_type == 1? 'active':''}}"  
@@ -8,9 +9,15 @@
 					<view hidden="{{distr_type==1}}" bindtap='set_wuliu' data-type='0' class="tab {{exp_type== 0 ? 'active':''}}" 
 					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+
+                    <!-- 同城配送 -->
+                    <block wx:if="{{show_same_city}}">
+                        <view hidden="{{bn_t_exp_t==3}}" bindtap='set_wuliu' data-type='2' class="tab {{exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
+                    </block>
 			</view>
 	</view>
+    </block>
 <!----要进行判断地址是否显示---->
@@ -171,3 +178,5 @@
     </view >
 </view>
+<view style="height: 50rpx"></view>
+
@@ -335,21 +335,20 @@ Page({
     }
   },
-  // 分享朋友圈
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var curPage = this;
-    var pagePath = curPage.route; //当前页面url
-    if (pagePath.indexOf('/') != 0) {
-      pagePath = '/' + pagePath;
-    }
-    pagePath += "?first_leader=" + this.data.getUserID;
-    return {
-      title: '专享礼包',
-      imageUrl: this.data.ad_data.ad_code,
-      path: pagePath,
-    }
-  },
+    // 分享朋友圈
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: '专享礼包',
+            imageUrl: this.data.ad_data.ad_code,
+            query: 'first_leader='+user_id
+        }
+    },
+
     //--- 设置一下默认库存的数量 ----
@@ -544,28 +544,21 @@ Page({
     }
   },
-  /**
-   * 用户分享朋友圈
-   */
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var curPage = this;
-    var pagePath = curPage.route; //当前页面url
-    if (pagePath.indexOf('/') != 0) {
-      pagePath = '/' + pagePath;
-    }
-    pagePath += "?isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID;
-    // if (this.data.isBuy == 0) {
-    //   pagePath += "&orderSn=" + this.data.orderSn;
-    // } else {
-    //   pagePath += "&lbId=" + this.data.getGiftID;
-    // }
-    console.log('pagePath', pagePath);
-    return {
-      title: "礼包详情",
-      path: pagePath,
-    }
-  },
+    /**
+     * 用户分享朋友圈
+     */
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+
+        var pagePath ="&isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID;
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: "礼包详情",
+            query: 'first_leader='+user_id+pagePath
+        }
+    },
   //免费领取
   GetFree: function (e) {
@@ -177,20 +177,14 @@ Page({
     }
   },
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var curPage = this;
-    var pagePath = curPage.route; //当前页面url
-    if (pagePath.indexOf('/') != 0) {
-      pagePath = '/' + pagePath;
-    }
-    pagePath += "?first_leader=" + this.data.getUserID;
-    return {
-      title: '专享礼包',
-      imageUrl: this.data.ad_data.ad_code,
-      path: pagePath,
-    }
-  },
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+        return {
+            title: '专享礼包',
+            imageUrl: this.data.ad_data.ad_code,
+            query: "first_leader=" + this.data.getUserID
+        }
+    },
 });
 \ No newline at end of file
@@ -1092,15 +1092,20 @@ Page({
   		  if(url[0]!='/') url='/'+url;
   		  getApp().goto(url);
    },
-   
-   onShareTimeline(){
-       getApp().globalData.no_clear=1;
-	    var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';	  
-		if(!store_name)
-		   store_name=getApp().globalData.setting.appName;
-	    return {
-		   title:'商品分类-'+store_name,
-	   }
-   }
+
+    onShareTimeline(){
+        getApp().globalData.no_clear=1;
+        var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
+        if(!store_name)
+            store_name=getApp().globalData.setting.appName;
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title:'商品分类-'+store_name,
+            query: "first_leader=" + user_id
+        }
+    }
 });
 \ No newline at end of file
@@ -548,8 +548,9 @@ Page({
         });
         //更新点击量
+        //noinspection JSUnresolvedFunction
         getApp().request.put("/api/weshop/goods/updateClick", {
-            data: {store_id: os.stoid, goods_id: gid}
+            data: {store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 }
         });
@@ -6673,16 +6674,33 @@ Page({
     onShareTimeline() {
         getApp().globalData.no_clear=1;
+        var th=this;
         var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
         if (!store_name)
             store_name = getApp().globalData.setting.appName;
+
+        var url = "&goods_id="
+            + th.data.sele_g.goods_id + "&prom_type=" + th.data.sele_g.prom_type + "&prom_id=" + th.data.sele_g.prom_id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+
+        //-- 如果房间分享，且不是会员分享的 --
+        if (getApp().globalData.room_id &&
+            th.data.sele_g.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share
+        ) {
+            url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
+        }
+
         return {
             title: this.data.data.goods_name + '-' + store_name,
             imageUrl: this.data.gallery[0].image_url,
+            query: 'first_leader='+user_id+url
         }
     },
+
     clickCollapse() {
         this.setData({
             flag: !this.data.flag,
@@ -126,7 +126,7 @@ Page({
       var ob = {
           title: this.data.share_title,
           path: url,
-          imageUrl:this.data.url+this.data.store_config.store_logo,
+          //imageUrl:this.data.url+this.data.store_config.store_logo,
       };
       return ob;
   },
@@ -152,9 +152,8 @@ Page({
     var ob = {
         title:share_title,
-        //path: url,
         query:url,
-        imageUrl:this.data.url+store_config.store_logo,
+        //imageUrl:this.data.url+store_config.store_logo,
     };
     console.log(ob);
     return ob;
@@ -240,14 +240,19 @@ Page({
     }
   },
-  onShareTimeline() {
-      getApp().globalData.no_clear=1;
-    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-    if (!store_name)
-      store_name = getApp().globalData.setting.appName;
-    return {
-      title: '好友助力-' + store_name,
-    }
-  },
+    onShareTimeline() {
+        getApp().globalData.no_clear=1;
+        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+        if (!store_name)
+            store_name = getApp().globalData.setting.appName;
+
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
+        return {
+            title: '好友助力-' + store_name,
+            query: 'first_leader='+user_id
+        }
+    },
 })
@@ -42,7 +42,8 @@ Page({
 		actId: "", //生日活动的id
 		actImg: "",
 		is_assistance: 0, //助力活动
-		ad_img: "",
+    ad_img: "",
+    usertop_ad: [],//会员顶部配置
     add_card_data: '',  //等级卡的内容
     getusercode_vailtime:10,//会员二维码时效
 		hiddenCS: true,
@@ -70,8 +71,13 @@ Page({
 			},
 			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 })
+          var item = res.data.data.pageData[0];
+          if (item)
+          {
+              th.setData({ usertop_ad:item });
+            	if (item.ad_code) th.setData({ ad_img: item.ad_code })
+          }
+				
 				}
 			}
 		})
@@ -19,12 +19,12 @@
               <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
                 <block wx:if="{{cz_val<full_cz_val}}">
                   {{" "}}
-                  <text class="grow-up-val">成长值</text>
+                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text>
                   <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
                 </block>
                 <block wx:else>
                   {{" "}}
-                  <text class="grow-up-val">成长值</text> {{cz_val}}
+                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text> {{cz_val}}
                 </block>
               </view>
             </view>
@@ -40,7 +40,7 @@
         </view>
         <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs ">
           <!-- {{iurl}}/miniapp -->
-          <image bindtap='show_tc' class=" xc-qrcode " src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+          <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};background: {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
           <view style="font-size:12px;color: #fff;">会员卡</view>
         </view>
         <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
@@ -52,7 +52,7 @@
             <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
           </view>
-          <view class="xc-grow-val">5000/10000</view>
+          <view class="xc-grow-val">0/0</view>
         </view>
         <view class="flex-equality  abs xc-assets">
           <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}