订单列表与详情样式修复

wj1031925 · Nov 24, 2021 · 8329303 · 8329303
1 parent f778a2f
commit 8329303
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/mall4uni/pages/order-detail/order-detail.css b/mall4uni/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 {
@@ -190,6 +191,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/mall4uni/pages/order-detail/order-detail.vue b/mall4uni/pages/order-detail/order-detail.vue
@@ -65,15 +65,15 @@
           </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>
           <button v-if="status==1" class="button warn" @tap="onPayAgain" :data-ordernum="orderNumber" hover-class="none">付款</button>
           <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/mall4uni/pages/orderList/orderList.css b/mall4uni/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,13 +222,18 @@ page {
 }
 
 .button {
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
   margin-left: 10px;
   font-size: 26rpx;
   background: #fff;
   padding: 10rpx 30rpx;
   border-radius: 80rpx;
   border: 2rpx solid #e1e1e1;
 }
+.button:last-child {
+  margin-right: 10rpx;
+}
 
 .button.warn {
   color: #eb2444;

diff --git a/mall4uni/pages/orderList/orderList.vue b/mall4uni/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" :data-ordernum="item.orderNumber" hover-class="none">再次购买</text>
+            <!-- <text class="button warn" :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>