From 48bebc050325ded10e24f58e1410a8ada54ce45e Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Fri, 30 Jun 2023 10:41:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:lipstick:=20=E4=BC=98=E5=8C=96=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E4=B8=AD=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/myOrder.vue | 50 ++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 6f458f6..c604b82 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -90,19 +90,19 @@
                   <div v-else>应付金额:</div>
                   <div class="price">￥{{ order.flowPrice | unitPrice }}</div>
                 </view>
-                <view>
+                <view class="goods-btn flex flex-a-c">
                   <!-- 全部 -->
-                  <u-button
+                  <view
                     ripple
                     class="pay-btn"
                     shape="circle"
                     size="mini"
                     v-if="order.allowOperationVO.pay"
                     @click="waitPay(order)"
-                    >立即付款</u-button
+                    >立即付款</view
                   >
                   <!-- 取消订单 -->
-                  <u-button
+                  <view
                     ripple
                     class="cancel-btn"
                     shape="circle"
@@ -111,9 +111,9 @@
                     @click="onCancel(order.sn)"
                   >
                     取消订单
-                  </u-button>
+                  </view>
                   <!-- 等待收货 -->
-                  <u-button
+                  <view
                     ripple
                     shape="circle"
                     class="rebuy-btn"
@@ -122,10 +122,9 @@
                     @click="navigateToLogistics(order)"
                   >
                     查看物流
-                  </u-button>
-                  <u-button
+                  </view>
+                  <view
                     ripple
-                    :customStyle="{ background: lightColor, color: '#fff' }"
                     shape="circle"
                     class="pay-btn"
                     size="mini"
@@ -133,8 +132,8 @@
                     @click="onRog(order.sn)"
                   >
                     确认收货
-                  </u-button>
-                  <u-button
+                  </view>
+                  <view
                     ripple
                     shape="circle"
                     class="cancel-btn"
@@ -143,7 +142,7 @@
                     @click="applyService(order)"
                   >
                     退款/售后
-                  </u-button>
+                  </view>
                   <!-- TODO 后续完善 -->
                   <!-- <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
                       order.orderStatus === 'CANCELLED' ||
@@ -762,6 +761,7 @@ page,
       flex: 1;
       .price {
         color: $main-color;
+        
       }
     }
   }
@@ -796,29 +796,33 @@ page,
     text-align: center;
   }
 }
-
-.cancel-btn {
-  color: #999999 !important;
-  border-color: #999999 !important;
+.goods-btn{
+  display: flex;
+}
+.cancel-btn,.pay-btn,.rebuy-btn{
+  text-align: center;
   margin-left: 15rpx;
-  height: 60rpx;
+  font-size: 24rpx;
+  padding: 14rpx 20rpx;
+  border-radius: 100px;
+
+}
+.cancel-btn {
+  color: #333639 !important;
+  background: rgba(46, 51, 56, .05) !important;
 }
 
 .pay-btn {
-  // #ifndef MP-WEIXIN
+
   background-color: $light-color !important;
-  // #endif
+
   color: #ffffff !important;
-  margin-left: 15rpx;
-  height: 60rpx;
 }
 
 .rebuy-btn {
   color: $light-color !important;
   border-color: $light-color !important;
   background-color: #ffffff !important;
-  margin-left: 15rpx;
-  height: 60rpx;
 }
 </style>