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

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

Browse Source
This commit is contained in:
zhuoda
2024-04-28 21:59:11 +08:00
parent 5075fc6030
commit 9ad5a5a5b5
48 changed files with 326 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 { SmartLoading, SmartToast } from '/@/lib/smart-support';
import { smartSentry } from '@/lib/smart-sentry';
import { SmartLoading, SmartToast } from '@/lib/smart-support';
// ----------------------- tab -----------------------

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

@@ -48,11 +48,11 @@
<script setup>
import { reactive, ref } from 'vue';
import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
import { regular } from '/@/constants/regular-const';
import SmartEnumRadio from '/@/components/smart-enum-radio/index.vue';
import { smartSentry } from '/@/lib/smart-sentry';
import { SmartLoading, SmartToast } from '/@/lib/smart-support';
import { enterpriseApi } from '@/api/business/oa/enterprise-api';
import { regular } from '@/constants/regular-const';
import SmartEnumRadio from '@/components/smart-enum-radio/index.vue';
import { smartSentry } from '@/lib/smart-sentry';
import { SmartLoading, SmartToast } from '@/lib/smart-support';
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>
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';
// --------------------------- 查询 ---------------------------------

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

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

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

@@ -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';

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

@@ -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,

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

@@ -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;

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

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

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

@@ -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>

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

@@ -12,8 +12,8 @@
</view>
</template>
<script setup>
import checkOutImg from '/@/static/images/login/check-out.png';
import checkInImg from '/@/static/images/login/check-in.png';
import checkOutImg from '/static/images/login/check-out.png';
import checkInImg from '/static/images/login/check-in.png';
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 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;

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

@@ -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 { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
import { encryptData } from '/@/lib/encrypt';
import { useUserStore } from '/@/store/modules/system/user';
import { smartSentry } from '/@/lib/smart-sentry';
import { loginApi } from '@/api/system/login-api';
import { LOGIN_DEVICE_ENUM } from '@/constants/system/login-device-const';
import { encryptData } from '@/lib/encrypt';
import { useUserStore } from '@/store/modules/system/user';
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;

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

@@ -66,7 +66,7 @@
</view>
</template>
<script setup>
import { SmartToast } from '/@/lib/smart-support';
import { SmartToast } from '@/lib/smart-support';
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>
<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(() => {

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

@@ -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;

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

@@ -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 { SmartLoading, SmartToast } from '/@/lib/smart-support';
import { smartSentry } from '/@/lib/smart-sentry';
import { useUserStore } from '@/store/modules/system/user';
import { SmartLoading, SmartToast } from '@/lib/smart-support';
import { smartSentry } from '@/lib/smart-sentry';
const userStore = useUserStore();
const blueUserFlag = ref(true);

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

@@ -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']);

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

@@ -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: '',

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

@@ -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';

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

@@ -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';

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

@@ -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');

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

@@ -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';
// --------------------------- 查询 ---------------------------------

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

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