Commit 5b2f80d9 authored by 刘鑫鹏's avatar 刘鑫鹏

修改了BUG

parent df52d3dd
......@@ -358,11 +358,6 @@
this.flag = false
this.list(this.type, this.queryParams.pageNum)
},
...mapMutations('m_user', ['updateToken']),
...mapMutations('m_user', ['updateUserInfo']),
//登录判断
......
......@@ -216,6 +216,14 @@
position: relative;
overflow-x: hidden;
overflow-y: hidden;
// top: 88rpx;
/* #ifdef APP-PLUS */
top: calc(var(--top-window-height) + 0px);
/* #endif */
-webkit-overflow-scroll:touch;
left: 0;
.home{
......
......@@ -25,7 +25,7 @@
<view class="info">
<view class="question" style="display: flex;width: 100%; justify-content: space-between;">
<view style="width: 80%;height: 100%;">
<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName}}</view>
<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName|ellipsis}}</view>
</view>
<view style="width: 20%;height: 100%;">
<!-- <view class="item1"> -->
......@@ -44,26 +44,25 @@
</view>
<dividerface></dividerface>
<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view>
<view class="item" style="display: flex">比赛时间<view class="time">{{item.activityTime}}</view>
</view>
<view class="item" style="display: flex">报名时间:<view class="time">
<view class="item" style="display: flex">报名时间<view class="time">
{{item.taseCreateTime||item.tasCreateTime}}
</view>
</view>
<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">
<view class="item" style="display: flex;margin-left: 34rpx;">参赛人<view class="time">
{{item.tasName||item.taseName}}
</view>
</view>
<view style="display: flex;">
<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;color: aliceblue">报名详情</button>
<button @click="goDetail(item.type,wechatId,item.activityId)"
style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;color: aliceblue">活动详情</button>
</view>
</view>
</view>
<view class="popup" v-show="showexam" >
<view class="popup-info">
<view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:{{signupexamlist.school}}</view>
......@@ -77,7 +76,6 @@
</view>
</view>
</view>
<view class="popup" v-show="show">else
<view class="popup-info">
......@@ -116,6 +114,7 @@
userInfo
} from 'os';
export default {
data() {
return {
showtime:false,
......@@ -130,6 +129,17 @@
signuplist:{}
}
},
filters: {
ellipsis(value){
if (!value) return '';
if (value.length > 31) {
return value.slice(0,31) + '...'
}
return value
}
},
computed: {
...mapState('m_user', ['userInfo']),
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment