From a0f4b1cb6c6f0f8145f824e62fa43fd2d7968a0b Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Mon, 21 Sep 2020 16:21:39 +0800
Subject: [PATCH] 提交订单样式修改

---
 pages/cart/cart2/cart2.wxml | 1030 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/cart/cart2/cart2.wxss |  145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 2 files changed, 634 insertions(+), 541 deletions(-)

diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index e8552aa..e9da295 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -3,518 +3,550 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 
 <form bindsubmit="submitForm">
-    <view class="container">  
-         <!--要进行判断地址是否显示----> 
-        <view bindtap="enterAddressPage" class="user-mes"
-            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>收货人：</text>{{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" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-                    </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">
-            
-                      <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <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">
-                        <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
-                        <image class="wh100" 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}}">
-                        <view class="goods-name">{{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>
-                                  <!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>-->
-                                  <!--<block wx:else>-->
-                                      <!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>-->
-                                      <!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>-->
-                                  <!--</block>-->
-                              </view>
-                          </view>
-
-
-                            <!-----商品名称规格------>
-                    <view class="order-num flex-space-between">
-                        <view 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>
-
-                <!-----使用优惠券------>
-                <view class="xc-coupon-frame flex-center" data-bn="0"  bindtap="open_coupon_list" 
-				    wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
-                    <view class="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="container">
+		<!--要进行判断地址是否显示---->
+		<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>收货人：</text>{{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" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+					</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">
+						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+						<image class="wh100" 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}}">
+						<view class="goods-name">{{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>
+								<!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>-->
+								<!--<block wx:else>-->
+								<!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>-->
+								<!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>-->
+								<!--</block>-->
+							</view>
+						</view>
+
+
+						<!-----商品名称规格------>
+						<view class="order-num flex-space-between">
+							<view 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>
+
+				<!-----使用优惠券------>
+				<view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null}}"
+				 data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
+					<view class="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="set-mes">
-                    <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">
-                    <view class="flex-vertical">
-                          <view bindtap='setexptype_w' data-ind="{{pidx}}"  data-t='1' data-txt='cartlist[{{pidx}}].exp_type'style="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='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_w' 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_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
-                             <!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> -->
-    <block wx:if="{{item.exp_type==0}}">
-        <!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
-            <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  color="red" size="16" type="success"></icon>
-      </block>
-      <block wx:else>
-     <view class="circle  xc-hookts on"></view>
-        </block>
-                             
-                            <view bindtap='setexptype_w' data-t='0' data-ind="{{pidx}}"
-                                    data-txt='cartlist[{{pidx}}].exp_type'
-                                    data-wl_txt='cartlist[{{pidx}}].wind'
-                                    class="yu_er">快递邮寄</view>
-                          </view>
-                          </view>
-                          <block wx:if="{{item.exp_type==0}}">
-                              <!-- 点击显示物流选择 -->
-                              <view class="flex-vertical" bindtap="show_wu_arr"  data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}">
-                                  <view >{{wu_arr[item.wind].name}}</view><view class="xc-right"></view>
-                              </view>
-                          </block>
-                    </view>
-
-                    <!-- <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'>
+						</view>
+					</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">
+						<view class="flex-vertical">
+							<view bindtap='setexptype_w' 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='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_w' 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_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
+								<!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> -->
+								<block wx:if="{{item.exp_type==0}}">
+									<!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
+									<icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hookts on"></view>
+								</block>
+
+								<view bindtap='setexptype_w' data-t='0' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind'
+								 class="yu_er">快递邮寄</view>
+							</view>
+						</view>
+						<block wx:if="{{item.exp_type==0}}">
+							<!-- 点击显示物流选择 -->
+							<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>
+						</block>
+					</view>
+
+					<!-- <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'>
                           <view>选择物流：</view> -->
-                          <!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind'  value="{{item.wind}}" range="{{wu_arr}}" range-key="name">
+					<!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind'  value="{{item.wind}}" range="{{wu_arr}}" range-key="name">
                                 <view >{{wu_arr[item.wind].name}}</view>
                           </picker> -->
-                    <!-- </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_{{item.pickup_id}}"></input>
-
-                    </view>
-                </view>
-               
-            </view>
-
-            <!-----使用余额------>
-            <view class="set-mes" 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>
-
-        <!------立即购买-------->
-        <view class="xc-border xc-border"></view>
-        <block wx:if="{{is_b_now==1}}">
-                <view class="use-item bfff">
-                      <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
-                <view class="order-detail">
-                      <view class="goods-img">
-                          <image class="wh100" 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">{{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>
-                                  <!--<block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>-->
-                                  <!--<block wx:else>-->
-                                     <!--<text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>-->
-                                     <!--<text wx:if="{{bn_goods.goods_color}}">{{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>
-                <!-- 赠品的显示 -->
-                <view class="order-detail" wx:if="{{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" src="{{buy_now_gift_goods.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods.original_img"></image>
-                    </view>
-                    <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{buy_now_gift_goods.goods_id}}">
-                        <view class="goods-name">{{buy_now_gift_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(buy_now_gift_goods.goods_spec,buy_now_gift_goods.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{{buy_now_gift_goods.buynum}}</view>
-                        </view>
-                    </navigator>
-                </view>
-
-
-                <block wx:if="{{collocation_goods}}">
-                <!-- 搭配购买的功能实现 -->
-                <view class="order-detail" wx:for="{{collocation_goods}}">
-                    <view class="goods-img">
-                        <image class="wh100" src="{{imgUrl+item.original_img}}" binderror='err_img_collocation' data-err="item.original_img"></image>
-                    </view>
-                    <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-                        <view class="goods-name">{{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>
-
-
-            <view class="set-mes">
-                    <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}}"
-					      wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
-                        <view class="work-frame flex-space-between">
-                            <view class="work">
-                              优惠券  <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text>
-                            </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="use-item flex-space-between">
-                    <view class="flex">
-                        <view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'   style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};">
-                          <icon   color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
-                           <view class="yu_er">自提</view>
-                        </view>
-                        <view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};">
-                            <icon  color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon>
-                            <view class="yu_er">物流</view>
-                        </view>
-</view>
-                         <block wx:if="{{bn_exp_type==0}}">
-                              <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index'><view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view></view>
-                         </block>
-                    </view>
-                </view>
-
-                 <!-----使用余额------>
-                <view class="set-mes" 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="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">
-            <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.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.user_money>0}}">
-                <view>使用余额</view>
-                <view class="co-red">- ￥ {{formData.user_money}}元</view>
-            </view>
-        </view>
-    </view>
-
-     <view class="btn-wrap">
-            <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
-            <view class="pay-amount">
-                <view class="payable">应付金额 : </view>
-                <view class="co-red big">￥ {{formData.order_amount}}元</view>
-            </view>
-     </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_{{item.pickup_id}}"></input>
+
+					</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>
+
+		<!------立即购买-------->
+		<!-- <view class="xc-border xc-border"></view> -->
+		<block wx:if="{{is_b_now==1}}">
+			<view class="use-item bfff bdr_t-14 mgt20">
+				<image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image>
+				<view>{{bn_pickname}}</view>
+				<!-- <view>门店：{{bn_pickname}}</view> -->
+			</view>
+			<view class="order-detail">
+				<view class="goods-img">
+					<image class="wh100" 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">{{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>
+							<!--<block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>-->
+							<!--<block wx:else>-->
+							<!--<text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>-->
+							<!--<text wx:if="{{bn_goods.goods_color}}">{{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>
+			<!-- 赠品的显示 -->
+			<view class="order-detail" wx:if="{{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" src="{{buy_now_gift_goods.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods.original_img"></image>
+				</view>
+				<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{buy_now_gift_goods.goods_id}}">
+					<view class="goods-name">{{buy_now_gift_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(buy_now_gift_goods.goods_spec,buy_now_gift_goods.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{{buy_now_gift_goods.buynum}}</view>
+					</view>
+				</navigator>
+			</view>
+
+
+			<block wx:if="{{collocation_goods}}">
+				<!-- 搭配购买的功能实现 -->
+				<view class="order-detail" wx:for="{{collocation_goods}}">
+					<view class="goods-img">
+						<image class="wh100" src="{{imgUrl+item.original_img}}" binderror='err_img_collocation' data-err="item.original_img"></image>
+					</view>
+					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+						<view class="goods-name">{{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>
+
+
+			<view class="set-mes">
+				<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}}" wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
+					<view class="work-frame flex-space-between">
+						<view class="work">
+							优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text>
+						</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="use-item flex-space-between">
+					<view class="flex">
+						<view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};">
+							<icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
+							<view class="yu_er">自提</view>
+						</view>
+						<view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};">
+							<icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon>
+							<view class="yu_er">物流</view>
+						</view>
+					</view>
+					<block wx:if="{{bn_exp_type==0}}">
+						<view class="flex-vertical" bindtap="show_wu_arr" data-txt='index'>
+							<view class="logistics-name">{{wu_arr[index].name}}</view>
+							<view class="xc-right"></view>
+						</view>
+					</block>
+				</view>
+			</view>
+
+			<!-----使用余额------>
+			<view class="set-mes" 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="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 bdr_b-14">
+			<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.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.user_money>0}}">
+				<view>使用余额</view>
+				<view class="co-red">- ￥ {{formData.user_money}}元</view>
+			</view>
+		</view>
+	</view>
+
+	<view class="btn-wrap shadow-1">
+		<view class="pay-amount">
+			<view class="payable">应付金额：￥{{formData.order_amount}}</view>
+			<!-- <view class="co-red big"></view> -->
+		</view>
+		<button class="tips-btn" formType="submit" id="submitOrder">提交订单</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 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="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-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="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 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>
+				</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 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 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>
 
-<warn id="warn"></warn>
\ No newline at end of file
+<warn id="warn"></warn>
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 90f871c..8d759e9 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -1,11 +1,43 @@
+.bdr_t-14 {
+	border-top-left-radius: 14rpx;
+	border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+	border-bottom-left-radius: 14rpx;
+	border-bottom-right-radius: 14rpx;
+}
+.mgt20 {
+	margin-top: 20rpx;
+}
+.shadow {
+	box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+	box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+
+page {
+	/* background-color: #FAFAFA; */
+	background-color: #F0F0F0;
+	padding: 0 22rpx;
+	box-sizing: border-box;
+}
+.container {
+	background-color: #F0F0F0;
+	/* padding-top: 28rpx; */
+	padding-bottom: 120rpx;
+}
 .user-mes {
     position: relative;
     background-color: #fff;
     font-size: 32rpx;
     color: #444;
+		/* margin-top: 28rpx; */
+		border-radius: 14rpx;
 }
 .user-contact {
-    padding: 24rpx 70rpx;
+    padding: 24rpx 26rpx;
     font-weight: 600; 
 }
  
@@ -16,10 +48,10 @@
 
 .pos-icon {
     position: absolute;
-    left: 22rpx;
+    left: 28rpx;
     top: 9rpx;
-    width: 32rpx;
-    height: 37.5rpx;
+    width: 30rpx;
+    height: 36rpx;
 }
 
 .border-img {
@@ -32,7 +64,7 @@
     right: 0;
     top: 0;
     width: 80rpx;
-    height: 148rpx;
+    height: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -51,7 +83,7 @@
 
 .order-detail {
     padding: 30rpx 0;
-    border-bottom: 6rpx solid #eee;
+    border-bottom: 2rpx solid #eee;
     color: #777;
     min-height: 190rpx;
     background-color: #fff;
@@ -90,22 +122,33 @@
     line-height: 42rpx;
 }
 
-.set-mes{background-color: #fff; }
+.set-mes{
+	background-color: #fff;
+	/* margin-top: 20rpx; */
+}
 .use-item{
     display: flex;
     align-items: center;
     height: 80rpx;
-    border-bottom: 1px solid #ddd;
+    /* border-bottom: 1px solid #ddd; */
     font-size: 30rpx;
-  width:95%;
-margin:auto;
-
+  /* width:95%;
+margin:auto; */
+	padding: 0 26rpx;
 }
 .use-item>view{
-   display: flex;margin-right: 12rpx;
+   display: flex;
+	 /* margin-right: 12rpx; */
+}
+.use-item.bfff{
+	background-color: #fff;
+}
+.use-item .dp{
+	display: block;
+	width: 50rpx;
+	height: 50rpx; 
+	margin-left: -6rpx;
 }
-.use-item.bfff{ background-color: #fff;}
-.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx}
 
 .set-item {
     justify-content: space-between;
@@ -135,14 +178,16 @@ margin:auto;
 }
 
 .coupon-mes {
+	/* box-sizing: border-box; */
     height:95rpx;
-    padding: 0 20rpx;
+    padding: 0 26rpx;
     background-color: #fff;
     font-size: 30rpx;
     color: #444;
-    width: 100%;
-
-
+    /* width: 100%; */
+		border-radius: 14rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 }
 
 .coupon-title {
@@ -169,15 +214,14 @@ margin:auto;
 
 .leave-word {
     position: relative;
-    
     font-size: 24rpx;
     margin-left: 20rpx;
-
+		flex-grow: 1;
 }
 
 .word-box {
-    
-    width: 600rpx;
+    font-size: 26rpx;
+    /* width: 600rpx; */
     padding: 10rpx;
     height: 28rpx;
     line-height: 40rpx;
@@ -190,9 +234,9 @@ margin:auto;
 }
 
 .information {
-    padding: 0 20rpx;
+    padding: 0 26rpx;
     background-color: #fff;
-    margin-bottom: 120rpx;
+    /* margin-bottom: 120rpx; */
 }
 
 .information .item {
@@ -205,36 +249,50 @@ margin:auto;
 }
 
 .btn-wrap {
-    height: 100rpx; width: 100%;
-    background-color: #fff;
-    position: fixed; bottom: 0;left: 0;
-    border-top:1rpx solid #dee; 
-    z-index:9999
+	height: 94rpx;
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+	background-color: white;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 0 30rpx;
 }
 
 .tips-btn {
-    float: right;
+    /* float: right;
     width: 200rpx;
     height: 100rpx;
     line-height: 100rpx;
     text-align: center;
     font-size: 30rpx;
     color: #fff;
-    background-color: #f23030;
+    background-color: #f23030; */
+		color: white;
+		background-color: #FE4445;
+		height: 72rpx;
+		line-height: 72rpx;
+		padding: 0 42rpx;
+		border-radius: 36rpx;
+		margin-left: 0;
+		margin-right: 0;
 }
 
 .pay-amount {
-    float: right;
+    /* float: right;
     display: flex;
     align-items: center;
     height: 100rpx;
     font-size: 26rpx;
-    margin-right: 40rpx;
+    margin-right: 40rpx; */
 }
 
 .payable {
     color: #444;
-    margin-right: 20rpx;
+    /* margin-right: 20rpx; */
 }
 
 .shipping-modal {
@@ -277,7 +335,11 @@ margin:auto;
 .add_new{height: 60rpx; line-height: 60rpx;}
 .addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; 
    margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;}
-.yu_er{margin-left: 10rpx;margin-right: 60rpx;} .wuliu{margin-left: 20rpx;}
+.yu_er{
+	margin-left: 10rpx;
+	/* margin-right: 60rpx; */
+}
+.wuliu{margin-left: 20rpx;}
 
 
 /*---- 优惠券列表 -----*/
@@ -290,8 +352,8 @@ margin:auto;
     width: 100%;
     height: 100%;
     border-bottom:3rpx solid #eee;
-
-
+		padding: 0 26rpx;
+		background-color: white;
 }
 .xc-right{
     width:20rpx;
@@ -300,7 +362,6 @@ margin:auto;
     border-right:2rpx solid #000;
     transform:rotate(45deg);
     display:inline-block;
-   
 }
 
 .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
@@ -309,15 +370,15 @@ margin:auto;
 /* 自定义弹出窗口 */
 .cx-popup{
     width:100%;
-    height:920rpx;
+    height:900rpx;
     background: #fff;
     z-index: 35;
     border-top-left-radius: 20rpx;
     border-top-right-radius: 20rpx;
     position:fixed;
     bottom:0;
-    padding-bottom: 25rpx;
-
+		left: 0;
+    /* padding-bottom: 25rpx; */
 }
 
 .cx-popup .top{
@@ -821,4 +882,4 @@ margin-left: 20rpx;
 .n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
 .gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0}
 
-.quan_num_show{ padding: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx  }
\ No newline at end of file
+.quan_num_show{ padding: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;}
\ No newline at end of file
--
libgit2 0.21.4