jufubao-base 1.0.161 → 1.0.162-beta11

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>
@@ -127,6 +128,7 @@ export default {
       interval: null,
       provider_id: "",
       callback_url: "",
+      is_show_skip: "",
     };
   },
   computed: {
@@ -174,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', {

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

@@ -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: '样式设置',

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -18,13 +18,12 @@
 					height: (height + rpxText) + 'px'
 				}"
 			>
-
-				<view :style="{ height: height + 'px', width:width}">
+				<view :style="{ height: height + 'px', width:width, padding: config.iconPadding}">
 					<view :style="{
 						borderRadius: config.radius  + 'rpx',
 						boxShadow: config.shadow === 1? `0 0 8rpx ${config.shadowColor}` : '',
 					}">
-						<image :src="item.image_url"></image>
+						<image :src="item.image_url" style=""></image>
 					</view>
 				</view>
 				<view v-if="item['content_name']" :style="{color: config.textColor}">{{item['content_name']}}</view>
@@ -70,7 +69,7 @@
                 :style="{height: boxHeight + 'px'}"
                 @click="handleClick(it)"
               >
-                <view :style="{ height: height + 'px'}">
+                <view :style="{ height: height + 'px', padding: config.iconPadding}">
                   <view :style="{
 										borderRadius: config.radius  + 'rpx',
 										boxShadow: config.shadow === 1? `0 0 10rpx rgba(0, 0, 0, .5)` : '',
@@ -114,7 +113,7 @@
 								}"
 								@click="handleClick(it)"
 							>
-								<view :style="{ height: height + 'px'}">
+								<view :style="{ height: height + 'px', padding: config.iconPadding}">
 									<view :style="{
 										borderRadius: config.radius  + 'rpx',
 										boxShadow: config.shadow === 1? `0 0 10rpx rgba(0, 0, 0, .5)` : '',
@@ -158,7 +157,7 @@
         timer: null,
         width: 0,
         height: 0,
-				text: 50,
+				text: 40,
         padding: 0,
         status: false,
 				list: [],
@@ -400,15 +399,15 @@
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						width: 100%;
+            box-sizing: border-box;
+
 						& > view {
-							width: 75%;
-							height: 75%;
+							width: 100%;
+							height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 							& > image {
 								width: 100%;
 								height: 100%;
@@ -441,15 +440,15 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 80%;
-							height: 80%;
+              width: 100%;
+              height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 
 							& > image {
 								width: 100%;
@@ -505,11 +504,11 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 75%;
-							height: 75%;
-							overflow: hidden;
+							width: 100%;
+							height: 100%;
 							display: flex;
 							justify-content: center;
 							align-items: center;
@@ -542,15 +541,15 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 80%;
-							height: 80%;
+							width: 100%;
+							height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 
 							& > image {
 								width: 100%;

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -72,6 +72,7 @@
 				timer: null,
 				info: [],
         mS: {},
+        iconPadding:{},
 				isPreview: false,
 				noData:false,
 
@@ -100,8 +101,18 @@
           shadow: this.shadow,
           shadowColor: this.shadowColor,
           textColor: this.textColor,
+          iconPadding:this.iconCPadding,
 				}
 			},
+      iconCPadding(){
+        let defaultPadding = 20;
+        if(this.cells === 4) defaultPadding = 25
+        let str = `${this.checkValue(this.iconPadding.top, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.right, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.bottom, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.left, defaultPadding)}rpx`;
+        return str
+      },
       margin(){
         let str = `${this.checkValue(this.mS.top, 0)}rpx`;
         str = `${str} ${this.checkValue(this.mS.right, 0)}rpx`;
@@ -164,6 +175,7 @@
         this.shadow = getContainerPropsValue(container, 'content.shadow', 2);
         this.shadowColor = getContainerPropsValue(container, 'content.shadowColor', 'rgba(0,0,0,.3)');
         this.mS = getContainerPropsValue(container, 'content.margin', {});
+        this.iconPadding = getContainerPropsValue(container, 'content.iconPadding', {});
 
         //样式设置
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#333');

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -107,7 +107,7 @@
                   class="jfb-base-success__body-cashier-password"
                   @click="showPassword = true"
                   :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                >{{ showPassword ? info.codes[0].can_read_code : "查看密码" }}</view>
+                >{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
@@ -218,7 +218,7 @@
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
                         :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                      >查看二维码和密码</view>
+                      >查看二维码和{{ item.password_title }}</view>
                       <view
                         v-if="item['code_end_time']"
                         class="jfb-base-success__body-cashier-code"

package/src/components/JfbBaseSweep/Api.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [];

package/src/components/JfbBaseSweep/Attr.js

@@ -0,0 +1,34 @@
+'use strict';
+
+export default {
+  style: [],
+  advanced: [],
+  content: (data) => {
+    return [
+      {
+        label: '门店核销首页:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'change_url',
+        groupKey:'advanced',
+        placeholder: '请选择门店核销首页跳转路径',
+        value: data.change_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡绑定:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'bind_url',
+        groupKey:'advanced',
+        placeholder: '请选择卡绑定跳转路径',
+        value: data.bind_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+    ].filter(i => i)
+  },
+};