Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -1,55 +1,52 @@
|
||||
<template>
|
||||
<div class="meeting">
|
||||
<template v-if="isList">
|
||||
<ai-top-fixed>
|
||||
<u-grid :col="3" :border="false">
|
||||
<u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
|
||||
@click="handleClick(index)">
|
||||
<u-icon :name="item.icon" :size="64"></u-icon>
|
||||
<view class="label">{{ item.label }}</view>
|
||||
</u-grid-item>
|
||||
</u-grid>
|
||||
</ai-top-fixed>
|
||||
<div class="body">
|
||||
<header>待参加的会议</header>
|
||||
<template v-if="meetingList.length">
|
||||
<div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)">
|
||||
<header>{{ item.title }}</header>
|
||||
<u-row justify="between">
|
||||
<div class="time">
|
||||
<span>{{ item.startTime|format }}</span>
|
||||
<span>{{ item.startTime|formatDate(0) }}年{{
|
||||
<ai-top-fixed>
|
||||
<u-grid :col="3" :border="false">
|
||||
<u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
|
||||
@click="handleClick(index)">
|
||||
<u-icon :name="item.icon" :size="64"></u-icon>
|
||||
<view class="label">{{ item.label }}</view>
|
||||
</u-grid-item>
|
||||
</u-grid>
|
||||
</ai-top-fixed>
|
||||
<div class="body">
|
||||
<header>待参加的会议</header>
|
||||
<template v-if="meetingList.length">
|
||||
<div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)">
|
||||
<header>{{ item.title }}</header>
|
||||
<u-row justify="between">
|
||||
<div class="time">
|
||||
<span>{{ item.startTime|format }}</span>
|
||||
<span>{{ item.startTime|formatDate(0) }}年{{
|
||||
item.startTime|formatDate(1)
|
||||
}}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
|
||||
</div>
|
||||
<div class="arrow"></div>
|
||||
<div class="time">
|
||||
<span>{{ item.endTime|format }}</span>
|
||||
<span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{
|
||||
</div>
|
||||
<div class="arrow"></div>
|
||||
<div class="time">
|
||||
<span>{{ item.endTime|format }}</span>
|
||||
<span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{
|
||||
item.endTime|formatDate(2)
|
||||
}}日 周{{ item.endTime|formatWeek }}</span>
|
||||
</div>
|
||||
</u-row>
|
||||
<u-row class="info">
|
||||
<span>发起人员:</span>
|
||||
<AiOpenData type="userName" :openid="item.createUserId"/>
|
||||
</u-row>
|
||||
<u-gap height="20"></u-gap>
|
||||
<u-row class="info" style="align-items: start;flex-wrap: nowrap;">
|
||||
<span style="flex-shrink: 0">会议地点:</span>
|
||||
<span>{{ item.address }}</span>
|
||||
</u-row>
|
||||
<div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<ai-empty/>
|
||||
</template>
|
||||
</div>
|
||||
<u-divider bg-color="#F5F5F5" v-if="meetingList.length">已经到底啦</u-divider>
|
||||
<ai-add @add="add"/>
|
||||
</template>
|
||||
<component v-else :is="comp" :params="params"></component>
|
||||
</div>
|
||||
</u-row>
|
||||
<u-row class="info">
|
||||
<span>发起人员:</span>
|
||||
<AiOpenData type="userName" :openid="item.createUserId"/>
|
||||
</u-row>
|
||||
<u-gap height="20"></u-gap>
|
||||
<u-row class="info" style="align-items: start;flex-wrap: nowrap;">
|
||||
<span style="flex-shrink: 0">会议地点:</span>
|
||||
<span>{{ item.address }}</span>
|
||||
</u-row>
|
||||
<div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<ai-empty/>
|
||||
</template>
|
||||
</div>
|
||||
<u-divider bg-color="#F5F5F5" v-if="meetingList.length">已经到底啦</u-divider>
|
||||
<ai-add @add="add"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -130,18 +127,19 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
handleClick(index) {
|
||||
this.params = index;
|
||||
this.isList = false;
|
||||
if (index == 0 || index == 2) {
|
||||
this.comp = "meetingList";
|
||||
} else if (index == 1) {
|
||||
this.comp = "belongToMe";
|
||||
handleClick(index){
|
||||
let url
|
||||
if(index==0 || index==2){
|
||||
url="/pages/meetingNotice/components/meetingList?index=" + index
|
||||
}else if(index==1){
|
||||
url="/pages/meetingNotice/components/belongToMe"
|
||||
}
|
||||
uni.navigateTo({url})
|
||||
},
|
||||
add() {
|
||||
this.isList = false;
|
||||
this.comp = "addMeeting";
|
||||
uni.navigateTo({
|
||||
url: "/pages/meetingNotice/components/addMeeting"
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
@@ -198,6 +196,7 @@ export default {
|
||||
}
|
||||
|
||||
& > header {
|
||||
width: 95%;
|
||||
font-size: 32px;
|
||||
font-weight: 600;
|
||||
color: #333333;
|
||||
|
||||
Reference in New Issue
Block a user