Merge branch 'master' of git.zdool.com:xs/yyx/h5

This commit is contained in:
闫世杰 2023-08-03 17:31:23 +08:00
commit 42ecbb5beb
1 changed files with 12 additions and 16 deletions

View File

@ -63,29 +63,26 @@
</view> </view>
</view> </view>
<view class="forms" v-if="tabC == '2'"> <view class="forms" v-if="tabC == '2'">
<view class="addIcon" @click="toAddOrder"> <view class="addIcon" @click="toAddOrder" v-if="isadmin">
<image src="../../static/orderHall/addOrder.png"></image> <image src="../../static/orderHall/addOrder.png"></image>
</view> </view>
<view class="main" v-if="mainList.length > 0"> <view class="main" v-if="mainList.length > 0">
<view class="mainList" v-for="(item, i) in mainList" :key="i" @click="toDetail(item.id)"> <view class="mainList" v-for="(item, i) in mainList" :key="i" @click="toDetail(item.id)">
<!-- <view class="mainListImg" @click="toDetail(item.id)">
<img class='img' :src="item.enclosure" alt="">
</view> -->
<view class="text"> <view class="text">
<view class="text1">{{ item.title }}</view> <view class="text1">{{ item.title ? item.title : '暂无' }}</view>
<view class="text3"> <view class="text3">
<view class="time">节目{{ item.teamName }}</view> <view class="time">节目{{ item.teamName ? item.teamName : '暂无' }}</view>
</view> </view>
<view class="text3"> <view class="text3">
<view class="time">团队{{ item.showName }}</view> <view class="time">团队{{ item.showName ? item.showName : '暂无' }}</view>
</view> </view>
<view class="text3"> <view class="text3">
<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt=""> <img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
<view class="time">开始时间{{ item.startTime }}</view> <view class="time">开始时间{{ item.startTime ? item.startTime : '暂无' }}</view>
</view> </view>
<view class="text3"> <view class="text3">
<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt=""> <img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
<view class="time">截止时间{{ item.endTime }}</view> <view class="time">截止时间{{ item.endTime ? item.endTime : '暂无' }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -108,12 +105,10 @@ export default {
villageId: '', villageId: '',
team: [], team: [],
program: [], program: [],
loadings: true loadings: true,
isadmin: false
}; };
}, },
onShow () {
// this.getData();
},
methods: { methods: {
toTab (val) { toTab (val) {
this.tabC = val; this.tabC = val;
@ -172,6 +167,7 @@ export default {
} }
}, },
async onShow () { async onShow () {
this.isadmin = uni.getStorageSync('isAdmin');
await this.teamandprogram() await this.teamandprogram()
await this.RuralDevelopmentPlanlist() await this.RuralDevelopmentPlanlist()
}, },
@ -230,7 +226,7 @@ export default {
// overflow-y: auto; // overflow-y: auto;
.teamBox { .teamBox {
height: 140rpx; height: 180rpx;
padding: 18rpx 10rpx; padding: 18rpx 10rpx;
background-color: #fff; background-color: #fff;
// background-color: rgb(241, 243, 244); // background-color: rgb(241, 243, 244);
@ -243,7 +239,7 @@ export default {
image { image {
width: 180rpx; width: 180rpx;
height: 130rpx; height: 180rpx;
background-size: contain; background-size: contain;
} }
} }
@ -287,7 +283,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
} }