From 25482cb612d993cba6496b2dae29fc48207e0f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Fri, 13 Jan 2023 16:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=88=87?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/base.scss | 2 +- common/js/request.js | 4 +- common/js/util.js | 2 +- components/Cn-grid-item/Cn-grid-item.vue | 70 ++++++++ components/Cn-grid/Cn-grid.vue | 52 ++++++ components/Cn-page/Cn-page.vue | 2 +- pages.json | 98 ++++++++++- pages/home/wentaiyuexian.vue | 33 ++++ pages/home/wentaiyuexianjiancedian.vue | 33 ++++ pages/home/wentaiyuexianjiancedianDetail.vue | 39 +++++ pages/home/zantaishijian.vue | 34 ++++ pages/home/zantaishijianDetail.vue | 97 +++++++++++ pages/home/zhongduanzhuangtai.vue | 33 ++++ pages/home/zhongduanzhuangtaiDetail.vue | 0 pages/index/index.vue | 68 ++++---- pages/index/mine.vue | 41 ++++- pages/mine/about.vue | 52 ++++++ pages/{login => mine}/agreement.vue | 2 +- pages/mine/company.vue | 25 +++ pages/mine/message.vue | 28 ++++ pages/{login => mine}/policy.vue | 0 pages/mine/setup.vue | 40 ++++- pages/mine/setupMessage.vue | 111 +++++++++++++ pages/mine/system.vue | 25 +++ pages/mine/upgrade.vue | 81 +++++++++ pages/user/changePhone.vue | 165 +++++++++++++++++++ pages/{login => user}/changePwd.vue | 10 +- pages/{login => user}/forget.vue | 4 +- pages/{login => user}/login.vue | 8 +- pages/{login => user}/register.vue | 4 +- static/head.png | Bin 0 -> 10767 bytes static/index.png | Bin 2514 -> 5039 bytes static/index2.png | Bin 2513 -> 6549 bytes static/message.png | Bin 0 -> 4607 bytes static/message2.png | Bin 0 -> 9409 bytes static/mine2.png | Bin 7962 -> 8022 bytes static/report2.png | Bin 9061 -> 9140 bytes static/server.png | Bin 6248 -> 6493 bytes static/setup.png | Bin 11572 -> 12764 bytes static/我的服务.png | Bin 0 -> 6493 bytes uni.scss | 2 +- 41 files changed, 1090 insertions(+), 75 deletions(-) create mode 100644 components/Cn-grid-item/Cn-grid-item.vue create mode 100644 components/Cn-grid/Cn-grid.vue create mode 100644 pages/home/wentaiyuexian.vue create mode 100644 pages/home/wentaiyuexianjiancedian.vue create mode 100644 pages/home/wentaiyuexianjiancedianDetail.vue create mode 100644 pages/home/zantaishijian.vue create mode 100644 pages/home/zantaishijianDetail.vue create mode 100644 pages/home/zhongduanzhuangtai.vue create mode 100644 pages/home/zhongduanzhuangtaiDetail.vue create mode 100644 pages/mine/about.vue rename pages/{login => mine}/agreement.vue (89%) create mode 100644 pages/mine/company.vue create mode 100644 pages/mine/message.vue rename pages/{login => mine}/policy.vue (100%) create mode 100644 pages/mine/setupMessage.vue create mode 100644 pages/mine/system.vue create mode 100644 pages/mine/upgrade.vue create mode 100644 pages/user/changePhone.vue rename pages/{login => user}/changePwd.vue (92%) rename pages/{login => user}/forget.vue (92%) rename pages/{login => user}/login.vue (93%) rename pages/{login => user}/register.vue (92%) create mode 100644 static/head.png create mode 100644 static/message.png create mode 100644 static/message2.png create mode 100644 static/我的服务.png diff --git a/common/css/base.scss b/common/css/base.scss index 0453de4..2dc4853 100644 --- a/common/css/base.scss +++ b/common/css/base.scss @@ -1,5 +1,5 @@ page { - background: #f6f7f8; + background: #f3f4f5; } .hide-txt { diff --git a/common/js/request.js b/common/js/request.js index f26ac3d..7ff726d 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -54,7 +54,7 @@ export default (options = {}) => { title: '网络异常,请稍后再试', }) uni.reLaunch({ - url: '/pages/login/login', + url: '/pages/user/login', }); }, }) @@ -72,7 +72,7 @@ function errHandler (res) { uni.removeStorageSync('Cookie'); uni.clearStorageSync(); // #endif - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/user/login' }) break default: uni.showToast({ diff --git a/common/js/util.js b/common/js/util.js index 1b59732..2a50b96 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -192,7 +192,7 @@ const loadConfig = (call, need_fresh = false) => { }).catch(err => { globalConfigIsLoading = false; console.warn(err); - // uni.reLaunch({ url: '/pages/login/login' }) + // uni.reLaunch({ url: '/pages/user/login' }) }) } diff --git a/components/Cn-grid-item/Cn-grid-item.vue b/components/Cn-grid-item/Cn-grid-item.vue new file mode 100644 index 0000000..6a65ea5 --- /dev/null +++ b/components/Cn-grid-item/Cn-grid-item.vue @@ -0,0 +1,70 @@ + + + + \ No newline at end of file diff --git a/components/Cn-grid/Cn-grid.vue b/components/Cn-grid/Cn-grid.vue new file mode 100644 index 0000000..cefb844 --- /dev/null +++ b/components/Cn-grid/Cn-grid.vue @@ -0,0 +1,52 @@ + + + + \ No newline at end of file diff --git a/components/Cn-page/Cn-page.vue b/components/Cn-page/Cn-page.vue index 39c9cd9..a2c9536 100644 --- a/components/Cn-page/Cn-page.vue +++ b/components/Cn-page/Cn-page.vue @@ -1,7 +1,7 @@ @@ -31,12 +43,23 @@ export default { methods: { init () { }, + upgrade (code) { + console.log(code); + uni.showToast({ + title: '升级成功', + icon: 'none' + }) + }, jump (type) { switch (type) { case 'login': uni.navigateTo({ - url: `/pages/login/login` + url: `/pages/user/login` }) + break; + case 'upgrade': + this.$refs.inputDialog.open() + break; default: uni.navigateTo({ url: `/pages/mine/${type}` @@ -75,6 +98,12 @@ export default { font-size: 36rpx; color: #111; font-weight: 700; + + .tag { + margin-top: 10rpx; + font-size: 24rpx; + color: #aaa; + } } } diff --git a/pages/mine/about.vue b/pages/mine/about.vue new file mode 100644 index 0000000..87f8396 --- /dev/null +++ b/pages/mine/about.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/pages/login/agreement.vue b/pages/mine/agreement.vue similarity index 89% rename from pages/login/agreement.vue rename to pages/mine/agreement.vue index fc1593c..4ffa9e6 100644 --- a/pages/login/agreement.vue +++ b/pages/mine/agreement.vue @@ -2,7 +2,7 @@ - 用户协议 + 用户协议 。。。。 diff --git a/pages/mine/company.vue b/pages/mine/company.vue new file mode 100644 index 0000000..69d4bd6 --- /dev/null +++ b/pages/mine/company.vue @@ -0,0 +1,25 @@ + + + \ No newline at end of file diff --git a/pages/mine/message.vue b/pages/mine/message.vue new file mode 100644 index 0000000..44d576c --- /dev/null +++ b/pages/mine/message.vue @@ -0,0 +1,28 @@ + + + \ No newline at end of file diff --git a/pages/login/policy.vue b/pages/mine/policy.vue similarity index 100% rename from pages/login/policy.vue rename to pages/mine/policy.vue diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue index 7f05506..efbbdab 100644 --- a/pages/mine/setup.vue +++ b/pages/mine/setup.vue @@ -1,15 +1,34 @@