fix: prod2-57/58

boyang
1 parent 9fbe700a
Showing 4 changed files with 35 additions and 16 deletions
components/MobileProductDetail.vue
components/ProductDetail.vue
deploy/prod2.sh
pages/products/index.vue
@@ -161,7 +161,12 @@
             <td class="td text-grey-darken-4 font-weight-medium">
               {{ item.typeName }}
             </td>
-            <td v-if="item.priceShow" class="td">$ {{ item.price }}</td>
+            <td v-if="item.priceShow" class="td">
+              <div style="color: #df3931">${{ item.price }}</div>
+              <s style="font-size: 13px; color: #757575">
+                ${{ item.originPrice }}</s
+              >
+            </td>
             <!-- <td class="td">
               <v-btn
                 size="small"
@@ -213,34 +218,34 @@
         selected-class="active"
       >
         <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 v-model="tab">
         <v-window-item key="1" :value="1">
           <div v-if="info.advantage" class="tw-mb-[24px]">
-            <div class="py-2 pl-2 text-h6">Advantage</div>
-            <v-divider class="tw-mb-[12px]"></v-divider>
+            <!--            <div class="py-2 pl-2 text-h6">Advantage</div>-->
+            <!--            <v-divider class="tw-mb-[12px]"></v-divider>-->
             <div v-html="info.advantage"></div>
           </div>
           <div v-if="info.physicalproperty" class="tw-mb-[24px]">
-            <div class="py-2 pl-2 text-h6">Physical Property</div>
-            <v-divider class="tw-mb-[12px]"></v-divider>
+            <!--            <div class="py-2 pl-2 text-h6">Physical Property</div>-->
+            <!--            <v-divider class="tw-mb-[12px]"></v-divider>-->
             <div v-html="clearSpanStyle(info.physicalproperty)"></div>
           </div>
           <div v-if="info.storage" class="tw-mb-[24px]">
-            <div class="py-2 pl-2 text-h6">Storage</div>
-            <v-divider class="tw-mb-[12px]"></v-divider>
+            <!--            <div class="py-2 pl-2 text-h6">Storage</div>-->
+            <!--            <v-divider class="tw-mb-[12px]"></v-divider>-->
             <div v-html="clearSpanStyle(info.storage)"></div>
           </div>
           <div v-if="info.introduction" class="tw-mb-[24px]">
-            <div class="py-2 pl-2 text-h6">Introduction</div>
-            <v-divider class="tw-mb-[12px]"></v-divider>
+            <!--            <div class="py-2 pl-2 text-h6">Introduction</div>-->
+            <!--            <v-divider class="tw-mb-[12px]"></v-divider>-->
             <div v-html="clearSpanStyle(info.introduction)"></div>
           </div>
           <div v-if="info.description" class="tw-mb-[24px]">
-            <div class="py-2 pl-2 text-h6">Description</div>
-            <v-divider class="tw-mb-[12px]"></v-divider>
+            <!--            <div class="py-2 pl-2 text-h6">Description</div>-->
+            <!--            <v-divider class="tw-mb-[12px]"></v-divider>-->
             <div v-html="clearSpanStyle(info.description)"></div>
           </div>
         </v-window-item>
@@ -155,7 +155,12 @@
                 {{ item.typeName }}
               </td>
               <td v-if="item.priceShow" class="td">
-                {{ item.price + " " + item.priceUnit }}
+                <div style="color: #df3931">
+                  {{ item.price + " " + item.priceUnit }}
+                </div>
+                <s style="font-size: 13px; color: #757575">{{
+                  item.originPrice + " " + item.priceUnit
+                }}</s>
               </td>
               <td class="td">
                 <v-btn
 #!/bin/bash
 # 变量定义
-LAST_TAG="1.0.56"
-TAG="1.0.57"
+LAST_TAG="1.0.57"
+TAG="1.0.58"
 TARGET_PATH="/root/web/canrud-outside-nuxt-front"
 DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front"
 IMAGE_NAME="canrud-outside-front"
@@ -36,8 +36,17 @@
                   style="height: auto"
                 >
                   <h3 style="color: red" v-if="item.price">
-                    {{ item.price === item.maxPrice ? `$${item.price}` : `$${item.price} - $${item.maxPrice}` }}
+                    {{
+                      item.price === item.maxPrice
+                        ? `$${item.price}`
+                        : `$${item.price} - $${item.maxPrice}`
+                    }}
                   </h3>
+                  <!-- <s style="font-size: 13px; color: #757575">{{
+                    item.originPrice === item.maxPrice
+                      ? `$${item.originMinPrice}`
+                      : `$${item.originMinPrice} - $${item.originMaxPrice}`
+                  }}</s> -->
                   <h4 class="item-name">{{ item.name }}</h4>
                 </v-card-text>
               </v-card>