jufubao-base 1.0.347 → 1.0.348-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.347",
+  "version": "1.0.348-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -146,6 +146,21 @@ export default {
         }
         this.companyList = res.list;
       });
+
+      //判断应用是否开启了强制选择企业功能
+      let isCustomer = false;
+      if(this.brandInfo && this.brandInfo['headers'] && this.brandInfo['headers']['X-T-Fts']){
+        isCustomer = this.brandInfo['headers']['X-T-Fts'].split(',').includes('customer');
+      }
+      if(isCustomer) {
+        this.$xdAlert({
+          title:'配置错误',
+          content: '请检查是否开启了应用高级功能配置下的开启强制选择企业，要按需配置应用哦。',
+          time: 24*60*60*1000,
+          contentColor: '#333',
+          background: '#fff',
+        });
+      }
     },
     /**
      * @description 监听事件变化

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -16,7 +16,10 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice-dialog__body">
-      <view v-if="isShow && contentList && contentList.length" class="jfb-base-notice-dialog__body_dialog">
+      <view
+        v-if="isShow && contentList && contentList.length"
+        class="jfb-base-notice-dialog__body_dialog"
+      >
         <view
           class="jfb-base-notice-dialog__body_dialog_mask"
           @click.stop="handleMaskHide"
@@ -64,13 +67,19 @@ import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import getServiceUrl from "@/common/getServiceUrl";
 import storage from "@/common/storage";
+import posterMixins from "@/mixins/posterMixins";
 const Color = require("color");
 export default {
   name: "JfbBaseNoticeDialog",
   components: {
     XdFontIcon,
   },
-  mixins: [componentsMixins, extsMixins, JfbBaseNoticeDialogMixin],
+  mixins: [
+    componentsMixins,
+    extsMixins,
+    JfbBaseNoticeDialogMixin,
+    posterMixins,
+  ],
   data() {
     return {
       isShow: false,
@@ -81,11 +90,11 @@ export default {
       close_position: "",
       type: "",
       currentImage: "",
-      currentLinkUrl: "",
+      currentLink: null,
       currentIndex: 0,
       contentList: [],
-      number: '',
-      is_order_by_show_group: '',
+      number: "",
+      is_order_by_show_group: "",
     };
   },
   watch: {
@@ -128,7 +137,7 @@ export default {
           page_id: this.pageAttr["page_id"], //页面ID
           container_id: this.containerId, //组件ID
           page_size: this.number, //数量
-          is_order_by_show_group: this.is_order_by_show_group
+          is_order_by_show_group: this.is_order_by_show_group,
         },
       })
         .then((res) => {
@@ -136,16 +145,12 @@ export default {
 
           //弹窗显示
           if (res.list.length > 0) {
-            this.contentList = res.list
+            this.contentList = res.list;
             this.currentImage = getServiceUrl(
               this.contentList[0].image_url,
               "size8"
             );
-            if(this.contentList[0].redirect_data){
-              this.currentLinkUrl = this.getLinkUrl(
-                this.contentList[0].redirect_data
-              );
-            }
+            this.currentLink = this.contentList[0];
             this.currentIndex = 0;
             this.handlePop();
           }
@@ -156,7 +161,7 @@ export default {
     },
     getLinkUrl(data) {
       data = JSON.parse(data);
-      return `${data.page}?${data.redirect_params}`;
+      return `${data.page}`;
     },
     /**
      * @description 监听事件变化
@@ -198,10 +203,8 @@ export default {
         return;
       }
       this.currentIndex = this.currentIndex + 1;
-      if(this.contentList[this.currentIndex].redirect_data) {
-        this.currentLinkUrl = this.getLinkUrl(
-          this.contentList[this.currentIndex].redirect_data
-        );
+      if (this.contentList[this.currentIndex].redirect_data) {
+        this.currentLink = this.contentList[this.currentIndex];
       }
       this.currentImage = getServiceUrl(
         this.contentList[this.currentIndex].image_url,
@@ -209,10 +212,7 @@ export default {
       );
     },
     handleToLink() {
-      if (this.isPreview) return;
-      this.$xdUniHelper.navigateTo({
-        url: this.currentLinkUrl,
-      });
+      this.handlePosterClick(this.currentLink);
     },
     onJfbScroll(options) {
       console.log("event.onJfbScroll", options);