leisure-core 0.6.20 → 0.6.22

package/le-login/src/main.vue

@@ -119,6 +119,7 @@
 </template>
 
 <script>
+import { setToken } from "../../le-libs/js/tokens";
 export default {
   name: "le-login",
   props: {
@@ -224,6 +225,10 @@ export default {
             },
             this.loginAfter,
             this.nav2Home,
+            (fail) => {
+              this.loading = false;
+              this.$message.error(fail || "登录失败");
+            },
           );
         }
       });
@@ -234,8 +239,12 @@ export default {
       const code = res?.data?.code || "";
       if (code === "10000") {
         const data = res.data.data;
+        if (data && data.cid && data.cid.length > 0) {
+          this.$store.commit("setCid", data.cid);
+        }
         this.$store.commit("setUserInfo", data);
-        this.$store.commit("setToken", data.token);
+        this.$emit("loginAfter", data);
+        setToken(res.data.data.token);
         this.$message.success("登录成功");
       } else {
         this.$message.error(res?.data?.msg || "登录失败");
@@ -250,12 +259,25 @@ export default {
       return this.formdata;
     },
 
+    validatePhone(phone) {
+      const phoneRegex = /^1[3-9]\d{9}$/;
+      return phoneRegex.test(phone);
+    },
+
     // 发送验证码
     sendCaptcha() {
-      // 验证用户名是否已输入
-      if (!this.formdata.account) {
-        this.$message.warning("请输入用户名");
-        return;
+      if (
+        !this.formdata.account ||
+        !this.validatePhone(this.formdata.account)
+      ) {
+        this.$message.error("请输入正确的手机号码");
+        return false;
+      }
+
+      // 验证密码
+      if (!this.formdata.pwd) {
+        this.$message.error("请输入密码");
+        return false;
       }
 
       this.sending = true;
@@ -263,6 +285,7 @@ export default {
       // 触发发送验证码事件，父组件可以监听这个事件来处理发送逻辑
       this.$emit("sendCaptcha", {
         account: this.formdata.account,
+        pwd: this.formdata.pwd,
         success: this.startCountdown,
         fail: () => {
           this.sending = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "description": "leisure-core是京心数据基于vue2.x开发的一套后台管理系统桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",