jufubao-food 1.0.15-beta12 → 1.0.15-beta14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbFoodProductList/JfbFoodProductList.vue +8 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-food",
3
- "version": "1.0.15-beta12",
3
+ "version": "1.0.15-beta14",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件餐饮插件包",
6
6
  "main": "index.js",
package/src/components/JfbFoodProductList/JfbFoodProductList.vue CHANGED
@@ -28,7 +28,7 @@
28
28
  </view>
29
29
  <view style="height: 100rpx;"></view>
30
30
 
31
- <view class="section_main" :style="[sectionMainStyleComp]">
31
+ <view v-if="categoryList.length" class="section_main" :style="[sectionMainStyleComp]">
32
32
  <view class="left_nav" :style="[navStyleComp]">
33
33
  <scroll-view style="height:100%" scroll-y="true" class="nav_scroll">
34
34
  <view v-for="(item, index) in categoryList" :key="item.category_id"
@@ -109,6 +109,9 @@
109
109
  </scroll-view>
110
110
  </view>
111
111
  </view>
112
+ <view v-else class="section_main" :style="[sectionMainStyleComp]" style="display: flex;align-items: center;justify-content: center;">
113
+ <xd-no-data height="250rpx" :scaleSize="2">暂无商品</xd-no-data>
114
+ </view>
112
115
 
113
116
  <view style="height: 120rpx;"></view>
114
117
  <view class="fixed_bottom" :style="fixed_bottom">
@@ -556,8 +559,11 @@
556
559
  let curPage = this.$xdUniHelper.getCurrentPages();
557
560
  let query = {...curPage.query};
558
561
  let callback= Base64.encode(curPage.path + '?' + this.$xdUniHelper.jsonToParams(query));
562
+ let linkQuery = '?brand_id=' + (this.brand_id || this.shopInfo.brand_id);
563
+ let rShopId = this.shopInfo.resource_shop_id || this.resource_shop_id;
564
+ linkQuery = rShopId ? linkQuery + '&resource_shop_id=' + rShopId : linkQuery;
559
565
  this.$xdUniHelper.redirectTo({
560
- url: this.switchStorePath + '?brand_id=' + this.shopInfo.brand_id + '&callback=' + callback
566
+ url: this.switchStorePath + linkQuery + '&callback=' + callback
561
567
  })
562
568
  // this.$xdUniHelper.navigateTo({
563
569
  // url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,