xiongzhu 4 years ago
parent
commit
aafac52df0

+ 10 - 3
src/views/conversations.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <nav-bar @click-left="$router.go(-1)" title="消息中心">
-            <div slot="right">全部已读</div>
+            <div slot="right" @click="readAll">全部已读</div>
         </nav-bar>
         <div class="list">
             <div class="conversation-item" v-for="item in conversations" :key="item.sessionId" @click="detail(item)">
@@ -9,7 +9,9 @@
                 <div class="info">
                     <div class="title">
                         <div class="text">{{ item.title }}</div>
-                        <div class="time" v-if="item.relativeTime">{{ item.relativeTime }}</div>
+                        <div class="time" v-if="item.relativeTime && item.type !== 'LIKE' && item.type !== 'COMMENT'">
+                            {{ item.relativeTime }}
+                        </div>
                     </div>
                     <div class="msg" v-if="item.type === 'PUBLISH' || item.type === 'DOCKING' || item.type === 'SYS'">
                         {{ item.lastMessage }}
@@ -44,12 +46,17 @@ export default {
                 this.conversations = res;
             });
         },
+        readAll() {
+            this.$http.get('/message/readAll').then(() => {
+                this.getData();
+            });
+        },
         detail(item) {
             this.$http.get('/message/readAll', {
                 sessionId: item.sessionId
             });
             this.$set(item, 'unread', 0);
-            if (item.type === 'TEXT') {
+            if (item.type === 'PUBLISH' || item.type === 'DOCKING') {
                 this.$router.push({
                     name: 'message',
                     query: {

+ 7 - 1
src/views/index/interact.vue

@@ -1,6 +1,12 @@
 <template>
     <div class="interact-root">
-        <nav-bar :theme="navTheme" :placeholder="false" :transparent="navTransparent" rightIcon="search">
+        <nav-bar
+            :theme="navTheme"
+            :placeholder="false"
+            :transparent="navTransparent"
+            rightIcon="search"
+            @click-right="$router.push({ name: 'search' })"
+        >
             <div slot="left"></div>
             <div class="tabs" :class="navTheme" slot="title">
                 <div class="tab-item" :class="{ active: tab === 0 }" @click="changeTab(0)">官答</div>

+ 1 - 0
src/views/interact/forumDetail.vue

@@ -176,6 +176,7 @@ export default {
                 )
                 .then(res => {
                     this.$toast.success('提交成功');
+                    this.content = '';
                     this.showCommentDialog = false;
                     this.getData();
                 })

+ 1 - 8
src/views/interact/official.vue

@@ -7,14 +7,7 @@
             @click="$router.push({ name: 'officialDetail', query: { id: item.id } })"
         >
             <div class="title">
-                <van-image
-                    class="avatar"
-                    src="https://img01.yzcdn.cn/vant/cat.jpeg"
-                    width="24"
-                    height="24"
-                    fit="cover"
-                    round
-                />
+                <van-image class="avatar" :src="item.avatar" width="24" height="24" fit="cover" round />
                 <div class="txt">{{ item.title }}</div>
             </div>
             <div class="answer">

+ 2 - 1
src/views/sysMessage.vue

@@ -54,7 +54,7 @@ export default {
         title() {
             switch (this.type) {
                 case 'COMMENT':
-                    return '评论';
+                    return '回复';
                 case 'LIKE':
                     return '点赞';
                 default:
@@ -195,6 +195,7 @@ export default {
         border-radius: 0px 16px 16px 16px;
         .col {
             .flex-col();
+            flex-grow: 1;
             .title {
                 font-size: 14px;
                 color: @text2;