jufubao-base 1.0.355 → 1.0.356-beta1

package/package.json

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

package/src/components/JfbBaseChangeCompany/JfbBaseChangeCompany.vue

@@ -57,7 +57,8 @@ export default {
       backgroundColor: "",
       fontStyle: {},
       changeCompanyPath: "",
-      company_name: ''
+      company_name: '',
+      if_redirect_url: 'Y'
     };
   },
   watch: {
@@ -96,6 +97,7 @@ export default {
     init(container) {
       //content
       this.companyPosition = gCPVal(container, "companyPosition", "left", {});
+      this.if_redirect_url = gCPVal(container, "if_redirect_url", "Y", {});
       //style
       this.contentPadding = gCPVal(
         container,
@@ -137,8 +139,9 @@ export default {
         redirect_url = this["$xdUniHelper"].parseURL().source;
       if (store.state.configProject.platform === "h5")
         redirect_url = this.$route.fullPath;
+      //加配置面板是否需要设置返回地址进行判断是否加?redirect_url=${Base64.encodeURI(redirect_url)}
       this.$xdUniHelper.navigateTo({
-        url: `${this.changeCompanyPath}?redirect_url=${Base64.encodeURI(redirect_url)}`,
+        url: this.if_redirect_url === 'Y' ? `${this.changeCompanyPath}?redirect_url=${Base64.encodeURI(redirect_url)}` : `${this.changeCompanyPath}`,
       });
     },
     onJfbScroll(options) {

package/src/components/JfbBaseChangeCompany/cusAttr/content.js

@@ -23,5 +23,17 @@ export default (data, gValue, gColor, oldData) => {
         { label: '居中', value: 'center' },
       ]
     },
+    {
+      label: '返回本页',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'if_redirect_url',
+      value: dataVal({ data, key: 'if_redirect_url', dValue: 'Y' }),
+      labelInline: true,
+      list: [
+        { label: '是', value: 'Y' },
+        { label: '否', value: 'N' },
+      ]
+    },
   ]
 }

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -53,7 +53,7 @@
       </view>
       <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
         >{{ addTitle
-        }}<view @click="handleToAdd" :style="{color:mainColor}"
+        }}<view v-if="addCompanyPath" @click="handleToAdd" :style="{color:mainColor}"
           >去添加<XdFontIcon
             size="28"
             icon="iconxiangyou_xian"
@@ -140,9 +140,9 @@ export default {
         data: {},
       }).then((res) => {
         console.log(res, "resgetChoseCompanyList");
-        if (res.list.length === 0) {
-          this.handleToAdd();
-          return;
+        //如果只有一个企业，直接选择该企业
+        if(res.list.length === 1) {
+          this.handleChoseCompany(res.list[0]);
         }
         this.companyList = res.list;
       });
@@ -266,6 +266,9 @@ export default {
       ).value;
     },
     handleChoseCompany(item) {
+      if(this.$configProject["isPreview"]){
+        return; 
+      }
       jfbRootExec("switchChoseCompany", {
         vm: this,
         data: {
@@ -281,16 +284,16 @@ export default {
           this.jfbAuthorize.removeAllCardToken();
         }
         //#endif
-
-        if (this.redirect_url) {
-          this.$xdUniHelper.redirectTo({
-            url: this.redirect_url,
-          });
-        } else {
-          this.$xdUniHelper.redirectTo({
-            url: this.settings.index,
-          });
-        }
+        let real_index_url = '';
+        try {
+          let jsonData = JSON.parse(item.index_url);
+          real_index_url = jsonData['app']['frontPath'];
+        } catch (error) {
+          real_index_url = item.index_url;
+        } 
+        this.$xdUniHelper.redirectTo({
+          url: this.redirect_url || real_index_url || this.settings.index,
+        });
       });
     },
     handleToAdd() {

package/get.package.path.js

@@ -1,22 +0,0 @@
-'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
-}