From 092a69b52d384219bc08553afecce9214b03b442 Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 15 Sep 2022 16:54:44 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dh5=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=96=B0=E9=97=BB=E8=B5=84=E8=AE=AF=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.env.production | 2 +- app/src/components/tab/tab.vue | 7 ++++--- app/src/components/tabs/tabs.vue | 4 ++-- app/src/pages/news/component/news-list.vue | 4 ++-- h5/assets/{account.00a6144f.js => account.1ac7d7e9.js} | 2 +- h5/assets/{index.21969731.js => index.4f50f7aa.js} | 6 +++--- h5/assets/{news-card.14a6e803.js => news-card.572a4bb0.js} | 2 +- h5/assets/news.0d842806.js | 1 + h5/assets/news.65bbe893.js | 1 - h5/assets/news.6a2c6971.css | 1 - h5/assets/news.f277b7a2.css | 1 + ...t.75c3e76a.js => pages-agreement-agreement.ff9b6ce3.js} | 2 +- h5/assets/pages-as_us-as_us.82745650.js | 1 + h5/assets/pages-as_us-as_us.980dcae0.js | 1 - h5/assets/pages-bind_mobile-bind_mobile.286a03dd.js | 1 - h5/assets/pages-bind_mobile-bind_mobile.a670d5c5.js | 1 + .../pages-change_password-change_password.132c2978.js | 1 + .../pages-change_password-change_password.e984112e.js | 1 - h5/assets/pages-collection-collection.cd3b9ef9.js | 1 - h5/assets/pages-collection-collection.f3dd57af.js | 1 + ...=> pages-customer_service-customer_service.bf5834a6.js} | 2 +- h5/assets/pages-empty-empty.637fcb62.js | 1 - h5/assets/pages-empty-empty.a6edb204.js | 1 + h5/assets/pages-forget_pwd-forget_pwd.fad274e4.js | 1 - h5/assets/pages-forget_pwd-forget_pwd.fe4a2437.js | 1 + ...dex-index.fe168679.js => pages-index-index.e831406c.js} | 2 +- h5/assets/pages-login-login.a1964be5.js | 1 + h5/assets/pages-login-login.a833f688.js | 1 - h5/assets/pages-news-news.4422a672.js | 1 - h5/assets/pages-news-news.bf1217ff.js | 1 + ...2e1c41.js => pages-news_detail-news_detail.37bb999c.js} | 2 +- ...ter.82ddc6e3.js => pages-register-register.fff25c1c.js} | 2 +- h5/assets/pages-search-search.377f4704.js | 1 - h5/assets/pages-search-search.6b081b11.js | 1 + ...s-user-user.2a9fe1a9.js => pages-user-user.254a9415.js} | 2 +- h5/assets/pages-user_data-user_data.567666d7.js | 1 + h5/assets/pages-user_data-user_data.8b999feb.js | 1 - ...set.f57bc223.js => pages-user_set-user_set.75d35cd3.js} | 2 +- h5/assets/pages-webview-webview.1842ea1f.js | 1 - h5/assets/pages-webview-webview.d98b21f2.js | 1 + h5/assets/shop.20664790.js | 1 - h5/assets/shop.b2a53e93.js | 1 + h5/assets/{tabbar.9757c3e5.js => tabbar.f1602f4a.js} | 2 +- h5/assets/{u-avatar.c390bffe.js => u-avatar.bbc58a10.js} | 2 +- h5/assets/{u-button.126b2542.js => u-button.3962b4f3.js} | 2 +- .../{u-checkbox.c5fcea9f.js => u-checkbox.fe900004.js} | 2 +- .../{u-form-item.b469356e.js => u-form-item.f875c20d.js} | 2 +- h5/assets/{u-form.c3a815ba.js => u-form.17f5f9a9.js} | 2 +- h5/assets/{u-icon.67feec68.js => u-icon.0a81a19c.js} | 2 +- h5/assets/{u-image.e641a9f8.js => u-image.29be3df8.js} | 2 +- h5/assets/u-parse.5f650ac0.js | 1 - h5/assets/u-parse.792ac186.js | 1 + h5/assets/{u-popup.efa6beec.js => u-popup.b9da59e2.js} | 2 +- h5/assets/{u-search.8bcd4dc2.js => u-search.be8f9e92.js} | 2 +- ...on-code.f035b1a4.js => u-verification-code.1c1b948f.js} | 2 +- h5/assets/{uni.67383283.css => uni.c1194171.css} | 2 +- ...mponents-u-avatar-cropper-u-avatar-cropper.693060b6.js} | 2 +- h5/assets/util.18b010b0.js | 1 + h5/assets/util.34a4212c.js | 1 - h5/assets/z-paging.19bee01b.js | 1 + h5/assets/z-paging.1ef01bbf.js | 1 - h5/index.html | 4 ++-- 62 files changed, 53 insertions(+), 52 deletions(-) rename h5/assets/{account.00a6144f.js => account.1ac7d7e9.js} (92%) rename h5/assets/{index.21969731.js => index.4f50f7aa.js} (96%) rename h5/assets/{news-card.14a6e803.js => news-card.572a4bb0.js} (86%) create mode 100644 h5/assets/news.0d842806.js delete mode 100644 h5/assets/news.65bbe893.js delete mode 100644 h5/assets/news.6a2c6971.css create mode 100644 h5/assets/news.f277b7a2.css rename h5/assets/{pages-agreement-agreement.75c3e76a.js => pages-agreement-agreement.ff9b6ce3.js} (65%) create mode 100644 h5/assets/pages-as_us-as_us.82745650.js delete mode 100644 h5/assets/pages-as_us-as_us.980dcae0.js delete mode 100644 h5/assets/pages-bind_mobile-bind_mobile.286a03dd.js create mode 100644 h5/assets/pages-bind_mobile-bind_mobile.a670d5c5.js create mode 100644 h5/assets/pages-change_password-change_password.132c2978.js delete mode 100644 h5/assets/pages-change_password-change_password.e984112e.js delete mode 100644 h5/assets/pages-collection-collection.cd3b9ef9.js create mode 100644 h5/assets/pages-collection-collection.f3dd57af.js rename h5/assets/{pages-customer_service-customer_service.9e2cb16b.js => pages-customer_service-customer_service.bf5834a6.js} (86%) delete mode 100644 h5/assets/pages-empty-empty.637fcb62.js create mode 100644 h5/assets/pages-empty-empty.a6edb204.js delete mode 100644 h5/assets/pages-forget_pwd-forget_pwd.fad274e4.js create mode 100644 h5/assets/pages-forget_pwd-forget_pwd.fe4a2437.js rename h5/assets/{pages-index-index.fe168679.js => pages-index-index.e831406c.js} (50%) create mode 100644 h5/assets/pages-login-login.a1964be5.js delete mode 100644 h5/assets/pages-login-login.a833f688.js delete mode 100644 h5/assets/pages-news-news.4422a672.js create mode 100644 h5/assets/pages-news-news.bf1217ff.js rename h5/assets/{pages-news_detail-news_detail.192e1c41.js => pages-news_detail-news_detail.37bb999c.js} (85%) rename h5/assets/{pages-register-register.82ddc6e3.js => pages-register-register.fff25c1c.js} (89%) delete mode 100644 h5/assets/pages-search-search.377f4704.js create mode 100644 h5/assets/pages-search-search.6b081b11.js rename h5/assets/{pages-user-user.2a9fe1a9.js => pages-user-user.254a9415.js} (76%) create mode 100644 h5/assets/pages-user_data-user_data.567666d7.js delete mode 100644 h5/assets/pages-user_data-user_data.8b999feb.js rename h5/assets/{pages-user_set-user_set.f57bc223.js => pages-user_set-user_set.75d35cd3.js} (95%) delete mode 100644 h5/assets/pages-webview-webview.1842ea1f.js create mode 100644 h5/assets/pages-webview-webview.d98b21f2.js delete mode 100644 h5/assets/shop.20664790.js create mode 100644 h5/assets/shop.b2a53e93.js rename h5/assets/{tabbar.9757c3e5.js => tabbar.f1602f4a.js} (97%) rename h5/assets/{u-avatar.c390bffe.js => u-avatar.bbc58a10.js} (94%) rename h5/assets/{u-button.126b2542.js => u-button.3962b4f3.js} (98%) rename h5/assets/{u-checkbox.c5fcea9f.js => u-checkbox.fe900004.js} (96%) rename h5/assets/{u-form-item.b469356e.js => u-form-item.f875c20d.js} (99%) rename h5/assets/{u-form.c3a815ba.js => u-form.17f5f9a9.js} (62%) rename h5/assets/{u-icon.67feec68.js => u-icon.0a81a19c.js} (87%) rename h5/assets/{u-image.e641a9f8.js => u-image.29be3df8.js} (95%) delete mode 100644 h5/assets/u-parse.5f650ac0.js create mode 100644 h5/assets/u-parse.792ac186.js rename h5/assets/{u-popup.efa6beec.js => u-popup.b9da59e2.js} (98%) rename h5/assets/{u-search.8bcd4dc2.js => u-search.be8f9e92.js} (94%) rename h5/assets/{u-verification-code.f035b1a4.js => u-verification-code.1c1b948f.js} (93%) rename h5/assets/{uni.67383283.css => uni.c1194171.css} (88%) rename h5/assets/{uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.ab2e984a.js => uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.693060b6.js} (77%) create mode 100644 h5/assets/util.18b010b0.js delete mode 100644 h5/assets/util.34a4212c.js create mode 100644 h5/assets/z-paging.19bee01b.js delete mode 100644 h5/assets/z-paging.1ef01bbf.js diff --git a/app/.env.production b/app/.env.production index c26c7fb9..a174cad2 100644 --- a/app/.env.production +++ b/app/.env.production @@ -1,3 +1,3 @@ # 请求域名 -VITE_APP_BASE_URL='' \ No newline at end of file +VITE_APP_BASE_URL='https://likeadmin-java-api.yixiangonline.com' \ No newline at end of file diff --git a/app/src/components/tab/tab.vue b/app/src/components/tab/tab.vue index 4c7ae53c..2ce9592d 100644 --- a/app/src/components/tab/tab.vue +++ b/app/src/components/tab/tab.vue @@ -33,7 +33,7 @@ const handleChange: any = inject('handleChange') const updateRender = (value) => { inited.value = inited.value || value active.value = value - shouldRender.value = inited.value + shouldRender.value = inited.value! shouldShow.value = value } const update = () => { @@ -42,8 +42,9 @@ const update = () => { } } -const { ctx } = getCurrentInstance() -handleChange(ctx, updateRender) +const instance = getCurrentInstance() +console.log(instance) +handleChange(instance?.props, updateRender) onMounted(() => { update() diff --git a/app/src/components/tabs/tabs.vue b/app/src/components/tabs/tabs.vue index 9a4c4ad9..27a4e9b6 100644 --- a/app/src/components/tabs/tabs.vue +++ b/app/src/components/tabs/tabs.vue @@ -142,7 +142,7 @@ const barFirstTimeMove = ref(true) // 滑块第一次移动时(页面 const swiping = ref(false) //@ts-ignore -const { ctx } = getCurrentInstance() +const ctx = getCurrentInstance() // 监听tab的变化,重新计算tab菜单的布局信息,因为实际使用中菜单可能是通过 // 后台获取的(如新闻app顶部的菜单),获取返回需要一定时间,所以list变化时,重新获取布局信息 @@ -232,7 +232,7 @@ const updateTabs = () => { } }) // nextTick(() => { - // init() + // init() // }) } diff --git a/app/src/pages/news/component/news-list.vue b/app/src/pages/news/component/news-list.vue index e09a92c0..c4c6e89f 100644 --- a/app/src/pages/news/component/news-list.vue +++ b/app/src/pages/news/component/news-list.vue @@ -16,7 +16,7 @@ + From 05fdcfd3685669e2b8249ddb0dcad724a8595a24 Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 15 Sep 2022 17:43:03 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/permission.ts | 1 - admin/src/router/index.ts | 3 ++- admin/src/styles/element.scss | 3 +++ admin/src/styles/var.css | 2 +- admin/src/views/article/column/edit.vue | 4 ++-- admin/src/views/decoration/tabbar.vue | 2 ++ admin/src/views/setting/search/index.vue | 2 +- admin/src/views/setting/user/login_register.vue | 2 +- frontend/assets/{403.443144ba.js => 403.5c599e92.js} | 2 +- frontend/assets/{404.ddb07c9d.js => 404.7ca2c34c.js} | 2 +- .../assets/{add-nav.834e7887.js => add-nav.ef710b91.js} | 2 +- ...dd-nav.vue_vue_type_script_setup_true_lang.74b3f414.js | 1 - ...dd-nav.vue_vue_type_script_setup_true_lang.8f595cdd.js | 1 + .../assets/{article.5062e2b7.js => article.abab4206.js} | 2 +- frontend/assets/attr-setting.47378827.js | 1 + frontend/assets/attr-setting.4d7c6efe.js | 1 - ...tting.vue_vue_type_script_setup_true_lang.ed49ab5a.js} | 2 +- frontend/assets/{attr.e78a6d9d.js => attr.06d00d72.js} | 2 +- frontend/assets/{attr.67342c7c.js => attr.31737748.js} | 2 +- frontend/assets/attr.4701a12e.js | 1 - frontend/assets/{attr.123016ca.js => attr.5050f155.js} | 2 +- frontend/assets/attr.8729ff35.js | 1 - frontend/assets/attr.ac6cd7f3.js | 1 + frontend/assets/attr.bc7c158e.js | 1 + frontend/assets/attr.f33c4747.js | 1 + .../attr.vue_vue_type_script_setup_true_lang.06a2fa18.js | 1 + .../attr.vue_vue_type_script_setup_true_lang.10fbce94.js | 1 + ... attr.vue_vue_type_script_setup_true_lang.28152adb.js} | 2 +- ... attr.vue_vue_type_script_setup_true_lang.60763238.js} | 2 +- .../attr.vue_vue_type_script_setup_true_lang.8c5174d0.js | 1 - .../attr.vue_vue_type_script_setup_true_lang.9c846cc2.js | 1 + .../attr.vue_vue_type_script_setup_true_lang.a3236314.js | 1 - ... attr.vue_vue_type_script_setup_true_lang.e932689b.js} | 2 +- frontend/assets/{auth.b3b4c76c.js => auth.66ba23d4.js} | 2 +- .../auth.vue_vue_type_script_setup_true_lang.3cca0355.js | 1 - .../auth.vue_vue_type_script_setup_true_lang.536a0fa1.js | 1 + frontend/assets/{cache.bd2ec0c3.js => cache.83bac4ac.js} | 2 +- ...{code-preview.bf63f322.js => code-preview.2b07afb3.js} | 2 +- ...eview.vue_vue_type_script_setup_true_lang.5b34611f.js} | 2 +- frontend/assets/{code.baceaf9b.js => code.04ee8812.js} | 2 +- frontend/assets/config.0cbeb5e6.js | 1 + frontend/assets/config.9610d10c.js | 1 - .../assets/{consumer.79dd850d.js => consumer.5ed76ba2.js} | 2 +- frontend/assets/content.00e76360.js | 1 + .../assets/{content.1861f907.js => content.08844925.js} | 2 +- frontend/assets/content.1dcb2807.js | 1 + frontend/assets/content.3c4253d6.js | 1 - .../assets/{content.7331f794.js => content.84ca12f6.js} | 2 +- frontend/assets/content.8f3b2cf8.css | 1 + frontend/assets/content.93b01230.css | 1 - frontend/assets/content.9533ee8d.js | 1 - frontend/assets/content.9ba86bb3.js | 1 - .../assets/{content.2bb46d09.css => content.9f244b19.css} | 2 +- frontend/assets/content.bfdadda5.js | 1 - frontend/assets/content.c4421dd6.css | 1 - frontend/assets/content.cbd138f9.js | 1 - frontend/assets/content.cd3abec2.js | 1 + frontend/assets/content.dca3e67f.js | 1 + frontend/assets/content.efb8af20.css | 1 + frontend/assets/content.f6af1ae3.js | 1 + frontend/assets/content.fe06b0dc.js | 1 + ...ontent.vue_vue_type_script_setup_true_lang.20d66ca5.js | 1 + ...ontent.vue_vue_type_script_setup_true_lang.2d76d027.js | 1 + ...ontent.vue_vue_type_script_setup_true_lang.437c794d.js | 1 + ...ontent.vue_vue_type_script_setup_true_lang.a734f094.js | 1 - ...ontent.vue_vue_type_script_setup_true_lang.afeae959.js | 1 - .../{data-table.b2e19c7d.js => data-table.4c45a63b.js} | 2 +- ...table.vue_vue_type_script_setup_true_lang.08302581.js} | 2 +- frontend/assets/decoration-img.49159595.css | 1 + frontend/assets/decoration-img.b149fbae.js | 1 + frontend/assets/decoration.b1a99ddf.js | 1 + frontend/assets/decoration.f1c238f3.js | 1 - frontend/assets/default_reply.3d314007.js | 1 + frontend/assets/default_reply.a7680699.js | 1 - .../{department.dd023d35.js => department.d8665773.js} | 2 +- frontend/assets/detail.4d7e220f.js | 1 + frontend/assets/detail.566c9cb5.js | 1 - frontend/assets/{dict.b31e2e60.js => dict.91cbb6a9.js} | 2 +- frontend/assets/{edit.0c2acd27.js => edit.0051a861.js} | 2 +- frontend/assets/{edit.37a34241.js => edit.085a4ad8.js} | 2 +- frontend/assets/edit.28c113d9.js | 1 + frontend/assets/{edit.7de5404b.js => edit.3d334538.js} | 2 +- frontend/assets/edit.400359d7.js | 1 - frontend/assets/{edit.4d385ec6.js => edit.4fcfdcbb.js} | 2 +- frontend/assets/{edit.8c65b785.js => edit.80e83a9f.js} | 2 +- frontend/assets/edit.9703e921.js | 1 + frontend/assets/{edit.8686b321.js => edit.a2f46523.js} | 2 +- frontend/assets/{edit.2cffb0ac.js => edit.a8d6eaf2.js} | 2 +- frontend/assets/{edit.b7afa89b.js => edit.b8c7b7ec.js} | 2 +- frontend/assets/{edit.87ee536e.js => edit.cecd423d.js} | 2 +- frontend/assets/{edit.a4c27cb5.js => edit.e1f4e19b.js} | 2 +- frontend/assets/{edit.c5e0f2c6.js => edit.e78d010f.js} | 2 +- frontend/assets/{edit.ebce67a5.js => edit.e998ba1f.js} | 2 +- .../edit.vue_vue_type_script_setup_true_lang.0044aa72.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.02bf7c7e.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.09301fe7.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.0be75872.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.105e4a82.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.31d7116f.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.32671abf.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.426c2001.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.51604f96.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.53990432.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.54a27a3f.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.5856f635.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.5d92ac0c.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.66917ff2.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.67f14c2d.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.6cea5681.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.72f26945.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.907f3e13.js | 1 - .../edit.vue_vue_type_script_setup_true_lang.955ba1d9.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.ac077cbe.js | 1 + .../edit.vue_vue_type_script_setup_true_lang.d23fac27.js | 1 + ...{element-plus.f93fd622.js => element-plus.62f8b726.js} | 4 ++-- ...lement-plus.90445590.css => element-plus.a224f706.css} | 2 +- .../{environment.3b8811c1.js => environment.50f9f65d.js} | 2 +- frontend/assets/{error.cc45235a.js => error.68daf1da.js} | 2 +- .../assets/{filing.5499f0b5.js => filing.198b3b56.js} | 2 +- frontend/assets/follow_reply.66d5864f.js | 1 + frontend/assets/follow_reply.927e40d8.js | 1 - frontend/assets/{h5.8d606cfb.js => h5.9fbbbed8.js} | 2 +- frontend/assets/{index.028e97a2.js => index.025bdfa9.js} | 2 +- frontend/assets/index.080a0ec8.css | 1 + frontend/assets/{index.c4b9ad67.js => index.098fb7b4.js} | 2 +- frontend/assets/index.202dcba0.js | 1 + frontend/assets/{index.e22b5b2b.js => index.27946f8c.js} | 2 +- frontend/assets/index.2cfd300b.css | 1 - frontend/assets/{index.0b9b4571.js => index.37cda7d4.js} | 2 +- frontend/assets/{index.1da3754a.js => index.3f82453a.js} | 2 +- frontend/assets/{index.1ad4b59d.js => index.40f5e15d.js} | 2 +- frontend/assets/index.4b3e8ed6.css | 1 - frontend/assets/{index.21d818d2.js => index.570d4c59.js} | 2 +- frontend/assets/{index.731a26d6.js => index.5cf72e03.js} | 2 +- frontend/assets/{index.a4e50c6d.js => index.5fb0c379.js} | 2 +- frontend/assets/{index.4dff4328.js => index.6610e755.js} | 2 +- frontend/assets/index.662c9036.js | 1 + frontend/assets/index.6be519aa.js | 1 - frontend/assets/index.705784a8.css | 1 + frontend/assets/index.744ca7bf.css | 1 - frontend/assets/index.84b4742e.js | 1 - frontend/assets/{index.cb6dcb66.js => index.8c9a391f.js} | 2 +- frontend/assets/index.8de0af92.js | 1 + frontend/assets/{index.cf6c36b8.js => index.9563c83a.js} | 2 +- frontend/assets/{index.5da0546d.js => index.9c288f46.js} | 2 +- frontend/assets/index.a318de61.css | 1 + frontend/assets/index.ac62fd7d.js | 1 + frontend/assets/{index.29e8a712.js => index.aecec658.js} | 2 +- frontend/assets/index.b2a6e967.css | 1 - frontend/assets/{index.8e46c860.js => index.b9ffe6de.js} | 2 +- frontend/assets/index.ba487959.js | 1 - frontend/assets/{index.39e26ece.js => index.c18d5e6d.js} | 2 +- frontend/assets/index.ccc78a7a.js | 1 + frontend/assets/{index.b7ed9ca3.js => index.d338d44b.js} | 2 +- frontend/assets/index.e8a7ecce.js | 1 - frontend/assets/index.f2fb745c.css | 1 + frontend/assets/{index.61fd87dc.js => index.f712cef7.js} | 2 +- frontend/assets/index.f7633ef3.js | 1 - frontend/assets/{index.d00d57c8.js => index.fd3131b6.js} | 2 +- ...index.vue_vue_type_script_setup_true_lang.805613e8.js} | 2 +- ...index.vue_vue_type_script_setup_true_lang.a97aff48.js} | 2 +- ...index.vue_vue_type_script_setup_true_lang.c996e5f2.js} | 2 +- .../{information.18ed7f80.js => information.b1a4bf06.js} | 2 +- .../assets/{journal.0a0686e5.js => journal.98f13b70.js} | 2 +- frontend/assets/keyword_reply.11e513a6.js | 1 - frontend/assets/keyword_reply.c752becd.js | 1 + frontend/assets/{login.f4eba35d.js => login.03b721b9.js} | 2 +- frontend/assets/login_register.17ecaaca.js | 1 + frontend/assets/login_register.3f893909.js | 1 - frontend/assets/menu.448dc776.js | 1 + frontend/assets/{menu.ccf0ae2a.js => menu.514c5db3.js} | 2 +- frontend/assets/menu.7b1ec0d6.js | 1 - frontend/assets/{menu.1b7873a7.js => menu.b7216e1d.js} | 2 +- .../assets/{message.531769b6.js => message.8cd09dd1.js} | 2 +- frontend/assets/oa-attr.8115fded.js | 1 + frontend/assets/oa-attr.91e5f6e3.js | 1 - frontend/assets/oa-menu-form-edit.4620efc6.js | 1 + ...m-edit.vue_vue_type_script_setup_true_lang.872e71b3.js | 1 + frontend/assets/oa-menu-form.1dca9856.js | 1 + ...u-form.vue_vue_type_script_setup_true_lang.3f0a59b9.js | 1 + frontend/assets/oa-phone.1bc814e9.js | 1 - frontend/assets/oa-phone.9ea45e8b.css | 1 - frontend/assets/oa-phone.de676ace.css | 1 + frontend/assets/oa-phone.f23e97f8.js | 1 + frontend/assets/picker.05436930.css | 1 + frontend/assets/picker.16c20083.js | 1 + .../assets/{picker.2ad4f3fe.js => picker.8f877736.js} | 2 +- frontend/assets/picker.c66e2dae.css | 1 - ...picker.vue_vue_type_script_setup_true_lang.5eb3faa5.js | 1 - frontend/assets/{post.63406709.js => post.7aa9caee.js} | 2 +- frontend/assets/preview.4260ee80.js | 1 + frontend/assets/preview.6e931073.css | 1 + frontend/assets/preview.e0d735d2.js | 1 - frontend/assets/preview.e8b6faba.css | 1 - .../assets/{protocol.3bf7a5a6.js => protocol.bb514b1f.js} | 2 +- frontend/assets/{role.fe130277.js => role.1b027fa2.js} | 2 +- frontend/assets/setting.a6920e19.js | 1 + frontend/assets/setting.a9502695.js | 1 - frontend/assets/{setup.3920a53b.js => setup.4af4f61a.js} | 2 +- .../assets/{system.0245dc8f.js => system.45508e93.js} | 2 +- frontend/assets/tabbar.39292d3d.js | 1 - frontend/assets/tabbar.e864414b.js | 1 + .../assets/{tabbar.63861cf5.css => tabbar.edd4a565.css} | 2 +- ...DictOptions.e0c63d20.js => useDictOptions.11692629.js} | 2 +- frontend/assets/useMenuOa.2fae8ed3.js | 1 + .../{usePaging.226fac59.js => usePaging.70f7c50a.js} | 2 +- frontend/assets/{user.7f198e09.js => user.e8da2ff4.js} | 2 +- frontend/assets/{weapp.dc716f29.js => weapp.f437b464.js} | 2 +- .../assets/{website.7a006105.js => website.2da6f299.js} | 2 +- .../assets/{wx_dev.275e2b88.js => wx_dev.9906a56d.js} | 2 +- frontend/assets/wx_oa.36e4b213.js | 1 + frontend/index.html | 8 ++++---- 212 files changed, 167 insertions(+), 148 deletions(-) rename frontend/assets/{403.443144ba.js => 403.5c599e92.js} (79%) rename frontend/assets/{404.ddb07c9d.js => 404.7ca2c34c.js} (78%) rename frontend/assets/{add-nav.834e7887.js => add-nav.ef710b91.js} (56%) delete mode 100644 frontend/assets/add-nav.vue_vue_type_script_setup_true_lang.74b3f414.js create mode 100644 frontend/assets/add-nav.vue_vue_type_script_setup_true_lang.8f595cdd.js rename frontend/assets/{article.5062e2b7.js => article.abab4206.js} (93%) create mode 100644 frontend/assets/attr-setting.47378827.js delete mode 100644 frontend/assets/attr-setting.4d7c6efe.js rename frontend/assets/{attr-setting.vue_vue_type_script_setup_true_lang.58215fa3.js => attr-setting.vue_vue_type_script_setup_true_lang.ed49ab5a.js} (91%) rename frontend/assets/{attr.e78a6d9d.js => attr.06d00d72.js} (50%) rename frontend/assets/{attr.67342c7c.js => attr.31737748.js} (50%) delete mode 100644 frontend/assets/attr.4701a12e.js rename frontend/assets/{attr.123016ca.js => attr.5050f155.js} (63%) delete mode 100644 frontend/assets/attr.8729ff35.js create mode 100644 frontend/assets/attr.ac6cd7f3.js create mode 100644 frontend/assets/attr.bc7c158e.js create mode 100644 frontend/assets/attr.f33c4747.js create mode 100644 frontend/assets/attr.vue_vue_type_script_setup_true_lang.06a2fa18.js create mode 100644 frontend/assets/attr.vue_vue_type_script_setup_true_lang.10fbce94.js rename frontend/assets/{attr.vue_vue_type_script_setup_true_lang.fc348e0d.js => attr.vue_vue_type_script_setup_true_lang.28152adb.js} (84%) rename frontend/assets/{attr.vue_vue_type_script_setup_true_lang.f7487f69.js => attr.vue_vue_type_script_setup_true_lang.60763238.js} (90%) delete mode 100644 frontend/assets/attr.vue_vue_type_script_setup_true_lang.8c5174d0.js create mode 100644 frontend/assets/attr.vue_vue_type_script_setup_true_lang.9c846cc2.js delete mode 100644 frontend/assets/attr.vue_vue_type_script_setup_true_lang.a3236314.js rename frontend/assets/{attr.vue_vue_type_script_setup_true_lang.7bb7c341.js => attr.vue_vue_type_script_setup_true_lang.e932689b.js} (88%) rename frontend/assets/{auth.b3b4c76c.js => auth.66ba23d4.js} (61%) delete mode 100644 frontend/assets/auth.vue_vue_type_script_setup_true_lang.3cca0355.js create mode 100644 frontend/assets/auth.vue_vue_type_script_setup_true_lang.536a0fa1.js rename frontend/assets/{cache.bd2ec0c3.js => cache.83bac4ac.js} (96%) rename frontend/assets/{code-preview.bf63f322.js => code-preview.2b07afb3.js} (77%) rename frontend/assets/{code-preview.vue_vue_type_script_setup_true_lang.b71dd951.js => code-preview.vue_vue_type_script_setup_true_lang.5b34611f.js} (91%) rename frontend/assets/{code.baceaf9b.js => code.04ee8812.js} (91%) create mode 100644 frontend/assets/config.0cbeb5e6.js delete mode 100644 frontend/assets/config.9610d10c.js rename frontend/assets/{consumer.79dd850d.js => consumer.5ed76ba2.js} (73%) create mode 100644 frontend/assets/content.00e76360.js rename frontend/assets/{content.1861f907.js => content.08844925.js} (90%) create mode 100644 frontend/assets/content.1dcb2807.js delete mode 100644 frontend/assets/content.3c4253d6.js rename frontend/assets/{content.7331f794.js => content.84ca12f6.js} (90%) create mode 100644 frontend/assets/content.8f3b2cf8.css delete mode 100644 frontend/assets/content.93b01230.css delete mode 100644 frontend/assets/content.9533ee8d.js delete mode 100644 frontend/assets/content.9ba86bb3.js rename frontend/assets/{content.2bb46d09.css => content.9f244b19.css} (65%) delete mode 100644 frontend/assets/content.bfdadda5.js delete mode 100644 frontend/assets/content.c4421dd6.css delete mode 100644 frontend/assets/content.cbd138f9.js create mode 100644 frontend/assets/content.cd3abec2.js create mode 100644 frontend/assets/content.dca3e67f.js create mode 100644 frontend/assets/content.efb8af20.css create mode 100644 frontend/assets/content.f6af1ae3.js create mode 100644 frontend/assets/content.fe06b0dc.js create mode 100644 frontend/assets/content.vue_vue_type_script_setup_true_lang.20d66ca5.js create mode 100644 frontend/assets/content.vue_vue_type_script_setup_true_lang.2d76d027.js create mode 100644 frontend/assets/content.vue_vue_type_script_setup_true_lang.437c794d.js delete mode 100644 frontend/assets/content.vue_vue_type_script_setup_true_lang.a734f094.js delete mode 100644 frontend/assets/content.vue_vue_type_script_setup_true_lang.afeae959.js rename frontend/assets/{data-table.b2e19c7d.js => data-table.4c45a63b.js} (72%) rename frontend/assets/{data-table.vue_vue_type_script_setup_true_lang.c2091fb6.js => data-table.vue_vue_type_script_setup_true_lang.08302581.js} (92%) create mode 100644 frontend/assets/decoration-img.49159595.css create mode 100644 frontend/assets/decoration-img.b149fbae.js create mode 100644 frontend/assets/decoration.b1a99ddf.js delete mode 100644 frontend/assets/decoration.f1c238f3.js create mode 100644 frontend/assets/default_reply.3d314007.js delete mode 100644 frontend/assets/default_reply.a7680699.js rename frontend/assets/{department.dd023d35.js => department.d8665773.js} (84%) create mode 100644 frontend/assets/detail.4d7e220f.js delete mode 100644 frontend/assets/detail.566c9cb5.js rename frontend/assets/{dict.b31e2e60.js => dict.91cbb6a9.js} (91%) rename frontend/assets/{edit.0c2acd27.js => edit.0051a861.js} (96%) rename frontend/assets/{edit.37a34241.js => edit.085a4ad8.js} (70%) create mode 100644 frontend/assets/edit.28c113d9.js rename frontend/assets/{edit.7de5404b.js => edit.3d334538.js} (62%) delete mode 100644 frontend/assets/edit.400359d7.js rename frontend/assets/{edit.4d385ec6.js => edit.4fcfdcbb.js} (94%) rename frontend/assets/{edit.8c65b785.js => edit.80e83a9f.js} (62%) create mode 100644 frontend/assets/edit.9703e921.js rename frontend/assets/{edit.8686b321.js => edit.a2f46523.js} (70%) rename frontend/assets/{edit.2cffb0ac.js => edit.a8d6eaf2.js} (63%) rename frontend/assets/{edit.b7afa89b.js => edit.b8c7b7ec.js} (63%) rename frontend/assets/{edit.87ee536e.js => edit.cecd423d.js} (54%) rename frontend/assets/{edit.a4c27cb5.js => edit.e1f4e19b.js} (63%) rename frontend/assets/{edit.c5e0f2c6.js => edit.e78d010f.js} (61%) rename frontend/assets/{edit.ebce67a5.js => edit.e998ba1f.js} (63%) delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.0044aa72.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.02bf7c7e.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.09301fe7.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.0be75872.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.105e4a82.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.31d7116f.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.32671abf.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.426c2001.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.51604f96.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.53990432.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.54a27a3f.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.5856f635.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.5d92ac0c.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.66917ff2.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.67f14c2d.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.6cea5681.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.72f26945.js delete mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.907f3e13.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.955ba1d9.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.ac077cbe.js create mode 100644 frontend/assets/edit.vue_vue_type_script_setup_true_lang.d23fac27.js rename frontend/assets/{element-plus.f93fd622.js => element-plus.62f8b726.js} (60%) rename frontend/assets/{element-plus.90445590.css => element-plus.a224f706.css} (93%) rename frontend/assets/{environment.3b8811c1.js => environment.50f9f65d.js} (96%) rename frontend/assets/{error.cc45235a.js => error.68daf1da.js} (92%) rename frontend/assets/{filing.5499f0b5.js => filing.198b3b56.js} (91%) create mode 100644 frontend/assets/follow_reply.66d5864f.js delete mode 100644 frontend/assets/follow_reply.927e40d8.js rename frontend/assets/{h5.8d606cfb.js => h5.9fbbbed8.js} (94%) rename frontend/assets/{index.028e97a2.js => index.025bdfa9.js} (92%) create mode 100644 frontend/assets/index.080a0ec8.css rename frontend/assets/{index.c4b9ad67.js => index.098fb7b4.js} (92%) create mode 100644 frontend/assets/index.202dcba0.js rename frontend/assets/{index.e22b5b2b.js => index.27946f8c.js} (91%) delete mode 100644 frontend/assets/index.2cfd300b.css rename frontend/assets/{index.0b9b4571.js => index.37cda7d4.js} (98%) rename frontend/assets/{index.1da3754a.js => index.3f82453a.js} (93%) rename frontend/assets/{index.1ad4b59d.js => index.40f5e15d.js} (99%) delete mode 100644 frontend/assets/index.4b3e8ed6.css rename frontend/assets/{index.21d818d2.js => index.570d4c59.js} (92%) rename frontend/assets/{index.731a26d6.js => index.5cf72e03.js} (95%) rename frontend/assets/{index.a4e50c6d.js => index.5fb0c379.js} (83%) rename frontend/assets/{index.4dff4328.js => index.6610e755.js} (86%) create mode 100644 frontend/assets/index.662c9036.js delete mode 100644 frontend/assets/index.6be519aa.js create mode 100644 frontend/assets/index.705784a8.css delete mode 100644 frontend/assets/index.744ca7bf.css delete mode 100644 frontend/assets/index.84b4742e.js rename frontend/assets/{index.cb6dcb66.js => index.8c9a391f.js} (54%) create mode 100644 frontend/assets/index.8de0af92.js rename frontend/assets/{index.cf6c36b8.js => index.9563c83a.js} (90%) rename frontend/assets/{index.5da0546d.js => index.9c288f46.js} (56%) create mode 100644 frontend/assets/index.a318de61.css create mode 100644 frontend/assets/index.ac62fd7d.js rename frontend/assets/{index.29e8a712.js => index.aecec658.js} (88%) delete mode 100644 frontend/assets/index.b2a6e967.css rename frontend/assets/{index.8e46c860.js => index.b9ffe6de.js} (85%) delete mode 100644 frontend/assets/index.ba487959.js rename frontend/assets/{index.39e26ece.js => index.c18d5e6d.js} (89%) create mode 100644 frontend/assets/index.ccc78a7a.js rename frontend/assets/{index.b7ed9ca3.js => index.d338d44b.js} (90%) delete mode 100644 frontend/assets/index.e8a7ecce.js create mode 100644 frontend/assets/index.f2fb745c.css rename frontend/assets/{index.61fd87dc.js => index.f712cef7.js} (85%) delete mode 100644 frontend/assets/index.f7633ef3.js rename frontend/assets/{index.d00d57c8.js => index.fd3131b6.js} (73%) rename frontend/assets/{index.vue_vue_type_script_setup_true_lang.c678c8cb.js => index.vue_vue_type_script_setup_true_lang.805613e8.js} (90%) rename frontend/assets/{index.vue_vue_type_script_setup_true_lang.89d72182.js => index.vue_vue_type_script_setup_true_lang.a97aff48.js} (91%) rename frontend/assets/{index.vue_vue_type_script_setup_true_lang.6f61ba2e.js => index.vue_vue_type_script_setup_true_lang.c996e5f2.js} (90%) rename frontend/assets/{information.18ed7f80.js => information.b1a4bf06.js} (89%) rename frontend/assets/{journal.0a0686e5.js => journal.98f13b70.js} (92%) delete mode 100644 frontend/assets/keyword_reply.11e513a6.js create mode 100644 frontend/assets/keyword_reply.c752becd.js rename frontend/assets/{login.f4eba35d.js => login.03b721b9.js} (95%) create mode 100644 frontend/assets/login_register.17ecaaca.js delete mode 100644 frontend/assets/login_register.3f893909.js create mode 100644 frontend/assets/menu.448dc776.js rename frontend/assets/{menu.ccf0ae2a.js => menu.514c5db3.js} (91%) delete mode 100644 frontend/assets/menu.7b1ec0d6.js rename frontend/assets/{menu.1b7873a7.js => menu.b7216e1d.js} (84%) rename frontend/assets/{message.531769b6.js => message.8cd09dd1.js} (86%) create mode 100644 frontend/assets/oa-attr.8115fded.js delete mode 100644 frontend/assets/oa-attr.91e5f6e3.js create mode 100644 frontend/assets/oa-menu-form-edit.4620efc6.js create mode 100644 frontend/assets/oa-menu-form-edit.vue_vue_type_script_setup_true_lang.872e71b3.js create mode 100644 frontend/assets/oa-menu-form.1dca9856.js create mode 100644 frontend/assets/oa-menu-form.vue_vue_type_script_setup_true_lang.3f0a59b9.js delete mode 100644 frontend/assets/oa-phone.1bc814e9.js delete mode 100644 frontend/assets/oa-phone.9ea45e8b.css create mode 100644 frontend/assets/oa-phone.de676ace.css create mode 100644 frontend/assets/oa-phone.f23e97f8.js create mode 100644 frontend/assets/picker.05436930.css create mode 100644 frontend/assets/picker.16c20083.js rename frontend/assets/{picker.2ad4f3fe.js => picker.8f877736.js} (93%) delete mode 100644 frontend/assets/picker.c66e2dae.css delete mode 100644 frontend/assets/picker.vue_vue_type_script_setup_true_lang.5eb3faa5.js rename frontend/assets/{post.63406709.js => post.7aa9caee.js} (86%) create mode 100644 frontend/assets/preview.4260ee80.js create mode 100644 frontend/assets/preview.6e931073.css delete mode 100644 frontend/assets/preview.e0d735d2.js delete mode 100644 frontend/assets/preview.e8b6faba.css rename frontend/assets/{protocol.3bf7a5a6.js => protocol.bb514b1f.js} (82%) rename frontend/assets/{role.fe130277.js => role.1b027fa2.js} (86%) create mode 100644 frontend/assets/setting.a6920e19.js delete mode 100644 frontend/assets/setting.a9502695.js rename frontend/assets/{setup.3920a53b.js => setup.4af4f61a.js} (81%) rename frontend/assets/{system.0245dc8f.js => system.45508e93.js} (72%) delete mode 100644 frontend/assets/tabbar.39292d3d.js create mode 100644 frontend/assets/tabbar.e864414b.js rename frontend/assets/{tabbar.63861cf5.css => tabbar.edd4a565.css} (55%) rename frontend/assets/{useDictOptions.e0c63d20.js => useDictOptions.11692629.js} (84%) create mode 100644 frontend/assets/useMenuOa.2fae8ed3.js rename frontend/assets/{usePaging.226fac59.js => usePaging.70f7c50a.js} (95%) rename frontend/assets/{user.7f198e09.js => user.e8da2ff4.js} (80%) rename frontend/assets/{weapp.dc716f29.js => weapp.f437b464.js} (94%) rename frontend/assets/{website.7a006105.js => website.2da6f299.js} (86%) rename frontend/assets/{wx_dev.275e2b88.js => wx_dev.9906a56d.js} (93%) create mode 100644 frontend/assets/wx_oa.36e4b213.js diff --git a/admin/src/permission.ts b/admin/src/permission.ts index 11bdcaeb..346a911f 100644 --- a/admin/src/permission.ts +++ b/admin/src/permission.ts @@ -78,6 +78,5 @@ router.beforeEach(async (to, from, next) => { }) router.afterEach(() => { - console.log(router.getRoutes()) NProgress.done() }) diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index 8227b944..7b6d8926 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -84,8 +84,9 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine } } } - +//通过权限字符查询路由路径 export function getRoutePath(perms: string) { + console.log(router.getRoutes()) return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || '' } diff --git a/admin/src/styles/element.scss b/admin/src/styles/element.scss index e3f4a7e1..48c2c86d 100644 --- a/admin/src/styles/element.scss +++ b/admin/src/styles/element.scss @@ -112,6 +112,9 @@ .el-button--danger { --el-button-hover-link-text-color: var(--el-color-danger-light-3); } + .el-image__error { + font-size: 12px; + } } @media (max-width: 768px) { .el-pagination > .el-pagination__jump { diff --git a/admin/src/styles/var.css b/admin/src/styles/var.css index b9377057..a10631a3 100644 --- a/admin/src/styles/var.css +++ b/admin/src/styles/var.css @@ -32,7 +32,7 @@ --el-border-color-dark: #d4d7de; --el-border-color-darker: #cdd0d6; --el-fill-color: #f0f2f5; - --el-fill-color-light: #f5f7fa; + --el-fill-color-light: #f8f8f8; --el-fill-color-lighter: #fafafa; --el-fill-color-extra-light: #fafcff; --el-fill-color-dark: #ebedf0; diff --git a/admin/src/views/article/column/edit.vue b/admin/src/views/article/column/edit.vue index 3fd807ca..bdf9247f 100644 --- a/admin/src/views/article/column/edit.vue +++ b/admin/src/views/article/column/edit.vue @@ -12,9 +12,9 @@ - +
- +
默认为0, 数值越大越排前
diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue index 4f6661d8..21905173 100644 --- a/admin/src/views/decoration/tabbar.vue +++ b/admin/src/views/decoration/tabbar.vue @@ -111,12 +111,14 @@
diff --git a/admin/src/views/setting/search/index.vue b/admin/src/views/setting/search/index.vue index 1530b581..89471f4e 100644 --- a/admin/src/views/setting/search/index.vue +++ b/admin/src/views/setting/search/index.vue @@ -36,7 +36,7 @@ -