diff --git a/src/pages/my/OrderActControl.vue b/src/pages/my/OrderActControl.vue index 7af4fb5..1f1ebce 100644 --- a/src/pages/my/OrderActControl.vue +++ b/src/pages/my/OrderActControl.vue @@ -15,8 +15,8 @@ - - + + @@ -24,10 +24,16 @@ {{item.title}} - + 已完成 + + 未接单 + + 进行中 @@ -37,13 +43,13 @@ - + 活动时间: {{item.createdAt}} - - - - + + + + @@ -51,26 +57,27 @@ - + - + - + + - + - + - - + + @@ -80,36 +87,36 @@ 已报名 - + 已完成 - + 进行中 - + 活动时间: {{item.createdAt}} - - + + - + - + - + - - + + @@ -156,8 +163,8 @@ - - + + @@ -192,11 +199,11 @@ }, methods: { receiveevlaue(id) { - + this.showShoudao = true this.http.request('/hallUser/sdpj?id=' + id, {}, "POST").then(res => { if (res.code == 200) { - + this.starsvalue = res.data.evaluate this.showShoudao = true @@ -316,40 +323,40 @@ }) } }, - 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}` }) } - + }, toUpimgPage(id) { this.http.request('/hallUser/pjList?hallId=' + id, {}, "GET").then(res => { - if (res.code == 200) { - console.log("reg", res.data) - if(res.data.length>0){ - uni.navigateTo({ - url: `/pages/my/imgUpload?id=` + id - }) - }else{ - uni.showToast({ - title: "无人接单", - icon: "none", - }); - } - } - }).catch(e => { - uni.showToast({ - title: e.data.message, - icon: "none", - }); - }) - + if (res.code == 200) { + console.log("reg", res.data) + if (res.data.length > 0) { + uni.navigateTo({ + url: `/pages/my/imgUpload?id=` + id + }) + } else { + uni.showToast({ + title: "无人接单", + icon: "none", + }); + } + } + }).catch(e => { + uni.showToast({ + title: e.data.message, + icon: "none", + }); + }) + }, touploadedimg(imgstr) { uni.navigateTo({ @@ -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;