jufubao-food 1.0.15-beta17 → 1.0.15-beta19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta17",
+  "version": "1.0.15-beta19",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -455,7 +455,7 @@
         this.bgColor = this.$colorChange(this.warningColor).alpha(0.1).toString();
         this.bgColor2 = this.$colorChange(this.mainColor).alpha(0.1).toString();
 
-        this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
+        this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', "");
         this.showBuyer = getContainerPropsValue(container, 'content.showBuyer', "Y");
         this.showOrderComment = getContainerPropsValue(container, 'content.showOrderComment', "Y");
         this.payPath = getContainerPropsValue(container, 'content.payPath', { value: "/system/system/pay" }).value;

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -223,7 +223,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
+        this.xnamespace = gCPVal(container, 'xnamespace', "");
         this.foodProductListPath = getContainerPropsValue(container, 'content.foodProductListPath', {value: ""}).value;
         this.shopBtnBgColor = gCPVal(container, 'shopBtnBgColor', this.mainColor, {sKey:'cartBtnStatus',fields:['shopBtnBgColor']});
         this.showDiscount = gCPVal(container, 'showDiscount', "Y");

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -186,7 +186,7 @@
                   <text style="margin-right: 16rpx;">{{item.resource_shop_name}}</text>
                   <view class="curr_active">正在预览</view>
                 </view>
-                <view class="more_r">详情 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
+                <view class="more_r" @click="toShopDetail(item)">详情 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
               </view>
               <view class="shop_addr_bar">
                 <view>{{item.address}}</view>
@@ -279,7 +279,7 @@
         column_num: 1,
         skeNumber:10,
         rowSpacing: 16,
-        columnSpacing: 16,
+        columnSpacing: 32,
         listPadding:{},
         productConfig:{},
         itemPadding:{},
@@ -307,6 +307,7 @@
         confirmPath: "",
         switchStorePath: "",
         switchCityPath: "",
+        shopDetailPath: "",
       }
     },
     computed: {
@@ -463,11 +464,12 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
+        this.xnamespace = gCPVal(container, 'xnamespace', "");
         this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: ""}).value;
         this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: ""}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
         this.switchCityPath = getContainerPropsValue(container, 'content.switchCityPath', { value: ''}).value;
+        this.shopDetailPath = getContainerPropsValue(container, 'content.shopDetailPath', { value: ''}).value;
         this.showDiscount = gCPVal(container, 'showDiscount', "Y");
         this.differ = gCPVal(container, 'differ', 1);
 
@@ -491,7 +493,7 @@
         this.radius = gCPVal(container,'radius', [this.gStyleValue.radius,'0'], {sKey:'radiusStatus',fields:['radius']})||0;
         this.imageRadius = gCPVal(container,'imageRadius', [this.gStyleValue.radius/2,'0'], {sKey:'imageRadiusStatus',fields:['imageRadius']})||0;
         this.contShadow = gCPVal(container, 'contShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
-        this.columnSpacing = gCPVal(container,'columnSpacing', [16,20], {sKey:'columnRowStatus',fields:['columnSpacing']});
+        this.columnSpacing = gCPVal(container,'columnSpacing', [32,20], {sKey:'columnRowStatus',fields:['columnSpacing']});
 
         //导航
         this.titleBgcColor = gCPVal(container,'titleBgcColor', '#f8f8f8', {sKey:'titleBgcColorStatus',fields:['titleBgcColor']});
@@ -523,6 +525,11 @@
         }
 
       },
+      toShopDetail(item){
+        this.$xdUniHelper.navigateTo({
+          url: this.shopDetailPath + "?resource_shop_id=" + item.resource_shop_id,
+        })
+      },
       handleCartNumChange(val, prod){
         console.log("handleCartNumChange", val, prod)
         let product = {

package/src/components/JfbFoodProductList/cusAttr/advanced.js

@@ -15,6 +15,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
+    {
+      label: '门店详情页',
+      ele: 'xd-select-pages-path',
+      valueKey: 'shopDetailPath',
+      placeholder: '请选择门店详情页跳转地址',
+      value: data.shopDetailPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      groupKey:'advanced',
+      className: 'input100',
+    },
     {
       label: '订单确认页',
       ele: 'xd-select-pages-path',

package/src/components/JfbFoodProductList/cusAttr/style.js

@@ -319,7 +319,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       labelInline: true,
       groupKey:'style',
       valueKey: 'columnSpacing',
-      value: dataVal({data, key:'columnSpacing', dValue: 16, gValue}),
+      value: dataVal({data, key:'columnSpacing', dValue: 32, gValue}),
       hidden: !statusShow({data, key: 'columnRowStatus', fields:['columnSpacing'], gValue}),
       inline: false,
       append:'px',