From 8363be8f8843146f1e15d30de125762778dbd8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 3 Sep 2024 17:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=97=A0=E6=B3=95=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E6=8A=80=E5=B8=88BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/address/address.vue | 9 ++--
my/order/payModifyDzhifu.vue | 91 +++++++++++++++++++--------------
my/order/payModifyTcMy.vue | 4 +-
pages/my/hangyedana.vue | 32 ++++++------
pages/therapist/orderDetail.vue | 46 +++++++++--------
5 files changed, 102 insertions(+), 80 deletions(-)
diff --git a/my/address/address.vue b/my/address/address.vue
index 8cb1f29..93c522b 100644
--- a/my/address/address.vue
+++ b/my/address/address.vue
@@ -62,7 +62,8 @@
address: '',
isfa: '',
noneData:'地址',
- orderXm:[]
+ orderXm:[],
+ pageName:'',
}
},
onShow() {
@@ -73,8 +74,9 @@
},
onLoad(e) {
this.isfa = e.id
+ this.pageName = e.pageName
+ console.log(this.pageName);
-
let userId = this.$queue.getData('userId');
if (userId) {
this.getAddressList();
@@ -90,7 +92,8 @@
this.updateaddress()
}else if (this.isfa == 2) {
uni.reLaunch({
- url:'/my/order/payModify'
+ // url:'/my/order/payModify',
+ url:'/my/order/'+this.pageName,
})
}else if (this.isfa == '104') {
uni.reLaunch({
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index d62b9d0..f5602ff 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -31,7 +31,7 @@
- {{orderXm.duration}}分钟
+ 时长：{{orderXm.duration}}分钟
@@ -39,11 +39,10 @@
价格：
￥
-
- {{technicianRate}}
-
+ {{technicianRate}}
+ 价格：
￥
{{orderXm.priceMarkup}}
@@ -56,7 +55,7 @@
-
+
请选择地址
@@ -124,15 +123,15 @@
-->
@@ -165,7 +165,9 @@
limit: pageSize,
isGoods: '1',
classifyId: this.classifyId,
- artificerName: this.searchValue
+ artificerName: this.searchValue,
+ by: 1,
+ status:-1
}
this.$Request.get('/app/artificer/selectArtificerList', params).then(res => {
this.$refs.paging.complete(res.data.list);
@@ -195,8 +197,8 @@
url: '/pages/therapist/orderDetail?artificerId=' + item.artificerId + "&classifyId=" + this
.tabIndex
});
-
-
+
+
}
}
}
@@ -357,7 +359,7 @@
height: auto;
border-radius: 10rpx;
position: relative;
-
+
}
.touxiang-left-content-img-ditu{
width: 150rpx;
@@ -389,8 +391,8 @@
flex-direction: column;
align-items: baseline;
}
-
-
+
+
/deep/.zp-empty-view-center{
position: absolute;
margin-top: 106px;
@@ -401,7 +403,7 @@
display: flex;
justify-content: end;
// overflow: hidden;
-
+
.leftTab {
width:19%;
height: 100%;
@@ -415,7 +417,7 @@
left: 0;
.tabBox {
height: 100%;
-
+
.tabItem {
text-align: center;
padding: 14rpx 0;
@@ -425,14 +427,14 @@
font-weight: bold;
margin-bottom: 20rpx;
}
-
+
.tabActive {
background: #f2fffb;
color: #019c88;
}
}
}
-
+
.rightGoods {
width:76%;
height: 100%;
@@ -453,8 +455,8 @@
font-size: 26rpx;
font-weight: bold;
}
-
-
+
+
}
}
}
@@ -819,4 +821,4 @@
flex-direction: row;
align-items: center;
}
-
\ No newline at end of file
+
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 0cd6af7..abf74b1 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -9,7 +9,7 @@
相识度：{{order.bdxsl}}%
-
+
@@ -46,7 +46,7 @@
{{order.technicianTypeName}}
-
+
请TA上线
@@ -91,7 +91,7 @@
{{order.consortiaName}}
-
+
@@ -123,7 +123,7 @@
{{order.content}}
-
+
-
+
@@ -326,6 +326,7 @@
longitude: '',
imgArr: [],
status: "",
+ acceptOrders: '',
XCXIsSelect: '否',
hyCheck: '否',
imageHeight: '358',
@@ -337,7 +338,7 @@
}
},
onLoad(option) {
-
+
this.hyCheck = this.$queue.getData('hyCheck');
uni.showLoading({
title: '加载中...',
@@ -400,7 +401,7 @@
if (res.code == 0) {
that.swiperDateLists = res.data.list||{}
// this.dataList=res.data.records
-
+
} else {
uni.showToast({
title: res.msg,
@@ -475,12 +476,12 @@
}
}
})
-
+
},
guanzhu(item) {// 关注
let oldIsFollow = this.isFollow;
let that = this;
-
+
let data = {
artificerId: that.artificerId,
userId: that.myId,
@@ -499,7 +500,7 @@
icon: 'none'
})
}
-
+
} else {
uni.showToast({
title: res.msg,
@@ -558,6 +559,7 @@
if (res.code == 0) {
this.order = res.data
this.status = res.data.status
+ this.acceptOrders = res.data.acceptOrders
this.tripWay = res.data.tripWay;
this.artificerClassifyList=res.data.artificerClassifyList
console.log("artificerClassifyList",this.artificerClassifyList)
@@ -692,7 +694,7 @@
}
})
},
-
+
saveImg(imgs, index) {
// console.log(imgs)
let that = this;
@@ -799,7 +801,7 @@
position: absolute;
top:1rpx;
left:-1rpx;
-
+
}
.headset-text{
background: linear-gradient(90deg, #88abec, #4e7dd3);
@@ -972,7 +974,7 @@
align-items: center;
margin-top:14rpx;
}
-
+
.popup-mian{
width: 88%;
display: flex;
@@ -1010,7 +1012,7 @@
display: flex;
flex-direction: column;
}
-
+
.content{
width: 100%;
background-color: #f7f7f7;
@@ -1043,7 +1045,7 @@
/* padding-left:50rpx; */
font-size: 28rpx;
font-weight: bold;
-
+
}
.oder-mian-qing{
height: 47rpx;
@@ -1099,7 +1101,7 @@
font-size: 21rpx;
color: #878787;
}
-
+
.video-list-top{
width: 100%;
display: flex;
@@ -1136,7 +1138,7 @@
height:50rpx;
line-height: 52rpx;
margin-left: 8rpx;
-
+
}
.shouchang-img{
width: 30rpx;
@@ -1223,7 +1225,7 @@
color: #333333;
margin-bottom: 5rpx;
}
-
+
.xiangmu-cont-top{
width: 100%;
display: flex;
@@ -1350,7 +1352,7 @@
align-items: center;
border-radius: 7rpx;
}
-
+
.oder-mian-left{
display: flex;
flex-direction: row;
@@ -1364,14 +1366,14 @@
align-items: center;
justify-content: space-between;
}
-
+
.jian-view-right-weizhi{
display: flex;
flex-direction: row;
align-items: center;
margin-left: 10px;
}
-
+
.view-head{
padding-bottom: 5px;
margin: 15px 24px 0px 24px;
@@ -1537,4 +1539,4 @@
margin-right: 10rpx;
margin-top: 5px;
}
-
\ No newline at end of file
+