From 5959df70900d877f51591f2046ea54027b920550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 1 Aug 2024 16:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/payModifyPt.vue | 9 ++---
pages/my/cikarDrtail.vue | 4 +--
pages/my/fuwuliaochengDetail.vue | 4 +--
pages/my/miaoShaOderDrtail.vue | 20 +++++------
pages/my/newTeamlDetail.vue | 11 +++---
pages/my/newseckilldetails.vue | 9 ++---
pages/my/pTuanOderDrtail.vue | 2 ++
pages/my/pinTuanOderDrtail.vue | 20 +++++------
pages/my/serviceOderDrtail.vue | 35 ++++++++++---------
.../uni-search-bar/uni-search-bar.vue | 2 +-
10 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/my/order/payModifyPt.vue b/my/order/payModifyPt.vue
index bcebdd9..bed9ed1 100644
--- a/my/order/payModifyPt.vue
+++ b/my/order/payModifyPt.vue
@@ -52,9 +52,10 @@
服务时长:{{item.duration}}分钟
@@ -129,7 +130,7 @@
methods: {
goOrder() {//生成orderId
let that = this
- console.log('asdasd',that.couponId)
+ console.log(that.orderXm.groupNo);
let data = {
userId: uni.getStorageSync('userId'),
groupNo:that.orderXm.groupNo,
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 0fa78e0..757b472 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -209,9 +209,9 @@
detail(item){//详情
console.log("item=====>",item)
if(item.usedQuantity){
- item.id=this.mainData.id
+ // item.id=this.mainData.id
uni.navigateTo({
- url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'次卡'
+ url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&mainId='+this.mainId+'&name='+'次卡'
})
}else{
uni.showToast({
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index 4691aa3..c5d005a 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -218,9 +218,9 @@
methods:{
details(item){//详情
if(item.usedQuantity){
- item.id=this.mainData.id
+ // item.id=this.mainData.id
uni.navigateTo({
- url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'疗程'
+ url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&mainId='+this.mainId+'&name='+'疗程'
})
}else{
uni.showToast({
diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue
index 47b69c2..91ac624 100644
--- a/pages/my/miaoShaOderDrtail.vue
+++ b/pages/my/miaoShaOderDrtail.vue
@@ -79,7 +79,7 @@
￥{{item.oldPrice}}
- {{item.status=='1'?'详情':'预约'}}
+ {{item.status=='1'?'订单':'预约'}}
服务时长:{{item.duration}}分钟
@@ -182,9 +182,8 @@
},
xiangqing(item){
if(item.status=='1'){
- item.id=this.mainData.id
uni.navigateTo({
- url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'秒杀'
+ url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&name='+'秒杀'
})
}else{
uni.navigateTo({
@@ -196,18 +195,17 @@
},
detail(item){
- if(item.status=='1'){
- uni.showToast({
- title:'该项目已使用！'
- })
- }else{
+ // if(item.status=='1'){
+ // uni.showToast({
+ // title:'该项目已使用！'
+ // })
+ // }else{
uni.navigateTo({
url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
- '&page='+1+
- '&limit='+10
+ '&status='+item.status
})
- }
+ // }
},
getData(){
diff --git a/pages/my/newTeamlDetail.vue b/pages/my/newTeamlDetail.vue
index fc8d7ef..4d78ebf 100644
--- a/pages/my/newTeamlDetail.vue
+++ b/pages/my/newTeamlDetail.vue
@@ -18,7 +18,7 @@
距结束仅剩
-
+
@@ -35,7 +35,7 @@
@@ -60,7 +60,9 @@
还差{{itema.lessNum}}人拼成
- 剩余
+
去拼团
@@ -92,7 +94,7 @@
-
+
￥{{mainData.price}}
一键开团
@@ -205,7 +207,6 @@
this.hours=hours;
this.minutes=minutes;
this.seconds=seconds;
- console.log("asdsadasdasdasd",this.day,this.hours,this.minutes,this.seconds)
},
getData(){
var that=this;
diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue
index 7780ae3..a2db2ec 100644
--- a/pages/my/newseckilldetails.vue
+++ b/pages/my/newseckilldetails.vue
@@ -28,10 +28,11 @@
-
+ 次
+
{{item}}
@@ -1242,7 +1243,7 @@
}
.header-bottom-title-num span:nth-child(2){
font-weight: bold;
- color: #08A28A;
+ color: #f52b1b;
}
.header-bottom-title-num span:nth-child(3){
color: #848485;
diff --git a/pages/my/pTuanOderDrtail.vue b/pages/my/pTuanOderDrtail.vue
index d7f28f2..100d4a2 100644
--- a/pages/my/pTuanOderDrtail.vue
+++ b/pages/my/pTuanOderDrtail.vue
@@ -162,6 +162,7 @@
},
getData(){
var that=this;
+ console.log(that.dataList);
let data = {
id: that.dataList.id,
page: that.page,
@@ -169,6 +170,7 @@
}
that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
if (res.code == 0) {
+ console.log(res.data);
that.getList=res.data;
that.backgroundImageUrl=that.getList.massageImg
// that.labels=res.data.labels.split(',');
diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue
index 616d78a..0f7006f 100644
--- a/pages/my/pinTuanOderDrtail.vue
+++ b/pages/my/pinTuanOderDrtail.vue
@@ -79,7 +79,7 @@
￥{{item.oldPrice}}
- {{item.status=='1'?'详情':'预约'}}
+ {{item.status=='1'?'订单':'预约'}}
服务时长:{{item.duration}}分钟
@@ -182,9 +182,8 @@
},
xiangqing(item){
if(item.status=='1'){
- item.id=this.mainData.id
uni.navigateTo({
- url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'拼团'
+ url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&mainId='+this.mainId+'&name='+'拼团'
})
}else{
uni.navigateTo({
@@ -196,18 +195,17 @@
},
detail(item){
- if(item.status=='1'){
- uni.showToast({
- title:'该项目已使用！'
- })
- }else{
+ // if(item.status=='1'){
+ // uni.showToast({
+ // title:'该项目已使用！'
+ // })
+ // }else{
uni.navigateTo({
url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
- '&page='+1+
- '&limit='+10
+ '&status='+item.status
})
- }
+ // }
},
getData(){
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index ecb837e..9e6834d 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -97,7 +97,7 @@
￥{{item.oldPrice}}
- {{item.status=='1'?'详情':'预约'}}
+ {{item.status=='1'?'订单':'预约'}}
服务时长:{{item.duration}}分钟
@@ -634,29 +634,32 @@
}
},
xiangqing(item){
- uni.navigateTo({
- url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
- '&massageTypeId='+item.massageTypeId+
- '&status='+item.status+
- '&name='+this.nameText
- })
- },
- detail(item){
- if(item.status=='1'&&this.serviData.name!='index'){
- uni.showToast({
- title:'该项目已使用！'
+ if(item.status=='1'){
+ uni.navigateTo({
+ url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&mainId='+this.mainId+'&name='+'套餐'
})
}else{
uni.navigateTo({
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
- '&page='+1+
- '&limit='+10+
+ '&status='+item.status+
'&name='+this.nameText
})
}
-
-
+ },
+ detail(item){
+ // if(item.status=='1'&&this.serviData.name!='index'){
+ // uni.showToast({
+ // title:'该项目已使用！'
+ // })
+ // }else{
+ uni.navigateTo({
+ url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
+ '&massageTypeId='+item.massageTypeId+
+ '&status='+item.status+
+ '&name='+this.nameText
+ })
+ // }
},
getData(){
var that=this;
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index 3cc70bd..2b2f474 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -139,7 +139,7 @@
}
},
mounted() {
- console.log("asdsad",this.serviceTrue)
+
},
watch: {
// #ifndef VUE3