From 1582a437b529e2f5bc99fe70be0101df7a21288f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 14 Aug 2024 22:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 6 +-
my/order/payJaZ.vue | 6 +-
my/order/payModify.vue | 10 +-
my/order/payModifyDzhifu.vue | 4 +-
my/order/payModifyJsDetail.vue | 4 +-
my/order/payModifyTcMy.vue | 25 +++--
my/order/payModifyTcMyDaiB.vue | 6 +-
my/order/payShengji.vue | 6 +-
my/order/payding.vue | 8 +-
my/order/paydingDd.vue | 2 +-
my/order/paydingTCX.vue | 6 +-
my/order/paydingXiuGai.vue | 2 +-
pages/my/cikarDrtail.vue | 12 +--
pages/my/fuwuliaochengDetail.vue | 12 +--
pages/my/miaoShaOderDrtail.vue | 6 +-
pages/my/myMsOderDrtail.vue | 6 +-
pages/my/newseckilldetails.vue | 12 +--
pages/my/pTuanOderDrtail.vue | 6 +-
pages/my/pinTuanOderDrtail.vue | 6 +-
pages/my/serviceOderDrtail.vue | 12 +--
pages/shop/qiyeDatail.vue | 12 +--
pages/therapist/orderDetail.vue | 2 +-
pages/therapist/therapist.vue | 162 ++++++++++++-----------------
pages/therapist/therapist1.vue | 6 +-
pages/therapist/therapistList.vue | 6 +-
pages/therapist/therapistList1.vue | 2 +-
26 files changed, 166 insertions(+), 181 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 2132ef6..18a5c1b 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -1330,13 +1330,13 @@ export default {
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
- this.order["technicianTypeName"] = "新手"
+ this.order["technicianTypeName"] = "资深"
}
if(res.data["technicianType"] == 4){
- this.order["technicianTypeName"] = "专家"
+ this.order["technicianTypeName"] = "金牌"
}
if(res.data["technicianType"] == 5){
- this.order["technicianTypeName"] = "资深"
+ this.order["technicianTypeName"] = "专家"
}
var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 29a2ec2..cbf6d10 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -1125,13 +1125,13 @@ export default {
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
- this.order["technicianTypeName"] = "新手"
+ this.order["technicianTypeName"] = "资深"
}
if(res.data["technicianType"] == 4){
- this.order["technicianTypeName"] = "专家"
+ this.order["technicianTypeName"] = "金牌"
}
if(res.data["technicianType"] == 5){
- this.order["technicianTypeName"] = "资深"
+ this.order["technicianTypeName"] = "专家"
}
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 48e7507..d4d13c1 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -309,8 +309,8 @@
selectedString:'',
fuwuBtn: [
{'title':'请速回电'},
- {'title':'切勿大声敲门'},
- {'title':'请尽快上门服务'},
+ {'title':'勿大声敲门'},
+ {'title':'尽快上门服务'},
{'title':'直接来即可'},
],
}
@@ -694,6 +694,12 @@
},
goOrder() {//生成orderId
let that = this
+ if(that.detailaddress==''){
+ uni.showToast({
+ title:'请选择服务地址！'
+ })
+ return;
+ }
let data = {
address:that.province+that.city+that.district+that.detailaddress,
artificerId:that.jishiName.artificerId,
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index 5e5173a..1e0a491 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -275,8 +275,8 @@
return {
fuwuBtn: [
{'title':'请速回电'},
- {'title':'切勿大声敲门'},
- {'title':'请尽快上门服务'},
+ {'title':'勿大声敲门'},
+ {'title':'尽快上门服务'},
{'title':'直接来即可'},
],
selected:[],
diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue
index 26f779a..8db15f6 100644
--- a/my/order/payModifyJsDetail.vue
+++ b/my/order/payModifyJsDetail.vue
@@ -311,8 +311,8 @@
selectedString:'',
fuwuBtn: [
{'title':'请速回电'},
- {'title':'切勿大声敲门'},
- {'title':'请尽快上门服务'},
+ {'title':'勿大声敲门'},
+ {'title':'尽快上门服务'},
{'title':'直接来即可'},
],
}
diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 0572967..0b77fc7 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -290,8 +290,8 @@
selectedString:'',
fuwuBtn: [
{'title':'请速回电'},
- {'title':'切勿大声敲门'},
- {'title':'请尽快上门服务'},
+ {'title':'勿大声敲门'},
+ {'title':'尽快上门服务'},
{'title':'直接来即可'},
],
}
@@ -304,13 +304,13 @@
}
this.orderXm=this.$queue.getData('mainData');
if(this.orderXm.level == 3){
- this.orderXm.levelName = "新手"
+ this.orderXm.levelName = "资深"
}
if(this.orderXm.level == 4){
- this.orderXm.levelName = "专家"
+ this.orderXm.levelName = "金牌"
}
if(this.orderXm.level == 5){
- this.orderXm.levelName = "资深"
+ this.orderXm.levelName = "专家"
}
console.log("this.orderXm",this.orderXm)
this.detailData=this.$queue.getData('detailData');
@@ -417,6 +417,12 @@
},
goOrder() {//生成orderId
let that = this
+ if(that.detailaddress==''){
+ uni.showToast({
+ title:'请选择服务地址！'
+ })
+ return;
+ }
// let payMoney =item.price;
// let payMoney = that.isVip ? item.memberPrice : item.price;
let data = {
@@ -1408,7 +1414,7 @@
}
.huiBtn {
color:#333;
- background: #ccc;
+ background: #f3f3f3;
// color: #333333;
}
.lanBtn {
@@ -1416,16 +1422,17 @@
background: #049F89;
}
.guke-btn {
- width: 45%;
+ width:24%;
// height: 40px;
- line-height: 40px;
+ line-height:34px;
// margin-left: 5px;
text-align: center;
// line-height: 40px;
font-weight: bold;
- font-size: 12px;
+ font-size:11px;
border-radius: 6px;
margin-top:5px;
+ margin-right:2px;
// border-bottom: 1px solid #ccc;
}
.guke-list {
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index f2fc018..f1d4a52 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -533,13 +533,13 @@
uni.hideLoading()
this.order = res.data;
if (res.data["technicianType"] == 3) {
- this.order["technicianTypeName"] = "新手"
+ this.order["technicianTypeName"] = "资深"
}
if (res.data["technicianType"] == 4) {
- this.order["technicianTypeName"] = "专家"
+ this.order["technicianTypeName"] = "金牌"
}
if (res.data["technicianType"] == 5) {
- this.order["technicianTypeName"] = "资深"
+ this.order["technicianTypeName"] = "专家"
}
var date = new Date(); // 当前日期和时间
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 90289f6..318336b 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -1443,13 +1443,13 @@
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
- this.order["technicianTypeName"] = "新手"
+ this.order["technicianTypeName"] = "资深"
}
if(res.data["technicianType"] == 4){
- this.order["technicianTypeName"] = "专家"
+ this.order["technicianTypeName"] = "金牌"
}
if(res.data["technicianType"] == 5){
- this.order["technicianTypeName"] = "资深"
+ this.order["technicianTypeName"] = "专家"
}
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 4f9df35..ee92983 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -114,7 +114,7 @@
-
+
- {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}
+ {{order.technicianType=='3'?'资深':order.technicianType=='4'?'金牌':'专家'}}
-
+