cb-biz-ui 1.5.4 → 1.5.5

package/components/cb-goods-card/cb-goods-card.vue

@@ -25,9 +25,8 @@
     <view class="goods-card_info">
       <view class="goods-card_info_title">
         <ui-overflow-hidden size="24rpx">
-          <text class="text" :style="{ fontSize: textFontSize.title }">{{
-              entity.name
-            }}
+          <text class="text" :style="{ fontSize: textFontSize.title }"
+            >{{ entity.name }}
           </text>
         </ui-overflow-hidden>
       </view>
@@ -66,11 +65,26 @@
           </ui-tag>
         </view>
       </view>
+      <view class="rebate-box" v-if="entity.skuCommonExt.enableRebate">
+        <view class="rebate-box_title"> 购买返利 </view>
+        <view class="rebate-box_content">
+          <text class="rebate-box_content_text">约¥1.01</text>
+          <view class="rebate-box_content_icon">
+            (
+            <text class="rebate-box_content_icon_text">11111</text>
+            <image
+              class="rebate-icon"
+              src="https://edu-cdn.yunzhuxue.com/edub1429d21xcfds/img/cd9fd828b1b047aa8ac91f020b8452e9@.png@.webp"
+            />
+            )
+          </view>
+        </view>
+      </view>
       <view class="goods-card_info_sales-volume">
         <text
           class="goods-card_info_sales-volume_text"
           :style="{ fontSize: textFontSize.salesVolume }"
-        >销量{{ ` ` }}{{ entity.saleCnt || 0 }}
+          >销量{{ ` ` }}{{ entity.saleCnt || 0 }}
         </text>
       </view>
       <view class="goods-card_info_price">
@@ -78,14 +92,14 @@
           class="goods-card_info_price_preferential-price"
           :style="{ fontSize: textFontSize.preferentialPrice }"
         >
-          ￥{{ price }}/{{ entity?.unitTitle || "件" }}
+          ￥{{ price }}/{{ entity?.unitTitle || '件' }}
         </text>
         <text
           class="goods-card_info_price_price"
           v-if="entity.hasDiscount"
           :style="{ fontSize: textFontSize.price }"
         >
-          ￥{{ entity.marketPriceShow }}/{{ entity.unitTitle || "件" }}
+          ￥{{ entity.marketPriceShow }}/{{ entity.unitTitle || '件' }}
         </text>
       </view>
       <view class="goods-card_info_status" v-if="errStatusText">
@@ -149,8 +163,8 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, computed } from "vue";
-import type { GoodsDataType, changeValueType } from "../interface/types";
+import { onMounted, reactive, computed } from 'vue';
+import type { GoodsDataType, changeValueType } from '../interface/types';
 
 interface IProps {
   entity: GoodsDataType;
@@ -161,19 +175,19 @@ interface IProps {
   goodMin?: number;
   imagePlaceholder?: string;
   imageMode?:
-    | "scaleToFill"
-    | "aspectFit"
-    | "aspectFill"
-    | "widthFix"
-    | "top"
-    | "bottom"
-    | "center"
-    | "left"
-    | "right"
-    | "top left"
-    | "top right"
-    | "bottom left"
-    | "bottom right";
+    | 'scaleToFill'
+    | 'aspectFit'
+    | 'aspectFill'
+    | 'widthFix'
+    | 'top'
+    | 'bottom'
+    | 'center'
+    | 'left'
+    | 'right'
+    | 'top left'
+    | 'top right'
+    | 'bottom left'
+    | 'bottom right';
   textFontSize?: {
     title: string;
     tag: string;
@@ -186,35 +200,35 @@ interface IProps {
 }
 
 const props = withDefaults(defineProps<IProps>(), {
-  imgWidth: "225rpx",
-  imgHeight: "225rpx",
+  imgWidth: '225rpx',
+  imgHeight: '225rpx',
   goodMin: 0,
   goodsCount: 0,
   bezier: true,
   imagePlaceholder:
-    "https://shop-cdn.cbyzx.com/shop23n05y18abcd/img/3544375090854cd099d72edb09dce492.png",
-  imageMode: "aspectFill",
+    'https://shop-cdn.cbyzx.com/shop23n05y18abcd/img/3544375090854cd099d72edb09dce492.png',
+  imageMode: 'aspectFill',
   textFontSize: {
-    title: "24rpx",
-    tag: "18rpx",
-    salesVolume: "20rpx",
-    preferentialPrice: "24rpx",
-    price: "20rpx",
-    numberBoxBg: "#fff"
+    title: '24rpx',
+    tag: '18rpx',
+    salesVolume: '20rpx',
+    preferentialPrice: '24rpx',
+    price: '20rpx',
+    numberBoxBg: '#fff'
   },
   entity: {
-    goodSrc: "",
-    title: "",
+    goodSrc: '',
+    title: '',
     preferentialPrice: 0,
     status: 0,
-    unit: "份"
+    unit: '份'
   },
   addBtnBgColor: 'rgba(255, 82, 79, 1)'
 });
 
 const emit = defineEmits<{
-  (e: "countChange", value: changeValueType, entity: GoodsDataType): void;
-  (e: "handleClick", entity: GoodsDataType): void;
+  (e: 'countChange', value: changeValueType, entity: GoodsDataType): void;
+  (e: 'handleClick', entity: GoodsDataType): void;
 }>();
 
 const price = computed(() => {
@@ -224,12 +238,12 @@ const price = computed(() => {
 });
 const errStatusText = computed(() => {
   if (props.entity.saleStatus === 20) {
-    return "已失效";
+    return '已失效';
   }
   if (!props.entity.existInventory) {
-    return "无货";
+    return '无货';
   }
-  return "";
+  return '';
 });
 
 const state = reactive({
@@ -247,13 +261,13 @@ const change = (val: changeValueType) => {
   // if (val > props.entity.inventoryCapacity) {
   //   triggerMax();
   // }
-  emit("countChange", val, props.entity);
+  emit('countChange', val, props.entity);
 };
 
 const triggerMax = () => {
   uni.showModal({
-    title: "提示",
-    content: "库存不足,最大库存为" + props.entity.inventoryCapacity,
+    title: '提示',
+    content: '库存不足,最大库存为' + props.entity.inventoryCapacity,
     showCancel: false
   });
 };
@@ -265,7 +279,7 @@ const load = () => {
 };
 
 const itemTap = () => {
-  emit("handleClick", props.entity);
+  emit('handleClick', props.entity);
 };
 
 onMounted(() => {
@@ -275,7 +289,7 @@ onMounted(() => {
 const addClick = () => {
   change({
     value: props.goodsCount + 1,
-    type: "plus",
+    type: 'plus',
     index: 0,
     custom: {}
   });

package/components/cb-manage-goods-item/cb-manage-goods-item.vue

@@ -17,6 +17,12 @@
         <view class="off-shelf" v-if="data.saleStatus === 20">
           <text class="text">已下架</text>
         </view>
+        <view
+          class="rebate"
+          v-if="data.saleStatus == 10 && data.skuCommonExt.enableRebate"
+        >
+          <text class="text">购后返利:¥{{ data.skuCommonExt.rebateVal }}</text>
+        </view>
       </view>
       <view class="text-box">
         <view class="header">
@@ -60,6 +66,11 @@ interface dataType {
   marketPriceShow: string; // 市场价
   saleCnt: number; // 销量
   distributionCommissionRate: string; // 佣金率
+  skuCommonExt: {
+    rebateVal: number;
+    enableRebate: boolean;
+    rebateType: string;
+  };
 }
 interface IProps {
   data: dataType;

package/components/interface/types.d.ts

@@ -31,7 +31,16 @@ export interface GoodsDataType {
   marketPriceShow: string;
   existInventory: boolean; // 是否有库存
   saleCnt: number; // 销量
-  purchaseLimitNum: number // 限购数量
+  purchaseLimitNum: number; // 限购数量
+  skuCommonExt: {
+    distributionCommissionRate: string; // 分销佣金比例
+    enableDistribution: number; // 是否开启分销
+    enableRebate: boolean; // 是否开启购后返利
+    rebateContractId: number; // 返利合同id
+    rebateContractSnapshotId: number; // 返利合同快照id
+    rebateType: string; // 返利类型
+    rebateVal: string; // 返利金额
+  };
 }
 export interface changeValueType {
   value: number;
@@ -58,7 +67,7 @@ export interface skuInfoType {
   /**是否无限库存 */
   unlimitedInventory: boolean;
   existInventory: boolean; // 是否有库存
-  purchaseLimitNum: number // 是否限购 -1 不限购
+  purchaseLimitNum: number; // 是否限购 -1 不限购
 }
 export interface cartItemListType {
   /** 买家id */

package/libs/css/goods-card.scss

@@ -66,6 +66,37 @@
       }
     }
 
+    .rebate-box {
+      display: flex;
+      align-items: center;
+      font-size: 18rpx;
+      border: 1px solid rgba(255, 82, 79, 1);
+      border-radius: 10rpx;
+      overflow: hidden;
+
+      .rebate-box_title {
+        font-size: 20rpx;
+        color: rgb(1, 1, 1);
+        background-color: rgba(255, 82, 79, 1);
+        padding: 25rpx 20rpx;
+      }
+      .rebate-box_content {
+        display: flex;
+        align-items: center;
+        padding: 25rpx 10rpx;
+        color: rgba(255, 82, 79, 1);
+        .rebate-box_content_icon {
+          display: flex;
+          align-items: center;
+          color: rgba(102, 102, 102, 1);
+          .rebate-icon {
+            width: 30rpx;
+            height: 30rpx;
+          }
+        }
+      }
+    }
+
     .goods-card_info_sales-volume {
       width: 100%;
       display: flex;
@@ -152,4 +183,4 @@
       z-index: 21;
     }
   }
-}
+}

package/libs/css/manage-goods-item.scss

@@ -33,6 +33,24 @@
           font-size: 26rpx;
         }
       }
+
+      .rebate {
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(49, 48, 48, 0.73);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 10rpx 0;
+        font-size: 20rpx;
+        box-sizing: border-box;
+        .text {
+          color: #bfbfbf;
+          font-size: 20rpx;
+        }
+      }
     }
 
     .text-box {
@@ -77,22 +95,28 @@
         align-items: center;
         font-size: 26rpx;
         width: 100%;
+
         .money {
           width: 150rpx;
           font-weight: bold;
+
           .symbol {
             font-size: 20rpx;
           }
+
           .value {
             color: #FF0000;
           }
         }
-        .rate{
+
+        .rate {
           display: flex;
           align-items: center;
+
           .label {
             color: #666666;
           }
+
           .value {
             color: #FF0000;
           }
@@ -100,4 +124,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cb-biz-ui",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "cb-biz-ui",
   "main": "index.js",
   "keywords": [