Merge branch 'wangtao' of uskycloud/usky-web-mobile into master

src/pages/index.vue

@@ -446,8 +446,21 @@ function getAppRoutersData() {
 }
 
 onLoad((options) => {
-  uni.hideTabBar(); //隐藏自带tabbar
-  init(options);
+  if(options?.xcxData){
+    let xcxData = JSON.parse(decrypt(decodeURIComponent(options.xcxData)))
+    useStore.SET_STORAGE_OBJECT_KEYS({ tenantId: xcxData.tenantId })
+    localStorage.setItem("tenantId", xcxData.tenantId )
+    useStore.Login(JSON.parse(decrypt(decodeURIComponent(options.xcxData)))).then(() => {
+      useStore.GetInfo().then((res) => {
+        proxy.$settingStore.initThemeColor(storageSystem.get("themeColor")); //初始化默认主题
+        uni.hideTabBar(); //隐藏自带tabbar
+        init(options);
+      });
+    });
+  }else{
+    uni.hideTabBar(); //隐藏自带tabbar
+    init(options);
+  }
 });
 
 onShow(() => {

src/pages/login.vue

@@ -91,6 +91,7 @@
       </view>
     </view>
   </u-modal>
+  
 </template>
 
 <script setup>
@@ -258,7 +259,7 @@ function submitRes() {
 
 /** 获取登录数据 */
 function login(data) {
-  proxy.$modal.loading("登录中，请耐心等待...");
+  proxy.$modal.loading( "登录中，请耐心等待...");
 
   useStore.Login(data).then(() => {
     /** 获取用户信息 */
@@ -299,15 +300,6 @@ function handlePrivacy() {
 onShow(() => {
   init();
 });
-
-onLoad((options) => {
-  if (options.dataToken) {
-    localStorage.setItem("App-Token", options.dataToken);
-    localStorage.setItem("type", "innerH5");
-    useStore.GetInfo();
-    proxy.$tab.reLaunch("/pages/index");
-  }
-});
 </script>
 
 <style lang="scss" scoped>