cb-biz-ui 1.3.9 → 1.4.1

package/components/cb-cart-bar-icon/cb-cart-bar-icon.vue

@@ -8,39 +8,44 @@
       width: width + 'rpx'
     }"
   >
-    <view class="nut-badge"
-      ><ui-icon :name="icon" :size="22" color="#333"></ui-icon>
-      <view class="nut-badge__content"
-        ><ui-badge
+    <view class="nut-badge">
+      <ui-icon :name="icon" :size="22" color="#333"></ui-icon>
+      <view class="nut-badge__content">
+        <ui-badge
           v-if="badge"
-          type="red"
+          :type="badgeType"
           absolute
           :scaleRatio="0.8"
           right="10rpx"
-          top="-4rpx"
-          >{{ badge }}</ui-badge
-        ></view
-      >
+          top="-4rpx">
+          {{ badge }}
+        </ui-badge>
+      </view>
     </view>
     <view class="cart-bar-text ui-scale-small">{{ text }}</view>
   </view>
 </template>
 <script setup lang="ts">
+type badgeType = "primary" | "warning" | "green" | "danger" | "white" | "black" | "gray" | "white_red" | 'red'
+
 interface IProps {
   text: string;
   icon: string;
   badge?: number;
   width: number;
+  badgeType: badgeType;
 }
+
 const props = withDefaults(defineProps<IProps>(), {
-  width: 130
+  width: 130,
+  badgeType: "primary"
 });
 const emit = defineEmits<{
-  (e: 'handleClick', data: IProps): void;
+  (e: "handleClick", data: IProps): void;
 }>();
 
 const handleClick = () => {
-  emit('handleClick', props);
+  emit("handleClick", props);
 };
 </script>
 <style scoped lang="scss">

package/components/cb-category/cb-category.vue

@@ -20,7 +20,7 @@
             <sort-icon
               :scale="0.8"
               :type="inventoryType"
-              borderActivedColor="#FF524F"
+              :borderActivedColor="addBtnBgColor"
               borderColor="#6D7278"
             />
           </view>
@@ -29,7 +29,7 @@
             <sort-icon
               :scale="0.8"
               :type="priceType"
-              borderActivedColor="#FF524F"
+              :borderActivedColor="addBtnBgColor"
               borderColor="#6D7278"
             />
           </view>
@@ -45,6 +45,7 @@
           >
             <goods-card
               :goods-count="countData[item.defaultShopSkuId]?.count"
+              :addBtnBgColor="addBtnBgColor"
               @handleClick="goDetails"
               @countChange="countChange"
               :entity="item"
@@ -86,6 +87,7 @@ interface IProps {
   cartItemList?: cartItemListType[];
   inventoryType?: 'desc' | 'asc' | '';
   priceType?: 'desc' | 'asc' | '';
+  addBtnBgColor: string;
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -94,7 +96,8 @@ const props = withDefaults(defineProps<IProps>(), {
   goodsList: [],
   nullData: { url: '', text: '' },
   cartItemList: [],
-  loading: false
+  loading: false,
+  addBtnBgColor: 'rgba(255, 82, 79, 1)'
 });
 
 const countData = computed<{ [key: number]: any }>(() => {

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

@@ -97,7 +97,7 @@
           v-if="!goodsCount"
           class="goods-card_info_add_icon"
         >
-          <ui-icon name="add" :size="19" color="red"></ui-icon>
+          <ui-icon name="add" :size="19" :color="addBtnBgColor"></ui-icon>
         </view>
         <view v-else class="number-box" @tap.stop="() => {}">
           <!-- <uni-number-box
@@ -135,6 +135,7 @@
           v-if="bezier"
           right="0"
           bottom="0"
+          :backgroundColor="addBtnBgColor"
           :windowWidth="state.windowWidth"
           :windowHeight="state.windowHeight"
           :position="{ right: 110, bottom: 15 }"
@@ -181,6 +182,7 @@ interface IProps {
     price: string;
     numberBoxBg?: string;
   };
+  addBtnBgColor: string;
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -206,7 +208,8 @@ const props = withDefaults(defineProps<IProps>(), {
     preferentialPrice: 0,
     status: 0,
     unit: "份"
-  }
+  },
+  addBtnBgColor: 'rgba(255, 82, 79, 1)'
 });
 
 const emit = defineEmits<{

package/components/cb-shopping-cart/cb-shopping-cart.vue

@@ -30,7 +30,7 @@
                   <ui-checkbox
                     :trigger-group="false"
                     borderColor="#6D7278"
-                    color="#FF524F"
+                    :color="primaryColor"
                     :scaleRatio="0.8"
                     :value="item.id"
                     :checked="item.selected"
@@ -48,6 +48,7 @@
                     image-placeholder="https://shop-cdn.cbyzx.com/shop23n05y18abcd/img/50fbba9d9b4e4184b9ab7e2fbb43c645.png"
                     :textFontSize="props.goodTextStyles"
                     :goodsCount="item.count"
+                    :add-btn-bg-color="primaryColor"
                     :bezier="false"
                     @countChange="(val) => countChange(val, item)"
                     @handleClick="(goodsInfo) => goDetails(goodsInfo, item)"
@@ -71,6 +72,7 @@
       :is-all="isAll"
       :loading="payLoading"
       :priceData="props.priceData"
+      :primaryColor="primaryColor"
       @buyPlay="buyPlay"
       @checkAll="checkAll"
     />
@@ -110,6 +112,7 @@ interface IProps {
     price: string;
     numberBoxBg: string;
   };
+  primaryColor: string;
   payLoading?: boolean;
 }
 
@@ -131,7 +134,8 @@ const props = withDefaults(defineProps<IProps>(), {
     preferentialPrice: '31rpx',
     price: '23rpx',
     numberBoxBg: '#fff'
-  }
+  },
+  primaryColor: '#6D7278'
 });
 
 const actions = [

package/components/cb-shopping-cart-tabbar/cb-shopping-cart-tabbar.vue

@@ -3,7 +3,7 @@
     <view class="ui-checkAll">
       <ui-label class="ui-checkbox" width="100%" height="100%" isFull>
         <ui-checkbox
-          borderColor="#6D7278"
+          :borderColor="primaryColor"
           color="#FF524F"
           :scaleRatio="0.8"
           @change="checkAll"
@@ -27,7 +27,7 @@
       height="85rpx"
       size="32"
       padding="27rpx 70rpx"
-      background="#FF524F"
+      :background="primaryColor"
       :loading="loading"
       @click="btnPay"
       >去结算</ui-form-button
@@ -42,6 +42,7 @@ interface IProps {
   isAll: boolean;
   priceData: priceDataType;
   loading: boolean;
+  primaryColor: string;
 }
 const emit = defineEmits<{
   (e: 'buyPlay'): void;
@@ -57,7 +58,8 @@ const props = withDefaults(defineProps<IProps>(), {
     marketPriceTotalShow: '0.00',
     platformPriceTotal: 0,
     platformPriceTotalShow: '0.00'
-  }
+  },
+  primaryColor: '#6D7278'
 });
 const btnPay = () => {
   emit('buyPlay');

package/libs/css/vertical-nav.scss

@@ -20,7 +20,7 @@
 .active::before {
   content: '';
   position: absolute;
-  border-left: 3rpx solid #ff524f;
+  border-left: 3rpx solid $uni-color-primary;
   height: 110rpx;
   left: 0;
 }

package/package.json

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