From bff4893affebd8d0b176c9c802a4c8b07439d8ec Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Fri, 17 Jan 2025 17:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 2 +- component/Tabbar/Tabbar.vue | 13 +- package_sub/pages/AddOrder/AddOrder.vue | 135 ++++++++------- package_sub/pages/UserArchive/UserArchive.vue | 159 ++++++++++++++++++ pages.json | 16 +- pages/index/index.vue | 7 +- pages/login/login.vue | 2 +- pages/me/me.vue | 19 ++- pages/order/order.vue | 2 +- static/tabbar/home-active.svg | 1 + static/tabbar/home.svg | 2 +- static/tabbar/me-active.svg | 1 + static/tabbar/me.svg | 2 +- static/tabbar/order-active.svg | 1 + static/tabbar/order.svg | 2 +- 15 files changed, 291 insertions(+), 73 deletions(-) create mode 100644 package_sub/pages/UserArchive/UserArchive.vue create mode 100644 static/tabbar/home-active.svg create mode 100644 static/tabbar/me-active.svg create mode 100644 static/tabbar/order-active.svg diff --git a/common/config.js b/common/config.js index 89b2d43..bcdb157 100644 --- a/common/config.js +++ b/common/config.js @@ -1,5 +1,5 @@ const mode = 'devOnline'; //devLocal：本地测试、devOnline：线上测试、production：生产环境 -let ROOTPATH = 'http://yikangyang.ali251.langye.net'; //域名 +let ROOTPATH = 'https://yikangyang.ali251.langye.net'; //域名 switch (mode) { case 'devLocal': ROOTPATH = ROOTPATH diff --git a/component/Tabbar/Tabbar.vue b/component/Tabbar/Tabbar.vue index 6136c41..1abd3f6 100644 --- a/component/Tabbar/Tabbar.vue +++ b/component/Tabbar/Tabbar.vue @@ -9,7 +9,7 @@ @tap.stop="clickHandler(item)"> - + {{ item.text }} @@ -72,7 +72,7 @@ export default { .icon { width: 40rpx; height: 40rpx; - overflow: hidden; + // overflow: hidden; z-index: 2; position: relative; @@ -86,8 +86,9 @@ export default { &__inner { width: 40rpx; height: 40rpx; - transform: translateY(-80rpx); - filter: drop-shadow(0 80rpx 0 #333); + border-bottom: 40rpx solid transparent; + transform: translateZ(0); + // filter: drop-shadow(0 80rpx 0 #333); } } .text { @@ -113,7 +114,9 @@ export default { $activeIcon: 50rpx; width: $activeIcon; height: $activeIcon; - filter: drop-shadow(calc((#{$activeSize} - #{$activeIcon}) / 2) calc((#{$activeSize} - #{$activeIcon}) / 2 + 80rpx) 0 #fff); + transform: translateX(calc((#{$activeSize} - #{$activeIcon}) / 2)) translateY(calc((#{$activeSize} - #{$activeIcon}) / 2)) translateZ(0); + // filter: drop-shadow(calc((#{$activeSize} - #{$activeIcon}) / 2) calc((#{$activeSize} - #{$activeIcon}) / 2) 0 #fff); + // filter: drop-shadow(calc((#{$activeSize} - #{$activeIcon}) / 2) calc((#{$activeSize} - #{$activeIcon}) / 2 + 80rpx) 0 #fff); } } .text { diff --git a/package_sub/pages/AddOrder/AddOrder.vue b/package_sub/pages/AddOrder/AddOrder.vue index a92f587..e0e3be6 100644 --- a/package_sub/pages/AddOrder/AddOrder.vue +++ b/package_sub/pages/AddOrder/AddOrder.vue @@ -18,13 +18,13 @@ @@ -41,7 +41,14 @@ > - + @@ -66,9 +73,9 @@ :error-type="['toast']" > - + - + - - - 是 - 否 - +
+ + + 是 + 否 + +
- - - 男 - 女 - 任意 - +
+ + + 男 + 女 + 任意 + +
@@ -187,7 +195,7 @@ - + @@ -242,7 +250,7 @@
服务需求 - {{ form.content }} + {{ form.content || ' ' }} @@ -251,23 +259,23 @@ 姓名 - aa + {{ archive.name || ' ' }}
- 性别 - 女 + 身份证 + {{ archive.idcard || ' ' }}
- 年龄 - 55岁 + 地址 + {{ archive.address || ' ' }}
手机号 - 15555555555 + {{ archive.mobile || ' ' }}
行动能力 - 无障碍 + {{ archive.is_move ? '无障碍' : '有障碍' }} @@ -304,7 +312,7 @@ - + 实付： ¥ {{ accompanyProduct.price }} @@ -621,13 +629,22 @@ export default { rules: { user_archive_id: [ { + type: "number", required: true, message: "请选择就诊人", trigger: ["blur", "change"], }, ], + time: [ + { + required: true, + message: "请选择就诊时间", + trigger: ["blur", "change"], + }, + ], hospital: [ { + type: "number", required: true, message: "请选择就诊医院", trigger: ["blur", "change"], @@ -702,6 +719,7 @@ export default { this.form[key] = res[key]; } } + this.form['created_at'] = res['created_at'] }); }, async getHospital(site_id) { @@ -724,7 +742,6 @@ export default { this.form.accompany_product_id = item.id; this.getHospital(item.site_id); this.isShowService = false; - this.form.hospitalName = ""; this.form.hospital = ""; }, confirmHospital(e) { @@ -760,6 +777,7 @@ export default { ?.map((i) => i.response?.id) || []; const res = await this.$u.api.accompanyProductOrder(this.form); if (res) { + this.orderId = res.id; uni.showModal({ title: "下单成功", content: "下单成功，是否立即支付？", @@ -828,7 +846,7 @@ export default { title: "支付成功", icon: "none", }); - // await this.getDetail() + await this.getDetail(); } } catch (err) { uni.showToast({ @@ -841,16 +859,19 @@ export default { computed: { currentStep() { if (!this.orderId) { - return []; + return 0; } if (this.form.pay_status === 0) { - return [0]; + return 1; } if (this.form.pay_status === 1) { - return [0, 1]; + return 2; + } + if (this.form.pay_status === 2) { + return 3; } if (this.form.pay_status === 3) { - return [0, 1, 2, 3]; + return 4; } }, sex() { diff --git a/package_sub/pages/UserArchive/UserArchive.vue b/package_sub/pages/UserArchive/UserArchive.vue new file mode 100644 index 0000000..1891aff --- /dev/null +++ b/package_sub/pages/UserArchive/UserArchive.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/pages.json b/pages.json index 9752b1d..46c2cbb 100644 --- a/pages.json +++ b/pages.json @@ -63,6 +63,13 @@ "style": { "navigationBarTitleText": "服务对象" } + }, + { + "path": "pages/UserArchive/UserArchive", + "style": { + "navigationBarTitleText": "我的服务人员", + "enablePullDownRefresh": true + } } ] } @@ -79,17 +86,20 @@ { "pagePath": "pages/index/index", "text": "首页", - "myIconPath": "/static/tabbar/home.svg" + "myIconPath": "/static/tabbar/home.svg", + "selectedMyIconPath": "/static/tabbar/home-active.svg" }, { "pagePath": "pages/order/order", "text": "订单", - "myIconPath": "/static/tabbar/order.svg" + "myIconPath": "/static/tabbar/order.svg", + "selectedMyIconPath": "/static/tabbar/order-active.svg" }, { "pagePath": "pages/me/me", "text": "我的", - "myIconPath": "/static/tabbar/me.svg" + "myIconPath": "/static/tabbar/me.svg", + "selectedMyIconPath": "/static/tabbar/me-active.svg" } ], "color": "", diff --git a/pages/index/index.vue b/pages/index/index.vue index c2773d8..9e09d75 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -127,7 +127,12 @@ 陪诊团队介绍 让就医体验更美好 diff --git a/pages/login/login.vue b/pages/login/login.vue index 8a4eca8..4a443b7 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -19,7 +19,7 @@ 一件授权登录 + @click="authLogin">一键授权登录 diff --git a/pages/me/me.vue b/pages/me/me.vue index f01d939..7a6bba8 100644 --- a/pages/me/me.vue +++ b/pages/me/me.vue @@ -12,10 +12,26 @@ - + 陪诊订单 + + + 商城订单 + + + + 居家照护订单 + + + + 常用联系人 + + + + 售后订单 + @@ -91,6 +107,7 @@ export default { padding-left: 40rpx; &-name { + line-height: 2; font-weight: 600; } } diff --git a/pages/order/order.vue b/pages/order/order.vue index 3e90d7d..c03c41f 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -43,7 +43,7 @@ - + diff --git a/static/tabbar/home-active.svg b/static/tabbar/home-active.svg new file mode 100644 index 0000000..36905e6 --- /dev/null +++ b/static/tabbar/home-active.svg @@ -0,0 +1 @@ + diff --git a/static/tabbar/home.svg b/static/tabbar/home.svg index aa51b6c..02eb4eb 100644 --- a/static/tabbar/home.svg +++ b/static/tabbar/home.svg @@ -1 +1 @@ - + diff --git a/static/tabbar/me-active.svg b/static/tabbar/me-active.svg new file mode 100644 index 0000000..5f60f0a --- /dev/null +++ b/static/tabbar/me-active.svg @@ -0,0 +1 @@ + diff --git a/static/tabbar/me.svg b/static/tabbar/me.svg index 61a870b..d126abd 100644 --- a/static/tabbar/me.svg +++ b/static/tabbar/me.svg @@ -1 +1 @@ - + diff --git a/static/tabbar/order-active.svg b/static/tabbar/order-active.svg new file mode 100644 index 0000000..75a704d --- /dev/null +++ b/static/tabbar/order-active.svg @@ -0,0 +1 @@ + diff --git a/static/tabbar/order.svg b/static/tabbar/order.svg index 6812958..f8f04d5 100644 --- a/static/tabbar/order.svg +++ b/static/tabbar/order.svg @@ -1 +1 @@ - +