From 47fe4829d8f901a673c3618ef011d31c62091e50 Mon Sep 17 00:00:00 2001
From: Eratosici <ZL769@163.com>
Date: Wed, 24 Nov 2021 09:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=8E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-detail/order-detail.css | 8 ++++++++
 pages/order-detail/order-detail.vue | 8 ++++----
 pages/orderList/orderList.css       | 7 ++++++-
 pages/orderList/orderList.vue       | 2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pages/order-detail/order-detail.css b/pages/order-detail/order-detail.css
index df1e919..c2c8607 100644
--- a/pages/order-detail/order-detail.css
+++ b/pages/order-detail/order-detail.css
@@ -173,6 +173,7 @@ page {
   display: flex;
   padding: 10rpx 0;
   align-items: center;
+  box-sizing: border-box;
 }
 
 .order-msg .msg-item .item.payment {
@@ -182,6 +183,7 @@ page {
 }
 
 .order-msg .msg-item .item .item-tit {
+  min-width: 140rpx;
   color: #999;
   line-height: 48rpx;
 }
@@ -190,6 +192,12 @@ page {
   flex: 1;
   line-height: 48rpx;
 }
+.order-msg .msg-item .item .item-txt.remarks {
+  max-width: 600rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 
 .order-msg .msg-item .item  .copy-btn {
   display: block;
diff --git a/pages/order-detail/order-detail.vue b/pages/order-detail/order-detail.vue
index a5497dd..16c9d0a 100644
--- a/pages/order-detail/order-detail.vue
+++ b/pages/order-detail/order-detail.vue
@@ -65,7 +65,7 @@
           </view>
         </view>
       </view> -->
-      <view class="prod-foot">
+      <!-- <view class="prod-foot">
         <view class="btn">
           <button v-if="status==1" class="button" @tap="onCancelOrder" :data-ordernum="orderNumber" hover-class="none">取消订单</button>
           <button v-if="status==1" class="button warn" @tap="onConfirmReceive" :data-ordernum="orderNumber" hover-class="none">再次购买</button>
@@ -73,7 +73,7 @@
           <button v-if="status==3 || status==5" class="button" @tap="toDeliveryPage" :data-ordernum="orderNumber" hover-class="none">查看物流</button>
           <button v-if="status==3" class="button warn" @tap="onConfirmReceive" :data-ordernum="orderNumber" hover-class="none">确认收货</button>
         </view>
-      </view>
+      </view> -->
     </view>
 
     <!-- 订单信息 -->
@@ -100,7 +100,7 @@
         </view>
         <view class="item">
           <text class="item-tit">订单备注：</text>
-          <text class="item-txt">{{remarks}}</text>
+          <text class="item-txt remarks">{{remarks}}</text>
         </view>
       </view>
     </view>
@@ -147,7 +147,7 @@
       <text class="dele-order" v-if="status==5||status==6">删除订单</text>
       <view class="footer-box">
         <text class="apply-service">联系客服</text>
-        <text class="buy-again">再次购买</text>
+        <!-- <text class="buy-again">再次购买</text> -->
       </view>
     </view>
 
diff --git a/pages/orderList/orderList.css b/pages/orderList/orderList.css
index 2be1596..7349c57 100644
--- a/pages/orderList/orderList.css
+++ b/pages/orderList/orderList.css
@@ -190,7 +190,7 @@ page {
 }
 
 .prod-item  .prod-foot {
-  padding: 20rpx 30rpx;
+  /* padding: 20rpx 30rpx; */
   border-top: 2rpx solid #e6e6e6;
 }
 
@@ -222,6 +222,8 @@ page {
 }
 
 .button {
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
   margin-left: 10px;
   font-size: 26rpx;
   background: #fff;
@@ -229,6 +231,9 @@ page {
   border-radius: 80rpx;
   border: 2rpx solid #e1e1e1;
 }
+.button:last-child {
+  margin-right: 10rpx;
+}
 
 .button.warn {
   color: #eb2444;
diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue
index a223666..31cf1bd 100644
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@@ -79,7 +79,7 @@
         <view class="prod-foot">
           <view class="btn">
             <text v-if="item.status==1" class="button" @tap="onCancelOrder" :data-ordernum="item.orderNumber" hover-class="none">取消订单</text>
-            <text class="button warn" @tap :data-ordernum="item.orderNumber" hover-class="none">再次购买</text>
+            <!-- <text class="button warn" @tap :data-ordernum="item.orderNumber" hover-class="none">再次购买</text> -->
             <text v-if="item.status==1" class="button warn" @tap="normalPay" :data-ordernum="item.orderNumber" hover-class="none">付款</text>
             <text v-if="item.status==3 || item.status==5" class="button" @tap="toDeliveryPage" :data-ordernum="item.orderNumber" hover-class="none">查看物流</text>
             <text v-if="item.status==3" class="button warn" @tap="onConfirmReceive" :data-ordernum="item.orderNumber" hover-class="none">确认收货</text>