From 2510bf00bb49d9d78bcf083b774ec5e0a653b6db Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Fri, 11 Oct 2019 23:02:21 +0800
Subject: [PATCH] 购物车结算

---
 pages/cart/cart/cart.wxml         |  6 +++---
 pages/cart/cart/cart.wxss         |  6 +++---
 pages/cart/cart2/cart2.wxml       |  2 +-
 pages/cart/cart2/cart2.wxss       |  8 ++++++--
 pages/cart/cart2_pt/cart2_pt.wxml | 55 ++++++++++++++++++++++++++++++++++++++++---------------
 pages/cart/cart2_pt/cart2_pt.wxss | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 6 files changed, 127 insertions(+), 41 deletions(-)

diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 32b886d..de9f2d5 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -40,10 +40,10 @@
             <view class="goods-name">
               <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
 
-              <view class="Specifications flex-center">
-                <view class="ellipsis-1" wx:if="{{items.goods_color || items.goods_spec}}">
+              <view class="specifications  ellipsis-1">
+                <view  wx:if="{{items.goods_color || items.goods_spec}}">
                   {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
-                <view class="ellipsis-1" wx:else>规格1</view>
+                <view  wx:else>规格1</view>
               </view>
             </view>
 
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 44c8d63..cb8f510 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -231,17 +231,17 @@ radio {
   color: rgb(0, 0, 0);
 }
 
-.Specifications {
+.specifications {
   padding: 3rpx 8rpx;
   margin-top: 8rpx;
   font-size: 22rpx;
-  max-width: 115rpx;
+  min-width: 50rpx;
+  width: auto;
   height: 30rpx;
   line-height: 29rpx;
   background-color: rgb(236, 236, 236);
   border-radius: 8rpx;
   white-space: nowrap;
-  overflow: hidden;
   color: rgb(63, 63, 63);
 }
 
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 42a4b08..056739d 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -50,7 +50,7 @@
                         <view class="goods-name">{{items.goods_name}}</view>
                         
                           <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 xc-ash">商品属性: <view class="goods-color"> 
+                          <view class="flex-vertical fs28 color-gray">商品属性: <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>
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 09c6951..6000396 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -53,9 +53,9 @@
 
 .order-detail {
     padding: 30rpx 0;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 6rpx solid #eee;
     color: #777;
-    min-height: 240rpx;
+    min-height: 190rpx;
     background-color: #fff;
   
 }
@@ -817,4 +817,8 @@ font-size: 28rpx;
 line-height: 44rpx;
 margin-left: 20rpx;
 
+}
+.color-gray{
+  color: #808080;
+
 }
\ No newline at end of file
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 69e9bd5..8677244 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -1,14 +1,15 @@
+<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 || kt_type==3}}'>
             <!---默认地址显示------>
             <block wx:if="{{user_addr!=null}}">
-                <view class="user-contact">{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
+                <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" src="{{imgUrl}}/miniapp/images/iconfont-address.png"></image>
+                        <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
                     </view>
                 </view>
                 <view class="update-logistics">
@@ -27,8 +28,9 @@
 
         <!------立即购买-------->
         <block>
+         <view class="xc-border main-top"></view>
                 <view class="use-item bfff">
-                      <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
+                      <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" src="{{bn_goods.original_img}}" 
@@ -36,28 +38,51 @@
                       </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 color-gray">商品属性: 
                           <view class="goods-color">
                                 <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}
-                          </view>
+                          </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="order-num">
                           <view class="co-red">￥{{bn_goods.shop_price}}</view>
                           <view class="goods-num">x{{bn_goods.buynum}}</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" wx:if="{{kt_type!=3 || is_normal==1}}">
+                    <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">
                     <view class="flex-vertical">
-                        <view bindtap='setexptype' data-t='1'  style="display:{{bn_t_exp_t==2?'none':'flex'}};">
-                            <icon   color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
+                        <view bindtap='setexptype' data-t='1'  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> -->
+                                       <block wx:if="{{bn_exp_type==1}}">
+       
+            <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 class="yu_er">自提</view>
                         </view>
-                        <view bindtap='setexptype' data-t='0'  style="margin-left: 45rpx;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="{{bn_t_exp_t==2?'':'xc-left'}}" bindtap='setexptype' data-t='0'  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> -->
+                              <block wx:if="{{bn_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 class="yu_er">物流</view>
                         </view>
                     </view>
@@ -86,11 +111,11 @@
 
                   </view>
                 </view>
-                <view class="coupon-mes">
-                    <view>用户备注（50字）</view>
+                <view class="coupon-mes flex-vertical">
+                    <view>留言</view>
                     <view class="leave-word">
-                        <textarea bindinput="keyUpChangeNum" class="word-box" maxlength="50" name="user_note"></textarea>
-                        <view class="max-word">{{maxWord}}/50</view>
+                        <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>
diff --git a/pages/cart/cart2_pt/cart2_pt.wxss b/pages/cart/cart2_pt/cart2_pt.wxss
index d49345f..7dc1812 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxss
+++ b/pages/cart/cart2_pt/cart2_pt.wxss
@@ -6,6 +6,8 @@
 }
 .user-contact {
     padding: 24rpx 80rpx;
+    font-weight: 600;
+
 }
 
 .location {
@@ -16,9 +18,9 @@
 .pos-icon {
     position: absolute;
     left: 30rpx;
-    top: 0;
+    top: 20rpx;
     width: 32rpx;
-    height: 32.5rpx;
+    height: 40rpx;
 }
 
 .border-img {
@@ -50,17 +52,17 @@
 
 .order-detail {
     padding: 30rpx 0;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 7rpx solid #eee;
     color: #777;
-    min-height: 100rpx;
+    min-height: 190rpx;
     background-color: #fff;
   
 }
 
 .goods-img {
     float: left;
-    width: 100rpx;
-    height: 100rpx;
+    width: 190rpx;
+    height: 190rpx;
     margin: 0 20rpx;
 }
 
@@ -90,20 +92,18 @@
     line-height: 42rpx;
 }
 
-.set-mes{background-color: #fff; margin-bottom: 20rpx;}
+.set-mes{background-color: #fff; }
 .use-item{
     display: flex;
     align-items: center;
     height: 92rpx;
     border-bottom: 1px solid #ddd;
     font-size: 30rpx;
-    padding-left: 20rpx;
-    justify-content: space-between;
-
-  
+    width: 95%;
+    margin: auto;
 }
 .use-item>view{
-   display: flex;margin-right: 20rpx;
+   display: flex;margin-right: 10rpx;
 }
 .use-item.bfff{ background-color: #fff;}
 .use-item .dp{width: 56rpx; height: 56rpx;}
@@ -136,11 +136,15 @@
 }
 
 .coupon-mes {
-    margin-bottom: 20rpx;
+     height:95rpx;
     padding: 0 20rpx;
     background-color: #fff;
     font-size: 30rpx;
     color: #444;
+    width: 100%;
+    border-bottom: 6rpx solid #eee;
+    margin-bottom: 20rpx;
+
 }
 
 .coupon-title {
@@ -167,15 +171,16 @@
 
 .leave-word {
     position: relative;
-    margin: 20rpx 0;
     font-size: 24rpx;
+    margin-left: 20rpx;
+
 }
 
 .word-box {
-    border: 1px solid #ddd;
-    width: 690rpx;
+   
+    width: 600rpx;
     padding: 10rpx;
-    height: 120rpx;
+    height: 28rpx;
     line-height: 40rpx;
 }
 
@@ -502,7 +507,59 @@
     border-right:2rpx solid #000;
     transform:rotate(45deg);
     display:inline-block;
+    margin-right: 5rpx;
+    margin-left: 10rpx;
 
 }
 
 
+.xc-left{
+ margin-left: 45rpx;
+}
+.xc-border{
+  border-top:8rpx solid #eee;
+width: 100%
+}
+.main-top{
+margin-top: 20rpx;
+
+}
+.order-num {
+    margin-top: 25rpx;
+    font-size: 24rpx;
+    line-height: 42rpx;
+    width: 95%;
+
+}
+.goods-num{
+  font-size: 28rpx;
+color: #333;
+
+}
+.click-buttem{
+width: 90%;
+margin: auto;
+}
+.xc-determine{
+  height: 55rpx;
+  width: 40%;
+  border-radius: 50rpx;
+background: #d60021;
+color: #fff;
+font-size: 28rpx;
+margin: 0 auto;
+
+}
+.xc-hookts{
+border: 1rpx solid #999;
+
+}
+.xc-hookts.on{
+  width:30rpx;
+height:30rpx;
+
+}
+.color-gray{
+  color: #808080;
+
+}
\ No newline at end of file
--
libgit2 0.21.4