From 655940c4f682622398ccc9cc154da1f0f985b9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Fri, 7 Mar 2025 13:50:23 +0800
Subject: [PATCH] tijiao

---
 .../commonComponents/selectGoods.vue          | 151 ++++++++----------
 pages/goods/index/index.vue                   |   2 +
 2 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue
index 4b81ac9..c0117ae 100644
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -24,31 +24,42 @@
 
       <view :class="`common_radius_box  goods_box popup_content`">
         <view class="title title_box"
-          ><text class="title_price"
-            >
-            
-            <text v-if="selectGoodsData.isVipPrice==1&&selectGoodsData.vipPrice!=0&&selectGoodsData.vipPrice!=null">
-									<text style="color: #e97512;font-weight: bold;">￥{{(selectGoodsData.vipPrice).toFixed(2)}}</text>
-									<text style="color: #fa2d12;font-size: 12px;margin-left: 4px;">VIP到手价</text>
-									<!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
-									
-									
-								
-								</text>
-
-							<text
-								v-else-if="selectGoodsData.activityPrice && selectGoodsData.activityPrice > 0">
-								<text style="color: #e97512;font-weight: bold;">￥{{(selectGoodsData.activityPrice).toFixed(2)}}</text>
-								<text style="color: #613804;font-size: 12px;margin-left: 4px;">活动价</text>
-									<!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
-									
-								
-							
-							</text>
-
-							<text v-else style="color: #e97512;font-weight: bold;"> ￥{{Number(selectGoodsData.price).toFixed(2)}}</text>
-            </text
           >
+            <text
+              v-if="
+                selectGoodsData.isVipPrice == 1 &&
+                selectGoodsData.vipPrice != 0 &&
+                selectGoodsData.vipPrice != null
+              "
+            >
+              <text style="color: #e97512; font-weight: bold"
+                >￥{{ selectGoodsData.vipPrice.toFixed(2) }}</text
+              >
+              <text style="color: #fa2d12; font-size: 12px; margin-left: 4px"
+                >VIP到手价</text
+              >
+              <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
+            </text>
+
+            <text
+              v-else-if="
+                selectGoodsData.activityPrice &&
+                selectGoodsData.activityPrice > 0
+              "
+            >
+              <text style="color: #e97512; font-weight: bold"
+                >￥{{ selectGoodsData.activityPrice.toFixed(2) }}</text
+              >
+              <text style="color: #613804; font-size: 12px; margin-left: 4px"
+                >活动价</text
+              >
+              <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
+            </text>
+
+            <text v-else style="color: #e97512; font-weight: bold">
+              ￥{{ Number(selectGoodsData.price).toFixed(2) }}</text
+            >
+          </text>
           <u-icon
             name="close"
             color="#333"
@@ -95,70 +106,14 @@
 
               <view :class="`goods_info  just`" style="">
                 <view class="name">{{ slotProps.row.productName }}</view>
-                <view class="flex_box" style="align-items: center;">
+                <view class="flex_box" style="align-items: center">
                   <!-- <text style="color: #999; text-decoration: line-through; margin-right: 20rpx;"
 													v-if="slotProps.row.activityPrice > 0 && slotProps.row.activityPrice < slotProps.row.price" >￥{{slotProps.row.price}}</text>
 					  <view class="price" style="color: #258feb"
 					    >￥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
 					  ></view
 					> -->
-
-                  <text
-                    class="price"
-                    v-if="
-                      slotProps.row.isVipPrice == 1 &&
-                      slotProps.row.vipPrice != 0 &&
-                      slotProps.row.vipPrice != null
-                    "
-                  >
-                    <text
-                      style="color: #e97512; font-size: 12px; font-weight: bold"
-                      >￥{{ slotProps.row.vipPrice.toFixed(2) }}</text
-                    >
-                    <!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
-                >VIP到手价</text
-              > -->
-                    <text
-                      style="
-                        color: #8a8a8a;
-                        font-size: 10px;
-                        margin-left: 4px;
-                        font-weight: bold;
-                        text-decoration: line-through;
-                      "
-                      >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
-                    >
-                  </text>
-
-                  <text
-                    v-else-if="
-                      slotProps.row.activityPrice &&
-                      slotProps.row.activityPrice > 0
-                    "
-                    class="price"
-                  >
-                    <text
-                      style="color: #e97512; font-size: 12px; font-weight: bold"
-                      >￥{{ slotProps.row.activityPrice.toFixed(2) }}</text
-                    >
-                    <!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
-                >活动价</text
-              > -->
-                    <text
-                      style="
-                        color: #8a8a8a;
-                        font-size: 10px;
-                        margin-left: 4px;
-                        font-weight: bold;
-                        text-decoration: line-through;
-                      "
-                      >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
-                    >
-                  </text>
-
-                  <text v-else class="price"
-                    >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
-                  >
+                  <text v-html="getPrice(slotProps)"></text>
 
                   <text
                     v-if="
@@ -236,6 +191,38 @@ export default {
     ...mapState(["userInfo"]),
   },
   methods: {
+    getPrice(slotProps) {
+      if (
+        Number(slotProps.row.isVipPrice) === 1 &&
+        Number(slotProps.row.vipPrice) > 0
+      ) {
+        return `
+  <text style="color: #e97512; font-size: 12px; font-weight: bold;">
+    ￥${Number(slotProps.row.vipPrice).toFixed(2)}
+  </text>
+  <text
+    style="color: #8a8a8a; font-size: 10px; margin-left: 4px; font-weight: bold; text-decoration: line-through;"
+  >
+    ￥${Number(slotProps.row.price).toFixed(2)}
+  </text>
+`;
+      } else if (Number(slotProps.row.activityPrice) > 0) {
+        return `
+  <text style="color: #e97512; font-size: 12px; font-weight: bold;">
+    ￥${Number(slotProps.row.activityPrice).toFixed(2)}
+  </text>
+  <text
+    style="color: #8a8a8a; font-size: 10px; margin-left: 4px; font-weight: bold; text-decoration: line-through;"
+  >
+    ￥${Number(slotProps.row.price).toFixed(2)}
+  </text>
+`;
+      } else {
+        return `<span style="color: #e97512;">
+  ￥${Number(slotProps.row.price).toFixed(2)}</span>
+`;
+      }
+    },
     // 放大图片
     previewImage(url) {
       console.log(url);
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index b69f7e5..8e6676a 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -428,6 +428,7 @@
         @buttonClick="onHandleClickBuy1"
       />
     </view>
+    
     <common-select-goods
       ref="commonSelectGoods"
       :selectGoodsData="selectGoodsData"
@@ -897,6 +898,7 @@ export default {
           that.booksList = res.data.books ? res.data.books : [];
           that.coursesList = res.data.courses ? res.data.courses : [];
           that.goodsList = res.data.GLProducts;
+          console.log('that.goodsList at line 111111111111111900:', that.goodsList)
 
           that.parameterList = [];
           if (that.curriculumData.productName) {