This commit is contained in:
Mr.jiang 2024-07-13 13:49:16 +08:00
parent b412c01724
commit 99752b5910
6 changed files with 22 additions and 28 deletions

View File

@ -190,6 +190,7 @@
display: flex;
flex-direction: column;
align-items: center;
z-index: 666;
}
.time-money{
width: 100%;

View File

@ -1626,6 +1626,7 @@
accomplishLatitude:latitude,
earlyFinishReason: that.earlyFinishReason,
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
if (res.code == 0||res.code == 200) {
uni.showToast({
@ -1636,7 +1637,9 @@
uni.switchTab({
url:'/pages/order/index'
})
uni.hideLoading();
}else{
uni.hideLoading();
that.getOrder()
uni.showToast({
icon:'error',
@ -1664,6 +1667,7 @@
});
}else{
uni.hideLoading();
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'

View File

@ -497,7 +497,7 @@
</u-button>
<u-button
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId)"
class="btns">
充值
</u-button>
@ -624,7 +624,7 @@
</view>
<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
<label class="tui-radio">
<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
<radio color="#019c88" :checked="openWay === item.id ? true : false" />
</label>
</radio-group>
</view>
@ -1197,6 +1197,7 @@
accomplishLatitude:latitude,
earlyFinishReason: that.earlyFinishReason,
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
@ -1207,12 +1208,14 @@
uni.switchTab({
url:'/pages/order/index'
})
uni.hideLoading();
}else{
that.getOrder()
uni.showToast({
icon:'error',
title:'操作失败!'
})
uni.hideLoading();
}
}).catch(() => {
@ -1234,6 +1237,7 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'

View File

@ -722,7 +722,7 @@
</view>
<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
<label class="tui-radio">
<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
<radio color="#019c88" :checked="openWay === item.id ? true : false" />
</label>
</radio-group>
</view>
@ -1485,6 +1485,7 @@
accomplishLatitude:latitude,
earlyFinishReason: that.earlyFinishReason,
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
@ -1495,12 +1496,14 @@
uni.switchTab({
url:'/pages/order/index'
})
uni.hideLoading();
}else{
that.getOrder()
uni.showToast({
icon:'error',
title:'操作失败!'
})
uni.hideLoading();
}
}).catch(() => {

View File

@ -9,7 +9,7 @@
<view class="my-head-top-view" v-if="!isLogin">
<view class="my-head-top-text">
<span>{{userName}}</span>
<view class="my-head-top-id" v-if="vipNameType">
<view class="my-head-top-id" v-if="vipNameType!=null">
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership5.png"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership6.png"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership4.png"></image>

View File

@ -31,38 +31,16 @@
<span>{{item.price}}</span>
<span style="color: #999;text-decoration: line-through;margin-left: 5px;">{{item.oldPrice}}</span>
</view>
<view class="item-view-jianjie">
{{item.content}}
<view class="shop_label" v-if="tagsData">
<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
</view>
<view class="item-view-bottom">
<view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}}</span>
</view>
<!--<view class="item-view-bottom-btn">
预约
</view>-->
</view>
<!-- <view class="flex shop_category">
<view class="shop_category_a">中医理疗</view>
<view>6.7km</view>
</view>
<view class="shop_label">
<span>有包厢</span>
<span>有吸烟区</span>
<span>有淋浴房</span>
<span>有免费wifi</span>
</view> -->
</view>
</view>
<!-- <view class="shop_item">
<view>
<span></span>
<span class="shop_color">980</span>
<span></span>
</view>
<view>冬病夏治无烟明火艾灸疗</view>
<view class="shop-arrow"></view>
</view> -->
</view>
<view v-if="getText=='商家'">
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
@ -171,6 +149,10 @@
if (res.data) {
if (this.page == 1) this.dataList = []; //
this.dataList = [...this.dataList, ...res.data.list]; //
for(var i=0;i<this.dataList.length;i++){
this.tagsData=this.dataList[i].labels.split(',');
}
console.log("tagsData",this.tagsData)
uni.stopPullDownRefresh()
}
}