From 96e25a394423963db9079ad6a31d96ca1dca7bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 13 Oct 2023 17:32:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommodityDetails/CommodityDetails.js | 5 +- api/pagesB/confirmOrder/index.js | 10 +++- api/pagesB/healthybeans/index.js | 15 ++++-- api/pagesB/materialbenefits/index.js | 10 +++- pages.json | 51 +++++++------------ pages/myinformation/myinformation.vue | 27 +++++----- pagesB/CommodityDetails/CommodityDetails.vue | 2 +- pagesB/ProductList/ProductList.vue | 3 +- pagesB/modify/modify.vue | 1 + .../ServiceAppointment/ServiceAppointment.vue | 2 +- 10 files changed, 71 insertions(+), 55 deletions(-) diff --git a/api/pagesB/CommodityDetails/CommodityDetails.js b/api/pagesB/CommodityDetails/CommodityDetails.js index f5bd8f1..7992ccc 100644 --- a/api/pagesB/CommodityDetails/CommodityDetails.js +++ b/api/pagesB/CommodityDetails/CommodityDetails.js @@ -3,6 +3,9 @@ import request from "../../request.js" export function goodsDetails(goodsInfoId, patientId) { return request({ url: `/nurseApplet/nursingStationGoods/goodsDetails?goodsInfoId=${goodsInfoId}&patientId=${patientId}`, - method: 'GET' + method: 'GET', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } diff --git a/api/pagesB/confirmOrder/index.js b/api/pagesB/confirmOrder/index.js index c5f7974..3388a58 100644 --- a/api/pagesB/confirmOrder/index.js +++ b/api/pagesB/confirmOrder/index.js @@ -5,7 +5,10 @@ export function addStationGoodsOrder(data) { return request({ url: `/nurseApplet/nursingStationGoods/addStationGoodsOrder`, method: 'post', - data + data, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } //小程序购买商品订单支付接口 @@ -13,6 +16,9 @@ export function appletGoodsOrderPay(data) { return request({ url: `/nurseApp/weChatPayment/appletGoodsOrderPay`, method: 'post', - data + data, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } diff --git a/api/pagesB/healthybeans/index.js b/api/pagesB/healthybeans/index.js index c442dc5..52f8061 100644 --- a/api/pagesB/healthybeans/index.js +++ b/api/pagesB/healthybeans/index.js @@ -5,7 +5,10 @@ import request from "../../request.js" export function signIn(patientId) { return request({ url: `/nurseApplet/patientInfo/signIn?patientId=${patientId}&signInChannel=WECHAT_APPLET`, - method: 'post' + method: 'post', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } @@ -13,7 +16,10 @@ export function signIn(patientId) { export function selectPatientSignIn(patientId) { return request({ url: `/nurseApplet/patientInfo/selectPatientSignIn?patientId=${patientId}`, - method: 'get' + method: 'get', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } @@ -21,7 +27,10 @@ export function selectPatientSignIn(patientId) { export function selectExchangeGoods(pageNum, pageSize) { return request({ url: `/nurseApplet/patientInfo/selectExchangeGoods?pageNum=${pageNum}&pageSize=${pageSize}`, - method: 'get' + method: 'get', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } diff --git a/api/pagesB/materialbenefits/index.js b/api/pagesB/materialbenefits/index.js index d6e997e..a8d8492 100644 --- a/api/pagesB/materialbenefits/index.js +++ b/api/pagesB/materialbenefits/index.js @@ -5,7 +5,10 @@ import request from "../../request.js" export function couponByUseStatus(pageNum, pageSize, patientId) { return request({ url: `/nurseApplet/patientInfo/couponByUseStatus?pageNum=${pageNum}&pageSize=${pageSize}&patientId=${patientId}`, - method: 'get' + method: 'get', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } @@ -13,6 +16,9 @@ export function couponByUseStatus(pageNum, pageSize, patientId) { export function insertCouponReceive(patientId, couponId) { return request({ url: `/nurseApplet/patientInfo/insertCouponReceive?patientId=${patientId}&couponId=${couponId}`, - method: 'post' + method: 'post', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } diff --git a/pages.json b/pages.json index 27e57c5..3b7277b 100644 --- a/pages.json +++ b/pages.json @@ -4,17 +4,17 @@ }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { - "path": "pages/homepage/homepage", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, { "path": "pages/startup/startup", "style": { "navigationStyle": "custom", "enablePullDownRefresh": false } + },{ + "path": "pages/homepage/homepage", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } }, { "path": "pages/medicalservice/medicalservice", @@ -260,7 +260,7 @@ }, { "path": "ProductList/ProductList", //商品列表 "style": { - "navigationBarTitleText": "医路优品", + "navigationBarTitleText": "健康商城", "navigationStyle": "custom", // 隐藏系统导航栏 "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true @@ -397,14 +397,7 @@ "navigationBarTitleText": "履约详情", "enablePullDownRefresh": false } - },{ - "path" : "AddMembers/AddMembers", - "style" : - { - "navigationBarTitleText": "添加成员", - "enablePullDownRefresh": false - } - } + } ] }, { "root": "pagesC", @@ -415,13 +408,13 @@ "enablePullDownRefresh": false } }, - // { - // "path": "Filinginformation/Filinginformation", - // "style": { - // "navigationBarTitleText": "查看建档信息" - // // "enablePullDownRefresh": false - // } - // }, + { + "path": "Filinginformation/Filinginformation", + "style": { + "navigationBarTitleText": "查看建档信息" + // "enablePullDownRefresh": false + } + }, { "path": "Onlinesigning/Onlinesigning", "style": { @@ -454,8 +447,8 @@ "path": "ServiceAppointment/ServiceAppointment", "style": { "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTitleText": "商品订单", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "navigationBarTitleText": "商品订单", + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, @@ -509,20 +502,14 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - },{ + }, + { "path": "contractsigningprotocol/contractsigningprotocol", "style": { "navigationBarTitleText": "签约协议", "enablePullDownRefresh": false } } - // { - // "path": "contractsigningprotocol/contractsigningprotocol", - // "style": { - // "navigationBarTitleText": "签约协议", - // "enablePullDownRefresh": false - // } - // } ] }], "globalStyle": { diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 0ba8dd2..377db7a 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -5,17 +5,17 @@ 我的 --> - + - 张三 + {{appPersonallist.patientName}} 未签约 - 17869283647 + {{appPersonallist.phone}} 切换家庭成员 @@ -168,7 +168,7 @@ appPersonallist: null, //获取个人信息 timer: null, list: {}, - // bjimg: '', + }; }, onShow() { @@ -313,16 +313,19 @@ }, //全部订单 goorder(index, item) { - console.log(index, item) - const value = uni.getStorageSync('openid'); - const value2 = uni.getStorageSync('patientId'); - if (value && value2) { + // console.log(index, item) + // const value = uni.getStorageSync('openid'); + // const value2 = uni.getStorageSync('patientId'); + // if (value && value2) { uni.navigateTo({ - url: `/pagesB/CommodityOrder/CommodityOrder?toindex=${index}&&orderStatus=${item}` + url: '/pagesB/CommodityOrder/CommodityOrder' }) - } else { - this.gologin(); - } + // uni.navigateTo({ + // url: `/pagesB/CommodityOrder/CommodityOrder?toindex=${index}&&orderStatus=${item}` + // }) + // } else { + // this.gologin(); + // } }, //去登陆 gologin() { diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue index 70f2834..40a8108 100644 --- a/pagesB/CommodityDetails/CommodityDetails.vue +++ b/pagesB/CommodityDetails/CommodityDetails.vue @@ -392,7 +392,7 @@ goinformation() { this.usershow = false uni.navigateTo({ - url: '/pagesB/information/information' + url: '/pagesB/modify/modify' }) }, //立即购买跳转确认订单页面 diff --git a/pagesB/ProductList/ProductList.vue b/pagesB/ProductList/ProductList.vue index 0ea9caa..793c5e5 100644 --- a/pagesB/ProductList/ProductList.vue +++ b/pagesB/ProductList/ProductList.vue @@ -228,7 +228,8 @@