jmash-core-mp 0.1.21 → 0.1.22

package/src/store/user.ts

@@ -1,270 +1,270 @@
-import { defineStore } from "@mpxjs/pinia";
-import {
-  LoginReq,
-  PhoneRegisterReq,
-  WebLoginReq,
-  LoginRes,
-  RolesPerms,
-  TokenModel,
-  UserInfo,
-} from "../api/auth/types";
-import { authApi } from "../api/auth/index";
-import { ResponseData } from "../api/types";
-import { db } from "../utils/db";
-import { net } from "../utils/net";
-import mpx from "@mpxjs/core";
-
-interface UserState {
-  //用户信息
-  userInfo: UserInfo;
-  // 角色编码
-  roleCodes: string[];
-  // 权限编码
-  permCodes: string[];
-  //访问Token
-  accessToken: string;
-  //Token过期时间
-  expiresDate: number;
-}
-
-export const useUserStore = defineStore("user", {
-  state: (): UserState => ({
-    userInfo: (db.getUserInfo() as UserInfo) || {},
-    roleCodes: (db.getRoleCodes() as string[]) || [],
-    permCodes: (db.getPermCodes() as string[]) || [],
-    accessToken: (db.getToken() as string) || "",
-    expiresDate: (db.getTokenExpiresDate() as number) || 0,
-  }),
-  actions: {
-    /** 登录检查 */
-    loginOnlyAC(): Promise<boolean> {
-      // 1. 已登录 → 直接返回成功
-      if (this.checkLogin()) {
-        return Promise.resolve(true);
-      }
-      const config = getApp().globalData.config;
-      // 2. 测试环境特殊配置 → 直接返回失败
-      if (config.dev && config.testNewUser) {
-        return Promise.reject("测试环境，要求用户登录！");
-      }
-
-      // 3. 执行静默登录
-      return this.silentLogin().then((res) => {
-        return res.status;
-      });
-    },
-    /** 登录检查并跳转登录 */
-    loginAC(
-      backurl: string,
-      tabbar: boolean,
-      loginurl: string = "/jmash/pages/auth/login"
-    ): Promise<boolean> {
-      // 1. 已登录 → 直接 resolve
-      if (this.checkLogin()) {
-        return Promise.resolve(true);
-      }
-
-      // 2. 拼接登录跳转地址（抽离公共逻辑）
-      const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(
-        backurl
-      )}`;
-      const config = getApp().globalData.config;
-
-      // 3. 测试环境特殊处理
-      if (config.dev && config.testNewUser) {
-        mpx.navigateTo({ url: toUrl });
-        return Promise.resolve(false);
-      }
-
-      // 4. 生产环境：执行静默登录
-      return this.silentLogin()
-        .then((res) => {
-          // 静默登录成功
-          return Promise.resolve(res.status);
-        })
-        .catch(() => {
-          mpx.navigateTo({ url: toUrl });
-          return Promise.resolve(false);
-        });
-    },
-
-    /** 静默登录 */
-    silentLogin(): Promise<LoginRes> {
-      const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
-      const config = getApp().globalData.config;
-      return mpx
-        .login(obj as WechatMiniprogram.LoginOption)
-        .then((res: any) => {
-          console.log("silentLogin-res", res);
-          if (res.code) {
-            return authApi
-              .mpLogin({
-                loginCode: res.code,
-                appId: config.appId,
-                componentAppid: config.componentAppid,
-              } as LoginReq)
-              .then(this.loginProcess);
-          }
-          throw new Error("接口登录失败!");
-        })
-        .catch((error: any) => {
-          console.log("小程序登录失败!", error);
-          return Promise.reject(error);
-        });
-    },
-    // 手机号code 注册登录
-    mpRegister(
-      phoneCode: string,
-      nickName: string = "",
-      avatar: string = ""
-    ): Promise<LoginRes> {
-      const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
-      const config = getApp().globalData.config;
-      return mpx
-        .login(obj as WechatMiniprogram.LoginOption)
-        .then((res: any) => {
-          if (res.code) {
-            return authApi
-              .mpPhoneRegister({
-                phoneCode: phoneCode,
-                loginCode: res.code,
-                appId: config.appId,
-                nickName: nickName,
-                avatar: avatar,
-                componentAppid: config.componentAppid,
-              } as PhoneRegisterReq)
-              .then(this.loginProcess);
-          }
-          throw new Error("小程序登录失败!");
-        });
-    },
-    //web登录.
-    webLogin(userName: string, pwd: string): Promise<LoginRes> {
-      // 编码密码
-      const encodePwd = net.encrypt(pwd);
-      return authApi
-        .webLogin({ userName, encodePwd: encodePwd } as WebLoginReq)
-        .then((res) => {
-          return {
-            status: true,
-            token: this.loginSuccess(res.data),
-            message: "登录成功!",
-          } as LoginRes;
-        });
-    },
-    // 登录处理
-    loginProcess(resp: ResponseData<LoginRes>): LoginRes {
-      //console.log("miniappLogin", resp);
-      if (resp.statusCode === 200 && resp.data.status === true) {
-        console.log("login success");
-        this.loginSuccess(resp.data.token);
-      } else if (resp.statusCode !== 200) {
-        throw new Error(resp.errMsg);
-      } else if (resp.data.status === false) {
-        throw new Error("用户未注册!");
-      }
-      return resp.data;
-    },
-    loginSuccess(token: TokenModel): TokenModel {
-      this.accessToken = token.accessToken;
-      this.expiresDate = token.expiresIn * 1000 + new Date().getTime();
-      db.setToken(token);
-      this.getUserInfo(false);
-      this.getRolePerm(false);
-      return token;
-    },
-    // 退出登录，清空状态
-    logout() {
-      db.clearStorage();
-      this.userInfo = {} as UserInfo;
-      this.roleCodes = [];
-      this.permCodes = [];
-      this.accessToken = "";
-      this.expiresDate = 0;
-    },
-    /** 检查登录是否有效？ */
-    checkLogin(): boolean {
-      if (this.accessToken && !this.isTokenExpires()) {
-        return true;
-      }
-      return false;
-    },
-    //是否Token过期.
-    isTokenExpires(): boolean {
-      const expiresDate = this.expiresDate;
-      //无token/无过期时间直接视为过期
-      if (!this.accessToken || !expiresDate) return true;
-      const now = new Date().getTime();
-      return now + 30000 > expiresDate;
-    },
-    // 检查角色
-    checkRole(role: string): boolean {
-      // 获取roleCodes
-      const roleCodes: Array<string> = this.roleCodes;
-      return roleCodes.length > 0 && roleCodes.indexOf(role) !== -1;
-    },
-
-    // 获取用户信息
-    getUserInfo(cache: boolean = true): Promise<UserInfo> {
-      const userInfo = this.userInfo;
-      // 有缓存直接返回
-      if (cache && Object.keys(userInfo).length > 0) {
-        return Promise.resolve(userInfo);
-      }
-      // 无缓存请求接口
-      return authApi
-        .userInfo()
-        .then((resp: ResponseData<UserInfo>) => {
-          this.userInfo = resp.data;
-          db.setUserInfo(resp.data);
-          return resp.data;
-        })
-        .catch(() => Promise.reject("获取用户信息错误！"));
-    },
-    setUserInfo(userInfo: UserInfo) {
-      this.userInfo = userInfo;
-      db.setUserInfo(userInfo);
-    },
-
-    // 获取角色权限
-    getRolePerm(cache: boolean = true): Promise<RolesPerms> {
-      const rolesPerms = {
-        roleCodes: this.roleCodes,
-        permCodes: this.permCodes,
-      };
-
-      // 有缓存直接返回
-      if (
-        cache &&
-        (rolesPerms.roleCodes.length > 0 || rolesPerms.permCodes.length > 0)
-      ) {
-        return Promise.resolve(rolesPerms);
-      }
-
-      // 无缓存请求接口
-      return authApi
-        .userRolesPerms()
-        .then((response: ResponseData<RolesPerms>) => {
-          this.roleCodes = response.data.roleCodes;
-          this.permCodes = response.data.permCodes;
-          db.setRoleCodes(response.data.roleCodes);
-          db.setPermCodes(response.data.permCodes);
-          return response.data;
-        })
-        .catch(() => Promise.reject("获取角色权限错误！"));
-    },
-
-    // 刷新Token.
-    refreshToken(): Promise<boolean> {
-      return authApi
-        .refreshToken()
-        .then((response: ResponseData<TokenModel>) => {
-          this.accessToken = response.data.accessToken;
-          this.expiresDate =
-            response.data.expiresIn * 1000 + new Date().getTime();
-          db.setToken(response.data);
-          return true;
-        });
-    },
-  },
-});
+import { defineStore } from "@mpxjs/pinia";
+import {
+  LoginReq,
+  PhoneRegisterReq,
+  WebLoginReq,
+  LoginRes,
+  RolesPerms,
+  TokenModel,
+  UserInfo,
+} from "../api/auth/types";
+import { authApi } from "../api/auth/index";
+import { ResponseData } from "../api/types";
+import { db } from "../utils/db";
+import { net } from "../utils/net";
+import mpx from "@mpxjs/core";
+
+interface UserState {
+  //用户信息
+  userInfo: UserInfo;
+  // 角色编码
+  roleCodes: string[];
+  // 权限编码
+  permCodes: string[];
+  //访问Token
+  accessToken: string;
+  //Token过期时间
+  expiresDate: number;
+}
+
+export const useUserStore = defineStore("user", {
+  state: (): UserState => ({
+    userInfo: (db.getUserInfo() as UserInfo) || {},
+    roleCodes: (db.getRoleCodes() as string[]) || [],
+    permCodes: (db.getPermCodes() as string[]) || [],
+    accessToken: (db.getToken() as string) || "",
+    expiresDate: (db.getTokenExpiresDate() as number) || 0,
+  }),
+  actions: {
+    /** 登录检查 */
+    loginOnlyAC(): Promise<boolean> {
+      // 1. 已登录 → 直接返回成功
+      if (this.checkLogin()) {
+        return Promise.resolve(true);
+      }
+      const config = getApp().globalData.config;
+      // 2. 测试环境特殊配置 → 直接返回失败
+      if (config.dev && config.testNewUser) {
+        return Promise.reject("测试环境，要求用户登录！");
+      }
+
+      // 3. 执行静默登录
+      return this.silentLogin().then((res) => {
+        return res.status;
+      });
+    },
+    /** 登录检查并跳转登录 */
+    loginAC(
+      backurl: string,
+      tabbar: boolean,
+      loginurl: string = "/jmash/pages/auth/login"
+    ): Promise<boolean> {
+      // 1. 已登录 → 直接 resolve
+      if (this.checkLogin()) {
+        return Promise.resolve(true);
+      }
+
+      // 2. 拼接登录跳转地址（抽离公共逻辑）
+      const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(
+        backurl
+      )}`;
+      const config = getApp().globalData.config;
+
+      // 3. 测试环境特殊处理
+      if (config.dev && config.testNewUser) {
+        mpx.navigateTo({ url: toUrl });
+        return Promise.resolve(false);
+      }
+
+      // 4. 生产环境：执行静默登录
+      return this.silentLogin()
+        .then((res) => {
+          // 静默登录成功
+          return Promise.resolve(res.status);
+        })
+        .catch(() => {
+          mpx.navigateTo({ url: toUrl });
+          return Promise.resolve(false);
+        });
+    },
+
+    /** 静默登录 */
+    silentLogin(): Promise<LoginRes> {
+      const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
+      const config = getApp().globalData.config;
+      return mpx
+        .login(obj as WechatMiniprogram.LoginOption)
+        .then((res: any) => {
+          console.log("silentLogin-res", res);
+          if (res.code) {
+            return authApi
+              .mpLogin({
+                loginCode: res.code,
+                appId: config.appId,
+                componentAppid: config.componentAppid,
+              } as LoginReq)
+              .then(this.loginProcess);
+          }
+          throw new Error("接口登录失败!");
+        })
+        .catch((error: any) => {
+          console.log("小程序登录失败!", error);
+          return Promise.reject(error);
+        });
+    },
+    // 手机号code 注册登录
+    mpRegister(
+      phoneCode: string,
+      nickName: string = "",
+      avatar: string = ""
+    ): Promise<LoginRes> {
+      const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
+      const config = getApp().globalData.config;
+      return mpx
+        .login(obj as WechatMiniprogram.LoginOption)
+        .then((res: any) => {
+          if (res.code) {
+            return authApi
+              .mpPhoneRegister({
+                phoneCode: phoneCode,
+                loginCode: res.code,
+                appId: config.appId,
+                nickName: nickName,
+                avatar: avatar,
+                componentAppid: config.componentAppid,
+              } as PhoneRegisterReq)
+              .then(this.loginProcess);
+          }
+          throw new Error("小程序登录失败!");
+        });
+    },
+    //web登录.
+    webLogin(userName: string, pwd: string): Promise<LoginRes> {
+      // 编码密码
+      const encodePwd = net.encrypt(pwd);
+      return authApi
+        .webLogin({ userName, encodePwd: encodePwd } as WebLoginReq)
+        .then((res) => {
+          return {
+            status: true,
+            token: this.loginSuccess(res.data),
+            message: "登录成功!",
+          } as LoginRes;
+        });
+    },
+    // 登录处理
+    loginProcess(resp: ResponseData<LoginRes>): LoginRes {
+      //console.log("miniappLogin", resp);
+      if (resp.statusCode === 200 && resp.data.status === true) {
+        console.log("login success");
+        this.loginSuccess(resp.data.token);
+      } else if (resp.statusCode !== 200) {
+        throw new Error(resp.errMsg);
+      } else if (resp.data.status === false) {
+        throw new Error("用户未注册!");
+      }
+      return resp.data;
+    },
+    loginSuccess(token: TokenModel): TokenModel {
+      this.accessToken = token.accessToken;
+      this.expiresDate = token.expiresIn * 1000 + new Date().getTime();
+      db.setToken(token);
+      this.getUserInfo(false);
+      this.getRolePerm(false);
+      return token;
+    },
+    // 退出登录，清空状态
+    logout() {
+      db.clearStorage();
+      this.userInfo = {} as UserInfo;
+      this.roleCodes = [];
+      this.permCodes = [];
+      this.accessToken = "";
+      this.expiresDate = 0;
+    },
+    /** 检查登录是否有效？ */
+    checkLogin(): boolean {
+      if (this.accessToken && !this.isTokenExpires()) {
+        return true;
+      }
+      return false;
+    },
+    //是否Token过期.
+    isTokenExpires(): boolean {
+      const expiresDate = this.expiresDate;
+      //无token/无过期时间直接视为过期
+      if (!this.accessToken || !expiresDate) return true;
+      const now = new Date().getTime();
+      return now + 30000 > expiresDate;
+    },
+    // 检查角色
+    checkRole(role: string): boolean {
+      // 获取roleCodes
+      const roleCodes: Array<string> = this.roleCodes;
+      return roleCodes.length > 0 && roleCodes.indexOf(role) !== -1;
+    },
+
+    // 获取用户信息
+    getUserInfo(cache: boolean = true): Promise<UserInfo> {
+      const userInfo = this.userInfo;
+      // 有缓存直接返回
+      if (cache && Object.keys(userInfo).length > 0) {
+        return Promise.resolve(userInfo);
+      }
+      // 无缓存请求接口
+      return authApi
+        .userInfo()
+        .then((resp: ResponseData<UserInfo>) => {
+          this.userInfo = resp.data;
+          db.setUserInfo(resp.data);
+          return resp.data;
+        })
+        .catch(() => Promise.reject("获取用户信息错误！"));
+    },
+    setUserInfo(userInfo: UserInfo) {
+      this.userInfo = userInfo;
+      db.setUserInfo(userInfo);
+    },
+
+    // 获取角色权限
+    getRolePerm(cache: boolean = true): Promise<RolesPerms> {
+      const rolesPerms = {
+        roleCodes: this.roleCodes,
+        permCodes: this.permCodes,
+      };
+
+      // 有缓存直接返回
+      if (
+        cache &&
+        (rolesPerms.roleCodes.length > 0 || rolesPerms.permCodes.length > 0)
+      ) {
+        return Promise.resolve(rolesPerms);
+      }
+
+      // 无缓存请求接口
+      return authApi
+        .userRolesPerms()
+        .then((response: ResponseData<RolesPerms>) => {
+          this.roleCodes = response.data.roleCodes;
+          this.permCodes = response.data.permCodes;
+          db.setRoleCodes(response.data.roleCodes);
+          db.setPermCodes(response.data.permCodes);
+          return response.data;
+        })
+        .catch(() => Promise.reject("获取角色权限错误！"));
+    },
+
+    // 刷新Token.
+    refreshToken(): Promise<boolean> {
+      return authApi
+        .refreshToken()
+        .then((response: ResponseData<TokenModel>) => {
+          this.accessToken = response.data.accessToken;
+          this.expiresDate =
+            response.data.expiresIn * 1000 + new Date().getTime();
+          db.setToken(response.data);
+          return true;
+        });
+    },
+  },
+});

package/src/styles/index.scss

@@ -1,20 +1,20 @@
-@forward "@/styles/vars.scss";
-
-//tabbar web 放在底部
-/* @mpx-if (__mpx_mode__ === 'web') */
-.cube-tab-bar {
-  position: fixed !important;
-  left: 0 !important;
-  bottom: 0 !important;
-  width: 100% !important;
-  z-index: 9999 !important;
-  /* 保证在最上层 */
-  background: #fff !important;
-  border-top: 1px solid #eee !important;
-}
-
-/* 给页面主体加内边距，防止内容被 tabbar 挡住 */
-.page-body {
-  padding-bottom: 50px !important;
-}
-/* @mpx-endif */
+@forward "@/styles/vars.scss";
+
+//tabbar web 放在底部
+/* @mpx-if (__mpx_mode__ === 'web') */
+.cube-tab-bar {
+  position: fixed !important;
+  left: 0 !important;
+  bottom: 0 !important;
+  width: 100% !important;
+  z-index: 9999 !important;
+  /* 保证在最上层 */
+  background: #fff !important;
+  border-top: 1px solid #eee !important;
+}
+
+/* 给页面主体加内边距，防止内容被 tabbar 挡住 */
+.page-body {
+  padding-bottom: 50px !important;
+}
+/* @mpx-endif */

package/src/styles/vars.scss

@@ -1,27 +1,27 @@
-// 圆角
-$border-radius: 20rpx;
-$border-mini-radius: 10rpx;
-$border-max-radius: 50rpx;
-// 字体大小
-$font-size: 28rpx;
-$font-size-mini: 24rpx;
-// 颜色
-$white-color: #fff;
-$red-color: #ef4444;
-$green-color: #16a34a;
-$blue-color: #2563eb;
-$black-color: #000;
-// 字体颜色
-$font-color: #333;
-$font-color-grey: #666;
-$font-color-grey-opacity: #999;
-// 宽
-$width: 100%;
-// 层级
-$z-index: 99999;
-// 下拉线颜色
-$border-line: #ebebeb;
-// 背景色
-$background-color: #f6f6f6;
-// 白色背景
-$background-white-color: #fff;
+// 圆角
+$border-radius: 20rpx;
+$border-mini-radius: 10rpx;
+$border-max-radius: 50rpx;
+// 字体大小
+$font-size: 28rpx;
+$font-size-mini: 24rpx;
+// 颜色
+$white-color: #fff;
+$red-color: #ef4444;
+$green-color: #16a34a;
+$blue-color: #2563eb;
+$black-color: #000;
+// 字体颜色
+$font-color: #333;
+$font-color-grey: #666;
+$font-color-grey-opacity: #999;
+// 宽
+$width: 100%;
+// 层级
+$z-index: 99999;
+// 下拉线颜色
+$border-line: #ebebeb;
+// 背景色
+$background-color: #f6f6f6;
+// 白色背景
+$background-white-color: #fff;