From 4dba142cbcc4be73056164a606b76a5dd31e114d Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 7 Feb 2023 15:48:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8B=BC=E5=9B=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=8F=8A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=95=86=E5=93=81=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=B7=BB=E5=8A=A0=E5=9C=86=E8=A7=92=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8Cs-goods-item=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=86=E8=A7=92=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/order.vue              | 53 ++++++++++++-------
 .../components/s-goods-item/s-goods-item.vue  |  9 +++-
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/pages/activity/groupon/order.vue b/pages/activity/groupon/order.vue
index 6fb9ddb..74b34fc 100644
--- a/pages/activity/groupon/order.vue
+++ b/pages/activity/groupon/order.vue
@@ -16,12 +16,27 @@
         v-for="order in state.pagination.data"
         :key="order.id"
       >
+        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+          <view class="order-no">订单号：{{ order.my.order.order_sn }}</view>
+          <view
+            class="ss-font-26"
+            :class="
+              order.status === 'ing'
+                ? 'warning-color'
+                : order.status === 'invalid'
+                ? 'danger-color'
+                : 'success-color'
+            "
+            >{{ order.status_text }}</view
+          >
+        </view>
         <view class="border-bottom">
           <s-goods-item
             :img="order.goods.image"
             :title="order.goods.title"
             :price="order.goods.price[0]"
             priceColor="#E1212B"
+            radius="20"
           >
             <template #groupon>
               <view class="ss-flex">
@@ -39,7 +54,8 @@
             订单详情
           </button>
           <button
-            class="detail-btn ss-reset-button"
+            class="tool-btn ss-reset-button"
+            :class="{ 'ui-BG-Main-Gradient': order.status === 'ing' }"
             @tap="sheep.$router.go('/pages/activity/groupon/detail', { id: order.id })"
           >
             {{ order.status === 'ing' ? '邀请拼团' : '拼团详情' }}
@@ -200,19 +216,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .tool-btn {
-    width: 160rpx;
-    height: 60rpx;
-    background: #f6f6f6;
-    font-size: 26rpx;
-    border-radius: 30rpx;
-    margin-right: 10rpx;
-
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
-
   .swiper-box {
     flex: 1;
 
@@ -230,10 +233,6 @@
         font-size: 26rpx;
         font-weight: 500;
       }
-
-      .order-state {
-        color: var(--ui-BG-Main);
-      }
     }
 
     .order-card-footer {
@@ -249,6 +248,15 @@
         color: #999999;
         margin-right: 20rpx;
       }
+      .tool-btn {
+        width: 210rpx;
+        height: 66rpx;
+        border-radius: 33rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+        margin-right: 20rpx;
+        background: #f6f6f6;
+      }
 
       .invite-btn {
         width: 210rpx;
@@ -278,4 +286,13 @@
     font-weight: 400;
     color: #999999;
   }
+  .warning-color {
+    color: #faad14;
+  }
+  .danger-color {
+    color: #ff3000;
+  }
+  .success-color {
+    color: #52c41a;
+  }
 </style>
diff --git a/sheep/components/s-goods-item/s-goods-item.vue b/sheep/components/s-goods-item/s-goods-item.vue
index af39e18..6bed9f8 100644
--- a/sheep/components/s-goods-item/s-goods-item.vue
+++ b/sheep/components/s-goods-item/s-goods-item.vue
@@ -1,5 +1,8 @@
 <template>
-  <view class="ss-order-card-warp ss-flex ss-col-stretch ss-row-between bg-white">
+  <view
+    class="ss-order-card-warp ss-flex ss-col-stretch ss-row-between bg-white"
+    :style="[{ borderRadius: radius + 'rpx' }]"
+  >
     <view class="img-box ss-m-r-24">
       <image class="order-img" :src="sheep.$url.cdn(img)" mode="aspectFill"></image>
     </view>
@@ -91,6 +94,10 @@
       type: [String, Number],
       default: '',
     },
+    radius: {
+      type: [String],
+      default: '',
+    },
   });
   const skuString = computed(() => {
     if (!props.skuText) {