fix: prod2-51/52

boyang
1 parent bb644353
Showing 4 changed files with 41 additions and 67 deletions
components/ProductDetail.vue
deploy/prod2.sh
pages/products/detail/[id]/index.vue
pages/products/index.vue
@@ -255,7 +255,9 @@
           style="width: 100%"
         >
           <v-tab :value="1">Product Details</v-tab>
-          <v-tab :value="2">Specification</v-tab>
+          <v-tab :value="2" v-if="info.productAttributeList"
+            >Specification</v-tab
+          >
           <!-- <v-tab :value="3">商品百科</v-tab> -->
         </v-tabs>
         <v-window
@@ -272,32 +274,32 @@
           <v-window-item key="1" :value="1">
             <!-- 修改位置 1: 使用 clearSpanStyle 方法清理 info.advantage -->
             <div v-if="info.advantage" class="tw-mb-[24px]">
-              <div class="text-h6">Advantage</div>
-              <v-divider class="tw-mb-[12px]"></v-divider>
+              <!-- <div class="text-h6">Advantage</div>
+              <v-divider class="tw-mb-[12px]"></v-divider> -->
               <div v-html="clearSpanStyle(info.advantage)"></div>
             </div>
             <!-- 修改位置 2: 使用 clearSpanStyle 方法清理 info.physicalproperty -->
             <div v-if="info.physicalproperty" class="tw-mb-[24px]">
-              <div class="text-h6">Physical Property</div>
-              <v-divider class="tw-mb-[12px] html-content"></v-divider>
+              <!-- <div class="text-h6">Physical Property</div>
+              <v-divider class="tw-mb-[12px] html-content"></v-divider> -->
               <div v-html="clearSpanStyle(info.physicalproperty)"></div>
             </div>
             <!-- 修改位置 3: 使用 clearSpanStyle 方法清理 info.storage -->
             <div v-if="info.storage" class="tw-mb-[24px]">
-              <div class="text-h6">Storage</div>
-              <v-divider class="tw-mb-[12px]"></v-divider>
+              <!-- <div class="text-h6">Storage</div>
+              <v-divider class="tw-mb-[12px]"></v-divider> -->
               <div v-html="clearSpanStyle(info.storage)"></div>
             </div>
             <!-- 修改位置 4: 使用 clearSpanStyle 方法清理 info.introduction -->
             <div v-if="info.introduction" class="tw-mb-[24px]">
-              <div class="text-h6">Introduction</div>
-              <v-divider class="tw-mb-[12px]"></v-divider>
+              <!-- <div class="text-h6">Introduction</div>
+              <v-divider class="tw-mb-[12px]"></v-divider> -->
               <div v-html="clearSpanStyle(info.introduction)"></div>
             </div>
             <!-- 修改位置 5: 使用 clearSpanStyle 方法清理 info.description -->
             <div v-if="info.description" class="tw-mb-[24px]">
-              <div class="text-h6">Description</div>
-              <v-divider class="tw-mb-[12px]"></v-divider>
+              <!-- <div class="text-h6">Description</div>
+              <v-divider class="tw-mb-[12px]"></v-divider> -->
               <div v-html="clearSpanStyle(info.description)"></div>
             </div>
           </v-window-item>
@@ -631,13 +633,34 @@ const clearSpanStyle = (htmlContent) =&gt; {
     span.removeAttribute("style"); // 清空 style 属性
   });
-  // 修改 img 的 style 属性，追加 width: 100%
+  // const imgs = doc.querySelectorAll("img");
+  // imgs.forEach((img) => {
+  //   const style = img.getAttribute("style") || ""; // 获取现有 style
+  //   if (!style.includes("width: 100%")) {
+  //     img.setAttribute("style", `${style} width: 100%; height: auto;`.trim()); // 添加 width: 100% 和 height: auto
+  //   }
+  // });
   const imgs = doc.querySelectorAll("img");
+
   imgs.forEach((img) => {
-    const style = img.getAttribute("style") || ""; // 获取现有 style
-    if (!style.includes("width: 100%")) {
-      img.setAttribute("style", `${style} width: 100%;`.trim()); // 添加 width: 100%
+    // 去除 img 标签内的 width 和 height 属性，如果存在的话
+    if (img.hasAttribute("width")) {
+      img.removeAttribute("width");
     }
+    if (img.hasAttribute("height")) {
+      img.removeAttribute("height");
+    }
+
+    // 获取现有的 style 属性，如果存在的话
+    let style = img.getAttribute("style") || "";
+
+    // 如果 style 中有 width 和 height，移除它们
+    style = style
+      .replace(/width\s*:\s*[^;]+;?/gi, "")
+      .replace(/height\s*:\s*[^;]+;?/gi, "");
+
+    // 添加 width: 100% 和 height: auto 样式
+    img.setAttribute("style", `${style} width: 100%; height: auto;`.trim());
   });
   // 返回处理后的 HTML
 #!/bin/bash
 # 变量定义
-LAST_TAG="1.0.50"
-TAG="1.0.51"
+LAST_TAG="1.0.51"
+TAG="1.0.52"
 TARGET_PATH="/root/web/canrud-outside-nuxt-front"
 DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front"
 IMAGE_NAME="canrud-outside-front"
@@ -64,7 +64,7 @@ newData.productimageliststore = newData?.productimageliststore?.map(
   (item: ProductImage) => ({
     ...item,
     // url: `http://112.74.45.244:8100/api/show/image?fileKey=${item.fileKey}`
-    url: `https://www.canrud.com/api/show/image?fileKey=${item.fileKey}&psize=p512`,
+    url: `/api/show/image?fileKey=${item.fileKey}&psize=p512`,
   })
 );
@@ -2,55 +2,6 @@
   <div class="tw-m-auto tw-pb-[64px]" style="padding-bottom: 0px">
     <CategoryList v-if="categoryStore.categoryVisible && !isMobile()" />
     <MobileCategoryList v-if="categoryStore.categoryVisible && isMobile()" />
-    <!-- <v-tabs
-      class="tabs"
-      v-model="tabRecom"
-      style="margin-top: 25px"
-      color="white"
-      bg-color="#eeeeee"
-      slider-color="blue-lighten-1"
-      selected-class="active"
-      v-if="recommendImages[0] !== null && !isMobile()"
-    >
-      <v-tab :value="1">Best Sellers</v-tab>
-    </v-tabs>
-    <div id="image-container" v-if="recommendImages[0] !== null && !isMobile()">
-      <div class="recommend-left-box">
-        <v-img
-          src="https://m-canrd.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2024/09/14/76c987e13a334be481a346c19c2284f3qy4tjnxps7.png"
-          alt="往左移"
-          class="recommend-img-left"
-          @click="toggleRowLeft"
-        />
-      </div>
-      <div class="image-row" id="row1">
-        <div
-          v-for="(imageObj, index) in recommendImages"
-          :key="'row1-' + index"
-          class="imageTotal"
-        >
-          <a v-if="imageObj" :href="imageObj[0]?.productUrl" target="_blank">
-            <img
-              :src="imageObj[0]?.url"
-              :alt="'Image ' + (index + 1)"
-              class="item-imgHot"
-            />
-            <span class="image-name">
-              {{ imageObj[0]?.name }}
-            </span>
-          </a>
-          <div v-else style="width: 200px; height: 200px"></div>
-        </div>
-      </div>
-      <div class="recommend-right-box">
-        <v-img
-          src="https://m-canrd.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2024/09/14/b5daa0a8f2f140f5b406e984c730a453iznzlekysg.png"
-          alt="往右移"
-          class="recommend-img-right"
-          @click="toggleRowRight"
-        />
-      </div>
-    </div> -->
     <v-container class="">
       <div class="tw-text-center tw-mt-[32px]" v-if="loading">
         <v-progress-circular