jufubao-mall 1.0.74 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallCart/Attr.js

@@ -86,7 +86,15 @@ export default {
           {label: '空购物车', value: "N"},
         ],
       },
-
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
       {
         label: '标题背景颜色:',
         ele: 'xd-color',

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -98,7 +98,8 @@
                         </view>
                         <view class="prod_info">
                           <view @click="toDetail(prod)">
-                            <view class="prod_tit">{{ prod.product_name }}</view>
+                            <view class="prod_tit" :class="{prod_tit_one: prod.brand_name && prod.product_sku_name}">{{ prod.product_name }}</view>
+                            <view v-if="prod.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ prod.brand_name }}</view>
                             <view class="prod_specs" v-if="prod.product_sku_name">规格：{{ prod.product_sku_name }}</view>
                           </view>
                           <view class="prod_price">
@@ -210,7 +211,6 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbMallCartMixin],
   data() {
     return {
-      hideMask: true,
       cart_bg: `//img.jufubao.cn/common/cart.png`,
       originCartList: [],
       cartList: [],
@@ -223,6 +223,7 @@ export default {
       orderConfirmPath: "",
       productInfoPath: "",
       cartListStatus: "", //购物车面板状态切换（有无商品)
+      brandTextColor:'',
 
       //基础
       backgroundColor: "rgba(0,0,0,0)",
@@ -350,6 +351,7 @@ export default {
       this.orderConfirmPath = getContainerPropsValue(container, "content.orderConfirmPath", { value: "" }).value;
       this.productInfoPath = getContainerPropsValue(container, "content.productInfoPath", { value: "" }).value;
       this.cartListStatus = getContainerPropsValue(container, "content.cartListStatus", 'Y');
+      this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
 
       //测试模式
       if (this.$configProject.isPreview) {
@@ -717,8 +719,11 @@ export default {
                   .uni-max-cut(2, 80);
                   line-height: unit(40, rpx);
                 }
+                .prod_tit_one {
+                  .uni-max-cut(1, 40);
+                }
                 .prod_specs {
-                  font-size: 28rpx;
+                  font-size: 26rpx;
                   color: #999999;
                   padding-top: unit(10, rpx);
                 }
@@ -727,6 +732,10 @@ export default {
                   justify-content: space-between;
                   align-items: center;
                 }
+                .brand-name {
+                  font-size: 26rpx;
+                  padding-top: unit(10, rpx);
+                }
               }
             }
           }

package/src/components/JfbMallCart/Mock.js

@@ -5,13 +5,12 @@ module.exports = {
     list: [
       {
         product_id: 60008821,
-        product_name:
-          "好丽友（orion）零食休闲零食薯条膨化食品呀!土豆番茄酱味70g/袋",
+        product_name: "好丽友（orion）零食休闲零食薯条膨化食品呀!土豆番茄酱味70g/袋",
+        brand_name:'好丽友（orion）',
         product_sku_id: "70016179",
         product_sku_name: "200 鲜香",
         num: 1,
-        thumb:
-          "//sandbox-img.jufubao.cn/uploads/20230522/478f40e75d1be2e85680d9de1c1890c7.jpg",
+        thumb: "//sandbox-img.jufubao.cn/uploads/20230522/478f40e75d1be2e85680d9de1c1890c7.jpg",
         sale_price: 2678,
         max_buy: -1,
         min_buy: -1,
@@ -26,8 +25,7 @@ module.exports = {
       },
       {
         product_id: 60008817,
-        product_name:
-          "港荣蒸蛋糕 奶香味手撕蛋糕900g/箱面包蛋糕早餐面包办公室零食",
+        product_name: "港荣蒸蛋糕 奶香味手撕蛋糕900g/箱面包蛋糕早餐面包办公室零食",
         product_sku_id: "0",
         product_sku_name: "",
         num: 1,
@@ -45,10 +43,10 @@ module.exports = {
       },
       {
         product_id: 60007091,
-        product_name:
-          "惠普（HP）战66 四代 15.6英寸轻薄笔记本电脑（i5-1135G7 16G 512G 高色域 一年上门+意外 2年电池）",
+        product_name: "惠普（HP）战66 四代 15.6英寸轻薄笔记本电脑（i5-1135G7 16G 512G 高色域 一年上门+意外 2年电池）",
         product_sku_id: "0",
         product_sku_name: "",
+        brand_name:'惠普（HP）战66 四代',
         num: 1,
         thumb: "//sandbox-img.jufubao.cn/uploads/20230517/d01ab9cd8344d226c43919b47f8ed534.jpg",
         sale_price: 1300,
@@ -62,8 +60,7 @@ module.exports = {
       },
       {
         product_id: 60008820,
-        product_name:
-          "好丽友（orion）零食休闲零食薯愿薯片非油炸膨化食品香烤原味 104g 桶装",
+        product_name: "好丽友（orion）零食休闲零食薯愿薯片非油炸膨化食品香烤原味 104g 桶装",
         product_sku_id: "0",
         product_sku_name: "",
         num: 1,
@@ -79,10 +76,10 @@ module.exports = {
       },
       {
         product_id: 60008816,
-        product_name:
-          "良品铺子手撕面包2斤装 量贩早餐小面包代餐休闲零食办公室点心整箱装礼盒",
+        product_name: "良品铺子手撕面包2斤装 量贩早餐小面包代餐休闲零食办公室点心整箱装礼盒",
         product_sku_id: "0",
         product_sku_name: "",
+        brand_name:'良品铺子',
         num: 1,
         thumb: "//sandbox-img.jufubao.cn/uploads/20230522/24f0e3386a80c2a6659d71862eedcae7.jpg",
         sale_price: 2678,

package/src/components/JfbMallConfirm/Attr.js

@@ -22,7 +22,6 @@ export default {
           {label: '否', value: 'N'},
         ]
       },
-
       {
         label: "显示订购人信息",
         ele: "xd-radio",
@@ -45,8 +44,6 @@ export default {
           {label: "隐藏", value: "N"}
         ]
       },
-
-
       {
         label: "选择业务线",
         ele: "xd-choose-namespace",
@@ -137,7 +134,7 @@ export default {
         label: "使用模式",
         ele: "xd-radio",
         valueKey: "useMode",
-        value: data.useMode,
+        value: data.useMode || "market",
         groupKey: 'content',
         list: [
           {label: "商城模式", value: "market"},
@@ -154,7 +151,36 @@ export default {
           {label: "展示", value: "Y"},
           {label: "不展示", value: "N"}
         ]
-      }
+      },
+      {
+        label: "表单提示文字大小",
+        ele: 'xd-site-select-list',
+        valueKey: 'blessFontSize',
+        value: data.blessFontSize,
+        multiple: false,
+        className: 'input50',
+        groupKey:'content',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_font_size'
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -46,15 +46,16 @@
                     <image :src="prod.product_thumb"/>
                   </view>
                   <view class="prod_info">
-                    <view class="prod_tit">{{prod.product_name}}</view>
-                    <view class="prod_specs">{{prod.product_sku_name}}</view>
+                    <view class="prod_tit" :class="{prod_tit_one:prod.brand_name||prod.product_sku_name||(showActivityPrice==='Y'&&prod.is_activity==='Y')}">{{prod.product_name}}</view>
+                    <view class="prod_brand" :style="{color:brandTextColor}" v-if="prod.brand_name">{{prod.brand_name}}</view>
+                    <view class="prod_specs" v-if="prod.product_sku_name">{{prod.product_sku_name}}</view>
                     <view class="prod_price">
                       <view style="display:flex;align-items:center">
                         <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/>
                       </view>
                       <view style="font-size: 28rpx;color:#999">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
                     </view>
-                    <view v-if="showActivityPrice==='Y'&&prod.is_activity==='Y'" :style="{color:mainColor,fontSize:'24rpx'}">{{prod.error_message?prod.error_message:'活动价'}}</view> 
+                    <view v-if="showActivityPrice==='Y'&&prod.is_activity==='Y'" :style="{color:mainColor,fontSize:'24rpx'}">{{prod.error_message?prod.error_message:'活动价'}}</view>
                   </view>
                 </view>
                 <view v-if="prod.blessingKey" class="wish_comment">
@@ -62,7 +63,8 @@
                   <view class="bless_tip"
                     v-if="prod.blessingData.struct && prod.blessingData.struct.explain"
                     :style="{
-                      color: mainColor
+                      color: mainColor,
+                      fontSize: blessFontSize + 'rpx'
                     }"
                     >{{prod.blessingData.struct.explain}}</view>
                 </view>
@@ -303,10 +305,10 @@
         is_use_jfb_pay: "",   //是否使用聚福宝支付
 
         scene: "",
-
         buyer_phone_number: "", //订购人手机号
         comment: "",  //订单备注
 
+
         gift_id: "",
         gift_mode: "",
         showGiftNewCard: false,
@@ -351,8 +353,10 @@
         preview: "N",
         showActivityPrice: 'N',
         bindCard: '1',
-	useMode: "",  //模式百货market，礼包gift
+	      useMode: "",  //模式百货market，礼包gift
         showPrice: "Y", //商城模式隐藏是否展示价格, 默认值是展示价格
+        blessFontSize: 24,  //动态输入语提示字体大小
+        brandTextColor:'',
       }
     },
     computed: {
@@ -460,8 +464,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       },
       curAddr(n, o){
         if((n != o || n.address_nnid != o.address_nnid)){
@@ -522,10 +527,12 @@
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: ""}).value;
         this.choseCityPath = getContainerPropsValue(container, 'content.choseCityPath',{value: "/system/system/city"}).value;
         this.preview = getContainerPropsValue(container, 'content.preview', "N");
+        this.blessFontSize = getContainerPropsValue(container, 'content.blessFontSize', "24");
         this.showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
-	this.useMode = getContainerPropsValue(container, 'content.useMode', "market");
+	      this.useMode = getContainerPropsValue(container, 'content.useMode', "market");
         this.showPrice = getContainerPropsValue(container, 'content.showPrice', "Y");
+        this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
         if(this.useMode === "market"){
           this.showPrice = "Y"
         }
@@ -631,7 +638,7 @@
           let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
           //票券跟钱包都未选择，给用户提示
           if(selected_card_list.length == 0 && selected_wallet_list.length == 0){
-            
+
             if(!this.hasAlertCardChose){
               if(this.payCard){
                 this.showCardPayChose = true;
@@ -640,7 +647,7 @@
                 this.showWalletChose = true;
                 return false;
               }
-              
+
             }else{
               //支持补差, 提示是否使用补差
               if(this.payThird){
@@ -1103,11 +1110,25 @@
           }
           .prod_tit{
             font-size: 32rpx;
+            .uni-max-cut(2, 80);
+            line-height: unit(40, rpx);
+          }
+          .prod_tit_one {
+            .uni-max-cut(1, 40);
           }
+
+          .prod_brand {
+            font-size: 26rpx;
+            padding-top: unit(10, rpx);
+            line-height: unit(32, rpx);
+          }
+
           .prod_specs{
+            padding-top: unit(10, rpx);
             display: block;
-            font-size: 28rpx;
+            font-size: 26rpx;
             color: #999999;
+            line-height: unit(32, rpx);
           }
           .prod_price{
             display: flex;

package/src/components/JfbMallConfirm/Mock.js

@@ -169,7 +169,7 @@ module.exports = {
       "supplier_logistics_amount_origin": "50",
       "product": [{
         "product_id": 60006948,
-        "product_name": "实物商品jls（单规格）1",
+        "product_name": "好丽友（orion）零食休闲零食薯条膨化食品呀!土豆番茄酱味70g/袋",
         "invoice_name": "",
         "sku_id": "0",
         "sku_name": "",
@@ -181,9 +181,9 @@ module.exports = {
         "product_exts": "{}",
         "product_type": "good",
         "product_thumb": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230406\/0b890cd5a947d9c5724b412d34cd4000.png",
-        "product_form_data": "[{\"id\":\"blessing\",\"type\":\"input\",\"struct\":{\"title\":\"\\u795d\\u798f\\u8bed\",\"explain\":\"\",\"default\":\"\",\"placeholder\":\"\",\"required\":true},\"options\":[],\"value\":\"\\u795d\\u798f\\u8bed\"}]",
+        "product_form_data": "[{\"id\":\"blessing\",\"type\":\"input\",\"struct\":{\"title\":\"祝福语\",\"explain\":\"请务必确保输入的号码准确无误，填错号码无法进行退还操作，后果自负。\",\"default\":\"\",\"placeholder\":\"\",\"required\":true},\"options\":[],\"value\":\"祝福语\"}]",
         "brand_id": 3,
-        "brand_name": "好利来",
+        "brand_name": "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "aftersale_service": ",refund,exchange",
         "channel_product_id": "60006948",
         "product_weight": "3000",
@@ -247,7 +247,7 @@ module.exports = {
         "product_thumb": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/d7411a5c6b104b83187e3e8f4fa6ae34.jpeg",
         "product_form_data": "[]",
         "brand_id": 3,
-        "brand_name": "好利来",
+        "brand_name": "HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "aftersale_service": ",refund,refund_and_good,exchange",
         "channel_product_id": "60007291",
         "product_weight": "2000",
@@ -310,7 +310,7 @@ module.exports = {
         "product_thumb": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230614\/99927477a89c8f88c9b71495b1683adb.jpg",
         "product_form_data": "[]",
         "brand_id": 100003,
-        "brand_name": "品牌jls0519",
+        "brand_name": "Quange/全格",
         "aftersale_service": "",
         "channel_product_id": "60009686",
         "product_weight": "0",

package/src/components/JfbMallHomeProductList/Attr.js

@@ -12,10 +12,33 @@ export default {
         value: data['row_num'] || 2,
         groupKey:'content',
         list: [
-          {label: "一行一个", value: 1},
-          {label: "一行两个", value: 2}
+          {label: "一列", value: 1},
+          {label: "两列", value: 2},
+          {label: "三列", value: 3}
         ]
       },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '0',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        groupKey:'content',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: "商品排序",
         ele: "xd-select-list",
@@ -377,28 +400,7 @@ export default {
         className: 'input80',
         groupKey:'style',
       },
-      {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '0',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        groupKey:'style',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius',
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
+
       {
         label: "选择业务线",
         ele: "xd-choose-namespace",