jufubao-base 1.0.365 → 1.0.366-beta101

package/package.json

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

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -17,48 +17,50 @@
       class="jfb-base-chose-company__body"
       :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
     >
-      <view :style="[contentPaddingCompStyle]">
-        <view class="jfb-base-chose-company__body-title"
-          >企业信息（{{ companyList.length }}家）</view
-        >
-        <view class="jfb-base-chose-company__body-notice">{{ title }}</view>
-        <view :style="{ '--main-color': mainColor }">
-          <view
-            v-for="(item, index) in companyList"
-            :key="index"
-            @click="handleChoseCompany(item)"
-            :style="[listPaddingCompStyle]"
-            :class="[
-              'jfb-base-chose-company__body-company',
-              item.is_select ? 'active' : '',
-            ]"
+      <template v-if="isLoading">
+        <view :style="[contentPaddingCompStyle]">
+          <view class="jfb-base-chose-company__body-title"
+            >企业信息（{{ companyList.length }}家）</view
           >
+          <view class="jfb-base-chose-company__body-notice">{{ title }}</view>
+          <view :style="{ '--main-color': mainColor }">
             <view
-              v-if="item.is_select"
-              class="jfb-base-chose-company__body-company-active"
-              :style="{
-                background: mainColor,
-                borderRadius: `0 ${listRadius}rpx 0 30rpx`,
-              }"
+              v-for="(item, index) in companyList"
+              :key="index"
+              @click="handleChoseCompany(item)"
+              :style="[listPaddingCompStyle]"
+              :class="[
+                'jfb-base-chose-company__body-company',
+                item.is_select ? 'active' : '',
+              ]"
             >
-              <XdFontIcon
-                size="20"
-                icon="iconduigou-xian"
-                color="#fff"
-              ></XdFontIcon>
-            </view>
-            {{ item.company_name }}
-          </view></view
-        >
-      </view>
-      <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
-        >{{ addTitle
-        }}<view v-if="addCompanyPath" @click="handleToAdd" :style="{color:mainColor}"
-          >去添加<XdFontIcon
-            size="28"
-            icon="iconxiangyou_xian"
-          ></XdFontIcon></view
-      ></view>
+              <view
+                v-if="item.is_select"
+                class="jfb-base-chose-company__body-company-active"
+                :style="{
+                  background: mainColor,
+                  borderRadius: `0 ${listRadius}rpx 0 30rpx`,
+                }"
+              >
+                <XdFontIcon
+                  size="20"
+                  icon="iconduigou-xian"
+                  color="#fff"
+                ></XdFontIcon>
+              </view>
+              {{ item.company_name }}
+            </view></view
+          >
+        </view>
+        <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
+          >{{ addTitle
+          }}<view v-if="addCompanyPath" @click="handleToAdd" :style="{color:mainColor}"
+            >去添加<XdFontIcon
+              size="28"
+              icon="iconxiangyou_xian"
+            ></XdFontIcon></view
+        ></view>
+      </template>
     </view>
   </view>
 </template>
@@ -93,6 +95,8 @@ export default {
       addCompanyPath: "",
       companyList: [],
       redirect_url: "",
+
+      isLoading: false,//页面加载完成
     };
   },
   watch: {
@@ -127,25 +131,12 @@ export default {
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {
       if (options.redirect_url) {
         this.redirect_url = Base64.decode(options.redirect_url);
       }
-      jfbRootExec("getChoseCompanyList", {
-        vm: this,
-        data: {},
-      }).then((res) => {
-        console.log(res, "resgetChoseCompanyList");
-        //如果只有一个企业，直接选择该企业
-        if(res.list.length === 1) {
-          this.handleChoseCompany(res.list[0]);
-        }
-        this.companyList = res.list;
-      });
 
       //判断应用是否开启了强制选择企业功能
       let isCustomer = false;
@@ -155,7 +146,6 @@ export default {
 
       //预览模式不显示强制选择企业功能提示
       if (this.$configProject['isPreview']) isCustomer = true;
-
       if(!isCustomer) {
         this.$xdAlert({
           title:'配置错误',
@@ -164,7 +154,26 @@ export default {
           contentColor: '#333',
           background: '#fff',
         });
+        return
       }
+
+      jfbRootExec("getChoseCompanyList", {
+        vm: this,
+        data: {},
+      }).then((res) => {
+        //如果只有一个企业，直接选择该企业(非预览模式)
+        if(res.list.length === 1) {
+          if(!this.$configProject["isPreview"]){
+            this.handleChoseCompany(res.list[0]);
+            return
+          }
+        }
+
+        //多个企业或者预览模式时候处理
+        this.isLoading = true;
+        this.companyList = res.list;
+      });
+
     },
     /**
      * @description 监听事件变化
@@ -267,8 +276,9 @@ export default {
     },
     handleChoseCompany(item) {
       if(this.$configProject["isPreview"]){
-        return; 
+        return;
       }
+
       jfbRootExec("switchChoseCompany", {
         vm: this,
         data: {
@@ -277,7 +287,6 @@ export default {
           company_source_from: item.company_source_from,
         },
       }).then((res) => {
-
         //#ifdef MP-WEIXIN
         if (this.jfbAuthorize !== null) {
           this.jfbAuthorize.setAllToken(res);//只返回用户登陆信息，无卡登陆信息
@@ -290,10 +299,12 @@ export default {
           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,
         });
+      }).catch(err=>{
+        console.error(err);
       });
     },
     handleToAdd() {
@@ -301,27 +312,6 @@ export default {
         url: this.addCompanyPath,
       });
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
-    onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
-    onJfbShow(options) {
-      console.log("event.onJfbShow", options);
-    },
-    onJfbHide(options) {
-      console.log("event.onJfbHide", options);
-    },
-    onJfbBack(options) {
-      console.log("event.onJfbBack", options);
-    },
-    onJfbUpdate(...data) {
-      console.log("event.onJfbUpdate", data);
-    },
-    onJfbCustomEvent(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
   },
 };
 </script>