BUG 25119

This commit is contained in:
aixianling
2021-12-03 15:18:13 +08:00
parent 4761ff7e82
commit 1d40462fd9
2 changed files with 207 additions and 194 deletions

View File

@@ -6,7 +6,7 @@
<u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}" <u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
@click="handleClick(index)"> @click="handleClick(index)">
<u-icon :name="item.icon" :size="64"></u-icon> <u-icon :name="item.icon" :size="64"></u-icon>
<view class="label">{{item.label}}</view> <view class="label">{{ item.label }}</view>
</u-grid-item> </u-grid-item>
</u-grid> </u-grid>
</ai-top-fixed> </ai-top-fixed>
@@ -14,26 +14,30 @@
<header>待参加的会议</header> <header>待参加的会议</header>
<template v-if="meetingList.length"> <template v-if="meetingList.length">
<div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)"> <div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)">
<header>{{item.title}}</header> <header>{{ item.title }}</header>
<u-row justify="between"> <u-row justify="between">
<div class="time"> <div class="time">
<span>{{item.startTime|format}}</span> <span>{{ item.startTime|format }}</span>
<span>{{item.startTime|formatDate(0)}}{{item.startTime|formatDate(1)}}{{item.startTime|formatDate(2)}} {{item.startTime|formatWeek}}</span> <span>{{ item.startTime|formatDate(0) }}{{
item.startTime|formatDate(1)
}}{{ item.startTime|formatDate(2) }} {{ item.startTime|formatWeek }}</span>
</div> </div>
<div class="arrow"></div> <div class="arrow"></div>
<div class="time"> <div class="time">
<span>{{item.endTime|format}}</span> <span>{{ item.endTime|format }}</span>
<span>{{item.endTime|formatDate(0)}}{{item.endTime|formatDate(1)}}{{item.endTime|formatDate(2)}} {{item.endTime|formatWeek}}</span> <span>{{ item.endTime|formatDate(0) }}{{ item.endTime|formatDate(1) }}{{
item.endTime|formatDate(2)
}} {{ item.endTime|formatWeek }}</span>
</div> </div>
</u-row> </u-row>
<u-row class="info"> <u-row class="info">
<span>发起人员</span> <span>发起人员</span>
<span>{{item.userName}}</span> <ai-open-data type="userName" :openid="item.createUserId"/>
</u-row> </u-row>
<u-gap height="20"></u-gap> <u-gap height="20"></u-gap>
<u-row class="info"> <u-row class="info">
<span>会议地点</span> <span>会议地点</span>
<span>{{item.address}}</span> <span>{{ item.address }}</span>
</u-row> </u-row>
<div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div> <div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>
</div> </div>
@@ -50,15 +54,16 @@
</template> </template>
<script> <script>
import AiEmpty from "../../components/AiEmpty"; import AiEmpty from "../../components/AiEmpty";
import AiTopFixed from "../../components/AiTopFixed"; import AiTopFixed from "../../components/AiTopFixed";
import AiAdd from "../../components/AiAdd"; import AiAdd from "../../components/AiAdd";
import {addMeeting, belongToMe, detail, meetingList} from './components' import {addMeeting, belongToMe, detail, meetingList} from './components'
import AiOpenData from "../../components/AiOpenData";
export default { export default {
name: "AppMeetingNotice", name: "AppMeetingNotice",
appName: "会议通知", appName: "会议通知",
components: {AiEmpty, AiTopFixed, AiAdd, addMeeting, belongToMe, detail, meetingList}, components: {AiOpenData, AiEmpty, AiTopFixed, AiAdd, addMeeting, belongToMe, detail, meetingList},
data() { data() {
return { return {
meetingList: [], meetingList: [],
@@ -89,9 +94,9 @@
} }
}, },
methods: { methods: {
emitShow(){ emitShow() {
const {id} = this.$route.query const {id} = this.$route.query
if(id){ if (id) {
this.comp = "detail"; this.comp = "detail";
this.params = id; this.params = id;
this.isList = false; this.isList = false;
@@ -151,11 +156,11 @@
} }
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.meeting { .meeting {
min-height: 100%; min-height: 100%;
background: #F5F5F5; background: #F5F5F5;
padding-bottom: 48px; padding-bottom: 48px;
@@ -269,5 +274,5 @@
::v-deep .content { ::v-deep .content {
padding: 0 !important; padding: 0 !important;
} }
} }
</style> </style>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div :type="type" :openid="openid" v-text="openid"/> <div :type="type" :openid="oid" v-text="oid"/>
</template> </template>
<script> <script>
@@ -8,6 +8,14 @@ import {mapActions} from "vuex";
export default { export default {
name: "AiOpenData", name: "AiOpenData",
props: ['type', 'openid'], props: ['type', 'openid'],
computed: {
oid() {
/**
* 后端返回格式(cropId|userId)
*/
return this.openid?.split("|")?.[1] || this.openid || ""
}
},
methods: { methods: {
...mapActions(['injectJWeixin']) ...mapActions(['injectJWeixin'])
}, },