Merge branch 'master' of https://e.coding.net/boss-01/yxx/app
This commit is contained in:
commit
e825f9e895
|
@ -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"'>
|
||||
|
@ -405,9 +412,11 @@
|
|||
margin: 0rpx 32rpx; */
|
||||
background-color: #F5F5F5 !important;
|
||||
}
|
||||
|
||||
.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;
|
||||
|
|
Loading…
Reference in New Issue