jufubao-base 1.0.159-beta2 → 1.0.159-beta20

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -44,6 +44,7 @@
               <image></image>
               <view class="jfb-base-order-list__body-order-item-content-info">
                 <view class="jfb-base-order-list__body-order-item-content-info-name"></view>
+                <view class="brand_name"></view>
                 <view class="jfb-base-order-list__body-order-item-content-info-price">
                   <view></view>
                   <view class="info-price"></view>
@@ -82,49 +83,26 @@
                 :icon="item.biz_code_icon"
                 :size="item['biz_code_icon_size']"
               ></xd-font-icon>
-              <view :class="{ marginLeft: item.biz_code_icon }">{{
-                item.biz_code_name
-              }}</view>
+              <view :class="{ marginLeft: item.biz_code_icon }">{{item.biz_code_name }}</view>
             </view>
             <view class="jfb-base-order-list__body-order-item-title">
               <view>订单编号:{{ item.main_order_id }}</view>
-              <view
-                :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
-                >{{ item.status.status_name }}</view>
+              <view :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}">{{ item.status.status_name }}</view>
             </view>
             <view class="order-list">
               <view
                 class="jfb-base-order-list__body-order-item-content"
                 v-for="(Sitem, Sindex) in item.products"
                 :key="Sitem.key"
-                v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
-                <image
-                  :src="Sitem.product_thumb"
-                  style="background: #ffffff"
-                  mode="aspectFit"
-                ></image>
+                v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']"
+              >
+                <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
                 <view class="jfb-base-order-list__body-order-item-content-info">
-                  <view
-                    class="jfb-base-order-list__body-order-item-content-info-name"
-                    >{{ Sitem.product_name }}</view
-                  >
-                  <view
-                    v-if="Sitem.product_sku_name"
-                    class="jfb-base-order-list__body-order-item-content-info-skuname"
-                    >规格：{{ Sitem.product_sku_name }}</view
-                  >
-                  <view
-                    class="jfb-base-order-list__body-order-item-content-info-price"
-                  >
-                    <view :style="{ fontSize: '32rpx', color: mainColor }">
-                      <!-- <xd-unit
-                        :isOld="false"
-                        :price="Sitem.sale_price"
-                        :color="mainColor"
-                        :fontSize="32"
-                        v-if="item.biz_code !== 'gift'"
-                      ></xd-unit> -->
-                    </view>
+                  <view class="jfb-base-order-list__body-order-item-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.product_sku_name" class="jfb-base-order-list__body-order-item-content-info-skuname">规格：{{ Sitem.product_sku_name }}</view>
+                  <view class="jfb-base-order-list__body-order-item-content-info-price">
+                    <view></view>
                     <view class="info-price">
                       <text>X</text>
                       <text>{{ Sitem.product_num }}</text>
@@ -136,7 +114,7 @@
                 class="order-list-icon"
                 :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
                 v-if="item.products.length > showLen"
-                @click.stop="item['isOpen'] = !item['isOpen']"
+                @click.stop="switchOpen(item)"
               >
                 <view :style="{ background: backgroundColor }">
                   <xd-font-icon
@@ -180,8 +158,7 @@
                   :type="getBtnType(btn.action)"
                   size="mini"
                   @click="handleBtnEvent(btn.action, item)"
-                  >{{ btn.text }}
-                </xd-button>
+                >{{ btn.text }}</xd-button>
               </view>
             </view>
           </view>
@@ -224,6 +201,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseOrderListMixin],
   data() {
     return {
+
       showLen: 3,
       tabList: [],
       tabIndex: 0,
@@ -241,6 +219,7 @@ export default {
       //基础
       radius: 0,
       backgroundColor: "",
+      brandTextColor:'',
       padding: 0,
 
       //投影
@@ -320,72 +299,34 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
-      this.backgroundColor = getContainerPropsValue(
-        container,
-        "content.backgroundColor",
-        "#f8f8f8"
-      );
+      this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", "#f8f8f8");
+      this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
       this.padding = getContainerPropsValue(container, "content.padding", 20);
 
-      this.is_shadow = getContainerPropsValue(
-        container,
-        "content.is_shadow",
-        "N"
-      );
-      this.is_shadow_bg = getContainerPropsValue(
-        container,
-        "content.is_shadow_bg",
-        "#fff"
-      );
-      this.is_shadow_w = getContainerPropsValue(
-        container,
-        "content.is_shadow_w",
-        "10"
-      );
+      this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
+      this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
 
-      this.is_border = getContainerPropsValue(
-        container,
-        "content.is_border",
-        "N"
-      );
-      this.is_border_c = getContainerPropsValue(
-        container,
-        "content.is_border_c",
-        "#fff"
-      );
-      this.is_border_w = getContainerPropsValue(
-        container,
-        "content.is_border_w",
-        2
-      );
+      this.is_border = getContainerPropsValue(container, "content.is_border", "N");
+      this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
+      this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
 
-      this.detailPath = getContainerPropsValue(
-        container,
-        "content.detailPath",
-        { value: "" }
-      ).value;
-      this.payPath = getContainerPropsValue(container, "content.payPath", {
-        value: "",
-      }).value;
-      this.tabList = getContainerPropsValue(
-        container,
-        "content.orderTypeList",
-        []
-      ).map((item) => {
+      this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
+      this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
+      this.tabList = getContainerPropsValue(container, "content.orderTypeList", []).map((item) => {
         return {
           name: item.customName || item.label,
           ...item,
           size: Number(item.size ? item.size : 18) * 2,
         };
       });
-      console.log("this.tabList", this.tabList);
+
+    },
+
+    switchOpen(item){
+      item['isOpen'] = !item['isOpen']
     },
 
     cancelUnPayOrder(main_order_id) {
@@ -572,6 +513,12 @@ export default {
       }
     }
     &-order {
+      .brand-name {
+        font-size: 24rpx;
+        margin-bottom: 6rpx;
+        .uni-max-cut(2, 64);
+        line-height: 32rpx;
+      }
       &-item {
         .skeleton-wrap & {
           background-color: #FFFFFF;

package/src/components/JfbBaseOrderList/Mock.js

@@ -13,6 +13,8 @@ module.exports = {
       "biz_code_name": "蛋糕(勿改)订单",
       "biz_code_icon": "icondangao-01",
       "products": [{
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007286,
         "product_name": "多规格商品测试",
         "product_sku_id": "70015608",
@@ -34,6 +36,8 @@ module.exports = {
       "biz_code_name": "礼包(勿改)订单",
       "biz_code_icon": "icondalibao-01",
       "products": [{
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60006975,
         "product_name": "大碗茶001",
         "product_sku_id": "0",
@@ -43,6 +47,8 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230411\/c9376f60c446efe811edd5b8b874ceb3.png",
         "sale_price": 1950
       }, {
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007126,
         "product_name": "牛肉干",
         "product_sku_id": "0",
@@ -52,6 +58,8 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230421\/0a2b0fd8c7b3395fd9f286d332ae4171.png",
         "sale_price": 3250
       }, {
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007126,
         "product_name": "牛肉干",
         "product_sku_id": "0",
@@ -61,8 +69,10 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230421\/0a2b0fd8c7b3395fd9f286d332ae4171.png",
         "sale_price": 3250
       }, {
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007091,
-        "product_name": "选品规则指定商品001",
+        "product_name": "冷冻千丝万缕面线虾 250g*2件共20只",
         "product_sku_id": "0",
         "product_sku_name": "",
         "product_type": "good",
@@ -70,8 +80,10 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230418\/5a7a974454ea4258edd50e89960dacb5.png",
         "sale_price": 1300
       }, {
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007091,
-        "product_name": "选品规则指定商品001",
+        "product_name": "【动物奶油】你的眼里有星河冰淇淋",
         "product_sku_id": "0",
         "product_sku_name": "",
         "product_type": "good",
@@ -79,6 +91,8 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230418\/5a7a974454ea4258edd50e89960dacb5.png",
         "sale_price": 1300
       }, {
+        'brand_id': 2,
+        'brand_name': "味多美",
         "product_id": 60007097,
         "product_name": "小吊梨汤榴莲蛋糕",
         "product_sku_id": "70004316",
@@ -100,8 +114,10 @@ module.exports = {
       "biz_code_name": "礼包(勿改)订单",
       "biz_code_icon": "icondalibao-01",
       "products": [{
+        'brand_id': 20167,
+        'brand_name': "派悦坊",
         "product_id": 60007217,
-        "product_name": "001号商品",
+        "product_name": "仙桃盛宴”祝寿定制蛋糕",
         "product_sku_id": "0",
         "product_sku_name": "",
         "product_type": "good",
@@ -121,8 +137,10 @@ module.exports = {
       "biz_code_name": "电影(勿改)订单",
       "biz_code_icon": "icondianying-01",
       "products": [{
+        'brand_id': 20001,
+        'brand_name': "维尔纳斯",
         "product_id": 581,
-        "product_name": "聚福宝-万里归途",
+        "product_name": "动物奶油】ins小清新动物奶油生日蛋糕",
         "product_sku_id": "F7-9218531180-1306340102#02#09",
         "product_sku_name": "6厅（需自备3D眼镜）-2排9列",
         "product_type": "virtual",
@@ -142,6 +160,8 @@ module.exports = {
       "biz_code_name": "蛋糕(勿改)订单",
       "biz_code_icon": "icondangao-01",
       "products": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60007126,
         "product_name": "牛肉干",
         "product_sku_id": "0",
@@ -151,8 +171,10 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230421\/0a2b0fd8c7b3395fd9f286d332ae4171.png",
         "sale_price": 3250
       }, {
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006975,
-        "product_name": "大碗茶001",
+        "product_name": "满庭芳”杨梅荔枝红丝绒蛋糕",
         "product_sku_id": "0",
         "product_sku_name": "",
         "product_type": "good",

package/src/components/JfbBasePhoneCollect/Attr.js

@@ -456,5 +456,16 @@ export default {
       inline: false,
       notice: '',
     },
+    {
+      label: "是否展示[跳过]功能",
+      ele: "xd-radio",
+      valueKey: "is_show_skip",
+      value: "",
+      groupKey: "content",
+      list: [
+        { label: '展示', value: 'Y' },
+        { label: '隐藏', value: 'N' },
+      ]
+    }
   ]
 }

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -74,6 +74,7 @@
           >
         </view>
         <view
+          v-if="is_show_skip === 'Y'"
           class="jump_collect"
           @click="jumpCollect"
           >跳过</view>
@@ -102,6 +103,10 @@ import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
+  // #ifdef MP-WEIXIN
+  options: { styleIsolation: 'shared' },
+  // #endif
+
   name: "JfbBasePhoneCollect",
   components: {
     XdFontIcon,
@@ -123,6 +128,7 @@ export default {
       interval: null,
       provider_id: "",
       callback_url: "",
+      is_show_skip: "",
     };
   },
   computed: {
@@ -170,6 +176,7 @@ export default {
     init(container) {
       //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
       //this.height = getContainerPropsValue(container, 'content.height', 10);
+      this.is_show_skip = getContainerPropsValue(container, 'content.is_show_skip', "Y");
     },
     reGetCode() {
       this.$xdLog.setProject('get.code.handle', {
@@ -329,7 +336,13 @@ export default {
   align-items: center;
 }
 /* #ifdef MP-WEIXIN */
+/deep/ .xd-form-checkbox .checklist-group {
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
 .text-content {
+  width: 100%;
   & > text {
     font-size: 26rpx;
   }

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -100,6 +100,10 @@
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
 
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
+
     name: "JfbBasePhoneLogin",
     components: {
       XdFontIcon,
@@ -362,7 +366,13 @@
     align-items: center;
   }
   /* #ifdef MP-WEIXIN */
+  /deep/ .xd-form-checkbox .checklist-group {
+    justify-content: center;
+    display: flex;
+    align-items: center;
+  }
   .text-content {
+    width: 100%;
     & > text {
       font-size: 26rpx;
     }

package/src/components/JfbBasePoster/Attr.js

@@ -338,6 +338,7 @@ export default {
           {label: '显示圆点+长条', value: 'round'},
           {label: '显示索引+标题', value: 'nav'},
           {label: '显示索引', value: 'indexes'},
+          {label: '不显示', value: 'normal'},
         ],
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,

package/src/components/JfbBasePosterBigSmall/Attr.js

@@ -118,7 +118,7 @@ export default {
             //当一个插件中出现多个内容分类时候需要设置code值，在页面引用时候（容器id + code）进行拼接获取数据列表
             data.params = Object.assign({}, data.params, {code: 'big'});
           }
-          console.log(data.params,'data.paramsdata.paramsdata.params');
+
           //设置场景参数
           if(data) {
             data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
@@ -403,6 +403,7 @@ export default {
           {label: '显示圆点+长条', value: 'round'},
           {label: '显示索引+标题', value: 'nav'},
           {label: '显示索引', value: 'indexes'},
+          {label: '不显示', value: 'normal'},
         ],
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,
@@ -718,6 +719,7 @@ export default {
           {label: '显示圆点+长条', value: 'round'},
           {label: '显示索引+标题', value: 'nav'},
           {label: '显示索引', value: 'indexes'},
+          {label: '不显示', value: 'normal'},
         ],
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,
@@ -1033,6 +1035,7 @@ export default {
           {label: '显示圆点+长条', value: 'round'},
           {label: '显示索引+标题', value: 'nav'},
           {label: '显示索引', value: 'indexes'},
+          {label: '不显示', value: 'normal'},
         ],
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,

package/src/components/JfbBasePosterType/Attr.js

@@ -8,6 +8,7 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
+    let defaultPadding = 20;
     if (!params['isCarousel']) params['isCarousel'] = 1;
     if (!params['number']) params['number'] = 20;
     if (params['shadow'] === undefined) params['shadow'] = 2;
@@ -15,6 +16,7 @@ export default {
     if (!params['jdRows']) params['jdRows'] = 1;
     if (!params['radius']) params['radius'] = '20';
     if (!params['carouselTime']) params['carouselTime'] = 5;
+    if(params['cells'] === 4) defaultPadding = 30
     return [
       {
         label: '导航配置:',
@@ -263,7 +265,7 @@ export default {
           {"label": "轮播图显示", "value": 2},
         ]
       },
-      params['isCarousel'] === 2 && {
+      {
         label: '导航轮播周期:',
         ele: 'el-input',
         type: 'number',
@@ -273,26 +275,8 @@ export default {
         value: params.carouselTime,
         placeholder: '请输入导航轮播周期，单位秒',
         className: 'input60',
-        unit: '秒',
-        rules: [
-          {
-            required: true,
-            message: '请输入导航轮播周期',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '导航内容显示列数:',
-        ele: 'xd-select-list',
-        valueKey: 'cells',
-        groupKey:'content',
-        value: params.cells,
-        className: 'input60',
-        list: [
-          {"label": "四列", "value": 4},
-          {"label": '五列', "value": 5},
-        ]
+        inline: false,
+        notice: '轮播周期时间设置仅在“<span style="color:red">轮播图显示</span>”生效，单位:<span style="color:red">秒</span>',
       },
       {
         label: '导航内容显示行数:',
@@ -325,12 +309,37 @@ export default {
           },
         ]
       },
+      {
+        label: '导航内容显示列数:',
+        ele: 'xd-select-list',
+        valueKey: 'cells',
+        groupKey:'content',
+        value: params.cells,
+        className: 'input60',
+        list: [
+          {"label": "四列", "value": 4},
+          {"label": '五列', "value": 5},
+        ]
+      },
+      {
+        label: 'ICON图标填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'iconPadding',
+        groupKey:'content',
+        value: params.iconPadding || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: `ICON图标填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">${defaultPadding}</span> 像素，<br/><span style="color: red">注意</span>：上下填充数值相加=左右填充数值相加时，ICON才会时正方形。`,
+      },
       {
         label: '导航ICON圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
         value: params['radius'],
-        groupKey:'style',
+        groupKey:'content',
         placeholder: '请选择导航ICON圆角设置',
         multiple: false,
         className: 'input60',
@@ -348,7 +357,7 @@ export default {
         label: '导航ICON是否阴影设置:',
         ele: 'xd-radio',
         valueKey: 'shadow',
-        groupKey:'style',
+        groupKey:'content',
         value: params['shadow'],
         placeholder: '请选择导航ICON阴影设置',
         className: 'input60',
@@ -357,15 +366,16 @@ export default {
           {"label": "否", "value": 2},
         ]
       },
-      params['shadow'] === 1&& {
+      params['shadow'] === 1 && {
         label: '导航ICON阴影颜色配置:',
         ele: 'xd-color',
         valueKey: 'shadowColor',
-        groupKey:'style',
+        groupKey:'content',
         value: params['shadowColor'] || '',
         placeholder: '导航ICON阴影颜色配置',
         classNmae: 'input60',
       },
+
       {
         ele: 'title',
         label: '样式设置',