diff --git a/api/ProductList/ProductList.js b/api/ProductList/ProductList.js index ed4c62a..b750720 100644 --- a/api/ProductList/ProductList.js +++ b/api/ProductList/ProductList.js @@ -1,8 +1,8 @@ import request from "../request.js" -export function goodsList(pageSize,pageNum,goodsCategoryId) { +export function goodsList(pageSize,pageNum,goodsCategoryId,goodsName) { return request({ - url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}`, + url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}&goodsName=${goodsName}`, method: 'GET' }) } \ No newline at end of file diff --git a/api/ServiceDetails/ServiceDetails.js b/api/ServiceDetails/ServiceDetails.js index 48d817e..ba40a8c 100644 --- a/api/ServiceDetails/ServiceDetails.js +++ b/api/ServiceDetails/ServiceDetails.js @@ -7,3 +7,13 @@ export function getAppointmentDetailsInfo(orderNo) { method: 'GET' }) } + + +//评价 +export function addAppointmentEvaluate(data) { + return request({ + url: `/nurseApp/orderEvaluate/addAppointmentEvaluate`, + method: 'POST', + data + }) +} \ No newline at end of file diff --git a/api/login/index.js b/api/login/index.js index a82dcde..767a967 100644 --- a/api/login/index.js +++ b/api/login/index.js @@ -6,4 +6,11 @@ export function appLoginpwd(phone, password) { url: `/nurseApp/login/appLogin?phone=${phone}&password=${password}`, method: 'POST' }) -} \ No newline at end of file +} + +export function createMobileToken() { + return request({ + url: `/nurseApplet/authorization/createMobileToken`, + method: 'GET' + }) +} diff --git a/api/lookrate/index.js b/api/lookrate/index.js new file mode 100644 index 0000000..cead2df --- /dev/null +++ b/api/lookrate/index.js @@ -0,0 +1,9 @@ +import request from "../request.js" + +// 修改信息 +export function lookrate(orderNo) { + return request({ + url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${orderNo}`, + method: 'GET' + }) +} diff --git a/api/request.js b/api/request.js index 5638e9d..6007a3a 100644 --- a/api/request.js +++ b/api/request.js @@ -10,33 +10,18 @@ var request = function(config) { data: config.data, method: config.method, timeout: 10000, - // header: { - // token: uni.getStorageSync('token') - // }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, success(res) { - // if (res.data.code == 20002) { - // uni.showModal({ - // title: "登录提示", - // content: res.data.message, - // success(res1) { - // if (res1.confirm) { - // uni.navigateTo({ - // url: '/pages/user/login/login' - // }) - // } - // } - // }) - // } else { - // if (res.data.success) { + if (res.data.code == 9999) { + uni.removeStorageSync('token'); + uni.reLaunch({ + url: '/pages/login/login' + }) + } uni.hideLoading(); resolve(res.data) - // } else { - // uni.showToast({ - // title: res.data.message, - // icon: "none" - // }) - // } - // } }, fail(err) { uni.hideLoading(); diff --git a/manifest.json b/manifest.json index c9e76ad..95a5d6e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "NurseStationApp", + "name" : "泉医到家APP", "appid" : "__UNI__D6F049F", "description" : "", "versionName" : "1.0.0", diff --git a/pages.json b/pages.json index 563a64b..3ed115e 100644 --- a/pages.json +++ b/pages.json @@ -9,58 +9,6 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } - }, { - "path": "pages/ProjectDetails/ProjectDetails", - "style": { - "navigationBarTitleText": "护理项目详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - - }, - { - "path": "pages/Bodysatelliteintegration/Bodysatelliteintegration", - "style": { - "navigationBarTitleText": "体卫融合", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { - "path": "pages/Geriatricdisease/Geriatricdisease", - "style": { - "navigationBarTitleText": "老年病中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { - "path": "pages/diseasemanagement/diseasemanagement", - "style": { - "navigationBarTitleText": "专病管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/goodsorderRate/goodsorderRate", - "style": { - "navigationBarTitleText": "发表评价", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { - "path": "pages/appointmenttime/appointmenttime", - "style": { - "navigationBarTitleText": "预约时间", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { - "path": "pages/information/information", - "style": { - "navigationBarTitleText": "完善个人信息", - "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "enablePullDownRefresh": false - } }, { "path": "pages/forgotPassword/forgotPassword", @@ -75,19 +23,139 @@ "navigationBarTitleText": "注册账号", "navigationBarBackgroundColor": "#ffffff" } - }, { - "path": "pages/homepage/homepage", + }, + { + "path": "pages/lookrate/lookrate", "style": { - "navigationBarTitleText": "泉医到家", + "navigationBarTitleText": "查看评价", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } + }, { - "path": "pages/login/login", + "path": "pages/ServiceDetails/ServiceDetails", + "style": { + "navigationBarTitleText": "服务详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + + } + }, { + "path": "pages/ProjectDetails/ProjectDetails", + "style": { + "navigationBarTitleText": "护理项目详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + + }, { + "path": "pages/goodsorderRate/goodsorderRate", + "style": { + "navigationBarTitleText": "发表评价", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { + "path": "pages/Bodysatelliteintegration/Bodysatelliteintegration", + "style": { + "navigationBarTitleText": "体卫融合", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, + { + "path": "pages/modify/modify", + "style": { + "navigationBarTitleText": "修改信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { + "path": "pages/information/information", + "style": { + "navigationBarTitleText": "完善个人信息", + "navigationBarBackgroundColor": "#ffffff", //背景颜色 + "enablePullDownRefresh": false + } + }, { + "path": "pages/appointmenttime/appointmenttime", + "style": { + "navigationBarTitleText": "预约时间", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { + "path": "pages/paysuccess/paysuccess", "style": { "navigationBarTitleText": "", + "enablePullDownRefresh": false, "navigationStyle": "custom" - // "enablePullDownRefresh": false + } + }, + { + "path": "pages/ratesuccess/ratesuccess", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { + "path": "pages/shopping/shopping", //商城 + "style": { + "navigationBarTitleText": "医路优品", + "navigationBarBackgroundColor": "#ffffff", + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true + } + }, { + "path": "pages/CommodityOrder/CommodityOrder", + "style": { + "navigationBarTitleText": "商品订单", + "navigationBarBackgroundColor": "#ffffff", + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true + } + }, + + { + "path": "pages/user/user", + "style": { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4C7BC9", //背景颜色 + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/orderDetails/orderDetails", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarBackgroundColor": "#ffffff", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/payorderDetails/payorderDetails", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarBackgroundColor": "#ffffff", + "enablePullDownRefresh": false + } + }, { + "path": "pages/Personal/Personal", + "style": { + "navigationBarTitleText": "个人中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, + + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录", + // "navigationStyle": "custom" + "enablePullDownRefresh": false } }, { @@ -98,65 +166,25 @@ "navigationBarBackgroundColor": "#ffffff" //背景颜色 } }, - { - "path": "pages/ServiceDetails/ServiceDetails", - "style": { - "navigationBarTitleText": "服务详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { "path": "pages/Nursingstationserviceorder/Nursingstationserviceorder", "style": { "navigationBarTitleText": "护理站服务订单", "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, { - "path": "pages/modify/modify", - "style": { - "navigationBarTitleText": "修改信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - - } - }, { - "path": "pages/Personal/Personal", - "style": { - "navigationBarTitleText": "个人中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/CommodityOrder/CommodityOrder", - "style": { - "navigationBarTitleText": "商品订单", - "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true - } - }, { "path": "pages/logistics/logistics", "style": { "navigationBarTitleText": "查看物流", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { - "path": "pages/user/user", - "style": { - "navigationBarTitleText": "个人信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4C7BC9", //背景颜色 - "navigationBarTextStyle": "white" - } }, - { "path": "pages/Aftersalesdetails/Aftersalesdetails", "style": { @@ -181,14 +209,8 @@ "enablePullDownRefresh": false } }, + { - "path": "pages/orderDetails/orderDetails", - "style": { - "navigationBarTitleText": "订单详情", - "navigationBarBackgroundColor": "#ffffff", - "enablePullDownRefresh": false - } - }, { "path": "pages/order/order", "style": { "navigationBarTitleText": "我的订单", @@ -197,14 +219,23 @@ } }, { - "path": "pages/shopping/shopping", //商城 + "path": "pages/menttimeorder/menttimeorder", "style": { - "navigationBarTitleText": "医路优品", - "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true + "navigationBarTitleText": "预约详情", + "enablePullDownRefresh": false } - }, { + + }, + { + "path": "pages/homepage/homepage", + "style": { + "navigationBarTitleText": "泉医到家", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, + + { "path": "pages/confirmOrder/confirmOrder", "style": { "navigationBarTitleText": "确认订单", @@ -229,13 +260,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { - "path": "pages/InformationFilling/InformationFilling", - "style": { - "navigationBarTitleText": "信息确认与填写", - "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "enablePullDownRefresh": false - } }, { "path": "pages/ProductList/ProductList", //商品列表 @@ -243,17 +267,19 @@ "navigationBarTitleText": "医路优品", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } - }, { + }, + { "path": "pages/CommodityDetails/CommodityDetails", "style": { "navigationBarTitleText": "商品详情", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { + }, + { "path": "pages/nursestation/nursestation", "style": { "navigationBarTitleText": "护理站详情", @@ -262,30 +288,34 @@ "enablePullDownRefresh": true //设置参数为true } - }, { + }, + { "path": "pages/site/site", "style": { "navigationBarTitleText": "附近护理站", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } - }, { + }, + { "path": "pages/detail/detail", "style": { "navigationBarTitleText": "护理站简介", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" //背景颜色 } - }, { + }, + { "path": "pages/medicine/medicine", "style": { "navigationBarTitleText": "就医", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { + }, + { "path": "pages/modifyAddress/modifyAddress", "style": { "navigationBarTitleText": "修改地址", @@ -302,13 +332,20 @@ "navigationBarBackgroundColor": "#ffffff" } }, { - "path": "pages/paysuccess/paysuccess", + "path": "pages/Geriatricdisease/Geriatricdisease", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "老年病中心", "enablePullDownRefresh": false, - "navigationStyle": "custom" + "navigationBarBackgroundColor": "#ffffff" } + }, { + "path": "pages/diseasemanagement/diseasemanagement", + "style": { + "navigationBarTitleText": "专病管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } } ], "globalStyle": { diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue index a84bb91..48dff57 100644 --- a/pages/Applforrefund/Applforrefund.vue +++ b/pages/Applforrefund/Applforrefund.vue @@ -63,13 +63,13 @@ this.order.updateTime = null refund(this.order).then( res => { - console.log(res) if (res.code == 500) { this.$refs.uToast.show({ title: res.msg, type: 'error' }) } else { + uni.setStorageSync("Refresh", 'Refresh') this.$refs.uToast.show({ title: '退款申请提交成功', type: 'success', @@ -80,7 +80,7 @@ } this.timer = setTimeout(e => { uni.navigateBack({ - delta: 3 + delta: 4 }); }, 1500) } @@ -94,7 +94,6 @@ }, //点击退款原因 tapreason(item) { - console.log(item) this.order.refundReasonDictId = item.dictCode this.dictname = item.dictLabel this.show = false; diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 2076e1d..425c260 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -296,8 +296,10 @@ // 查询商品详细信息 goodsDetailsinfo(goodsInfoId) { goodsDetails(goodsInfoId).then(res => { - res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\ 店铺名称 - 待付款 + 待付款 订单已关闭 退款中 已取消 @@ -40,6 +40,8 @@ + 退款中 + 查看物流 立即评价 + + 查看评价 @@ -104,10 +108,16 @@ } }, methods: { + //查看评价 + golookrate(item) { + uni.navigateTo({ + url: `/pages/lookrate/lookrate?item=${JSON.stringify(item)}` + }) + }, //评价 rate(item) { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${3}` }) }, //收货 @@ -122,11 +132,8 @@ this.show = false setTimeout(e => { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}&delta=${3}` }) - // uni.navigateTo({ - // url: `/pages/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}` - // }) }, 1000) } else {} }) @@ -141,7 +148,6 @@ payType: "WECHAT_PAY", buySource: item.buySource, } - console.log(obj) }, //物流页面 gologistics(item) { @@ -188,25 +194,32 @@ }); }, onLoad(options) { //开局调用 + this.baseurl = baseurl; let that = this try { const value = uni.getStorageSync('patientId'); if (value) { that.patientId = value - that.goodsOrderinfo(); + if (options.orderStatus) { + that.orderStatus = options.orderStatus + if (options.orderStatus == 'WAIT_PAY') { + that.title = '待付款' + that.goodsOrderinfo(); + } else if (options.orderStatus == 'WAIT_RECEIVED_GOODS') { + that.title = '待收货' + that.goodsOrderinfo(); + } else if (options.orderStatus == 'RECEIVED_GOODS') { + that.title = '待评价' + that.goodsOrderinfo(); + } else if (options.orderStatus == 'EVALUATED') { + that.title = '已完成' + that.goodsOrderinfo(); + } + } else { + that.goodsOrderinfo(); + } } } catch (e) {} - this.baseurl = baseurl; - if (options.orderStatus) { - this.orderStatus = options.orderStatus - if (options.orderStatus == 'WAIT_PAY') { - this.title = '待付款' - } else if (options.orderStatus == 'WAIT_RECEIVED_GOODS') { - this.title = '待收货' - } else if (options.orderStatus == 'RECEIVED_GOODS') { - this.title = '已完成' - } - } }, onReachBottom() { //下滑加载 if (this.orderlist.length >= this.total) {} else { diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss index 018b842..94de75d 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss @@ -1,6 +1,60 @@ .app { padding: 2%; -.noorder{ + .masks{ + image{ + position: absolute; + bottom:380rpx; + left:50%; + transform: translateX(-50%); + z-index: 999; + width: 250rpx; + border-radius: 25rpx; + height: 250rpx; + } + .ratetitle{ + font-size: 34rpx; + position: absolute; + bottom:320rpx; + left:50%; + transform: translateX(-50%); + z-index: 999; + } + .mask{ + position: absolute; + bottom:0; + width: 750rpx; + height: 703rpx; + background: #FFFFFF; + border-radius: 30rpx 30rpx 0px 0px; + display: flex; + justify-content: space-around; + .rateitem{ + margin-top:200rpx; + width: 217rpx; + height: 222rpx; + line-height: 222rpx; + text-align: center; + color: #ffffff; + background: #BFBFBF; + font-size: 40rpx; + border-radius: 25rpx; + } + + .lookrateitem{ + font-size: 32rpx; + margin-top:440rpx; + width: 200rpx; + height: 200rpx; + line-height: 200rpx; + text-align: center; + color: #ffffff; + background: #BFBFBF; + border-radius: 25rpx; + } + } + } + + .noorder{ margin-top: 20%; image{ display: block; diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index 922fbbb..8dfc7d8 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -32,11 +32,10 @@ v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0"> 去支付 - - + 退款中 + 立即评价 + 查看评价 @@ -45,26 +44,77 @@ 暂无服务订单 + + + + + 满意 + + + 一般 + + + 不满意 + + + + + + + {{rateimgtitle.title}} + + + + 满意 + + + 一般 + + + 不满意 + + + diff --git a/pages/goodsorderRate/goodsorderRate.vue b/pages/goodsorderRate/goodsorderRate.vue index 5babbb6..a9ef5b1 100644 --- a/pages/goodsorderRate/goodsorderRate.vue +++ b/pages/goodsorderRate/goodsorderRate.vue @@ -3,7 +3,8 @@ - + + @@ -53,37 +54,41 @@ file: [], imgs: [], patientId: null, - timer:null, + timer: null, + delta: null, }; }, methods: { - async updata() { - let that = this - this.file.forEach(e => { - uni.uploadFile({ - url: baseurl + '/nurseApp/orderEvaluate/uploadEvaluatePictureUrl', - filePath: e, - name: 'file', - formData: { - 'orderNo': that.orderlist.goOrderNo - }, - timeout: 5000, - header: { - 'Content-type': 'application/json;charset=utf-8' - }, - success(res) { - var img = { - evaluatePictureUrl: JSON.parse(res.data).imgUrl - } - that.imgs.push(img) - if (that.imgs.length == that.file.length) { - that.info(); - } - } - }) - }) + delimg(item) { + this.file = this.file.filter(e => e != item) + }, + updata() { + let that = this + if (this.file.length > 0) { + this.file.forEach(e => { + uni.uploadFile({ + url: baseurl + '/nurseApp/orderEvaluate/uploadEvaluatePictureUrl', + filePath: e, + name: 'file', + formData: { + 'orderNo': that.orderlist.goOrderNo + }, + timeout: 5000, + success(res) { + var img = { + evaluatePictureUrl: JSON.parse(res.data).imgUrl + } + that.imgs.push(img) + if (that.imgs.length == that.file.length) { + that.info(); + } + } + }) + }) + } else { + that.info(); + } }, - info() { var that = this var obj = { @@ -106,8 +111,8 @@ } that.timer = setTimeout(e => { that.imgs = [] - uni.navigateBack({ - delta: 1 + uni.navigateTo({ + url: `/pages/ratesuccess/ratesuccess?delta=${that.delta}` }) }, 1500) } else { @@ -115,9 +120,6 @@ } }) }, - - - updataImage() { var that = this; uni.chooseImage({ @@ -132,6 +134,7 @@ }, onLoad(options) { this.orderlist = JSON.parse(options.item) + this.delta = options.delta }, onShow() { this.baseurl = baseurl @@ -222,6 +225,7 @@ top: 10rpx; right: 10rpx; width: 40rpx; + z-index: 999; height: 40rpx; } diff --git a/pages/information/information.vue b/pages/information/information.vue index 184b74f..33323c1 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,10 +218,6 @@ this.maskshow = false; }, }, - onUnload() { - // 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果 - chooseLocation.setLocation(null); - }, //进入界面加载 onLoad() { let that = this @@ -254,7 +250,6 @@ } else {} }) } else { - console.log(that.query.nurseTypeIdList) that.medicalcarelist.forEach(e => { that.query.nurseTypeIdList = that.query.nurseTypeIdList.filter(el => el != e.id) }) diff --git a/pages/login/login.vue b/pages/login/login.vue index 542ee96..2e1f1d6 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -10,7 +10,7 @@ - + 登录 @@ -24,7 +24,8 @@ + + diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index a5027f9..e8ea989 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -275,16 +275,11 @@ }) }, }, - onUnload() { - // 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果 - chooseLocation.setLocation(null); - }, //带参返回 onShow() { let that = this uni.$on('disease', function(data) { that.patientDiseaseInfoList = JSON.parse(data.disease) - console.log(that.patientDiseaseInfoList) }) } } diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index a6ab847..c340ba6 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -40,7 +40,8 @@ - + {{item.nurseItemName}} @@ -48,7 +49,7 @@ --> 服务时长:{{item.serveDurationUnit?item.serveDurationUnit:'0'}} - 预约 + 预约 ￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}} @@ -128,13 +129,13 @@ }, onShow() { this.usershow = false - }, - onLoad(options) { - this.nurseStationId = options.nurseStationId this.getInfo() this.serveinfo() this.productinfo() }, + onLoad(options) { + this.nurseStationId = options.nurseStationId + }, methods: { goappointments(item) { let that = this @@ -158,8 +159,10 @@ getInfo() { introductionList(this.nurseStationId).then(res => { res.data.stationIntroducePcitureUrl = baseurl + res.data.stationIntroducePcitureUrl - res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\ { res.rows.forEach(e => { e.itemPictureUrl = baseurl + e.itemPictureUrl @@ -176,6 +180,7 @@ }) }, productinfo() { + this.pageNum = 1 productInformation(this.nurseStationId, this.pageNum, this.pageSize).then(res => { res.rows.forEach(e => { e.goodsPictureUrl = baseurl + e.goodsPictureUrl @@ -187,7 +192,6 @@ testTabClick(index) { this.tabIndex = index this.choicetab = this.tabIndex - console.log(this.choicetab) }, //跳转商品详情页 goCommodityDetails(item) { @@ -201,11 +205,15 @@ url: '/pages/information/information' }) }, + goProjectDetails(item) { + uni.navigateTo({ + url: `/pages/ProjectDetails/ProjectDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, + }) + }, gophone() { var that = this uni.getSystemInfo({ success: function(res) { - // console.log(res) if (res.platform == 'ios') { uni.makePhoneCall({ phoneNumber: that.list.phone //仅为示例 @@ -215,15 +223,12 @@ itemList: ['呼叫', ], success: function(res) { if (res.tapIndex + 1 == 1) { - console.log(1) uni.makePhoneCall({ phoneNumber: that.list.phone //仅为示例 }); } - console.log('选中了第' + (res.tapIndex + 1) + '个按钮'); }, fail: function(res) { - // console.log(res.errMsg); } }); } @@ -233,7 +238,6 @@ }, onReachBottom() { //下滑加载 if (this.choicetab == 0) { - console.log(1) if (this.servelist.length >= this.servetotal) {} else { this.pageNum++ itemList(this.nurseStationId, this.pageSize, this.pageNum).then(res => { diff --git a/pages/orderDetails/orderDetails.scss b/pages/orderDetails/orderDetails.scss index 6a92627..ce6e344 100644 --- a/pages/orderDetails/orderDetails.scss +++ b/pages/orderDetails/orderDetails.scss @@ -1,4 +1,5 @@ .app { + padding: 0; .time{ height: 80rpx; width: 95%; diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue index c9d6194..3fd66af 100644 --- a/pages/orderDetails/orderDetails.vue +++ b/pages/orderDetails/orderDetails.vue @@ -8,7 +8,7 @@ 订单已关闭 - + 订单已关闭 @@ -68,6 +68,17 @@ 去支付 + + + 查看评价 + + + + + 去评价 + + + @@ -76,6 +87,9 @@ goodsOrder } from '@/api/CommodityOrder/index.js' import baseurl from '@/api/baseurl.js' + import { + appletGoodsOrderPay + } from '@/api/confirmOrder/index.js' export default { data() { return { @@ -89,6 +103,18 @@ } }, methods: { + //查看评价 + golookrate() { + uni.navigateTo({ + url: `/pages/lookrate/lookrate?item=${JSON.stringify(this.order)}` + }) + }, + //评价 + rate() { + uni.navigateTo({ + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${4}` + }) + }, //退款页面 gorefundType() { uni.navigateTo({ diff --git a/pages/ratesuccess/ratesuccess.vue b/pages/ratesuccess/ratesuccess.vue new file mode 100644 index 0000000..4afc1c5 --- /dev/null +++ b/pages/ratesuccess/ratesuccess.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/pages/refundType/refundType.vue b/pages/refundType/refundType.vue index 065faa1..b1e86ad 100644 --- a/pages/refundType/refundType.vue +++ b/pages/refundType/refundType.vue @@ -59,7 +59,6 @@ //退款页面 goApplforrefund(e) { if (e == 1) { - console.log(e) uni.navigateTo({ url: `/pages/Applforrefund/Applforrefund?typename=${'我要退款(无需退货)'}&order=${JSON.stringify(this.order)}` }) @@ -73,7 +72,6 @@ onLoad(options) { this.baseurl = baseurl this.order = JSON.parse(options.order) - console.log(this.order) } } diff --git a/pages/register/register.vue b/pages/register/register.vue index ca48a80..c1ffe44 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -111,7 +111,6 @@ }) } else { appRegister(this.patientName, this.phone, this.password, this.verification).then(res => { - console.log(res) if (res.code == 200) { this.$refs.uToast.show({ title: '注册成功，前往登录', @@ -231,7 +230,6 @@ // }, // fail: (e) => { // uni.hideLoading() - // console.log('error'); // //新建UserList // uni.setStorage({ // key: 'UserList', @@ -250,7 +248,6 @@ // }, 1000) // }, // fail: function(e) { - // console.log('set error:' + JSON.stringify(e)); // } // }); // } diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue index f7e3216..2dac160 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -3,9 +3,8 @@ - - + + {{item.goodsCategoryName}} @@ -50,7 +49,6 @@ methods: { //跳转到商品列表页面 goProductList(item) { - console.log(item) uni.navigateTo({ url: `/pages/ProductList/ProductList?title=${item.goodsCategoryName}&goodsCategoryId=${item.id}` }) @@ -62,7 +60,6 @@ e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture this.goodsCategoryList.push(e) }) - console.log(this.goodsCategoryList) this.total = res.total }) } diff --git a/pages/site/site.vue b/pages/site/site.vue index 4959e3a..aa56e23 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -117,11 +117,9 @@ this.nursestationlist = res.rows this.mask = false this.total = res.total - // console.log(this.nursestationlist) }) }, godetails(item) { - console.log(item) uni.navigateTo({ url: `/pages/nursestation/nursestation?nurseStationId=${item.nurseStationId}` }) @@ -168,7 +166,7 @@ // this.requestinfo() }, }, - onLoad() { + onShow() { var that = this try { const value = uni.getStorageSync('patientId'); @@ -199,6 +197,7 @@ } } catch (e) {} }, + onLoad() {}, }