xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-08 11:43:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: xinyin025:v3.2.0
Branches Tags
xinyin025:master xinyin025:feature/1.x
xinyin025:v3.28.0 xinyin025:v3.27.0 xinyin025:v3.26.0 xinyin025:v3.25.0 xinyin025:v3.24.0 xinyin025:v3.23.0 xinyin025:v3.21 xinyin025:v3.19 xinyin025:v3.18 xinyin025:v3.15 xinyin025:v3.14 xinyin025:v3.13 xinyin025:v3.12 xinyin025:v3.11.0 xinyin025:v3.10.1 xinyin025:v3.10.0 xinyin025:v3.9.0 xinyin025:v3.7.0 xinyin025:v3.6.0 xinyin025:v3.5.0 xinyin025:v3.4.0 xinyin025:v3.3.0 xinyin025:v3.2.0 xinyin025:v3.1.0 xinyin025:v3.0.0 xinyin025:v3.0.1 xinyin025:v2.0.0 xinyin025:v1.12.0 xinyin025:v1.11.0 xinyin025:v1.10.0 xinyin025:v1.0.9 xinyin025:v1.0.8
...
compare: xinyin025:v3.4.0
Branches Tags
xinyin025:master xinyin025:feature/1.x
xinyin025:v3.28.0 xinyin025:v3.27.0 xinyin025:v3.26.0 xinyin025:v3.25.0 xinyin025:v3.24.0 xinyin025:v3.23.0 xinyin025:v3.21 xinyin025:v3.19 xinyin025:v3.18 xinyin025:v3.15 xinyin025:v3.14 xinyin025:v3.13 xinyin025:v3.12 xinyin025:v3.11.0 xinyin025:v3.10.1 xinyin025:v3.10.0 xinyin025:v3.9.0 xinyin025:v3.7.0 xinyin025:v3.6.0 xinyin025:v3.5.0 xinyin025:v3.4.0 xinyin025:v3.3.0 xinyin025:v3.2.0 xinyin025:v3.1.0 xinyin025:v3.0.0 xinyin025:v3.0.1 xinyin025:v2.0.0 xinyin025:v1.12.0 xinyin025:v1.11.0 xinyin025:v1.10.0 xinyin025:v1.0.9 xinyin025:v1.0.8

9 Commits
v3.2.0 ... v3.4.0

Author SHA1 Message Date
zhuoda
2b41357c8c 【v3.4.0】 1、【新增】页面全局圆角可配置化；2、【优化】首页心灵鸡汤语录；3、【优化】底部公司信息写法； 2024-05-05 20:43:05 +08:00
zhuoda
a4e0855f0a 【v3.4.0】 1、【新增】页面全局圆角可配置化；2、【优化】首页心灵鸡汤语录；3、【优化】底部公司信息写法； 2024-05-05 20:42:49 +08:00
卓大
babf575fc6 update README.md. 
Signed-off-by: 卓大 <zhuoluodada@qq.com>
 2024-04-28 14:25:00 +00:00
卓大
0a37427a84 update README.md. 
Signed-off-by: 卓大 <zhuoluodada@qq.com>
 2024-04-28 14:24:30 +00:00
zhuoda
9ad5a5a5b5 【v3.3.0】 1、uniapp 首页菜单功能区多平台适配;2、菜单组件路径说明;3、长时间不在线自动返回登录页;4、标签页 tab 为圆角;5、升级 sa token 到 1.37.0;6、代码生成表单弹窗 关闭事件;7、接口操作日志@OperateLogAspect 对文件的处理; 2024-04-28 21:59:11 +08:00
1024创新实验室
5075fc6030 !32 【轻量级 PR】：修改代码生成 form.vue.vm 模板中取消事件 
Merge pull request !32 from 大熊/master
 2024-04-28 13:06:26 +00:00
1024创新实验室
cfba870006 !30 update smart-admin-api/pom.xml. 
Merge pull request !30 from npc6/N/A
 2024-04-28 13:02:07 +00:00
Zhou Mingfa
9a991b2e27 修改代码生成 form.vue.vm 模板，drawer 类型的取消事件为 @close，modal 类型的取消事件为 @cancel 2024-04-25 16:08:59 +08:00
npc6
f97079ac1b update smart-admin-api/pom.xml. 
sa-token.version 升级到1.37.0

修复：修复路由拦截鉴权可被绕过的问题。 [漏洞修复]
重构：未登录时调用鉴权 API 抛出未登录异常而不再是无权限异常。
优化：优化 SaTokenDao 组件更换时的逻辑。
文档：提供 SpringBoot3.x 路由匹配出错的解决方案。

Signed-off-by: npc6 <jjwsoft@qq.com>
 2024-04-24 02:38:42 +00:00
60 changed files with 402 additions and 368 deletions
Expand all files Collapse all files

4
README.md
View File

@@ -35,6 +35,10 @@
<td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/code.png"/></td> <td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/code.png"/></td>
<td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/git-diff.png"/></td> <td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/git-diff.png"/></td>
</tr> </tr>
<tr>
<td><img src="https://img.smartadmin.1024lab.net/smart-app/app1.png"/></td>
<td><img src="https://img.smartadmin.1024lab.net/smart-app/app2.png"/></td>
</tr>
<tr> <tr>
<td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/front.png"/></td> <td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/front.png"/></td>
<td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/back.png"/></td> <td><img src="https://img.smartadmin.1024lab.net/smart-admin-v3/cut/back.png"/></td>

2
smart-admin-api/pom.xml
View File

@@ -47,7 +47,7 @@
<jjwt.version>0.9.1</jjwt.version> <jjwt.version>0.9.1</jjwt.version>
<jwks-rsa.version>0.9.0</jwks-rsa.version> <jwks-rsa.version>0.9.0</jwks-rsa.version>
<velocity-tools.version>3.1</velocity-tools.version> <velocity-tools.version>3.1</velocity-tools.version>
<sa-token.version>1.35.0.RC</sa-token.version> <sa-token.version>1.37.0</sa-token.version>
<ip2region.version>2.7.0</ip2region.version> <ip2region.version>2.7.0</ip2region.version>
<bcprov.version>1.59</bcprov.version> <bcprov.version>1.59</bcprov.version>
<jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version> <jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version>

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

@@ -159,8 +159,8 @@ public class LoginService implements StpInterface {
// 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid // 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid
String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId(); 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 { } else {

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

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

380
smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
View File

@@ -6,230 +6,234 @@
* @Copyright ${basic.copyright} * @Copyright ${basic.copyright}
--> -->
<template> <template>
<a-$!{insertAndUpdate.pageType} <a-$!{insertAndUpdate.pageType}
:title="form.$!{primaryKeyFieldName} ? '编辑' : '添加'" :title="form.$!{primaryKeyFieldName} ? '编辑' : '添加'"
width="$!{insertAndUpdate.width}" width="$!{insertAndUpdate.width}"
:open="visibleFlag" :open="visibleFlag"
#if($!{insertAndUpdate.pageType} == 'drawer')
@close="onClose"
#else
@cancel="onClose" @cancel="onClose"
#end
:maskClosable="false" :maskClosable="false"
:destroyOnClose="true" :destroyOnClose="true"
> >
<a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" > <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
#if($insertAndUpdate.countPerLine == 1) #if($insertAndUpdate.countPerLine == 1)
<a-row> <a-row>
#foreach ($field in $formFields) #foreach ($field in $formFields)
#if($field.frontComponent == "Input") #if($field.frontComponent == "Input")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "InputNumber") #if($field.frontComponent == "InputNumber")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Textarea") #if($field.frontComponent == "Textarea")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "BooleanSelect") #if($field.frontComponent == "BooleanSelect")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" /> <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "SmartEnumSelect") #if($field.frontComponent == "SmartEnumSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}"> <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/> <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "DictSelect") #if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}"> <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/> <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Date") #if($field.frontComponent == "Date")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/> <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "DateTime") #if($field.frontComponent == "DateTime")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" /> <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Upload") #if($field.frontComponent == "Upload")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload <FileUpload
:defaultFileList="form.$!{field.fieldName}" :defaultFileList="form.$!{field.fieldName}"
:folder="FILE_FOLDER_TYPE_ENUM.COMMON.value" :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
buttonText="上传 $!{field.label}" buttonText="上传 $!{field.label}"
listType="text" listType="text"
@change="e => form.$!{field.fieldName} = e" @change="e => form.$!{field.fieldName} = e"
/> />
</a-form-item> </a-form-item>
#end #end
#end #end
</a-row> </a-row>
#end #end
#if($insertAndUpdate.countPerLine > 1) #if($insertAndUpdate.countPerLine > 1)
<a-row> <a-row>
#set($span=24 / $!insertAndUpdate.countPerLine ) #set($span=24 / $!insertAndUpdate.countPerLine )
#foreach ($field in $formFields) #foreach ($field in $formFields)
<a-col :span="$!{span}"> <a-col :span="$!{span}">
#if($field.frontComponent == "Input") #if($field.frontComponent == "Input")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "InputNumber") #if($field.frontComponent == "InputNumber")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Textarea") #if($field.frontComponent == "Textarea")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" /> <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "BooleanSelect") #if($field.frontComponent == "BooleanSelect")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" /> <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "SmartEnumSelect") #if($field.frontComponent == "SmartEnumSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}"> <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/> <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "DictSelect") #if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}"> <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/> <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Date") #if($field.frontComponent == "Date")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/> <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "DateTime") #if($field.frontComponent == "DateTime")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" /> <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item> </a-form-item>
#end #end
#if($field.frontComponent == "Upload") #if($field.frontComponent == "Upload")
<a-form-item label="$!{field.label}" name="${field.fieldName}"> <a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload <FileUpload
:defaultFileList="form.$!{field.fieldName}" :defaultFileList="form.$!{field.fieldName}"
:folder="FILE_FOLDER_TYPE_ENUM.COMMON.value" :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
buttonText="上传 $!{field.label}" buttonText="上传 $!{field.label}"
listType="text" listType="text"
@change="e => form.$!{field.fieldName} = e" @change="e => form.$!{field.fieldName} = e"
/> />
</a-form-item> </a-form-item>
#end #end
</a-col> </a-col>
#end #end
</a-row> </a-row>
#end #end
</a-form> </a-form>
<template #footer> <template #footer>
<a-space> <a-space>
<a-button @click="onClose">取消</a-button> <a-button @click="onClose">取消</a-button>
<a-button type="primary" @click="onSubmit">保存</a-button> <a-button type="primary" @click="onSubmit">保存</a-button>
</a-space> </a-space>
</template> </template>
</a-$!{insertAndUpdate.pageType}> </a-$!{insertAndUpdate.pageType}>
</template> </template>
<script setup> <script setup>
import { reactive, ref, nextTick } from 'vue'; import { reactive, ref, nextTick } from 'vue';
import _ from 'lodash'; import _ from 'lodash';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { SmartLoading } from '/@/components/framework/smart-loading'; import { SmartLoading } from '/@/components/framework/smart-loading';
import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api'; import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api';
import { smartSentry } from '/@/lib/smart-sentry'; import { smartSentry } from '/@/lib/smart-sentry';
#foreach ($import in $frontImportList) #foreach ($import in $frontImportList)
$!{import} $!{import}
#end #end
// ------------------------ 事件 ------------------------ // ------------------------ 事件 ------------------------
const emits = defineEmits(['reloadList']); const emits = defineEmits(['reloadList']);
// ------------------------ 显示与隐藏 ------------------------ // ------------------------ 显示与隐藏 ------------------------
// 是否显示 // 是否显示
const visibleFlag = ref(false); const visibleFlag = ref(false);
function show(rowData) { function show(rowData) {
Object.assign(form, formDefault); Object.assign(form, formDefault);
if (rowData && !_.isEmpty(rowData)) { if (rowData && !_.isEmpty(rowData)) {
Object.assign(form, rowData); Object.assign(form, rowData);
}
visibleFlag.value = true;
nextTick(() => {
formRef.value.clearValidate();
});
} }
visibleFlag.value = true;
function onClose() { nextTick(() => {
Object.assign(form, formDefault); formRef.value.clearValidate();
visibleFlag.value = false;
}
// ------------------------ 表单 ------------------------
// 组件ref
const formRef = ref();
const formDefault = {
$!{primaryKeyFieldName}: undefined,
#foreach ($field in $formFields)
$!{field.fieldName}: undefined, //$!{field.label}
#end
};
let form = reactive({ ...formDefault });
const rules = {
#foreach ($field in $formFields)
#if($field.requiredFlag)
$!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
#end
#end
};
// 点击确定，验证表单
async function onSubmit() {
try {
await formRef.value.validateFields();
save();
} catch (err) {
message.error('参数验证错误，请仔细填写表单数据!');
}
}
// 新建、编辑API
async function save() {
SmartLoading.show();
try {
if (form.$!{primaryKeyFieldName}) {
await $!{name.lowerCamel}Api.update(form);
} else {
await $!{name.lowerCamel}Api.add(form);
}
message.success('操作成功');
emits('reloadList');
onClose();
} catch (err) {
smartSentry.captureError(err);
} finally {
SmartLoading.hide();
}
}
defineExpose({
show,
}); });
}
function onClose() {
Object.assign(form, formDefault);
visibleFlag.value = false;
}
// ------------------------ 表单 ------------------------
// 组件ref
const formRef = ref();
const formDefault = {
$!{primaryKeyFieldName}: undefined,
#foreach ($field in $formFields)
$!{field.fieldName}: undefined, //$!{field.label}
#end
};
let form = reactive({ ...formDefault });
const rules = {
#foreach ($field in $formFields)
#if($field.requiredFlag)
$!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
#end
#end
};
// 点击确定，验证表单
async function onSubmit() {
try {
await formRef.value.validateFields();
save();
} catch (err) {
message.error('参数验证错误，请仔细填写表单数据!');
}
}
// 新建、编辑API
async function save() {
SmartLoading.show();
try {
if (form.$!{primaryKeyFieldName}) {
await $!{name.lowerCamel}Api.update(form);
} else {
await $!{name.lowerCamel}Api.add(form);
}
message.success('操作成功');
emits('reloadList');
onClose();
} catch (err) {
smartSentry.captureError(err);
} finally {
SmartLoading.hide();
}
}
defineExpose({
show,
});
</script> </script>

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

@@ -3,7 +3,7 @@ spring:
datasource: 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 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 username: root
password: Zhuoda#1024lab password: Zhuoda1024lab
initial-size: 10 initial-size: 10
min-idle: 10 min-idle: 10
max-active: 100 max-active: 100

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

@@ -3,7 +3,7 @@ spring:
datasource: 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 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 username: root
password: Java@1024 password: Zhuoda1024lab
initial-size: 2 initial-size: 2
min-idle: 2 min-idle: 2
max-active: 10 max-active: 10

17
smart-admin-web/javascript-ant-design-vue3/src/App.vue
View File

@@ -1,11 +1,11 @@
<!-- <!--
* 主应用页面 * 主应用页面
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-12 23:46:47 * @Date: 2022-09-12 23:46:47
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
@@ -19,6 +19,7 @@
colorLinkActive: themeColors[colorIndex].activeColor, colorLinkActive: themeColors[colorIndex].activeColor,
colorLinkHover: themeColors[colorIndex].hoverColor, colorLinkHover: themeColors[colorIndex].hoverColor,
colorIcon: themeColors[colorIndex].primaryColor, colorIcon: themeColors[colorIndex].primaryColor,
borderRadius: borderRadius,
}, },
components: { components: {
Button: { Button: {
@@ -62,4 +63,8 @@
const colorIndex = computed(() => { const colorIndex = computed(() => {
return useAppConfigStore().colorIndex; return useAppConfigStore().colorIndex;
}); });
// 圆角
const borderRadius = computed(() => {
return useAppConfigStore().borderRadius;
});
</script> </script>

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

@@ -1,11 +1,11 @@
<!--- <!---
* 字段 下拉选择框 * 字段 下拉选择框
* *
* @Author: 1024创新实验室：罗伊 * @Author: 1024创新实验室：罗伊
* @Date: 2022-09-12 22:06:45 * @Date: 2022-09-12 22:06:45
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
* *
--> -->
<template> <template>
@@ -108,7 +108,7 @@
emit('update:value', valueList); emit('update:value', valueList);
emit('change', valueList); emit('change', valueList);
} else { } 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('update:value', findValue.valueCode);
emit('change', findValue.valueCode); emit('change', findValue.valueCode);
} }

2
smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js
View File

@@ -20,6 +20,8 @@ export const appDefaultConfig = {
colorIndex: 0, colorIndex: 0,
// 顶部菜单页面宽度 // 顶部菜单页面宽度
pageWidth: '99%', pageWidth: '99%',
// 圆角
borderRadius: 6,
// 标签页 // 标签页
pageTagFlag: true, pageTagFlag: true,
// 面包屑 // 面包屑

1
smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js
View File

@@ -19,6 +19,7 @@ export default {
'setting.menu.width': 'Menu Width', 'setting.menu.width': 'Menu Width',
'setting.menu.theme': 'Menu Theme', 'setting.menu.theme': 'Menu Theme',
'setting.page.width': 'Page Width', 'setting.page.width': 'Page Width',
'setting.border.radius': 'Border Radius',
'setting.compact': 'Page Compact', 'setting.compact': 'Page Compact',
'setting.bread': 'Show Bread', 'setting.bread': 'Show Bread',
'setting.pagetag': 'Show PageTag', 'setting.pagetag': 'Show PageTag',

1
smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js
View File

@@ -19,6 +19,7 @@ export default {
'setting.menu.width': '菜单宽度', 'setting.menu.width': '菜单宽度',
'setting.menu.theme': '菜单主题', 'setting.menu.theme': '菜单主题',
'setting.compact': '页面紧凑', 'setting.compact': '页面紧凑',
'setting.border.radius': '页面圆角',
'setting.page.width': '页面宽度', 'setting.page.width': '页面宽度',
'setting.bread': '面包屑', 'setting.bread': '面包屑',
'setting.pagetag': '标签页', 'setting.pagetag': '标签页',

22
smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
View File

@@ -1,11 +1,11 @@
<!-- <!--
* 设置模块 * 设置模块
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-06 20:18:20 * @Date: 2022-09-06 20:18:20
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
@@ -35,6 +35,9 @@
</template> </template>
</div> </div>
</a-form-item> </a-form-item>
<a-form-item :label="$t('setting.border.radius')">
<a-slider v-model:value="formState.borderRadius" :min="0" :max="6" @change="changeBorderRadius" />
</a-form-item>
<a-form-item :label="$t('setting.compact')"> <a-form-item :label="$t('setting.compact')">
<a-radio-group v-model:value="formState.compactFlag" button-style="solid" @change="changeCompactFlag"> <a-radio-group v-model:value="formState.compactFlag" button-style="solid" @change="changeCompactFlag">
<a-radio-button :value="false">默认</a-radio-button> <a-radio-button :value="false">默认</a-radio-button>
@@ -169,6 +172,8 @@
sideMenuTheme: appConfigStore.sideMenuTheme, sideMenuTheme: appConfigStore.sideMenuTheme,
// 页面紧凑 // 页面紧凑
compactFlag: appConfigStore.compactFlag, compactFlag: appConfigStore.compactFlag,
// 页面圆角
borderRadius: appConfigStore.borderRadius,
// 标签页 // 标签页
pageTagFlag: appConfigStore.pageTagFlag, pageTagFlag: appConfigStore.pageTagFlag,
// 面包屑 // 面包屑
@@ -227,6 +232,11 @@
compactFlag: e.target.value, compactFlag: e.target.value,
}); });
} }
function changeBorderRadius(e) {
appConfigStore.$patch({
borderRadius: e,
});
}
function changeBreadCrumbFlag(e) { function changeBreadCrumbFlag(e) {
appConfigStore.$patch({ appConfigStore.$patch({

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

@@ -1,11 +1,11 @@
<!-- <!--
* 标签页 * 标签页
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-06 20:29:12 * @Date: 2022-09-06 20:29:12
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<!-- 标签页，共两部分：1、标签 ；2、标签操作区 --> <!-- 标签页，共两部分：1、标签 ；2、标签操作区 -->
@@ -130,6 +130,9 @@
const { useToken } = theme; const { useToken } = theme;
const { token } = useToken(); const { token } = useToken();
const borderRadius = computed(() => {
return token.value.borderRadius + 'px';
});
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@@ -199,6 +202,7 @@
:deep(.ant-tabs-small > .ant-tabs-nav .ant-tabs-tab) { :deep(.ant-tabs-small > .ant-tabs-nav .ant-tabs-tab) {
padding: 5px 8px 3px 10px; padding: 5px 8px 3px 10px;
border-radius: v-bind(borderRadius);
} }
:deep(.ant-tabs-tab-active) { :deep(.ant-tabs-tab-active) {

14
smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
View File

@@ -1,18 +1,18 @@
<!-- <!--
* 第一列菜单 * 第一列菜单
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-06 20:29:12 * @Date: 2022-09-06 20:29:12
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<div class="top-menu-container"> <div class="top-menu-container">
<!-- 顶部logo区域 --> <!-- 顶部logo区域 -->
<div class="logo" @click="onGoHome"> <div class="logo" @click="onGoHome">
<img class="logo-img" :src="logoImg" /> <img class="logo-img" :src="logoImg" />
<div class="title">{{ websiteName }}</div> <div class="title smart-logo">{{ websiteName }}</div>
</div> </div>
<!-- 一级菜单展示 --> <!-- 一级菜单展示 -->
<a-menu :selectedKeys="selectedKeys" mode="inline" :theme="theme"> <a-menu :selectedKeys="selectedKeys" mode="inline" :theme="theme">

4
smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
View File

@@ -13,8 +13,8 @@
<!-- 1、顶部logo区域 --> <!-- 1、顶部logo区域 -->
<div class="logo" @click="onGoHome" :style="sideMenuWidth" v-if="!collapsed"> <div class="logo" @click="onGoHome" :style="sideMenuWidth" v-if="!collapsed">
<img class="logo-img" :src="logoImg" /> <img class="logo-img" :src="logoImg" />
<div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div> <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
<div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div> <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
</div> </div>
<div class="min-logo" @click="onGoHome" v-if="collapsed"> <div class="min-logo" @click="onGoHome" v-if="collapsed">
<img class="logo-img" :src="logoImg" /> <img class="logo-img" :src="logoImg" />

15
smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
View File

@@ -1,15 +1,16 @@
<!-- <!--
* 底部：版权、公司等信息 * 底部：版权、公司等信息
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-06 20:29:12 * @Date: 2022-09-06 20:29:12
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<div class="version"> <div class="version">
<a target="_blank" href="javascript:void(0)"> SmartAdmin V3.x @copyright 河南·洛阳【1024创新实验室】 Since 2012-{{ currentYear }} </a> <a target="_blank" class="smart-copyright" href="https://www.1024lab.net"> ©2012-{{ currentYear }} 河南·洛阳「1024创新实验室」 SmartAdmin </a>
<a target="_blank" class="smart-version" href="https://smartadmin.vip/views/other/change-log.html"> V3.4.0 </a>
</div> </div>
</template> </template>
<script setup> <script setup>

16
smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
View File

@@ -1,11 +1,11 @@
<!-- <!--
* 顶部菜单 * 顶部菜单
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-06 20:29:12 * @Date: 2022-09-06 20:29:12
* @Wechat: zhuda1024 * @Wechat: zhuda1024
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<!--总共3部分：1、logo区域，包含 logo和名称; 2、菜单区域 ;3、用户操作区域--> <!--总共3部分：1、logo区域，包含 logo和名称; 2、菜单区域 ;3、用户操作区域-->
@@ -13,8 +13,8 @@
<!-- 1、logo区域 --> <!-- 1、logo区域 -->
<div class="logo" @click="onGoHome"> <div class="logo" @click="onGoHome">
<img class="logo-img" :src="logoImg" /> <img class="logo-img" :src="logoImg" />
<div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div> <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
<div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div> <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
</div> </div>
<!-- 2、菜单区域 --> <!-- 2、菜单区域 -->
<RecursionMenu ref="menuRef" /> <RecursionMenu ref="menuRef" />

19
smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js
View File

@@ -1,12 +1,11 @@
export default [ export default [
'每个人的一生好比一根蜡烛，看似不经意间散发的光和热，都可能照亮和温暖他人。这是生活赋予我们的智慧，也让我们在寻常的日子成为一个温暖善良的人。', '梦想不会自动成真，奋斗是其桥梁；目标不会自动抵达，奔跑才有远方!',
'立规矩的目的，不是禁锢、限制，而是教育；孩子犯了错，父母不能帮孩子逃避，而应该让孩子学会承担责任。让孩子有面对错误的诚实和勇气，这才是立规矩的意义所在。', '成长是一场和自己的比赛，不要担心别人会做得比你好，只要你每天都比前一天做得好!',
'人这一辈子，格局大了、善良有了，成功自然也就近了。格局越大，人生越宽。你的人生会是什么样，与你在为人处世时的表现有很大关系。世间美好都是环环相扣的，善良的人总不会被亏待。', '最慢的步伐不是跬步，而是徘徊；最快的脚步不是冲刺，而是坚持!',
'平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。', '平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。',
'家，不在于奢华，而在于温馨；家，不在于大小，而在于珍惜。在家里，有父母的呵护，有爱人的陪伴，有子女的欢笑。一家人整整齐齐、和和睦睦，就是人生最大的幸福！', '历尽天华成此景，人间万事出艰辛。志不求易者成，事不避难者进!',
'每一个不向命运低头、努力生活的人，都值得被尊重。', '每一个不向命运低头、努力生活的人，都值得被尊重。',
'青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。', '青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。',
'人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。', '人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。',
'如果你真的在乎一个人，首先要学会的就是感恩对方的好。这样，对方才会在和你的相处中找到价值感，相处起来也会更加舒适愉悦。', '没有理所当然的成功，也没有毫无道理的平庸。值得拥有的东西，永远都来之不易。所以在徘徊迷茫时，不要质疑你的付出，这些累积都会变成一种沉淀，默默为你铺路!',
'一个人只有心里装得下别人，有换位思考的品质，有为他人谋幸福的信念，才能真正做到慷慨施予。同样，也只有赠人玫瑰而无所求时，你才会手有余香、真有所得。',
]; ];

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

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

2
smart-admin-web/typescript-ant-design-vue3/README.md Normal file
View File

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

2
smart-app/.env.development
View File

@@ -1,3 +1,3 @@
NODE_ENV=development NODE_ENV=development
VITE_APP_TITLE='SmartAdmin 开发环境(Dev)' 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'

2
smart-app/src/App.vue
View File

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

2
smart-app/src/api/business/goods/goods-api.js
View File

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

2
smart-app/src/api/business/oa/enterprise-api.js
View File

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

2
smart-app/src/api/business/oa/notice-api.js
View File

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

2
smart-app/src/api/support/change-log-api.js
View File

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

2
smart-app/src/api/support/dict-api.js
View File

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

2
smart-app/src/api/support/file-api.js
View File

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

2
smart-app/src/api/system/login-api.js
View File

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

2
smart-app/src/components/dict-select/index.vue
View File

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

6
smart-app/src/lib/smart-request.js
View File

@@ -7,10 +7,10 @@
* @Email: lab1024@163.com * @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @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 { 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; const baseUrl = import.meta.env.VITE_APP_API_URL;

4
smart-app/src/main.js
View File

@@ -6,8 +6,8 @@ import { store } from './store/index';
import './theme/index.scss'; 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'; import lodash from 'lodash';
export function createApp() { export function createApp() {

4
smart-app/src/manifest.json
View File

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

8
smart-app/src/pages/enterprise/enterprise-detail.vue
View File

@@ -83,12 +83,12 @@
</template> </template>
<script setup> <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 { 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 { 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 ----------------------- // ----------------------- tab -----------------------

10
smart-app/src/pages/enterprise/enterprise-form.vue
View File

@@ -48,11 +48,11 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; 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'; import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
// --------------------- 表单 --------------------- // --------------------- 表单 ---------------------

4
smart-app/src/pages/enterprise/enterprise-list.vue
View File

@@ -55,10 +55,10 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; 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 { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll'; import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
import { smartSentry } from '/@/lib/smart-sentry'; import { smartSentry } from '@/lib/smart-sentry';
import _ from 'lodash'; import _ from 'lodash';
// --------------------------- 查询 --------------------------------- // --------------------------- 查询 ---------------------------------

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

@@ -30,8 +30,8 @@
<script setup> <script setup>
import { reactive, ref, toRaw } from 'vue'; 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']); const emits = defineEmits(['close']);
defineExpose({ show }); defineExpose({ show });

4
smart-app/src/pages/goods/goods-index.vue
View File

@@ -46,10 +46,10 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import QueryFormPopUp from './components/goods-query-form-popup.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 { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll'; 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 NoticeList from './components/goods-list.vue';
import _ from 'lodash'; import _ from 'lodash';

4
smart-app/src/pages/home/components/goods.vue
View File

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

44
smart-app/src/pages/home/components/menu.vue
View File

@@ -2,67 +2,67 @@
<view class="menu-container"> <view class="menu-container">
<uni-grid :column="5" :highlight="true" :show-border="false" customStyle="display: block;"> <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"> <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 class="item-text"> 首页切换 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 通知公告 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 客户线索 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 品质商品 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 版本更新 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 复杂表单 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 复杂详情 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 列表样式1 </view>
</view> </view>
</uni-grid-item> </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')"> <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 class="item-text"> 列表样式2 </view>
</view> </view>
</uni-grid-item> </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"> <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 class="item-text"> 接口加密 </view>
</view> </view>
</uni-grid-item> </uni-grid-item>
@@ -71,7 +71,7 @@
</template> </template>
<script setup> <script setup>
import { SmartToast } from '/@/lib/smart-support'; import { SmartToast } from '@/lib/smart-support';
const emit = defineEmits(['changeHome']); const emit = defineEmits(['changeHome']);
function changeHome() { function changeHome() {
@@ -101,7 +101,7 @@
margin-top: 20rpx; margin-top: 20rpx;
} }
} }
//height: 340rpx; height: 340rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 16rpx; border-radius: 16rpx;
width: 700rpx; width: 700rpx;

4
smart-app/src/pages/home/components/notice.vue
View File

@@ -11,8 +11,8 @@
<script setup> <script setup>
import { ref } from 'vue'; 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'; import { onShow } from '@dcloudio/uni-app';
const queryForm = { const queryForm = {

4
smart-app/src/pages/home/index.vue
View File

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

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

@@ -12,8 +12,8 @@
</view> </view>
</template> </template>
<script setup> <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'; import { ref } from 'vue';

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

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

34
smart-app/src/pages/login/login.vue
View File

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

2
smart-app/src/pages/mine/components/mine-menu.vue
View File

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

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

@@ -13,12 +13,12 @@
<view class="user-phone">{{ departmentName }}</view> <view class="user-phone">{{ departmentName }}</view>
</view> </view>
<view class="vip-flag"> <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>
</view> </view>
</template> </template>
<script setup> <script setup>
import { useUserStore } from '/@/store/modules/system/user'; import { useUserStore } from '@/store/modules/system/user';
import { computed } from 'vue'; import { computed } from 'vue';
const actualName = computed(() => { const actualName = computed(() => {

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

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

6
smart-app/src/pages/mine/mine.vue
View File

@@ -18,9 +18,9 @@
import MineUserBlue from './components/mine-user-blue.vue'; import MineUserBlue from './components/mine-user-blue.vue';
import MineUserWhite from './components/mine-user-white.vue'; import MineUserWhite from './components/mine-user-white.vue';
import { ref } from '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 userStore = useUserStore();
const blueUserFlag = ref(true); const blueUserFlag = ref(true);

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

@@ -37,7 +37,7 @@
<script setup> <script setup>
import { onMounted, reactive, ref, toRaw } from 'vue'; 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'; import _ from 'lodash';
const emits = defineEmits(['close']); const emits = defineEmits(['close']);

4
smart-app/src/pages/notice/notice-detail.vue
View File

@@ -19,9 +19,9 @@
<script setup> <script setup>
import { reactive } from 'vue'; 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 { onLoad } from '@dcloudio/uni-app';
import { smartSentry } from '/@/lib/smart-sentry'; import { smartSentry } from '@/lib/smart-sentry';
const noticeDetail = reactive({ const noticeDetail = reactive({
title: '', title: '',

4
smart-app/src/pages/notice/notice-index.vue
View File

@@ -46,10 +46,10 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import NoticeQueryFormPopUp from './components/notice-query-form-popup.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 { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll'; 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 NoticeList from './components/notice-list.vue';
import _ from 'lodash'; import _ from 'lodash';

2
smart-app/src/pages/order-detail/order-detail.vue
View File

@@ -11,7 +11,7 @@
<script setup> <script setup>
import { ref } from 'vue'; 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 OrderDetailBaseInfo from './components/order-detail-base-info.vue';
import DetailModelPath from './components/detail-model-path.vue'; import DetailModelPath from './components/detail-model-path.vue';
import OrderDetailSettle from './components/order-detail-settle.vue'; import OrderDetailSettle from './components/order-detail-settle.vue';

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

@@ -12,9 +12,9 @@
<script setup> <script setup>
import { inject, reactive } from 'vue'; 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 { onLoad } from '@dcloudio/uni-app';
import { smartSentry } from '/@/lib/smart-sentry'; import { smartSentry } from '@/lib/smart-sentry';
const smartEnumPlugin = inject('smartEnumPlugin'); const smartEnumPlugin = inject('smartEnumPlugin');

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

@@ -44,10 +44,10 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; 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 { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll'; import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
import { smartSentry } from '/@/lib/smart-sentry'; import { smartSentry } from '@/lib/smart-sentry';
import _ from 'lodash'; import _ from 'lodash';
// --------------------------- 查询 --------------------------------- // --------------------------- 查询 ---------------------------------

12
smart-app/src/pages/support/feedback/feedback-form.vue
View File

@@ -31,14 +31,14 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; 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 { 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 _ from 'lodash';
import { feedbackApi } from '/@/api/support/feedback-api'; import { feedbackApi } from '@/api/support/feedback-api';
// --------------------- 表单 --------------------- // --------------------- 表单 ---------------------

2
smart-app/src/plugins/smart-enums-plugin.js
View File

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

8
smart-app/src/store/modules/system/app-config.js
View File

@@ -8,10 +8,10 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
*/ */
import { defineStore } from 'pinia'; 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 }; let state = { ...appDefaultConfig };

4
smart-app/src/store/modules/system/user.js
View File

@@ -9,8 +9,8 @@
*/ */
import _ from 'lodash'; import _ from 'lodash';
import { defineStore } from 'pinia'; 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 = { const defaultUserInfo = {
//员工id //员工id