diff --git a/api/taskReturn/taskReturn.js b/api/taskReturn/taskReturn.js new file mode 100644 index 0000000..ad8f6e9 --- /dev/null +++ b/api/taskReturn/taskReturn.js @@ -0,0 +1,11 @@ +import request from "../request.js" + + +export function orderFallback(data) { + return request({ + url: `/nurseApp/personLogin/orderFallback`, + method: 'POST', + data + }) +} + diff --git a/pages.json b/pages.json index 6561708..dfecb5d 100644 --- a/pages.json +++ b/pages.json @@ -3,36 +3,34 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/login/login", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { - "path": "pages/Changepassword/Changepassword", - "style": { - "navigationBarTitleText": "修改密码", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true - } - }, - { - "path": "pages/Modifyphonenumber/Modifyphonenumber", - "style": { - "navigationBarTitleText": "修改手机号", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true - } - },{ - "path": "pages/homepage/homepage", - "style": { - "navigationBarTitleText": "工单", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true - } - }, + { + "path" : "pages/taskReturn/taskReturn", + "style" : + { + "navigationBarTitleText": "退回原因", + "enablePullDownRefresh": false + } + + }, + { + "path" : "pages/Completedwork/Completedwork", + "style" : + { + "navigationBarTitleText": "已完成工单", + "enablePullDownRefresh": false + } + + }, + + + { + "path": "pages/myinformation/myinformation", + "style": { + "navigationBarTitleText": "我的", + "enablePullDownRefresh": false + + } + }, { "path": "pages/ServiceSchedule/ServiceSchedule", "style": { @@ -40,29 +38,25 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#4ac4ab" } - }, - { - "path": "pages/seekadvicefrom/seekadvicefrom", + }, { + "path": "pages/login/login", "style": { + "navigationBarTitleText": "", "enablePullDownRefresh": false, "navigationStyle": "custom" } }, - + + + { - "path": "pages/myinformation/myinformation", + "path": "pages/homepage/homepage", "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": false - // "navigationStyle": "custom" + "enablePullDownRefresh": false, + "navigationBarTitleText": "工单" } - }, { - "path": "pages/taskDetails/taskDetails", - "style": { - "navigationBarTitleText": "工单详情", - "enablePullDownRefresh": false - } - }, { + } + , { "path": "pages/Personalinfo/Personalinfo", "style": { "navigationBarTitleText": "个人信息", @@ -70,12 +64,15 @@ } } - ], + + + ], "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "", "navigationBarBackgroundColor": "#18CBB3", "backgroundColor": "#F8F8F8" + }, "uniIdRouter": {}, "tabBar": { @@ -97,4 +94,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pages/Completedwork/Completedwork.vue b/pages/Completedwork/Completedwork.vue new file mode 100644 index 0000000..58fa2d9 --- /dev/null +++ b/pages/Completedwork/Completedwork.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/pages/ServiceSchedule/ServiceSchedule.vue b/pages/ServiceSchedule/ServiceSchedule.vue index 88119de..51ae17d 100644 --- a/pages/ServiceSchedule/ServiceSchedule.vue +++ b/pages/ServiceSchedule/ServiceSchedule.vue @@ -149,7 +149,7 @@ display: flex; position: absolute; right: 2%; - top: 13%; + top: 20%; flex-wrap: wrap; width: 400rpx; @@ -299,7 +299,7 @@ width: 100%; position: fixed; - + } .imageitem { @@ -318,4 +318,4 @@ } } } - \ No newline at end of file + diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index a90e586..061c6ff 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -254,7 +254,13 @@ }) }, tabschange(index) { + console.log(index) this.tabscurrent = index; + if(this.tabscurrent==2){ + uni.navigateTo({ + url:'/pages/Completedwork/Completedwork' + }) + } this.query.orderStatus = this.tabslist[index].value this.optionname = '全部' this.info(); diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 6574588..c9f8b98 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -1,13 +1,7 @@