From a9a368dd3a399e9056b6b7e96c4a5d3a5e3b08de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 13 Apr 2023 16:02:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 47 +- androidPrivacy.json | 70 +- api/Modifyinformation/Modifyinformation.js | 20 +- api/MyBenefits/MyBenefits.js | 17 + api/{ => Mymission}/Mymission.js | 16 +- api/homepage/index.js | 9 + api/personnal/personal.js | 15 +- api/request.js | 29 +- api/{startup.js => startup/index.js} | 3 +- api/taskDetails.js | 11 - api/taskDetails/taskDetails.js | 9 + api/taskReturn/index.js | 7 +- manifest.json | 9 +- pages.json | 142 ++-- pages/Healthknowledge/Healthknowledge.vue | 170 +++++ .../Modifyinformation/Modifyinformation.scss | 171 +++-- pages/Modifyinformation/Modifyinformation.vue | 348 ++++++--- pages/MyBenefits/MyBenefits.vue | 378 ++++++++++ pages/Mymission/Mymission.vue | 557 +++++++------- pages/RevenueDetails/RevenueDetails.vue | 345 +++++++++ pages/confirmCompletion/confirmCompletion.vue | 381 +++++++--- pages/homepage/homepage.vue | 316 ++++++-- pages/login/login.vue | 13 +- pages/personal/personal.vue | 441 ++++++----- pages/signature/signature.vue | 11 +- pages/startup/startup.vue | 68 +- pages/study/study.vue | 71 ++ pages/taskDetails/taskDetails.scss | 191 +++-- pages/taskDetails/taskDetails.vue | 201 +++-- pages/taskReturn/taskReturn.vue | 245 ++++-- pages/ucalendar/u-calendar.vue | 671 +++++++++++++++++ pages/upicker/u-picker.vue | 695 ++++++++++++++++++ pages/v-sign/changelog.md | 48 ++ .../v-sign-action/v-sign-action.vue | 165 +++++ .../components/v-sign-color/v-sign-color.vue | 212 ++++++ .../components/v-sign-pen/v-sign-pen.vue | 215 ++++++ pages/v-sign/components/v-sign/v-sign.vue | 314 ++++++++ pages/v-sign/package.json | 83 +++ pages/v-sign/readme.md | 245 ++++++ pages/v-sign/static/image/clear.png | Bin 0 -> 6420 bytes pages/v-sign/static/image/clear.svg | 1 + pages/v-sign/static/image/next.png | Bin 0 -> 7319 bytes pages/v-sign/static/image/next.svg | 1 + pages/v-sign/static/image/prev.png | Bin 0 -> 7356 bytes pages/v-sign/static/image/prev.svg | 1 + pages/v-sign/static/image/save.png | Bin 0 -> 3573 bytes pages/v-sign/static/image/save.svg | 1 + pages/v-sign/utils/index.js | 15 + static/1024.png | Bin 124358 -> 0 bytes static/autograph.png | Bin 1571 -> 1050 bytes static/daohang.png | Bin 0 -> 793 bytes static/dcl.png | Bin 0 -> 12912 bytes static/detailed.png | Bin 13871 -> 0 bytes static/dingdan.png | Bin 2029 -> 0 bytes static/dingyue.png | Bin 0 -> 10499 bytes static/dqgd.png | Bin 0 -> 1447 bytes static/dqgd2.png | Bin 0 -> 1293 bytes static/evaluated.png | Bin 2019 -> 0 bytes static/finished.png | Bin 1673 -> 0 bytes static/fuwu.png | Bin 0 -> 1061 bytes static/fuwutu.png | Bin 50424 -> 0 bytes static/gb.png | Bin 1253 -> 0 bytes static/gb2.png | Bin 0 -> 2865 bytes static/gongdan.png | Bin 0 -> 38191 bytes static/headportrait.png | Bin 2342 -> 0 bytes static/hlxw.png | Bin 0 -> 136913 bytes static/home.png | Bin 3372 -> 0 bytes static/home1.png | Bin 2236 -> 0 bytes static/homepage.png | Bin 0 -> 9520 bytes static/jiantou.png | Bin 1297 -> 0 bytes static/jinbi.png | Bin 0 -> 1396 bytes static/jnks.png | Bin 0 -> 6555 bytes static/kaishi.png | Bin 0 -> 3054 bytes static/kaishi2.png | Bin 0 -> 1618 bytes static/kaoshi.png | Bin 0 -> 1159 bytes static/lixian.png | Bin 0 -> 2498 bytes static/lixian2.png | Bin 0 -> 1526 bytes static/logo.png | Bin 23943 -> 54113 bytes static/manglu.png | Bin 0 -> 2919 bytes static/manglu2.png | Bin 0 -> 1453 bytes static/no.png | Bin 0 -> 1326 bytes static/noorder.png | Bin 2577 -> 0 bytes static/order.png | Bin 1443 -> 0 bytes static/paishe.png | Bin 0 -> 4137 bytes static/person.png | Bin 1632 -> 0 bytes static/pic.png | Bin 729 -> 0 bytes static/qbgd.png | Bin 0 -> 987 bytes static/qbgd2.png | Bin 0 -> 847 bytes static/radio.png | Bin 2283 -> 0 bytes static/rowsright.png | Bin 638 -> 0 bytes static/shezhi.png | Bin 0 -> 1858 bytes static/shopping.png | Bin 2651 -> 0 bytes static/shouyi.png | Bin 0 -> 1249 bytes static/shouyibeijing.png | Bin 0 -> 37686 bytes static/sousuo.png | Bin 1512 -> 0 bytes static/temple.png | Bin 0 -> 1435 bytes static/upload.png | Bin 0 -> 590 bytes static/user.png | Bin 2406 -> 1014 bytes static/user2.png | Bin 0 -> 3853 bytes static/userw.png | Bin 0 -> 1942 bytes static/xg.png | Bin 0 -> 503 bytes static/xuexi.png | Bin 0 -> 1354 bytes static/xxpx.png | Bin 0 -> 5600 bytes static/ywc.png | Bin 0 -> 28779 bytes static/ywcgd.png | Bin 0 -> 1449 bytes static/ywcgd2.png | Bin 0 -> 1318 bytes static/ziliao.png | Bin 0 -> 977 bytes static/zxkf.png | Bin 0 -> 7579 bytes 108 files changed, 5746 insertions(+), 1232 deletions(-) create mode 100644 api/MyBenefits/MyBenefits.js rename api/{ => Mymission}/Mymission.js (55%) create mode 100644 api/homepage/index.js rename api/{startup.js => startup/index.js} (78%) delete mode 100644 api/taskDetails.js create mode 100644 api/taskDetails/taskDetails.js create mode 100644 pages/Healthknowledge/Healthknowledge.vue create mode 100644 pages/MyBenefits/MyBenefits.vue create mode 100644 pages/RevenueDetails/RevenueDetails.vue create mode 100644 pages/study/study.vue create mode 100644 pages/ucalendar/u-calendar.vue create mode 100644 pages/upicker/u-picker.vue create mode 100644 pages/v-sign/changelog.md create mode 100644 pages/v-sign/components/v-sign-action/v-sign-action.vue create mode 100644 pages/v-sign/components/v-sign-color/v-sign-color.vue create mode 100644 pages/v-sign/components/v-sign-pen/v-sign-pen.vue create mode 100644 pages/v-sign/components/v-sign/v-sign.vue create mode 100644 pages/v-sign/package.json create mode 100644 pages/v-sign/readme.md create mode 100644 pages/v-sign/static/image/clear.png create mode 100644 pages/v-sign/static/image/clear.svg create mode 100644 pages/v-sign/static/image/next.png create mode 100644 pages/v-sign/static/image/next.svg create mode 100644 pages/v-sign/static/image/prev.png create mode 100644 pages/v-sign/static/image/prev.svg create mode 100644 pages/v-sign/static/image/save.png create mode 100644 pages/v-sign/static/image/save.svg create mode 100644 pages/v-sign/utils/index.js delete mode 100644 static/1024.png create mode 100644 static/daohang.png create mode 100644 static/dcl.png delete mode 100644 static/detailed.png delete mode 100644 static/dingdan.png create mode 100644 static/dingyue.png create mode 100644 static/dqgd.png create mode 100644 static/dqgd2.png delete mode 100644 static/evaluated.png delete mode 100644 static/finished.png create mode 100644 static/fuwu.png delete mode 100644 static/fuwutu.png delete mode 100644 static/gb.png create mode 100644 static/gb2.png create mode 100644 static/gongdan.png delete mode 100644 static/headportrait.png create mode 100644 static/hlxw.png delete mode 100644 static/home.png delete mode 100644 static/home1.png create mode 100644 static/homepage.png delete mode 100644 static/jiantou.png create mode 100644 static/jinbi.png create mode 100644 static/jnks.png create mode 100644 static/kaishi.png create mode 100644 static/kaishi2.png create mode 100644 static/kaoshi.png create mode 100644 static/lixian.png create mode 100644 static/lixian2.png create mode 100644 static/manglu.png create mode 100644 static/manglu2.png create mode 100644 static/no.png delete mode 100644 static/noorder.png delete mode 100644 static/order.png create mode 100644 static/paishe.png delete mode 100644 static/person.png delete mode 100644 static/pic.png create mode 100644 static/qbgd.png create mode 100644 static/qbgd2.png delete mode 100644 static/radio.png delete mode 100644 static/rowsright.png create mode 100644 static/shezhi.png delete mode 100644 static/shopping.png create mode 100644 static/shouyi.png create mode 100644 static/shouyibeijing.png delete mode 100644 static/sousuo.png create mode 100644 static/temple.png create mode 100644 static/upload.png create mode 100644 static/user2.png create mode 100644 static/userw.png create mode 100644 static/xg.png create mode 100644 static/xuexi.png create mode 100644 static/xxpx.png create mode 100644 static/ywc.png create mode 100644 static/ywcgd.png create mode 100644 static/ywcgd2.png create mode 100644 static/ziliao.png create mode 100644 static/zxkf.png diff --git a/App.vue b/App.vue index bec52b3..0b4cbf3 100644 --- a/App.vue +++ b/App.vue @@ -9,54 +9,15 @@ diff --git a/androidPrivacy.json b/androidPrivacy.json index 2dd0b22..78574c0 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -1,37 +1,37 @@ { - "version" : "1", - "prompt" : "template", - "title" : "服务协议和隐私政策", - "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", - "buttonAccept" : "同意并接受", - "buttonRefuse" : "暂不同意", - "hrefLoader" : "system|default", - "second" : { - "title" : "确认提示", - "message" : "进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", - "buttonAccept" : "同意并继续", - "buttonRefuse" : "退出应用" - }, - "disagreeMode" : { - "support" : false, - "loadNativePlugins" : false, - "visitorEntry" : true, - "showAlways" : true - }, - "styles" : { - "backgroundColor" : "#ffffff", - "borderRadius" : "5px", - "title" : { - "color" : "#000000" - }, - "buttonAccept" : { - "color" : "#000000" - }, - "buttonRefuse" : { - "color" : "#000000" - }, - "buttonVisitor" : { - "color" : "#000000" - } - } + "version": "1", + "prompt": "template", + "title": "用户协议与隐私政策", + "message": "请你务必审慎阅读、充分理解“用户协议与隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《用户协议与隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept": "同意并接受", + "buttonRefuse": "暂不同意", + "hrefLoader": "system|default", + "second": { + "title": "确认提示", + "message": "进入应用前，你需先同意《用户协议与隐私政策》，否则将退出应用。", + "buttonAccept": "同意并继续", + "buttonRefuse": "退出应用" + }, + "disagreeMode": { + "support": false, + "loadNativePlugins": false, + "visitorEntry": false, + "showAlways": false + }, + "styles": { + "backgroundColor": "#ffffff", + "borderRadius": "5px", + "title": { + "color": "#000000" + }, + "buttonAccept": { + "color": "#000000" + }, + "buttonRefuse": { + "color": "#000000" + }, + "buttonVisitor": { + "color": "#000000" + } + } } diff --git a/api/Modifyinformation/Modifyinformation.js b/api/Modifyinformation/Modifyinformation.js index da9821b..349999e 100644 --- a/api/Modifyinformation/Modifyinformation.js +++ b/api/Modifyinformation/Modifyinformation.js @@ -1,12 +1,13 @@ import request from "../request.js" -export function userPassWord(data) { +export function updateNursePersonCheck(data) { return request({ - url: `/nurseApp/personLogin/userPassWord`, + url: `/nurseApplet/personCenter/updateNursePersonCheck`, method: 'POST', data, }) } + export function updateHeadAvatarHead(userId, File) { return request({ url: `/nurseApp/personLogin/updateHeadAvatarHead?userId=${userId}&File=${File}`, @@ -20,3 +21,18 @@ export function nursePerson(phonenumber, password) { method: 'GET' }) } + +export function nurseAppLoginSysUser(data) { + return request({ + url: `/nurseApp/personLogin/nurseAppLoginSysUser`, + method: 'POST', + data, + }) +} + +export function personNurseStationLists(pageNum,pageSize) { + return request({ + url: `/nurseApp/personLogin/personNurseStationLists?pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'get' + }) +} diff --git a/api/MyBenefits/MyBenefits.js b/api/MyBenefits/MyBenefits.js new file mode 100644 index 0000000..257131f --- /dev/null +++ b/api/MyBenefits/MyBenefits.js @@ -0,0 +1,17 @@ +import request from "../request.js" + +//个人中心 我的收益 金额 +export function personRevenue(nurseStationPersonId, monthTime, monthStartTime, monthEndTime) { + return request({ + url: `/nurseApplet/personCenter/personRevenue?nurseStationPersonId=${nurseStationPersonId}&&monthTime=${monthTime}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`, + method: 'GET' + }) +} + +// 个人中心 我的收益 订单列表分页 +export function personRevenueDetails(pageNum, pageSize, nurseStationPersonId, monthTime, monthStartTime, monthEndTime) { + return request({ + url: `/nurseApplet/personCenter/personRevenueDetails?pageNum=${pageNum}&&pageSize=${pageSize}&&nurseStationPersonId=${nurseStationPersonId}&&monthTime=${monthTime}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`, + method: 'GET', + }) +} diff --git a/api/Mymission.js b/api/Mymission/Mymission.js similarity index 55% rename from api/Mymission.js rename to api/Mymission/Mymission.js index 838f627..f8c5d0a 100644 --- a/api/Mymission.js +++ b/api/Mymission/Mymission.js @@ -1,9 +1,19 @@ -import request from "./request.js" +import request from "../request.js" - -export function selectMission(nursePersonId, orderStatus, pageNum, pageSize,nurseItemName) { +//工单list +export function selectMission(nursePersonId, orderStatus, pageNum, pageSize, nurseItemName) { return request({ url: `/nurseApp/personLogin/selectMission?nursePersonId=${nursePersonId}&orderStatus=${orderStatus}&pageNum=${pageNum}&pageSize=${pageSize}&nurseItemName=${nurseItemName}`, method: 'GET' }) } + + +//接单 +export function receiveOrders(data) { + return request({ + url: `/nurseApplet/personWorkOrder/receiveOrders`, + method: 'post', + data + }) +} diff --git a/api/homepage/index.js b/api/homepage/index.js new file mode 100644 index 0000000..a7e6a4a --- /dev/null +++ b/api/homepage/index.js @@ -0,0 +1,9 @@ +import request from "../request.js" + +// +export function selectOrderByNursePersonCount(nurseStationPersonId) { + return request({ + url: `/nurseApp/personLogin/selectOrderByNursePersonCount?nurseStationPersonId=${nurseStationPersonId}`, + method: 'GET' + }) +} diff --git a/api/personnal/personal.js b/api/personnal/personal.js index b8e825d..a59e092 100644 --- a/api/personnal/personal.js +++ b/api/personnal/personal.js @@ -1,7 +1,18 @@ import request from "../request.js" -export function nursePerson(phonenumber,password) { + +//个人信息查询护理站人员的个人信息 +export function nurseAppletPersonCenter(nursePersonId) { return request({ - url: `/nurseApp/personLogin/nursePerson?phonenumber=${phonenumber}&stationPersonPassword=${password}`, + url: `/nurseApplet/personCenter/nurseAppletPersonCenter?nursePersonId=${nursePersonId}`, method: 'GET' }) } + +// 护理员App和小程序护理员修改状态 +export function updateNursePersonWorkStatus(data) { + return request({ + url: `/nurseApplet/personCenter/updateNursePersonWorkStatus`, + method: 'post', + data + }) +} diff --git a/api/request.js b/api/request.js index 31de474..02bfd08 100644 --- a/api/request.js +++ b/api/request.js @@ -16,29 +16,16 @@ var request = function(config) { success(res) { if (res.data.code == 9999) { uni.removeStorageSync('token'); - // uni.reLaunch({ + uni.removeStorageSync('nursePersonId'); + uni.removeStorageSync('phone'); + uni.reLaunch({ + url: '/pages/login/login' + }) + } else if (res.data.code == 500) { + // uni.removeStorageSync('nursePersonId'); + // uni.navigateTo({ // url: '/pages/login/login' // }) - uni.showModal({ - title: "登录提示", - content: '登录失效,请重新登录', - success(res1) { - if (res1.confirm) { - uni.navigateTo({ - url: '/pages/login/login' - }) - } else if (res1.cancel) { - uni.reLaunch({ - url: '/pages/homepage/homepage' - }) - } - }, - fail(err1) { - uni.reLaunch({ - url: '/pages/homepage/homepage' - }) - } - }) } uni.hideLoading(); resolve(res.data) diff --git a/api/startup.js b/api/startup/index.js similarity index 78% rename from api/startup.js rename to api/startup/index.js index b4bdb03..b442c9f 100644 --- a/api/startup.js +++ b/api/startup/index.js @@ -1,5 +1,4 @@ -import request from "./request.js" - +import request from "../request.js" export function appFileInfoByOneId() { return request({ diff --git a/api/taskDetails.js b/api/taskDetails.js deleted file mode 100644 index 876dff8..0000000 --- a/api/taskDetails.js +++ /dev/null @@ -1,11 +0,0 @@ -import request from "./request.js" - -// 任务详情 - -export function taskDetails(orderDetailsId) { - return request({ - url: `/nurseApp/personLogin/taskDetails?&orderDetailsId=${orderDetailsId}`, - method: 'GET' - }) -} - diff --git a/api/taskDetails/taskDetails.js b/api/taskDetails/taskDetails.js new file mode 100644 index 0000000..b8616a0 --- /dev/null +++ b/api/taskDetails/taskDetails.js @@ -0,0 +1,9 @@ +import request from "../request.js" + +// 任务详情 +export function taskDetails(orderDetailsId) { + return request({ + url: `/nurseApp/personLogin/taskDetails?orderNo=${orderDetailsId}`, + method: 'GET' + }) +} diff --git a/api/taskReturn/index.js b/api/taskReturn/index.js index 386b64c..a534cc0 100644 --- a/api/taskReturn/index.js +++ b/api/taskReturn/index.js @@ -1,9 +1,10 @@ import request from "../request.js" -export function orderFallback(orderNo, taskReturnReason) { +export function orderFallback(data) { return request({ - url: `/nurseApp/personLogin/orderFallback?orderNo=${orderNo}&taskReturnReason=${taskReturnReason}`, - method: 'POST' + url: `/nurseApp/personLogin/orderFallback`, + method: 'POST', + data }) } diff --git a/manifest.json b/manifest.json index 2e69341..9c415f1 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "泉医到家护理员APP", + "name" : "泉医助手", "appid" : "__UNI__EE607B0", "description" : "", - "versionName" : "1.0.5", - "versionCode" : 105, + "versionName" : "1.0.6", + "versionCode" : 106, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -19,7 +19,8 @@ /* 模块配置 */ "modules" : { "Geolocation" : {}, - "Maps" : {} + "Maps" : {}, + "Camera" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/pages.json b/pages.json index 4b39cb7..6ee6c31 100644 --- a/pages.json +++ b/pages.json @@ -4,85 +4,82 @@ }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { - "path": "pages/startup/startup", - "style": { - "navigationBarTitleText": "启动页", - "navigationStyle": "custom" - } - },{ "path": "pages/login/login", "style": { "navigationBarTitleText": "登录", - "navigationBarBackgroundColor": "#ffffff", //背景颜色 "navigationStyle": "custom" } - }, - { - "path": "pages/confirmCompletion/confirmCompletion", + }, { + "path": "pages/startup/startup", "style": { - "navigationBarTitleText": "完成确认", - "navigationBarBackgroundColor": "#ffffff" //背景颜色 + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { + "path": "pages/Healthknowledge/Healthknowledge", + "style": { + "navigationBarTitleText": "护理新闻", + "enablePullDownRefresh": false + } + }, { + "path": "pages/MyBenefits/MyBenefits", + "style": { + "navigationBarTitleText": "我的收益", + "enablePullDownRefresh": false + } + }, { + "path": "pages/Modifyinformation/Modifyinformation", + "style": { + "navigationBarTitleText": "修改信息", + "enablePullDownRefresh": false + // "navigationBarTextStyle": "white" } }, { "path": "pages/personal/personal", "style": { "navigationBarTitleText": "个人信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4C7BC9", - "navigationBarTextStyle": "white" + "navigationStyle": "custom" } }, { - "path": "pages/forgotPassword/forgotPassword", + "path": "pages/Mymission/Mymission", "style": { - "navigationBarTitleText": "忘记密码", - "navigationBarBackgroundColor": "#ffffff" //背景颜色 + "navigationBarTitleText": "我的工单", + "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true } }, { - "path": "pages/register/register", + "path": "pages/taskDetails/taskDetails", "style": { - "navigationBarTitleText": "注册账号", - "navigationBarBackgroundColor": "#ffffff" //背景颜色 + "navigationBarTitleText": "工单信息", + "enablePullDownRefresh": false } }, { "path": "pages/homepage/homepage", "style": { - "navigationBarTitleText": "泉医到家", - "navigationBarBackgroundColor": "#ffffff" //背景颜色 + "navigationBarTitleText": "", + "navigationStyle": "custom" } - }, - { + }, { + "path": "pages/confirmCompletion/confirmCompletion", + "style": { + "navigationBarTitleText": "当前工单", + "enablePullDownRefresh": false + } + }, { "path": "pages/taskReturn/taskReturn", "style": { - "navigationBarTitleText": "任务退回", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 + "navigationBarTitleText": "退回原因", + "enablePullDownRefresh": false } - }, { - "path": "pages/Mymission/Mymission", + "path": "pages/forgotPassword/forgotPassword", "style": { - "navigationBarTitleText": "我的任务", - "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true + "navigationBarTitleText": "忘记密码" } - }, { - "path": "pages/taskDetails/taskDetails", + "path": "pages/register/register", "style": { - "navigationBarTitleText": "任务详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - - }, - { - "path": "pages/Modifyinformation/Modifyinformation", - "style": { - "navigationBarTitleText": "修改信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - // "navigationBarTextStyle": "white" + "navigationBarTitleText": "注册" } }, { "path": "pages/signature/signature", @@ -90,14 +87,51 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - + }, { + "path": "pages/RevenueDetails/RevenueDetails", + "style": { + "navigationBarTitleText": "收益信息", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/RevenueDetails/RevenueDetails", + "style": { + "navigationBarTitleText": "收益信息", + "enablePullDownRefresh": false + } + }, { + "path": "pages/study/study", + "style": { + "navigationBarTitleText": "泉医助手", + "enablePullDownRefresh": false + } } ], "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", + "navigationBarTextStyle": "white", + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4271B9", "backgroundColor": "#F8F8F8" }, - "uniIdRouter": {} + "uniIdRouter": {}, + "tabBar": { + "color": "#7A7E83", + "selectedColor": "#435950", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/homepage/homepage", + "iconPath": "static/homepagew.png", + "selectedIconPath": "static/homepagews.png", + "text": "首页" + }, + { + "pagePath": "pages/personal/personal", + "iconPath": "static/userw.png", + "selectedIconPath": "static/users.png", + "text": "我的" + } + ] + } } diff --git a/pages/Healthknowledge/Healthknowledge.vue b/pages/Healthknowledge/Healthknowledge.vue new file mode 100644 index 0000000..7b9bf6b --- /dev/null +++ b/pages/Healthknowledge/Healthknowledge.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/pages/Modifyinformation/Modifyinformation.scss b/pages/Modifyinformation/Modifyinformation.scss index 9135d1c..c533e1a 100644 --- a/pages/Modifyinformation/Modifyinformation.scss +++ b/pages/Modifyinformation/Modifyinformation.scss @@ -1,25 +1,19 @@ -.app { - background-color: #F4F5F7; + .app { width: 100%; - height: 100vh; color: #000000; - padding: 3%; - font-size: 34rpx; - .title{ - font-size: 28rpx; - margin: 20rpx 20rpx 0; - } + padding: 2%; + font-size: 30rpx; + .finish { - width: 217rpx; + width: 496rpx; + background: #4271B9; + border-radius: 5rpx; color: #FFFFFF; height: 68rpx; line-height: 68rpx; text-align: center; - position: absolute; - top: 70%; - left: 70%; + margin: 100rpx auto; background: #4C7BC9; - border-radius: 26rpx; } .centercontent { @@ -29,8 +23,10 @@ border-radius: 20rpx; margin: 0 auto; padding-bottom: 10rpx; + .content { line-height: 100rpx; + .name { margin-left: 20rpx; height: 100rpx; @@ -42,55 +38,128 @@ display: inline-block; width: 20%; } - + text{ + width: 80%; + font-size: 30rpx; + } input { position: absolute; top: 50%; transform: translateY(-50%); line-height: 100rpx; display: inline-block; - width: 80%; - font-size: 34rpx; - + width: 75%; + font-size: 30rpx; } } .nursetype { - padding-bottom: 20rpx; - border: none;line-height: 50rpx;margin: 20rpx 20rpx; - } - } - - .Commodity { - line-height: 130rpx; margin-left: 20rpx; - border-bottom: 1rpx solid #D8D4D4; - position: relative; - - .picture { - position: absolute; - right: 10%; - top: 50%; - transform: translateY(-50%); - width: 110rpx; - height: 110rpx; - border-radius: 50%; - } - - .pictureA { - position: absolute; - right: 2%; - top: 50%; - transform: translateY(-50%); - width: 18rpx; - height: 27rpx; - } - - .head { - line-height: 140rpx; - margin-left: 5%; - display: inline-block; + line-height: 100rpx; + border-bottom: 1rpx solid #D8D4D4; + .rate { + margin: 30rpx auto; + width: 650rpx; + background: #FFFFFF; + border: 1px solid #E6E6E6; + border-radius: 5rpx; + color: #E6E6E6; + background: #FFFFFF; + .itemimgs { + display: inline-block; + width: 200rpx; + height: 200rpx; + margin: 0 0 10rpx 10rpx; + position: relative; + .delimg { + position: absolute; + top: 10rpx; + right: 10rpx; + width: 40rpx; + height: 40rpx; + z-index: 999; + } + + .itemimg { + width: 200rpx; + height: 200rpx; + } + } + + .item { + display: inline-block; + margin-bottom: 20rpx; + width: 200rpx; + margin: 0 0 0 2%; + height: 212rpx; + border: 1rpx dashed #E6E6E6; + border-radius: 5rpx; + position: relative; + + .title { + width: 100%; + font-size: 30rpx; + color: #969394; + line-height: 70rpx; + text-align:center; + position: absolute; + top: 58%; + } + + image { + position: absolute; + left: 50%; + top: 20%; + transform: translateX(-50%); + width: 89rpx; + height: 68rpx; + } + } + } + .upload { + margin: 30rpx auto; + width: 650rpx; + height: 255rpx; + background: #FFFFFF; + border: 1px solid #E6E6E6; + border-radius: 5rpx; + color: #E6E6E6; + position: relative; + view{ + width: 50%; + position: absolute; + top:50%; + left: 50%; + transform: translate(-50%,-50%); + } + } } } } + + .Commodity { + background-color: #F4F5F7; + height: 330rpx; + position: relative; + + view { + text-align: center; + position: absolute; + top: 240rpx; + font-size: 26rpx; + width: 100%; + text-align: center; + } + + .picture { + border: 4px solid #6DD8FC; + position: absolute; + left: 50%; + top: 50rpx; + transform: translateX(-50%); + width: 160rpx; + height: 160rpx; + border-radius: 50%; + } + } } \ No newline at end of file diff --git a/pages/Modifyinformation/Modifyinformation.vue b/pages/Modifyinformation/Modifyinformation.vue index 2963ceb..87172c8 100644 --- a/pages/Modifyinformation/Modifyinformation.vue +++ b/pages/Modifyinformation/Modifyinformation.vue @@ -1,72 +1,136 @@ - + + diff --git a/pages/Mymission/Mymission.vue b/pages/Mymission/Mymission.vue index bf5d6a9..e368bdf 100644 --- a/pages/Mymission/Mymission.vue +++ b/pages/Mymission/Mymission.vue @@ -1,182 +1,209 @@ + + diff --git a/pages/confirmCompletion/confirmCompletion.vue b/pages/confirmCompletion/confirmCompletion.vue index 0280440..a418df4 100644 --- a/pages/confirmCompletion/confirmCompletion.vue +++ b/pages/confirmCompletion/confirmCompletion.vue @@ -1,65 +1,111 @@