合并luo39

WXD-SEASON\season
2 parents a5b73a15 2449b11d
Showing 13 changed files with 272 additions and 43 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2.wxml
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_inte/cart2_inte.wxml
packageE/pages/cart/cart2_pt/cart2_pt.js
packageE/pages/cart/cart2_pt/cart2_pt.wxml
pages/template/index.js
@@ -11,7 +11,7 @@ var oo = t.globalData.setting,
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 var util_pay = require("../../../../utils/pay.js");
 let self = null;
-
+ 
 Page({
   data: {
     prom_type: 9,
@@ -87,6 +87,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
@@ -1073,7 +1075,22 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         } else {
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
           is_next = 0;
           wx.showToast({
             title: res.data.msg, icon: 'none', duration: 2000
@@ -1821,7 +1838,10 @@ Page({
     var th = this;
     var ty = t.currentTarget.dataset.t;
     th.setData({
-      bn_exp_type: ty,same_ok:1
+      bn_exp_type: ty,
+      same_ok:1,
+      sameCityExp_off:0, 
+      sameCityExp_info:'',
     });
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
@@ -2344,6 +2364,10 @@ Page({
     }
     func(isok);
   },
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
 });
@@ -9,7 +9,7 @@
           <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>
@@ -221,11 +221,22 @@
   </view>
   <view class="btn-wrap" wx:if="{{is_show_sub}}">
-    <view class="pay-amount">
-      <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-      <!-- <view class="co-red big"></view> -->
-    </view>
-    <button disabled="{{sub || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <button disabled="{{sub || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
+
   </view>
 </form>
@@ -123,7 +123,9 @@ Page({
         bconfig: null,
         showFold:true,
-        is_fwk:0,  //-- 是不是服务卡项的购买 --
+        is_fwk:0,  //-- 是不是服务卡项的购买 -- 
+        sameCityExp_off:0, //未达到起送价
+        sameCityExp_info:'',//未达到起送价提示信息
       },
@@ -2526,7 +2528,22 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             shipping_price = res.data.data;
+                            th.setData({
+                              sameCityExp_off:0,
+                              sameCityExp_info:''
+                            })
                         } else {
+                          if (res.data.code==-2) {  //未达到起送价
+                            th.setData({
+                              sameCityExp_off:2,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }else{
+                            th.setData({
+                              sameCityExp_off:1,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }
                             is_next = 0;
                             wx.showToast({
                                 title: res.data.msg, icon: 'none', duration: 2000
@@ -2612,7 +2629,22 @@ Page({
                 }).then(res => {
                     if (res.data.code == 0) {
                         shipping_price = res.data.data;
+                        th.setData({
+                          sameCityExp_off:0,
+                          sameCityExp_info:''
+                        })
                     } else {
+                      if (res.data.code==-2) {  //未达到起送价
+                        th.setData({
+                          sameCityExp_off:2,
+                          sameCityExp_info:res.data.msg
+                        })
+                      }else{
+                        th.setData({
+                          sameCityExp_off:1,
+                          sameCityExp_info:res.data.msg
+                        })
+                      }
                         is_next = 0;
                         wx.showToast({
                             title: res.data.msg, icon: 'none', duration: 2000
@@ -2927,7 +2959,10 @@ Page({
     set_wuliu: function (e) {
         var type = e.currentTarget.dataset.type;
         this.setData({
-            exp_type: type,same_ok:1
+            exp_type: type,
+            same_ok:1,
+            sameCityExp_off:0,
+            sameCityExp_info:'',
         });
         this.calculatePrice2();
     },
@@ -3443,7 +3478,12 @@ Page({
     //-- 查看物流 --
     go_wuliu:function (e) {
         getApp().go_wuliu(e);
-    }
+    },
+      //去凑单
+    qcd(){
+      getApp().goto("/pages/index/index/index");
+    },
+
@@ -388,14 +388,26 @@
             请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消
         </view>
-        <view class="btn-wrap" hidden="{{disabled_btn}}">
+        <view class="btn-wrap" >
+          <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
             <view class="pay-amount">
+                <view class="payable">
+                    <text class="co-red fs24">{{sameCityExp_info}}</text>
+                </view>
+            </view>
+            <!-- <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button> -->
+            <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button>
+          </block>
+          <block wx:else>
+            <view class="pay-amount" hidden="{{disabled_btn}}">
                 <view class="payable">应付金额：
                     <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
                 </view>
             </view>
             <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button>
             <button wx:else class="tips-btn" bindtap="show_pay" hidden="{{!show_submit || !same_ok}}">支付尾款</button>
+          </block>
+
             <!-- 预售 -->
             <!-- <button  class="tips-btn" formType="submit" id="submitOrder">立即支付</button> -->
         </view>
@@ -142,6 +142,8 @@ Page({
         can_use_ord_prom:{},
         //存储订单促销的取价，按照门店进行索引
         show_ord_prom:{},
+        sameCityExp_off:0, //未达到起送价
+        sameCityExp_info:'',//未达到起送价提示信息
       },
@@ -1181,7 +1183,22 @@ Page({
                         if (res.data.code == 0) {
                             var wl_txt = "formData.shipping_price";
                             th.setData({ [wl_txt]: res.data.data, })
+                            th.setData({
+                              sameCityExp_off:0,
+                              sameCityExp_info:''
+                            })
                         }else{
+                          if (res.data.code==-2) {  //未达到起送价
+                            th.setData({
+                              sameCityExp_off:2,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }else{
+                            th.setData({
+                              sameCityExp_off:1,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }
                             is_next=0;
                             wx.showToast({
                                 title: res.data.msg, icon: 'none',  duration: 2000
@@ -2261,7 +2278,7 @@ Page({
     setexptype: function (t) {
         var th = this;
         var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code;
-        th.setData({ bn_exp_type: ty,same_ok:1 });
+        th.setData({ bn_exp_type: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
         if (ty == 0) {
             th.setData({ is_all_zt: 0 });
         }
@@ -3400,7 +3417,11 @@ Page({
         if(!th.data.can_use_ord_prom[pickid]){
             th.get_buy_now_quan();
         }
-    }
+    },
+      //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
@@ -272,10 +272,21 @@
 	</view>
 	<view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
-		<view class="pay-amount">
-			<view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
-		</view>
-		<button disabled="{{dis_btn}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+      </view>
+      <button  class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+		<block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
+      </view>
+      <button disabled="{{dis_btn}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
+
+
 	</view>
 </form>
@@ -186,7 +186,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
-
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
@@ -3691,8 +3692,23 @@ Page({
         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;
+            th.setData({
+              sameCityExp_off:0,
+              sameCityExp_info:''
+            })
           } else {
-            is_next = 0;
+            if (res.data.code==-2) {  //未达到起送价
+              th.setData({
+                sameCityExp_off:2,
+                sameCityExp_info:res.data.msg
+              })
+            }else{
+              th.setData({
+                sameCityExp_off:1,
+                sameCityExp_info:res.data.msg
+              })
+            }
+            // is_next = 0;
             if (qfunc) qfunc();
             else {
@@ -4532,9 +4548,23 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
-
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         } else {
-          is_next = 0;
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
+          // is_next = 0;
           if (qfunc) {
             qfunc();
           } else {
@@ -7722,7 +7752,7 @@ Page({
   setexptype2: function (e) {
     if(this.data.submit) return false;
-    this.setData({ submit: 1,same_ok:1 });
+    this.setData({ submit: 1,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
     if(this.data.all_collocation_list){
        var bn_coll= this.selectComponent('#bn_coll');
@@ -7741,7 +7771,7 @@ Page({
   setexptype_w2: function (e) {
     if(this.data.submit) return false;
-    this.setData({ submit: 1,same_ok:1 });
+    this.setData({ submit: 1,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
     for (let i = 0; i <this.data.cartlist.length ; i++) {
@@ -9164,7 +9194,12 @@ Page({
     if(!th.data.can_use_ord_prom[pickid]){
       th.get_buy_now_quan();
     }
-  }
+  },
+
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
@@ -841,12 +841,21 @@
   </view>
   <view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text>
+        </view>
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn  "  catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
     <view class="pay-amount">
       <view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
       <!-- <view class="co-red big"></view> -->
     </view>
     <button class="tips-btn" formType="submit" id="submitOrder"
             disabled="{{submit || !same_ok}}" bindtap="requestSubscribe">提交订单</button>
+    </block>
   </view>
 </form>
@@ -93,6 +93,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
@@ -1029,7 +1031,22 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         }else{
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
           is_next=0;
           wx.showToast({
             title: res.data.msg, icon: 'none',  duration: 2000
@@ -1637,7 +1654,7 @@ Page({
     var th = this;
     var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code;
-    th.setData({ bn_exp_type: ty,same_ok:1 });
+    th.setData({ bn_exp_type: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'', });
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
       th.data.isget_by_quan = {};
@@ -1963,7 +1980,11 @@ Page({
       mark:true
     })
     th.calculatePrice2()
-  }
+  },
+    //去凑单
+    qcd(){
+      getApp().goto("/pages/index/index/index");
+    },
@@ -216,11 +216,21 @@
 	<view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
-		<view class="pay-amount">
-			<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-			<view hidden="{{can_use_ord_prom && can_use_ord_prom[bn_pick] }}" class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
-		</view>
-		<button disabled="{{submit || !same_ok}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+        <!-- <view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view> -->
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <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 disabled="{{submit || !same_ok}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
 	</view>
 </form>
@@ -97,6 +97,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
@@ -1113,8 +1115,22 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
-
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         } else {
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
           is_next = 0;
           wx.showToast({
             title: res.data.msg, icon: 'none', duration: 2000
@@ -1773,7 +1789,7 @@ Page({
   setexptype_w: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt;
-    th.setData({ [txt]: ty,same_ok:1 });
+    th.setData({ [txt]: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'', });
     var iszt = 1;
     if (ty == 0) {
       th.setData({ is_all_zt: 0 });
@@ -1795,7 +1811,7 @@ Page({
   setexptype: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t;
-    th.setData({ bn_exp_type: ty, same_ok:1 });
+    th.setData({ bn_exp_type: ty, same_ok:1, sameCityExp_off:0, sameCityExp_info:'',});
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
       return th.get_wuliu(th.calculatePrice2());
@@ -2538,6 +2554,10 @@ Page({
     }
     func(isok);
   },
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
@@ -237,11 +237,20 @@
   </view>
   <view class="btn-wrap" wx:if="{{show_btn}}">
-    <view class="pay-amount">
-      <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-      <!-- <view class="co-red big"></view> -->
-    </view>
-    <button disabled="{{submit || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <button disabled="{{submit || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
   </view>
 </form>
@@ -18,6 +18,7 @@ Page({
     is_full_screen_navigation_index: -1, //广告轮播满屏下标
     nav_title: '首页',
     nav_frontColor: "#000",
+    old_nav_frontColor: "",
     nav_backgroundColor: "#fff",
     nav_type: 1,  //导航类型
     searchbox_transparent: 1, //搜索框背景是否透明
@@ -213,7 +214,7 @@ Page({
             backgroundColor: temp_data.top_color, // 必写项
           })
           th.setData({
-            // nav_frontColor: top_w_color, // 必写项
+            nav_frontColor: top_w_color, // 必写项
             nav_backgroundColor: temp_data.top_color, // 必写项
           })
         }
@@ -232,8 +233,13 @@ Page({
     })
   },
   onPageScroll: function (e) {
-    //满屏模式监听
+    //满屏模式监听 
     let num = e.scrollTop
+    if (!this.data.old_nav_frontColor) {
+      this.setData({
+        old_nav_frontColor:this.data.nav_frontColor
+      })
+    }
     if (this.data.is_full_screen_navigation) {
       let nav_type = this.data.nav_type
       if (num >= 100 && nav_type) {
@@ -248,7 +254,7 @@ Page({
         this.setData({
           nav_type: 1,
           searchbox_transparent: 1,
-          nav_frontColor: '#000'
+          nav_frontColor: this.data.old_nav_frontColor
         })
         // this.data.nav_type = 1
       }