xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/boss-01/yxx/app

This commit is contained in:
lnn19986213 2022-07-19 14:29:58 +08:00
parent 8829b440f7 5b4d3d5a10
commit e825f9e895
1 changed files with 77 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/pages/my/OrderActControl.vue
View File

@ -15,7 +15,7 @@
</view>
<view class="main" >
<view class="main">
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" v-if="tabNum==1">
<!-- <image src="../../static/icon12.jpg" mode=""></image> -->
<image :src="item.enclosure" mode="" @click="goActDeat(item.id,1)"></image>
@ -28,6 +28,12 @@
<view class="tag_sta_end" v-if='item.state=="3"'>
已完成
</view>
<view class="tag_sta_fail" v-if='item.state=="4"'>
未接单
</view>
<!-- <view class="tag_sta_fail" v-if='item.state=="3"'>
已结束
</view> -->
<view class="tag_sta_going" v-if='item.state=="1"||item.state=="0"'>
进行中
@ -40,7 +46,7 @@
活动时间： {{item.createdAt}}
</view>
<view class="but_box" style="margin-top: 20rpx;">
<view class="but_box" style="margin-top: 20rpx;" v-if="!(item.state=='4')">
@ -58,7 +64,8 @@
</view>
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "2" '>
<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i,item.id)"></u-button>
<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i,item.id)">
</u-button>
</view>
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
@ -156,8 +163,8 @@
</u-modal>
<view v-if="!(orderList.length>0)" >
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" >
<view v-if="!(orderList.length>0)">
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
</view>
</view>
@ -316,14 +323,14 @@
})
}
},
goActDeat(id,typEnum) {
if(typEnum){
goActDeat(id, typEnum) {
if (typEnum) {
uni.navigateTo({
url:`/pages/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`
url: `/pages/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`
})
}else{
} else {
uni.navigateTo({
url:`/pages/orderHall/orderHallDetails?id=${id}`
url: `/pages/orderHall/orderHallDetails?id=${id}`
})
}
@ -332,11 +339,11 @@
this.http.request('/hallUser/pjList?hallId=' + id, {}, "GET").then(res => {
if (res.code == 200) {
console.log("reg", res.data)
if(res.data.length>0){
if (res.data.length > 0) {
uni.navigateTo({
url: `/pages/my/imgUpload?id=` + id
})
}else{
} else {
uni.showToast({
title: "无人接单",
icon: "none",
@ -405,9 +412,11 @@
margin: 0rpx 32rpx; */
background-color: #F5F5F5 !important;
}
.main{
.main {
padding: 0rpx 32rpx;
}
image {
width: 100%;
height: 60%;
@ -458,6 +467,18 @@
font-size: 24rpx;
}
.tag_sta_fail {
width: 100rpx;
height: 48rpx;
background: #F5F5F5;
;
border-radius: 8rpx;
line-height: 48rpx;
color: #7A7A7A;
text-align: center;
font-size: 24rpx;
}
.act_time {
height: 34rpx;
font-size: 24rpx;