jufubao-food 1.0.15-beta1 → 1.0.15-beta3

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -21,7 +21,9 @@
           <view class="shop_wrap" @click="toSwitchShop">
             <view class="shop_info">
               <view class="_name"><xd-font-icon icon="iconshouye" :color="mainColor" size="36" style="margin-right: 8rpx;"></xd-font-icon>{{ shopInfo.shop_name }}</view>
-              <view class="_dist">{{ shopInfo.distance_conversion}}
+              <view class="_dist">
+                <!-- {{ shopInfo.distance_conversion}} -->
+                更多门店
                 <xd-font-icon icon="iconxiangyou_xian" color="#666666" :size="20" style="margin-left: 8rpx;"></xd-font-icon>
               </view>
             </view>

package/src/components/JfbFoodProductInfo/Attr.js

@@ -1,26 +1,20 @@
 'use strict';
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
+  advanced: [],
+  content: (data, gValue, gColor, oldData={})=>{
+
     return [
-      {
-        label: '商品列表页',
-        ele: 'xd-select-pages-path',
-        valueKey: 'foodProductListPath',
-        placeholder: '请选择商品列表页跳转地址',
-        value: data.foodProductListPath || null,
-        labelInline: true,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        groupKey:'advanced',
-        className: 'input100',
-      },
+      ...content(data, gValue,gColor,oldData),
+      ...style(data, gValue,gColor,oldData),
+      ...advanced(data),
     ].filter(i=>i)
   },
-  advanced: [],
 };

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

@@ -0,0 +1,28 @@
+'use strict';
+
+export default (data)=>{
+  return [
+    {
+      label: '商品列表页',
+      ele: 'xd-select-pages-path',
+      valueKey: 'foodProductListPath',
+      placeholder: '请选择商品列表页跳转地址',
+      value: data.foodProductListPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      groupKey:'advanced',
+      className: 'input100',
+    },
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'advanced',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
+  ]
+}

package/src/components/JfbFoodProductInfo/cusAttr/content.js

@@ -0,0 +1,40 @@
+'use strict';
+import {
+  dataVal ,
+  statusShow,
+  statusDataVal,
+  customVal,
+  cusDisabled ,
+  getCustomAttr,
+} from "@/utils/AttrTools";
+import ProductAttr from "@/utils/Attr/ProductAttr";
+
+export default function (data, gValue,gColor,oldData){
+  return [
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      value: dataVal({data, key:'xnamespace', dValue:null, gValue}),
+      className: 'input100',
+      placeholder: '请选择业务线',
+      labelInline:true,
+      groupKey:'content',
+      notice:'空继承上级业务线',
+      inline: false,
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+  ]
+}

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

@@ -0,0 +1,56 @@
+import {
+  dataVal,
+  statusShow,
+  statusDataVal,
+  customVal,
+  cusDisabled,
+  getCustomAttr,
+  oldTonNewBorAndSha,
+  cRaBorShadow,
+  isDefStatus
+} from "@/utils/AttrTools";
+import productStyle from "@/utils/Attr/productStyle";
+const Color = require('color');
+
+export default function (data={},gValue={},gColor={},oldData) {
+  return [
+    {
+      ele: 'title',
+      label: '常规',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '外边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'bodyPaddingStatus',
+      value: statusDataVal({data, key:'bodyPaddingStatus', fields:['bodyPadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'bodyPadding',
+      hidden:!statusShow({data, key: 'bodyPaddingStatus', fields:['bodyPadding'], gValue}),
+      value: dataVal({
+        data,
+        key:'bodyPadding',
+        dValue:[0],
+        gValue,
+        isPM: true,
+        isCPM: true,
+      }),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+  ]
+}

package/src/components/JfbFoodProductList/Api.js

@@ -5,6 +5,20 @@
  * @type {*[]}
  */
 module.exports = [
+  {
+    mapFnName: "getFoodShopList",
+    title: "获取门店列表",
+    path: "/mall/v1/shop/list",
+    isRule: false,
+    params: {
+      brand_id: ['brand_id', 'String', 'true'],
+      city_code: ['city_code', 'String', 'true'],
+      latitude: ['latitude', 'String', 'true'],
+      longitude: ['longitude', 'String', 'true'],
+    },
+    isConsole: true,
+    disabled: true
+  },
   {
     mapFnName: 'getFoodShopDetail',
     title: '获取餐饮门店详情',