From 7d10d58886a050e2b85edc09cf0c5f48d04a1258 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期日, 23 四月 2023 14:07:17 +0800
Subject: [PATCH] 聊天休息颜色修改

---
 src/views/cause/Group.vue  |   32 ++++++++++++++++++++++++++------
 src/views/manager/User.vue |    8 ++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/cause/Group.vue b/src/views/cause/Group.vue
index 8251778..5e1a241 100644
--- a/src/views/cause/Group.vue
+++ b/src/views/cause/Group.vue
@@ -29,9 +29,9 @@
                         >
                    <img class="group-img" v-if="messageOne.pic == null || messageOne.pic == ''"
                         src="../../icons/7bedbaa41b1744fbfe0c55b507fd9e28.png">
-                   <div style="margin-left: 10px">{{ messageOne.userName }} {{ messageOne.ctime }}</div>
+                   <div style="margin-left: 10px" >{{ messageOne.userName }} {{ messageOne.ctime }}</div>
                  </div>
-                  <div class="group-right-left-seach-body-box-text">{{ messageOne.text }}</div>
+                  <div :class="messageOne.remark!==null?'activemess':'group-right-left-seach-body-box-text' " >{{ messageOne.text }}</div>
               </li>
             </ul>
           </div>
@@ -167,11 +167,11 @@
         //     pick(){
         // this.filterNode(this.filterVal,this.data);
         //     },
-        handleNodeClick(data) {
+       async handleNodeClick(data) {
           if (data.id != null) {
             this.groupName = data.groupName;
             var _this = this;
-            getAllMessage(data.id).then((res) => {
+           await getAllMessage(data.id).then((res) => {
 
               for (let item of res) {
                 if (item.pic === '' || item.pic === null) {
@@ -181,12 +181,28 @@
                   })
                 }
               }
+              res.map(item=>{
+                item.remark=null
+              })
               this.messageList = res
 
               this.sendBtn=false
             })
-            getAllNotice(data.id).then(res => this.groupAnList = res)
-            getAllUser(data.id).then(res => this.tableData = res)
+            await getAllNotice(data.id).then(res => this.groupAnList = res)
+            await getAllUser(data.id).then(res => {
+              console.log(this.messageList)
+              console.log(res)
+              for (let i=0; i<this.messageList.length;i++){
+                for (let j = 0; j < res.length; j++) {
+                  if (this.messageList[i].userName == res[j].userName){
+                    this.messageList[i].remark = res[j].remark
+                  }
+                }
+              }
+              this.tableData = res
+
+            })
+            console.log(this.messageList)
             this.groupId = data.id;
           }
         },
@@ -454,4 +470,8 @@
 ::v-deep(.el-table thead) {
   color: #000000;
 }
+.activemess{
+  margin-left: 35px;
+  color: red;
+}
 </style>
diff --git a/src/views/manager/User.vue b/src/views/manager/User.vue
index 11e359f..a7c4d50 100644
--- a/src/views/manager/User.vue
+++ b/src/views/manager/User.vue
@@ -21,11 +21,14 @@
         <el-table :data="publicityList" style="width: 100%">
           <el-table-column prop="nickName" label="鐢ㄦ埛鍚�" width="180" align="center">
           </el-table-column>
+
           <el-table-column prop="realName" label="鐢ㄦ埛濮撳悕" width="180" header-align="center" align="center">
           </el-table-column>
           <el-table-column prop="userMobile" label="鎵嬫満鍙风爜" width="180" header-align="center" align="center">
           </el-table-column>
           <el-table-column prop="ctime" label="鍒涘缓鏃堕棿" width="180" header-align="center" align="center">
+          </el-table-column>
+          <el-table-column prop="userMemo" label="澶囨敞" width="180" align="center">
           </el-table-column>
           <el-table-column label="鎿嶄綔" align="conter">
             <template slot-scope="scope">
@@ -116,6 +119,11 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-form-item label="澶囨敞" prop="userMemo">
+            <el-input v-model="detailsRow.userMemo" placeholder="璇疯緭鍏ュ娉�" clearable
+                      :style="{ width: '100%' }">
+            </el-input>
+          </el-form-item>
         </el-form>
       </el-row>
       <span slot="footer" class="dialog-footer">

--
Gitblit v1.8.0