jufubao-food 1.0.15-beta2 → 1.0.15-beta20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta2",
+  "version": "1.0.15-beta20",
   "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>
@@ -453,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

@@ -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">
@@ -114,6 +116,7 @@
         consume_mode: "",
         category_id: "",
         specsPrice: 0,
+        xnamespace: "",
 
         baseInfo: null,
         images: [],
@@ -125,8 +128,10 @@
 
         is_plus_site: false,
         //面板
-        isShowDiscount: "Y",  //是否展示划线价
+        showDiscount: "Y",  //是否展示划线价
         differ: 1,  //原价与现价的差值
+        bodyPadding: "",
+        contentColor: "",
 
         shopBtnBgColor: "",
         bottomBtnRadius: "100",
@@ -150,6 +155,7 @@
           '--main-color': this.mainColor,
           '--bg-color': this.mainColorAlpha,
           '--bg-main-color': this.mainColorAlpha,
+          backgroundColor: this.contentColor
         }
       },
       prod_bottom() {
@@ -185,6 +191,11 @@
           item.p = p;
           return item;
         })
+      },
+      contBodyStyleComp(){
+        return {
+          padding: this.getMarginAndPadding(this.bodyPadding, 0)
+        }
       }
     },
     watch: {
@@ -212,8 +223,14 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        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");
+        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 +258,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 +350,6 @@
 
   .jfb-food-product-info {
     &__body{
-      background-color: #f8f8f8;
       .xd-store-product {
         color: #333;
         &__swiper {
@@ -358,7 +374,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 +394,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/content.js

@@ -36,5 +36,40 @@ export default function (data, gValue,gColor,oldData){
           .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

@@ -21,11 +21,11 @@ export default function (data={},gValue={},gColor={},oldData) {
       groupKey:'style',
     },
     {
-      label: '外边距',
+      label: '内容区边距',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'bodyPaddingStatus',
-      value: statusDataVal({data, key:'bodyPaddingStatus', fields:['bodyPadding'],gValue}),
+      value: statusDataVal({data, key:'bodyPaddingStatus', dValue: 'D', gValue}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -42,7 +42,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       value: dataVal({
         data,
         key:'bodyPadding',
-        dValue:[0],
+        dValue:[16],
         gValue,
         isPM: true,
         isCPM: true,
@@ -52,5 +52,34 @@ export default function (data={},gValue={},gColor={},oldData) {
       },
     },
     {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/JfbFoodProductList.vue

@@ -17,7 +17,7 @@
     <!-- #endif -->
     <view class="jfb-food-product-list__body" :style="[bodyStyleComp]">
       <view v-if="shopInfo">
-        <view class="shop_info" :style="{top: layoutInfo.top+'rpx'}" @click="toSwitchShopPage">
+        <view class="shop_info" :style="{top: layoutInfo.top+'rpx'}" @click="handleSwitchShop">
           <view class="flex-center">
             <xd-font-icon icon="icona-Buy2"  size="36" style="margin-right: 8rpx;"></xd-font-icon>
             <view class="shop_name">{{ shopInfo.shop_name }}</view><text style="margin:0 20rpx;">|</text> <text class="_distance">{{ shopInfo.distance }}</text>
@@ -28,7 +28,7 @@
         </view>
         <view style="height: 100rpx;"></view>
 
-        <view class="section_main" :style="[sectionMainStyleComp]">
+        <view v-if="categoryList.length" class="section_main" :style="[sectionMainStyleComp]">
           <view class="left_nav" :style="[navStyleComp]">
             <scroll-view style="height:100%" scroll-y="true" class="nav_scroll">
               <view v-for="(item, index) in categoryList" :key="item.category_id"
@@ -43,6 +43,7 @@
               >
                 {{ item.category_name }}
                 <view v-if="item.cart_num" class="cate_num">{{ item.cart_num }}</view>
+                <view v-if="index === cateIndex" :style="[navActiveBarStyle]" class="nav_active_bar"></view>
               </view>
               <view style="height: 80rpx;"></view>
             </scroll-view>
@@ -80,15 +81,16 @@
                             <view style="display:flex;align-items:center">
                               <CusPrice :isPlus="is_plus_site" :isShowIcon="false" salePriceFontSize="32" :showPrice="item.show_prices"></CusPrice>
                             </view>
-                            <view class="p_r" style="font-size: 28rpx;color:#999" @click.stop>
-                              <view v-if="item.has_choose" class="chose_spu" @click="handleChoseProduct(item)">
-                                选规格
+                            <view v-if="isAddCart==='Y'" class="p_r" style="font-size: 28rpx;color:#999" @click.stop>
+                              <view v-if="item.has_choose" class="chose_spu" :style="[choseSpuStyleComp]" @click="handleChoseProduct(item)">
+                                <!-- 选规格  -->
+                                {{ cartName }}
                                 <view v-if="item.num" class="cart_edg">{{ item.num }}</view>
                               </view>
                               <view v-else>
-                                <xd-number v-if="item.num" v-model="item.num" circle @change="val => handleCartNumChange(val, item)"></xd-number>
+                                <xd-number v-if="item.num" v-model="item.num" circle :pointCusStyle="pointCusStyle" @change="val => handleCartNumChange(val, item)"></xd-number>
                                 <!-- <xd-font-icon v-else icon="iconaddcart" :color="mainColor" size="46"></xd-font-icon> -->
-                                <view class="icon_add_cart" v-else @click="handleChoseProduct(item)">+</view>
+                                <view class="icon_add_cart" :style="[choseSpuStyleComp]" v-else @click="handleChoseProduct(item)">+</view>
                               </view>
                             </view>
                           </view>
@@ -107,6 +109,9 @@
             </scroll-view>
           </view>
         </view>
+        <view v-else class="section_main" :style="[sectionMainStyleComp]" style="display: flex;align-items: center;justify-content: center;">
+          <xd-no-data height="250rpx" :scaleSize="2">暂无商品</xd-no-data>
+        </view>
 
         <view style="height: 120rpx;"></view>
         <view class="fixed_bottom" :style="fixed_bottom">
@@ -118,8 +123,15 @@
             <xd-unit :price="cartPrice" :isOld="false"></xd-unit>
           </view>
           <view>
-            <xd-button v-if="cartProductList.length" width="170rpx" size="small" type="primary" @click="handleSubmitCart">选好了</xd-button>
-            <xd-button v-else width="170rpx" size="small" type="primary" :disabled="true">选好了</xd-button>
+            <xd-button v-if="cartProductList.length"
+              :cusStyle="{fontSize: '28rpx'}"
+              width="170rpx" size="small" type="primary"
+              @click="handleSubmitCart"
+            >选好了</xd-button>
+            <xd-button v-else
+              :cusStyle="{fontSize: '28rpx'}"
+              width="170rpx" size="small" type="primary" :disabled="true"
+            >选好了</xd-button>
           </view>
         </view>
         <view class="cart_product_modal" v-if="cartProductShow">
@@ -170,14 +182,17 @@
               @click="setCurShop(i)"
             >
               <view class="shop_name_bar">
-                <view class="shop_name">{{item.resource_shop_name}} <view class="curr_active">正在预览</view></view>
-                <view class="more_r">详情 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
+                <view class="shop_name">
+                  <text style="margin-right: 16rpx;">{{item.resource_shop_name}}</text>
+                  <view class="curr_active">正在预览</view>
+                </view>
+                <view class="more_r" @click.stop="toShopDetail(item)">详情 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
               </view>
               <view class="shop_addr_bar">
                 <view>{{item.address}}</view>
                 <view>{{item.distance}}</view>
               </view>
-              <view class="shop_time">营业时间：09-21:00</view>
+              <view class="shop_time" v-if="item.business_time_name">营业时间：{{ item.business_time_name }}</view>
             </view>
           </view>
           <view class="chose_other" @click="handleSwitchShop">选择其他门店 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
@@ -185,7 +200,7 @@
       </xd-down-drawer>
       <view v-if="showEmptyShop" class="empty_shop">
         <xd-no-data :scaleSize="2"  iconType="shop">附近暂无门店</xd-no-data>
-        <view class="empty_chose_btn" @click="handleSwitchShop">选择其他门店 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
+        <view class="empty_chose_btn" @click="handleSwitchCity">选择其他城市 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
       </view>
     </view>
   </view>
@@ -223,6 +238,7 @@
     ],
     data() {
       return {
+        pageOptions: {},
         closeMask: true,
         isPreview: false,
         resource_shop_id: "",
@@ -257,13 +273,13 @@
         scrollTopTimer: null,
         brand_id: "",
         shopList: [],
-        curShopIndex: 0,
+        curShopIndex: -1,
 
         //商品列表
         column_num: 1,
         skeNumber:10,
         rowSpacing: 16,
-        columnSpacing: 16,
+        columnSpacing: 32,
         listPadding:{},
         productConfig:{},
         itemPadding:{},
@@ -279,6 +295,10 @@
         //导航
         titleBgcColor: '#FFFFFF',
         titleStyle: {},
+        navStyle: "",
+        isAddCart: "Y",
+        cartStyle: "",
+        cartName: "",
 
         //面板
         showDiscount: "Y",  //是否展示划线价
@@ -286,6 +306,8 @@
         foodDetailPath: "",
         confirmPath: "",
         switchStorePath: "",
+        switchCityPath: "",
+        shopDetailPath: "",
       }
     },
     computed: {
@@ -341,6 +363,54 @@
 
         }
       },
+      navActiveBarStyle(){
+        if(this.navStyle === 'long'){
+          return {
+            top: 0,
+            bottom: 0
+          }
+        }else if(this.navStyle === 'no'){
+          return {
+            display: 'none'
+          }
+        }
+      },
+      choseSpuStyleComp(){
+        if(this.cartStyle === 'btn_cartCFull'){}
+        else if(this.cartStyle === 'btn_cartCPlain'){
+          return {
+            border: '1px solid ' + this.mainColor,
+            color: this.mainColor,
+            backgroundColor: 'transparent'
+          }
+        }
+        else if(this.cartStyle === 'btn_cartFFull'){
+          return {
+            borderRadius: 0,
+          }
+        }else if(this.cartStyle === 'btn_cartFPlain'){
+          return {
+            border: '1px solid ' + this.mainColor,
+            color: this.mainColor,
+            backgroundColor: 'transparent',
+            borderRadius: 0,
+          }
+        }
+      },
+      pointCusStyle(){
+        if(this.cartStyle === 'btn_cartFFull'){
+          return {
+            borderRadius: 0,
+          }
+        }else if(this.cartStyle === 'btn_cartFPlain'){
+          return {
+            // border: '1px solid ' + this.mainColor,
+            // color: this.mainColor,
+            // backgroundColor: 'transparent',
+            borderRadius: 0,
+          }
+        }
+      },
       fixed_bottom() {
         return this.fixedStyle({height: 30, zIndex: 111});
       },
@@ -360,6 +430,11 @@
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
+      stateCity(n, o) {
+        if(n && JSON.stringify(n) !== JSON.stringify(o)){
+          this.onJfbLoad(this.pageOptions);
+        }
+      }
     },
     created() {
       this.init(this.container);
@@ -369,20 +444,32 @@
     },
     methods: {
       onJfbLoad(options) {
+        this.pageOptions = options;
         this.setNameSpace(options);
         this.resource_shop_id = options.resource_shop_id;
         this.consume_mode = options.consume_mode || 'HDSELF';
         this.brand_id = options.brand_id;
-        this.p_getFoodShopList();
+        if(this.resource_shop_id){
+          this.p_getFoodShopDetail(this.resource_shop_id);
+        }else if(this.brand_id || this.$configProject['isPreview']){
+          this.p_getFoodShopList();
+        }else{
+          this.$xdAlert({
+            content: '请配置品牌ID',
+          })
+        }
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: "/Smallline/food/pinfo"}).value;
-        this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: "/Smallline/food/confirmv2"}).value;
+        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);
 
@@ -406,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']});
@@ -425,7 +512,11 @@
           }],
           {sKey:'titleStyleStatus',fields:['titleStyle'],isMerge: true}
         );
-        console.log("this.z titleStyle", this.titleStyle)
+        this.navStyle = gCPVal(container, 'navStyle', 'short');
+        this.isAddCart = gCPVal(container, 'isAddCart', 'Y');
+        this.cartStyle = gCPVal(container, 'cartStyle', 'btn_cartCFull')
+        this.cartName = gCPVal(container, 'cartName', '选规格');
+        console.log("this.z cartStyle", this.cartStyle)
 
         //预览mock数据
         if (this.$configProject['isPreview']) {
@@ -434,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 = {
@@ -470,13 +566,31 @@
         })
       },
       toSwitchShopPage(){
+        if(this.shopList.length===0){
+          this.p_getFoodShopList(false);
+        }
         this.showTakeoutShop = true;
       },
-      handleSwitchShop(){
+      handleSwitchCity(){
         this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath + "?brand_id=" + this.shopInfo.brand_id + "&resource_shop_id=" + this.resource_shop_id,
+          url: this.switchCityPath
         })
       },
+      handleSwitchShop(){
+        //切换门店
+        let curPage = this.$xdUniHelper.getCurrentPages();
+        let query = {...curPage.query};
+        let callback= Base64.encode(curPage.path + '?' + this.$xdUniHelper.jsonToParams(query));
+        let linkQuery = '?brand_id=' + (this.brand_id || this.shopInfo.brand_id);
+        let rShopId = this.shopInfo.resource_shop_id || this.resource_shop_id;
+        linkQuery = rShopId ? linkQuery + '&resource_shop_id=' + rShopId : linkQuery;
+        this.$xdUniHelper.redirectTo({
+          url: this.switchStorePath + linkQuery + '&callback=' + callback
+        })
+        // this.$xdUniHelper.navigateTo({
+        //   url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,
+        // })
+      },
       setCurShop(index){
         if(this.curShopIndex !== index){
           this.curShopIndex = index;
@@ -484,7 +598,7 @@
         }
         this.showTakeoutShop = false;
       },
-      p_getFoodShopList(){
+      p_getFoodShopList(loadFirstShop=true){
         jfbRootExec("getFoodShopList", {
           vm: this,
           data: {
@@ -494,12 +608,20 @@
             city_code: this.stateCity.city_code,
             page_token: 1,
             page_size: 3,
+            consume_mode: this.consume_mode,
+            xnamespace: this.xnamespace
           }
         }).then(res => {
           if(res.list && res.list.length > 0){
+            this.showEmptyShop = false;
             this.shopList = res.list;
-            this.curShopIndex = 0;
-            this.p_getFoodShopDetail();
+            if(loadFirstShop){
+              this.curShopIndex = 0;
+              this.p_getFoodShopDetail();
+            }else{
+              let findShopIndex = this.shopList.findIndex(item => item.resource_shop_id == this.resource_shop_id);
+              this.curShopIndex = findShopIndex;
+            }
             if(!this.$configProject['isPreview']){
               this.showTakeoutShop = true;
             }
@@ -508,13 +630,13 @@
           }
         })
       },
-      p_getFoodShopDetail(){
-        let curShop = this.shopList[this.curShopIndex];
+      p_getFoodShopDetail(resource_shop_id){
+        let curShop = this.shopList[this.curShopIndex]||{};
         jfbRootExec("getFoodShopDetail", {
           vm: this,
           data: {
             xnamespace: this.xnamespace,
-            resource_shop_id: curShop.resource_shop_id,
+            resource_shop_id: resource_shop_id || curShop.resource_shop_id,
             consume_mode: this.consume_mode,
             latitude: this.stateLocation.latitude,
             longitude: this.stateLocation.longitude,
@@ -961,6 +1083,10 @@
   .jfb-food-product-list {
     &__body{
       background-color: #FFFFFF;
+      ::v-deep .xd-up-drawer__warper{
+        border-radius: 24rpx 24rpx 0 0 !important;
+        overflow: hidden;
+      }
       .empty_shop{
         background-color: #FFFFFF;
         height: 100%;
@@ -1035,6 +1161,15 @@
             padding: 24rpx;
             text-align: center;
             position: relative;
+            .nav_active_bar{
+              position: absolute;
+              left: 0;
+              top: 28rpx;
+              bottom: 28rpx;
+              width: 12rpx;
+              background-color: var(--main-color);
+              border-radius: 0 4rpx 4rpx 0;
+            }
 
             .cate_num{
               position: absolute;
@@ -1052,15 +1187,16 @@
               // color: var(--main-color);
               font-weight: 500;
               background-color: #FFFFFF;
-              &::after{
-                content: '';
-                position: absolute;
-                left: 0;
-                top: 28rpx;
-                bottom: 28rpx;
-                width: 12rpx;
-                background-color: var(--main-color);
-              }
+              // &::after{
+              //   content: '';
+              //   position: absolute;
+              //   left: 0;
+              //   top: 28rpx;
+              //   bottom: 28rpx;
+              //   width: 12rpx;
+              //   background-color: var(--main-color);
+              //   border-radius: 0 4rpx 4rpx 0;
+              // }
             }
           }
         }
@@ -1259,7 +1395,7 @@
             .prod_specs{
               padding-top: unit(10, rpx);
               display: block;
-              font-size: 28rpx;
+              font-size: 24rpx;
               color: #999999;
               line-height: unit(32, rpx);
             }
@@ -1304,7 +1440,7 @@
       }
     }
     .take_shop_wrap{
-      background-color: #eee;
+      background-color: #f8f8f8;
       .take_title{
         background-color: #FFFFFF;
         padding: 24rpx 32rpx;
@@ -1333,19 +1469,20 @@
           background-color: rgba(229, 1, 14, 0.03);
           .shop_name_bar{
             .curr_active{
-              display: flex;
+              display: inline-flex;
             }
           }
         }
         .shop_name_bar{
           display: flex;
-          align-items: center;
+          align-items: flex-start;
           justify-content: space-between;
           font-size: 32rpx;
           color: #333333;
           .shop_name{
-            display: flex;
             align-items: center;
+            flex: 1;
+            padding-right: 40rpx;
           }
           .curr_active{
             border: 1px solid rgba(229, 1, 14, 0.2);
@@ -1356,7 +1493,7 @@
             align-items: center;
             justify-content: center;
             font-size: 24rpx;
-            margin-left: 16rpx;
+            // margin-left: 16rpx;
             display: none;
           }
           .more_r{
@@ -1364,6 +1501,7 @@
             align-items: center;
             color: #999999;
             font-size: 24rpx;
+            padding-top: 8rpx;
           }
         }
         .shop_addr_bar{

package/src/components/JfbFoodProductList/Mock.js

@@ -126,7 +126,7 @@ module.exports = {
         show_prices: [
           { p: 1875, n: "", t: "S" },
           { p: 1625, n: "PLUS价", t: "D" },
-          { "p": 2000, "n": "原价", "t": "U" },
+          { p: 2000, n: "原价", t: "U" }
         ]
       },
       {
@@ -299,5 +299,119 @@ module.exports = {
     ],
     total_num: 1,
     request_id: "9c2bfb2c0f6817fd"
+  },
+  getFoodShopList: {
+    list: [
+      {
+        brand_id: 100021,
+        brand_name: "万象院线",
+        brand_type: "MC",
+        distance: "13.1km",
+        phone: "0316-8366949",
+        address: "大厂回族自治县大厂回族自治县鑫华商场三层盛世影城",
+        consume_mode: ["SEAT"],
+        shop_icon: "//sandbox-img.jufubao.cn/uploads/20230725/a343d6a8aab0bd9419ddad1030be7cd1.jpg",
+        shop_id: 0,
+        resource_shop_id: 8003557,
+        params: {
+          consume_mode: "SELL,CODE,SEAT,TRAVEL",
+          resource_shop:
+            "eyJyZXNvdXJjZV9zaG9wX2lkIjo2NzcxOTUzLCJzaG9wX2lkIjowfQ"
+        },
+        resource_shop_name: "廊坊盛世影城",
+        province_name: "",
+        city_name: "",
+        area_name: "",
+        street_name: "",
+        latitude: "39.89214964393913",
+        longitude: "116.99514574878383",
+        default_consume_type: "",
+        consume_type: [],
+        is_support_jhd: false,
+        time_slot_name: "",
+        business_time_name: "",
+        business_code: "cake",
+        consume_options: [
+          {
+            consume_mode: "SEAT",
+            desc: "在线订票选座",
+            icon: "iconzuo",
+            show_price: []
+          }
+        ]
+      },
+      {
+        brand_id: 14,
+        brand_name: "测试1111",
+        brand_type: "MA",
+        distance: "20.6km",
+        phone: "13152526323",
+        address: "三河市燕郊镇河北燕郊尚京广场",
+        consume_mode: ["SELL"],
+        shop_icon: "//sandbox-img.jufubao.cn/uploads/20230324/3265afeb6a1f2a94f25c968a09275574.png",
+        shop_id: 1220258,
+        resource_shop_id: 8005378,
+        params: {
+          consume_mode: "SELL,CODE,SEAT,TRAVEL",
+          resource_shop:
+            "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDA1Mzc4LCJzaG9wX2lkIjoxMjIwMjU4fQ"
+        },
+        resource_shop_name: "润旭商城-2号楼",
+        province_name: "",
+        city_name: "",
+        area_name: "",
+        street_name: "",
+        latitude: "39.960893804217115",
+        longitude: "116.84628655458927",
+        default_consume_type: "JHD",
+        consume_type: ["WB", "QP", "JHD", "CV", "POS"],
+        is_support_jhd: true,
+        time_slot_name: "",
+        business_time_name: "",
+        business_code: "cake",
+        consume_options: [
+          {
+            consume_mode: "JHD",
+            desc: "到店消费任意金额可用",
+            icon: "iconduihuan",
+            show_price: []
+          }
+        ]
+      },
+      {
+        brand_id: 7,
+        brand_name: "goodlike",
+        brand_type: "MA",
+        distance: "20.6km",
+        phone: "18710035161",
+        address: "三河市燕郊镇华地1",
+        consume_mode: ["SELF", "STOD", "CODE"],
+        shop_icon: "//sandbox-img.jufubao.cn/uploads/20230508/c33ccd6408e911f0334cc2b44b6d4470.jpg",
+        shop_id: 0,
+        resource_shop_id: 8000009,
+        params: {
+          consume_mode: "SELL,CODE,SEAT,TRAVEL",
+          resource_shop:
+            "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDA5LCJzaG9wX2lkIjowfQ"
+        },
+        resource_shop_name: "验门店周期A-关联后",
+        province_name: "",
+        city_name: "",
+        area_name: "",
+        street_name: "",
+        latitude: "39.96091751137191",
+        longitude: "116.84556045424561",
+        default_consume_type: "",
+        consume_type: [],
+        is_support_jhd: false,
+        time_slot_name: "",
+        business_time_name: "",
+        business_code: "cake",
+        consume_options: []
+      },
+    ],
+    total_size: 0,
+    next_page_token: 'a:3:{i:0;d:20725.13012367171;i:1;d:0;i:2;s:7:"8000003";}',
+    request_id: "ea411b018a2310c4"
   }
 };

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',
@@ -41,6 +54,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
+    {
+      label: '切换城市',
+      ele: 'xd-select-pages-path',
+      valueKey: 'switchCityPath',
+      placeholder: '请选择切换城市跳转地址',
+      value: data.switchCityPath || null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      labelInline: true,
+      groupKey:'advanced',
+      className: 'input100',
+    },
 
     {
       label: '版本号:',

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

@@ -80,12 +80,106 @@ export default function (data, gValue,gColor,oldData){
           });
       },
     },
+    {
+      label: "分类样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "navStyle",
+      value: data['navStyle'] || 'short',
+      value: customVal({
+        data,
+        key: 'navStyle',
+        gValue,
+        sValue:"short",
+      }),
+      labelInline:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'xdDbJ4IOirUK0lljEPIkF',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
     {
       ele: 'title',
       label: '展示内容',
       size: 'small',
       groupKey:'content',
     },
+    {
+      label: '加购按钮',
+      ele: 'xd-cus-switch',
+      valueKey: 'isAddCart',
+      value: data['isAddCart'] || 'Y',
+      className: 'input100',
+      groupKey:'content',
+      labelInline:true,
+      cusStyle:{marginBottom: '10px'},
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {ele: 'group_start'},
+    data['isAddCart'] === 'Y' && {
+      label: "",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "cartStyle",
+      value: dataVal({data, key:'cartStyle', dValue:'btn_cartCFull', gValue}),
+      labelInline:true,
+      //isTplRef:true, //内容引用模版被禁用
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'wF0WmvAM3SB0t9cymnx0b',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    data['isAddCart'] === 'Y' && {
+      label: '按钮文字',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'cartName',
+      value: dataVal({data, key:'cartName', dValue:'', gValue}),
+      placeholder: '请输入按钮文字，默认值：选规格',
+      className: 'input100',
+      labelInline: true,
+      groupKey:'content',
+      rules:[
+        {
+          required: false,
+          validator: (rule, value, callback) => {
+            if(typeof value === "string") value = value.trim();
+            // if(value.length === 0){
+            //   callback('按钮文字不能为空');
+            //   return
+            // }
+            if(value.length > 3) {
+              callback('按钮文字长度为：1-3字符');
+              return
+            }
+            callback();
+          },
+          trigger: ['blur', 'change']
+        }
+      ]
+    },
+    {ele: 'group_end'},
+    { ele:'xd-line', groupKey:'content' },
     {
       label: '划线价',
       ele: 'xd-cus-switch',

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

@@ -192,7 +192,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'radiusStatus',
-      value: statusDataVal({data, key:'radiusStatus', cValue:'N',}),
+      value: statusDataVal({data, key:'radiusStatus', cValue:'D',}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -234,7 +234,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'imageRadiusStatus',
-      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'N'}),
+      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'D'}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -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',