From 09ce6fbb11c4b956c7154ee1715c264971c719d1 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 9 May 2025 09:42:19 +0800 Subject: [PATCH] 1 --- env/.env.development | 2 +- pages.config.ts | 104 +-- src/App.vue | 18 +- src/api/system/department.ts | 27 + src/api/system/index.ts | 22 +- src/api/system/user.ts | 29 + src/api/user/index.ts | 0 src/common/constants.ts | 2 +- src/common/work.ts | 135 ---- src/pages-user/userEdit/components/avatar.vue | 229 +++--- src/pages-user/userEdit/userEdit.vue | 326 ++++----- src/pages.json | 22 +- src/pages/demo/demo.vue | 12 +- src/pages/index/index.vue | 659 +++++++++--------- src/pages/login/login.vue | 94 +-- src/pages/more/more.vue | 4 +- src/pages/user/people.vue | 599 ++++++++-------- src/static/app/icons/1024x1024.png | Bin 35110 -> 0 bytes src/static/app/icons/120x120.png | Bin 2879 -> 0 bytes src/static/app/icons/144x144.png | Bin 3551 -> 0 bytes src/static/app/icons/152x152.png | Bin 3780 -> 0 bytes src/static/app/icons/167x167.png | Bin 4165 -> 0 bytes src/static/app/icons/180x180.png | Bin 4543 -> 0 bytes src/static/app/icons/192x192.png | Bin 4838 -> 0 bytes src/static/app/icons/20x20.png | Bin 527 -> 0 bytes src/static/app/icons/29x29.png | Bin 689 -> 0 bytes src/static/app/icons/40x40.png | Bin 971 -> 0 bytes src/static/app/icons/58x58.png | Bin 1387 -> 0 bytes src/static/app/icons/60x60.png | Bin 1434 -> 0 bytes src/static/app/icons/72x72.png | Bin 1691 -> 0 bytes src/static/app/icons/76x76.png | Bin 1753 -> 0 bytes src/static/app/icons/80x80.png | Bin 1841 -> 0 bytes src/static/app/icons/87x87.png | Bin 2036 -> 0 bytes src/static/app/icons/96x96.png | Bin 2294 -> 0 bytes src/static/index/128/qingjia.png | Bin 3301 -> 0 bytes .../{128/chuchai.png => index/absence.png} | Bin .../qingjia1.png => index/absenceData.png} | Bin src/static/index/index/calendar.png | Bin 0 -> 1232 bytes .../{128/gongwen.png => index/document.png} | Bin src/static/index/{128 => index}/duanxin.png | Bin .../index/{128/richang.png => index/duty.png} | Bin .../{128/hetong.png => index/health.png} | Bin .../{128/kehu.png => index/healthData.png} | Bin src/static/index/{128 => index}/kaoqin.png | Bin .../{128/tongxun.png => index/manual.png} | Bin src/static/index/{128 => index}/more.png | Bin .../{128/xinwen.png => index/notice.png} | Bin .../{128/huiyi.png => index/peopleData.png} | Bin src/static/index/index/position.png | Bin 0 -> 1862 bytes .../liucheng.png => index/regulation.png} | Bin src/static/index/{128 => index}/renwu.png | Bin src/static/index/{128 => index}/richeng.png | Bin .../{128/wendang.png => index/system.png} | Bin src/static/index/{128 => index}/tongzhi.png | Bin src/static/index/{128 => index}/toupiao.png | Bin src/static/index/{128 => index}/youjian.png | Bin src/static/index/{128 => index}/zhoubao.png | Bin src/static/navbg.png | Bin 0 -> 1888424 bytes src/store/index.ts | 26 +- src/store/user.ts | 94 +-- src/style/custom/icon.css | 10 + src/types/uni-pages.d.ts | 6 +- src/typings.d.ts | 63 +- src/utils/index.ts | 116 ++- src/utils/signMd5Utils.ts | 2 +- tsconfig.json | 3 +- 66 files changed, 1290 insertions(+), 1314 deletions(-) create mode 100644 src/api/system/department.ts create mode 100644 src/api/system/user.ts delete mode 100644 src/api/user/index.ts delete mode 100644 src/common/work.ts delete mode 100644 src/static/app/icons/1024x1024.png delete mode 100644 src/static/app/icons/120x120.png delete mode 100644 src/static/app/icons/144x144.png delete mode 100644 src/static/app/icons/152x152.png delete mode 100644 src/static/app/icons/167x167.png delete mode 100644 src/static/app/icons/180x180.png delete mode 100644 src/static/app/icons/192x192.png delete mode 100644 src/static/app/icons/20x20.png delete mode 100644 src/static/app/icons/29x29.png delete mode 100644 src/static/app/icons/40x40.png delete mode 100644 src/static/app/icons/58x58.png delete mode 100644 src/static/app/icons/60x60.png delete mode 100644 src/static/app/icons/72x72.png delete mode 100644 src/static/app/icons/76x76.png delete mode 100644 src/static/app/icons/80x80.png delete mode 100644 src/static/app/icons/87x87.png delete mode 100644 src/static/app/icons/96x96.png delete mode 100644 src/static/index/128/qingjia.png rename src/static/index/{128/chuchai.png => index/absence.png} (100%) rename src/static/index/{128/qingjia1.png => index/absenceData.png} (100%) create mode 100644 src/static/index/index/calendar.png rename src/static/index/{128/gongwen.png => index/document.png} (100%) rename src/static/index/{128 => index}/duanxin.png (100%) rename src/static/index/{128/richang.png => index/duty.png} (100%) rename src/static/index/{128/hetong.png => index/health.png} (100%) rename src/static/index/{128/kehu.png => index/healthData.png} (100%) rename src/static/index/{128 => index}/kaoqin.png (100%) rename src/static/index/{128/tongxun.png => index/manual.png} (100%) rename src/static/index/{128 => index}/more.png (100%) rename src/static/index/{128/xinwen.png => index/notice.png} (100%) rename src/static/index/{128/huiyi.png => index/peopleData.png} (100%) create mode 100644 src/static/index/index/position.png rename src/static/index/{128/liucheng.png => index/regulation.png} (100%) rename src/static/index/{128 => index}/renwu.png (100%) rename src/static/index/{128 => index}/richeng.png (100%) rename src/static/index/{128/wendang.png => index/system.png} (100%) rename src/static/index/{128 => index}/tongzhi.png (100%) rename src/static/index/{128 => index}/toupiao.png (100%) rename src/static/index/{128 => index}/youjian.png (100%) rename src/static/index/{128 => index}/zhoubao.png (100%) create mode 100644 src/static/navbg.png diff --git a/env/.env.development b/env/.env.development index df941a6..5137213 100644 --- a/env/.env.development +++ b/env/.env.development @@ -5,5 +5,5 @@ VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -#VITE_SERVER_BASEURL = 'http://127.0.0.1:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file diff --git a/pages.config.ts b/pages.config.ts index b6fd1f7..bf535c5 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -1,55 +1,55 @@ import { defineUniPages } from '@uni-helper/vite-plugin-uni-pages' export default defineUniPages({ - globalStyle: { - navigationStyle: 'default', - navigationBarTitleText: 'uniapp', - navigationBarBackgroundColor: '#f8f8f8', - navigationBarTextStyle: 'black', - backgroundColor: '#FFFFFF', - }, - easycom: { - autoscan: true, - custom: { - '^wd-(.*)': 'wot-design-uni/components/wd-$1/wd-$1.vue', - '^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)': - 'z-paging/components/z-paging$1/z-paging$1.vue', - }, - }, - tabBar: { - color: '#aaa', - selectedColor: '#39b54a', - backgroundColor: '#F8F8F8', - borderStyle: 'black', - height: '50px', - fontSize: '11px', - iconWidth: '24px', - spacing: '3px', - list: [ - { - iconPath: 'static/tabbar/tabbar-message-2.png', - selectedIconPath: 'static/tabbar/tabbar-message.png', - pagePath: 'pages/message/message', - text: '消息', - }, - { - iconPath: 'static/tabbar/tabbar-home-2.png', - selectedIconPath: 'static/tabbar/tabbar-home.png', - pagePath: 'pages/index/index', - text: '协作', - }, - { - iconPath: 'static/tabbar/tabbar-workHome-2.png', - selectedIconPath: 'static/tabbar/tabbar-workHome.png', - pagePath: 'pages/workHome/index', - text: '工作台', - }, - { - iconPath: 'static/tabbar/tabbar-user-2.png', - selectedIconPath: 'static/tabbar/tabbar-user.png', - pagePath: 'pages/user/people', - text: '个人', - }, - ], - }, -}) + globalStyle: { + navigationStyle: 'default', + navigationBarTitleText: 'uniapp', + navigationBarBackgroundColor: '#f8f8f8', + navigationBarTextStyle: 'black', + backgroundColor: '#FFFFFF', + }, + easycom: { + autoscan: true, + custom: { + '^wd-(.*)': 'wot-design-uni/components/wd-$1/wd-$1.vue', + '^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)': + 'z-paging/components/z-paging$1/z-paging$1.vue', + }, + }, + tabBar: { + color: '#aaa', + selectedColor: '#39b54a', + backgroundColor: '#F8F8F8', + borderStyle: 'black', + height: '50px', + fontSize: '11px', + iconWidth: '24px', + spacing: '3px', + list: [ + { + iconPath: 'static/tabbar/tabbar-home-2.png', + selectedIconPath: 'static/tabbar/tabbar-home.png', + pagePath: 'pages/index/index', + text: '首页', + }, + { + iconPath: 'static/tabbar/tabbar-message-2.png', + selectedIconPath: 'static/tabbar/tabbar-message.png', + pagePath: 'pages/message/message', + text: '消息', + }, + { + iconPath: 'static/tabbar/tabbar-workHome-2.png', + selectedIconPath: 'static/tabbar/tabbar-workHome.png', + pagePath: 'pages/workHome/index', + text: '工作台', + }, + { + iconPath: 'static/tabbar/tabbar-user-2.png', + selectedIconPath: 'static/tabbar/tabbar-user.png', + pagePath: 'pages/user/people', + text: '个人', + }, + ], + }, +}) \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 2759e92..90ed22f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,20 +1,20 @@ + .showArea { + position: relative; + width: fit-content; + + .iconBox { + position: absolute; + right: 0; + top: 0; + border-bottom-left-radius: 3px; + padding: 3px 6px; + height: auto; + background-color: rgba(0, 0, 0, 0.5); + z-index: 1; + color: #fff; + font-size: 12px; + line-height: 1; + border-radius: 2px; + } + } + + .uploadArea { + width: 60px; + height: 60px; + + .iconBox { + height: 100%; + width: 100%; + border: 2px solid #eee; + color: #8799a3; + margin: auto; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + font-size: 27px; + } + } + \ No newline at end of file diff --git a/src/pages-user/userEdit/userEdit.vue b/src/pages-user/userEdit/userEdit.vue index 33fc6e1..dc8319d 100644 --- a/src/pages-user/userEdit/userEdit.vue +++ b/src/pages-user/userEdit/userEdit.vue @@ -1,188 +1,162 @@ -{ - layout: 'default', - style: { - navigationBarTitleText: '', - navigationStyle: 'custom', - }, -} + { + layout: 'default', + style: { + navigationBarTitleText: '', + navigationStyle: 'custom', + }, + } + // + :deep(.wd-cell) { + .wd-cell__left { + width: 70px; + flex: none; + } + + .wd-cell__value { + text-align: left; + } + } + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 59b5baa..70a1002 100644 --- a/src/pages.json +++ b/src/pages.json @@ -23,18 +23,18 @@ "iconWidth": "24px", "spacing": "3px", "list": [ + { + "iconPath": "static/tabbar/tabbar-home-2.png", + "selectedIconPath": "static/tabbar/tabbar-home.png", + "pagePath": "pages/index/index", + "text": "首页" + }, { "iconPath": "static/tabbar/tabbar-message-2.png", "selectedIconPath": "static/tabbar/tabbar-message.png", "pagePath": "pages/message/message", "text": "消息" }, - { - "iconPath": "static/tabbar/tabbar-home-2.png", - "selectedIconPath": "static/tabbar/tabbar-home.png", - "pagePath": "pages/index/index", - "text": "协作" - }, { "iconPath": "static/tabbar/tabbar-workHome-2.png", "selectedIconPath": "static/tabbar/tabbar-workHome.png", @@ -51,12 +51,11 @@ }, "pages": [ { - "path": "pages/index/index", + "path": "pages/login/login", "type": "home", - "layout": "default", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "首页" + "navigationBarTitleText": "登录页" } }, { @@ -130,11 +129,12 @@ } }, { - "path": "pages/login/login", + "path": "pages/index/index", "type": "page", + "layout": "default", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "" + "navigationBarTitleText": "主页" } }, { diff --git a/src/pages/demo/demo.vue b/src/pages/demo/demo.vue index 12a8f4e..f77694c 100644 --- a/src/pages/demo/demo.vue +++ b/src/pages/demo/demo.vue @@ -104,7 +104,7 @@ import { ref } from 'vue' import { useRouter } from '@/plugin/uni-mini-router' import { useToast, useMessage, useNotify } from 'wot-design-uni' -import { us, os } from '@/common/work' +// import { us, os } from '@/common/work' import Grid from '@/components/Grid/Grid.vue' const toast = useToast() @@ -116,11 +116,11 @@ const { showNotify, closeNotify } = useNotify() const router = useRouter() const selected = ref([]) const gridData = ref([]) -us.data.forEach((item: any, index) => { - if (index < 9) { - gridData.value.push({ text: item.title, img: item.icon, itemKey: index }) - } -}) +// us.data.forEach((item: any, index) => { +// if (index < 9) { +// gridData.value.push({ text: item.title, img: item.icon, itemKey: index }) +// } +// }) // 图片预览 const imgPreview = ref({ show: false, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b1d361d..fd29d2a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,334 +1,347 @@ - - -{ - layout: 'default', - style: { - navigationStyle: 'custom', - navigationBarTitleText: '首页', - }, -} + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '主页', + }, + } + + .nav { + width: calc(100%); + height: v-bind(cusnavbarheight); + font-size: 24rpx; + color: #333333; + position: fixed; + z-index: 99; + background-image: url('@/static/navbg.png'); + background-repeat: no-repeat; + background-size: 750rpx 458rpx; + } + + .nav_box { + position: absolute; + bottom: 6rpx; + width: calc(100% - 60rpx); + left: 30rpx; + right: 30rpx; + } + + .weather_calender { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: nowrap; + + .position { + display: flex; + align-items: center; + white-space: nowrap; + + image { + width: 36rpx; + height: 36rpx; + margin-right: 8rpx; + } + } + + /* 左对齐 */ + .position-left { + justify-content: flex-start; + } + + /* 居中 */ + .position-center { + justify-content: center; + } + + /* 右对齐 */ + .position-right { + justify-content: flex-end; + } + } + + .scrollView { + display: flex; + flex-direction: column; + min-height: 0; + background-color: #f1f1f1; + + :deep(.wd-row) { + background-color: #fff; + margin-bottom: 32upx; + + .wd-col { + display: flex; + align-items: center; + justify-content: center; + + .wd-img { + margin: 20upx; + margin-left: 0; + } + + .textBox { + text-align: center; + display: flex; + flex-direction: column; + + .wd-text { + color: #666; + } + } + } + } + + .serveBox { + margin-bottom: 32upx; + background-color: #fff; + + .title { + display: flex; + align-items: center; + padding-left: 30upx; + height: 52px; + + .dot { + width: 14upx; + height: 14upx; + background-color: #0081ff; + border-radius: 100%; + margin-right: 20upx; + } + + .wd-text { + color: #666; + font-size: 15px; + } + } + } + } + + .swiper { + height: 575upx; + flex: none; + + image { + width: 100%; + display: block; + height: 100%; + margin: 0; + } + + } + + \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index ca080f2..3048157 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -1,8 +1,9 @@ - + + { style: { navigationStyle: 'custom', - navigationBarTitleText: '', + navigationBarTitleText: '登录页', }, } @@ -12,7 +13,6 @@ -