jufubao-base 1.0.165 → 1.0.167-beta2

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -38,7 +38,7 @@
                   <view class="jfb-base-card__body-card-item-right-bottom-info-residue"></view>
                   <view class="jfb-base-card__body-card-item-right-bottom-info-deduction"></view>
                 </view>
-                <view :style="{ background: mainColor }"></view>
+                <view :style="{ background: '#F2F2F2' }"></view>
               </view>
             </view>
           </view>
@@ -47,26 +47,35 @@
       <template v-else>
         <view
           class="jfb-base-card__body-card"
-          :style="{
-            margin: marginUi,
-          }"
+          :style="{padding: marginUi}"
         >
           <view
             v-for="(item, index) in cardList"
             :key="index"
             @click="handleBindLogin(item)"
             class="jfb-base-card__body-card-item"
+            :style="{
+              marginBottom: list_sp + 'rpx',
+              backgroundColor:(item['is_login'] === 'Y'? mainBorderColor : '#fff'),
+              borderColor:`${item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}`
+            }"
           >
             <view class="jfb-base-card__body-card-item-left">
               <xd-font-icon
                 size="100"
-                color="#8D5F18"
-                icon="iconyouhuiquan1-011"
+                :color="mainColor"
+                :icon="item['is_login'] === 'Y'?'iconkaquandengluchenggong':'iconyouhuiquan1-011'"
               ></xd-font-icon>
-              <view>{{login_name}}</view>
+              <view :style="{color: item['is_login'] === 'Y'?mainColor :''}">{{ item['is_login'] === 'Y'? logged_name : login_name}}</view>
             </view>
-            <view class="jfb-base-card__body-card-item-right">
-              <view class="jfb-base-card__body-card-item-right-top">
+            <view
+              class="jfb-base-card__body-card-item-right"
+              :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
+            >
+              <view
+                class="jfb-base-card__body-card-item-right-top"
+                :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
+              >
                 <view>
                   <xd-font-icon
                     icon="iconkaquan"
@@ -85,10 +94,7 @@
                   <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
                   <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
                 </view>
-                <view
-                  @click.stop="toDetail(item)"
-                  :style="{ background: mainColor }"
-                >查看</view>
+                <view @click.stop="toDetail(item)" :style="{ background: mainColor }">{{look_name}}</view>
               </view>
             </view>
           </view>
@@ -121,6 +127,7 @@
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
   import {mapState} from "vuex";
+  import Color from "color";
 
   export default {
     name: "JfbBaseCardV2",
@@ -135,19 +142,19 @@
       return {
         cardList: [],
         inCallback: "",
+        mainBorderColor:'',
+        mainSubBorderColor:'',
 
         //面板
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
         orderListPath: "",
         login_name:'',
-        margin: {
-          top: 0,
-          left: 0,
-          bottom: 0,
-          right: 0
-        },
+        look_name:'',
+        logged_name:'',
+        margin: {},
         loadingCardList: true,
+        list_sp:20,
 
         inCallbackUrlOrg:'',//是否带有回调地址
       }
@@ -165,11 +172,17 @@
         return this.fixedStyle({paddingBottom: 0, zIndex: 111})
       },
       marginUi() {
-        return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
+        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
+        return str
       },
     },
     created() {
       this.init(this.container);
+      this.mainBorderColor = Color(this.mainColor).alpha(0.05).toString();
+      this.mainSubBorderColor = Color(this.mainColor).alpha(0.1).toString();
     },
     methods: {
       onJfbLoad(options) {
@@ -216,7 +229,11 @@
         this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
         this.orderListPath = getContainerPropsValue(container, "content.orderListPath", {value: ""}).value;
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
-        this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
+        this.margin = getContainerPropsValue(container, 'content.margin', {});
+        this.look_name =  getContainerPropsValue(container, 'content.look_name', '查看');
+        this.logged_name =  getContainerPropsValue(container, 'content.logged_name', '已登录');
+        this.list_sp = getContainerPropsValue(container, 'content.list_sp', 20);
+
       },
 
       handleBindLogin(item){
@@ -317,9 +334,13 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        border: unit(2, rpx) solid #eeeeeeff;
+        border: unit(2, rpx) solid #eee;
         border-radius: unit(20, rpx);
-        margin-bottom: unit(30, rpx);
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
 
         &-left {
           width: unit(200, rpx);
@@ -394,13 +415,14 @@
             }
 
             & > view:nth-child(2) {
-              width: unit(80, rpx);
+              min-width: unit(80, rpx);
               height: unit(40, rpx);
               border-radius: unit(20, rpx);
               font-size: unit(22, rpx);
               color: #fff;
               text-align: center;
               line-height: unit(40, rpx);
+              padding: 2rpx 10rpx;
             }
           }
         }

package/src/components/JfbBaseCardV2/Mock.js

@@ -8,17 +8,18 @@ module.exports = {
       "card_point": 100000000,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "is_login":"Y"
     }, {
       "card_number": "101001000005193",
       "card_point": 99963600,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "次",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -28,7 +29,7 @@ module.exports = {
       "card_point": 100000000,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -38,7 +39,7 @@ module.exports = {
       "card_point": 99631000,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "点",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -48,7 +49,7 @@ module.exports = {
       "card_point": 1400,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "",
-      "end_time": "2025-05-03 23:59:59",
+      "end_time": "2025-05-03",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -58,7 +59,7 @@ module.exports = {
       "card_point": 0,
       "card_type_name": "聚福宝测试C40",
       "unit": "次",
-      "end_time": "2025-05-03 23:59:59",
+      "end_time": "2025-05-03",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -68,7 +69,7 @@ module.exports = {
       "card_point": 3600,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "",
-      "end_time": "2025-05-03 23:59:59",
+      "end_time": "2025-05-03",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -78,7 +79,7 @@ module.exports = {
       "card_point": 0,
       "card_type_name": "聚福宝测试C40",
       "unit": "次",
-      "end_time": "2025-05-03 23:59:59",
+      "end_time": "2025-05-03",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -88,7 +89,7 @@ module.exports = {
       "card_point": 10000000,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "点",
-      "end_time": "2024-02-03 23:59:59",
+      "end_time": "2024-02-03",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
@@ -98,7 +99,7 @@ module.exports = {
       "card_point": 1000000,
       "card_type_name": "聚福宝福卡测试蛋糕",
       "unit": "点",
-      "end_time": "2024-02-23 23:59:59",
+      "end_time": "2024-02-23",
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,

package/src/components/JfbBaseCardV3/Attr.js

@@ -17,7 +17,19 @@ export default {
         placeholder: '请输入票券登录文案',
         className: 'input80',
         inline: false,
-        notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
+        notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
+      },
+      {
+        label: '票券已登录文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'logged_name',
+        groupKey:'content',
+        value: data.logged_name || '',
+        placeholder: '请输入票券已登录文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
       {
         label: '绑定新票券地址:',

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -20,9 +20,11 @@
       </view>
       <template v-else>
         <view class="card_list" v-if="cardList.length">
-          <xd-card-v2 v-for="(item, index) in cardList"
+          <xd-card-v2
+            v-for="(item, index) in cardList"
             :mainColor="mainColor"
             :login-name="login_name"
+            :logged-name="logged_name"
             :key="index"
             :cardInfo="item"
             :tabIndex="1"
@@ -73,6 +75,7 @@
         changeUrl: "",
         detailUrl: "",
         login_name:'',
+        logged_name:'',
         loadingCardList: true,
 
         inCallbackUrlOrg:'',//是否带有回调地址
@@ -136,6 +139,7 @@
         this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
         this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+        this.logged_name = getContainerPropsValue(container, "content.logged_name", "已登录");
       },
       toBindCard(){
         let path = this.getUrlCallback(this.cardBindPath)

package/src/components/JfbBaseCardV3/Mock.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getListCardBindV3: {}
 }

package/src/components/JfbBaseMultipleExpress/Attr.js

@@ -7,6 +7,15 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
       {
         label: '物流详情路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpress.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-multiple-express__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-multiple-express__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-multiple-express__body" v-if="express.length > 0">
@@ -36,8 +34,7 @@
           <view
             class="jfb-base-multiple-express__body-express-number-copy"
             @click="copy(item.logistics_number)"
-            >复制单号</view
-          >
+          >复制单号</view>
         </view>
         <view
           class="jfb-base-multiple-express__body-express-product"
@@ -46,30 +43,22 @@
           <view
             :style="{ color: mainColor }"
             class="jfb-base-multiple-express__body-express-product-status"
-            >{{ item.sub_order_status_text }}</view
-          >
+          >{{ item.sub_order_status_text }}</view>
           <view
             class="jfb-base-multiple-express__body-express-product-content"
             v-for="(Sitem, Sindex) in item.showList"
             :key="Sindex"
           >
-            <image
-              :src="Sitem.thumb"
-              style="background: #ffffff"
-            mode="aspectFit"
-            ></image>
+            <image :src="Sitem.thumb" style="background: #ffffff" mode="aspectFit"></image>
             <view
               class="jfb-base-multiple-express__body-express-product-content-info"
             >
-              <view
-                class="jfb-base-multiple-express__body-express-product-content-info-name"
-                >{{ Sitem.product_name }}</view
-              >
+              <view class="jfb-base-multiple-express__body-express-product-content-info-name">{{ Sitem.product_name }}</view>
+              <view class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
               <view
                 v-if="Sitem.sku_name"
                 class="jfb-base-multiple-express__body-express-product-content-info-skuname"
-                >规格：{{ Sitem.sku_name }}</view
-              >
+              >规格：{{ Sitem.sku_name }}</view>
               <view
                 class="jfb-base-multiple-express__body-express-product-content-info-price"
               >
@@ -83,7 +72,7 @@
                 </view>
                 <view v-else></view>
                 <view class="info-price">
-                  x
+                  <text>x</text>
                   <text style="margin-left: 8rpx;">{{ Sitem.num }}</text>
                 </view>
               </view>
@@ -127,6 +116,7 @@ export default {
     return {
       express: [],
       main_order_id: "",
+      brandTextColor:'',
     };
   },
   watch: {
@@ -180,13 +170,8 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.expressPath = getContainerPropsValue(
-        container,
-        "content.expressPath",
-        {
-          value: "",
-        }
-      ).value;
+      this.expressPath = getContainerPropsValue(container, "content.expressPath", {value: "",}).value;
+      this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
@@ -289,7 +274,7 @@ export default {
         &-status {
           font-size: unit(24, rpx);
           text-align: right;
-          margin: unit(36, rpx) 0;
+          margin: unit(20, rpx) 0;
         }
 
         &-content {
@@ -310,7 +295,14 @@ export default {
             flex-direction: column;
             justify-content: space-between;
             margin-left: unit(24, rpx);
-            height: unit(160, rpx);
+            min-height: unit(160, rpx);
+
+            .brand-name {
+              font-size: 24rpx;
+              margin-bottom: 6rpx;
+              .uni-max-cut(2, 64);
+              line-height: 32rpx;
+            }
 
             &-name {
               font-size: unit(32, rpx);

package/src/components/JfbBaseMultipleExpress/Mock.js

@@ -11,6 +11,8 @@ module.exports = {
       "logistics_number": "SF1685689779402",
       "package_id": "K8bX6_E7KZcIq7K6DiHJb",
       "product_list": [{
+        'brand_id': 20001,
+        'brand_name': "维尔纳斯",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -19,6 +21,8 @@ module.exports = {
         "thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230406\/0b890cd5a947d9c5724b412d34cd4000.png",
         "price": 2103
       }, {
+        'brand_id': 20001,
+        'brand_name': "维尔纳斯",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -36,6 +40,8 @@ module.exports = {
       "logistics_number": "75580431357494",
       "package_id": "GSoLqqSNzneETTn-QlZZG",
       "product_list": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -53,6 +59,8 @@ module.exports = {
       "logistics_number": "75580918666266",
       "package_id": "oxrqHZEeKn_a9qrjwYwRG",
       "product_list": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -70,6 +78,8 @@ module.exports = {
       "logistics_number": "1231",
       "package_id": "axz_Mgal3f3G5k3eELsUd",
       "product_list": [{
+        'brand_id': 20167,
+        'brand_name': "派悦坊",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -260,6 +260,20 @@ export default {
           }
         },
       },
+      {
+        label: "是否展示可用门店:",
+        ele: 'xd-radio',
+        valueKey: "is_show_support_shop",
+        value: data['is_show_support_shop'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展示可用门店',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',
@@ -273,6 +287,15 @@ export default {
         inline: false,
         notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',