jufubao-mall 2.0.4 → 2.0.5-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.4",
+  "version": "2.0.5-beta3",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -96,7 +96,8 @@
                           <xd-radio
                             class="xd-radio"
                             :width="32"
-                            :height="32"
+                            :height="100"
+                            :is-old="false"
                             :disabled="!(prod.status === 'ok' || editCart)"
                             size="mini"
                             v-model="prod.checked"
@@ -152,7 +153,7 @@
         <view class="bottom_fixed_body" :style="[bottomFixedBoxStyle]">
           <view class="flex-sub">
             <view class="flex">
-              <xd-radio size="mini" :width="40" :height="40" :value="allCheck" @change="handleAllCheck"></xd-radio>
+              <xd-radio size="mini" :width="40" :height="60" :is-old="false" :value="allCheck" @change="handleAllCheck"></xd-radio>
               <text class="text ml14">全选</text>
               <text>（{{ checkedProdList.length }}）</text>
             </view>

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -311,6 +311,11 @@
             :layoutInfo="layoutInfo"
             :fixedStyle="fixedStyle"
             :mainColor="mainColor"
+            :salePriceColor="salePriceColor" 
+            :salePriceFontSize="salePriceFontSize" 
+            :originalPriceFontSize="originalPriceFontSize" 
+            :originalPriceColor="originalPriceColor" 
+            :isPlus="is_plus_site"
             @change="handleSkuChange"
             @onConfirm="handleConfirmSku"
           ></xd-sku>
@@ -972,7 +977,7 @@
           NORMAL: {
             WITH_DISCOUNT: [
               { p: 2678, n: "PLUS价", t: "S" },
-              { p: 4000, n: "原价", t: "U" }
+              { p: 4000, n: "原价", t: "U" },
             ],
             WITHOUT_DISCOUNT: [
               { p: 2678, n: "PLUS价", t: "S" }

package/src/components/JfbMallProductInfo/XdSku.vue

@@ -12,7 +12,7 @@
       <view id="prod_wrap" class="prod_wrap">
         <image class="sku_img" :src="skuImage" />
         <view class="sku_info">
-          <xd-unit :price="priceNew.p" :fontSize="48" :isOld="false" />
+          <CusPrice :key="priceNew" v-if="priceNew" :salePriceColor="salePriceColor" :salePriceFontSize="salePriceFontSize" :originalPriceFontSize="originalPriceFontSize" :originalPriceColor="originalPriceColor" :isPlus="is_plus_site" iconSize="0.4" :showPrice="priceNew" type="info"></CusPrice>
           <view v-if="choseSkuName" class="_specs"
             >已选：{{ choseSkuName }}</view
           >
@@ -196,6 +196,7 @@ import XdNumber from "@/components/XdNumber/XdNumber";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import CusPrice from '@/components/CusPrice/CusPrice'
 import Color from "color";
 import getServiceUrl from "@/common/getServiceUrl";
 import {
@@ -212,6 +213,7 @@ export default {
     XdButton,
     XdUnit,
     XdFontIcon,
+    CusPrice
   },
   props: {
     action: {
@@ -271,7 +273,28 @@ export default {
     initStatus: {
       type: Boolean,
       default:false
+    },
+    salePriceColor: {
+      type: String,
+      default: "",
+    },
+    salePriceFontSize: {
+      type: String,
+      default: "",
+    },
+    originalPriceFontSize: {
+      type: String,
+      default: "",
+    },
+    originalPriceColor: {
+      type: String,
+      default: "",
+    },
+    is_plus_site: {
+      type: Boolean,
+      default: false,
     }
+    
   },
   data() {
     return {
@@ -358,30 +381,23 @@ export default {
       return this.buyButton.buttons.find((item) => item.code === "buy-now");
     },
     priceNew() {
-      let prices = {};
-      if (
-        this.currSku &&
-        this.currSku.prices &&
-        Object.keys(this.currSku.prices).length > 0
-      ) {
-        prices = this.currSku.prices;
-      } else {
-        if (this.baseInfo&&this.baseInfo.prices) {
-          prices = this.baseInfo.prices;
+      let prices = null;
+        if (
+          this.currSku &&
+          this.currSku.prices &&
+          this.currSku.prices.show_prices
+        ) { 
+          prices = this.currSku.prices.show_prices
         } else {
-          prices = {};
+          if (this.baseInfo && this.baseInfo.prices && this.baseInfo.prices.show_prices) {
+            prices = this.baseInfo.prices.show_prices
+          } else {
+            prices = []
+          }
         }
-      }
-      // 兼容页面加载完成接口还没有返回的情况
-      if (!prices) {
-        prices = {};
-      }
-      if (!prices.show_prices) {
-        prices.show_prices = [];
-      }
-      const filteredPrice = prices.show_prices.find((item) => item.t === "S");
-      return filteredPrice || {};
-    },
+        return prices
+      },
+      
   },
   async created() {
     this.style = await getParentsStyles(this.$parent);