订单页面调整
This commit is contained in:
parent
377203fea9
commit
5959df7090
|
@ -52,9 +52,10 @@
|
||||||
<view class="detail-view-mina">
|
<view class="detail-view-mina">
|
||||||
<view class="header-bottom-money">
|
<view class="header-bottom-money">
|
||||||
<view class="header-bottom-money-zhen">
|
<view class="header-bottom-money-zhen">
|
||||||
<span class="header-bottom-money-zhen-child1">¥</span>
|
<!-- <span class="header-bottom-money-zhen-child1">¥</span> -->
|
||||||
<span class="header-bottom-money-zhen-child2">{{item.packagePrice}}</span>
|
<!-- <span class="header-bottom-money-zhen-child2">{{item.packagePrice}}</span> -->
|
||||||
<span class="header-bottom-money-zhen-child3">¥{{item.oldPrice}}</span>
|
<!-- <span class="header-bottom-money-zhen-child3">¥{{item.oldPrice}}</span> -->
|
||||||
|
<span class="header-bottom-money-zhen-child3">¥{{orderXm.oldPrice}}</span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
||||||
|
@ -129,7 +130,7 @@
|
||||||
methods: {
|
methods: {
|
||||||
goOrder() {//生成orderId
|
goOrder() {//生成orderId
|
||||||
let that = this
|
let that = this
|
||||||
console.log('asdasd',that.couponId)
|
console.log(that.orderXm.groupNo);
|
||||||
let data = {
|
let data = {
|
||||||
userId: uni.getStorageSync('userId'),
|
userId: uni.getStorageSync('userId'),
|
||||||
groupNo:that.orderXm.groupNo,
|
groupNo:that.orderXm.groupNo,
|
||||||
|
|
|
@ -209,9 +209,9 @@
|
||||||
detail(item){//详情
|
detail(item){//详情
|
||||||
console.log("item=====>",item)
|
console.log("item=====>",item)
|
||||||
if(item.usedQuantity){
|
if(item.usedQuantity){
|
||||||
item.id=this.mainData.id
|
// item.id=this.mainData.id
|
||||||
uni.navigateTo({
|
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{
|
}else{
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
|
@ -218,9 +218,9 @@
|
||||||
methods:{
|
methods:{
|
||||||
details(item){//详情
|
details(item){//详情
|
||||||
if(item.usedQuantity){
|
if(item.usedQuantity){
|
||||||
item.id=this.mainData.id
|
// item.id=this.mainData.id
|
||||||
uni.navigateTo({
|
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{
|
}else{
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
¥{{item.oldPrice}}
|
¥{{item.oldPrice}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'详情':'预约'}}</view>
|
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'订单':'预约'}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
||||||
<view class="tese">
|
<view class="tese">
|
||||||
|
@ -182,9 +182,8 @@
|
||||||
},
|
},
|
||||||
xiangqing(item){
|
xiangqing(item){
|
||||||
if(item.status=='1'){
|
if(item.status=='1'){
|
||||||
item.id=this.mainData.id
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'秒杀'
|
url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&name='+'秒杀'
|
||||||
})
|
})
|
||||||
}else{
|
}else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
@ -196,18 +195,17 @@
|
||||||
|
|
||||||
},
|
},
|
||||||
detail(item){
|
detail(item){
|
||||||
if(item.status=='1'){
|
// if(item.status=='1'){
|
||||||
uni.showToast({
|
// uni.showToast({
|
||||||
title:'该项目已使用!'
|
// title:'该项目已使用!'
|
||||||
})
|
// })
|
||||||
}else{
|
// }else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
||||||
'&massageTypeId='+item.massageTypeId+
|
'&massageTypeId='+item.massageTypeId+
|
||||||
'&page='+1+
|
'&status='+item.status
|
||||||
'&limit='+10
|
|
||||||
})
|
})
|
||||||
}
|
// }
|
||||||
|
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="group-buy-right">
|
<view class="group-buy-right">
|
||||||
<view class="group-text">距结束仅剩</view>
|
<view class="group-text">距结束仅剩</view>
|
||||||
<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down>
|
<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down>
|
||||||
<!-- <uni-countdown :show-day="false" :font-size="13" :day="day" :hour="hours" :minute="minutes" :second="seconds" /> -->
|
<!-- <uni-countdown :show-day="false" :font-size="13" :day="day" :hour="hours" :minute="minutes" :second="seconds" /> -->
|
||||||
<!-- <view><span>08</span>:<span>08</span>:<span>08</span></view> -->
|
<!-- <view><span>08</span>:<span>08</span>:<span>08</span></view> -->
|
||||||
</view>
|
</view>
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-title-num">
|
<view class="header-bottom-title-num">
|
||||||
<span> 已拼</span>
|
<span> 已拼</span>
|
||||||
<span>16</span>
|
<span>{{mainData.sales}}</span>
|
||||||
<span> 次</span>
|
<span> 次</span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -60,7 +60,9 @@
|
||||||
<view class="flex" style="align-items: center;">
|
<view class="flex" style="align-items: center;">
|
||||||
<view class="teamwork-se">
|
<view class="teamwork-se">
|
||||||
<view>还差<span class="team-text">{{itema.lessNum}}人</span>拼成</view>
|
<view>还差<span class="team-text">{{itema.lessNum}}人</span>拼成</view>
|
||||||
<view>剩余<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down></view>
|
<!-- <view>剩余</text>
|
||||||
|
<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down>
|
||||||
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
<view class="teamwork-button" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,itema.groupNo)" v-if="mainData.isNewer!='1'&&newTime>0">去拼团</view>
|
<view class="teamwork-button" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,itema.groupNo)" v-if="mainData.isNewer!='1'&&newTime>0">去拼团</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -92,7 +94,7 @@
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="detail-btn" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,'null',detailData)" v-if="mainData.isNewer!='1'&&newTime>0">
|
<view class="detail-btn" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,'',detailData)" v-if="mainData.isNewer!='1'&&newTime>0">
|
||||||
<span>¥{{mainData.price}}</span>
|
<span>¥{{mainData.price}}</span>
|
||||||
<span> 一键开团</span>
|
<span> 一键开团</span>
|
||||||
</view>
|
</view>
|
||||||
|
@ -205,7 +207,6 @@
|
||||||
this.hours=hours;
|
this.hours=hours;
|
||||||
this.minutes=minutes;
|
this.minutes=minutes;
|
||||||
this.seconds=seconds;
|
this.seconds=seconds;
|
||||||
console.log("asdsadasdasdasd",this.day,this.hours,this.minutes,this.seconds)
|
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
var that=this;
|
var that=this;
|
||||||
|
|
|
@ -28,10 +28,11 @@
|
||||||
<view class="header-bottom-title-text">
|
<view class="header-bottom-title-text">
|
||||||
<span>{{mainData.title}}</span>
|
<span>{{mainData.title}}</span>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="header-bottom-title-num">
|
<view class="header-bottom-title-num">
|
||||||
<span> 已售</span>
|
<span> 已秒</span>
|
||||||
<span>{{mainData.sales}}</span>
|
<span>{{mainData.sales}}</span>
|
||||||
</view> -->
|
<span> 次</span>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="tewmork-key">
|
<view class="tewmork-key">
|
||||||
<span v-for="(item,index) in labels" :key="index">{{item}}</span>
|
<span v-for="(item,index) in labels" :key="index">{{item}}</span>
|
||||||
|
@ -1242,7 +1243,7 @@
|
||||||
}
|
}
|
||||||
.header-bottom-title-num span:nth-child(2){
|
.header-bottom-title-num span:nth-child(2){
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #08A28A;
|
color: #f52b1b;
|
||||||
}
|
}
|
||||||
.header-bottom-title-num span:nth-child(3){
|
.header-bottom-title-num span:nth-child(3){
|
||||||
color: #848485;
|
color: #848485;
|
||||||
|
|
|
@ -162,6 +162,7 @@
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
var that=this;
|
var that=this;
|
||||||
|
console.log(that.dataList);
|
||||||
let data = {
|
let data = {
|
||||||
id: that.dataList.id,
|
id: that.dataList.id,
|
||||||
page: that.page,
|
page: that.page,
|
||||||
|
@ -169,6 +170,7 @@
|
||||||
}
|
}
|
||||||
that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
|
that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
|
console.log(res.data);
|
||||||
that.getList=res.data;
|
that.getList=res.data;
|
||||||
that.backgroundImageUrl=that.getList.massageImg
|
that.backgroundImageUrl=that.getList.massageImg
|
||||||
// that.labels=res.data.labels.split(',');
|
// that.labels=res.data.labels.split(',');
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
¥{{item.oldPrice}}
|
¥{{item.oldPrice}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'详情':'预约'}}</view>
|
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'订单':'预约'}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
||||||
<view class="tese">
|
<view class="tese">
|
||||||
|
@ -182,9 +182,8 @@
|
||||||
},
|
},
|
||||||
xiangqing(item){
|
xiangqing(item){
|
||||||
if(item.status=='1'){
|
if(item.status=='1'){
|
||||||
item.id=this.mainData.id
|
|
||||||
uni.navigateTo({
|
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{
|
}else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
@ -196,18 +195,17 @@
|
||||||
|
|
||||||
},
|
},
|
||||||
detail(item){
|
detail(item){
|
||||||
if(item.status=='1'){
|
// if(item.status=='1'){
|
||||||
uni.showToast({
|
// uni.showToast({
|
||||||
title:'该项目已使用!'
|
// title:'该项目已使用!'
|
||||||
})
|
// })
|
||||||
}else{
|
// }else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
||||||
'&massageTypeId='+item.massageTypeId+
|
'&massageTypeId='+item.massageTypeId+
|
||||||
'&page='+1+
|
'&status='+item.status
|
||||||
'&limit='+10
|
|
||||||
})
|
})
|
||||||
}
|
// }
|
||||||
|
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
|
|
|
@ -97,7 +97,7 @@
|
||||||
¥{{item.oldPrice}}
|
¥{{item.oldPrice}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'详情':'预约'}}</view>
|
<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'订单':'预约'}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
|
||||||
<view class="tese">
|
<view class="tese">
|
||||||
|
@ -634,29 +634,32 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
xiangqing(item){
|
xiangqing(item){
|
||||||
uni.navigateTo({
|
if(item.status=='1'){
|
||||||
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
uni.navigateTo({
|
||||||
'&massageTypeId='+item.massageTypeId+
|
url:'/pages/my/orderDetailsList?id='+this.mainData.id+'&mainId='+this.mainId+'&name='+'套餐'
|
||||||
'&status='+item.status+
|
|
||||||
'&name='+this.nameText
|
|
||||||
})
|
|
||||||
},
|
|
||||||
detail(item){
|
|
||||||
if(item.status=='1'&&this.serviData.name!='index'){
|
|
||||||
uni.showToast({
|
|
||||||
title:'该项目已使用!'
|
|
||||||
})
|
})
|
||||||
}else{
|
}else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
|
||||||
'&massageTypeId='+item.massageTypeId+
|
'&massageTypeId='+item.massageTypeId+
|
||||||
'&page='+1+
|
'&status='+item.status+
|
||||||
'&limit='+10+
|
|
||||||
'&name='+this.nameText
|
'&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(){
|
getData(){
|
||||||
var that=this;
|
var that=this;
|
||||||
|
|
|
@ -139,7 +139,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
console.log("asdsad",this.serviceTrue)
|
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
// #ifndef VUE3
|
// #ifndef VUE3
|
||||||
|
|
Loading…
Reference in New Issue