jufubao-food 1.0.15-beta9 → 1.0.16-beta1

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -84,12 +84,12 @@
       </view>
 
       <!-- 展示vip -->
-      <view v-if="is_show_vip_card_list === 'Y'" class="section">
+      <!-- <view v-if="is_show_vip_card_list === 'Y'" class="section">
         <cus-vip-list :list="vipCardList"
           :vip_card_id="vip_card_id"
           :plus_saving_money="plus_saving_money"
           @choseVipCard="handleChoseVipCard"></cus-vip-list>
-      </view>
+      </view> -->
 
       <view class="section">
         <xd-list-item label="商品价格" paddingLR="60rpx" size="small">
@@ -98,7 +98,7 @@
       </view>
       <view v-if="isShowPlusSaveMoney" class="section">
         <xd-list-item label="" paddingLR="60rpx" size="small">
-          <view slot="label" style="color: #86541E;">PLUS专享立减</view>
+          <view slot="label" style="color: #86541E;">PLUS会员立减</view>
           <xd-unit :price="-plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
       </view>
@@ -240,6 +240,13 @@
           <xd-button type="primary" size="small" style="margin-left: 40rpx;" @click="handleSwitchShop">继续更换</xd-button>
         </view>
       </XdDailog>
+      <CusVipOpenDialog
+        v-if="!isVip"
+        :bgImg="openVipBgImg"
+        :btnBgImg="openVipBtnBgImg"
+        @onOpen="handleToOpen"
+        @onClose="handleCloseOpenVip"
+      ></CusVipOpenDialog>
     </view>
   </view>
 </template>
@@ -262,6 +269,9 @@
   import OrderMixin from "./orderMixin"
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex";
+  import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
+  import getServiceUrl from "@/common/getServiceUrl";
+
   export default {
     name: "JfbFoodConfirmV2",
     components: {
@@ -274,7 +284,8 @@
       XdWalletChose,
       CusCouponChose,
       XdDailog,
-      CusVipList
+      CusVipList,
+      CusVipOpenDialog
     },
     mixins: [
       componentsMixins, extsMixins, JfbFoodConfirmV2Mixin, OrderMixin
@@ -341,6 +352,9 @@
         paySuccessPath: "",
         switchStorePath: "",
         productListPath: "",
+        openPath: "",
+        openVipBtnBgImg: "",
+        openVipBgImg: "",
       }
     },
     computed: {
@@ -423,7 +437,10 @@
     created() {
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
-      this.isVip = this.getTokenForKey('user_level') === 'VIP';
+      this.isVip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? true : false;
+      if (this.$configProject['isPreview']) {
+        this.isVip=true
+      }
       //todo
     },
     methods: {
@@ -455,7 +472,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;
@@ -480,7 +497,13 @@
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
-
+        this.openPath = getContainerPropsValue(container, 'content.openPath', {value: ""}).value;
+        this.openVipBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
+        );
+        this.openVipBtnBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBtnBgImg", { url: "" }).url
+        );
         this.$nextTick(()=>{
           let time = 500;
           //#ifdef H5
@@ -810,6 +833,14 @@
           meal_method: this.meal_method,
         };
       },
+      handleToOpen() {
+        this.$xdUniHelper.navigateTo({
+          url: this.openPath
+        });
+      },
+      handleCloseOpenVip() {
+        this.$xdUniHelper.navigateBack()
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -818,6 +849,10 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
+        this.isVip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? true : false;
+        if (this.$configProject['isPreview']) {
+          this.isVip=true
+        }
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)

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

@@ -54,7 +54,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
-
+    {
+      label: '开通会员',
+      ele: 'xd-select-pages-path',
+      valueKey: 'openPath',
+      placeholder: '请选择开通会员跳转页面',
+      value: data.openPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      groupKey: 'advanced',
+      className: 'input100',
+    },
     {
       label: '版本号:',
       ele: 'el-input',

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

@@ -557,6 +557,48 @@ export default function (data={},gValue={},gColor={},oldData) {
         showAlpha: true
       },
     },
-    {ele: "group_end"},
+    { ele: "group_end" },
+    {
+      label: "开通PLUS背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBgImg",
+      groupKey: "style",
+      labelInline: true,
+      value: data.openVipBgImg || {},
+      defaultValue: data.openVipBgImg || null,
+      slot: true,
+      oneWidth: 355,
+      oneHeight: 355,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>，高度为<span style="color:red">710px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
+    {
+      label: "开通PLUS按钮背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBtnBgImg",
+      groupKey: "style",
+      labelInline: true,
+      value: data.openVipBtnBgImg || {},
+      defaultValue: data.openVipBtnBgImg || null,
+      slot: true,
+      oneWidth: 223,
+      oneHeight: 44,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">446px</span>，宽度为<span style="color:red">88px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
   ]
 }

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -116,6 +116,7 @@
         consume_mode: "",
         category_id: "",
         specsPrice: 0,
+        xnamespace: "",
 
         baseInfo: null,
         images: [],
@@ -222,6 +223,7 @@
        * @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");

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -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"
@@ -109,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">
@@ -183,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.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>
@@ -197,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>
@@ -235,6 +238,7 @@
     ],
     data() {
       return {
+        pageOptions: {},
         closeMask: true,
         isPreview: false,
         resource_shop_id: "",
@@ -275,7 +279,7 @@
         column_num: 1,
         skeNumber:10,
         rowSpacing: 16,
-        columnSpacing: 16,
+        columnSpacing: 32,
         listPadding:{},
         productConfig:{},
         itemPadding:{},
@@ -302,6 +306,8 @@
         foodDetailPath: "",
         confirmPath: "",
         switchStorePath: "",
+        switchCityPath: "",
+        shopDetailPath: "",
       }
     },
     computed: {
@@ -424,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);
@@ -433,6 +444,7 @@
     },
     methods: {
       onJfbLoad(options) {
+        this.pageOptions = options;
         this.setNameSpace(options);
         this.resource_shop_id = options.resource_shop_id;
         this.consume_mode = options.consume_mode || 'HDSELF';
@@ -452,9 +464,12 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        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);
 
@@ -478,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']});
@@ -510,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 = {
@@ -551,13 +571,21 @@
         }
         this.showTakeoutShop = true;
       },
+      handleSwitchCity(){
+        this.$xdUniHelper.navigateTo({
+          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 + '?brand_id=' + this.brand_id + '&callback=' + callback
+          url: this.switchStorePath + linkQuery + '&callback=' + callback
         })
         // this.$xdUniHelper.navigateTo({
         //   url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,
@@ -580,9 +608,12 @@
             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;
             if(loadFirstShop){
               this.curShopIndex = 0;

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/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',