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 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=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.packagePrice}} - ￥{{item.oldPrice}} + + + + ￥{{orderXm.oldPrice}} 服务时长:{{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 @@ 已拼 - 16 + {{mainData.sales}} 次 @@ -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 @@ {{mainData.title}} - + 次 + {{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 From 86d503b8a715b051e4a38275258be2d547415f2f 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 22:43:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/payModifyCi.vue | 27 +- my/order/payModifyLiao.vue | 27 +- my/order/payModifyMs.vue | 27 +- my/order/payModifyPt.vue | 35 ++- my/order/payModifyTc.vue | 27 +- my/order/payModifyTcMy.vue | 22 ++ pages/my/cika.vue | 315 +++++++++++++--------- pages/my/cikarDrtail.vue | 29 ++ pages/my/fuwuliaocheng.vue | 305 ++++++++++++--------- pages/my/fuwuliaochengDetail.vue | 33 ++- pages/my/indextaociliaoList.vue | 14 +- pages/my/miaoShaOderDrtail.vue | 20 +- pages/my/myMsOderDrtail.vue | 22 +- pages/my/newTeaml.vue | 433 +++++++++++++++++------------- pages/my/newTeamlDetail.vue | 38 ++- pages/my/newseckill.vue | 438 ++++++++++++++++++------------- pages/my/newseckilldetails.vue | 39 ++- pages/my/pTuanOderDrtail.vue | 24 +- pages/my/pinTuanOderDrtail.vue | 20 +- pages/my/serviceOderDrtail.vue | 33 ++- pages/my/servicePackage.vue | 20 +- 21 files changed, 1256 insertions(+), 692 deletions(-) diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue index 7d14700..2544af0 100644 --- a/my/order/payModifyCi.vue +++ b/my/order/payModifyCi.vue @@ -45,7 +45,8 @@ {{item.title}} - 详情 + + {{orderXm.levelName}} @@ -1428,16 +1429,22 @@ padding: 20rpx 0; } .detail-foot-list-top span:nth-child(2){ - width: 76rpx; - height: 33rpx; - line-height: 33rpx; + // width: 76rpx; + // height: 33rpx; + // line-height: 33rpx; + // text-align: center; + // border-radius: 16rpx; + // border: 1px solid #7D7D7D; + // font-weight: 400; + // font-size: 20rpx; + // color: #777777; + // margin: 0px 25px 0px 5px; + padding: 1px 8px; + border-radius: 10rpx 3rpx 10rpx 3rpx; + width: 50px; text-align: center; - border-radius: 16rpx; - border: 1px solid #7D7D7D; - font-weight: 400; - font-size: 20rpx; - color: #777777; - margin: 0px 25px 0px 5px; + background-color: #f1f8d7; + color: #58b314; } .detail-foot-list-top span:nth-child(3){ font-weight: 400; diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue index c128d83..4635ea1 100644 --- a/my/order/payModifyLiao.vue +++ b/my/order/payModifyLiao.vue @@ -45,7 +45,8 @@ {{item.title}} - 详情 + + {{orderXm.levelName}} @@ -1441,16 +1442,22 @@ padding: 20rpx 0; } .detail-foot-list-top span:nth-child(2){ - width: 76rpx; - height: 33rpx; - line-height: 33rpx; + // width: 76rpx; + // height: 33rpx; + // line-height: 33rpx; + // text-align: center; + // border-radius: 16rpx; + // border: 1px solid #7D7D7D; + // font-weight: 400; + // font-size: 20rpx; + // color: #777777; + // margin: 0px 25px 0px 5px; + padding: 1px 8px; + border-radius: 10rpx 3rpx 10rpx 3rpx; + width: 50px; text-align: center; - border-radius: 16rpx; - border: 1px solid #7D7D7D; - font-weight: 400; - font-size: 20rpx; - color: #777777; - margin: 0px 25px 0px 5px; + background-color: #f1f8d7; + color: #58b314; } .detail-foot-list-top span:nth-child(3){ font-weight: 400; diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue index 82a4ec2..e4ecfdf 100644 --- a/my/order/payModifyMs.vue +++ b/my/order/payModifyMs.vue @@ -44,7 +44,8 @@ {{item.title}} - 详情 + + {{orderXm.levelName}} @@ -1490,16 +1491,22 @@ padding: 20rpx 0; } .detail-foot-list-top span:nth-child(2){ - width: 76rpx; - height: 33rpx; - line-height: 33rpx; + // width: 76rpx; + // height: 33rpx; + // line-height: 33rpx; + // text-align: center; + // border-radius: 16rpx; + // border: 1px solid #7D7D7D; + // font-weight: 400; + // font-size: 20rpx; + // color: #777777; + // margin: 0px 25px 0px 5px; + padding: 1px 8px; + border-radius: 10rpx 3rpx 10rpx 3rpx; + width: 50px; text-align: center; - border-radius: 16rpx; - border: 1px solid #7D7D7D; - font-weight: 400; - font-size: 20rpx; - color: #777777; - margin: 0px 25px 0px 5px; + background-color: #f1f8d7; + color: #58b314; } .detail-foot-list-top span:nth-child(3){ font-weight: 400; diff --git a/my/order/payModifyPt.vue b/my/order/payModifyPt.vue index bed9ed1..5a103ee 100644 --- a/my/order/payModifyPt.vue +++ b/my/order/payModifyPt.vue @@ -45,17 +45,18 @@ {{item.title}} - 详情 + + {{orderXm.levelName}} - - - - ￥{{orderXm.oldPrice}} + ￥ + {{item.packagePrice}} + ￥{{item.oldPrice}} + 服务时长:{{item.duration}}分钟 @@ -440,16 +441,22 @@ padding: 20rpx 0; } .detail-foot-list-top span:nth-child(2){ - width: 76rpx; - height: 33rpx; - line-height: 33rpx; + // width: 76rpx; + // height: 33rpx; + // line-height: 33rpx; + // text-align: center; + // border-radius: 16rpx; + // border: 1px solid #7D7D7D; + // font-weight: 400; + // font-size: 20rpx; + // color: #777777; + // margin: 0px 25px 0px 5px; + padding: 1px 8px; + border-radius: 10rpx 3rpx 10rpx 3rpx; + width: 50px; text-align: center; - border-radius: 16rpx; - border: 1px solid #7D7D7D; - font-weight: 400; - font-size: 20rpx; - color: #777777; - margin: 0px 25px 0px 5px; + background-color: #f1f8d7; + color: #58b314; } .detail-foot-list-top span:nth-child(3){ font-weight: 400; diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index 01be160..1812381 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -47,7 +47,8 @@ {{item.title}} - 详情 + + {{orderXm.levelName}} @@ -1517,16 +1518,22 @@ padding: 20rpx 0; } .detail-foot-list-top span:nth-child(2){ - width: 76rpx; - height: 33rpx; - line-height: 33rpx; + // width: 76rpx; + // height: 33rpx; + // line-height: 33rpx; + // text-align: center; + // border-radius: 16rpx; + // border: 1px solid #7D7D7D; + // font-weight: 400; + // font-size: 20rpx; + // color: #777777; + // margin: 0px 25px 0px 5px; + padding: 1px 8px; + border-radius: 10rpx 3rpx 10rpx 3rpx; + width: 50px; text-align: center; - border-radius: 16rpx; - border: 1px solid #7D7D7D; - font-weight: 400; - font-size: 20rpx; - color: #777777; - margin: 0px 25px 0px 5px; + background-color: #f1f8d7; + color: #58b314; } .detail-foot-list-top span:nth-child(3){ font-weight: 400; diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue index 7aaab0e..910947f 100644 --- a/my/order/payModifyTcMy.vue +++ b/my/order/payModifyTcMy.vue @@ -14,6 +14,9 @@ {{orderXm.title}} + + {{orderXm.levelName}} + @@ -264,6 +267,15 @@ this.msTimeDate = 60; } this.orderXm=this.$queue.getData('mainData'); + if(this.orderXm.level == 3){ + this.orderXm.levelName = "新手" + } + if(this.orderXm.level == 4){ + this.orderXm.levelName = "专家" + } + if(this.orderXm.level == 5){ + this.orderXm.levelName = "资深" + } console.log("this.orderXm",this.orderXm) this.detailData=this.$queue.getData('detailData'); var date = new Date(); @@ -2194,4 +2206,14 @@ border-bottom: 1px #e5e5e5 solid; margin: 30rpx 0; } + .item-view-biao{ + padding: 1px 5px; + border-radius: 15rpx 3rpx 15rpx 3rpx; + width: 50px; + text-align: center; + } + .xiaoer{ + background-color:#f1f8d7; + color: #58b314; + } diff --git a/pages/my/cika.vue b/pages/my/cika.vue index 6da76d5..ebd0692 100644 --- a/pages/my/cika.vue +++ b/pages/my/cika.vue @@ -1,7 +1,7 @@