jufubao-mall 2.0.72-beta2 → 2.0.72-beta3

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/JfbMallShop/JfbMallShop.vue +4 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.72-beta2",
3
+ "version": "2.0.72-beta3",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallShop/JfbMallShop.vue CHANGED
@@ -540,6 +540,7 @@
540
540
  this.shopInfo = shopInfo;
541
541
  this.mapCenter = {lng: shopInfo.longitude, lat: shopInfo.latitude}
542
542
  this.initBaidu = true;
543
+ this.getShowBrandTip(this.shopInfo)
543
544
  this.$nextTick(() => {
544
545
  this.checkTextOverflow();
545
546
  if(this.isShowCodeProduct){
@@ -553,7 +554,6 @@
553
554
  this.$xdLog.catch(error);
554
555
  this.$xdHideLoading();
555
556
  })
556
- this.getShowBrandTip(options['shop_id'])
557
557
  },
558
558
  /**
559
559
  * @description 监听事件变化
@@ -700,14 +700,14 @@
700
700
  .exec();
701
701
 
702
702
  },
703
- getShowBrandTip(shop_id){
703
+ getShowBrandTip(shopInfo){
704
704
  jfbRootExec("showBrandTip", {
705
705
  vm: this,
706
706
  data: {
707
- shop_id: shop_id
707
+ shop_id: shopInfo.shop_id
708
708
  }
709
709
  }).then(res => {
710
- if(res.confirm_notice&&res.prompt_method === 1){
710
+ if(res.confirm_notice&&res.prompt_method === 1&&shopInfo.show_qrcode&&!this.is_plus_site&&this.showTake==='Y'){
711
711
  this.showTipDialog = true;
712
712
  this.notice_title = res.notice_title;
713
713
  this.notice_content = res.notice_content;