【v3.3.0】 1、uniapp 首页菜单功能区多平台适配;2、菜单组件路径说明;3、长时间不在线自动返回登录页;4、标签页 tab 为圆角;5、升级 sa token 到 1.37.0;6、代码生成表单弹窗 关闭事件;7、接口操作日志@OperateLogAspect 对文件的处理;

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -159,8 +159,8 @@ public class LoginService implements StpInterface {
 
             // 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid
             String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId();
-            // 万能密码登录只能登录15分钟
+            // 万能密码登录只能登录30分钟
-            StpUtil.login(saTokenLoginId, 900);
+            StpUtil.login(saTokenLoginId, 1800);
 
         } else {
 

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java

@@ -27,6 +27,7 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
@@ -238,6 +239,7 @@ public abstract class OperateLogAspect {
             if (arg instanceof HttpServletRequest
                     || arg instanceof HttpServletResponse
                     || arg instanceof ModelAndView
+                    || arg instanceof MultipartFile
                     || arg instanceof BindResult) {
                 continue;
             }

smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Zhuoda#1024lab
+    password: Zhuoda1024lab
     initial-size: 10
     min-idle: 10
     max-active: 100

smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Java@1024
+    password: Zhuoda1024lab
     initial-size: 2
     min-idle: 2
     max-active: 10

smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue

@@ -108,7 +108,7 @@
       emit('update:value', valueList);
       emit('change', valueList);
     } else {
-      let findValue = dictValueList.value.find((e) => e.valueCode == value);
+      let findValue = dictValueList.value.find((e) => e.valueCode === value);
       emit('update:value', findValue.valueCode);
       emit('change', findValue.valueCode);
     }

smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue

@@ -130,6 +130,7 @@
 
   const { useToken } = theme;
   const { token } = useToken();
+  const borderRadius = token.value.borderRadius + 'px';
 </script>
 
 <style scoped lang="less">
@@ -199,6 +200,7 @@
 
     :deep(.ant-tabs-small > .ant-tabs-nav .ant-tabs-tab) {
       padding: 5px 8px 3px 10px;
+      border-radius: v-bind(borderRadius);
     }
 
     :deep(.ant-tabs-tab-active) {

smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue

@@ -47,7 +47,7 @@
           <a-form-item v-if="form.frameFlag" label="外链地址" name="frameUrl">
             <a-input v-model:value="form.frameUrl" placeholder="请输入外链地址" />
           </a-form-item>
-          <a-form-item v-else label="组件地址" name="component">
+          <a-form-item v-else label="组件地址" name="component" help="比如 商品列表：/business/erp/goods/goods-list.vue">
             <a-input v-model:value="form.component" placeholder="请输入组件地址 默认带有开头/@/views" />
           </a-form-item>
         </template>
@@ -91,9 +91,8 @@
         </a-form-item>
       </template>
       <!--      按钮 end   -->
-      <a-form-item label="排序" name="sort">
+      <a-form-item label="排序" name="sort" help="值越小越靠前">
         <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
-        <h6 style="color: #ababab">值越小越靠前</h6>
       </a-form-item>
     </a-form>
     <div class="footer">

smart-admin-web/typescript-ant-design-vue3/README.md

@@ -0,0 +1,2 @@
+### **敬请期待，2024年5月开干**
+

smart-app/.env.development

@@ -1,3 +1,3 @@
 NODE_ENV=development
 VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
-VITE_APP_API_URL='http://127.0.0.1:1024'
+VITE_APP_API_URL='https://app.smartadmin.vip/smart-app-api'

smart-app/src/App.vue

@@ -1,5 +1,5 @@
 <script>
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
   export default {
     onLaunch: function () {
       useUserStore().getLoginInfo();

smart-app/src/api/business/goods/goods-api.js

@@ -5,7 +5,7 @@
  * @LastEditTime: 2022-06-23
  * @LastEditors: zhuoda
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const goodsApi = {
   // 添加商品 @author zhuoda

smart-app/src/api/business/oa/enterprise-api.js

@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const enterpriseApi = {
   // 新建企业 @author 开云

smart-app/src/api/business/oa/notice-api.js

@@ -4,7 +4,7 @@
  * @Author: zhuoda
  * @Date: 2022-08-16 20:34:36
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const noticeApi = {
   // ---------------- 通知公告类型 -----------------------

smart-app/src/api/support/change-log-api.js

@@ -5,7 +5,7 @@
  * @Date:      2022-09-26 14:53:50
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const changeLogApi = {
   /**

smart-app/src/api/support/dict-api.js

@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const dictApi = {
   // 分页查询数据字典KEY - @author 卓大

smart-app/src/api/support/file-api.js

@@ -5,7 +5,7 @@
  * @Date:      2022-09-26 14:53:50
  * @Copyright  1024创新实验室
  */
-import { uploadRequest } from '/@/lib/smart-request';
+import { uploadRequest } from '@/lib/smart-request';
 
 export const fileApi = {
   upload: (file, folder) => {

smart-app/src/api/system/login-api.js

@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/@/lib/smart-request';
+import { getRequest, postRequest } from '@/lib/smart-request';
 
 export const loginApi = {
   /**

smart-app/src/components/dict-select/index.vue

@@ -16,7 +16,7 @@
 
 <script setup>
   import { onMounted, ref, watch } from 'vue';
-  import { dictApi } from '/@/api/support/dict-api';
+  import { dictApi } from '@/api/support/dict-api';
 
   const props = defineProps({
     keyCode: String,

smart-app/src/lib/smart-request.js

@@ -7,10 +7,10 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { USER_TOKEN } from '/@/constants/local-storage-key-const';
+import { USER_TOKEN } from '@/constants/local-storage-key-const';
-import { DATA_TYPE_ENUM } from '/@/constants/common-const';
+import { DATA_TYPE_ENUM } from '@/constants/common-const';
 import { decryptData, encryptData } from './encrypt';
-import { useUserStore } from '/@/store/modules/system/user';
+import { useUserStore } from '@/store/modules/system/user';
 
 const baseUrl = import.meta.env.VITE_APP_API_URL;
 

smart-app/src/main.js

@@ -6,8 +6,8 @@ import { store } from './store/index';
 import './theme/index.scss';
 
 // 枚举管理
-import smartEnumPlugin from '/@/plugins/smart-enums-plugin';
+import smartEnumPlugin from '@/plugins/smart-enums-plugin';
-import constantsInfo from '/@/constants/index';
+import constantsInfo from '@/constants/index';
 import lodash from 'lodash';
 
 export function createApp() {

smart-app/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "",
+    "name" : "smart-app",
     "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx2f5032ef5c4adae4",
         "setting" : {
             "urlCheck" : false
         },

smart-app/src/pages/enterprise/enterprise-detail.vue

@@ -83,12 +83,12 @@
 </template>
 
 <script setup>
-  import SmartDetailTabs from '/@/components/smart-detail-tabs/index.vue';
+  import SmartDetailTabs from '@/components/smart-detail-tabs/index.vue';
   import { ref, reactive } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
   import { onShow, onLoad } from '@dcloudio/uni-app';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
 
   // ----------------------- tab -----------------------
 

smart-app/src/pages/enterprise/enterprise-form.vue

@@ -48,11 +48,11 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
-  import { regular } from '/@/constants/regular-const';
+  import { regular } from '@/constants/regular-const';
-  import SmartEnumRadio from '/@/components/smart-enum-radio/index.vue';
+  import SmartEnumRadio from '@/components/smart-enum-radio/index.vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
   import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
 
   // --------------------- 表单 ---------------------

smart-app/src/pages/enterprise/enterprise-list.vue

@@ -55,10 +55,10 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
   import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import _ from 'lodash';
 
   // --------------------------- 查询 ---------------------------------

smart-app/src/pages/goods/components/goods-query-form-popup.vue

@@ -30,8 +30,8 @@
 
 <script setup>
   import { reactive, ref, toRaw } from 'vue';
-  import DictSelect from '/@/components/dict-select/index.vue';
+  import DictSelect from '@/components/dict-select/index.vue';
-  import SmartEnumSelect from '/@/components/smart-enum-select/index.vue';
+  import SmartEnumSelect from '@/components/smart-enum-select/index.vue';
 
   const emits = defineEmits(['close']);
   defineExpose({ show });

smart-app/src/pages/goods/goods-index.vue

@@ -46,10 +46,10 @@
 <script setup>
   import { reactive, ref } from 'vue';
   import QueryFormPopUp from './components/goods-query-form-popup.vue';
-  import { goodsApi } from '/@/api/business/goods/goods-api';
+  import { goodsApi } from '@/api/business/goods/goods-api';
   import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import NoticeList from './components/goods-list.vue';
   import _ from 'lodash';
 

smart-app/src/pages/home/components/goods.vue

@@ -26,9 +26,9 @@
 
 <script setup>
   import { ref } from 'vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import { onShow } from '@dcloudio/uni-app';
-  import { goodsApi } from '/@/api/business/goods/goods-api';
+  import { goodsApi } from '@/api/business/goods/goods-api';
 
   const queryForm = {
     pageNum: 1,

smart-app/src/pages/home/components/menu.vue

@@ -2,67 +2,67 @@
   <view class="menu-container">
     <uni-grid :column="5" :highlight="true" :show-border="false" customStyle="display: block;">
       <!--------------------------------- 第一排--------------------------------->
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="changeHome">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu1.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu1.png"></image>
           <view class="item-text"> 首页切换 </view>
         </view>
       </uni-grid-item>
 
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/notice/notice-index')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu2.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu2.png"></image>
           <view class="item-text"> 通知公告 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/enterprise/enterprise-list')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu3.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu3.png"></image>
           <view class="item-text"> 客户线索 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/goods/goods-index')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu4.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu4.png"></image>
           <view class="item-text"> 品质商品 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/support/change-log/change-log-list')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu5.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu5.png"></image>
           <view class="item-text"> 版本更新 </view>
         </view>
       </uni-grid-item>
 
       <!--------------------------------- 第二排--------------------------------->
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/form/form')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu6.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu6.png"></image>
           <view class="item-text"> 复杂表单 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="navigateTo('/pages/order-detail/order-detail')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu7.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu7.png"></image>
           <view class="item-text"> 复杂详情 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="switchTab('/pages/list/list')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu9.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu9.png"></image>
           <view class="item-text"> 列表样式1 </view>
         </view>
       </uni-grid-item>
 
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="switchTab('/pages/list2/list')">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu8.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu8.png"></image>
           <view class="item-text"> 列表样式2 </view>
         </view>
       </uni-grid-item>
-      <uni-grid-item class="menu-grid">
+      <uni-grid-item class="menu-grid" style="width: 134rpx; height: 134rpx">
         <view class="menu-item" @click="developing">
-          <image class="item-image" src="/@/static/images/index/ic_home_menu10.png"></image>
+          <image class="item-image" src="@/static/images/index/ic_home_menu10.png"></image>
           <view class="item-text"> 接口加密 </view>
         </view>
       </uni-grid-item>
@@ -71,7 +71,7 @@
 </template>
 
 <script setup>
-  import { SmartToast } from '/@/lib/smart-support';
+  import { SmartToast } from '@/lib/smart-support';
   const emit = defineEmits(['changeHome']);
 
   function changeHome() {
@@ -101,7 +101,7 @@
         margin-top: 20rpx;
       }
     }
-    //height: 340rpx;
+    height: 340rpx;
     box-sizing: border-box;
     border-radius: 16rpx;
     width: 700rpx;

smart-app/src/pages/home/components/notice.vue

@@ -11,8 +11,8 @@
 
 <script setup>
   import { ref } from 'vue';
-  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { noticeApi } from '@/api/business/oa/notice-api';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import { onShow } from '@dcloudio/uni-app';
 
   const queryForm = {

smart-app/src/pages/home/index.vue

@@ -4,10 +4,10 @@
       <template #right>
         <view class="right">
           <view class="">
-            <image src="/@/static/images/index/ic_scan.png" mode=""></image>
+            <image src="@/static/images/index/ic_scan.png" mode=""></image>
           </view>
           <view class="">
-            <image src="/@/static/images/index/ic_search.png" mode=""></image>
+            <image src="@/static/images/index/ic_search.png" mode=""></image>
           </view>
         </view>
       </template>

smart-app/src/pages/login/components/login-check-box.vue

@@ -12,8 +12,8 @@
   </view>
 </template>
 <script setup>
-  import checkOutImg from '/@/static/images/login/check-out.png';
+  import checkOutImg from '/static/images/login/check-out.png';
-  import checkInImg from '/@/static/images/login/check-in.png';
+  import checkInImg from '/static/images/login/check-in.png';
 
   import { ref } from 'vue';
 

smart-app/src/pages/login/components/other-way-box.vue

@@ -6,15 +6,15 @@
     <view class="other-way">
       <!-- 手机号登录 -->
       <view v-if="phoneLoginFlag" @click="navigateTo('/pages/login/phone-login')" class="item">
-        <image src="/@/static/images/login/phone-login-icon.png" />
+        <image src="@/static/images/login/phone-login-icon.png" />
       </view>
       <!-- 微信登录 -->
       <view v-if="wxLoginFlag" @click="toWeChatLogin" class="item">
-        <image src="/@/static/images/login/wx-login-icon.png" />
+        <image src="@/static/images/login/wx-login-icon.png" />
       </view>
       <!-- 苹果账号登录 -->
       <view v-if="iosFlag" @click="toAppleLogin" class="item apple">
-        <image src="/@/static/images/login/ios-login-icon.png" />
+        <image src="@/static/images/login/ios-login-icon.png" />
       </view>
     </view>
   </view>
@@ -98,6 +98,8 @@
 </script>
 <style lang="scss" scoped>
   .other-way-box {
+    flex-shrink: 0;
+    margin-top: 82rpx;
     display: flex;
     align-items: center;
     justify-content: center;

smart-app/src/pages/login/login.vue

@@ -3,12 +3,12 @@
     <view class="top-view">
       <view class="login"> 登录 </view>
       <view class="logo">
-        <image src="/@/static/images/login/login-logo.png" />
+        <image src="@/static/images/login/login-logo.png" />
       </view>
     </view>
     <view class="bottom-view">
       <view class="input-view smart-margin-top10">
-        <image src="/@/static/images/login/login-username.png"></image>
+        <image src="@/static/images/login/login-username.png"></image>
         <uni-easyinput
           class="input"
           placeholder="请输入用户名"
@@ -20,7 +20,7 @@
       </view>
 
       <view class="input-view smart-margin-top10">
-        <image src="/@/static/images/login/login-password.png"></image>
+        <image src="@/static/images/login/login-password.png"></image>
         <uni-easyinput
           class="input"
           placeholder="请输入密码"
@@ -33,16 +33,15 @@
       </view>
 
       <view class="input-view smart-margin-top10">
-        <image src="/@/static/images/login/login-password.png"></image>
+        <image src="@/static/images/login/login-password.png"></image>
         <uni-easyinput
-          class="input"
+          class="input captcha-input"
           placeholder="请输入验证码"
           :clearable="true"
           :password="false"
           placeholderStyle="color:#CCCCCC"
           border="none"
           v-model="loginForm.captchaCode"
-          style="width: 50%"
         />
         <img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha" />
       </view>
@@ -54,7 +53,7 @@
 
       <view @click="login" class="button login-btn smart-margin-top20"> 登录 </view>
       <view @click="login" class="button register-btn smart-margin-top20"> 创建账号 </view>
-      <OtherWayBox class="other-way-box" />
+      <OtherWayBox />
       <LoginCheckBox class="login-check-box" ref="loginCheckBoxRef" />
     </view>
   </view>
@@ -64,11 +63,11 @@
   import { onShow } from '@dcloudio/uni-app';
   import OtherWayBox from './components/other-way-box.vue';
   import LoginCheckBox from './components/login-check-box.vue';
-  import { loginApi } from '/@/api/system/login-api';
+  import { loginApi } from '@/api/system/login-api';
-  import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
+  import { LOGIN_DEVICE_ENUM } from '@/constants/system/login-device-const';
-  import { encryptData } from '/@/lib/encrypt';
+  import { encryptData } from '@/lib/encrypt';
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
 
   const loginForm = reactive({
     loginName: 'admin',
@@ -176,6 +175,7 @@
       .captcha-img {
         margin-left: 5px;
         height: 100rpx;
+        width: 40%;
       }
       image {
         margin-left: 30rpx;
@@ -186,6 +186,9 @@
         margin: 0 16rpx;
         background-color: $page-bg-color;
       }
+      .captcha-input {
+        width: 50%;
+      }
     }
     .code-login-view {
       margin: 50rpx 0 0;
@@ -273,7 +276,7 @@
       align-items: center;
       width: 100%;
       height: 720rpx;
-      background-image: url(/@/static/images/login/login-top-back.png);
+      background-image: url('~@/static/images/login/login-top-back.png');
       .login {
         font-weight: bold;
         margin-top: 70rpx;
@@ -285,11 +288,6 @@
     }
   }
 
-  .other-way-box {
-    flex-shrink: 0;
-    margin-top: 82rpx;
-  }
-
   .login-check-box {
     flex-shrink: 0;
     margin-top: 150rpx;

smart-app/src/pages/mine/components/mine-menu.vue

@@ -66,7 +66,7 @@
   </view>
 </template>
 <script setup>
-  import { SmartToast } from '/@/lib/smart-support';
+  import { SmartToast } from '@/lib/smart-support';
 
   const emits = defineEmits(['changeStyle']);
 

smart-app/src/pages/mine/components/mine-user-blue.vue

@@ -13,12 +13,12 @@
       <view class="user-phone">{{ departmentName }}</view>
     </view>
     <view class="vip-flag">
-      <image src="/@/static/images/mine/no-vip-flag.png" mode=""></image>
+      <image src="@/static/images/mine/no-vip-flag.png" mode=""></image>
     </view>
   </view>
 </template>
 <script setup>
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
   import { computed } from 'vue';
 
   const actualName = computed(() => {

smart-app/src/pages/mine/components/mine-user-white.vue

@@ -29,7 +29,7 @@
   </view>
 </template>
 <script setup>
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
   import { computed } from 'vue';
 
   const actualName = computed(() => {
@@ -107,7 +107,7 @@
   }
 
   .vip-card {
-    background-image: url('/@/static/images/mine/vip-bg.png');
+    background-image: url('~@/static/images/mine/vip-bg.png');
     height: 80rpx;
     background-repeat: no-repeat;
     width: 700rpx;

smart-app/src/pages/mine/mine.vue

@@ -18,9 +18,9 @@
   import MineUserBlue from './components/mine-user-blue.vue';
   import MineUserWhite from './components/mine-user-white.vue';
   import { ref } from 'vue';
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
 
   const userStore = useUserStore();
   const blueUserFlag = ref(true);

smart-app/src/pages/notice/components/notice-query-form-popup.vue

@@ -37,7 +37,7 @@
 
 <script setup>
   import { onMounted, reactive, ref, toRaw } from 'vue';
-  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { noticeApi } from '@/api/business/oa/notice-api';
   import _ from 'lodash';
 
   const emits = defineEmits(['close']);

smart-app/src/pages/notice/notice-detail.vue

@@ -19,9 +19,9 @@
 
 <script setup>
   import { reactive } from 'vue';
-  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { noticeApi } from '@/api/business/oa/notice-api';
   import { onLoad } from '@dcloudio/uni-app';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
 
   const noticeDetail = reactive({
     title: '',

smart-app/src/pages/notice/notice-index.vue

@@ -46,10 +46,10 @@
 <script setup>
   import { reactive, ref } from 'vue';
   import NoticeQueryFormPopUp from './components/notice-query-form-popup.vue';
-  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { noticeApi } from '@/api/business/oa/notice-api';
   import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import NoticeList from './components/notice-list.vue';
   import _ from 'lodash';
 

smart-app/src/pages/order-detail/order-detail.vue

@@ -11,7 +11,7 @@
 
 <script setup>
   import { ref } from 'vue';
-  import SmartDetailTabs from '/@/components/smart-detail-tabs/index.vue';
+  import SmartDetailTabs from '@/components/smart-detail-tabs/index.vue';
   import OrderDetailBaseInfo from './components/order-detail-base-info.vue';
   import DetailModelPath from './components/detail-model-path.vue';
   import OrderDetailSettle from './components/order-detail-settle.vue';

smart-app/src/pages/support/change-log/change-log-detail.vue

@@ -12,9 +12,9 @@
 
 <script setup>
   import { inject, reactive } from 'vue';
-  import { changeLogApi } from '/@/api/support/change-log-api';
+  import { changeLogApi } from '@/api/support/change-log-api';
   import { onLoad } from '@dcloudio/uni-app';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
 
   const smartEnumPlugin = inject('smartEnumPlugin');
 

smart-app/src/pages/support/change-log/change-log-list.vue

@@ -44,10 +44,10 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { changeLogApi } from '/@/api/support/change-log-api';
+  import { changeLogApi } from '@/api/support/change-log-api';
   import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import _ from 'lodash';
 
   // --------------------------- 查询 ---------------------------------

smart-app/src/pages/support/feedback/feedback-form.vue

@@ -31,14 +31,14 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
   import { onLoad, onReady } from '@dcloudio/uni-app';
-  import { fileApi } from '/@/api/support/file-api';
+  import { fileApi } from '@/api/support/file-api';
-  import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
+  import { FILE_FOLDER_TYPE_ENUM } from '@/constants/support/file-const';
   import _ from 'lodash';
-  import { feedbackApi } from '/@/api/support/feedback-api';
+  import { feedbackApi } from '@/api/support/feedback-api';
 
   // --------------------- 表单 ---------------------
 

smart-app/src/plugins/smart-enums-plugin.js

@@ -9,7 +9,7 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 import _ from 'lodash';
-import { FLAG_NUMBER_ENUM } from '/@/constants/common-const';
+import { FLAG_NUMBER_ENUM } from '@/constants/common-const';
 
 export default {
   install: (app, smartEnumWrapper) => {

smart-app/src/store/modules/system/app-config.js

@@ -8,10 +8,10 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 import { defineStore } from 'pinia';
-import { appDefaultConfig } from '/@/config/app-config';
+import { appDefaultConfig } from '@/config/app-config';
-import localStorageKeyConst from '/@/constants/local-storage-key-const';
+import localStorageKeyConst from '@/constants/local-storage-key-const';
-import { smartSentry } from '/@/lib/smart-sentry';
+import { smartSentry } from '@/lib/smart-sentry';
-import { localRead } from '/@/utils/local-util';
+import { localRead } from '@/utils/local-util';
 
 let state = { ...appDefaultConfig };
 

smart-app/src/store/modules/system/user.js

@@ -9,8 +9,8 @@
  */
 import _ from 'lodash';
 import { defineStore } from 'pinia';
-import { USER_TOKEN } from '/@/constants/local-storage-key-const';
+import { USER_TOKEN } from '@/constants/local-storage-key-const';
-import { loginApi } from '/@/api/system/login-api';
+import { loginApi } from '@/api/system/login-api';
 
 const defaultUserInfo = {
   //员工id