From da9d6b70c84b85b5206fd6cd7e9e3586d783a3d8 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Thu, 2 Feb 2023 15:13:38 +0800
Subject: [PATCH] 预存使用优化

---
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js   |    4 ++--
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml |  411 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 packageC/pages/presell/cart/cart2_pre.js                    |    4 ++--
 packageC/pages/presell/cart/cart2_pre.wxml                  |   15 ++++++++-------
 packageE/pages/cart/cart2/cart2.js                          |    4 ++--
 packageE/pages/cart/cart2/cart2.wxml                        | 1669 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/cart/cart2_inte/cart2_inte.js                         |    4 ++--
 pages/cart/cart2_inte/cart2_inte.wxml                       |   22 +++++++++++-----------
 pages/cart/cart2_pt/cart2_pt.js                             |    4 ++--
 pages/cart/cart2_pt/cart2_pt.wxml                           |  414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 10 files changed, 1275 insertions(+), 1276 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index 1fbeafc..c6fa23a 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -286,7 +286,7 @@ Page({
     if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
       let resData = res.data.data
       resData.map(ite => {
-        yck += ite.advancesum
+        yck += ite.advancesum*1
         yckIdArr.push(ite.advanceitemid)
       })
       pre_json = resData
@@ -298,7 +298,7 @@ Page({
     } else {
       obj.yck_off = 0
     }
-    obj.yck = yck
+    obj.yck = yck.toFixed(2)
     obj.yckid = yckid
     obj.pre_json = pre_json
     return obj
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
index 2e75355..4f0cd29 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
@@ -1,113 +1,116 @@
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <form bindsubmit="submitConfirm">
-    <view class="container">
-		
-		<block wx:if="{{is_show_sub}}">
-		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
-			<view class="tab-wrapper">			
-					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
-					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
-					
-					<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>
-		</block>
-		
-        <!--要进行判断地址是否显示---->
-        <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
-            <!---默认地址显示------>
-            <block wx:if="{{user_addr!=null}}">
-                <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
-                <view class="location">
-                    <view class="address">{{user_addr.more_address}}{{'  '}}{{user_addr.address}}</view>
-                    <view class="pos-icon">
-                        <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-                    </view>
-                </view>
-                <view class="update-logistics">
-                    <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
-                </view>
-            </block>
-            <!---先增地址------>
-            <block wx:else>
-                <view class="add_new">
-                    <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
-                </view>
-            </block>
-            <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
+  <view class="container">
+
+    <block wx:if="{{is_show_sub}}">
+      <view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
+        <view class="tab-wrapper">
+          <view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
+
+          <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>
+    </block>
+
+    <!--要进行判断地址是否显示---->
+    <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
+      <!---默认地址显示------>
+      <block wx:if="{{user_addr!=null}}">
+        <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
+        <view class="location">
+          <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view>
+          <view class="pos-icon">
+            <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+          </view>
+        </view>
+        <view class="update-logistics">
+          <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
+        </view>
+      </block>
+      <!---先增地址------>
+      <block wx:else>
+        <view class="add_new">
+          <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
         </view>
+      </block>
+      <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
+    </view>
 
 
-        <!------立即购买-------->
-        <block>
-         <!-- <view class="xc-border main-top"></view> -->
-                <view class="use-item bfff bdr_t-14 mgt20">
-                      <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view>
-                <view class="order-detail">
-                      <view class="goods-img">
-                          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
-                            binderror='cart_set_err' data-err="bn_goods.original_img"></image>
-                      </view>
-                      <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
-                          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
-                               <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 color-gray n_guige">
-                                 <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
-                          </view></view>
-
-                             <!-----商品名称规格------>
-                    <view class="order-num flex-space-between">
-                        <view class="co-red">￥<text class="fs36">{{filters.toFix(param.goods_price,2)}}</text></view>
-                        <view class="goods-num">x{{bn_goods.buynum}}</view>
-                    </view>
-                      </navigator>
-                      <!-- <view class="order-num">
+    <!------立即购买-------->
+    <block>
+      <!-- <view class="xc-border main-top"></view> -->
+      <view class="use-item bfff bdr_t-14 mgt20">
+        <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
+        <view>{{bn_pickname}}</view>
+      </view>
+      <view class="order-detail">
+        <view class="goods-img">
+          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
+        </view>
+        <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
+          <!-- 商品属性 -->
+          <view class="flex-vertical fs28 color-gray n_guige">
+            <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
+            </view>
+          </view>
+
+          <!-----商品名称规格------>
+          <view class="order-num flex-space-between">
+            <view class="co-red">￥<text class="fs36">{{filters.toFix(param.goods_price,2)}}</text></view>
+            <view class="goods-num">x{{bn_goods.buynum}}</view>
+          </view>
+        </navigator>
+        <!-- <view class="order-num">
                           <view class="co-red">￥{{bn_goods.shop_price}}</view>
                           <view class="goods-num">x{{bn_goods.buynum}}</view>
                       </view> -->
-                </view>
-				
-				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-				<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
-					<view class="flex">
-						<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-							<image  src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
-							<text class="card_name">{{show_card.CardName}}</text>
-						</view>            						
-						<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
-					</view>
-					<view>
-						<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-					</view>				
-					<!-- 三角形 -->
-					<view class="car_tri_up"></view>
-					<!-- 立即开通跳转 -->
-					<view bindtap="buycard" class="card_op">立即开通</view>				
-				</view>	
-				
-				
-                <view class="set-mes bdr_b-14">
-                    <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
-                    </view>
-
-                    <!--阶梯团是不显示的-->
-					<block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
-						<view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">							
-						   <view>选择物流</view>
-						   <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index' style="margin-right: 8rpx;">
-							   <view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view>
-						   </view>						
-						</view>
-					</block>
-
-                    <!--阶梯团是不显示的
+      </view>
+
+      <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+      <view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
+        <view class="flex">
+          <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+            <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
+              </ image>
+              <text class="card_name">{{show_card.CardName}}</text>
+          </view>
+          <view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
+        </view>
+        <view>
+          <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+        </view>
+        <!-- 三角形 -->
+        <view class="car_tri_up"></view>
+        <!-- 立即开通跳转 -->
+        <view bindtap="buycard" class="card_op">立即开通</view>
+      </view>
+
+
+      <view class="set-mes bdr_b-14">
+        <view wx:if="{{order.store_prom}}">
+          <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
+        </view>
+
+        <!--阶梯团是不显示的-->
+        <block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+          <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">
+            <view>选择物流</view>
+            <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 8rpx;">
+              <view class="logistics-name">{{wu_arr[index].name}}</view>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </block>
+
+        <!--阶梯团是不显示的
                     <block wx:if="{{kt_type!=3 || is_normal==1 }}">
                         <view class="use-item" hidden='{{bn_exp_type==1}}'>
                               <view>使用物流：</view>
@@ -117,129 +120,127 @@
                         </view>
                     </block>-->
 
-                </view>
-
-                
-                <view class="coupon-mes flex-vertical">
-                    <view>留言</view>
-                    <view class="leave-word">
-                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
-                     
-                    </view>
-                </view>
-         </block>
-
-        <!-----使用佣金------>
-        <view  class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission}}">
-            <view class="use-item" bindtap='set_bn_commission'>
-                <icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
-                <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
-            </view>
+      </view>
+
+
+      <view class="coupon-mes flex-vertical">
+        <view>留言</view>
+        <view class="leave-word">
+          <input placeholder-class="fs28" placeholder='给商家留言，最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
+
         </view>
-        <!-- 预存款 -->
-        <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
-        <view class="use-item" style="justify-content: space-between;">
-          <view>
-            <icon  color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
-            <view class="yu_er">使用预存</view>
-          </view>
-          <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
+      </view>
+    </block>
+    <!-- 预存款 -->
+    <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
+      <view class="use-item" style="justify-content: space-between;">
+        <view>
+          <icon color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用预存</view>
         </view>
+        <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
+      </view>
+    </view>
+    <!-----使用佣金------>
+    <view class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission}}">
+      <view class="use-item" bindtap='set_bn_commission'>
+        <icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
+        <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
       </view>
+    </view>
 
-         <view class="information bdr14">
 
+    <view class="information bdr14">
 
 
 
-             <!-----使用余额------>
-						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
-							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
-								<icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
-								<view class="yu_er">使用余额 :￥{{yuer}} </view>
-							 </view>
-						 </view>
-            <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
-                <view>商品金额</view>
-                <!-- <view class="co-red">￥ {{formData.all_price}}元</view> -->
-								<view class="co-red">￥ {{param.goods_price}}元</view>
-            </view>
 
-            <view class="item" wx:else>
-                <view>定金金额</view>
-                <view class="co-red">￥ {{formData.all_price}}元</view>
-            </view>
+      <!-----使用余额------>
+      <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
+        <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
+          <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用余额 :￥{{yuer}} </view>
+        </view>
+      </view>
+      <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
+        <view>商品金额</view>
+        <!-- <view class="co-red">￥ {{formData.all_price}}元</view> -->
+        <view class="co-red">￥ {{param.goods_price}}元</view>
+      </view>
 
-            <view class="item" wx:if="{{formData.shipping_price>0}}">
-                <view>配送费用</view>
-                <view class="co-red">￥ {{formData.shipping_price}}元</view>
-            </view>
-               <!-- 使用预存优惠金额 -->
-            <view class="item" wx:if="{{formData.prestore>0}}">
-                <view>使用预存</view>
-                <view class="co-red">-￥ {{filters.toFix(formData.prestore,2)}}元</view>
-            </view>
+      <view class="item" wx:else>
+        <view>定金金额</view>
+        <view class="co-red">￥ {{formData.all_price}}元</view>
+      </view>
 
-            <view class="item" wx:if="{{formData.user_money>0}}">
-                <view>使用余额</view>
-                <view class="co-red">- ￥ {{formData.user_money}}元</view>
-            </view>
+      <view class="item" wx:if="{{formData.shipping_price>0}}">
+        <view>配送费用</view>
+        <view class="co-red">￥ {{formData.shipping_price}}元</view>
+      </view>
+      <!-- 使用预存优惠金额 -->
+      <view class="item" wx:if="{{formData.prestore>0}}">
+        <view>使用预存</view>
+        <view class="co-red">-￥ {{filters.toFix(formData.prestore,2)}}元</view>
+      </view>
+
+      <view class="item" wx:if="{{formData.user_money>0}}">
+        <view>使用余额</view>
+        <view class="co-red">- ￥ {{formData.user_money}}元</view>
+      </view>
 
-        </view>
     </view>
+  </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}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
-     </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}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+  </view>
 </form>
 
 <!----弹起选择物流名的列表---->
-<view wx:if='{{open_express==1}}' >
-    <view class="cover-layer flex-center "  bindtap='close_express'>
+<view wx:if='{{open_express==1}}'>
+  <view class="cover-layer flex-center " bindtap='close_express'>
+  </view>
+
+  <view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
+    <view class="tops flex">
+      <view class="top-content fs32">
+        <view>
+          选择物流名字
+        </view>
+      </view>
+      <view class="close-frame" bindtap='close_express'>
+        <view class="xc-close-express">×</view>
+      </view>
     </view>
+    <view class="express_list">
+      <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+        <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+          <block wx:if="{{is_express==idx}}">
+            <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
+          </block>
+          <block wx:else>
+            <view class="circle  xc-hooks"></view>
+          </block>
+          <view class="fs30">{{express_list.name}}</view>
 
-    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
-        <view class="tops flex">
-            <view class="top-content fs32">
-                <view>
-                    选择物流名字
-                </view>
-            </view>
-            <view class="close-frame"  bindtap='close_express' >
-                <view class="xc-close-express">×</view>
-            </view>
-        </view>
-        <view class="express_list">
-            <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-                <view class="express_list_frame" bindtap="click_express_name"
-                      data-shippingcode="{{express_list.shipping_code}}"
-                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
-
-                    <block wx:if="{{is_express==idx}}">
-                        <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
-                    </block>
-                    <block wx:else>
-                        <view class="circle  xc-hooks"></view>
-                    </block>
-                    <view class="fs30">{{express_list.name}}</view>
-
-                </view>
-            </view>
-        </view>
-        <view class="flex click-buttem" >
-            <view class="xc-determine flex-center" bindtap="determine_expres">
-                <view class="flex-vertical  t-c">确定</view>
-            </view>
-            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
-                <view class="flex-vertical  t-c">设为默认</view>
-            </view>
         </view>
+      </view>
+    </view>
+    <view class="flex click-buttem">
+      <view class="xc-determine flex-center" bindtap="determine_expres">
+        <view class="flex-vertical  t-c">确定</view>
+      </view>
+      <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+        <view class="flex-vertical  t-c">设为默认</view>
+      </view>
+    </view>
 
-    </view >
+  </view>
 </view>
 
-<warn id="warn"></warn>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 75522bc..96766af 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -416,7 +416,7 @@ Page({
     if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
       let resData = res.data.data
       resData.map(ite => {
-        yck += ite.advancesum
+        yck += ite.advancesum*1
         yckIdArr.push(ite.advanceitemid)
       })
       pre_json = resData
@@ -428,7 +428,7 @@ Page({
     } else {
       obj.yck_off = 0
     }
-    obj.yck = yck
+    obj.yck = yck.toFixed(2)
     obj.yckid = yckid
     obj.pre_json = pre_json
     return obj
diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index 5b49203..08542e7 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -129,6 +129,13 @@
         </view>
 
          <view class="information bdr14">
+         		<!-----使用预存------>
+						 <view class="set-mes" wx:if="{{bn_goods.yck_off}}">
+							 <view class="use-item" bindtap='prestore2' style="padding-left:0;padding-right:0;">
+								<icon   color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+								<view class="yu_er">使用预存 </view>
+							 </view>
+						 </view>
 						 <!-----使用余额------>
 						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
 							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
@@ -136,13 +143,7 @@
 								<view class="yu_er">使用余额 :￥{{yuer}} </view>
 							 </view>
 						 </view>
-						 <!-----使用预存------>
-						 <view class="set-mes" wx:if="{{bn_goods.yck_off}}">
-							 <view class="use-item" bindtap='prestore2' style="padding-left:0;padding-right:0;">
-								<icon   color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
-								<view class="yu_er">使用预存 </view>
-							 </view>
-						 </view>
+
             <view class="item" wx:if="{{act.presell_type==1}}">
                 <view>商品金额</view>
                 <view class="co-red">￥ {{formData.all_price}}元</view>
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index c47b046..a2da53b 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -424,7 +424,7 @@ Page({
     if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
       let resData = res.data.data
       resData.map(ite => {
-        yck += ite.advancesum
+        yck += ite.advancesum*1
         yckIdArr.push(ite.advanceitemid)
       })
       pre_json = resData
@@ -436,7 +436,7 @@ Page({
     } else {
       obj.yck_off = 0
     }
-    obj.yck = yck
+    obj.yck = yck.toFixed(2)
     obj.yckid = yckid
     obj.pre_json = pre_json
     return obj
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 8d993a5..a614ff9 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -3,882 +3,877 @@
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 
 <form>
-	<view class="container">
-		<block wx:if="{{show_submit}}">
-		<!-- 立即购买的时候 -->
-		<block wx:if="{{is_b_now==1}}">
-			<view class="tab-container">
-				<view class="tab-wrapper">
-					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype2' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
-
-					<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>
-		<!-- 购物购买只有一单的时候 -->
-		<block wx:if="{{is_b_now==0 && cartlist.length==1}}">
-			<view class="tab-container">
-				<view class="tab-wrapper">
-					<view hidden="{{cartlist[0].distr_t==2}}" bindtap='setexptype_w2' data-ind="0" data-t='1' class="tab {{cartlist[0].exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
-
-					<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 )}}'>
-			<!---默认地址显示------>
-			<block wx:if="{{user_addr!=null}}">
-
-				<view class="user-contact">
-					<text class="bold fs36 pdr20">{{user_addr.consignee}}</text>
-					<text class="fs28">{{user_addr.mobile}}</text>
-				</view>
-				<view class="location">
-					<view class="address fs26 pdt20">
-						<view class="pos-icon">
-							<image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-						</view>
-						{{user_addr.more_address}}{{' '}}{{user_addr.address}}
-					</view>
-
-				</view>
-				<view class="update-logistics">
-					<!-- <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> -->
-					<view class="xc-right"></view>
-				</view>
-			</block>
-			<!---先增地址------>
-			<block wx:else>
-				<view class="add_new">
-					<image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
-				</view>
-			</block>
-			<!-- <view class="border-img">
+  <view class="container">
+    <block wx:if="{{show_submit}}">
+      <!-- 立即购买的时候 -->
+      <block wx:if="{{is_b_now==1}}">
+        <view class="tab-container">
+          <view class="tab-wrapper">
+            <view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype2' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
+
+            <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>
+      <!-- 购物购买只有一单的时候 -->
+      <block wx:if="{{is_b_now==0 && cartlist.length==1}}">
+        <view class="tab-container">
+          <view class="tab-wrapper">
+            <view hidden="{{cartlist[0].distr_t==2}}" bindtap='setexptype_w2' data-ind="0" data-t='1' class="tab {{cartlist[0].exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
+
+            <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 )}}'>
+      <!---默认地址显示------>
+      <block wx:if="{{user_addr!=null}}">
+
+        <view class="user-contact">
+          <text class="bold fs36 pdr20">{{user_addr.consignee}}</text>
+          <text class="fs28">{{user_addr.mobile}}</text>
+        </view>
+        <view class="location">
+          <view class="address fs26 pdt20">
+            <view class="pos-icon">
+              <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+            </view>
+            {{user_addr.more_address}}{{' '}}{{user_addr.address}}
+          </view>
+
+        </view>
+        <view class="update-logistics">
+          <!-- <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> -->
+          <view class="xc-right"></view>
+        </view>
+      </block>
+      <!---先增地址------>
+      <block wx:else>
+        <view class="add_new">
+          <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
+        </view>
+      </block>
+      <!-- <view class="border-img">
 				<image class="wh100" src="{{imgUrl}}/miniapp/images/order/new_dividing_line.png"></image>
 			</view> -->
-		</view>
-
-		<!-- -------------------购物车进来，有可能多单-------------------- -->
-		<block wx:if="{{is_b_now==0}}">
-			<!-- <view class="xc-border main-top"></view> -->
-			<view wx:for="{{cartlist}}" wx:for-index="pidx">
-				<view class="use-item bfff bdr_t-14 mgt20">
-					<image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image>
-					<!-- <view>门店：{{item.pname}}</view> -->
-					<view>{{item.pname}}</view>
-				</view>
-				<view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
-					<!----商品图片----->
-					<view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
-						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
-						<text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
-						<image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
-					</view>
-					<!----商品名称规格---->
-					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
-						<view class="goods-name ellipsis-2">{{items.goods_name}}</view>
-						<!-- 商品属性 -->
-						<view class="flex-vertical fs28 color-gray n_guige">
-							<view class="goods-color">
-								<block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
-							</view>
-						</view>
-
-						<!-----商品名称规格------>
-						<view class="order-num flex-space-between">
-							<view wx:if="{{items.prom_type==10}}" class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text><text>({{items.discount}}折)</text></view>
-							<view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
-							<view class="goods-num">x{{items.goods_num}}</view>
-						</view>
-					</navigator>
-				</view>
-
-				<!-- 使用搭配 -->
-				<cart_collect_temp  bind:childFun="select_coll" sales_rules="{{sales_rules}}" pick="{{item.pickup_id}}"
-						is_cart="1" cart_index="{{pidx}}" distr_t="{{item.distr_t}}" appoint_pick_keyid="{{appoint_pick_keyid}}"
-						all_collocation_list="{{item.collocationList}}"  />
-
-				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-				<view class="plus_buy fs28" wx:if="{{item.card_cut_price>0}}">
-					<view class="flex">
-						<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-							<image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
-								</ image>
-								<text class="card_name">{{show_card.CardName}}</text>
-						</view>
-						<view>立减 <text style="color:#f23030;">{{filters.toFix(item.card_cut_price,2) }}</text> 元</view>
-					</view>
-					<view>
-						<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-					</view>
-					<!-- 三角形 -->
-					<view class="car_tri_up"></view>
-					<!-- 立即开通跳转 -->
-					<view bindtap="buycard" class="card_op">立即开通</view>
-				</view>
-
-				<view class="set-mes bdr_b-14">
-					<view wx:if="{{order.store_prom}}">
-						<icon color="#f23030" size="16" type="info"></icon>
-						{{order.store_prom}}
-					</view>
-
-					<!-- 当是物流很多单的时候 -->
-					<view class="use-item flex-space-between" wx:if="{{cartlist.length>1 && show_submit}}">
-						<view class="flex-vertical">
-							<view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;display:{{item.distr_t==2?'none':'flex;align-items: center'}};">
-								<!-- <icon  bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> -->
-
-								<block wx:if="{{item.exp_type==1}}">
-									<!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
-									<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>
-								</block>
-								<view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
-							</view>
-
-							<view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
-
-								<block wx:if="{{item.exp_type==0}}">
-									<icon data-t='0' 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='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 && 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>
-
-					</view>
-
-					<!-- 当是物流，只有一单的时候 -->
-					<block wx:else>
-						<view class="use-item flex-space-between" wx:if="{{item.exp_type==0 && !is_default_logistics}}">
-							<view class="flex jc_sb" style="width: 100%; padding: 0 13rpx;">
-								<view>选择物流</view>
-								<view 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>
-							</view>
-						</view>
-					</block>
-				</view>
-
-				<!-- 有送礼包 -->
-				<view wx:if="{{send_lb[item.pickup_id]}}">
-					<block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
-						<view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
-							<view class="flex ai_c">
-								<view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
-								<!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
-							</view>
-							<view class="flex ai_c">
-								x{{send.num}}<text class="bg_jj"></text>
-							</view>
-						</view>
-					</block>
-				</view>
-				<!-- 赠品的显示 -->
-				<view wx:if="{{send_gf[item.pickup_id]}}">
-					<block wx:for="{{send_gf[item.pickup_id]}}" wx:for-item="iter">
-						<view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{item.pickup_id}}" data-index="{{index}}" bindtap="show_sele_gift">
-							<view class="flex ai_c">
-								<view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
-							</view>
-
-							<view class="flex ai_c" wx:if="{{iter.selected}}">
-								已选择<text class="bg_jj"></text>
-							</view>
-
-							<view class="flex ai_c" wx:else="{{}}">
-								未选择<text class="bg_jj"></text>
-							</view>
-
-						</view>
-					</block>
-				</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 && 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">
-							<text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text>
-							<text wx:if="{{using_quan[item.pickup_id].money}}">￥{{using_quan[item.pickup_id].money}}元优惠券</text>
-							<text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text>
-							<view class="xc-right"></view>
-						</view>
-					</view>
-				</view>
+    </view>
+
+    <!-- -------------------购物车进来，有可能多单-------------------- -->
+    <block wx:if="{{is_b_now==0}}">
+      <!-- <view class="xc-border main-top"></view> -->
+      <view wx:for="{{cartlist}}" wx:for-index="pidx">
+        <view class="use-item bfff bdr_t-14 mgt20">
+          <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image>
+          <!-- <view>门店：{{item.pname}}</view> -->
+          <view>{{item.pname}}</view>
+        </view>
+        <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
+          <!----商品图片----->
+          <view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
+            <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+            <text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
+            <image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
+          </view>
+          <!----商品名称规格---->
+          <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
+            <view class="goods-name ellipsis-2">{{items.goods_name}}</view>
+            <!-- 商品属性 -->
+            <view class="flex-vertical fs28 color-gray n_guige">
+              <view class="goods-color">
+                <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
+              </view>
+            </view>
+
+            <!-----商品名称规格------>
+            <view class="order-num flex-space-between">
+              <view wx:if="{{items.prom_type==10}}" class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text><text>({{items.discount}}折)</text></view>
+              <view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
+              <view class="goods-num">x{{items.goods_num}}</view>
+            </view>
+          </navigator>
+        </view>
 
+        <!-- 使用搭配 -->
+        <cart_collect_temp bind:childFun="select_coll" sales_rules="{{sales_rules}}" pick="{{item.pickup_id}}" is_cart="1" cart_index="{{pidx}}" distr_t="{{item.distr_t}}" appoint_pick_keyid="{{appoint_pick_keyid}}" all_collocation_list="{{item.collocationList}}" />
+
+        <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+        <view class="plus_buy fs28" wx:if="{{item.card_cut_price>0}}">
+          <view class="flex">
+            <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+              <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
+                </ image>
+                <text class="card_name">{{show_card.CardName}}</text>
+            </view>
+            <view>立减 <text style="color:#f23030;">{{filters.toFix(item.card_cut_price,2) }}</text> 元</view>
+          </view>
+          <view>
+            <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+          </view>
+          <!-- 三角形 -->
+          <view class="car_tri_up"></view>
+          <!-- 立即开通跳转 -->
+          <view bindtap="buycard" class="card_op">立即开通</view>
+        </view>
+
+        <view class="set-mes bdr_b-14">
+          <view wx:if="{{order.store_prom}}">
+            <icon color="#f23030" size="16" type="info"></icon>
+            {{order.store_prom}}
+          </view>
+
+          <!-- 当是物流很多单的时候 -->
+          <view class="use-item flex-space-between" wx:if="{{cartlist.length>1 && show_submit}}">
+            <view class="flex-vertical">
+              <view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;display:{{item.distr_t==2?'none':'flex;align-items: center'}};">
+                <!-- <icon  bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> -->
+
+                <block wx:if="{{item.exp_type==1}}">
+                  <!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
+                  <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>
+                </block>
+                <view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
+              </view>
+
+              <view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
+
+                <block wx:if="{{item.exp_type==0}}">
+                  <icon data-t='0' 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='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 && 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>
+
+          </view>
+
+          <!-- 当是物流，只有一单的时候 -->
+          <block wx:else>
+            <view class="use-item flex-space-between" wx:if="{{item.exp_type==0 && !is_default_logistics}}">
+              <view class="flex jc_sb" style="width: 100%; padding: 0 13rpx;">
+                <view>选择物流</view>
+                <view 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>
+              </view>
+            </view>
+          </block>
+        </view>
+
+        <!-- 有送礼包 -->
+        <view wx:if="{{send_lb[item.pickup_id]}}">
+          <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
+                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+              </view>
+              <view class="flex ai_c">
+                x{{send.num}}<text class="bg_jj"></text>
+              </view>
+            </view>
+          </block>
+        </view>
+        <!-- 赠品的显示 -->
+        <view wx:if="{{send_gf[item.pickup_id]}}">
+          <block wx:for="{{send_gf[item.pickup_id]}}" wx:for-item="iter">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{item.pickup_id}}" data-index="{{index}}" bindtap="show_sele_gift">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
+              </view>
+
+              <view class="flex ai_c" wx:if="{{iter.selected}}">
+                已选择<text class="bg_jj"></text>
+              </view>
+
+              <view class="flex ai_c" wx:else="{{}}">
+                未选择<text class="bg_jj"></text>
+              </view>
+
+            </view>
+          </block>
+        </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 && 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">
+              <text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text>
+              <text wx:if="{{using_quan[item.pickup_id].money}}">￥{{using_quan[item.pickup_id].money}}元优惠券</text>
+              <text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </view>
+
+
+
+        <!-- 留言 -->
+        <view class="coupon-mes flex-vertical">
+          <view>留言</view>
+          <view class="leave-word">
+            <input placeholder="给商家留言，最多100字" bindinput="keyUpChangeNum" data-index="{{pidx}}" value="{{user_note[pidx]}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}" />
+
+          </view>
+        </view>
         <!-- 预存款 -->
         <view class="set-mes" wx:if="{{item.yck_off}}" data-ind="{{pidx}}" data-item="{{item}}" catchtap="prestore">
           <view class="use-item" style="justify-content: space-between;">
             <view>
-              <icon  color="{{item.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+              <icon color="{{item.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
               <view class="yu_er">使用预存</view>
             </view>
             <view wx:if="{{item.yck_off==2}}">￥{{filters.toFix(item.yck,2)}}</view>
           </view>
         </view>
 
-				<!-- 留言 -->
-				<view class="coupon-mes flex-vertical">
-					<view>留言</view>
-					<view class="leave-word">
-						<input placeholder="给商家留言，最多100字" bindinput="keyUpChangeNum" data-index="{{pidx}}" value="{{user_note[pidx]}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}" />
-
-					</view>
-				</view>
-
-				<!-- 是否参与店铺优惠 -->
-				<view class="coupon-mes flex-vertical" data-index="{{index}}" bindtap="cart_pop_offline" wx:if="{{item.offline_price}}">
-					<view>店铺优惠</view>
-					<view class="leave-word fs32" style="color: #999;">
-						省{{filters.toFix(item.offline_price,2)}}元
-					</view>
-					<block wx:if="{{item.is_offline}}">
-						<text style="color: #d7642b;">-￥{{filters.toFix(item.offline_price,2)}}</text>
-					</block>
-					<block wx:else>
-						<text style="color: #d7642b;">不使用优惠</text>
-					</block>
-					<!-- 右边点击 -->
-					<view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
-				</view>
-
-			</view>
-
-
-			<!-----使用佣金------>
-			<view  class="set-mes bdr_t-14" wx:if="{{cart_commission>0 && can_commission}}">
-
-				<view class="use-item" bindtap='set_cart_commission'>
-					<icon color="{{cart_use_commission?'red':'gray'}}" size="16" type="success"></icon>
-					<view class="yu_er">使用佣金 :￥{{cart_commission}} </view>
-				</view>
-			</view>
-
-			<!-- ---使用余额---- -->
-			<view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
-				<view class="use-item" bindtap='set_js_useyuer'>
-					<icon color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon>
-					<view class="yu_er">使用余额 :￥{{yuer}} </view>
-				</view>
-			</view>
-
-		</block>
-
-		<!-- ----立即购买------ -->
-		<block wx:if="{{is_b_now==1}}">
-			<view class="use-item bfff bdr_t-14 mgt20">
-				<image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
-				<view>{{bn_pickname}}</view>
-			</view>
-			<view class="order-detail">
-				<view class="goods-img" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{bn_goods.prom_type}}&prom_id={{bn_goods.prom_id}}">
-					<image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
-				</view>
-				<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
-					<view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
-					<!-- 商品属性 -->
-					<view class="flex-vertical fs28 xc-ash color-gray n_guige">
-						<view class="goods-color">
-							<block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block>
-						</view>
-					</view>
-
-					<!-- ---商品名称规格---- -->
-					<view class="order-num  flex-space-between">
-						<view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
-						<view class="goods-num">x{{bn_goods.buynum}}</view>
-					</view>
-				</navigator>
-
-			</view>
-			<!-- 赠品的显示 -->
-			<block wx:if="{{buy_now_gift_goods}}">
-				<view class="order-detail" wx:for="{{buy_now_gift_goods}}">
-					<view class="goods-img" style="position: relative">
-						<image src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
-
-						<image class="wh100 bdr14" src="{{item.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods[{{index}}].original_img"></image>
-					</view>
-					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-						<view class="goods-name ellipsis-2">{{item.goods_name}}</view>
-						<!-- 商品属性 -->
-						<view class="flex-vertical fs28 xc-ash color-gray n_guige">
-							<view class="goods-color">
-								<block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block>
-							</view>
-						</view>
-						<!-- ---商品名称规格---- -->
-						<view class="order-num  flex-space-between">
-							<view class="co-red">￥<text class="fs36">0</text></view>
-							<view class="goods-num">x{{item.buynum}}</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-
-
-			<block wx:if="{{collocation_goods}}">
-				<!-- 搭配购买的功能实现 -->
-				<view class="order-detail" wx:for="{{collocation_goods}}">
-					<view class="goods-img">
-						<image class="wh100 bdr14" src="{{imgUrl+item.original_img}}" binderror='cart_set_err1' data-err="collocation_goods[{{index}}].original_img"></image>
-					</view>
-					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-						<view class="goods-name ellipsis-2">{{item.goods_name}}</view>
-						<!-- 商品属性 -->
-						<view class="flex-vertical fs28 xc-ash color-gray n_guige">
-							<view class="goods-color">
-								<block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block>
-							</view>
-						</view>
-						<!-- ---商品名称规格---- -->
-						<view class="order-num  flex-space-between">
-							<view class="co-red">￥<text class="fs36">{{item.price}}</text></view>
-							<view class="goods-num">x{{item.goods_num}}</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-
-			<!-- 使用搭配 -->
-			<cart_collect_temp  bind:childFun="select_coll"    all_collocation_list="{{all_collocation_list}}"
-								appoint_pick_keyid="{{appoint_pick_keyid}}"
-								sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
-
-
-			<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-			<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
-				<view class="flex">
-					<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-						<image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
-							</ image>
-							<text class="card_name">{{show_card.CardName}}</text>
-					</view>
-					<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
-				</view>
-				<view>
-					<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-				</view>
-				<!-- 三角形 -->
-				<view class="car_tri_up"></view>
-				<!-- 立即开通跳转 -->
-				<view bindtap="buycard" class="card_op">立即开通</view>
-			</view>
-
-			<!-- 有送礼包 -->
-			<view wx:if="{{bn_goods.s_libao}}">
-					<view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" bindtap="viewLbDetails">
-						<view class="flex ai_c">
-							<view class="circle1">赠</view>{{bn_goods.lbtitle}}
-							<!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
-						</view>
-						<view class="flex ai_c">
-							x{{bn_goods.s_lb_num}}<text class="bg_jj"></text>
-						</view>
-					</view>
-			</view>
-			<!-- 有送专享礼包 -->
-			<view wx:if="{{bn_goods.zx_libao}}">
-					<view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}" data-flag="1" bindtap="viewLbDetails">
-						<view class="flex ai_c">
-							<view class="circle1">赠</view>{{bn_goods.zxlbtitle}}
-							<!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
-						</view>
-						<view class="flex ai_c">
-							x{{bn_goods.zx_lb_num}}<text class="bg_jj"></text>
-						</view>
-					</view>
-			</view>
-
-
-			<!-- 赠品的显示 -->
-			<view wx:if="{{send_gf[bn_pick]}}">
-				<block wx:for="{{send_gf[bn_pick]}}" wx:for-item="iter">
-					<view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{bn_pick}}" data-index="{{index}}" bindtap="show_sele_gift">
-						<view class="flex ai_c">
-							<view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
-						</view>
-
-						<view class="flex ai_c" wx:if="{{iter.selected}}">
-							已选择<text class="bg_jj"></text>
-						</view>
-
-						<view class="flex ai_c" wx:else="{{}}">
-							未选择<text class="bg_jj"></text>
-						</view>
-
-					</view>
-				</block>
-			</view>
-
-
-			<view class="set-mes bdr_b-14">
-
-				<view wx:if="{{order.store_prom}}">
-					<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}}"
-					  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 && 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>
-							<block wx:else>
-								<text wx:if="{{using_quan[bn_pick].money}}">￥{{using_quan[bn_pick].money}}元优惠券</text>
-								<text wx:if="{{using_quan[bn_pick].isby}}">包邮券</text>
-							</block>
-							<view class="xc-right"></view>
-						</view>
-					</view>
-				</view>
-
-				<view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
-					<view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
-						<view>选择物流</view>
-						<view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
-							<view class="logistics-name">{{wu_arr[index].name}}</view>
-							<view class="xc-right"></view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 留言 -->
-			<view class="coupon-mes flex-vertical">
-				<view>留言</view>
-				<view class="leave-word">
-					<input placeholder-class="fs28" placeholder='给商家留言，最多100字' data-index="{{index}}" bindinput="keyUpChangeNum" class="word-box" maxlength="100" name="user_note"></input>
-				</view>
-			</view>
-
-			<!-- 是否参与店铺优惠 -->
-			<view class="coupon-mes flex-vertical" bindtap="bn_pop_offline" wx:if="{{bn_goods.offline_price}}">
-				<view>店铺优惠</view>
-				<view class="leave-word fs32" style="color: #999;">
-					省{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}元
-				</view>
-				<block wx:if="{{bn_goods.is_offline}}">
-					<text style="color: #d7642b;">-￥{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}</text>
-				</block>
-				<block wx:else>
-					<text style="color: #d7642b;">不使用优惠</text>
-				</block>
-				<!-- 右边点击 -->
-				<view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
-			</view>
-
-
-			<!-----使用佣金------>
-			<view  class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission}}">
-				<view class="use-item" bindtap='set_bn_commission'>
-					<icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
-					<view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
-				</view>
-			</view>
-
-
-			<!-----使用余额------>
-			<view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
-				<view class="use-item" bindtap='set_bn_useyuer'>
-					<icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
-					<view class="yu_er">使用余额 :￥{{yuer}} </view>
-				</view>
-			</view>
-        <!-- 预存款 -->
-        <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
+        <!-- 是否参与店铺优惠 -->
+        <view class="coupon-mes flex-vertical" data-index="{{index}}" bindtap="cart_pop_offline" wx:if="{{item.offline_price}}">
+          <view>店铺优惠</view>
+          <view class="leave-word fs32" style="color: #999;">
+            省{{filters.toFix(item.offline_price,2)}}元
+          </view>
+          <block wx:if="{{item.is_offline}}">
+            <text style="color: #d7642b;">-￥{{filters.toFix(item.offline_price,2)}}</text>
+          </block>
+          <block wx:else>
+            <text style="color: #d7642b;">不使用优惠</text>
+          </block>
+          <!-- 右边点击 -->
+          <view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
+        </view>
+
+      </view>
+
+
+      <!-----使用佣金------>
+      <view class="set-mes bdr_t-14" wx:if="{{cart_commission>0 && can_commission}}">
+
+        <view class="use-item" bindtap='set_cart_commission'>
+          <icon color="{{cart_use_commission?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用佣金 :￥{{cart_commission}} </view>
+        </view>
+      </view>
+
+      <!-- ---使用余额---- -->
+      <view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
+        <view class="use-item" bindtap='set_js_useyuer'>
+          <icon color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用余额 :￥{{yuer}} </view>
+        </view>
+      </view>
+
+    </block>
+
+    <!-- ----立即购买------ -->
+    <block wx:if="{{is_b_now==1}}">
+      <view class="use-item bfff bdr_t-14 mgt20">
+        <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
+        <view>{{bn_pickname}}</view>
+      </view>
+      <view class="order-detail">
+        <view class="goods-img" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{bn_goods.prom_type}}&prom_id={{bn_goods.prom_id}}">
+          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
+        </view>
+        <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
+          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
+          <!-- 商品属性 -->
+          <view class="flex-vertical fs28 xc-ash color-gray n_guige">
+            <view class="goods-color">
+              <block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block>
+            </view>
+          </view>
+
+          <!-- ---商品名称规格---- -->
+          <view class="order-num  flex-space-between">
+            <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+            <view class="goods-num">x{{bn_goods.buynum}}</view>
+          </view>
+        </navigator>
+
+      </view>
+      <!-- 赠品的显示 -->
+      <block wx:if="{{buy_now_gift_goods}}">
+        <view class="order-detail" wx:for="{{buy_now_gift_goods}}">
+          <view class="goods-img" style="position: relative">
+            <image src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+
+            <image class="wh100 bdr14" src="{{item.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods[{{index}}].original_img"></image>
+          </view>
+          <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+            <view class="goods-name ellipsis-2">{{item.goods_name}}</view>
+            <!-- 商品属性 -->
+            <view class="flex-vertical fs28 xc-ash color-gray n_guige">
+              <view class="goods-color">
+                <block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block>
+              </view>
+            </view>
+            <!-- ---商品名称规格---- -->
+            <view class="order-num  flex-space-between">
+              <view class="co-red">￥<text class="fs36">0</text></view>
+              <view class="goods-num">x{{item.buynum}}</view>
+            </view>
+          </navigator>
+        </view>
+      </block>
+
+
+      <block wx:if="{{collocation_goods}}">
+        <!-- 搭配购买的功能实现 -->
+        <view class="order-detail" wx:for="{{collocation_goods}}">
+          <view class="goods-img">
+            <image class="wh100 bdr14" src="{{imgUrl+item.original_img}}" binderror='cart_set_err1' data-err="collocation_goods[{{index}}].original_img"></image>
+          </view>
+          <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+            <view class="goods-name ellipsis-2">{{item.goods_name}}</view>
+            <!-- 商品属性 -->
+            <view class="flex-vertical fs28 xc-ash color-gray n_guige">
+              <view class="goods-color">
+                <block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block>
+              </view>
+            </view>
+            <!-- ---商品名称规格---- -->
+            <view class="order-num  flex-space-between">
+              <view class="co-red">￥<text class="fs36">{{item.price}}</text></view>
+              <view class="goods-num">x{{item.goods_num}}</view>
+            </view>
+          </navigator>
+        </view>
+      </block>
+
+      <!-- 使用搭配 -->
+      <cart_collect_temp bind:childFun="select_coll" all_collocation_list="{{all_collocation_list}}" appoint_pick_keyid="{{appoint_pick_keyid}}" sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
+
+
+      <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+      <view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
+        <view class="flex">
+          <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+            <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
+              </ image>
+              <text class="card_name">{{show_card.CardName}}</text>
+          </view>
+          <view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
+        </view>
+        <view>
+          <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+        </view>
+        <!-- 三角形 -->
+        <view class="car_tri_up"></view>
+        <!-- 立即开通跳转 -->
+        <view bindtap="buycard" class="card_op">立即开通</view>
+      </view>
+
+      <!-- 有送礼包 -->
+      <view wx:if="{{bn_goods.s_libao}}">
+        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" bindtap="viewLbDetails">
+          <view class="flex ai_c">
+            <view class="circle1">赠</view>{{bn_goods.lbtitle}}
+            <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+          </view>
+          <view class="flex ai_c">
+            x{{bn_goods.s_lb_num}}<text class="bg_jj"></text>
+          </view>
+        </view>
+      </view>
+      <!-- 有送专享礼包 -->
+      <view wx:if="{{bn_goods.zx_libao}}">
+        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}" data-flag="1" bindtap="viewLbDetails">
+          <view class="flex ai_c">
+            <view class="circle1">赠</view>{{bn_goods.zxlbtitle}}
+            <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+          </view>
+          <view class="flex ai_c">
+            x{{bn_goods.zx_lb_num}}<text class="bg_jj"></text>
+          </view>
+        </view>
+      </view>
+
+
+      <!-- 赠品的显示 -->
+      <view wx:if="{{send_gf[bn_pick]}}">
+        <block wx:for="{{send_gf[bn_pick]}}" wx:for-item="iter">
+          <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{bn_pick}}" data-index="{{index}}" bindtap="show_sele_gift">
+            <view class="flex ai_c">
+              <view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
+            </view>
+
+            <view class="flex ai_c" wx:if="{{iter.selected}}">
+              已选择<text class="bg_jj"></text>
+            </view>
+
+            <view class="flex ai_c" wx:else="{{}}">
+              未选择<text class="bg_jj"></text>
+            </view>
+
+          </view>
+        </block>
+      </view>
+
+
+      <view class="set-mes bdr_b-14">
+
+        <view wx:if="{{order.store_prom}}">
+          <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}}" 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 && 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>
+              <block wx:else>
+                <text wx:if="{{using_quan[bn_pick].money}}">￥{{using_quan[bn_pick].money}}元优惠券</text>
+                <text wx:if="{{using_quan[bn_pick].isby}}">包邮券</text>
+              </block>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </view>
+
+        <view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+          <view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
+            <view>选择物流</view>
+            <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
+              <view class="logistics-name">{{wu_arr[index].name}}</view>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 留言 -->
+      <view class="coupon-mes flex-vertical">
+        <view>留言</view>
+        <view class="leave-word">
+          <input placeholder-class="fs28" placeholder='给商家留言，最多100字' data-index="{{index}}" bindinput="keyUpChangeNum" class="word-box" maxlength="100" name="user_note"></input>
+        </view>
+      </view>
+
+      <!-- 是否参与店铺优惠 -->
+      <view class="coupon-mes flex-vertical" bindtap="bn_pop_offline" wx:if="{{bn_goods.offline_price}}">
+        <view>店铺优惠</view>
+        <view class="leave-word fs32" style="color: #999;">
+          省{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}元
+        </view>
+        <block wx:if="{{bn_goods.is_offline}}">
+          <text style="color: #d7642b;">-￥{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}</text>
+        </block>
+        <block wx:else>
+          <text style="color: #d7642b;">不使用优惠</text>
+        </block>
+        <!-- 右边点击 --> 
+        <view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
+      </view>
+
+      <!-- 预存款 -->
+      <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
         <view class="use-item" style="justify-content: space-between;">
           <view>
-            <icon  color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+            <icon color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
             <view class="yu_er">使用预存</view>
           </view>
           <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
         </view>
       </view>
-		</block>
-
-		<view class="information bdr14">
-			<view class="item" wx:if="{{formData.all_price>0}}">
-				<view>商品金额</view>
-				<view class="co-red">￥ {{formData.all_price}}元</view>
-			</view>
-			<view class="item" wx:if="{{formData.shipping_price>0}}">
-				<view>配送费用</view>
-				<view class="co-red">￥ {{formData.shipping_price}}元</view>
-			</view>
-			<view class="item" wx:if="{{formData.coupon_price>0}}">
-				<view>使用优惠券</view>
-				<view class="co-red">- ￥ {{formData.coupon_price}}元</view>
-			</view>
-			<!-- 优惠活动优惠金额 -->
-			<view class="item" wx:if="{{formData.cut_price>0}}">
-				<view>优惠活动</view>
-				<view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
-			</view>
-			<!-- 组合购优惠金额 -->
-			<view class="item" wx:if="{{formData.zh_cut_price>0 || formData.zh_cut_price<0}}">
-				<view>组合购优惠</view>
-				<view class="co-red">- ￥ {{filters.toFix(formData.zh_cut_price,2)}}元</view>
-			</view>
-			<!-- 组合购优惠金额 -->
-			<view class="item" wx:if="{{formData.ladder_cut_price>0 || formData.ladder_cut_price<0}}">
-				<view>阶梯促销优惠</view>
-				<view class="co-red">- ￥ {{filters.toFix(formData.ladder_cut_price,2)}}元</view>
-			</view>
-
-			<!-- 订单优惠优惠金额 -->
-			<view class="item" wx:if="{{formData.order_prom_amount>0}}">
-				<view>订单优惠</view>
-				<view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
-			</view>
+
+      <!-----使用佣金------>
+      <view class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission}}">
+        <view class="use-item" bindtap='set_bn_commission'>
+          <icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
+        </view>
+      </view>
+
+
+      <!-----使用余额------>
+      <view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
+        <view class="use-item" bindtap='set_bn_useyuer'>
+          <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用余额 :￥{{yuer}} </view>
+        </view>
+      </view>
+
+    </block>
+
+    <view class="information bdr14">
+      <view class="item" wx:if="{{formData.all_price>0}}">
+        <view>商品金额</view>
+        <view class="co-red">￥ {{formData.all_price}}元</view>
+      </view>
+      <view class="item" wx:if="{{formData.shipping_price>0}}">
+        <view>配送费用</view>
+        <view class="co-red">￥ {{formData.shipping_price}}元</view>
+      </view>
+      <view class="item" wx:if="{{formData.coupon_price>0}}">
+        <view>使用优惠券</view>
+        <view class="co-red">- ￥ {{formData.coupon_price}}元</view>
+      </view>
+      <!-- 优惠活动优惠金额 -->
+      <view class="item" wx:if="{{formData.cut_price>0}}">
+        <view>优惠活动</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
+      </view>
+      <!-- 组合购优惠金额 -->
+      <view class="item" wx:if="{{formData.zh_cut_price>0 || formData.zh_cut_price<0}}">
+        <view>组合购优惠</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.zh_cut_price,2)}}元</view>
+      </view>
+      <!-- 组合购优惠金额 -->
+      <view class="item" wx:if="{{formData.ladder_cut_price>0 || formData.ladder_cut_price<0}}">
+        <view>阶梯促销优惠</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.ladder_cut_price,2)}}元</view>
+      </view>
+
+      <!-- 订单优惠优惠金额 -->
+      <view class="item" wx:if="{{formData.order_prom_amount>0}}">
+        <view>订单优惠</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
+      </view>
       <!-- 使用预存优惠金额 -->
       <view class="item" wx:if="{{formData.prestore>0}}">
         <view>使用预存</view>
         <view class="co-red">- ￥ {{filters.toFix(formData.prestore,2)}}元</view>
       </view>
-			<view class="item" wx:if="{{formData.user_money>0}}">
-				<view>使用余额</view>
-				<view class="co-red">- ￥ {{formData.user_money}}元</view>
-			</view>
-		</view>
-	</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 class="co-red big"></view> -->
-		</view>
-		<button class="tips-btn" formType="submit" id="submitOrder" disabled="{{submit}}" bindtap="requestSubscribe">提交订单</button>
-	</view>
+      <view class="item" wx:if="{{formData.user_money>0}}">
+        <view>使用余额</view>
+        <view class="co-red">- ￥ {{formData.user_money}}元</view>
+      </view>
+    </view>
+  </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 class="co-red big"></view> -->
+    </view>
+    <button class="tips-btn" formType="submit" id="submitOrder" disabled="{{submit}}" bindtap="requestSubscribe">提交订单</button>
+  </view>
 </form>
 
 <!-- 使用券列表的弹窗 -->
 <view wx:if='{{open_quan==1}}'>
-	<view class="cover-layer flex-center " bindtap='close_coupon'> </view>
-	<view class="cx-popup {{open_quan==true?'up' : 'down'}}">
-		<!-- 最上面 -->
-		<view class="top flex">
-			<view class="xc-top-content  t-c">
-				<view class="xc-title">优惠券使用</view>
-			</view>
-			<view class="xc-close-frame" bindtap='close_coupon'>
-				<view class="xc-close">×</view>
-			</view>
-		</view>
-		<!-- 使用优惠券和不使用优惠券层-->
-		<view class="may_use_coupon fs28 flex"> 可使用的优惠券
-			<view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券
-				<block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}">
-					<view class="circle white xc-hooka fs20 red-b  sn"><text>Γ</text></view>
-				</block>
-				<block wx:else>
-					<view class="circle  xc-hookst ons"></view>
-				</block>
-			</view>
-		</view>
-
-		<!-- 中间券内容显示 -->
-		<view class="xc-frame flex-level">
-			<view class="list-frame">
-				<view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}" wx:for-item="item" wx:for-index="q_index">
-					<view class="xc-coupon-frame flex-center" data-ind="{{q_index}}">
-						<view class="coupon-frame flex rel">
-							<!-- 锯齿 -->
-							<include src="juchi_part.wxml" />
-							<!-- 左边 -->
-							<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-								<view class="white xc-money-frames">
-									<view class="f_text"><text class="xc-rmb-symbol">￥</text><text class="xc-rmb-val">{{item.Sum}}</text></view>
-									<view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用</view>
-									<view class="coupon-explain t-c" wx:else>满0元可用</view>
-								</view>
-							</view>
-							<!-- 右边 -->
-							<view class="coupon-right flex-center rel">
-								<view class="coupon-annotation  flex">
-									<view class="flex  top-frame">
-										<view class="frame">
-											<view class="coupon-wode ib flex ellipsis-2 ">
-												<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}</text>
-												<block>{{item.Sum}}元优惠券</block>
-											</view>
-											<view class="coupon-time">{{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
-										</view>
-									</view>
-									<block wx:if="{{item.show_red}}">
-										<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-									</block>
-									<block wx:else>
-										<view class="circle  xc-hooks on"></view>
-									</block>
-								</view>
-								<include src="remark_click_part.wxml" />
-							</view>
-						</view>
-					</view>
-					<!-- 打开是说明 -->
-					<include src="remark_part.wxml" />
-				</view>
-				<!-- 包邮券的显示，立即购买 -->
-				<block wx:if="{{ is_b_now && bn_exp_type==0}}">
-					<view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index">
-						<view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
-							<view class="coupon-frame flex rel">
-								<!-- 锯齿 -->
-								<include src="juchi_part.wxml" />
-								<!-- 左边 -->
-								<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-									<view class="white xc-money-frames">
-										<view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
-										<view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
-										<view class="coupon-explain t-c" wx:else>满0元可用</view>
-									</view>
-								</view>
-								<!-- 右边 -->
-								<view class="coupon-right flex-center rel">
-									<view class="coupon-annotation  flex">
-										<view class="flex  top-frame">
-											<view class="frame">
-												<view class="coupon-wode ib flex ellipsis-2 ">
-													<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
-													<block>包邮券</block>
-												</view>
-												<view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
-											</view>
-										</view>
-										<block wx:if="{{item.show_red}}">
-											<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-										</block>
-										<block wx:else>
-											<view class="circle  xc-hooks on"></view>
-										</block>
-									</view>
-									<include src="remark_click_part2.wxml" />
-								</view>
-							</view>
-						</view>
-						<!-- 打开是说明 -->
-						<include src="remark_part.wxml" />
-					</view>
-				</block>
-
-				<!-- 包邮券的显示，购物车购买 -->
-				<block wx:if="{{!is_b_now && sele_exp_type==0}}">
-					<view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index">
-						<view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
-							<view class="coupon-frame flex rel">
-								<!-- 锯齿 -->
-								<include src="juchi_part.wxml" />
-								<!-- 左边 -->
-								<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-									<view class="white xc-money-frames">
-										<view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
-										<view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
-										<view class="coupon-explain t-c" wx:else>满0元可用</view>
-									</view>
-								</view>
-								<!-- 右边 -->
-								<view class="coupon-right flex-center rel">
-									<view class="coupon-annotation  flex">
-										<view class="flex  top-frame">
-											<view class="frame">
-												<view class="coupon-wode ib flex ellipsis-2 ">
-													<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
-													<block>包邮券</block>
-												</view>
-												<view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
-											</view>
-										</view>
-										<block wx:if="{{item.show_red}}">
-											<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-										</block>
-										<block wx:else>
-											<view class="circle  xc-hooks on"></view>
-										</block>
-									</view>
-									<include src="remark_click_part2.wxml" />
-								</view>
-							</view>
-						</view>
-						<!-- 打开是说明 -->
-						<include src="remark_part.wxml" />
-					</view>
-				</block>
-
-
-			</view>
-		</view>
-		<!-- 最底下确定层-->
-		<view class="determine-frame">
-			<view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定 </view>
-		</view>
-	</view>
+  <view class="cover-layer flex-center " bindtap='close_coupon'> </view>
+  <view class="cx-popup {{open_quan==true?'up' : 'down'}}">
+    <!-- 最上面 -->
+    <view class="top flex">
+      <view class="xc-top-content  t-c">
+        <view class="xc-title">优惠券使用</view>
+      </view>
+      <view class="xc-close-frame" bindtap='close_coupon'>
+        <view class="xc-close">×</view>
+      </view>
+    </view>
+    <!-- 使用优惠券和不使用优惠券层-->
+    <view class="may_use_coupon fs28 flex"> 可使用的优惠券
+      <view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券
+        <block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}">
+          <view class="circle white xc-hooka fs20 red-b  sn"><text>Γ</text></view>
+        </block>
+        <block wx:else>
+          <view class="circle  xc-hookst ons"></view>
+        </block>
+      </view>
+    </view>
+
+    <!-- 中间券内容显示 -->
+    <view class="xc-frame flex-level">
+      <view class="list-frame">
+        <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}" wx:for-item="item" wx:for-index="q_index">
+          <view class="xc-coupon-frame flex-center" data-ind="{{q_index}}">
+            <view class="coupon-frame flex rel">
+              <!-- 锯齿 -->
+              <include src="juchi_part.wxml" />
+              <!-- 左边 -->
+              <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                <view class="white xc-money-frames">
+                  <view class="f_text"><text class="xc-rmb-symbol">￥</text><text class="xc-rmb-val">{{item.Sum}}</text></view>
+                  <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用</view>
+                  <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                </view>
+              </view>
+              <!-- 右边 -->
+              <view class="coupon-right flex-center rel">
+                <view class="coupon-annotation  flex">
+                  <view class="flex  top-frame">
+                    <view class="frame">
+                      <view class="coupon-wode ib flex ellipsis-2 ">
+                        <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}</text>
+                        <block>{{item.Sum}}元优惠券</block>
+                      </view>
+                      <view class="coupon-time">{{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
+                    </view>
+                  </view>
+                  <block wx:if="{{item.show_red}}">
+                    <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
+                  </block>
+                  <block wx:else>
+                    <view class="circle  xc-hooks on"></view>
+                  </block>
+                </view>
+                <include src="remark_click_part.wxml" />
+              </view>
+            </view>
+          </view>
+          <!-- 打开是说明 -->
+          <include src="remark_part.wxml" />
+        </view>
+        <!-- 包邮券的显示，立即购买 -->
+        <block wx:if="{{ is_b_now && bn_exp_type==0}}">
+          <view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index">
+            <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
+              <view class="coupon-frame flex rel">
+                <!-- 锯齿 -->
+                <include src="juchi_part.wxml" />
+                <!-- 左边 -->
+                <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                  <view class="white xc-money-frames">
+                    <view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
+                    <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
+                    <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                  </view>
+                </view>
+                <!-- 右边 -->
+                <view class="coupon-right flex-center rel">
+                  <view class="coupon-annotation  flex">
+                    <view class="flex  top-frame">
+                      <view class="frame">
+                        <view class="coupon-wode ib flex ellipsis-2 ">
+                          <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
+                          <block>包邮券</block>
+                        </view>
+                        <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
+                      </view>
+                    </view>
+                    <block wx:if="{{item.show_red}}">
+                      <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
+                    </block>
+                    <block wx:else>
+                      <view class="circle  xc-hooks on"></view>
+                    </block>
+                  </view>
+                  <include src="remark_click_part2.wxml" />
+                </view>
+              </view>
+            </view>
+            <!-- 打开是说明 -->
+            <include src="remark_part.wxml" />
+          </view>
+        </block>
+
+        <!-- 包邮券的显示，购物车购买 -->
+        <block wx:if="{{!is_b_now && sele_exp_type==0}}">
+          <view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index">
+            <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
+              <view class="coupon-frame flex rel">
+                <!-- 锯齿 -->
+                <include src="juchi_part.wxml" />
+                <!-- 左边 -->
+                <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                  <view class="white xc-money-frames">
+                    <view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
+                    <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
+                    <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                  </view>
+                </view>
+                <!-- 右边 -->
+                <view class="coupon-right flex-center rel">
+                  <view class="coupon-annotation  flex">
+                    <view class="flex  top-frame">
+                      <view class="frame">
+                        <view class="coupon-wode ib flex ellipsis-2 ">
+                          <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
+                          <block>包邮券</block>
+                        </view>
+                        <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
+                      </view>
+                    </view>
+                    <block wx:if="{{item.show_red}}">
+                      <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
+                    </block>
+                    <block wx:else>
+                      <view class="circle  xc-hooks on"></view>
+                    </block>
+                  </view>
+                  <include src="remark_click_part2.wxml" />
+                </view>
+              </view>
+            </view>
+            <!-- 打开是说明 -->
+            <include src="remark_part.wxml" />
+          </view>
+        </block>
+
+
+      </view>
+    </view>
+    <!-- 最底下确定层-->
+    <view class="determine-frame">
+      <view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定 </view>
+    </view>
+  </view>
 </view>
 <!----弹起选择物流名的列表---->
 <view wx:if='{{open_express==1}}'>
-	<view class="cover-layer flex-center " bindtap='close_express'>
-	</view>
-
-	<view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
-		<view class="tops flex">
-			<view class="top-content fs32">
-				<view>选择物流名字</view>
-			</view>
-			<view class="close-frame" bindtap='close_express'>
-				<view class="xc-close-express">×</view>
-			</view>
-		</view>
-		<view class="express_list">
-			<view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-				<view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
-
-					<block wx:if="{{is_express==idx}}">
-						<view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
-					</block>
-					<block wx:else>
-						<view class="circle  xc-hooks"></view>
-					</block>
-					<view class="fs30">{{express_list.name}}</view>
-
-				</view>
-			</view>
-		</view>
-		<view class="flex click-buttem">
-			<view class="xc-determine flex-center" bindtap="determine_expres">
-				<view class="flex-vertical  t-c">确定</view>
-			</view>
-			<view class="xc-confirms flex-center" bindtap="select_default_logistics">
-				<view class="flex-vertical  t-c">设为默认</view>
-			</view>
-		</view>
-
-	</view>
+  <view class="cover-layer flex-center " bindtap='close_express'>
+  </view>
+
+  <view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
+    <view class="tops flex">
+      <view class="top-content fs32">
+        <view>选择物流名字</view>
+      </view>
+      <view class="close-frame" bindtap='close_express'>
+        <view class="xc-close-express">×</view>
+      </view>
+    </view>
+    <view class="express_list">
+      <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+        <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+          <block wx:if="{{is_express==idx}}">
+            <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
+          </block>
+          <block wx:else>
+            <view class="circle  xc-hooks"></view>
+          </block>
+          <view class="fs30">{{express_list.name}}</view>
+
+        </view>
+      </view>
+    </view>
+    <view class="flex click-buttem">
+      <view class="xc-determine flex-center" bindtap="determine_expres">
+        <view class="flex-vertical  t-c">确定</view>
+      </view>
+      <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+        <view class="flex-vertical  t-c">设为默认</view>
+      </view>
+    </view>
+
+  </view>
 </view>
 <warn id="warn"></warn>
 <!-- 是不是使用店铺优惠pop -->
 <view class="cover-layer flex ai-center" bindtap="close_offline" wx:if="{{is_offline_show}}">
-	<view style="background-color: #fff; width: 540rpx; margin: 0 auto; border-radius: 20rpx;">
-		<view class="fs32" style="text-align: center;height: 80rpx; line-height: 80rpx;">店铺优惠</view>
-		<view class="flex jc_sb ai-center fs28" style="height: 80rpx; width: 400rpx; margin-left: 70rpx;">
-			<view catchtap="sure_offline" class="flex ai-center">优惠￥{{show_off_price}}
-				<icon style="margin-left: 10rpx;" color="{{is_get_offline?'red':'gray'}}" size="14" type="success" role="img"></icon>
-			</view>
-			<view catchtap="cancle_offline" class="flex ai-center">不用优惠
-				<icon style="margin-left: 10rpx;" color="{{is_get_offline!=1?'red':'gray'}}" size="14" type="success" role="img"></icon>
-			</view>
-		</view>
-	</view>
+  <view style="background-color: #fff; width: 540rpx; margin: 0 auto; border-radius: 20rpx;">
+    <view class="fs32" style="text-align: center;height: 80rpx; line-height: 80rpx;">店铺优惠</view>
+    <view class="flex jc_sb ai-center fs28" style="height: 80rpx; width: 400rpx; margin-left: 70rpx;">
+      <view catchtap="sure_offline" class="flex ai-center">优惠￥{{show_off_price}}
+        <icon style="margin-left: 10rpx;" color="{{is_get_offline?'red':'gray'}}" size="14" type="success" role="img"></icon>
+      </view>
+      <view catchtap="cancle_offline" class="flex ai-center">不用优惠
+        <icon style="margin-left: 10rpx;" color="{{is_get_offline!=1?'red':'gray'}}" size="14" type="success" role="img"></icon>
+      </view>
+    </view>
+  </view>
 </view>
 
 <!-- 多赠品 -->
 <view class="duo_gift_sele" wx:if="{{show_duo_gift}}">
-	<!-- top search -->
-	<view class="flex gift_top_v ai_c">
-		<text bindtap="close_sele_gift" class="bg_jj1"></text>
-		<view class="pdh20 pdv10 flex ai_c jc_sb">
-			<view class="input-box" style="width: 580rpx;display: flex; padding-left: 20rpx">
-				<view class="sear_box" bindtap="submitSearch"></view>
-				<input autoFocus class="input-search" name="word" placeholder="搜索关键字" bindconfirm="submitSearch" bindinput="getInput" bindfocus="inputFocus" value="{{keyword}}" />
-			</view>
-		</view>
-
-	</view>
-	<!-- top act_name -->
-	<view class="flex gift_top_v ai_c fs30" style="padding-left: 70rpx">
-		{{gf_pr_name}}，可任选{{zp_num}}件商品为赠品
-	</view>
-	<!-- 赠品选择 -->
-	<scroll-view scroll-y="{{true}}" style="height:calc(100% - 300rpx);">
-		<view class="order-item" hidden="{{items.hide_div}}" data-item="{{idx}}" wx:for="{{giftsinfo}}" wx:for-item="items" wx:for-index="idx">
-
-			<view bindtap="check_th_item" class="order-raido flex-vertical " data-check="{{items.selected?items.selected:0}}" data-item="{{idx}}">
-				<icon wx:if="{{items.selected}}" color="red" size="20" type="success"></icon>
-				<text wx:else class="icon_no_sele"></text>
-			</view>
-
-			<navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
-				<image class="wh100" src="{{imgUrl+items.goodsinfo.original_img}}" binderror="bind_bnerr2" data-errorimg="gift_goods[{{idx}}].goodsinfo.original_img"></image>
-			</navigator>
-			<view class="goods-cont">
-				<view class="goods-name">
-					<navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
-
-					<view class="specifications  ellipsis-1">
-						<view wx:if="{{items.goodsinfo.goods_color || items.goodsinfo.goods_spec}}">
-							{{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view>
-						<view wx:else>规格1</view>
-					</view>
-				</view>
-
-				<view class="flex alend jc_sb">
-					<view class="goods-price co-red baseline ellipsis-1">
-						<view class="fs20">￥</view>
-						<view class="fs28">{{items.goodsinfo.shop_price}}</view>
-					</view>
-					<view class="count">
-						<view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
-						<input class="goodadd" bindblur="valueToNum" data-item="{{idx}}" bindinput="refresh_input" data-item="{{idx}}" type="number" value="{{items.goods_num}}"></input>
-						<view class="add" bindtap="addNum" data-item="{{idx}}">+</view>
-					</view>
-				</view>
-
-			</view>
-		</view>
-	</scroll-view>
-	<!-- 确认选择 -->
-	<view class="pay-for flex-vertical-between" style="bottom: 0">
-		<view></view>
-		<view>
-			<button bindtap="sure_this_gift" class="pay-btn">确定</button>
-		</view>
-	</view>
+  <!-- top search -->
+  <view class="flex gift_top_v ai_c">
+    <text bindtap="close_sele_gift" class="bg_jj1"></text>
+    <view class="pdh20 pdv10 flex ai_c jc_sb">
+      <view class="input-box" style="width: 580rpx;display: flex; padding-left: 20rpx">
+        <view class="sear_box" bindtap="submitSearch"></view>
+        <input autoFocus class="input-search" name="word" placeholder="搜索关键字" bindconfirm="submitSearch" bindinput="getInput" bindfocus="inputFocus" value="{{keyword}}" />
+      </view>
+    </view>
+
+  </view>
+  <!-- top act_name -->
+  <view class="flex gift_top_v ai_c fs30" style="padding-left: 70rpx">
+    {{gf_pr_name}}，可任选{{zp_num}}件商品为赠品
+  </view>
+  <!-- 赠品选择 -->
+  <scroll-view scroll-y="{{true}}" style="height:calc(100% - 300rpx);">
+    <view class="order-item" hidden="{{items.hide_div}}" data-item="{{idx}}" wx:for="{{giftsinfo}}" wx:for-item="items" wx:for-index="idx">
+
+      <view bindtap="check_th_item" class="order-raido flex-vertical " data-check="{{items.selected?items.selected:0}}" data-item="{{idx}}">
+        <icon wx:if="{{items.selected}}" color="red" size="20" type="success"></icon>
+        <text wx:else class="icon_no_sele"></text>
+      </view>
+
+      <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
+        <image class="wh100" src="{{imgUrl+items.goodsinfo.original_img}}" binderror="bind_bnerr2" data-errorimg="gift_goods[{{idx}}].goodsinfo.original_img"></image>
+      </navigator>
+      <view class="goods-cont">
+        <view class="goods-name">
+          <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
+
+          <view class="specifications  ellipsis-1">
+            <view wx:if="{{items.goodsinfo.goods_color || items.goodsinfo.goods_spec}}">
+              {{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view>
+            <view wx:else>规格1</view>
+          </view>
+        </view>
+
+        <view class="flex alend jc_sb">
+          <view class="goods-price co-red baseline ellipsis-1">
+            <view class="fs20">￥</view>
+            <view class="fs28">{{items.goodsinfo.shop_price}}</view>
+          </view>
+          <view class="count">
+            <view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
+            <input class="goodadd" bindblur="valueToNum" data-item="{{idx}}" bindinput="refresh_input" data-item="{{idx}}" type="number" value="{{items.goods_num}}"></input>
+            <view class="add" bindtap="addNum" data-item="{{idx}}">+</view>
+          </view>
+        </view>
+
+      </view>
+    </view>
+  </scroll-view>
+  <!-- 确认选择 -->
+  <view class="pay-for flex-vertical-between" style="bottom: 0">
+    <view></view>
+    <view>
+      <button bindtap="sure_this_gift" class="pay-btn">确定</button>
+    </view>
+  </view>
 
 </view>
\ No newline at end of file
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index 18fb1fb..cdf5db0 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -287,7 +287,7 @@ Page({
     if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
       let resData = res.data.data
       resData.map(ite => {
-        yck += ite.advancesum
+        yck += ite.advancesum*1
         yckIdArr.push(ite.advanceitemid)
       })
       pre_json = resData
@@ -299,7 +299,7 @@ Page({
     } else {
       obj.yck_off = 0
     }
-    obj.yck = yck
+    obj.yck = yck.toFixed(2)
     obj.yckid = yckid
     obj.pre_json = pre_json
     return obj
diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml
index 57964df..1a901a0 100644
--- a/pages/cart/cart2_inte/cart2_inte.wxml
+++ b/pages/cart/cart2_inte/cart2_inte.wxml
@@ -129,7 +129,16 @@
 					 class="word-box" maxlength="100" name="user_note"></input>
 				</view>
 			</view>
-
+              <!-- 预存款 -->
+              <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
+        <view class="use-item" style="justify-content: space-between;">
+          <view>
+            <icon  color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+            <view class="yu_er">使用预存</view>
+          </view>
+          <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
+        </view>
+      </view>
 
 			<!-----使用佣金抵扣,只有佣金小于尾款金额的时候------>
 			<view class="set-mes bdr_t-14"
@@ -148,16 +157,7 @@
 				</view>
 			</view>
 
-              <!-- 预存款 -->
-      <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
-        <view class="use-item" style="justify-content: space-between;">
-          <view>
-            <icon  color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
-            <view class="yu_er">使用预存</view>
-          </view>
-          <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
-        </view>
-      </view>
+
 			
 		</block>
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 1f360e6..174295e 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -241,7 +241,7 @@ Page({
     if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
       let resData = res.data.data
       resData.map(ite => {
-        yck += ite.advancesum
+        yck += ite.advancesum*1
         yckIdArr.push(ite.advanceitemid)
       })
       pre_json = resData
@@ -253,7 +253,7 @@ Page({
     } else {
       obj.yck_off = 0
     }
-    obj.yck = yck
+    obj.yck = yck.toFixed(2)
     obj.yckid = yckid
     obj.pre_json = pre_json
     return obj
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 81d96d5..53e083d 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -1,113 +1,116 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <form bindsubmit="submitForm">
-    <view class="container">
-		
-		<block wx:if="{{show_btn}}">
-		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
-			<view class="tab-wrapper">			
-					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
-					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
-					
-					<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>
-		</block>
-		
-        <!--要进行判断地址是否显示---->
-        <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
-            <!---默认地址显示------>
-            <block wx:if="{{user_addr!=null}}">
-                <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
-                <view class="location">
-                    <view class="address">{{user_addr.more_address}}{{'  '}}{{user_addr.address}}</view>
-                    <view class="pos-icon">
-                        <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-                    </view>
-                </view>
-                <view class="update-logistics">
-                    <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
-                </view>
-            </block>
-            <!---先增地址------>
-            <block wx:else>
-                <view class="add_new">
-                    <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
-                </view>
-            </block>
-            <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
+  <view class="container">
+
+    <block wx:if="{{show_btn}}">
+      <view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
+        <view class="tab-wrapper">
+          <view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提</view>
+
+          <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>
+    </block>
+
+    <!--要进行判断地址是否显示---->
+    <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
+      <!---默认地址显示------>
+      <block wx:if="{{user_addr!=null}}">
+        <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
+        <view class="location">
+          <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view>
+          <view class="pos-icon">
+            <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+          </view>
+        </view>
+        <view class="update-logistics">
+          <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
+        </view>
+      </block>
+      <!---先增地址------>
+      <block wx:else>
+        <view class="add_new">
+          <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
         </view>
+      </block>
+      <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
+    </view>
 
 
-        <!------立即购买-------->
-        <block>
-         <!-- <view class="xc-border main-top"></view> -->
-                <view class="use-item bfff bdr_t-14 mgt20">
-                      <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view>
-                <view class="order-detail">
-                      <view class="goods-img">
-                          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
-                            binderror='cart_set_err' data-err="bn_goods.original_img"></image>
-                      </view>
-                      <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
-                          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
-                               <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 color-gray n_guige">
-                                 <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
-                          </view></view>
-
-                             <!-----商品名称规格------>
-                    <view class="order-num flex-space-between">
-                        <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
-                        <view class="goods-num">x{{bn_goods.buynum}}</view>
-                    </view>
-                      </navigator>
-                      <!-- <view class="order-num">
+    <!------立即购买-------->
+    <block>
+      <!-- <view class="xc-border main-top"></view> -->
+      <view class="use-item bfff bdr_t-14 mgt20">
+        <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
+        <view>{{bn_pickname}}</view>
+      </view>
+      <view class="order-detail">
+        <view class="goods-img">
+          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
+        </view>
+        <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
+          <!-- 商品属性 -->
+          <view class="flex-vertical fs28 color-gray n_guige">
+            <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
+            </view>
+          </view>
+
+          <!-----商品名称规格------>
+          <view class="order-num flex-space-between">
+            <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+            <view class="goods-num">x{{bn_goods.buynum}}</view>
+          </view>
+        </navigator>
+        <!-- <view class="order-num">
                           <view class="co-red">￥{{bn_goods.shop_price}}</view>
                           <view class="goods-num">x{{bn_goods.buynum}}</view>
                       </view> -->
-                </view>
-				
-				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-				<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
-					<view class="flex">
-						<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-							<image  src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
-							<text class="card_name">{{show_card.CardName}}</text>
-						</view>            						
-						<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
-					</view>
-					<view>
-						<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-					</view>				
-					<!-- 三角形 -->
-					<view class="car_tri_up"></view>
-					<!-- 立即开通跳转 -->
-					<view bindtap="buycard" class="card_op">立即开通</view>				
-				</view>	
-				
-				
-                <view class="set-mes bdr_b-14">
-                    <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
-                    </view>
-
-                    <!--阶梯团是不显示的-->
-					<block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
-						<view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">							
-						   <view>选择物流</view>
-						   <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index' style="margin-right: 8rpx;">
-							   <view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view>
-						   </view>						
-						</view>
-					</block>
-
-                    <!--阶梯团是不显示的
+      </view>
+
+      <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+      <view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
+        <view class="flex">
+          <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+            <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png">
+              </ image>
+              <text class="card_name">{{show_card.CardName}}</text>
+          </view>
+          <view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
+        </view>
+        <view>
+          <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+        </view>
+        <!-- 三角形 -->
+        <view class="car_tri_up"></view>
+        <!-- 立即开通跳转 -->
+        <view bindtap="buycard" class="card_op">立即开通</view>
+      </view>
+
+
+      <view class="set-mes bdr_b-14">
+        <view wx:if="{{order.store_prom}}">
+          <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
+        </view>
+
+        <!--阶梯团是不显示的-->
+        <block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+          <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">
+            <view>选择物流</view>
+            <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 8rpx;">
+              <view class="logistics-name">{{wu_arr[index].name}}</view>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </block>
+
+        <!--阶梯团是不显示的
                     <block wx:if="{{kt_type!=3 || is_normal==1 }}">
                         <view class="use-item" hidden='{{bn_exp_type==1}}'>
                               <view>使用物流：</view>
@@ -117,128 +120,127 @@
                         </view>
                     </block>-->
 
-                </view>
-
-                
-                <view class="coupon-mes flex-vertical">
-                    <view>留言</view>
-                    <view class="leave-word">
-                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
-                     
-                    </view>
-                </view>
-         </block>
-
-         <view class="information bdr14">
-                         <!-----使用佣金抵扣------>
-                         <view class="set-mes" wx:if="{{bn_goods.use_commission>0 && can_commission && kt_type!=3}}">
-                             <view class="use-item" bindtap='set_bn_commission' style="padding-left:0;padding-right:0;">
-                                 <icon  color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
-                                 <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
-                             </view>
-                         </view>
-
-						 <!-----使用余额------>
-						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
-							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
-								<icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
-								<view class="yu_er">使用余额 :￥{{yuer}} </view>
-							 </view>
-						 </view>
-        <!-- 预存款 -->
-        <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
+      </view>
+
+
+      <view class="coupon-mes flex-vertical">
+        <view>留言</view>
+        <view class="leave-word">
+          <input placeholder-class="fs28" placeholder='给商家留言，最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
+
+        </view>
+      </view>
+    </block>
+
+    <view class="information bdr14">
+          <!-- 预存款 -->
+          <view class="set-mes" catchtap="prestore2" wx:if="{{bn_goods.yck_off}}">
         <view class="use-item" style="justify-content: space-between;padding: 0;">
           <view>
-            <icon  color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
+            <icon color="{{bn_goods.yck_off==2 ? 'red' : '#808080'}}" size="16" type="success"></icon>
             <view class="yu_er">使用预存</view>
           </view>
           <view wx:if="{{bn_goods.yck_off==2 }}">￥{{filters.toFix(bn_goods.yck,2)}}</view>
         </view>
       </view>
+      <!-----使用佣金抵扣------>
+      <view class="set-mes" wx:if="{{bn_goods.use_commission>0 && can_commission && kt_type!=3}}">
+        <view class="use-item" bindtap='set_bn_commission' style="padding-left:0;padding-right:0;">
+          <icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
+        </view>
+      </view>
 
-            <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
-                <view>商品金额</view>
-                <view class="co-red">￥ {{formData.all_price}}元</view>
-            </view>
-            <view class="item" wx:else>
-                <view>定金金额</view>
-                <view class="co-red">￥ {{formData.all_price}}元</view>
-            </view>
+      <!-----使用余额------>
+      <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
+        <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
+          <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
+          <view class="yu_er">使用余额 :￥{{yuer}} </view>
+        </view>
+      </view>
 
-            <view class="item" wx:if="{{formData.shipping_price>0}}">
-                <view>配送费用</view>
-                <view class="co-red">￥ {{formData.shipping_price}}元</view>
-            </view>
-            <!-- 使用预存优惠金额 -->
-            <view class="item" wx:if="{{formData.prestore>0}}">
-              <view>使用预存</view>
-              <view class="co-red">- ￥ {{filters.toFix(formData.prestore,2)}}元</view>
-            </view>
-            <view class="item" wx:if="{{formData.user_money>0}}">
-                <view>使用余额</view>
-                <view class="co-red">- ￥ {{formData.user_money}}元</view>
-            </view>
-            <!-- 订单优惠优惠金额 -->
-            <view class="item" wx:if="{{formData.order_prom_amount>0}}">
-                 <view>订单优惠</view>
-                 <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
-            </view>
 
-        </view>
+      <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
+        <view>商品金额</view>
+        <view class="co-red">￥ {{formData.all_price}}元</view>
+      </view>
+      <view class="item" wx:else>
+        <view>定金金额</view>
+        <view class="co-red">￥ {{formData.all_price}}元</view>
+      </view>
+
+      <view class="item" wx:if="{{formData.shipping_price>0}}">
+        <view>配送费用</view>
+        <view class="co-red">￥ {{formData.shipping_price}}元</view>
+      </view>
+      <!-- 使用预存优惠金额 -->
+      <view class="item" wx:if="{{formData.prestore>0}}">
+        <view>使用预存</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.prestore,2)}}元</view>
+      </view>
+      <view class="item" wx:if="{{formData.user_money>0}}">
+        <view>使用余额</view>
+        <view class="co-red">- ￥ {{formData.user_money}}元</view>
+      </view>
+      <!-- 订单优惠优惠金额 -->
+      <view class="item" wx:if="{{formData.order_prom_amount>0}}">
+        <view>订单优惠</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
+      </view>
+
     </view>
+  </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}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
-     </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}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+  </view>
 </form>
 
 <!----弹起选择物流名的列表---->
-<view wx:if='{{open_express==1}}' >
-    <view class="cover-layer flex-center "  bindtap='close_express'>
+<view wx:if='{{open_express==1}}'>
+  <view class="cover-layer flex-center " bindtap='close_express'>
+  </view>
+
+  <view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
+    <view class="tops flex">
+      <view class="top-content fs32">
+        <view>
+          选择物流名字
+        </view>
+      </view>
+      <view class="close-frame" bindtap='close_express'>
+        <view class="xc-close-express">×</view>
+      </view>
     </view>
+    <view class="express_list">
+      <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+        <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+          <block wx:if="{{is_express==idx}}">
+            <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
+          </block>
+          <block wx:else>
+            <view class="circle  xc-hooks"></view>
+          </block>
+          <view class="fs30">{{express_list.name}}</view>
 
-    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
-        <view class="tops flex">
-            <view class="top-content fs32">
-                <view>
-                    选择物流名字
-                </view>
-            </view>
-            <view class="close-frame"  bindtap='close_express' >
-                <view class="xc-close-express">×</view>
-            </view>
-        </view>
-        <view class="express_list">
-            <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-                <view class="express_list_frame" bindtap="click_express_name"
-                      data-shippingcode="{{express_list.shipping_code}}"
-                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
-
-                    <block wx:if="{{is_express==idx}}">
-                        <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
-                    </block>
-                    <block wx:else>
-                        <view class="circle  xc-hooks"></view>
-                    </block>
-                    <view class="fs30">{{express_list.name}}</view>
-
-                </view>
-            </view>
-        </view>
-        <view class="flex click-buttem" >
-            <view class="xc-determine flex-center" bindtap="determine_expres">
-                <view class="flex-vertical  t-c">确定</view>
-            </view>
-            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
-                <view class="flex-vertical  t-c">设为默认</view>
-            </view>
         </view>
+      </view>
+    </view>
+    <view class="flex click-buttem">
+      <view class="xc-determine flex-center" bindtap="determine_expres">
+        <view class="flex-vertical  t-c">确定</view>
+      </view>
+      <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+        <view class="flex-vertical  t-c">设为默认</view>
+      </view>
+    </view>
 
-    </view >
+  </view>
 </view>
 
-<warn id="warn"></warn>
+<warn id="warn"></warn>
\ No newline at end of file
--
libgit2 0.21.4