jufubao-mall 2.0.72-beta2 → 2.0.72

package/get.package.path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library-editx') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.72-beta2",
+  "version": "2.0.72",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -540,6 +540,7 @@
             this.shopInfo = shopInfo;
             this.mapCenter = {lng: shopInfo.longitude, lat: shopInfo.latitude}
             this.initBaidu = true;
+            this.getShowBrandTip(this.shopInfo)
             this.$nextTick(() => {
               this.checkTextOverflow();
               if(this.isShowCodeProduct){
@@ -553,7 +554,6 @@
           this.$xdLog.catch(error);
           this.$xdHideLoading();
         })
-        this.getShowBrandTip(options['shop_id'])
       },
       /**
        * @description 监听事件变化
@@ -700,14 +700,19 @@
         .exec(); 
     
       },
-      getShowBrandTip(shop_id){
+      getShowBrandTip(shopInfo){
         jfbRootExec("showBrandTip", {
           vm: this,
           data: {
-            shop_id: shop_id
+            shop_id: shopInfo.shop_id
           }
         }).then(res => {
-          if(res.confirm_notice&&res.prompt_method === 1){
+          //res.prompt_method  仅弹窗=1，弹窗和页面双展示=2，仅页面展示=3
+          //res.confirm_notice 是否展示
+          //shopInfo.show_qrcode 是否展示二维码
+          //this.is_plus_site 是否是plus
+          //this.showTake 是否显示快捷码
+          if(res.confirm_notice&&res.prompt_method === 1&&shopInfo.show_qrcode&&!this.is_plus_site&&this.showTake==='Y'){
             this.showTipDialog = true;
             this.notice_title = res.notice_title;
             this.notice_content = res.notice_content;