From 776605a3e29887f24e9e7addb19dde76d11ef2c3 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 9 Oct 2019 17:25:55 +0800
Subject: [PATCH] 商品结算页面

---
 pages/cart/cart2/cart2.js   |  29 +++++++++++++++++++----------
 pages/cart/cart2/cart2.wxml | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 pages/cart/cart2/cart2.wxss |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 178 insertions(+), 60 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 2037ebc..46b7daf 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -79,8 +79,6 @@ Page({
   
 
     is_express:0,//选中物流的属性
-  
-    express_name:"商家自配",
     expres_name:"",//点击选定
     isopen:0,//券的说明
     is_coupon:0,//选择券的控制属性
@@ -1082,18 +1080,26 @@ Page({
   //--------立即购买时，选择自提和物流-----------
   setexptype_w:function(t){
     var th=this;
-    var ty = t.currentTarget.dataset.t,txt = t.currentTarget.dataset.txt;
+    
+    var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt, ont = t.currentTarget.dataset.ont;
     th.setData({ [txt]: ty });
     var iszt=1;
+   
     if(ty==0){
+    
       th.setData({ is_all_zt: 0 });
     }else{
       for(var i=0;i<th.data.cartlist.length;i++){
         var item = th.data.cartlist[i];
         if (item.exp_type==0){ iszt=0;break;}
       }
+     
       th.setData({ is_all_zt: iszt });
     }
+    //判断是不是快递
+    if (ont == 66) {
+      this.express_name();
+    }
     //----计算此时购物车的价格----
     th.calculatePrice();
   },
@@ -1236,7 +1242,7 @@ Page({
   /*--点击选择券--*/
   sele_quan_item:function(e) {
     var no_use=e.currentTarget.dataset.no, quanlist=this.data.selected_quan_list;
-
+    
     //---所有的券的显示红色选择都清理一遍---
     for(var ind in quanlist){
        quanlist[ind].show_red=0;
@@ -1247,14 +1253,16 @@ Page({
     var th=this;
 
     //---如果是不使用优惠券---
+  
     if(no_use==1){
+      console.log("有进来吗券", no_use);
           if(using_quan[th.data.selected_quan_pick]){
               using_quan[th.data.selected_quan_pick].is_nouse_red=1;
           }
           else{
              using_quan[th.data.selected_quan_pick] ={is_nouse_red:1};
           }
-         this.setData({using_quan:using_quan});
+      this.setData({ using_quan: using_quan, is_coupon:2222});
 		 return;
     }
 
@@ -1349,7 +1357,7 @@ Page({
         }
         return arr;
   },
-  // 开启物流的弹窗
+  // // 开启物流的弹窗
   express_name:function(){
     this.setData({ open_express: 1});
 
@@ -1362,13 +1370,14 @@ Page({
     click_express_name:function(e){
       var express_name=e.currentTarget.dataset.name;
       var index=e.currentTarget.dataset.idxe;
-      this.setData({ expres_name: express_name, is_express:index});
+      this.setData({  is_express: index, index: index});
     },
     //点击确定物流
-  determine_expres:function(){
-  
+  determine_expres:function(e){
+    
    var name=this.data.expres_name
-    this.setData({ express_name: name, open_express: 0});
+    this.setData({ open_express: 0});
+    this.calculatePrice();
   },
   //设置默认物流
   set_default:function(){
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 799e4d1..d01a2c8 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -4,7 +4,7 @@
 <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)}}'>
             <!---默认地址显示------>
@@ -19,7 +19,8 @@
                     </view>
                 </view>
                 <view class="update-logistics">
-                     <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image>
+                     <!-- <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> -->
+                     	<view class="xc-right"></view>
                 </view>
             </block>
             <!---先增地址------>
@@ -28,15 +29,16 @@
                     <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
                 </view>
             </block>
-            <view class="border-img"><image class="wh100" src="{{imgUrl}}/miniapp/images/tt.png"></image></view>
+            <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/dianpu.png'> </image> <view>门店：{{item.pname}}</view></view>
+                      <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">
@@ -46,12 +48,12 @@
                     <!----商品名称规格---->
                     <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
                         <view class="goods-name">{{items.goods_name}}</view>
-                         <view class="goods-color">
-                                <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}">{{items.goods_spec}}/</text>
-                                {{items.goods_color==null?"":items.goods_color}}
-                          </view>
+                        
                           <!-- 商品属性 -->
-                          <view class="flex fs28 xc-ash">商品属性: <view></view></view>
+                          <view class="flex-vertical fs28 xc-ash">商品属性: <view class="goods-color"> 
+                                <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}/</text>
+                     {{items.goods_color==null?"":items.goods_color}}
+                          </view></view>
 
 
                             <!-----商品名称规格------>
@@ -67,57 +69,95 @@
                 <view class="xc-coupon-frame flex-center" data-bn="0"  bindtap="open_coupon_list" 
 				    wx:if="{{item.quan_list && item.quan_list.length>0 }}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
                     <view class="work-frame flex-space-between">
-                        <view class="work">使用优惠券</view>
+                        <view class="work">优惠券</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].money}}">￥{{using_quan[item.pickup_id].money}}元优惠券</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 wx:if="{{order.store_prom}}">
+                    <icon color="#f23030" size="16" type="info"></icon>
+                    {{order.store_prom}}
                     </view>
-                    <view class="use-item">
-                          <view  data-t='1' style="display:{{item.distr_t==2?'none':'flex'}};">
-                             <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>
+                    <view class="use-item flex-space-between">
+                    <view class="flex-vertical">
+                          <view bindtap='setexptype_w' 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-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
                           </view>
 
-                          <view  data-t='0'  style="display:{{item.distr_t==1?'none':'flex'}};">
-                             <icon   bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' class="wuliu" color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon>
+                          <view  data-t='0'data-ont="66"data-txt='cartlist[{{pidx}}].exp_type'   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-txt='cartlist[{{pidx}}].exp_type' class="yu_er">快递邮寄</view>
                           </view>
+                          </view>
+                          <block wx:if="{{item.exp_type==0}}">
+                          <view class="flex-vertical">
+                              <view >{{wu_arr[index].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 >{{express_name}}</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">
                                 <view >{{wu_arr[item.wind].name}}</view>
                           </picker> -->
-                    </view>
-                </view>
-                <view class="coupon-mes flex-vertical">
-                    <view>留言</view>
-                    <view class="leave-word">
-                        <textarea placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea>
-                     
-                    </view>
+                    <!-- </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>
+               
+            </view>
+
+             <!-- 留言 -->
+                <view class="coupon-mes flex-vertical">
+                    <view>留言</view>
+                    <view class="leave-word">
+                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea>
+                     
+                    </view>
+                </view>
+           
         </block>
 
         <!------立即购买-------->
+        <view class="xc-border xc-border"></view>
         <block wx:if="{{is_b_now==1}}">
-           <view class="xc-border"></view>
+          
                 <view class="use-item bfff">
              
                       <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
@@ -127,11 +167,10 @@
                       </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="goods-color">
-                                <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}
-                          </view>
+                        
                           <!-- 商品属性 -->
-                          <view class="flex fs28 xc-ash">商品属性: <view></view></view>
+                          <view class="flex-vertical fs28 xc-ash">商品属性:   <view class="goods-color"> 
+                                <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}</view></view>
 
 
                             <!-----商品名称规格------>
@@ -273,7 +312,22 @@
                 <view class="xc-close">×</view>
             </view>
         </view>
-    <view class="may_use_coupon fs28">可使用的优惠券</view>
+        <!-- <view class=""> -->
+    <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> -->
         <view class="xc-frame flex-level">
             <view class="list-frame">	
 
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 2a07175..09c6951 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -19,14 +19,14 @@
 .pos-icon {
     position: absolute;
     left: 30rpx;
-    top: 0;
+    top: 9rpx;
     width: 32rpx;
-    height: 32.5rpx;
+    height: 37.5rpx;
 }
 
 .border-img {
     width: 100%;
-    height: 16rpx;
+    height: 12rpx;
 }
 
 .update-logistics {
@@ -55,7 +55,7 @@
     padding: 30rpx 0;
     border-bottom: 1px solid #ddd;
     color: #777;
-    min-height: 100rpx;
+    min-height: 240rpx;
     background-color: #fff;
   
 }
@@ -82,6 +82,8 @@
 
 .goods-color {
     font-size: 24rpx;
+    margin-left: 15rpx;
+
 }
 
 .order-num {
@@ -100,7 +102,6 @@
   width:95%;
 margin:auto;
 
-  
 }
 .use-item>view{
    display: flex;margin-right: 10rpx;
@@ -136,13 +137,13 @@ margin:auto;
 }
 
 .coupon-mes {
-    height:80rpx;
+    height:95rpx;
     padding: 0 20rpx;
     background-color: #fff;
     font-size: 30rpx;
     color: #444;
     width: 100%;
-border-bottom: 10rpx solid #eee;
+
 
 }
 
@@ -276,7 +277,7 @@ border-bottom: 10rpx solid #eee;
 .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: 15rpx;} .wuliu{margin-left: 20rpx;}
+.yu_er{margin-left: 10rpx;margin-right: 60rpx;} .wuliu{margin-left: 20rpx;}
 
 
 /*---- 优惠券列表 -----*/
@@ -346,8 +347,6 @@ border-bottom: 10rpx solid #eee;
 .xc-frame{
     width: 100%;
     height:68.9%;
-    margin-top:20rpx;
-
 }
 
 .xc-frame .list-frame{
@@ -731,8 +730,8 @@ height:42rpx;
 }
 .may_use_coupon{
   width: 95%;
-  height: 40rpx;
-  line-height:68rpx;
+  height: 68rpx;
+  line-height:78rpx;
   margin: auto;
 }
 .determine-frame{
@@ -758,8 +757,64 @@ margin: auto;
   margin-right:20rpx;
 }
 .xc-border{
-  border-top:5rpx solid #eee;
-margin-top:20rpx;
+  border-top:8rpx solid #eee;
 width: 100%
+}
+.main-top{
+margin-top: 20rpx;
 
 }
+.xc-hookts{
+border: 1rpx solid #999;
+
+}
+.xc-hookts.on{
+  width:30rpx;
+height:30rpx;
+
+}
+.xc-hookt.sn{
+  width: 32rpx;
+height: 32rpx;
+font-size: 28rpx;
+line-height: 34rpx;
+}
+.xc-hookt{
+  transform: rotate(-135deg);
+text-align: center;
+
+}
+.main-bottom{
+  margin-bottom: 20rpx;
+
+}
+.xc-hookst{
+  border: 1rpx solid #999;
+
+}
+.xc-hookst.ons{
+  width: 42rpx;
+height: 42rpx;
+margin-left: 20rpx;
+
+}
+.is_use_coupon{
+  width: 65%;
+justify-content: flex-end;
+padding-top: 10rpx;
+
+
+}
+.xc-hooka{
+  transform: rotate(-135deg);
+text-align: center;
+
+} 
+.xc-hooka.sn{
+  width: 45rpx;
+height: 45rpx;
+font-size: 28rpx;
+line-height: 44rpx;
+margin-left: 20rpx;
+
+}
\ No newline at end of file
--
libgit2 0.21.4