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/main.js b/main.js index b250490..ba33955 100644 --- a/main.js +++ b/main.js @@ -4,6 +4,8 @@ import App from './App' import Vue from 'vue' import uView from "uview-ui"; Vue.use(uView); +import share from './share.js' +Vue.mixin(share) Vue.config.productionTip = false App.mpType = 'app' diff --git a/pages.json b/pages.json index 79d3537..1d2a730 100644 --- a/pages.json +++ b/pages.json @@ -9,6 +9,15 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "pages/lookrate/lookrate", + "style": { + "navigationBarTitleText": "查看评价", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { "path": "pages/ServiceDetails/ServiceDetails", "style": { @@ -68,12 +77,20 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path": "pages/ratesuccess/ratesuccess", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } }, { "path": "pages/shopping/shopping", //商城 "style": { "navigationBarTitleText": "医路优品", "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, { @@ -81,7 +98,7 @@ "style": { "navigationBarTitleText": "商品订单", "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, @@ -141,7 +158,7 @@ "style": { "navigationBarTitleText": "护理站服务订单", "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } @@ -236,7 +253,7 @@ "navigationBarTitleText": "医路优品", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, @@ -264,7 +281,7 @@ "navigationBarTitleText": "附近护理站", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 20, //距离底部多远时触发 单位为px + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue index c59a15f..793c0e9 100644 --- a/pages/Applforrefund/Applforrefund.vue +++ b/pages/Applforrefund/Applforrefund.vue @@ -54,7 +54,7 @@ order: {}, //订单 reasonlist: [], //退款原因list dictname: '', //页面退款原因字段 - timer:null, + timer: null, } }, methods: { @@ -69,6 +69,7 @@ type: 'error' }) } else { + uni.setStorageSync("Refresh", 'Refresh') this.$refs.uToast.show({ title: '退款申请提交成功', type: 'success', @@ -79,7 +80,7 @@ } this.timer = setTimeout(e => { uni.navigateBack({ - delta: 3 + delta: 4 }) }, 1500) } diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 0656506..b84f52c 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -2,9 +2,12 @@ - + {{goodsDetailslist.goodsName}} + + 暂无 + ￥{{goodsPrice}} 起 @@ -222,6 +225,8 @@ that.buyshow = false that.usershow = true } + } else if(res.code==9999){ + } else { that.$refs.uToast.show({ title: res.msg, @@ -297,9 +302,22 @@ }, // 查询商品详细信息 goodsDetailsinfo(goodsInfoId) { + let that = this goodsDetails(goodsInfoId).then(res => { - res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\ diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index 6651b4e..82a0b2a 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -40,6 +40,9 @@ + 退款中 + 查看物流 确认收货 - - 立即评价 + + 去评价 + + 查看评价 @@ -102,13 +108,19 @@ img: '', //确认收货页面图片 orderStatus: '', // goodsOrderId: '', // - pageSize: 10, // + pageSize: 15, // pageNum: 1, // goodsName: '', getCodeText: null, } }, methods: { + //查看评价 + golookrate(item) { + uni.navigateTo({ + url: `/pages/lookrate/lookrate?item=${JSON.stringify(item)}` + }) + }, //收货 Receipts() { confirmReceipt(this.orderNoitem.goOrderNo).then(res => { @@ -119,15 +131,23 @@ duration: '1000' }) this.show = false + uni.setStorageSync("Refresh", 'Refresh') 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 {} + } else { + this.$refs.uToast.show({ + title: '收货失败', + type: 'error', + duration: '1000' + }) + this.show = false + } }) }, //支付 @@ -151,12 +171,13 @@ signType: response.data.signType, paySign: response.data.paySign, success: function(res) { + uni.setStorageSync("Refresh", 'Refresh') that.$refs.uToast.show({ title: '支付成功', type: 'success', toast: 1500, + url: `/pages/paysuccess/paysuccess`, }) - that.goodsOrderinfo(); }, fail: function(err) { that.$refs.uToast.show({ @@ -184,7 +205,7 @@ //评价 rate(item) { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${3}` }) }, //订单详情页面 @@ -198,14 +219,17 @@ ssgoodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum, this .goodsName).then( res => { - this.orderlist = res.rows - this.orderlist.forEach(e => { - e.timestamp = null - var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) - var times = new Date().getTime() / 1000 - e.timestamp = time - times - }) - this.total = res.total + if (res.code == 200) { + this.orderlist = res.rows + this.orderlist.forEach(e => { + e.timestamp = null + var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) + var times = new Date().getTime() / 1000 + e.timestamp = time - times + }) + uni.removeStorageSync('Refresh'); + this.total = res.total + } }) }, //确认收货 @@ -217,6 +241,7 @@ }, watch: { //监听 goodsName() { + this.pageNum = 1 this.goodsOrderinfo() }, }, @@ -225,35 +250,45 @@ title: this.title, }); }, - onShow() {}, + onShow() { + this.pageNum = 1; + this.baseurl = baseurl; + let that = this + try { + const value3 = uni.getStorageSync('Refresh'); + if (value3) { + that.goodsOrderinfo(); + } + } catch (e) {} + }, onLoad(options) { //开局调用 let that = this try { const value = uni.getStorageSync('patientId'); - if (value) { + const value2 = uni.getStorageSync('openid'); + if (value && value2) { that.patientId = value - that.goodsOrderinfo(); + that.openid = value2 + 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) {} - try { - const value = uni.getStorageSync('openid'); - if (value) { - that.openid = value - } - } 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 = '待评价' - } else if (options.orderStatus == 'EVALUATED') { - this.title = '已完成' - } - } }, onReachBottom() { //下滑加载 if (this.orderlist.length >= this.total) {} else { diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss index ed3e8a3..94de75d 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss @@ -1,5 +1,59 @@ .app { padding: 2%; + .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{ diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index e24219f..784970f 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -33,11 +33,9 @@ 去支付 退款中 - - + 立即评价 + 查看评价 @@ -47,55 +45,142 @@ + + + + 满意 + + + 一般 + + + 不满意 + + + + + + + {{rateimgtitle.title}} + + + + 满意 + + + 一般 + + + 不满意 + + + - - diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index 844cf1d..88ae0a0 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -44,7 +44,8 @@ var that = this try { const value = uni.getStorageSync('openid'); - if (value) { + const value3 = uni.getStorageSync('token'); + if (value && value3) { const value2 = uni.getStorageSync('patientId'); if (value2) {} else { uni.navigateTo({ @@ -93,19 +94,16 @@ gouser() { try { const value = uni.getStorageSync('openid'); + const value3 = uni.getStorageSync('token'); var that = this - if (value) { + if (value && value3) { existPatientInfo(value).then(res => { - if (res.code == 200) { - if (res.msg == 'LOGIN') { - const value2 = uni.getStorageSync('patientId'); - if (value2) { - uni.navigateTo({ - url: '/pages/user/user' - }) - } else { - that.remove() - } + if (res.code == 200 && res.msg == 'LOGIN') { + const value2 = uni.getStorageSync('patientId'); + if (value2) { + uni.navigateTo({ + url: '/pages/user/user' + }) } else { that.remove() } @@ -124,6 +122,7 @@ uni.removeStorageSync('patientId'); uni.removeStorageSync('openid'); uni.removeStorageSync('phone'); + uni.removeStorageSync('token'); uni.navigateTo({ url: '/pages/login/login' }) diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue index 7f058c7..2aeaeac 100644 --- a/pages/ProductList/ProductList.vue +++ b/pages/ProductList/ProductList.vue @@ -47,6 +47,15 @@ }) }, }, + onShow() { + var that = this + try { + const value3 = uni.getStorageSync('Refresh'); + if (value3) { + that.goodsListinfo(); + } + } catch (e) {} + }, onLoad(options) { //获取传值 this.title = options.title //导航栏标题 this.goodsCategoryId = options.goodsCategoryId //请求id @@ -56,11 +65,15 @@ methods: { // 查询商品列表 goodsListinfo() { + this.pageNum = 1; goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => { - res.rows.forEach(e => { - this.goodsList.push(e) - }) - this.total = res.total + if (res.code == 200) { + res.rows.forEach(e => { + this.goodsList.push(e) + }) + this.total = res.total + } + uni.removeStorageSync('Refresh'); }) }, //跳转详情页 @@ -78,7 +91,13 @@ onReachBottom() { //下滑加载 if (this.goodsList.length >= this.total) {} else { this.pageNum++; - this.goodsListinfo(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName) + goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => { + if (res.code == 200) { + res.rows.forEach(e => { + this.goodsList.push(e) + }) + } + }) } }, onPullDownRefresh() { //下拉刷新 diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss index 270c0c5..69a3231 100644 --- a/pages/ProjectDetails/ProjectDetails.scss +++ b/pages/ProjectDetails/ProjectDetails.scss @@ -3,6 +3,7 @@ padding: 2% 2% 150rpx 2%; padding-top: 10rpx; font-size: 34rpx; + position: relative; .mask { .information { width: 70%; diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue index 7afc1ac..7cddb58 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -2,7 +2,9 @@ - {{list.nurseItemName}} + {{list.nurseItemName}} + + 暂无 + + + + 确认收到货了吗 + + + + + + 共1件 + + 为了保证你的售后权益，请收到商品确认无误后再确认收货 + + 确定 + + @@ -80,6 +114,9 @@ import { appletGoodsOrderPay } from '@/api/confirmOrder/index.js' + import { + confirmReceipt + } from '@/api/CommodityOrder/index.js' import { goodsOrder } from '@/api/CommodityOrder/index.js' @@ -91,13 +128,64 @@ order: null, patientId: '', openid: null, + show: false, //收货 orderStatus: '', pageSize: 10, pageNum: 1, timestamp: 0, + goodsOrderId: null, } }, methods: { + //查看评价 + golookrate() { + uni.navigateTo({ + url: `/pages/lookrate/lookrate?item=${JSON.stringify(this.order)}` + }) + }, + //收货 + Receipts() { + confirmReceipt(this.order.goOrderNo).then(res => { + if (res.code == 200) { + this.$refs.uToast.show({ + title: '收货成功', + type: 'success', + duration: '1000' + }) + this.show = false + uni.setStorageSync("Refresh", 'Refresh') + this.goodsOrderinfo() + setTimeout(e => { + uni.navigateTo({ + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${4}` + }) + }, 1000) + } else { + this.$refs.uToast.show({ + title: '收货失败', + type: 'error', + duration: '1000' + }) + this.show = false + } + }) + }, + //收货 + Receipt() { + this.show = true + }, + //看物流信息 + gologistics() { + uni.navigateTo({ + url: `/pages/logistics/logistics?item=${JSON.stringify(this.order)}` + }) + }, + //评价 + rate() { + uni.navigateTo({ + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${4}` + }) + }, //支付 pay() { var that = this @@ -116,6 +204,8 @@ signType: response.data.signType, paySign: response.data.paySign, success: function(res) { + uni.setStorageSync("Refresh", 'Refresh') + this.goodsOrderinfo() that.$refs.uToast.show({ title: '支付成功', type: 'success', @@ -146,8 +236,8 @@ url: `/pages/refundType/refundType?order=${JSON.stringify(this.order)}` }) }, - goodsOrderinfo(goodsOrderId) { - goodsOrder(this.patientId, this.orderStatus, goodsOrderId, this.pageSize, this.pageNum).then(res => { + goodsOrderinfo() { + goodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum).then(res => { this.order = res.rows[0] var time = new Date(this.order.orderTime).getTime() / 1000 + (60 * 60 * 24) var times = new Date().getTime() / 1000 @@ -157,26 +247,25 @@ //跳转售后详情 goAftersalesdetails(item) { uni.navigateTo({ - url: `/pages/Aftersalesdetails/Aftersalesdetails?goodsOrderId=${item.goodsOrderId}` + url: `/pages/Aftersalesdetails/Aftersalesdetails?goodsOrderId=${this.order.goodsOrderId}` }) }, }, + onShow() { + this.goodsOrderinfo() + }, onLoad(options) { this.baseurl = baseurl + this.goodsOrderId = options.goodsOrderId let that = this try { const value = uni.getStorageSync('patientId'); - if (value) { + const value2 = uni.getStorageSync('openid'); + if (value && value2) { that.patientId = value - that.goodsOrderinfo(options.goodsOrderId) + that.openid = value2 } } catch (e) {} - try { - const value = uni.getStorageSync('openid'); - if (value) { - that.openid = value - } else {} - } catch (e) {} } } 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/shopping/shopping.vue b/pages/shopping/shopping.vue index b9d7699..519ed20 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -45,6 +45,8 @@ }; }, onLoad(options) { //初始化加载 + }, + onShow() { this.goodsCategory() }, methods: { @@ -57,10 +59,11 @@ //获取商城信息 goodsCategory() { goodsCategoryList(this.pageSize, this.pageNum).then(res => { + uni.removeStorageSync('Refresh'); res.rows.forEach(e => { e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture - this.goodsCategoryList.push(e) }) + this.goodsCategoryList = res.rows this.total = res.total }) } @@ -68,7 +71,13 @@ onReachBottom() { //下滑加载 if (this.goodsCategoryList.length >= this.total) {} else { this.pageNum++; - this.goodsCategory() + goodsCategoryList(this.pageSize, this.pageNum).then(res => { + res.rows.forEach(e => { + e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture + this.goodsCategoryList.push(e) + }) + this.total = res.total + }) } }, onPullDownRefresh() { //下拉刷新 diff --git a/pages/site/site.vue b/pages/site/site.vue index beeb167..5947f35 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -84,8 +84,10 @@ }); }, requestinfo() { + this.pageNum = 1; nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode).then(res => { if (res.total > 0) { + uni.removeStorageSync('Refresh'); res.rows.forEach(e => { e.stationPictureUrl = baseurl + e.stationPictureUrl }) @@ -142,8 +144,7 @@ // this.requestinfo() }, }, - onShow() {}, - onLoad() { + onShow() { var that = this try { const value = uni.getStorageSync('patientId'); @@ -183,6 +184,8 @@ } }); } + } else if (res.code == 9999) { + } else { uni.getLocation({ type: 'wgs84', @@ -228,6 +231,7 @@ } } catch (e) {} }, + onLoad() {}, }