From bddf3f371163319610ea34b7d0128cd60984d604 Mon Sep 17 00:00:00 2001 From: "271556543@qq.com" <271556543@qq.com> Date: Thu, 29 Sep 2022 17:35:51 +0800 Subject: [PATCH] 2022-9-29 xy --- common/config.js | 2 +- common/http.api.js | 65 ++--- manifest.json | 4 + pages/detailNursing/detailNursing.vue | 300 +++++++++++++--------- pages/home/home.vue | 3 +- pages/list/list.vue | 8 +- pages/nursingCalendar/nursingCalendar.vue | 3 +- pages/setting/setting.vue | 12 +- pages/todayNursing/todayNursing.vue | 9 +- static/female.png | Bin 0 -> 5777 bytes static/male.png | Bin 0 -> 5143 bytes store/index.js | 2 + 12 files changed, 249 insertions(+), 159 deletions(-) create mode 100644 static/female.png create mode 100644 static/male.png diff --git a/common/config.js b/common/config.js index 2207b79..e40357d 100644 --- a/common/config.js +++ b/common/config.js @@ -1,4 +1,4 @@ -const mode = process.env.NODE_ENV; +const mode = 'development'; let ROOTPATH = ''; //域名 switch (mode) { case 'development': diff --git a/common/http.api.js b/common/http.api.js index 36d236a..d9c2ae7 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -1,51 +1,54 @@ //api集合 let apiAuth = { - login: "/api/nurse/auth/login", - me: "/api/nurse/auth/me", - logout: "/api/nurse/auth/logout", - save: "/api/nurse/auth/save", + login: "/api/nurse/auth/login", + me: "/api/nurse/auth/me", + logout: "/api/nurse/auth/logout", + save: "/api/nurse/auth/save", }; let apiTask = { - nurseList: "/api/nurse/nurse-list", - nurseDetail: "/api/nurse/nurse-detail", - nurseSave: "/api/nurse/nurse-save", - nurseCalendar: "/api/nurse/nurse-calendar", - noticeList: "/api/nurse/notice-list", - noticeDetail: "/api/nurse/notice-detail", - statistic: "/api/nurse/statistic", + nurseList: "/api/nurse/nurse-list", + nurseDetail: "/api/nurse/nurse-detail", + nurseSave: "/api/nurse/nurse-save", + processSave: "/api/nurse/process-save", + nurseCalendar: "/api/nurse/nurse-calendar", + noticeList: "/api/nurse/notice-list", + noticeDetail: "/api/nurse/notice-detail", + statistic: "/api/nurse/statistic", }; // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作 const install = (Vue, vm) => { - //api方法 - let login = (data = {}) => vm.$u.post(apiAuth.login, data); - let me = (data = {}) => vm.$u.post(apiAuth.me, data); - let logout = (data = {}) => vm.$u.post(apiAuth.logout, data); - let save = (data = {}) => vm.$u.post(apiAuth.save, data); + //api方法 + let login = (data = {}) => vm.$u.post(apiAuth.login, data); + let me = (data = {}) => vm.$u.post(apiAuth.me, data); + let logout = (data = {}) => vm.$u.post(apiAuth.logout, data); + let save = (data = {}) => vm.$u.post(apiAuth.save, data); - let nurseList = (params = {}) => vm.$u.get(apiTask.nurseList, params); - let nurseDetail = (params = {}) => vm.$u.get(apiTask.nurseDetail, params); - let nurseSave = (data = {}) => vm.$u.post(apiTask.nurseSave, data); - let nurseCalendar = (params = {}) => vm.$u.get(apiTask.nurseCalendar, params); - let noticeList = (params = {}) => vm.$u.get(apiTask.noticeList, params); - let noticeDetail = (params = {}) => vm.$u.get(apiTask.noticeDetail, params); - let statistic = (params = {}) => vm.$u.get(apiTask.statistic, params); - // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - vm.$u.api = { - login, - me, - logout, - save, + let nurseList = (params = {}) => vm.$u.get(apiTask.nurseList, params); + let nurseDetail = (params = {}) => vm.$u.get(apiTask.nurseDetail, params); + let nurseSave = (data = {}) => vm.$u.post(apiTask.nurseSave, data); + let processSave = (data = {}) => vm.$u.post(apiTask.processSave, data); + let nurseCalendar = (params = {}) => vm.$u.get(apiTask.nurseCalendar, params); + let noticeList = (params = {}) => vm.$u.get(apiTask.noticeList, params); + let noticeDetail = (params = {}) => vm.$u.get(apiTask.noticeDetail, params); + let statistic = (params = {}) => vm.$u.get(apiTask.statistic, params); + // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 + vm.$u.api = { + login, + me, + logout, + save, nurseList, nurseDetail, nurseSave, + processSave, nurseCalendar, noticeList, noticeDetail, statistic - }; + }; }; export default { - install, + install, }; diff --git a/manifest.json b/manifest.json index b6baff8..a0da06e 100644 --- a/manifest.json +++ b/manifest.json @@ -59,6 +59,10 @@ "scope.userLocation" : { "desc" : "获取位置" } + }, + "requiredPrivateInfos" : [ "getLocation" ], + "optimization" : { + "subPackages" : true } }, "mp-alipay" : { diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue index 74cf909..901eedd 100644 --- a/pages/detailNursing/detailNursing.vue +++ b/pages/detailNursing/detailNursing.vue @@ -50,7 +50,7 @@ {{detail.customer.phone}} - + 更新定位 @@ -66,10 +66,9 @@ - - - {{item.sku_info.name}} - + + {{item.sku_info.name}} + - + 过程打卡 - （1） + （3） + + + 签到 + {{$u.timeFormat(time,'hh:MM:ss')}} + + + 签退 + {{$u.timeFormat(time,'hh:MM:ss')}} - + 更新定位 {{$u.timeFormat(time,'hh:MM:ss')}} @@ -102,12 +109,14 @@