diff --git a/api/pagesB/CommodityOrder/index.js b/api/pagesB/CommodityOrder/index.js
index 94fe7c1..47859df 100644
--- a/api/pagesB/CommodityOrder/index.js
+++ b/api/pagesB/CommodityOrder/index.js
@@ -1,15 +1,5 @@
import request from "../../request.js"
-export function goodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageNum) {
- return request({
- url: `/nurseApplet/nursingOrder/goodsOrder?patientId=${patientId}&orderStatus=${orderStatus}&goodsOrderId=${goodsOrderId}&pageSize=${pageSize}&pageNum=${pageNum}`,
- method: 'GET',
- header: {
- Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
- },
- })
-}
-
//收货
export function confirmReceipt(orderNo) {
diff --git a/pages.json b/pages.json
index 189505d..596af9b 100644
--- a/pages.json
+++ b/pages.json
@@ -56,7 +56,8 @@
"navigationBarTitleText": "人脸采集",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/location/location",
"style": {
"navigationBarTitleText": "定位",
@@ -347,8 +348,11 @@
}, {
"path": "ExpertlookOrder/ExpertlookOrder",
"style": {
- "navigationBarTitleText": "专家咨询订单",
- "enablePullDownRefresh": false
+ // "navigationBarTitleText": "专家咨询订单",
+ "navigationStyle": "custom", // 隐藏系统导航栏
+ "onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+ "enablePullDownRefresh": true //设置参数为true
+ // "enablePullDownRefresh": false
}
}, {
"path": "consulted/consulted",
diff --git a/pagesB/Aftersalesdetails/Aftersalesdetails.vue b/pagesB/Aftersalesdetails/Aftersalesdetails.vue
index 843785c..f5795ed 100644
--- a/pagesB/Aftersalesdetails/Aftersalesdetails.vue
+++ b/pagesB/Aftersalesdetails/Aftersalesdetails.vue
@@ -41,7 +41,7 @@
\ No newline at end of file
+ page {
+ background-color: #F7F5F5;
+ }
+
+ .app {
+ width: 100%;
+
+ ::v-deep .u-navbar-placeholder {
+ background-color: #F7F5F5;
+ z-index: 999;
+ }
+
+ ::v-deep .u-tabs {
+ width: 100%;
+ position: fixed;
+ // top: 200rpx;
+ z-index: 999;
+ background-color: #F7F5F5 !important;
+ }
+
+ .noorder {
+ margin-top: 20%;
+ }
+
+ .u-navbar {
+ display: block;
+ // height: 200rpx;
+
+ image {
+ margin: 0 4% 0 4%;
+ width: 20rpx;
+ height: 30rpx;
+ }
+
+ .title {
+ width: 46%;
+ font-size: 34rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+
+ .inputs {
+ position: relative;
+ margin-left: 4%;
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ width: 60%;
+ height: 65rpx;
+ border-radius: 20rpx;
+ z-index: 999;
+ background: #65c0a9;
+ color: #FFFFFF;
+
+ .placeholder {
+ color: #FFFFFF;
+ }
+
+ .input {
+ margin: 0 auto;
+ position: absolute;
+ height: 65rpx;
+ // top: 8%;
+ left: 18%;
+ width: 80%;
+ font-size: 26rpx;
+ color: #FFFFFF;
+ }
+
+ .icon {
+ background: url(@/static/pagesB/sousuo.png) no-repeat;
+ width: 30rpx;
+ height: 28rpx;
+ background-size: cover;
+ position: absolute;
+ top: 28%;
+ left: 4%;
+ }
+ }
+ }
+
+ .submits {
+ width: 501rpx;
+ height: 71rpx;
+ background: #26A888;
+ border-radius: 26rpx;
+ text-align: center;
+ line-height: 71rpx;
+ color: #ffffff;
+ font-size: 34rpx;
+ margin-top: 5%;
+ margin-left: 15%;
+ }
+
+ // 弹框确认收货
+ .chat {
+ .word {
+ font-size: 26rpx;
+ color: #010000;
+ line-height: 36rpx;
+ width: 70%;
+ margin: 50rpx auto;
+ text-align: center;
+ }
+
+ .image {
+ position: relative;
+
+ .blackground {
+ width: 183rpx;
+ height: 69rpx;
+ background: #030303;
+ opacity: 0.5;
+ color: #ffffff;
+ font-size: 36rpx;
+ text-align: center;
+ line-height: 69rpx;
+ position: absolute;
+ bottom: 0%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ image {
+ width: 182rpx;
+ display: block;
+ margin: 0 auto;
+ height: 182rpx;
+ }
+ }
+
+ }
+
+ .payment {
+ width: 100%;
+ font-size: 42rpx;
+ color: #000000;
+ line-height: 120rpx;
+ text-align: center;
+
+ span {}
+
+ image {
+ width: 31rpx;
+ height: 31rpx;
+ position: absolute;
+ right: 5%;
+ top: 5%;
+ }
+ }
+
+ .Apayment {
+ width: 99%;
+ height: 400rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border-radius: 20rpx;
+ padding: 3%;
+ font-size: 30rpx;
+ color: #969394;
+ margin-top: 3%;
+ position: relative;
+ // line-height: 70rpx;
+
+ .anniu {
+ display: flex;
+ position: absolute;
+ right: 3%;
+ bottom: 20rpx;
+
+ .logistics {
+ text-align: center;
+ color: #ffffff;
+ width: 170rpx;
+ height: 60rpx;
+ background: #FFFFFF;
+ border: 1px solid #959595;
+ border-radius: 5rpx;
+ font-weight: 400;
+ color: #000000;
+ line-height: 60rpx;
+ }
+
+ .harvest {
+ margin-left: 10rpx;
+ background: #26A888;
+ color: #FFFFFF !important;
+ }
+ }
+
+ .details {
+ height: 200rpx;
+ position: relative;
+
+ .detailslist {
+
+ image {
+ position: absolute;
+ width: 182rpx;
+ height: 182rpx;
+ }
+
+ .model {
+ .top {
+ margin-top: 20rpx;
+ height: 100rpx;
+
+ span:nth-child(1) {
+ position: absolute;
+ left: 32%;
+ font-size: 32rpx;
+ color: #000000;
+ width: 50%;
+ line-height: 40rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+
+ }
+
+ span:nth-child(2) {
+ position: absolute;
+ top: 0%;
+ right: 0%;
+ line-height: 40rpx;
+ font-size: 32rpx;
+ }
+ }
+
+ .bottom {
+ position: absolute;
+ left: 32%;
+ top: 45%;
+ width: 68%;
+
+ .box:nth-child(1) {
+ width: 70%;
+ display: inline-block;
+ font-size: 30rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .box:nth-child(2) {
+ width: 30%;
+ position: absolute;
+ text-align: center;
+ right: 0%;
+ }
+ }
+
+ .refund {
+ position: absolute;
+ right: 0%;
+ top: 70%;
+
+ .price {
+ font-size: 41rpx;
+ color: #000000;
+ }
+ }
+ }
+ }
+ }
+
+ .names {
+ width: 100%;
+ border-bottom: 1rpx solid #D8D4D4;
+ position: relative;
+ padding-bottom: 20rpx;
+
+ .picture {
+ width: 15rpx;
+ height: 23rpx;
+ margin-left: 20rpx;
+ }
+
+ span {
+ position: absolute;
+ right: 0%;
+ color: #26A888;
+ // line-height: 67px;
+ display: inline-block;
+
+ }
+ }
+ }
+ }
+
diff --git a/pagesB/Serviceevaluation/Serviceevaluation.vue b/pagesB/Serviceevaluation/Serviceevaluation.vue
index f992d4b..30ab357 100644
--- a/pagesB/Serviceevaluation/Serviceevaluation.vue
+++ b/pagesB/Serviceevaluation/Serviceevaluation.vue
@@ -38,7 +38,6 @@
-
立即评价
@@ -470,7 +469,8 @@
height: 74rpx;
overflow: auto;
- span:nth-child(1) {
+
+ span:nth-child(1) {
font-size: 28rpx;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index 9807de8..f4dc0fb 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -68,8 +68,14 @@
- {{item.scheduleTimeSlot}}
+ :class="timeindex==index?'timeitemtap':'timeitem'"
+ :style="item.status?'':'background: #FFFFFF;color: #AAABB0;'">
+
+ {{item.scheduleTimeSlot}}
+
+
+ {{item.status?'(可预约)':'(不可预约)'}}
+
@@ -169,6 +175,7 @@
timecurrent: 0, //时间下标
timeindex: 0,
appointmentTimeList: [],
+ timer: null,
formdata: {
address: null,
patientId: null,
diff --git a/pagesB/orderDetails/orderDetails.vue b/pagesB/orderDetails/orderDetails.vue
index f0b2d65..1ce8a23 100644
--- a/pagesB/orderDetails/orderDetails.vue
+++ b/pagesB/orderDetails/orderDetails.vue
@@ -142,7 +142,7 @@
} from '@/api/pagesB/confirmOrder/index.js'
import {
confirmReceipt,
- goodsOrder
+ ssgoodsOrder
} from '@/api/pagesB/CommodityOrder/index.js'
import {
handCloseOrder
@@ -153,16 +153,23 @@
return {
baseurl: '',
order: null,
- patientId: '',
- openid: null,
show: false, //收货
- orderStatus: '',
- pageSize: 10,
- pageNum: 1,
timestamp: 0,
- goodsOrderId: null,
timecount: undefined,
Timers: null,
+ orderTypeList: {
+ goodsOrderId: null,
+ patientId: '',
+ openid: null,
+ orderTypeList: [
+ 'INTEGRAL_EXCHANGE',
+ 'DIRECT_BUY',
+ ],
+ orderStatus: '',
+ pageSize: 15,
+ pageNum: 1,
+ goodsName: '',
+ },
}
},
onUnload() {
@@ -232,7 +239,7 @@
pay() {
var that = this
let paydata = this.order
- paydata.openid = this.openid
+ paydata.openid = this.orderTypeList.openid
paydata.payType = "WECHAT_PAY"
paydata.paymentPrice = this.order.totalPrice
paydata.orderChannel = 'WECHAT_APPLET'
@@ -279,19 +286,20 @@
})
},
goodsOrderinfo() {
- goodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum).then(res => {
- this.order = res.rows[0]
- var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
- var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
- var times = new Date().getTime() / 1000
- this.timestamp = time - times
- if (this.timestamp >= 0) {
- this.timecount = this.timestamp
- this.Timers = setInterval(() => {
- this.timecount--;
- }, 1000)
- }
- })
+ ssgoodsOrder(this.orderTypeList).then(
+ res => {
+ this.order = res.rows[0]
+ var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
+ var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
+ var times = new Date().getTime() / 1000
+ this.timestamp = time - times
+ if (this.timestamp >= 0) {
+ this.timecount = this.timestamp
+ this.Timers = setInterval(() => {
+ this.timecount--;
+ }, 1000)
+ }
+ })
},
//跳转售后详情
goAftersalesdetails(item) {
@@ -305,13 +313,13 @@
},
onLoad(options) {
this.baseurl = baseurl
- this.goodsOrderId = options.goodsOrderId
+ this.orderTypeList.goodsOrderId = options.goodsOrderId
let that = this
const value = uni.getStorageSync('patientId');
const value2 = uni.getStorageSync('openid');
if (value && value2) {
- that.patientId = value
- that.openid = value2
+ that.orderTypeList.patientId = value
+ that.orderTypeList.openid = value2
}
}
}
diff --git a/pagesC/servicerecord/servicerecord.vue b/pagesC/servicerecord/servicerecord.vue
index f0601ed..987163d 100644
--- a/pagesC/servicerecord/servicerecord.vue
+++ b/pagesC/servicerecord/servicerecord.vue
@@ -120,7 +120,7 @@
- 取消
+ 取消
提交
@@ -179,6 +179,9 @@
},
methods: {
+ cancel(){
+ this.evaluateshow=false
+ },
submit(item) {
console.log(this.list, '45')
add(this.list).then(res => {