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

---
 pages/cart/cart2/cart2.wxml | 29 +++++++++++++++--------------
 pages/cart/cart2/cart2.wxss | 54 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index e9da295..356ed31 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -167,7 +167,7 @@
 		<!-- <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>
+				<image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
 				<view>{{bn_pickname}}</view>
 				<!-- <view>门店：{{bn_pickname}}</view> -->
 			</view>
@@ -245,7 +245,7 @@
 			</block>
 
 
-			<view class="set-mes">
+			<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>
@@ -268,13 +268,13 @@
 
 				<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;'}};">
+						<view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;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 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 class="yu_er">快递邮寄</view>
 						</view>
 					</view>
 					<block wx:if="{{bn_exp_type==0}}">
@@ -285,22 +285,23 @@
 					</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>
 
+			<!-----使用余额------>
+			<view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
+				<view class="use-item" bindtap='set_bn_useyuer'>
+					<icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
+					<view class="yu_er">使用余额 :￥{{yuer}} </view>
 				</view>
 			</view>
+			
 		</block>
 
 		<view class="information bdr_b-14">
@@ -335,7 +336,7 @@
 
 	<view class="btn-wrap shadow-1">
 		<view class="pay-amount">
-			<view class="payable">应付金额：￥{{formData.order_amount}}</view>
+			<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
 			<!-- <view class="co-red big"></view> -->
 		</view>
 		<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 8d759e9..acc0a05 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -370,7 +370,7 @@ margin:auto; */
 /* 自定义弹出窗口 */
 .cx-popup{
     width:100%;
-    height:900rpx;
+    height:880rpx;
     background: #fff;
     z-index: 35;
     border-top-left-radius: 20rpx;
@@ -492,9 +492,9 @@ color: #333;
 }
 
 .xc-confirm {
-   width: 48%;
+   width: 50%;
    border-radius: 50rpx;
-     height: 50rpx;
+   height: 80rpx;
     margin:0 auto;
     background:#d60021;
     color:#fff;
@@ -570,13 +570,13 @@ border-bottom: 1rpx solid #eee;
   width: 100%;
   height: 65%;
   overflow-y: auto;
-  margin-bottom: 10rpx;
+  margin-bottom: 40rpx;
   
 }
 .xc-confirms {
    width: 40%;
    border-radius: 50rpx;
-   height: 55rpx;
+   height: 80rpx;
     margin:0 auto;
     font-size:28rpx;
     background: #fff;
@@ -588,13 +588,14 @@ border-bottom: 1rpx solid #eee;
 
 /* 优惠券的改版样式 */
 .xc-coupon-frame{
-  width: 710rpx;
+  /* width: 710rpx; */
+	width: 100%;
   height:auto; 
   margin: 0 auto;
 
 }
 .xc-coupon-frame .coupon-frame{
-  width: 99%;
+  width: 100%;
   height: 200rpx;
   margin-top:10rpx;
   border-bottom: 1rpx solid #eee;
@@ -638,12 +639,12 @@ width:100%;
    top:-37rpx;
 } 
 .coupon-right{
-   width:490rpx;
+  /* width:490rpx; */
   height: 99%;
   border-top: 1rpx solid #eaeaea;
   /* //border-bottom: 1rpx solid #eaeaea; */
   border-right: 1rpx solid #eaeaea;
-
+	flex-grow: 1;
 }
 .coupon-annotation{
   width: 95%;
@@ -733,15 +734,15 @@ align-items: center;
 width: 24rpx;
 }
 .xc-buttom{
-  width:99%;
-min-height:76rpx;
-height:auto;
-line-height:40rpx;
-border-left:1rpx solid #eee;
-border-right:1rpx solid #eee;
-border-bottom:1rpx solid #eee;
-margin-left: 6rpx;
-
+	box-sizing: border-box;
+	width:100%;
+	min-height:76rpx;
+	height:auto;
+	line-height:40rpx;
+	border-left:1rpx solid #eee;
+	border-right:1rpx solid #eee;
+	border-bottom:1rpx solid #eee;
+/* margin-left: 6rpx; */
 }
 
 .goods-num{
@@ -787,10 +788,12 @@ width:42rpx;
 height:42rpx;
 }
 .may_use_coupon{
-  width: 95%;
-  height: 68rpx;
+  /* width: 95%; */
+  /* height: 68rpx; */
   line-height:78rpx;
-  margin: auto;
+	padding: 0 26rpx;
+	justify-content: space-between;
+	align-items: center;
 }
 .determine-frame{
   width: 100%;
@@ -798,7 +801,7 @@ height:42rpx;
   
 }
 .xc-determine{
-  height: 55rpx;
+  height: 80rpx;
   width: 40%;
   border-radius: 50rpx;
 background: #d60021;
@@ -882,4 +885,9 @@ 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;margin-left:10rpx;}
\ No newline at end of file
+.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;}
+
+.navigator-hover {
+	background: none;
+	opacity: 1;
+}
--
libgit2 0.21.4