jufubao-food 1.0.15-beta1 → 1.0.15-beta11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta1",
+  "version": "1.0.15-beta11",
   "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/JfbFoodProductInfo.vue

@@ -31,23 +31,25 @@
         </xd-swiper>
         <view class="xd-store-product__swiper-tips">{{swiperCurrent + 1}}/{{images.length}}</view>
       </view>
-
-      <view class="prod_title_number">
-        <view class="prod_title">{{ baseInfo.product_name }}</view>
-        <view class="prod_number">
-          <xd-number v-model="number" :min="1" :max="99" circle></xd-number>
+      <view :style="[contBodyStyleComp]">
+        <view class="prod_title_number">
+          <view class="prod_title">{{ baseInfo.product_name }}</view>
+          <view class="prod_number">
+            <xd-number v-model="number" :min="1" :max="99" circle></xd-number>
+          </view>
         </view>
-      </view>
 
-      <view v-if="skus.length" class="sku_wrap">
-        <!-- <xd-sku @change="handleSkuChange"></xd-sku> -->
-        <xd-sku :skus="skus" @change="handleSkuChange"></xd-sku>
-      </view>
+        <view v-if="skus.length" class="sku_wrap">
+          <!-- <xd-sku @change="handleSkuChange"></xd-sku> -->
+          <xd-sku :skus="skus" @change="handleSkuChange"></xd-sku>
+        </view>
 
-      <view v-if="spuList.length" class="attr_wrap">
-        <!-- <xd-spu ref="mySpu" @change="handleSpuChange"></xd-spu> -->
-        <xd-spu ref="mySpu" :list="spuList" @change="handleSpuChange"></xd-spu>
+        <view v-if="spuList.length" class="attr_wrap">
+          <!-- <xd-spu ref="mySpu" @change="handleSpuChange"></xd-spu> -->
+          <xd-spu ref="mySpu" :list="spuList" @change="handleSpuChange"></xd-spu>
+        </view>
       </view>
+      
 
       <view style="height: 120rpx;"></view>
       <view class="fixed_bottom" :style="prod_bottom">
@@ -125,8 +127,10 @@
 
         is_plus_site: false,
         //面板
-        isShowDiscount: "Y",  //是否展示划线价
+        showDiscount: "Y",  //是否展示划线价
         differ: 1,  //原价与现价的差值
+        bodyPadding: "",
+        contentColor: "",
 
         shopBtnBgColor: "",
         bottomBtnRadius: "100",
@@ -150,6 +154,7 @@
           '--main-color': this.mainColor,
           '--bg-color': this.mainColorAlpha,
           '--bg-main-color': this.mainColorAlpha,
+          backgroundColor: this.contentColor
         }
       },
       prod_bottom() {
@@ -185,6 +190,11 @@
           item.p = p;
           return item;
         })
+      },
+      contBodyStyleComp(){
+        return {
+          padding: this.getMarginAndPadding(this.bodyPadding, 0)
+        }
       }
     },
     watch: {
@@ -214,6 +224,11 @@
       init(container) {
         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");
+        this.differ = gCPVal(container, 'differ', 1);
+        this.bodyPadding = gCPVal(container, 'bodyPadding', [16], {sKey:'bodyPaddingStatus',fields:['bodyPadding'], isPMR:true});
+        this.contentColor = gCPVal(container,'contentColor', '#f8f8f8', {sKey:'contentColorStatus',fields:['contentColor']});
+        console.log("this.bodyPadding", this.bodyPadding)
       },
       handleSkuChange(sku){
         console.log('handleSkuChange', sku);
@@ -241,7 +256,7 @@
             category_id: this.category_id,
             consume_mode: this.consume_mode,
             shop_id: this.shop_id,
-            is_show_uprice: this.isShowDiscount !== 'Y' ? 0 : this.multiply(this.differ),
+            is_show_uprice: this.showDiscount !== 'Y' ? 0 : this.multiply(this.differ),
           }
         }).then(res => {
           this.$xdHideLoading()
@@ -333,7 +348,6 @@
 
   .jfb-food-product-info {
     &__body{
-      background-color: #f8f8f8;
       .xd-store-product {
         color: #333;
         &__swiper {
@@ -358,7 +372,7 @@
       .prod_title_number{
         background-color: #FFFFFF;
         padding: 24rpx 32rpx;
-        margin: 20rpx;
+        margin: 20rpx 0;
         border-radius: 16rpx;
         display: flex;
         align-items: center;
@@ -378,13 +392,13 @@
       .sku_wrap{
         background-color: #FFFFFF;
         padding: 24rpx;
-        margin: 16rpx;
+        margin: 16rpx 0;
         border-radius: 16rpx;
       }
       .attr_wrap{
         background-color: #FFFFFF;
         padding: 24rpx;
-        margin: 16rpx;
+        margin: 16rpx 0;
         border-radius: 16rpx;
       }
       .fixed_bottom{

package/src/components/JfbFoodProductInfo/XdSpu.vue

@@ -213,7 +213,7 @@ export default {
       margin-bottom: 20rpx;
       flex-wrap: wrap;
       &.img_list{
-        justify-content: space-between;
+        // justify-content: space-between;
       }
 
       .specs_img_item{
@@ -229,6 +229,10 @@ export default {
         position: relative;
         margin-bottom: 16rpx;
         overflow: hidden;
+        margin-right: 16rpx;
+        &:nth-of-type(3n){
+          margin-right: 0;
+        }
 
         &.active{
           border-color: var(--main-color);

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,75 @@
+'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();
+      }
+    },
+    {
+      ele: 'title',
+      label: '展示内容',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: '划线价',
+      ele: 'xd-cus-switch',
+      valueKey: 'showDiscount',
+      value: dataVal({ data, key: 'showDiscount', dValue: 'Y', gValue }),
+      className: 'input100',
+      labelInline: true,
+      groupKey: 'content',
+      setting: {
+        tips: ['显示', '不显示'],
+        isBackType: 'string'
+      },
+    },
+    { ele: 'group_start' },
+    {
+      label: '差值',
+      ele: 'el-input',
+      type: 'number',
+      valueKey: 'differ',
+      labelInline: true,
+      value: dataVal({ data, key: 'differ', dValue: '', gValue }),
+      hidden: data.showDiscount !== 'Y',
+      groupKey: 'content',
+      placeholder: '价差，默认值：1',
+      className: 'input80',
+      notice: '划线价取市场价，市场价-售价差值大于等于设置值时展示',
+      inline: false
+    },
+    { ele: 'group_end' },
+  ]
+}

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

@@ -0,0 +1,85 @@
+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', dValue: 'D', 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:[16],
+        gValue,
+        isPM: true,
+        isCPM: true,
+      }),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '背景色',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contentColorStatus',
+      value: statusDataVal({data, key: 'contentColorStatus', fields:['contentColor'], gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      groupKey:'style',
+      valueKey: 'contentColor',
+      value: dataVal({data, key:'contentColor', dValue: '#f8f8f8', gValue}),
+      hidden: !statusShow({data, key: 'contentColorStatus', fields:['contentColor'], gValue}),
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+      inline: false,
+    },
+    {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: '获取餐饮门店详情',