diff --git a/common/http.api.js b/common/http.api.js index 75cf369..3778bec 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -54,7 +54,9 @@ let apiApp = { // 就医服务 serveHospital:'/api/mobile/serve-hospital/hospital', serveHospitalDetail:'/api/mobile/serve-hospital/hospital-detail', - serveHospitalForm:'/api/mobile/serve-hospital/forms' + serveHospitalForm:'/api/mobile/serve-hospital/forms', + serveHospitalOrder:'/api/mobile/user/serve-hospital-form', + serveHospitalOrderDetail:'/api/mobile/user/serve-hospital-form-detail', } @@ -117,6 +119,8 @@ const install = (Vue, vm) => { const serveHospital = (params = {}) => vm.$u.get(apiApp.serveHospital, params) const serveHospitalDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalDetail, params) const serveHospitalForm = (params = {}) => vm.$u.get(apiApp.serveHospitalForm, params) + const serveHospitalOrder = (params = {}) => vm.$u.get(apiApp.serveHospitalOrder, params) + const serveHospitalOrderDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalOrderDetail, params) // end vm.$u.api = { @@ -144,7 +148,7 @@ const install = (Vue, vm) => { // 购物车 cartList, cartSave, cartShow, cartDestroy, //就医服务 - serveHospital,serveHospitalDetail,serveHospitalForm + serveHospital,serveHospitalDetail,serveHospitalForm,serveHospitalOrder,serveHospitalOrderDetail }; } diff --git a/package_sub/pages/ServeForm/ServeForm.vue b/package_sub/pages/ServeForm/ServeForm.vue index 6ec7034..20da8e1 100644 --- a/package_sub/pages/ServeForm/ServeForm.vue +++ b/package_sub/pages/ServeForm/ServeForm.vue @@ -154,11 +154,17 @@ }], isShowType: false, list_type: [{ - label: '专家咨询', - value: '专家咨询' + label: '挂号', + value: '挂号' }, { - label: '普通咨询', - value: '普通咨询' + label: '陪诊', + value: '陪诊' + },{ + label: '照护', + value: '照护' + }, { + label: '预约专家', + value: '预约专家' }], }; @@ -215,8 +221,8 @@ icon:'none', success() { setTimeout(function() { - uni.switchTab({ - url: '/pages/index/index' + uni.redirectTo({ + url:'/package_sub/pages/ServeOrder/ServeOrder' }) }, 1500) } diff --git a/package_sub/pages/ServeOrder/ServeOrder.vue b/package_sub/pages/ServeOrder/ServeOrder.vue new file mode 100644 index 0000000..9447c11 --- /dev/null +++ b/package_sub/pages/ServeOrder/ServeOrder.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/package_sub/pages/ServeOrderDetail/ServeOrderDetail.vue b/package_sub/pages/ServeOrderDetail/ServeOrderDetail.vue new file mode 100644 index 0000000..31a3ac9 --- /dev/null +++ b/package_sub/pages/ServeOrderDetail/ServeOrderDetail.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file diff --git a/package_sub/pages/ServiceList/ServiceList.vue b/package_sub/pages/ServiceList/ServiceList.vue index 0519269..feb7785 100644 --- a/package_sub/pages/ServiceList/ServiceList.vue +++ b/package_sub/pages/ServiceList/ServiceList.vue @@ -68,7 +68,7 @@ 'height': '60rpx', 'line-height': '60rpx' }, - last_page:1, + last_page: 1, select: { page: 1, page_size: 5, @@ -103,21 +103,21 @@ async getList() { const res = await this.$u.api.accompanyProduct({ ...this.select, - site_id: this.vuex_site?.id + site_id: this.vuex_site?.id }) this.last_page = res.last_page - this.loadStatus = this.select.page >= this.last_page ?'nomore':'loadmore' + this.loadStatus = this.select.page >= this.last_page ? 'nomore' : 'loadmore' this.list.push(...res.data) - console.log(this.select.page,this.last_page) + console.log(this.select.page, this.last_page) }, reachBottom() { - if (this.select.page > this.last_page) { - this.loadStatus = 'nomore' - return - } - this.loadStatus = 'loading' - this.select.page++ - this.getList() + if (this.select.page > this.last_page) { + this.loadStatus = 'nomore' + return + } + this.loadStatus = 'loading' + this.select.page++ + this.getList() }, confirmSite(e) { this.$u.vuex("vuex_site", e[0]) @@ -126,34 +126,33 @@ this.getList() }, toOrder(item) { - if (!this.token) { - uni.showModal({ - title: "提示", - content: "请先登录再下单", - confirmText: "登录", - success: (status) => { - if (status.confirm) { - this.$u.route({ - url: '/pages/login/login', - type: 'redirect' - }) - } else { + if (!this.token) { + uni.showModal({ + title: "提示", + content: "请先登录再下单", + confirmText: "登录", + success: (status) => { + if (status.confirm) { + this.$u.route({ + url: '/pages/login/login', + type: 'redirect' + }) + } else { - } - }, - fail: () => { - }, - }); - return - } + } + }, + fail: () => {}, + }); + return + } this.$u.route({ url: '/package_sub/pages/AddOrder/AddOrder', - params: { - id: item.id, - title: item.name, - site_id: item.site_id, - type: item.type - } + params: { + id: item.id, + title: item.name, + site_id: item.site_id, + type: item.type + } }) }, toDetail(item) { @@ -162,11 +161,11 @@ }) } }, - computed: { - token() { - return this.vuex_token || uni.getStorageSync('lifeData')?.vuex_token - } - } + computed: { + token() { + return this.vuex_token || uni.getStorageSync('lifeData')?.vuex_token + } + } } @@ -281,4 +280,4 @@ } } } - + \ No newline at end of file diff --git a/package_sub/pages/Shop/ProductDetail.vue b/package_sub/pages/Shop/ProductDetail.vue index 82f4ad2..ecb0cd3 100644 --- a/package_sub/pages/Shop/ProductDetail.vue +++ b/package_sub/pages/Shop/ProductDetail.vue @@ -258,7 +258,7 @@ diff --git a/pages.json b/pages.json index a4256e0..e6ed064 100644 --- a/pages.json +++ b/pages.json @@ -157,6 +157,20 @@ "style": { "navigationBarTitleText": "提交咨询" } + }, + { + "path": "pages/ServeOrder/ServeOrder", + "style": { + "navigationBarTitleText": "就医服务", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/ServeOrderDetail/ServeOrderDetail", + "style": { + "navigationBarTitleText": "就医服务", + "enablePullDownRefresh": true + } } ] diff --git a/pages/me/me.vue b/pages/me/me.vue index 36273f5..deb88a5 100644 --- a/pages/me/me.vue +++ b/pages/me/me.vue @@ -53,7 +53,7 @@ 商城订单 - 居家照护订单 - + --> + + + 就医服务订单 +