From 68ee5d5ba6253c4265c1334eb0bf649896e52dec Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Fri, 3 Feb 2023 18:46:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=98=B6=E6=A2=AF=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-select-groupon-sku.vue                  | 111 ++++++++++--------
 1 file changed, 63 insertions(+), 48 deletions(-)

diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index 541be7d..c67e54a 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -12,11 +12,8 @@
           </image>
         </view>
         <view class="header-right ss-flex-col ss-row-between ss-flex-1">
-          <view class="goods-title ss-line-2">{{ goodsInfo.title }}</view>
-          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-            <view class="price-text"> {{ goodsPrice }}</view>
-			<!-- TODO @jj 拼团价放在标题左边 -->
- <!--           <view class="tig ss-flex ss-col-center">
+          <view class="goods-title ss-line-2">
+            <view class="tig ss-flex ss-col-center">
               <view class="tig-icon ss-flex ss-col-center ss-row-center">
                 <view class="groupon-tag">
                   <image :src="sheep.$url.static('/static/img/shop/goods/groupon-tag-white.png')">
@@ -24,9 +21,16 @@
                 </view>
               </view>
               <view class="tig-title">拼团价</view>
-            </view> -->
+            </view>
+            <view class="info-title">
+              {{ goodsInfo.title }}
+            </view>
+          </view>
+          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+            <view class="price-text"> {{ goodsPrice }}</view>
+
             <view class="stock-text ss-m-l-20">
-              库存{{ state.selectedSkuPrice.stock || goodsInfo.stock }}000件
+              库存{{ state.selectedSkuPrice.stock || goodsInfo.stock }}件
             </view>
           </view>
         </view>
@@ -92,7 +96,9 @@
         <view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
           <view class="ss-flex">
             <button class="ss-reset-button origin-price-btn ss-flex-col">
-              <view class="btn-title">{{ state.grouponNum === 0 ? '阶梯团' : state.grouponNum + '人团' }}</view>
+              <view class="btn-title">{{
+                state.grouponNum === 0 ? '阶梯团' : state.grouponNum + '人团'
+              }}</view>
             </button>
             <button class="ss-reset-button btn-tox ss-flex-col" @tap="onBuy">
               <view class="btn-price">
@@ -154,7 +160,6 @@
     currentSkuArray: [],
     grouponNum: props.grouponNum,
   });
-
   // 默认单规格
   if (!props.goodsInfo.is_sku) {
     state.selectedSkuPrice = props.goodsInfo.sku_prices[0];
@@ -179,12 +184,14 @@
   // 规格价格
   const goodsPrice = computed(() => {
     if (isEmpty(state.selectedSkuPrice)) {
+      console.log(222);
       return formatPrice(props.goodsInfo.price);
     }
-	if(state.grouponNum === 0 && activityType === 'groupon_ladder') {
-		return formatPrice(props.goodsInfo.price)
-	}
-	
+    if (state.grouponNum === 0 && activityType === 'groupon_ladder') {
+      console.log(1111);
+      return formatPrice(props.goodsInfo.price);
+    }
+
     if (activityType === 'groupon') {
       return state.selectedSkuPrice.groupon_price;
     }
@@ -200,9 +207,11 @@
     if (isEmpty(state.selectedSkuPrice)) {
       return formatPrice(props.goodsInfo.price);
     }
-	
-	if(state.grouponNum === 0 && activityType === 'groupon_ladder') return;
-	
+
+    if (state.grouponNum === 0 && activityType === 'groupon_ladder') {
+      return formatPrice(props.goodsInfo.price);
+    }
+
     if (activityType === 'groupon') {
       return state.selectedSkuPrice.leader_price;
     }
@@ -214,7 +223,7 @@
 
   // 获取阶梯价
   function getSkuPriceByLadder() {
-	return state.selectedSkuPrice.ladders.find((item) => item.ladder == state.grouponNum);
+    return state.selectedSkuPrice.ladders.find((item) => item.ladder == state.grouponNum);
   }
 
   watch(
@@ -480,6 +489,43 @@
         font-size: 28rpx;
         font-weight: 500;
         line-height: 42rpx;
+        position: relative;
+        .tig {
+          border: 2rpx solid #ff6000;
+          border-radius: 4rpx;
+          width: 126rpx;
+          height: 38rpx;
+          position: absolute;
+          left: 0;
+          top: 0;
+
+          .tig-icon {
+            width: 40rpx;
+            height: 40rpx;
+            background: #ff6000;
+            margin-left: -2rpx;
+            border-radius: 4rpx 0 0 4rpx;
+
+            .groupon-tag {
+              width: 32rpx;
+              height: 32rpx;
+            }
+          }
+
+          .tig-title {
+            font-size: 24rpx;
+            font-weight: 500;
+            line-height: normal;
+            color: #ff6000;
+            width: 86rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+        }
+        .info-title {
+          text-indent: 132rpx;
+        }
       }
 
       .price-text {
@@ -542,37 +588,6 @@
     }
   }
 
-  .tig {
-    border: 2rpx solid #ff6000;
-    border-radius: 4rpx;
-    width: 126rpx;
-    height: 38rpx;
-
-    .tig-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: #ff6000;
-      margin-left: -2rpx;
-      border-radius: 4rpx 0 0 4rpx;
-
-      .groupon-tag {
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
-
-    .tig-title {
-      font-size: 24rpx;
-      font-weight: 500;
-      line-height: normal;
-      color: #ff6000;
-      width: 86rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-
   image {
     width: 100%;
     height: 100%;