Merge branch 'main' of https://gitlab.com/tea28/client

src/pages/szw-order-list/index.vue

@@ -31,10 +31,14 @@
                         </view>
                     </view>
                     <view class="price-box flex_r flex_ac">
-                        <view class="btn cancel-btn" @tap="toCancel(li)" v-if="li.pay_status === 0">取消订单</view>
-                        <view class="btn topay-btn" @tap="toPay(li)" v-if="li.pay_status === 0">立即支付</view>
-                        <view class="btn cancel-btn" @click="toDetails(li)" v-if="li.pay_status != 0">查看订单</view>
-                        <view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
+                        <template v-if="li.pay_status === 0">
+                            <view class="btn cancel-btn" @tap="toCancel(li)">取消订单</view>
+                            <view class="btn topay-btn" @tap="toPay(li)">立即支付</view>
+                        </template>
+                        <template v-else>
+                            <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
+                            <view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
+                        </template>
                     </view>
                 </view>
                 <!-- 未付款 end -->
@@ -523,28 +527,30 @@ page {
 }
 
 .typetag{
-    border: 2px solid #ccc;
+    border: 1px solid #ccc;
     border-radius: 10rpx;
-    padding: 1px 18rpx;
+    padding: 2rpx 10rpx;
+    font-size: 22rpx;
+    font-weight: 500;
 }
 .tagcolor1{
-    border-color: #7986ca;
-    color: #7986ca;
+    border-color: #007aff;
+    color: #007aff;
 }
 .tagcolor2{
-    border-color: #afd7f7;
-    color: #afd7f7;
+    border-color: #4cd964;
+    color: #4cd964;
 }
 .tagcolor3{
-    border-color: #c8b4e1;
-    color: #c8b4e1;
+    border-color: #f0ad4e;
+    color: #f0ad4e;
 }
 .tagcolor4{
-    border-color: #e6c9e1;
-    color: #e6c9e1;
+    border-color: #dd524d;
+    color: #dd524d;
 }
 .tagcolor5{
-    border-color: #f4e68a;
-    color: #f4e68a;
+    border-color: #4335d6;
+    color: #4335d6;
 }
 </style>