1、同城配送

2、会员作废 3、小店排序

1、同城配送
2、会员作废 3、小店排序
yvan.ni
1 parent fb055097
Showing 10 changed files with 139 additions and 29 deletions
packageA/pages/distribution/shop/shop.js
packageA/pages/distribution/shop/shop.wxml
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/user/plus/plus.js
@@ -458,7 +458,7 @@ Page({
   clickSort(e) {
     let data = this.data.currentQuery;
     // data.orderField = 'shop_price';
-    data.orderField = 'prom_price';
+    data.orderField = 'final_price';
     if (data.page) {
       delete data.page;
     };
@@ -526,9 +526,10 @@ Page({
       delete data.page;
     };
     if (currentIndex == 0) {
-      if (data.orderField) {// 清除orderField
-        delete data.orderField;
-      };
+      // if (data.orderField) {// 清除orderField
+      //   delete data.orderField;
+      // };
+      data.orderField = 'shop_price';
     };
     if (currentIndex == 1) {
       data.orderField = 'sales_sum';
@@ -539,11 +540,14 @@ Page({
     if (currentIndex == 3) {
       // console.log('点击价格');
-      if (data.orderType) {// 清除orderType
-        delete data.orderType;
-      };
+      // if (data.orderType) {// 清除orderType
+      //   delete data.orderType;
+      // };
+      data.orderType = 'desc';
       return;
     };
+
+
     data.orderType = 'desc';
     this.data.currentQuery = data;
     delete data.brand_id;
@@ -51,12 +51,13 @@
 			<view class="pdl20 c-a" bindtap="search">搜索</view>
 		</view>
 	</view>
-	<view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
+
+	<view class="flex t-c fs26 bg-white bdb sticky c-a" bindtap="clickTab">
 		<block wx:for="{{tabArr}}">
 			<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
 				{{item}}
 			</view>
-			<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
+			<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else catchtap="clickSort">
 				{{item}}
 				<text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
 				<text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
@@ -934,6 +934,11 @@ Page({
         }
       })
       if (!is_next) return false
+
+      th.data.lon=lon;
+      th.data.lat=lat;
+      th.data.bn_gd_w=gd_w;
+      th.data.bn_samecity_order_amount=req_data.order_amount;
     }
     //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
@@ -1226,6 +1231,13 @@ Page({
       'order_goods': new Array(),
     };
+    if(item.exp_type==2){
+      item.lon=th.data.lon?th.data.lon:0;
+      item.lat=th.data.lat?th.data.lat:0;
+      item.goods_weight=t_item.gd_w;
+      item.samecity_order_amount=t_item.samecity_order_amount;
+    }
+
     //--判断有没有优惠活动--
     if (th.data.formData.order_prom_amount > 0) {
       var order_prom_list = {};
@@ -2200,6 +2200,10 @@ Page({
                         return false
                     }
                     exp_price = parseFloat(shipping_price).toFixed(2);
+                    th.data.lon=lon;
+                    th.data.lat=lat;
+                    th.data.bn_gd_w=gd_w;
+                    th.data.bn_samecity_order_amount=req_data.order_amount;
                 }
                 ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit);
@@ -2283,6 +2287,10 @@ Page({
                     return false
                 }
                 exp_price = parseFloat(shipping_price).toFixed(2);
+                th.data.lon=lon;
+                th.data.lat=lat;
+                th.data.bn_gd_w=gd_w;
+                th.data.bn_samecity_order_amount=req_data.order_amount;
             }
@@ -2411,7 +2419,7 @@ Page({
             tail_pay_type: ind,//0微信支付 1余额支付
         };
-        if (th.data.exp_type == 0) {
+        if (th.data.exp_type == 0 || th.data.exp_type==2 ) {
             var index = th.data.index;
             dd.shipping_code = th.data.wu_arr[index].code;
             dd.shipping_name = th.data.wu_arr[index].name;
@@ -2419,6 +2427,14 @@ Page({
             dd.addressid = th.data.user_addr.address_id;
         }
+
+        if(dd.exp_type==2){
+            dd.lon=th.data.lon?th.data.lon:0;
+            dd.lat=th.data.lat?th.data.lat:0;
+            dd.goods_weight=th.data.bn_gd_w;
+            dd.samecity_order_amount=th.data.bn_samecity_order_amount;
+        }
+
         if (th.data.order_prom_amount > 0) {
             var e = {
                 order_prom_id: th.data.order_prom_id,
@@ -2461,6 +2477,13 @@ Page({
                 //---用微信支付---
                 if (dd.tail_pay_type == 0) {
+
+                    if(t.data.code!=0){
+                        getApp().my_warnning(t.data.msg, 1, th);
+                        th.data.paying=0;
+                        return false;
+                    }
+
                     util_pay.pay_data(t,function (){
                         //---用余额支付---
                         getApp().my_warnning("支付成功", 1, th);
@@ -1007,6 +1007,12 @@ Page({
                        th.setData({show_submit:1, submit: 0,same_ok:0 })
                        return false
                     }
+
+                    th.data.lon=lon;
+                    th.data.lat=lat;
+                    th.data.bn_gd_w=gd_w;
+                    th.data.bn_samecity_order_amount=req_data.order_amount;
+
                 }
                 total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
@@ -1154,6 +1160,13 @@ Page({
                 item.use_commission=th.data.bn_goods.use_commission;
             }
+            if(item.exp_type==2){
+                item.lon=th.data.lon?th.data.lon:0;
+                item.lat=th.data.lat?th.data.lat:0;
+                item.goods_weight=th.data.bn_gd_w;
+                item.samecity_order_amount=th.data.bn_samecity_order_amount;
+            }
+
             //获取立即购买的商品的信息
             var gg = to.get_b_now();
             //--商品的房间号--
@@ -2737,6 +2737,11 @@ Page({
           th.setData({show_submit:1, submit: 0,same_ok:0 })
           return false
         }
+
+        //重量要带出去
+        cart_item.gd_w=gd_w;
+        cart_item.samecity_order_amount=req_data.order_amount;
+
       }
       //预存金额使用参与计算
@@ -3527,7 +3532,8 @@ Page({
       }
       th.data.lon=lon;
       th.data.lat=lat;
-
+      th.data.bn_gd_w=gd_w;
+      th.data.bn_samecity_order_amount=req_data.order_amount;
     }
@@ -3850,12 +3856,13 @@ Page({
         item.use_commission = th.data.bn_goods.use_commission;
       }
-      if(th.data.lon && item.exp_type==2){
-        item.lon=th.data.lon;
-        item.lat=th.data.lat;
+      if(item.exp_type==2){
+        item.lon=th.data.lon?th.data.lon:0;
+        item.lat=th.data.lat?th.data.lat:0;
+        item.goods_weight=th.data.bn_gd_w;
+        item.samecity_order_amount=th.data.bn_samecity_order_amount;
       }
-
       //获取立即购买的商品的信息
       var gg = to.get_b_now();
       //--商品的房间号--
@@ -4156,9 +4163,11 @@ Page({
           item.use_commission = t_item.can_usecommise;
         }
-        if(th.data.lon && item.exp_type==2){
-          item.lon=th.data.lon;
-          item.lat=th.data.lat;
+        if(item.exp_type==2){
+          item.lon=th.data.lon?th.data.lon:0;
+          item.lat=th.data.lat?th.data.lat:0;
+          item.goods_weight=t_item.gd_w;
+          item.samecity_order_amount=t_item.samecity_order_amount;
         }
         var order_prom_list = {};
@@ -999,6 +999,12 @@ Page({
          th.setData({show_submit:1, submit: 0,same_ok:0 })
          return false
       }
+
+      th.data.lon=lon;
+      th.data.lat=lat;
+      th.data.bn_gd_w=gd_w;
+      th.data.bn_samecity_order_amount=req_data.order_amount;
+
     }
@@ -1105,7 +1111,6 @@ Page({
         return false;
       }
-
       var item = {
         'user_id': to.globalData.user_id,
         'consignee': addr == null ? "" : addr.consignee,
@@ -1148,6 +1153,13 @@ Page({
       }
       item.order_prom_list = order_prom_list;
+      if(item.exp_type==2){
+        item.lon=th.data.lon?th.data.lon:0;
+        item.lat=th.data.lat?th.data.lat:0;
+        item.goods_weight=th.data.bn_gd_w;
+        item.samecity_order_amount=th.data.bn_samecity_order_amount;
+      }
+
         //获取立即购买的商品的信息
       var gg = to.get_b_now();
@@ -865,6 +865,13 @@ Page({
         th.setData({show_submit:1, submit: 0,same_ok:0 })
         return false
       }
+
+      th.data.lon=lon;
+      th.data.lat=lat;
+      th.data.bn_gd_w=gd_w;
+      th.data.bn_samecity_order_amount=req_data.order_amount;
+
+
     }
     //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
@@ -1125,8 +1132,15 @@ Page({
       'order_goods': new Array(),
     };
+    //-- 同城配送检验的参数 --
+    if(item.exp_type==2){
+      item.lon=th.data.lon?th.data.lon:0;
+      item.lat=th.data.lat?th.data.lat:0;
+      item.goods_weight=th.data.bn_gd_w;
+      item.samecity_order_amount=th.data.bn_samecity_order_amount;
+    }
-        //--判断有没有优惠活动--
+    //--判断有没有优惠活动--
         if (th.data.formData.order_prom_amount > 0) {
             var order_prom_list = {};
             order_prom_list.order_prom_id = th.data.formData.order_prom_id;
@@ -1417,7 +1431,7 @@ Page({
   setexptype_w: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt;
-    th.setData({ [txt]: ty });
+    th.setData({ [txt]: ty,same_ok:1 });
     var iszt = 1;
     if (ty == 0) {
       th.setData({ is_all_zt: 0 });
@@ -1439,7 +1453,7 @@ Page({
   setexptype: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t;
-    th.setData({ bn_exp_type: ty, same_ok:0 });
+    th.setData({ bn_exp_type: ty, same_ok:1 });
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
       return th.get_wuliu(th.calculatePrice2());
@@ -586,7 +586,7 @@ Page({
       tail_pay_type: ind,//0微信支付 1余额支付
     };
-    if (th.data.exp_type == 0) {
+    if (th.data.exp_type == 0 && th.data.exp_type == 2) {
       var index = th.data.index;
       dd.shipping_code = th.data.wu_arr[index].code;
       dd.shipping_name = th.data.wu_arr[index].name;
@@ -595,10 +595,18 @@ Page({
     }
     //如果是同城配送的时候
-    if(th.data.exp_type==2){
-        dd.shipping_price = parseFloat(th.data.exp_price);
+    // if(th.data.exp_type==2){
+    //     dd.shipping_price = parseFloat(th.data.exp_price);
+    // }
+
+    if(dd.exp_type==2){
+      dd.lon=th.data.lon?th.data.lon:0;
+      dd.lat=th.data.lat?th.data.lat:0;
+      dd.goods_weight=th.data.bn_gd_w;
+      dd.samecity_order_amount=th.data.bn_samecity_order_amount;
     }
+
     if(getApp().globalData.scene){
       dd.scene=getApp().globalData.scene;
     }
@@ -634,6 +642,12 @@ Page({
         //---用微信支付---
         if (dd.tail_pay_type == 0) {
+          if (t.data.code != 0) {
+              getApp().my_warnning(t.data.msg, 1, th);
+              th.data.paying=0;
+              return false;
+          }
+
           util_pay.pay_data(t,function (){
                 var allmoney = th.data.allpice;
                 th.jumpPaymentPage(th.data.order.order_sn, allmoney);
@@ -1011,6 +1025,11 @@ Page({
                     return false
                 }
+                th.data.lon=lon;
+                th.data.lat=lat;
+                th.data.bn_gd_w=gd_w;
+                th.data.bn_samecity_order_amount=req_data.order_amount;
+
                 var exp_price = parseFloat(shipping_price).toFixed(2);
                 allpice = parseFloat(exp_price) + parseFloat(allpice);
             if(th.data.bn_use_commission){
@@ -465,8 +465,9 @@ Page({
       // })
     } else {
       t_pay.set_pay_url('/api/weshop/plus/create/plus/order');
-      t_pay.pay(req, th.success, function () {
-        getApp().my_warnning("支付失败", 0, th);
+      t_pay.pay(req, th.success, function (msg) {
+        if(!msg) msg='支付失败';
+        getApp().my_warnning(msg, 0, th);
         th.setData({
           is_select:0,
           focus:true,
@@ -499,8 +500,10 @@ Page({
             })
           }else{
             t_pay.set_pay_url('/api/weshop/plus/create/plus/order');
-            t_pay.pay(req, th.success, function () {
-              getApp().my_warnning("支付失败", 0, th);
+            t_pay.pay(req, th.success, function (msg) {
+              if(!msg) msg="支付失败";
+
+              getApp().my_warnning(msg, 0, th);
               th.setData({
                 is_select:0,
                 focus:true,