From 917ba55703d13420cf68672b6e9f1ca7c89ac38d Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 23 Oct 2023 16:34:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 53 ++++++++++++-------- pages/Personalinfo/Personalinfo.vue | 72 +++++++++++++++++++++++++++ pages/login/login.vue | 2 - pages/myinformation/myinformation.vue | 11 +++- 4 files changed, 114 insertions(+), 24 deletions(-) create mode 100644 pages/Personalinfo/Personalinfo.vue diff --git a/pages.json b/pages.json index e4ad754..43c0c9b 100644 --- a/pages.json +++ b/pages.json @@ -3,6 +3,23 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/myinformation/myinformation", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { "path": "pages/myinformation/myinformation", "style": { @@ -20,33 +37,27 @@ "enablePullDownRefresh": false, "navigationBarTitleText": "工单" } - }, { - "path": "pages/index/index", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - + } // { - // "path": "pages/login/login", + // "path": "pages/index/index", // "style": { - // "navigationBarTitleText": "", // "enablePullDownRefresh": false, // "navigationStyle": "custom" // } - // }, - { - "path": "pages/myinformation/myinformation", - "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4ac4ab" + // } - // "navigationStyle": "custom" - } - } - ], + + + ,{ + "path" : "pages/Personalinfo/Personalinfo", + "style" : + { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "", diff --git a/pages/Personalinfo/Personalinfo.vue b/pages/Personalinfo/Personalinfo.vue new file mode 100644 index 0000000..b224ce9 --- /dev/null +++ b/pages/Personalinfo/Personalinfo.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 693b49b..6490908 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -15,8 +15,6 @@ - - diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 7d9d635..30ce16c 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -70,7 +70,7 @@ - + 个人信息 @@ -113,6 +113,15 @@ }, methods: { + // 个人信息 + personlinfo(){ + uni.navigateTo({ + url:'/pages/Personalinfo/Personalinfo' + }) + + }, + + } } From ead56785c71fd1ee051d53eebb9c1bd72634cbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 23 Oct 2023 16:57:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ServiceSchedule/ServiceSchedule.vue | 321 ++++++++++++++++++++++ static/jiantou.png | Bin 0 -> 594 bytes 2 files changed, 321 insertions(+) create mode 100644 pages/ServiceSchedule/ServiceSchedule.vue create mode 100644 static/jiantou.png diff --git a/pages/ServiceSchedule/ServiceSchedule.vue b/pages/ServiceSchedule/ServiceSchedule.vue new file mode 100644 index 0000000..c345baf --- /dev/null +++ b/pages/ServiceSchedule/ServiceSchedule.vue @@ -0,0 +1,321 @@ + + + + + \ No newline at end of file diff --git a/static/jiantou.png b/static/jiantou.png new file mode 100644 index 0000000000000000000000000000000000000000..a8fcb76a2ff4e216908e6e5c49b5fc6330804199 GIT binary patch literal 594 zcmV-Y0Px%3`s;mR7gv$mN9SBP!xsFF{*c%7#ZUH5`>sQ3F)v;19siq*UahxFN)jNt}i^UcLM2zI)F*@A25n<)eD1 z^ICu+MeZxh^>BbiBMNVja{F(t+*PK#Fe!_L$iJYGYlDd*veLBNtCPUk-CS(=4**_C zBnnoQu zAZGf&jw~Di6qW&*4rE0B@X?45JJe6)uE>aLbEHuh7b4%*$Y3f# z78}9v6#+KY_rvC(sz(a482KK^rIcnim9|~VeQC371jM>3*%gqI%SN(YQl2T(t>iW~ zqY*9>a(ybR%`|_=V`aM4aem!zcII;gK2)YXn+FnuG9O5w-ZY*0ypR}_ezHm2`Et%l g^=Ukk|LYU+8*(MvWrNoik^lez07*qoM6N<$g8gn4?EnA( literal 0 HcmV?d00001 From 1897b377e86bfc0f3632b90c2150dfd723b8992e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 23 Oct 2023 17:31:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/utabs/u-tabs.vue | 385 ++++++++++++++++++++++ pages.json | 72 ++-- pages/ServiceSchedule/ServiceSchedule.vue | 18 +- pages/login/login.vue | 43 +-- pages/myinformation/myinformation.vue | 9 +- 5 files changed, 460 insertions(+), 67 deletions(-) create mode 100644 components/utabs/u-tabs.vue diff --git a/components/utabs/u-tabs.vue b/components/utabs/u-tabs.vue new file mode 100644 index 0000000..197e400 --- /dev/null +++ b/components/utabs/u-tabs.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/pages.json b/pages.json index 43c0c9b..2d369c6 100644 --- a/pages.json +++ b/pages.json @@ -3,34 +3,31 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { - "path": "pages/myinformation/myinformation", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, + { + "path": "pages/ServiceSchedule/ServiceSchedule", + "style": { + "navigationBarTitleText": "服务时间表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4ac4ab" + } + }, { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/myinformation/myinformation", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, - { - "path": "pages/myinformation/myinformation", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - // "navigationBarBackgroundColor": "#4ac4ab" - // "navigationStyle": "custom" - } - }, { "path": "pages/homepage/homepage", "style": { @@ -46,18 +43,17 @@ // } // } - - ,{ - "path" : "pages/Personalinfo/Personalinfo", - "style" : - { - "navigationBarTitleText": "个人信息", - "enablePullDownRefresh": false - } - - } - ], + + , { + "path": "pages/Personalinfo/Personalinfo", + "style": { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "", @@ -85,4 +81,4 @@ } ] } -} +} \ No newline at end of file diff --git a/pages/ServiceSchedule/ServiceSchedule.vue b/pages/ServiceSchedule/ServiceSchedule.vue index c345baf..f2b63a2 100644 --- a/pages/ServiceSchedule/ServiceSchedule.vue +++ b/pages/ServiceSchedule/ServiceSchedule.vue @@ -32,7 +32,7 @@ 不可预约 - + 9:30~10:00 可预约 @@ -65,7 +65,7 @@ 不可预约 - + 9:30~10:00 可预约 @@ -105,16 +105,16 @@ orderStatus: '', }, { name: '周一 01-01', - orderStatus: 'WAIT_PAY', + orderStatus: '', }, { name: '周二 01-01', - orderStatus: 'WAIT_RECEIVED_GOODS', + orderStatus: '', }, { name: '周三 01-01', - orderStatus: 'RECEIVED_GOODS', + orderStatus: '', }, { name: '周四 01-01', - orderStatus: 'EVALUATED', + orderStatus: '', }, { name: '周五 01-01', @@ -149,7 +149,7 @@ display: flex; position: fixed; right: 2%; - top: 20%; + top: 18%; flex-wrap: wrap; width: 400rpx; @@ -181,6 +181,7 @@ height: 361px; background: #fff; border-radius: 0rpx 5rpx 5rpx 0rpx; + // margin: 15px 0 15px 0; } .morning { @@ -190,6 +191,7 @@ border-radius: 0rpx 5rpx 5rpx 0rpx; margin: 20rpx auto; background-color: #fff; + margin: 15px 0 15px 0; .morningtime { padding: 15px 27px 62rpx 20rpx; @@ -266,7 +268,7 @@ } .content { - margin: 30rpx auto; + // padding-top: 30rpx; // top: 2%; background-color: #fff; width: 100%; diff --git a/pages/login/login.vue b/pages/login/login.vue index 6490908..056eb7c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -14,14 +14,14 @@ - + - - + + - + 登录 @@ -48,7 +48,11 @@ }, methods: { - + gohomepage() { + uni.redirectTo({ + url: '/pages/homepage/homepage' + }) + }, } } @@ -133,14 +137,15 @@ position: relative; width: 83%; /* background: red; */ - left: 50%; - transform: translateX(-50%); - top: 9%; + left: 50%; + transform: translateX(-50%); + top: 9%; ::v-deep .u-form-item--left { font-size: 30rpx; } - .pwd{ + + .pwd { display: inline-block; position: absolute; right: 10%; @@ -153,17 +158,17 @@ } - .loginsubmit{ - text-align: center; - width: 83%; - height: 88rpx; - line-height: 88rpx; - background: #18CBB3; - /* position: absolute; */ - margin: 177rpx auto; - color: #fff; + + .loginsubmit { + text-align: center; + width: 83%; + height: 88rpx; + line-height: 88rpx; + background: #18CBB3; + /* position: absolute; */ + margin: 177rpx auto; + color: #fff; border-radius: 100rpx - } } diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 30ce16c..17ecd54 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -68,8 +68,8 @@ 张三族 - - + + 个人信息 @@ -120,6 +120,11 @@ }) }, + gotime(){ + uni.navigateTo({ + url:'/pages/ServiceSchedule/ServiceSchedule' + }) + }, From 723a568b61c6d13f5af9651432f7381f9d635fbf Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 24 Oct 2023 09:57:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/homepage.png | Bin 2332 -> 706 bytes static/homepages.png | Bin 0 -> 1060 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/homepages.png diff --git a/static/homepage.png b/static/homepage.png index 2951ef2664051402284b9fcc25bad3cb8a446e75..63c30fa7aa36bc65be7f4db124b98046125beb71 100644 GIT binary patch literal 706 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 literal 0 HcmV?d00001