Merge remote-tracking branch 'origin/feature/wgt'

manifest.json

@@ -1,130 +1,130 @@
 {
-	"name": "DeepOil",
-	"appid": "__UNI__6E4BC49",
-	"description": "",
-	"versionName": "1.3.2",
-	"versionCode": 10302,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"webpack": {
-			"externals": {
-				"dingtalk-jsapi": "dingtalk-jsapi" // 告诉 webpack 不打包该依赖
-			}
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {
-				"enabled": true,
-				"mode": "default",
-				"orientation": "auto",
-				"background": "#000000",
-				"controls": true,
-				"autoPlay": false,
-				"loop": false,
-				"showFullscreenBtn": true,
-				"showPlayBtn": true,
-				"showCenterPlayBtn": true,
-				"showProgress": true,
-				"objectFit": "contain"
-			},
-			"SQLite": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* sdk */
-			"sdkConfigs": {
-				"oauth": {
-					"dingtalk": {
-						"appid": "dingcrhejkptu0mcsw3r",
-						"universalLinks": "http://1.94.244.160:70/"
-					}
-				}
-			},
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					// "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-				],
-				"schemes": "deepoil"
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs__UNI__6E4BC49\t": {},
-			"splashscreen": {
-				"useOriginalMsgbox": false
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "3",
-	"h5": {
-		"router": {
-			"base": "./"
-		}
-	}
-}
+  "name": "DeepOil",
+  "appid": "__UNI__6E4BC49",
+  "description": "",
+  "versionName": "1.3.2",
+  "versionCode": 10302,
+  "transformPx": false,
+  /* 5+App特有相关 */
+  "app-plus": {
+    "usingComponents": true,
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "webpack": {
+      "externals": {
+        "dingtalk-jsapi": "dingtalk-jsapi" // 告诉 webpack 不打包该依赖
+      }
+    },
+    /* 模块配置 */
+    "modules": {
+      "VideoPlayer": {
+        "enabled": true,
+        "mode": "default",
+        "orientation": "auto",
+        "background": "#000000",
+        "controls": true,
+        "autoPlay": false,
+        "loop": false,
+        "showFullscreenBtn": true,
+        "showPlayBtn": true,
+        "showCenterPlayBtn": true,
+        "showProgress": true,
+        "objectFit": "contain"
+      },
+      "SQLite": {}
+    },
+    /* 应用发布信息 */
+    "distribute": {
+      /* sdk */
+      "sdkConfigs": {
+        "oauth": {
+          "dingtalk": {
+            "appid": "dingcrhejkptu0mcsw3r",
+            "universalLinks": "http://1.94.244.160:70/"
+          }
+        }
+      },
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          // "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+        ],
+        "schemes": "deepoil"
+      },
+      /* ios打包配置 */
+      "ios": {
+        "dSYMs": false
+      },
+      /* SDK配置 */
+      "sdkConfigs__UNI__6E4BC49\t": {},
+      "splashscreen": {
+        "useOriginalMsgbox": false
+      }
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false
+    },
+    "usingComponents": true
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "3",
+  "h5": {
+    "router": {
+      "base": "./"
+    }
+  }
+}

pages/user/index.vue

@@ -12,8 +12,11 @@
             <view class="notice-button">
               <image
                 src="~@/static/home/message.png"
-                style="width: 15px; height: 15px; background-color: transparent"
-              />
+                style="
+                  width: 15px;
+                  height: 15px;
+                  background-color: transparent;
+                " />
             </view>
           </uni-badge>
         </view>
@@ -27,8 +30,7 @@
             class="avatar"
             :src="
               userInfo?.avatar ? userInfo?.avatar : '/static/user/avatar.png'
-            "
-          ></image>
+            "></image>
           <view class="info flex-col align-center justify-start">
             <view class="text flex-row" style="align-items: center; gap: 10px">
               <text class="nickname">{{ userInfo?.nickname }}</text>
@@ -49,8 +51,7 @@
                 display: flex;
                 align-items: center;
                 gap: 5px;
-              "
-            >
+              ">
               <uni-icons type="phone-filled" size="16" color="#656f85" />
               <text>{{ userInfo?.mobile }}</text>
             </view>
@@ -62,8 +63,7 @@
                 display: flex;
                 align-items: center;
                 gap: 5px;
-              "
-            >
+              ">
               <uni-icons type="staff" size="16" color="#656f85" />
               <text>{{ userInfo?.dept.name }}</text>
             </view>
@@ -91,12 +91,10 @@
       <view class="menu-list">
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="navigateToChange"
-        >
+          @click="navigateToChange">
           <image
             src="/static/user/anquanzhongxin.svg"
-            mode="aspectFill"
-          ></image>
+            mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
               <view class="title">
@@ -110,6 +108,20 @@
           </view>
         </view>
 
+        <view class="card-cell flex-row align-center justify-between">
+          <image src="/static/user/guanyuwomen.svg" mode="aspectFill"></image>
+          <view class="cell-con flex-row align-center justify-between">
+            <view class="cell-text flex-row align-center justify-start">
+              <view class="title">
+                {{ $t("user.aboutUs") }}
+              </view>
+              <view class="subtitle">
+                {{ $t("user.currentVersion") + " " + version }}
+              </view>
+            </view>
+            <uni-icons type="right" :color="'#CACCCF'" size="15" />
+          </view>
+        </view>
         <view class="card-cell flex-row align-center justify-between">
           <image src="/static/user/guanyuwomen.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
@@ -151,12 +163,10 @@
           display: flex;
           align-items: center;
           justify-content: center;
-        "
-      >
+        ">
         <image
           style="width: 22px; height: 22px; padding-right: 8px"
-          src="/static/user/logout.png"
-        ></image>
+          src="/static/user/logout.png"></image>
         <text>{{ $t("user.logout") }}</text>
       </button>
     </view>
@@ -252,6 +262,9 @@ onShow(() => {
 .page {
   padding: 10px !important;
 }
+.page {
+  padding: 10px !important;
+}
 
 .mine-container {
   width: 100%;
@@ -273,6 +286,13 @@ onShow(() => {
   z-index: 0;
 }
 
+.navgator {
+  position: fixed;
+  top: 1.5625rem;
+  left: 0;
+  width: 100%;
+  height: 55px;
+  padding: 15px 0;
 .navgator {
   position: fixed;
   top: 1.5625rem;
@@ -373,6 +393,9 @@ onShow(() => {
   }
 }
 
+.text {
+  height: 19px;
+  width: 100%;
 .text {
   height: 19px;
   width: 100%;
@@ -388,6 +411,14 @@ onShow(() => {
   font-weight: bold;
 }
 
+.menu-list {
+  height: 274px;
+  background: #ffffff;
+  border-radius: 6px;
+  margin-top: 10px;
+  padding: 20px;
+  box-sizing: border-box;
+}
 .menu-list {
   height: 274px;
   background: #ffffff;
@@ -397,6 +428,9 @@ onShow(() => {
   box-sizing: border-box;
 }
 
+.card-cell {
+  width: 100%;
+  height: 50px;
 .card-cell {
   width: 100%;
   height: 50px;
@@ -406,7 +440,19 @@ onShow(() => {
     height: 32px;
   }
 }
+  image {
+    width: 32px;
+    height: 32px;
+  }
+}
 
+.cell-con {
+  margin-left: 20px;
+  margin-right: 10px;
+  width: calc(100% - 32px - 20px - 10px);
+  height: 100%;
+  border-bottom: 0.5px solid #cacccf;
+}
 .cell-con {
   margin-left: 20px;
   margin-right: 10px;
@@ -415,15 +461,28 @@ onShow(() => {
   border-bottom: 0.5px solid #cacccf;
 }
 
+.cell-text {
+  font-weight: 500;
 .cell-text {
   font-weight: 500;
 
+  .title {
+    font-size: 14px;
+    color: #333333;
+    line-height: 20px;
+  }
   .title {
     font-size: 14px;
     color: #333333;
     line-height: 20px;
   }
 
+  .subtitle {
+    font-size: 12px;
+    color: #999999;
+    line-height: 17px;
+    margin-left: 10px;
+  }
   .subtitle {
     font-size: 12px;
     color: #999999;
@@ -436,4 +495,9 @@ onShow(() => {
     height: 10px;
   }
 }
+  .icon {
+    width: 6px;
+    height: 10px;
+  }
+}
 </style>

pages/user/login.vue

@@ -51,6 +51,7 @@
       </view>
     </view>
 
+    <!-- <view class="uni-padding-wrap">
     <!-- <view class="uni-padding-wrap">
 			<view>
 				<checkbox-group @change="handleChange">
@@ -89,6 +90,10 @@
     <language-popup ref="languagePopupRef" />
     <upgrade ref="upgradeRef" />
   </view>
+    <!-- 引用语言选择组件 -->
+    <language-popup ref="languagePopupRef" />
+    <upgrade ref="upgradeRef" />
+  </view>
 </template>
 
 <script setup>
@@ -102,20 +107,33 @@ import {
   getInfo,
   getTokenByUserId,
 } from "@/api/login.js";
+import {
+  appLogin,
+  dingTalkLogin,
+  dingTalkLoginH5,
+  getInfo,
+  getTokenByUserId,
+} from "@/api/login.js";
 // 引入配置文件
 import config from "@/utils/config";
+import config from "@/utils/config";
 // 引入数据库操作
 import { saveUser } from "@/utils/appDb";
+import { saveUser } from "@/utils/appDb";
 // 引入本地存储操作
 import { setUserId, setToken, setDeptId, setUserInfo } from "@/utils/auth.js";
+import { setUserId, setToken, setDeptId, setUserInfo } from "@/utils/auth.js";
 // 引入组件
 import Upgrade from "@/components/upgrade.vue";
 import LanguagePopup from "@/components/language-popup.vue";
+import Upgrade from "@/components/upgrade.vue";
+import LanguagePopup from "@/components/language-popup.vue";
 
 // 引入钉钉JSAPI -- 仅在H5环境下使用
 let dd = null;
 // #ifdef H5
 import * as dingTalkJsApi from "dingtalk-jsapi";
+import * as dingTalkJsApi from "dingtalk-jsapi";
 dd = dingTalkJsApi;
 // #endif
 
@@ -125,6 +143,7 @@ const languagePopupRef = ref(null);
 
 const openLanguagePopup = () => {
   languagePopupRef.value.open();
+  languagePopupRef.value.open();
 };
 
 let isChecked = ref(false);
@@ -132,6 +151,7 @@ let my_value = ref(false);
 
 const handleChange = (val) => {
   my_value.value = val.detail.value[0];
+  my_value.value = val.detail.value[0];
 };
 
 // let privacyRef = ref(null);
@@ -150,6 +170,9 @@ const isDingTalk = () => {
   const ua = window.navigator.userAgent.toLowerCase();
   console.log("🚀 ~ 当前环境 ~ ua:", ua);
   return ua.includes("dingtalk") || ua.includes("dingtalkwork");
+  const ua = window.navigator.userAgent.toLowerCase();
+  console.log("🚀 ~ 当前环境 ~ ua:", ua);
+  return ua.includes("dingtalk") || ua.includes("dingtalkwork");
 };
 
 const dingTalkAutoLogin = async () => {
@@ -160,6 +183,13 @@ const dingTalkAutoLogin = async () => {
   }
   // 执行钉钉微应用免登逻辑
   loginWithDingTalkH5();
+  // 判断是否在钉钉环境
+  if (!isDingTalk()) {
+    console.log("当前环境不是钉钉环境，无法自动登录");
+    return;
+  }
+  // 执行钉钉微应用免登逻辑
+  loginWithDingTalkH5();
 };
 
 // 钉钉登录
@@ -184,6 +214,26 @@ const loginWithDingTalk = async () => {
     }
   });
   // #endif
+  // #ifdef APP
+  const plugin = uni.requireNativePlugin("DingTalk");
+  // 钉钉登录，这里无法使用async，否则java端会报参数错误
+  plugin.login((res) => {
+    console.log(res);
+    if (res.success === 1) {
+      dingTalkLogin({
+        type: 20,
+        code: res.code,
+        state: res.state,
+      }).then((res) => {
+        console.log(res);
+        handleLoginSuccess(res);
+      });
+    } else if (res.success === 2) {
+      uni.showToast({ title: t("login.dingTalkError"), icon: "none" });
+      console.error("APP端钉钉登录失败：", res);
+    }
+  });
+  // #endif
 
   // #ifdef H5
   if (isDingTalk()) {
@@ -197,6 +247,18 @@ const loginWithDingTalk = async () => {
     uni.showToast({ title: t("login.h5DingTalk"), icon: "none" });
   }
   // #endif
+  // #ifdef H5
+  if (isDingTalk()) {
+    if (!dd) {
+      uni.showToast({ title: t("login.dingTalkJsapiMissing"), icon: "none" });
+      return;
+    }
+    loginWithDingTalkH5();
+  } else {
+    console.log("当前是普通 H5 环境，无法使用钉钉登录");
+    uni.showToast({ title: t("login.h5DingTalk"), icon: "none" });
+  }
+  // #endif
 };
 
 const loginWithDingTalkH5 = async () => {
@@ -204,6 +266,10 @@ const loginWithDingTalkH5 = async () => {
   console.log("🚀 ~ loginWithDingTalkH5 ~ corpId:", corpId);
   const clientId = config.default.clientId;
   console.log("🚀 ~ loginWithDingTalkH5 ~ clientId:", clientId);
+  const corpId = config.default.corpId;
+  console.log("🚀 ~ loginWithDingTalkH5 ~ corpId:", corpId);
+  const clientId = config.default.clientId;
+  console.log("🚀 ~ loginWithDingTalkH5 ~ clientId:", clientId);
 
   if (!corpId || !clientId) {
     console.error("缺少必要参数");
@@ -236,6 +302,37 @@ const loginWithDingTalkH5 = async () => {
       });
     },
   });
+  if (!corpId || !clientId) {
+    console.error("缺少必要参数");
+    return;
+  }
+  dd.requestAuthCode({
+    corpId,
+    clientId,
+    success: async (result) => {
+      console.log("🚀 ~ loginWithDingTalkH5 ~ result:", result);
+      const { code } = result;
+      dingTalkLoginH5({
+        type: 10,
+        state: new Date().getTime(),
+        code: code,
+      })
+        .then((res) => {
+          console.log("🚀 ~ loginWithDingTalkH5 ~ res:", res);
+          handleLoginSuccess(res);
+        })
+        .catch((err) => {
+          console.log("🚀 ~ loginWithDingTalkH5 ~ err:", err);
+        });
+    },
+    fail: (err) => {
+      console.log("🚀 ~ loginWithDingTalkH5 ~ err:", err);
+      uni.showToast({
+        title: "获取code失败:" + JSON.stringify(err),
+        icon: "none",
+      });
+    },
+  });
 };
 
 onLoad(async (options) => {
@@ -267,6 +364,25 @@ onLoad(async (options) => {
     dingTalkAutoLogin();
   }
   // #endif
+  // 保存钉钉消息传递的参数
+  if (options.userId) {
+    uni.setStorageSync("dingTalkJson", JSON.stringify(options));
+    const isLoggedIn = uni.getStorageSync("userId");
+    if (!isLoggedIn) {
+      const result = await getTokenByUserId(options.userId);
+      await handleLoginSuccess(result);
+    }
+  }
+  // #ifdef H5
+  // 当前环境为H5时，判断是否是通过钉钉微应用打开的链接
+  // 获取当前Url地址
+  const url = window.location.href;
+  console.log("当前环境为H5时 当前Url地址:", url);
+  // 判断是否是通过钉钉微应用打开的链接
+  if (url.includes("/deepoil")) {
+    dingTalkAutoLogin();
+  }
+  // #endif
 });
 
 onMounted(() => {
@@ -287,10 +403,13 @@ onMounted(() => {
   }
 });
 
+const placeholderStyle = ref("color:#797979;font-weight:500;font-size:16px");
 const placeholderStyle = ref("color:#797979;font-weight:500;font-size:16px");
 const inputStyles = reactive({
   backgroundColor: "#F0F3FB",
   color: "#797979",
+  backgroundColor: "#F0F3FB",
+  color: "#797979",
 });
 const loginData = reactive({
   username: "",
@@ -313,6 +432,22 @@ const loginRules = ref({
       },
     ],
   },
+  username: {
+    rules: [
+      {
+        required: true,
+        errorMessage: t("login.enterUsername"),
+      },
+    ],
+  },
+  password: {
+    rules: [
+      {
+        required: true,
+        errorMessage: t("login.enterPassword"),
+      },
+    ],
+  },
 });
 
 const formRef = ref();
@@ -324,6 +459,13 @@ const formSubmit = async (formEl) => {
   // 		duration: 2000, // 持续时间，单位ms
   // 		mask: true // 是否显示透明蒙层，防止触摸穿透
   // 	});
+  // if (!my_value.value) {
+  // 	uni.showToast({
+  // 		title: '请阅读并同意隐私政策和用户服务协议',
+  // 		icon: 'none', // 可选 success/error/loading/none
+  // 		duration: 2000, // 持续时间，单位ms
+  // 		mask: true // 是否显示透明蒙层，防止触摸穿透
+  // 	});
 
   // 	return;
   // }
@@ -351,9 +493,47 @@ const formSubmit = async (formEl) => {
     .catch((err) => {
       console.log("err", err);
     });
+  // 	return;
+  // }
+  if (!formEl) return;
+  await formEl
+    .validate()
+    .then((res) => {
+      appLogin({
+        ...loginData,
+        // rememberMe: ,
+        // tenantName: ""
+      })
+        .then(async (result) => {
+          console.log("result,", result.data);
+          if (result) {
+            await saveUser({
+              name: loginData.username,
+              pwd: loginData.password,
+            });
+            await handleLoginSuccess(result);
+          }
+        })
+        .finally(() => {});
+    })
+    .catch((err) => {
+      console.log("err", err);
+    });
 };
 
 const handleLoginSuccess = async (result) => {
+  if (result) {
+    await setUserId(result.data.userId);
+    await setToken(result.data);
+    await getInfo().then(async (res) => {
+      // console.log('useres', res)
+      const data = JSON.stringify({
+        user: res.data.user,
+        roles: res.data.roles,
+      });
+      // console.log('data', data)
+      await setUserInfo(data);
+      await setDeptId(res.data.user.deptId);
   if (result) {
     await setUserId(result.data.userId);
     await setToken(result.data);
@@ -380,6 +560,9 @@ const handleLoginSuccess = async (result) => {
   height: 60vh;
   width: 85vw;
   overflow: hidden;
+  height: 60vh;
+  width: 85vw;
+  overflow: hidden;
 }
 
 .uni-padding-wrap {
@@ -388,19 +571,30 @@ const handleLoginSuccess = async (result) => {
   justify-content: center;
   align-items: center;
   padding: 0 10rpx;
+  display: flex;
+  z-index: 999;
+  justify-content: center;
+  align-items: center;
+  padding: 0 10rpx;
 }
 .uni-title {
   font-size: 12px;
+  font-size: 12px;
 }
 .login-top {
   position: relative;
   width: 100%;
   height: 422rpx;
+  position: relative;
+  width: 100%;
+  height: 422rpx;
 }
 
 .back-img {
   width: 100%;
   height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .login-text {
@@ -418,6 +612,20 @@ const handleLoginSuccess = async (result) => {
   display: flex;
   justify-content: center;
   flex-direction: column;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: #ffffff;
+  font-size: 40rpx;
+  font-family: "Negreta,PingFang SC";
+  font-weight: 600;
+  padding: 0 56rpx;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
 
   .text {
     width: 100%;