全局消息,首页完成

src/views/chat/contacts.vue

@@ -1,1065 +1,1064 @@
 <template>
-    <div class="mainBox">
-      <div class="hallBox">
-        <div class="hallLeft">
-          <!--添加好友 start------------------------------------------>
-          <contactsTitle :name="tableTitleName" @addUser="addUser" @closeAddUser="closeAddUser" />
-          <!--添加好友 end------------------------------------------>
-          <!--搜索 start------------------------------------------>
-          <div class="searchBox">
-            <el-input
-              placeholder="请输入用户账号"
-              prefix-icon="el-icon-search"
-              v-model="searchUserName"
-              @keyup.enter.native="searchFriend"
-              v-if="pagestatus == 4"
-            >
-            </el-input>
-            <el-input
-              placeholder="请输入好友账号"
-              prefix-icon="el-icon-search"
-              v-model="searchUserListName"
-              @keyup.enter.native="searchOrdFriend"
-              v-if="pagestatus==1||pagestatus==2||pagestatus==3"
-            >
-            </el-input>
+  <div class="mainBox">
+    <div class="hallBox">
+      <div class="hallLeft">
+        <!--添加好友 start------------------------------------------>
+        <contactsTitle :name="tableTitleName" @addUser="addUser" @closeAddUser="closeAddUser" />
+        <!--添加好友 end------------------------------------------>
+        <!--搜索 start------------------------------------------>
+        <div class="searchBox">
+          <el-input
+            placeholder="请输入用户账号"
+            prefix-icon="el-icon-search"
+            v-model="searchUserName"
+            @keyup.enter.native="searchFriend"
+            v-if="pagestatus == 4"
+          >
+          </el-input>
+          <el-input
+            placeholder="请输入好友账号"
+            prefix-icon="el-icon-search"
+            v-model="searchUserListName"
+            @keyup.enter.native="searchOrdFriend"
+            v-if="pagestatus==1||pagestatus==2||pagestatus==3"
+          >
+          </el-input>
+        </div>
+        <!--搜索 end------------------------------------------>
+        <div class="newFriendBox">新的朋友</div>
+        <div class="newFriendImgBox" v-if="pagestatus==4">
+          <div class="newFriendImg">
+            <img src="@/assets/chat/newcontacts.png">
           </div>
-          <!--搜索 end------------------------------------------>
-          <div class="newFriendBox">新的朋友</div>
-          <div class="newFriendImgBox" v-if="pagestatus==4">
-            <div class="newFriendImg">
-              <img src="@/assets/chat/newcontacts.png">
-            </div>
-            <div class="newFriendText" @click="searchFriend">
-              搜索：{{searchUserName}}
-            </div>
-            <div class="searchFriendBox" v-if="searchWindowStatus==true">
-              <div class="searchFriendItem">
-                <div class="searchFriendAvatar">
-                  <img :src="searchFriendList.avatar" v-if="searchFriendList.avatar!=''">
-                  <img src="@/assets/chat/user/admin.png" v-else>
-                </div>
-                <div class="searchFriendInfo">
-                  <div class="searchFriendName">
-                    <div class="searchFriendNameText" v-if="searchFriendList.remark!=null&&searchFriendList.remark!=''">{{searchFriendList.remark}}</div>
-                    <div class="searchFriendNameText" v-else>{{searchFriendList.user_name}}</div>
-                    <!--性别-->
-                    <!-- <div class="gender"><img src="@/assets/chat/girl.png"></div> -->
-                    <!--更多-->
-                    <!-- <img src="@/assets/chat/fi_more.png"> -->
-                  </div>
-                  <div class="searchFriendPhone">账号：{{searchFriendList.user_name}}</div>
-                </div>
+          <div class="newFriendText" @click="searchFriend">
+            搜索：{{searchUserName}}
+          </div>
+          <div class="searchFriendBox" v-if="searchWindowStatus==true">
+            <div class="searchFriendItem">
+              <div class="searchFriendAvatar">
+                <img :src="searchFriendList.avatar" v-if="searchFriendList.avatar!=''">
+                <img src="@/assets/chat/user/admin.png" v-else>
               </div>
-              <!-- <div v-if="searchFriendList.isfriend==0||searchFriendList.isfriend==null"></div>
-              <div class="searchFriendLineBox" v-else @click="openEditWindow">
-                <div class="searchFriendLineTitle">备注</div>
-                <div class="searchFriendLineContent">
-                  <div class="searchFriendLineContentItem">
-                    <div>{{searchFriendList.remark}}</div>
-                    <div><i class="el-icon-edit"></i></div>
-                  </div>
+              <div class="searchFriendInfo">
+                <div class="searchFriendName">
+                  <div class="searchFriendNameText" v-if="searchFriendList.remark!=null&&searchFriendList.remark!=''">{{searchFriendList.remark}}</div>
+                  <div class="searchFriendNameText" v-else>{{searchFriendList.user_name}}</div>
+                  <!--性别-->
+                  <!-- <div class="gender"><img src="@/assets/chat/girl.png"></div> -->
+                  <!--更多-->
+                  <!-- <img src="@/assets/chat/fi_more.png"> -->
                 </div>
-              </div> -->
-              <!-- <div class="searchFriendLineBox">
-                <div class="searchFriendLineTitle">共同群聊</div>
-                <div class="searchFriendLineContent">0个</div>
-              </div>
-              <div class="searchFriendLineBox">
-                <div class="searchFriendLineTitle">添加方式</div>
-                <div class="searchFriendLineContent">通过账号添加</div>
-              </div> -->
-              <div class="searchFriendButton">
-                <el-button type="primary" v-if="searchFriendList.showBtn==false&&searchFriendList.id!=this.$store.state.user.userid" @click="openAddWindow(searchFriendList.id)">添加到通讯录</el-button>
-                <el-button type="danger" v-else-if="searchFriendList.showBtn==true" @click="deleteFriend(searchFriendList)">删除好友</el-button>
-                <el-button type="primary" disabled v-else>添加到通讯录</el-button>
+                <div class="searchFriendPhone">账号：{{searchFriendList.user_name}}</div>
               </div>
-              <!-- <div class="searchFriendButton">
-                <div class="searchFriendButtonItem">
-                  <img src="@/assets/chat/sendmessage.png">
-                  <div>发消息</div>
-                </div>
-              </div> -->
-            </div>
-          </div>
-          <div :class="['newFriendImgBox', pagestatus === 2 ? 'newFriendIActive' : '']" @click="tabPage(2)" v-else>
-            <div class="newFriendImg">
-              <img src="@/assets/chat/newcontacts.png">
             </div>
-            <div class="newFriendText" v-if="pagestatus==4">
-              搜索：{{searchUserName}}
+            <!-- <div v-if="searchFriendList.isfriend==0||searchFriendList.isfriend==null"></div>
+            <div class="searchFriendLineBox" v-else @click="openEditWindow">
+              <div class="searchFriendLineTitle">备注</div>
+              <div class="searchFriendLineContent">
+                <div class="searchFriendLineContentItem">
+                  <div>{{searchFriendList.remark}}</div>
+                  <div><i class="el-icon-edit"></i></div>
+                </div>
+              </div>
+            </div> -->
+            <!-- <div class="searchFriendLineBox">
+              <div class="searchFriendLineTitle">共同群聊</div>
+              <div class="searchFriendLineContent">0个</div>
             </div>
-            <div class="newFriendText" v-else>
-              新的朋友
-              <span v-if="userApplyList.length>0">{{userApplyList.length}}</span>
+            <div class="searchFriendLineBox">
+              <div class="searchFriendLineTitle">添加方式</div>
+              <div class="searchFriendLineContent">通过账号添加</div>
+            </div> -->
+            <div class="searchFriendButton">
+              <el-button type="primary" v-if="searchFriendList.showBtn==false&&searchFriendList.id!=this.$store.state.user.userid" @click="openAddWindow(searchFriendList.id)">添加到通讯录</el-button>
+              <el-button type="danger" v-else-if="searchFriendList.showBtn==true" @click="deleteFriend(searchFriendList)">删除好友</el-button>
+              <el-button type="primary" disabled v-else>添加到通讯录</el-button>
             </div>
-          </div>
-          <!--用户列表 start------------------------------------------>
-          <div class="userListBox" v-if="pagestatus==1||pagestatus==2||pagestatus==3">
-            <!-- <div class="userListTitle">A</div> -->
-            <div class="userItem" @click="changeUserItem(item.friend_id)" v-for="(item,index) in userFriendList" :key="index" :class="['userItem', { active: item.status == 1 }]">
-              <div class="userAvatar">
-                <img :src="item.avatar" v-if="item.avatar!=''">
-                <img src="@/assets/chat/user/admin.png" v-else>
+            <!-- <div class="searchFriendButton">
+              <div class="searchFriendButtonItem">
+                <img src="@/assets/chat/sendmessage.png">
+                <div>发消息</div>
               </div>
-              <div class="userInfo">
-                <div class="userName">
-                  <div class="userNameText" v-if="item.remark!=null">{{item.user_name}}<span v-if="item.remark!=''">({{item.remark}})</span></div>
-                  <div class="userNameText" v-else>{{item.user_name}}</div>
-                </div>
+            </div> -->
+          </div>
+        </div>
+        <div :class="['newFriendImgBox', pagestatus === 2 ? 'newFriendIActive' : '']" @click="tabPage(2)" v-else>
+          <div class="newFriendImg">
+            <img src="@/assets/chat/newcontacts.png">
+          </div>
+          <div class="newFriendText" v-if="pagestatus==4">
+            搜索：{{searchUserName}}
+          </div>
+          <div class="newFriendText" v-else>
+            新的朋友
+            <span v-if="userApplyList.length>0">{{userApplyList.length}}</span>
+          </div>
+        </div>
+        <!--用户列表 start------------------------------------------>
+        <div class="userListBox" v-if="pagestatus==1||pagestatus==2||pagestatus==3">
+          <!-- <div class="userListTitle">A</div> -->
+          <div class="userItem" @click="changeUserItem(item.friend_id)" v-for="(item,index) in userFriendList" :key="index" :class="['userItem', { active: item.status == 1 }]">
+            <div class="userAvatar">
+              <img :src="item.avatar" v-if="item.avatar!=''">
+              <img src="@/assets/chat/user/admin.png" v-else>
+            </div>
+            <div class="userInfo">
+              <div class="userName">
+                <div class="userNameText" v-if="item.remark!=null">{{item.user_name}}<span v-if="item.remark!=''">({{item.remark}})</span></div>
+                <div class="userNameText" v-else>{{item.user_name}}</div>
               </div>
             </div>
           </div>
-          <!--用户列表 end------------------------------------------>
         </div>
-        <div class="hallRight" v-if="pagestatus==1||pagestatus==4">
-          <div class="ifHallRigthNoMessage">恒星管理平台</div>
+        <!--用户列表 end------------------------------------------>
+      </div>
+      <div class="hallRight" v-if="pagestatus==1||pagestatus==4">
+        <div class="ifHallRigthNoMessage">恒星管理平台</div>
+      </div>
+      <div class="hallRight" v-if="pagestatus==2">
+        <div class="UserNameBox">
+          <div class="userName">新的朋友</div>
         </div>
-        <div class="hallRight" v-if="pagestatus==2">
-          <div class="UserNameBox">
-            <div class="userName">新的朋友</div>
+        <div class="rightNewFriendBox" v-for="(item,index) in userApplyList" :key="index">
+          <div class="rightNewFriendItem">
+            <div class="rightNewFriendAvatar">
+              <img :src="item.avatar" v-if="item.avatar!=''">
+              <img src="@/assets/chat/user/admin.png" v-else>
+            </div>
+            <div class="rightNewFriendInfo">
+              <div class="rightNewFriendName">{{item.remark}}</div>
+              <div class="rightNewFriendPhone">{{item.user_name}}</div>
+            </div>
           </div>
-          <div class="rightNewFriendBox" v-for="(item,index) in userApplyList" :key="index">
-            <div class="rightNewFriendItem">
-              <div class="rightNewFriendAvatar">
-                <img :src="item.avatar" v-if="item.avatar!=''">
-                <img src="@/assets/chat/user/admin.png" v-else>
-              </div>
-              <div class="rightNewFriendInfo">
-                <div class="rightNewFriendName">{{item.remark}}</div>
-                <div class="rightNewFriendPhone">{{item.user_name}}</div>
-              </div>
+          <div class="rightNewFriendStatus">
+            <div class="rightNewFriendStatus2">
+              <el-button type="primary" @click="openWindow(item)">接受</el-button>
             </div>
-            <div class="rightNewFriendStatus">
-              <div class="rightNewFriendStatus2">
-                <el-button type="primary" @click="openWindow(item)">接受</el-button>
-              </div>
+          </div>
+        </div>
+        <!-- <div class="rightNewFriendBox">
+          <div class="rightNewFriendItem">
+            <div class="rightNewFriendAvatar">
+              <img src="@/assets/chat/user/user.png">
+            </div>
+            <div class="rightNewFriendInfo">
+              <div class="rightNewFriendName">我是某某某</div>
+              <div class="rightNewFriendPhone">15210211200</div>
             </div>
           </div>
-          <!-- <div class="rightNewFriendBox">
-            <div class="rightNewFriendItem">
-              <div class="rightNewFriendAvatar">
-                <img src="@/assets/chat/user/user.png">
-              </div>
-              <div class="rightNewFriendInfo">
-                <div class="rightNewFriendName">我是某某某</div>
-                <div class="rightNewFriendPhone">15210211200</div>
-              </div>
+          <div class="rightNewFriendStatus">
+            <div class="rightNewFriendStatus1">已接受</div>
+          </div>
+        </div>
+        <div class="rightNewFriendBox">
+          <div class="rightNewFriendItem">
+            <div class="rightNewFriendAvatar">
+              <img src="@/assets/chat/user/user.png">
             </div>
-            <div class="rightNewFriendStatus">
-              <div class="rightNewFriendStatus1">已接受</div>
+            <div class="rightNewFriendInfo">
+              <div class="rightNewFriendName">我是某某某</div>
+              <div class="rightNewFriendPhone">15210211200</div>
             </div>
           </div>
-          <div class="rightNewFriendBox">
-            <div class="rightNewFriendItem">
-              <div class="rightNewFriendAvatar">
-                <img src="@/assets/chat/user/user.png">
-              </div>
-              <div class="rightNewFriendInfo">
-                <div class="rightNewFriendName">我是某某某</div>
-                <div class="rightNewFriendPhone">15210211200</div>
-              </div>
+          <div class="rightNewFriendStatus">
+            <div class="rightNewFriendStatus2">
+              <el-button type="primary" @click="friendWindowStatus=true">接受</el-button>
             </div>
-            <div class="rightNewFriendStatus">
-              <div class="rightNewFriendStatus2">
-                <el-button type="primary" @click="friendWindowStatus=true">接受</el-button>
-              </div>
+          </div>
+        </div> -->
+      </div>
+      <div class="hallRight" v-if="pagestatus==3">
+        <div class="userInfoMainBox">
+          <div class="userInfoMainItem">
+            <div class="userInfoMainAvatar">
+              <img :src="friendInfo.avatar" v-if="friendInfo.avatar!=''">
+              <img src="@/assets/chat/user/admin.png" v-else>
             </div>
-          </div> -->
-        </div>
-        <div class="hallRight" v-if="pagestatus==3">
-          <div class="userInfoMainBox">
-            <div class="userInfoMainItem">
-              <div class="userInfoMainAvatar">
-                <img :src="friendInfo.avatar" v-if="friendInfo.avatar!=''">
-                <img src="@/assets/chat/user/admin.png" v-else>
-              </div>
-              <div class="userInfoMainInfo">
-                <div class="userInfoMainName">
-                  <div class="userInfoMainNameText" v-if="friendInfo.nickname!=null&&friendInfo.nickname!=''">{{friendInfo.nickname}}</div>
-                  <div class="userInfoMainNameText" v-else>{{friendInfo.user_name}}</div>
-                </div>
-                <div class="userInfoMainPhone">账号：{{friendInfo.user_name}}</div>
+            <div class="userInfoMainInfo">
+              <div class="userInfoMainName">
+                <div class="userInfoMainNameText" v-if="friendInfo.nickname!=null&&friendInfo.nickname!=''">{{friendInfo.nickname}}</div>
+                <div class="userInfoMainNameText" v-else>{{friendInfo.user_name}}</div>
               </div>
+              <div class="userInfoMainPhone">账号：{{friendInfo.user_name}}</div>
             </div>
-            <div class="userInfoMainLineBox">
-              <div class="userInfoMainLineTitle">备注</div>
-              <div class="userInfoMainLineContent">
-                <div class="userInfoMainLineContentItem" @click="openEditWindow">
-                  <div v-if="friendInfo.remark!=null&&friendInfo.remark!=''">{{friendInfo.remark}}</div>
-                  <div v-else>暂无备注</div>
-                  <div><i class="el-icon-edit"></i></div>
-                </div>
+          </div>
+          <div class="userInfoMainLineBox">
+            <div class="userInfoMainLineTitle">备注</div>
+            <div class="userInfoMainLineContent">
+              <div class="userInfoMainLineContentItem" @click="openEditWindow">
+                <div v-if="friendInfo.remark!=null&&friendInfo.remark!=''">{{friendInfo.remark}}</div>
+                <div v-else>暂无备注</div>
+                <div><i class="el-icon-edit"></i></div>
               </div>
             </div>
-            <!-- <div class="userInfoMainLineBox">
-              <div class="userInfoMainLineTitle">共同群聊</div>
-              <div class="userInfoMainLineContent">0个</div>
-            </div>
-            <div class="userInfoMainLineBox">
-              <div class="userInfoMainLineTitle">添加方式</div>
-              <div class="userInfoMainLineContent">通过账号添加</div>
+          </div>
+          <!-- <div class="userInfoMainLineBox">
+            <div class="userInfoMainLineTitle">共同群聊</div>
+            <div class="userInfoMainLineContent">0个</div>
+          </div>
+          <div class="userInfoMainLineBox">
+            <div class="userInfoMainLineTitle">添加方式</div>
+            <div class="userInfoMainLineContent">通过账号添加</div>
+          </div> -->
+          <div class="userInfoMainButton">
+            <!-- <div class="userInfoMainButtonItem">
+              <img src="@/assets/chat/sendmessage.png">
+              <div>删除好友</div>
             </div> -->
-            <div class="userInfoMainButton">
-              <!-- <div class="userInfoMainButtonItem">
-                <img src="@/assets/chat/sendmessage.png">
-                <div>删除好友</div>
-              </div> -->
-              <el-button type="primary" icon="el-icon-s-promotion" @click="sendMessage(friendInfo)">发送消息</el-button>
-              <el-button type="danger" icon="el-icon-delete" @click="deleteFriend(friendInfo.friend_id)">删除好友</el-button>
-            </div>
+            <el-button type="primary" icon="el-icon-s-promotion" @click="sendMessage(friendInfo)">发送消息</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="deleteFriend(friendInfo.friend_id)">删除好友</el-button>
           </div>
         </div>
       </div>
-      <!--发送好友申请弹出框 start------------------------------------------------------------>
-      <el-dialog :visible.sync="addFriendWindowStatus" title="朋友申请" :close-on-click-modal="false" width="420px">
+    </div>
+    <!--发送好友申请弹出框 start------------------------------------------------------------>
+    <el-dialog :visible.sync="addFriendWindowStatus" title="朋友申请" :close-on-click-modal="false" width="420px">
+      <div>
         <div>
-          <div>
-            <el-form :model="form" ref="form" autocomplete="off" label-position="left">
-              <div class="formDiv">
-                <el-form-item label="验证消息：" :label-width="formLabelWidth" class="custom-align-right">
-                  <el-input v-model="addform.remark" autocomplete="off"  placeholder="我是.."></el-input>
-                </el-form-item>
-              </div> 
-            </el-form>
-          </div>
-          <div class="footerButtonBox">
-            <el-button type="info" @click="addFriendWindowStatus=false">取消</el-button>
-            <el-button type="primary" @click="addMyFriend">确定</el-button>
-          </div>
+          <el-form :model="form" ref="form" autocomplete="off" label-position="left">
+            <div class="formDiv">
+              <el-form-item label="验证消息：" :label-width="formLabelWidth" class="custom-align-right">
+                <el-input v-model="addform.remark" autocomplete="off"  placeholder="我是.."></el-input>
+              </el-form-item>
+            </div> 
+          </el-form>
         </div>
-      </el-dialog>
-      <!--发送好友申请弹出框 end------------------------------------------------------------>
-      <!--请求验证弹出框 start------------------------------------------------------------>
-      <el-dialog :visible.sync="friendWindowStatus" title="通过朋友验证" :close-on-click-modal="false" width="420px">
-        <div>
-          <div class="friendWindowText">
-            <!--此处修改备注是没用的，修改备注需要friendId，但是此时你们还不是好友，改不了备注-->
-            <!-- <el-form :model="form" ref="form" autocomplete="off" label-position="left">
-              <div class="formDiv">
-                <el-form-item label="备注名" :label-width="formLabelWidth" class="custom-align-right">
-                  <el-input v-model="form.remark" autocomplete="off" placeholder="请输入备注名.."></el-input>
-                </el-form-item>
-              </div> 
-            </el-form> -->
-            确定要添加<span>{{friendInfo.user_name}}</span>为好友吗？
-          </div>
-          <div class="footerButtonBox">
-            <el-button type="info" @click="friendWindowStatus=false">取消</el-button>
-            <el-button type="primary" @click="addFriend">确定</el-button>
-          </div>
+        <div class="footerButtonBox">
+          <el-button type="info" @click="addFriendWindowStatus=false">取消</el-button>
+          <el-button type="primary" @click="addMyFriend">确定</el-button>
         </div>
-      </el-dialog>
-      <!--请求验证弹出框 end------------------------------------------------------------>
-      <!--修改备注弹出框 start------------------------------------------------------------>
-      <el-dialog :visible.sync="editWindowStatus" title="修改备注" :close-on-click-modal="false" width="420px">
+      </div>
+    </el-dialog>
+    <!--发送好友申请弹出框 end------------------------------------------------------------>
+    <!--请求验证弹出框 start------------------------------------------------------------>
+    <el-dialog :visible.sync="friendWindowStatus" title="通过朋友验证" :close-on-click-modal="false" width="420px">
+      <div>
+        <div class="friendWindowText">
+          <!--此处修改备注是没用的，修改备注需要friendId，但是此时你们还不是好友，改不了备注-->
+          <!-- <el-form :model="form" ref="form" autocomplete="off" label-position="left">
+            <div class="formDiv">
+              <el-form-item label="备注名" :label-width="formLabelWidth" class="custom-align-right">
+                <el-input v-model="form.remark" autocomplete="off" placeholder="请输入备注名.."></el-input>
+              </el-form-item>
+            </div> 
+          </el-form> -->
+          确定要添加<span>{{friendInfo.user_name}}</span>为好友吗？
+        </div>
+        <div class="footerButtonBox">
+          <el-button type="info" @click="friendWindowStatus=false">取消</el-button>
+          <el-button type="primary" @click="addFriend">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!--请求验证弹出框 end------------------------------------------------------------>
+    <!--修改备注弹出框 start------------------------------------------------------------>
+    <el-dialog :visible.sync="editWindowStatus" title="修改备注" :close-on-click-modal="false" width="420px">
+      <div>
         <div>
-          <div>
-            <el-form :model="form" ref="form" autocomplete="off" label-position="left">
-              <div class="formDiv">
-                <el-form-item label="备注名" :label-width="formLabelWidth" class="custom-align-right">
-                  <el-input v-model="remark" autocomplete="off"  placeholder="请输入备注名.."></el-input>
-                </el-form-item>
-              </div> 
-            </el-form>
-          </div>
-          <div class="footerButtonBox">
-            <el-button type="info" @click="editWindowStatus=false">取消</el-button>
-            <el-button type="primary" @click="editFriend">确定</el-button>
-          </div>
+          <el-form :model="form" ref="form" autocomplete="off" label-position="left">
+            <div class="formDiv">
+              <el-form-item label="备注名" :label-width="formLabelWidth" class="custom-align-right">
+                <el-input v-model="remark" autocomplete="off"  placeholder="请输入备注名.."></el-input>
+              </el-form-item>
+            </div> 
+          </el-form>
         </div>
-      </el-dialog>
-      <!--修改备注弹出框 end------------------------------------------------------------>
-    </div>
-  </template>
-  
-  <script>
-  //引入公用样式
-  import '@/styles/global.less';
-  //引入baseUrl
-  import URL from '@/utils/baseUrl';
-  //引入组件
-  import contactsTitle from './components/contactsTitle.vue';
-  import { status } from 'nprogress';
-  import openWindow from '@/utils/open-window';
-  
-  export default {
-    components: {
-      contactsTitle
-    },
-    data() {
-      return {
-        //1.全局配置 start------------------------------------------------------------>
-        tableTitleName:'通讯录',
-        pagestatus:1,//1=没有选择任何联系人 2=申请列表 3=好友详情 4=搜索结果
-        formLabelWidth:"100px",//表单label宽度
-        searchUserName:"",//搜索新添加用户
-        searchUserListName:"",//搜索好友列表
-        friendId:"",//要添加的好友id
-        friendWindowStatus:false,//通过朋友申请弹出框
-        searchWindowStatus:false,//搜索窗口左侧弹出框
-        searchUserWindowStatus:false,//搜索好友列表弹出框
-        editWindowStatus:false,//修改备注弹出框
-        addFriendWindowStatus:false,//发送好友申请弹出框
-        editFriendId:"",//要编辑的好友
-        getFriendApplyListStatus:null,//获取好友申请列表状态
-        //1.全局配置 end------------------------------------------------------------>
-        //2.好友列表 start------------------------------------------------------------>
-        userFriendList:[],//好友列表
-        userApplyList:[],//好友申请列表
-        searchFriendList:"",//搜索好友列表
-        //2.好友列表 end------------------------------------------------------------>
-        //3.通过好友申请 start------------------------------------------------------------>
-        form:{
-          //好友的用户id
-          id:"",
-          //好友id
-          friend_id:"",
-          //好友申请
-          remark:"",
-          //状态
-          status:2,
-          //申请id
-          apply_id:""
-        },
-        //3.通过好友申请 end------------------------------------------------------------>
-        //4.编辑好友 start------------------------------------------------------------>
-        friendInfo:{},//好友信息
-        remark:"",//修改的用户备注
-        //4.编辑好友 end------------------------------------------------------------>
-        //5.发送好友申请 start------------------------------------------------------------>
-        addform:{
-          //好友id
-          friend_id:"",
-          //好友申请
-          remark:"",
-        },
-        //5.发送好友申请 end------------------------------------------------------------>
-      };
-    },
-    methods: {
-      //0.全局操作 start------------------------------------------------------------>
-      //0.1切换页面状态
-      tabPage(status){
-        this.pagestatus = status;
-        if(status==2){
-          //如果是2 好友列表状态还原
-          for(let item of this.userFriendList){
-            item.status = 0;
-          }
-        }
-        this.getFriendApplyList();
+        <div class="footerButtonBox">
+          <el-button type="info" @click="editWindowStatus=false">取消</el-button>
+          <el-button type="primary" @click="editFriend">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!--修改备注弹出框 end------------------------------------------------------------>
+  </div>
+</template>
+
+<script>
+//引入公用样式
+import '@/styles/global.less';
+//引入baseUrl
+import URL from '@/utils/baseUrl';
+//引入组件
+import contactsTitle from './components/contactsTitle.vue';
+import { status } from 'nprogress';
+import openWindow from '@/utils/open-window';
+
+export default {
+  components: {
+    contactsTitle
+  },
+  data() {
+    return {
+      //1.全局配置 start------------------------------------------------------------>
+      tableTitleName:'通讯录',
+      pagestatus:1,//1=没有选择任何联系人 2=申请列表 3=好友详情 4=搜索结果
+      formLabelWidth:"100px",//表单label宽度
+      searchUserName:"",//搜索新添加用户
+      searchUserListName:"",//搜索好友列表
+      friendId:"",//要添加的好友id
+      friendWindowStatus:false,//通过朋友申请弹出框
+      searchWindowStatus:false,//搜索窗口左侧弹出框
+      searchUserWindowStatus:false,//搜索好友列表弹出框
+      editWindowStatus:false,//修改备注弹出框
+      addFriendWindowStatus:false,//发送好友申请弹出框
+      editFriendId:"",//要编辑的好友
+      getFriendApplyListStatus:null,//获取好友申请列表状态
+      //1.全局配置 end------------------------------------------------------------>
+      //2.好友列表 start------------------------------------------------------------>
+      userFriendList:[],//好友列表
+      userApplyList:[],//好友申请列表
+      searchFriendList:"",//搜索好友列表
+      //2.好友列表 end------------------------------------------------------------>
+      //3.通过好友申请 start------------------------------------------------------------>
+      form:{
+        //好友的用户id
+        id:"",
+        //好友id
+        friend_id:"",
+        //好友申请
+        remark:"",
+        //状态
+        status:2,
+        //申请id
+        apply_id:""
       },
-      //0.全局操作 end------------------------------------------------------------>
-      //1.好友列表 start------------------------------------------------------------>
-      addUser(){
-        this.pagestatus = 4;
+      //3.通过好友申请 end------------------------------------------------------------>
+      //4.编辑好友 start------------------------------------------------------------>
+      friendInfo:{},//好友信息
+      remark:"",//修改的用户备注
+      //4.编辑好友 end------------------------------------------------------------>
+      //5.发送好友申请 start------------------------------------------------------------>
+      addform:{
+        //好友id
+        friend_id:"",
+        //好友申请
+        remark:"",
       },
-      closeAddUser(){
-        this.pagestatus = 2;
-        this.searchWindowStatus = false;
-      },
-      //1.1获取联系人列表
-      getUserFriendList(){
-        //获取用户身份id
-        //const userId = this.$store.state.user.userid;
-        this.$store.dispatch('chat/getFriendsList',{}).then(res=> {
-          let data = res.data;
-          for(let item of data){
-            item.status = 0; //默认未选中
-          }
-          this.userFriendList = data;
-        }).catch(() => {
-          this.$message.error('获取好友列表失败!')
-        })
-      },
-      //1.2选择联系人
-      changeUserItem(id){
+      //5.发送好友申请 end------------------------------------------------------------>
+    };
+  },
+  methods: {
+    //0.全局操作 start------------------------------------------------------------>
+    //0.1切换页面状态
+    tabPage(status){
+      this.pagestatus = status;
+      if(status==2){
+        //如果是2 好友列表状态还原
         for(let item of this.userFriendList){
-          if(item.friend_id == id){
-            item.status = 1;
-          }else{
-            item.status = 0;
-          }
+          item.status = 0;
         }
-        //切换页面到用户列表
-        this.pagestatus = 3;
-        //把要编辑的好友的id存起来
-        this.editFriendId = id;
-  
-        // console.log(id)
-        // console.log(this.userFriendList)
-        //获取好友身份信息详情
-        this.$store.dispatch('chat/getFriendInfo',{friend_id:this.editFriendId}).then(res=> {
-          console.log(res)
-          //保存好友信息
-          this.friendInfo = res.data;
-          this.remark = res.data.remark;
-        }).catch(() => {
-          this.$message.error('获得好友身份详情失败!')
-        })
-  
-      },
-      //1.3搜索联系人
-      searchFriend(){
-        //搜索联系人
-        this.$store.dispatch('chat/searchFriend',{keyword:this.searchUserName}).then(res=> {
-          //获取到好友
-          this.searchWindowStatus = false;
-          console.log(res);
-          if(res.code==200){
-            if(res.data.length>0){
-              this.searchWindowStatus = true;
-              this.searchFriendList = res.data[0];
-              //搜出来以后查询两人是否为好友
-              this.searchIsFriend(this.searchFriendList)
-  
-            }else{
-              this.$message.error('没有找到该联系人!')
-            }
-          }else{
-            this.$message.error('搜索关键字不能为空!')
-          }
-        })
-      },
-      //1.3搜索好友列表中的好友
-      searchOrdFriend(){
-        if(this.searchUserListName==""){
-          this.$message.error('搜索关键字不能为空!')
-          return;
+      }
+      this.getFriendApplyList();
+    },
+    //0.全局操作 end------------------------------------------------------------>
+    //1.好友列表 start------------------------------------------------------------>
+    addUser(){
+      this.pagestatus = 4;
+    },
+    closeAddUser(){
+      this.pagestatus = 2;
+      this.searchWindowStatus = false;
+    },
+    //1.1获取联系人列表
+    getUserFriendList(){
+      //获取用户身份id
+      //const userId = this.$store.state.user.userid;
+      this.$store.dispatch('chat/getFriendsList',{}).then(res=> {
+        let data = res.data;
+        for(let item of data){
+          item.status = 0; //默认未选中
+        }
+        this.userFriendList = data;
+      }).catch(() => {
+        this.$message.error('获取好友列表失败!')
+      })
+    },
+    //1.2选择联系人
+    changeUserItem(id){
+      for(let item of this.userFriendList){
+        if(item.friend_id == id){
+          item.status = 1;
         }else{
-          let isFriend = false;
-          for(let item of this.userFriendList){
-            if(item.user_name == this.searchUserListName){
-              isFriend = true;
-              this.searchFriendList = item;
-            }
-          }
-          if(isFriend){
-            this.changeUserItem(this.searchFriendList.friend_id)
-            //console.log(this.searchFriendList);
+          item.status = 0;
+        }
+      }
+      //切换页面到用户列表
+      this.pagestatus = 3;
+      //把要编辑的好友的id存起来
+      this.editFriendId = id;
+
+      // console.log(id)
+      // console.log(this.userFriendList)
+      //获取好友身份信息详情
+      this.$store.dispatch('chat/getFriendInfo',{friend_id:this.editFriendId}).then(res=> {
+        console.log(res)
+        //保存好友信息
+        this.friendInfo = res.data;
+        this.remark = res.data.remark;
+      }).catch(() => {
+        this.$message.error('获得好友身份详情失败!')
+      })
+
+    },
+    //1.3搜索联系人
+    searchFriend(){
+      //搜索联系人
+      this.$store.dispatch('chat/searchFriend',{keyword:this.searchUserName}).then(res=> {
+        //获取到好友
+        this.searchWindowStatus = false;
+        console.log(res);
+        if(res.code==200){
+          if(res.data.length>0){
+            this.searchWindowStatus = true;
+            this.searchFriendList = res.data[0];
+            //搜出来以后查询两人是否为好友
+            this.searchIsFriend(this.searchFriendList)
+
           }else{
             this.$message.error('没有找到该联系人!')
           }
+        }else{
+          this.$message.error('搜索关键字不能为空!')
         }
-      },
-      //1.好友列表 end------------------------------------------------------------>
-  
-      //2.获得好友申请列表 start------------------------------------------------------------>
-      //2.1 好友申请列表
-      getFriendApplyList(){
-        console.log("获取好友申请列表");
-        const userId = this.$store.state.user.userid;
-        this.$store.dispatch('chat/getFriendsApplyList',{user_id:userId}).then(res=> {
-          this.userApplyList = res.data;
-        }).catch(() => {
-          this.$message.error('获取好友申请列表失败!')
-        })
-      },
-      
-      //2.2 接受好友申请
-      addFriend(){
-        //通过用户申请
-        console.log(this.form);
-        this.$store.dispatch('chat/applyFriend',this.form).then(res=> {
-          if(res.code==200){
-            this.$message.success('成功添加好友!')
-            this.friendWindowStatus = false;
-            //重新加载用户列表
-            this.getUserFriendList();
-            //清空右侧
-            this.friendInfo = {};
-            //this.pagestatus = 1;
-            this.getFriendApplyListStatus();
+      })
+    },
+    //1.3搜索好友列表中的好友
+    searchOrdFriend(){
+      if(this.searchUserListName==""){
+        this.$message.error('搜索关键字不能为空!')
+        return;
+      }else{
+        let isFriend = false;
+        for(let item of this.userFriendList){
+          if(item.user_name == this.searchUserListName){
+            isFriend = true;
+            this.searchFriendList = item;
           }
-        })
-      },
-      
-      //2.3 删除好友
-      deleteFriend(id){
-        console.log(id);
-        if(id){
-          this.editFriendId = String(id);
         }
-        console.log(id)
-        this.$confirm('此操作将永久删除该联系人, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          console.log(this.editFriendId);
-          this.$store.dispatch('chat/delFriend',{friend_id:this.editFriendId}).then(res=> {
-            this.$message.success('删除成功!')
-            //关闭用户详情显示
-            this.pagestatus = 1;
-            //重新装在用户列表
-            this.getUserFriendList();
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'warning',
-            message: '已取消删除'
-          });
-        });
-      },
-      //2.4 编辑好友
-      editFriend(){
-        let data = {
-          friend_id:this.editFriendId,
-          remark:this.remark
+        if(isFriend){
+          this.changeUserItem(this.searchFriendList.friend_id)
+          //console.log(this.searchFriendList);
+        }else{
+          this.$message.error('没有找到该联系人!')
         }
-        //this.editFriendId
-        this.$store.dispatch('chat/updateFriend',data).then(res=> {
-          if(res.code==200){
-            this.$message.success('修改备注名成功!')
-            this.pagestatus = 1;
-            this.editWindowStatus = false;
-            this.getUserFriendList();
-            this.remark = "";
-          }else{
-            this.$message.error(res.message)
-          }
-        }).catch(() => {
-          this.$message.error('修改备注名失败!')
-        })
-      },
-      //2.5 发送好友申请
-      addMyFriend(){
-        console.log(this.addform);
-        this.$store.dispatch('chat/addFriend',this.addform).then(res=> {
-          this.$message.success("已成功发送好友申请！")
-          this.addFriendWindowStatus = false;
-          this.searchWindowStatus = false;
-          this.addform.remark = "";
-        })
-      },
-      //2.6 查询是否是好友
-      searchIsFriend(item){
-        let data = {
-          friend_id:item.isfriend
+      }
+    },
+    //1.好友列表 end------------------------------------------------------------>
+
+    //2.获得好友申请列表 start------------------------------------------------------------>
+    //2.1 好友申请列表
+    getFriendApplyList(){
+      console.log("获取好友申请列表");
+      const userId = this.$store.state.user.userid;
+      this.$store.dispatch('chat/getFriendsApplyList',{user_id:userId}).then(res=> {
+        this.userApplyList = res.data;
+      }).catch(() => {
+        this.$message.error('获取好友申请列表失败!')
+      })
+    },
+    
+    //2.2 接受好友申请
+    addFriend(){
+      //通过用户申请
+      console.log(this.form);
+      this.$store.dispatch('chat/applyFriend',this.form).then(res=> {
+        if(res.code==200){
+          this.$message.success('成功添加好友!')
+          this.friendWindowStatus = false;
+          //重新加载用户列表
+          this.getUserFriendList();
+          //清空右侧
+          this.friendInfo = {};
+          //this.pagestatus = 1;
+          this.getFriendApplyListStatus();
         }
-        console.log(data);
-        this.$store.dispatch('chat/isFriend',data).then(res=>{
-          console.log(res);
-          if(res.code==0&&res.message=="不是好友"){
-            this.searchFriendList.showBtn = false;
-          }else{
-            this.searchFriendList.showBtn = true;
-          }
-          this.$forceUpdate();
+      })
+    },
+    
+    //2.3 删除好友
+    deleteFriend(id){
+      console.log(id);
+      if(id){
+        this.editFriendId = String(id);
+      }
+      console.log(id)
+      this.$confirm('此操作将永久删除该联系人, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log(this.editFriendId);
+        this.$store.dispatch('chat/delFriend',{friend_id:this.editFriendId}).then(res=> {
+          this.$message.success('删除成功!')
+          //关闭用户详情显示
+          this.pagestatus = 1;
+          //重新装在用户列表
+          this.getUserFriendList();
         })
-      },
-      //2.7 定时查询好友申请状态
-      setTimeFriendApplyList(){
-        console.log("定时查询好友申请状态");
-        let that = this;
-        this.getFriendApplyListStatus = setInterval(()=>{
-          that.getFriendApplyList();
-        },5000)
-      },
-      //2.获得好友申请列表 end------------------------------------------------------------>
-  
-      //3.操作弹出框 start------------------------------------------------------------>
-      //用户菜单操作
-      openWindow(item){
-        this.form.id = item.id;
-        this.form.friend_id = item.friend_id;
-        this.friendInfo = item;
-        //打开弹出框
-        this.friendWindowStatus = true;
-      },
-      openEditWindow(id){
-        //打开修改备注弹出框
-        this.editWindowStatus = true;
-      },
-      openAddWindow(id){
-        console.log(id);
-        this.addform.friend_id = String(id);
-        this.addFriendWindowStatus = true;
-      },
-      //发送消息
-      sendMessage(friendInfo){
-        console.log(friendInfo);
-        //带着friend_id跳转到hall页面
-        this.$router.push({
-          path:'/hall',
-          query:{friend_id:friendInfo.friend_id}
-        }); 
-      },
-      //3.操作弹出框 end------------------------------------------------------------>
-      
+      }).catch(() => {
+        this.$message({
+          type: 'warning',
+          message: '已取消删除'
+        });
+      });
     },
-    mounted() {
-      //1.获取联系人列表
-      this.getUserFriendList();
-      //2.获取好友申请列表
-      this.getFriendApplyList();
-      //3.定时查询好友申请状态
-      this.setTimeFriendApplyList();
-      //打印当前用户id
-      console.log("当前的用户id为：" + this.$store.state.user.userid);
+    //2.4 编辑好友
+    editFriend(){
+      let data = {
+        friend_id:this.editFriendId,
+        remark:this.remark
+      }
+      //this.editFriendId
+      this.$store.dispatch('chat/updateFriend',data).then(res=> {
+        if(res.code==200){
+          this.$message.success('修改备注名成功!')
+          this.pagestatus = 1;
+          this.editWindowStatus = false;
+          this.getUserFriendList();
+          this.remark = "";
+        }else{
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.$message.error('修改备注名失败!')
+      })
     },
-    beforeDestroy() {
-      clearInterval(this.getFriendApplyListStatus);
-    }
-  };
-  </script>
-  
-  <style scoped lang="less">
-    .hallBox {
-      display: flex;
-      margin: 30px;
-      //左侧
-      .hallLeft {
-        width: 420px;
-        background: #fff;
-        border-radius: 20px;
-        margin-right: 20px;
-        .newFriendBox {
-          padding: 10px 25px 0 25px;
-          font-size: 18px;
-          color: #999;
+    //2.5 发送好友申请
+    addMyFriend(){
+      console.log(this.addform);
+      this.$store.dispatch('chat/addFriend',this.addform).then(res=> {
+        this.$message.success("已成功发送好友申请！")
+        this.addFriendWindowStatus = false;
+        this.searchWindowStatus = false;
+        this.addform.remark = "";
+      })
+    },
+    //2.6 查询是否是好友
+    searchIsFriend(item){
+      let data = {
+        friend_id:item.isfriend
+      }
+      console.log(data);
+      this.$store.dispatch('chat/isFriend',data).then(res=>{
+        console.log(res);
+        if(res.code==0&&res.message=="不是好友"){
+          this.searchFriendList.showBtn = false;
+        }else{
+          this.searchFriendList.showBtn = true;
         }
-        .newFriendImgBox {
-          margin: 10px 0 10px 0;
-          padding: 20px 0 20px 25px;
+        this.$forceUpdate();
+      })
+    },
+    //2.7 定时查询好友申请状态
+    setTimeFriendApplyList(){
+      console.log("定时查询好友申请状态");
+      let that = this;
+      this.getFriendApplyListStatus = setInterval(()=>{
+        that.getFriendApplyList();
+      },5000)
+    },
+    //2.获得好友申请列表 end------------------------------------------------------------>
+
+    //3.操作弹出框 start------------------------------------------------------------>
+    //用户菜单操作
+    openWindow(item){
+      this.form.id = item.id;
+      this.form.friend_id = item.friend_id;
+      this.friendInfo = item;
+      //打开弹出框
+      this.friendWindowStatus = true;
+    },
+    openEditWindow(id){
+      //打开修改备注弹出框
+      this.editWindowStatus = true;
+    },
+    openAddWindow(id){
+      console.log(id);
+      this.addform.friend_id = String(id);
+      this.addFriendWindowStatus = true;
+    },
+    //发送消息
+    sendMessage(friendInfo){
+      console.log(friendInfo);
+      //带着friend_id跳转到hall页面
+      this.$router.push({
+        path:'/hall',
+        query:{friend_id:friendInfo.friend_id}
+      }); 
+    },
+    //3.操作弹出框 end------------------------------------------------------------>
+    
+  },
+  mounted() {
+    //1.获取联系人列表
+    this.getUserFriendList();
+    //2.获取好友申请列表
+    this.getFriendApplyList();
+    //3.定时查询好友申请状态
+    this.setTimeFriendApplyList();
+    //打印当前用户id
+    console.log("当前的用户id为：" + this.$store.state.user.userid);
+  },
+  beforeDestroy() {
+    clearInterval(this.getFriendApplyListStatus);
+  }
+};
+</script>
+
+<style scoped lang="less">
+  .hallBox {
+    display: flex;
+    margin: 30px;
+    //左侧
+    .hallLeft {
+      width: 420px;
+      background: #fff;
+      border-radius: 20px;
+      margin-right: 20px;
+      .newFriendBox {
+        padding: 10px 25px 0 25px;
+        font-size: 18px;
+        color: #999;
+      }
+      .newFriendImgBox {
+        margin: 10px 0 10px 0;
+        padding: 20px 0 20px 25px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        cursor: pointer;
+        border-bottom: 1px solid #E9EDF7;
+        position: relative;
+        box-sizing: border-box;
+        border-right: 4px solid #fff;
+        .newFriendImg {
+          width: 58px;
+          height: 58px;
+          border-radius: 8px;
+          background: #5570F1;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
-          cursor: pointer;
-          border-bottom: 1px solid #E9EDF7;
-          position: relative;
-          box-sizing: border-box;
-          border-right: 4px solid #fff;
-          .newFriendImg {
-            width: 58px;
-            height: 58px;
-            border-radius: 8px;
+          justify-content: center;
+          margin-right: 20px;
+        }
+        .newFriendText {  
+          color: #333;
+          font-size: 18px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex: 1;
+          span {
             background: #5570F1;
-            display: flex;
-            align-items: center;
-            justify-content: center;
+            color: #fff;
+            line-height: 24px;
+            font-size: 12px;
+            width: 24px;
+            height: 24px;
+            text-align: center;
+            border-radius: 50%;
+            display: block;
             margin-right: 20px;
           }
-          .newFriendText {  
-            color: #333;
-            font-size: 18px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            flex: 1;
-            span {
-              background: #5570F1;
-              color: #fff;
-              line-height: 24px;
-              font-size: 12px;
-              width: 24px;
-              height: 24px;
-              text-align: center;
+        }
+      }
+      .newFriendIActive {
+        border-right: 4px solid #5570F1 !important;
+        background: #F5F7FD
+      }
+      .searchFriendBox {
+        position: absolute;
+        width: 280px;
+        border-radius: 8px;
+        top: 0;
+        right: -300px;
+        background: #fff;
+        box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+        border-radius: 8px;
+        z-index: 100;
+        box-sizing: border-box;
+        padding: 30px 0;
+        .searchFriendItem {
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          border-bottom: 1px solid #E9EDF7;
+          padding: 0 20px 30px 20px;
+          .searchFriendAvatar {
+            img {
+              width: 66px;
+              height: 66px;
               border-radius: 50%;
-              display: block;
-              margin-right: 20px;
             }
+            margin-right: 15px;
           }
-        }
-        .newFriendIActive {
-          border-right: 4px solid #5570F1 !important;
-          background: #F5F7FD
-        }
-        .searchFriendBox {
-          position: absolute;
-          width: 280px;
-          border-radius: 8px;
-          top: 0;
-          right: -300px;
-          background: #fff;
-          box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-          border-radius: 8px;
-          z-index: 100;
-          box-sizing: border-box;
-          padding: 30px 0;
-          .searchFriendItem {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-            border-bottom: 1px solid #E9EDF7;
-            padding: 0 20px 30px 20px;
-            .searchFriendAvatar {
-              img {
-                width: 66px;
-                height: 66px;
-                border-radius: 50%;
-              }
-              margin-right: 15px;
-            }
-            .searchFriendInfo {
-              flex: 1;
-              .searchFriendName {
-                display: flex;
-                align-items: center;
-                .gender {
-                  img {
-                    width: 12px;
-                    height: 12px;
-                  }
-                }
+          .searchFriendInfo {
+            flex: 1;
+            .searchFriendName {
+              display: flex;
+              align-items: center;
+              .gender {
                 img {
-                  width: 18px;
-                  height: 18px;
-                  cursor: pointer;
-                }
-                .searchFriendNameText {
-                  font-size: 18px;
-                  width: 120px;
-                  height: 28px;
-                  line-height: 28px;
-                  white-space: nowrap; 
-                  overflow: hidden; 
-                  text-overflow: ellipsis;
+                  width: 12px;
+                  height: 12px;
                 }
               }
-              .searchFriendPhone {
-                font-size: 14px;
-                color: #999;
-                margin-top: 10px;
+              img {
+                width: 18px;
+                height: 18px;
+                cursor: pointer;
               }
-            }
-          }
-          .searchFriendLineBox {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-            padding: 20px;
-            border-bottom: 1px solid #E9EDF7;
-            .searchFriendLineTitle{
-              font-size: 16px;
-              color: #999999;
-              width: 90px;
-            }
-            .searchFriendLineContent{
-              font-size: 16px;
-              color: #333;
-              flex: 1;
-              .searchFriendLineContentItem{
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
+              .searchFriendNameText {
+                font-size: 18px;
+                width: 120px;
+                height: 28px;
+                line-height: 28px;
+                white-space: nowrap; 
+                overflow: hidden; 
+                text-overflow: ellipsis;
               }
             }
-          }
-          .searchFriendButton {
-            padding:40px 0 10px 0;
-            text-align: center;
-            .searchFriendButtonItem {
+            .searchFriendPhone {
               font-size: 14px;
-              color: #5570F1;
-              img {
-                width: 30px;
-                height: 30px;
-                margin-bottom: 5px;
-              }
+              color: #999;
+              margin-top: 10px;
             }
           }
         }
-        .userListTitle {
-          padding: 15px 25px;
-          font-size: 18px;
-          color: #999;
-        }
-        .searchBox {
-          padding-left: 25px;
-          padding-right: 25px;
-          padding-bottom: 20px;
-        }
-        .userListBox {
-          padding: 15px 0;
-          overflow-y: auto;
-          height: 380px;
-          .active {
-            background: #F5F7FD;
-            box-sizing: border-box;
-            border-right: 4px solid #5570F1 !important;
+        .searchFriendLineBox {
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 20px;
+          border-bottom: 1px solid #E9EDF7;
+          .searchFriendLineTitle{
+            font-size: 16px;
+            color: #999999;
+            width: 90px;
           }
-          .userItem {
-            padding: 0 21px 0 25px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            height: 90px;
-            box-sizing: border-box;
-            border-right: 4px solid #fff;
-            cursor: pointer;
-            .userAvatar {
-              img {
-                width: 58px;
-                height: 58px;
-                border-radius: 50%;
-              }
+          .searchFriendLineContent{
+            font-size: 16px;
+            color: #333;
+            flex: 1;
+            .searchFriendLineContentItem{
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
             }
-            .userInfo {
-              flex: 1;
-              box-sizing: border-box;
-              padding-left: 15px;
-              .userName {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                .userNameText {
-                  font-size: 18px;
-                  font-weight: bold;
-                  width: 240px;
-                  white-space: nowrap;
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                  color: #333;
-                }
-                .userMessageNum {
-                  font-size: 12px;
-                  color: #333;
-                  width: 24px;
-                  height: 24px;
-                  line-height: 24px;
-                  text-align: center;
-                  border-radius: 50%;
-                  background: #FFCC91;
-                  font-weight: bold;
-                }
-              }
-              .userMessage {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                .userMessageText {
-                  display: block;
-                  width: 240px;
-                  white-space: nowrap;
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                  font-size: 14px;
-                  color: #999999;
-                }
-                .userMessageTime {
-                  font-size: 14px;
-                  color: #999999;
-                }
-              }
+          }
+        }
+        .searchFriendButton {
+          padding:40px 0 10px 0;
+          text-align: center;
+          .searchFriendButtonItem {
+            font-size: 14px;
+            color: #5570F1;
+            img {
+              width: 30px;
+              height: 30px;
+              margin-bottom: 5px;
             }
           }
         }
       }
-      //右侧
-      .hallRight {
-        flex: 1;
-        background: #fff;
-        border-radius: 20px;
-        position: relative;
-        height: 740px;
-        .rightNewFriendBox {
-          height: 126px;
-          border-bottom: 1px solid #E9EDF7;
+      .userListTitle {
+        padding: 15px 25px;
+        font-size: 18px;
+        color: #999;
+      }
+      .searchBox {
+        padding-left: 25px;
+        padding-right: 25px;
+        padding-bottom: 20px;
+      }
+      .userListBox {
+        padding: 15px 0;
+        overflow-y: auto;
+        height: 380px;
+        .active {
+          background: #F5F7FD;
+          box-sizing: border-box;
+          border-right: 4px solid #5570F1 !important;
+        }
+        .userItem {
+          padding: 0 21px 0 25px;
           display: flex;
           align-items: center;
           justify-content: space-between;
+          height: 90px;
           box-sizing: border-box;
-          padding: 30px 40px;
-          .rightNewFriendItem { 
-            display: flex;
-            align-items: center; 
-            .rightNewFriendAvatar {
-              margin-right: 15px;
-              img {
-                width: 66px;
-                height: 66px;
-                border-radius: 50%;
-              }
+          border-right: 4px solid #fff;
+          cursor: pointer;
+          .userAvatar {
+            img {
+              width: 58px;
+              height: 58px;
+              border-radius: 50%;
             }
-            .rightNewFriendInfo {
-              .rightNewFriendName {
-                font-size: 18px; 
-                margin-bottom: 7px;
-              }
-              .rightNewFriendPhone {
+          }
+          .userInfo {
+            flex: 1;
+            box-sizing: border-box;
+            padding-left: 15px;
+            .userName {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              .userNameText {
                 font-size: 18px;
-                color: #999;
+                font-weight: bold;
+                width: 240px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                color: #333;
               }
-            }
-          }
-          .rightNewFriendStatus {
-            .rightNewFriendStatus1 {
-              font-size: 16px;
-              color: #999;
-              width: 69px;
-              text-align: center;
-            }
-          }
-        }
-        .userInfoMainBox {
-          padding: 40px;
-          max-width: 900px;
-          margin: 100px auto 0 auto;
-          .userInfoMainItem {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-            border-bottom: 1px solid #E9EDF7;
-            padding: 0 20px 30px 20px;
-            .userInfoMainAvatar {
-              img {
-                width: 66px;
-                height: 66px;
+              .userMessageNum {
+                font-size: 12px;
+                color: #333;
+                width: 24px;
+                height: 24px;
+                line-height: 24px;
+                text-align: center;
                 border-radius: 50%;
+                background: #FFCC91;
+                font-weight: bold;
               }
-              margin-right: 15px;
             }
-            .userInfoMainInfo {
-              flex: 1;
-              .userInfoMainName {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                img {
-                  width: 18px;
-                  height: 18px;
-                  cursor: pointer;
-                }
-                .userInfoMainNameText {
-                  font-size: 18px;
-                  width: 240px;
-                  height: 28px;
-                  line-height: 28px;
-                  white-space: nowrap; 
-                  overflow: hidden; 
-                  text-overflow: ellipsis;
-                }
+            .userMessage {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              .userMessageText {
+                display: block;
+                width: 240px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                font-size: 14px;
+                color: #999999;
               }
-              .userInfoMainPhone {
+              .userMessageTime {
                 font-size: 14px;
-                color: #999;
-                margin-top: 10px;
+                color: #999999;
               }
             }
           }
-          .userInfoMainLineBox {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-            padding: 20px;
-            border-bottom: 1px solid #E9EDF7;
-            .userInfoMainLineTitle{
-              font-size: 16px;
-              color: #999999;
-              width: 90px;
+        }
+      }
+    }
+    //右侧
+    .hallRight {
+      flex: 1;
+      background: #fff;
+      border-radius: 20px;
+      position: relative;
+      height: 740px;
+      .rightNewFriendBox {
+        height: 126px;
+        border-bottom: 1px solid #E9EDF7;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        padding: 30px 40px;
+        .rightNewFriendItem { 
+          display: flex;
+          align-items: center; 
+          .rightNewFriendAvatar {
+            margin-right: 15px;
+            img {
+              width: 66px;
+              height: 66px;
+              border-radius: 50%;
             }
-            .userInfoMainLineContent{
-              font-size: 16px;
-              color: #333;
-              flex: 1;
-              .userInfoMainLineContentItem{
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                cursor: pointer;
-              }
+          }
+          .rightNewFriendInfo {
+            .rightNewFriendName {
+              font-size: 18px; 
+              margin-bottom: 7px;
+            }
+            .rightNewFriendPhone {
+              font-size: 18px;
+              color: #999;
             }
           }
-          .userInfoMainButton {
-            padding:40px 0 10px 0;
+        }
+        .rightNewFriendStatus {
+          .rightNewFriendStatus1 {
+            font-size: 16px;
+            color: #999;
+            width: 69px;
             text-align: center;
-            .userInfoMainButtonItem {
-              font-size: 14px;
-              color: #5570F1;
+          }
+        }
+      }
+      .userInfoMainBox {
+        padding: 40px;
+        max-width: 900px;
+        margin: 100px auto 0 auto;
+        .userInfoMainItem {
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          border-bottom: 1px solid #E9EDF7;
+          padding: 0 20px 30px 20px;
+          .userInfoMainAvatar {
+            img {
+              width: 66px;
+              height: 66px;
+              border-radius: 50%;
+            }
+            margin-right: 15px;
+          }
+          .userInfoMainInfo {
+            flex: 1;
+            .userInfoMainName {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
               img {
-                width: 30px;
-                height: 30px;
-                margin-bottom: 5px;
+                width: 18px;
+                height: 18px;
+                cursor: pointer;
+              }
+              .userInfoMainNameText {
+                font-size: 18px;
+                width: 240px;
+                height: 28px;
+                line-height: 28px;
+                white-space: nowrap; 
+                overflow: hidden; 
+                text-overflow: ellipsis;
               }
             }
+            .userInfoMainPhone {
+              font-size: 14px;
+              color: #999;
+              margin-top: 10px;
+            }
           }
         }
-        .ifHallRigthNoMessage {
-          color: #CCCCCC;
-          font-size: 32px;
-          font-weight: bold;
-          text-align: center;
-          height: 740px;
-          line-height: 740px;
-        }
-        .userName {
-          font-size: 20px;
-          color: #333;
-          font-weight: bold;
-        }
-        .ifNotice {
-          padding-bottom: 60px !important;  
-        }
-        .UserNameBox {
+        .userInfoMainLineBox {
           display: flex;
           align-items: center;
-          justify-content: space-between;
-          padding: 40px 30px 30px 30px;
-          border-bottom: 1px solid #E7E7E7;
-          position: relative;
-          .moreIcon {
-            cursor: pointer;
-          }
-          .groupNotice {
-            position: absolute;
-            height: 40px;
-            line-height: 40px;
+          justify-content: flex-start;
+          padding: 20px;
+          border-bottom: 1px solid #E9EDF7;
+          .userInfoMainLineTitle{
             font-size: 16px;
-            background:url('../../assets/chat/notice.png') no-repeat 10px center #F6F8FE;
-            left: 30px;
-            box-sizing: border-box;
-            padding-left: 40px;
-            bottom: 10px;
             color: #999999;
-            border-radius: 10px;
-            padding-right: 10px;
-            width: 400px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
+            width: 90px;
+          }
+          .userInfoMainLineContent{
+            font-size: 16px;
+            color: #333;
+            flex: 1;
+            .userInfoMainLineContentItem{
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              cursor: pointer;
+            }
+          }
+        }
+        .userInfoMainButton {
+          padding:40px 0 10px 0;
+          text-align: center;
+          .userInfoMainButtonItem {
+            font-size: 14px;
+            color: #5570F1;
+            img {
+              width: 30px;
+              height: 30px;
+              margin-bottom: 5px;
+            }
           }
         }
       }
-    }
-    //弹出框底部按钮
-    .footerButtonBox {
-      padding-top: 40px;
-      text-align: center;
-    }
-    .friendWindowText {
-      font-size: 16px;
-      color: #333;
-      span {
-        color: #5570F1;
+      .ifHallRigthNoMessage {
+        color: #CCCCCC;
+        font-size: 32px;
         font-weight: bold;
+        text-align: center;
+        height: 740px;
+        line-height: 740px;
+      }
+      .userName {
+        font-size: 20px;
+        color: #333;
+        font-weight: bold;
+      }
+      .ifNotice {
+        padding-bottom: 60px !important;  
+      }
+      .UserNameBox {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 40px 30px 30px 30px;
+        border-bottom: 1px solid #E7E7E7;
+        position: relative;
+        .moreIcon {
+          cursor: pointer;
+        }
+        .groupNotice {
+          position: absolute;
+          height: 40px;
+          line-height: 40px;
+          font-size: 16px;
+          background:url('../../assets/chat/notice.png') no-repeat 10px center #F6F8FE;
+          left: 30px;
+          box-sizing: border-box;
+          padding-left: 40px;
+          bottom: 10px;
+          color: #999999;
+          border-radius: 10px;
+          padding-right: 10px;
+          width: 400px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
       }
     }
-    //表单微调 start------------------------------------------------------------>*/
-    ::v-deep .custom-form-item > .el-form-item__label {
-      line-height: 140px !important;
-    }
-    ::v-deep .custom-textarea .el-textarea__inner {
-      resize: none; /* 禁止用拖拽调整大小 */
-    }
-    ::v-deep .custom-align-right .el-form-item__label {
-      text-align: right; /* 设置标签文字右对齐 */
-    }
-    ::v-deep .el-select-group__title {
-      color: #909399;
-    }
-    ::v-deep .el-select {
-      width: 100% !important;
-    }
-    ::v-deep .el-tabs__active-bar{
-      height: 1px !important;
-    }
-    ::v-deep .el-tabs__nav-wrap::after {
-      height:1px !important;
-    }
-    ::v-deep .el-tabs__header {
-      margin-bottom: 0 !important;
+  }
+  //弹出框底部按钮
+  .footerButtonBox {
+    padding-top: 40px;
+    text-align: center;
+  }
+  .friendWindowText {
+    font-size: 16px;
+    color: #333;
+    span {
+      color: #5570F1;
+      font-weight: bold;
     }
-  </style>
-  
+  }
+  //表单微调 start------------------------------------------------------------>*/
+  ::v-deep .custom-form-item > .el-form-item__label {
+    line-height: 140px !important;
+  }
+  ::v-deep .custom-textarea .el-textarea__inner {
+    resize: none; /* 禁止用拖拽调整大小 */
+  }
+  ::v-deep .custom-align-right .el-form-item__label {
+    text-align: right; /* 设置标签文字右对齐 */
+  }
+  ::v-deep .el-select-group__title {
+    color: #909399;
+  }
+  ::v-deep .el-select {
+    width: 100% !important;
+  }
+  ::v-deep .el-tabs__active-bar{
+    height: 1px !important;
+  }
+  ::v-deep .el-tabs__nav-wrap::after {
+    height:1px !important;
+  }
+  ::v-deep .el-tabs__header {
+    margin-bottom: 0 !important;
+  }
+</style>

src/views/chat/creatTopic.vue

@@ -28,9 +28,9 @@
               <el-form-item label="群聊名称：" prop="group_name" class="custom-align-right" v-if="form.is_group=='1'">
                 <el-input v-model="form.group_name" autocomplete="off" placeholder="请输入群聊名称" :disabled="groupStatus" maxlength="20"></el-input>
               </el-form-item>
-              <el-form-item label="作者：" class="custom-align-right">
+              <!-- <el-form-item label="作者：" class="custom-align-right">
                 <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者名"></el-input>
-              </el-form-item>
+              </el-form-item> -->
             </div>
           </div>
         </div>
@@ -51,6 +51,7 @@ import tableTitle from './components/tableTitle';
 import '@/styles/global.less';
 //引入富文本编辑器
 import myEditor from '../../components/edit/myEditor.vue';
+import { getUseType, removeLoginStatus } from '@/utils/auth'
 
 export default {
   components: {
@@ -82,6 +83,7 @@ export default {
       groupStatus:false,//是否可以编辑群信息
       tableDivTitle:"编辑课题",
       disclaimer:true,//免责声明
+      userType:"",//用户类型
       //提交表单
       form: {
         type:"",//课题分类
@@ -145,11 +147,17 @@ export default {
         if (valid) {
           //console.log(this.form)
           this.$store.dispatch('chat/addTopic',this.form).then(res=> {
-            //汇报结果
-            this.$message({
-              type: 'success',
-              message: '已成功创建商圈！'
-            });
+            if(this.userType==10000){
+              this.$message({
+                type: 'success',
+                message: '已成功创建商圈！'
+              });
+            }else{
+              this.$message({
+                type: 'success',
+                message: '待管理员审核'
+              });
+            }
             this.cleatForm();
             //返回列表页
             this.returnPage()
@@ -283,6 +291,8 @@ export default {
 
   },
   mounted(){
+    //获取用户类型
+    this.userType = getUseType();
     //查询课题分类
     this.getTopicType();
 

src/views/chat/topic.vue

@@ -7,7 +7,7 @@
           <el-col :span="8">
             <div class="searchBox">
               <div class="searchTitle">课题标题：</div>
-              <el-input placeholder="请输入课题标题" autocomplete="off" v-model="getApiData.title"/>
+              <el-input placeholder="请输入课题标题" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
           <el-col :span="8">
@@ -23,7 +23,7 @@
           <el-col :span="8">
             <div class="searchBox">
               <div class="searchTitle">作者：</div>
-              <el-input placeholder="请输入作者姓名" autocomplete="off" v-model="getApiData.nickname"/>
+              <el-input placeholder="请输入作者姓名" autocomplete="off" v-model="getApiData.nickname" />
             </div>
           </el-col>
         </el-row>
@@ -57,7 +57,7 @@
 
     <!--表格内容 start------------------------------------------------------------>
     <div class="layerBox">
-      <tableTitle :name="tableDivTitle"/>
+      <tableTitle :name="tableDivTitle" />
       <el-row>
         <template>
           <el-table :data="tableData" style="width: 100%">
@@ -70,14 +70,19 @@
                 <div v-if="scope.row.type==3">讨论</div>
               </template> -->
             </el-table-column>
-            <el-table-column prop="author" label="作者" width=""></el-table-column>
+            <el-table-column prop="is_group" label="是否创建群聊" width="">
+              <template slot-scope="scope">
+                <div v-if="scope.row.is_group == 1">是</div>
+                <div v-if="scope.row.is_group == 0">否</div>
+              </template>
+            </el-table-column>
             <el-table-column prop="created_at" label="创建时间" width=""></el-table-column>
             <el-table-column prop="updated_at" label="修改时间" width=""></el-table-column>
             <el-table-column prop="status" label="状态" width="">
               <template slot-scope="scope">
-                <div v-if="scope.row.status==1" class="status1">待审核</div>
-                <div v-if="scope.row.status==2" class="status2">已通过</div>
-                <div v-if="scope.row.status==3" class="status3">已拒绝</div>
+                <div v-if="scope.row.status == 1" class="status1">待审核</div>
+                <div v-if="scope.row.status == 2" class="status2">已通过</div>
+                <div v-if="scope.row.status == 3" class="status3">已拒绝</div>
               </template>
             </el-table-column>
             <el-table-column fixed="right" label="操作" width="280" header-align="center">
@@ -85,7 +90,9 @@
                 <div class="listBtnBox">
                   <div class="listDeleteBtn" @click="deleteRow(scope.row.id)"><i class="el-icon-delete"></i>删除</div>
                   <div class="listEditBtn" @click="goEdit(scope.row.id)"><i class="el-icon-edit-outline"></i>编辑</div>
-                  <div class="listMainBtn" @click="openEditWindow(scope.row.id)" v-if="$store.state.user.role_id==1||$store.state.user.role_id==21||$store.state.user.role_id==23"><i class="el-icon-edit-outline"></i>审核</div>
+                  <div class="listMainBtn" @click="openEditWindow(scope.row.id)"
+                    v-if="$store.state.user.role_id == 1 || $store.state.user.role_id == 21 || $store.state.user.role_id == 23"><i
+                      class="el-icon-edit-outline"></i>审核</div>
                 </div>
               </template>
             </el-table-column>
@@ -97,7 +104,9 @@
     <div class="alignBox">
       <el-row>
         <el-col :span="24">
-          <el-pagination @size-change="handleSizeChange" :current-page="getApiData.page" @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper" :total="allCount"></el-pagination>
+          <el-pagination @size-change="handleSizeChange" :current-page="getApiData.page"
+            @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper"
+            :total="allCount"></el-pagination>
         </el-col>
       </el-row>
     </div>
@@ -136,23 +145,23 @@ export default {
   data() {
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"课题列表",
-      tableData:[],//内容
-      editId:0,//要修改的网站id
-      topicType:[],//课题分类
-      topicStatus:[],//课题状态
-      getApiData:{
-        title:"",//标题
-        type:"",//课题分类
-        nickname:"",//作者
-        status:"",//审核状态
-        page:1,//当前是第几页
-        page_size:10,//一共多少条
+      tableDivTitle: "课题列表",
+      tableData: [],//内容
+      editId: 0,//要修改的网站id
+      topicType: [],//课题分类
+      topicStatus: [],//课题状态
+      getApiData: {
+        title: "",//标题
+        type: "",//课题分类
+        nickname: "",//作者
+        status: "",//审核状态
+        page: 1,//当前是第几页
+        page_size: 10,//一共多少条
       },
-      allCount:0,//总条数
-      auditStatus:false,//审核状态弹出框
-      form:{
-        radio:2 //1=通过 2=拒绝
+      allCount: 0,//总条数
+      auditStatus: false,//审核状态弹出框
+      form: {
+        radio: 2 //1=通过 2=拒绝
       }
       //分页相关 end ------------------------------------------------------------>
     }
@@ -160,17 +169,17 @@ export default {
   methods: {
     //1.列表和分页相关 start ------------------------------------------------------------>
     //1.1 开始请求商圈列表
-    getData(type){
-      if(type=="search"){
+    getData(type) {
+      if (type == "search") {
         this.getApiData.page = 1;
       }
-      this.$store.dispatch('chat/getTopicsList',this.getApiData).then(res=> {
+      this.$store.dispatch('chat/getTopicsList', this.getApiData).then(res => {
         this.tableData = res.data.data; //给与内容
         this.allCount = res.data.total; //给与总条数
         //把数字转换为汉字
-        for(let item of res.data.data){
-          for(let item2 of this.topicType){
-            if(item.type == item2.value){
+        for (let item of res.data.data) {
+          for (let item2 of this.topicType) {
+            if (item.type == item2.value) {
               item.type = item2.label;
             }
           }
@@ -183,7 +192,7 @@ export default {
       })
     },
     //1.2 删除商圈
-    deleteRow(id){
+    deleteRow(id) {
       this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -191,9 +200,9 @@ export default {
       }).then(() => {
         console.log("当前删除：" + id)
         let data = {
-          id:id+""
+          id: id + ""
         }
-        this.$store.dispatch('chat/delTopic',data).then(res=> {
+        this.$store.dispatch('chat/delTopic', data).then(res => {
           this.getData();
           this.$message({
             type: 'success',
@@ -224,7 +233,7 @@ export default {
       this.getData();
     },
     //1.6 重置按钮
-    clearSearchList(){
+    clearSearchList() {
       this.tableData = [];
       this.getApiData.title = "";
       this.getApiData.type = "";
@@ -235,8 +244,8 @@ export default {
       this.getData();
     },
     //1.7 查询商圈分类
-    getTopicType(){
-      this.$store.dispatch('chat/topicType',this.getApiData).then(res=> {
+    getTopicType() {
+      this.$store.dispatch('chat/topicType', this.getApiData).then(res => {
         this.topicType = res.data;
         console.log(this.topicType)
       }).catch(() => {
@@ -244,8 +253,8 @@ export default {
       })
     },
     //1.8 查询商圈状态
-    getTopicStatus(){
-      this.$store.dispatch('chat/topicStatus',this.getApiData).then(res=> {
+    getTopicStatus() {
+      this.$store.dispatch('chat/topicStatus', this.getApiData).then(res => {
         this.topicStatus = res.data;
         console.log(res)
       }).catch(() => {
@@ -256,14 +265,14 @@ export default {
 
     //2.添加商圈 start ------------------------------------------------------------>
     //跳转到资讯发布页面
-    goCreat(){
+    goCreat() {
       this.$router.push({
         path: '/creatTopic',
       });
     },
-    goEdit(id){
+    goEdit(id) {
       let data = {
-        id:id
+        id: id
       }
       this.$router.push({
         path: '/creatTopic',
@@ -273,16 +282,16 @@ export default {
     //添加商圈 end ------------------------------------------------------------>
 
     //3.审核 start ------------------------------------------------------------>
-    openEditWindow(id){
+    openEditWindow(id) {
       this.editId = id;
       this.auditStatus = true;
     },
-    editStatus(){
+    editStatus() {
       let data = {
-        id:this.editId + "",
-        status:this.form.radio + ""
+        id: this.editId + "",
+        status: this.form.radio + ""
       }
-      this.$store.dispatch('chat/applyTopic',data).then(res=> {
+      this.$store.dispatch('chat/applyTopic', data).then(res => {
         console.log(res)
         this.getData();
         this.auditStatus = false;
@@ -290,7 +299,7 @@ export default {
     },
     //3.审核 end ------------------------------------------------------------>
   },
-  mounted(){
+  mounted() {
     //1.获得初始数据
     this.getData();
     //2.查询课题分类
@@ -302,19 +311,23 @@ export default {
 </script>
 
 <style scoped lang="less">
-  .contentBox {
-    padding: 0 0 20px 0;
-  }
-  .footerButtonBox {
-    text-align: right;
-  }
-  .status1 {
-    color: #F19655;
-  }
-  .status2 {
-    color: #519C66;
-  }
-  .status3 {
-    color: #CC5F5F;
-  }
+.contentBox {
+  padding: 0 0 20px 0;
+}
+
+.footerButtonBox {
+  text-align: right;
+}
+
+.status1 {
+  color: #F19655;
+}
+
+.status2 {
+  color: #519C66;
+}
+
+.status3 {
+  color: #CC5F5F;
+}
 </style>

src/views/dashboard/admin/index.vue

@@ -1,4 +1,5 @@
 <template>
+
     <div class="dashboard-editor-container">
         <!--超级管理员10000√ 个人会员1× 政务会员2× 企业会员3× 调研员4×-->
         <div v-if="userType == 10000">
@@ -52,6 +53,16 @@
                                     <span @click="goToList(7)">{{ complaintCount }}</span>
                                 </div>
                             </div>
+                            <div class="topDataLi5">
+                                <div class="topDataMain">
+                                    <span @click="goToList(9)">待审核企业</span>
+                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                </div>
+                                <div class="topDataMain">
+                                    <span @click="goToList(10)">待审核项目</span>
+                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </el-col>
@@ -138,6 +149,52 @@
                         <div class="twbNumber">{{ allJobHuntingCount }}</div>
                     </div>
                 </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg9">
+                                <img src="@/assets/index/topIcon9.png" />
+                            </div>
+                            通知发布总数量
+                        </div>
+                        <div class="twbNumber">{{ allNoticeCount }}</div>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox ">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg10">
+                                <img src="@/assets/index/topIcon10.png" />
+                            </div>
+                            投诉发布总数量
+                        </div>
+                        <div class="twbNumber">{{ allComplaintCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg11">
+                                <img src="@/assets/index/topIcon11.png" />
+                            </div>
+                            企业发布总数量
+                        </div>
+                        <div class="twbNumber">{{ allComplanyCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg12">
+                                <img src="@/assets/index/topIcon12.png" />
+                            </div>
+                            项目发布总数量
+                        </div>
+                        <div class="twbNumber">{{ allProjectCount }}</div>
+                    </div>
+                </el-col>
             </el-row>
             <el-row :gutter="32">
                 <el-col :xs="24" :sm="24" :lg="16">
@@ -197,23 +254,23 @@
                                 </div>
                             </div>
                             <div class="topDataLi3">
-                                <div class="topDataMainCenter">
+                                <!-- <div class="topDataMainCenter">
                                     <span @click="goToList(4)">待审核招聘</span>
                                     <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
-                                </div>
+                                </div> -->
                                 <div class="topDataMainCenter">
                                     <span @click="goToList(5)">待审核求职</span>
                                     <span @click="goToList(5)">{{ jobHuntingCount }}</span>
                                 </div>
                             </div>
-                            <div class="topDataLi4">
-                                <!-- <div class="topDataMain">
-                                    <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{noticeCount}}</span>
-                                </div> -->
+                            <div class="topDataLi5">
                                 <div class="topDataMain">
-                                    <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{ complaintCount }}</span>
+                                    <span @click="goToList(9)">待审核企业</span>
+                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                </div>
+                                <div class="topDataMain">
+                                    <span @click="goToList(10)">待审核项目</span>
+                                    <span @click="goToList(10)">{{ projectCount }}</span>
                                 </div>
                             </div>
                         </div>
@@ -221,8 +278,6 @@
                 </el-col>
             </el-row>
 
-
-
             <el-row :gutter="32">
                 <el-col :xs="24" :sm="24" :lg="6">
                     <div class="topWindowBox">
@@ -269,6 +324,30 @@
                     </div>
                 </el-col>
             </el-row>
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg11">
+                                <img src="@/assets/index/topIcon11.png" />
+                            </div>
+                            企业发布数量
+                        </div>
+                        <div class="twbNumber">{{ allComplanyCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg12">
+                                <img src="@/assets/index/topIcon12.png" />
+                            </div>
+                            项目发布数量
+                        </div>
+                        <div class="twbNumber">{{ allProjectCount }}</div>
+                    </div>
+                </el-col>
+            </el-row>
 
             <!--lj 系统消息开始 -->
             <el-row :gutter="32">
@@ -305,7 +384,6 @@
                                     </div>
                                     <div class="sys_msg_time">{{ item.formatted_updated_at }}</div>
                                 </div>
-
                             </div>
                         </div>
                     </div>
@@ -314,7 +392,7 @@
             <div style="height: 20px;" class="noticeTabs">
             </div>
 
-            <el-row :gutter="32">
+            <!-- <el-row :gutter="32">
                 <el-col :xs="24" :sm="24" :lg="12">
                     <div class="chartBox">
 
@@ -332,12 +410,15 @@
                         </div>
                     </div>
                 </el-col>
-            </el-row>
-            
+            </el-row> -->
+
+
             <div style="height: 20px;" class="noticeTabs">
             </div>
+
             <!-- 系统消息结束 -->
-             
+
+
         </div>
 
         <!--超级管理员10000× 个人会员1× 政务会员2 √ 企业会员3× 调研员4×-->
@@ -378,6 +459,17 @@
                                     <span @click="goToList(7)">{{ complaintCount }}</span>
                                 </div>
                             </div>
+                            <div class="topDataLi5">
+                                <div class="topDataMain">
+                                    <span @click="goToList(9)">待审核企业</span>
+                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                </div>
+                                <div class="topDataMain">
+                                    <span @click="goToList(10)">待审核项目</span>
+                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                                </div>
+                            </div>
+
                         </div>
                     </div>
                 </el-col>
@@ -420,12 +512,59 @@
                 <el-col :xs="24" :sm="24" :lg="6">
                     <div class="topWindowBox">
                         <div class="twbTitle">
-                            <div class="twbIconbg bg7">
-                                <img src="@/assets/index/topIcon7.png" />
+                            <div class="twbIconbg bg9">
+                                <img src="@/assets/index/topIcon9.png" />
                             </div>
-                            求职发布数量
+                            通知发布数量
+                        </div>
+                        <div class="twbNumber">{{ allNoticeCount }}</div>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg10">
+                                <img src="@/assets/index/topIcon10.png" />
+                            </div>
+                            投诉发布数量
+                        </div>
+                        <div class="twbNumber">{{ allComplaintCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg11">
+                                <img src="@/assets/index/topIcon11.png" />
+                            </div>
+                            企业发布数量
+                        </div>
+                        <div class="twbNumber">{{ allComplanyCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg12">
+                                <img src="@/assets/index/topIcon12.png" />
+                            </div>
+                            项目发布数量
+                        </div>
+                        <div class="twbNumber">{{ allProjectCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg8">
+                                <img src="@/assets/index/topIcon8.png" />
+                            </div>
+                            待处理
                         </div>
                         <div class="twbNumber">{{ allJobHuntingCount }}</div>
+                        投诉
                     </div>
                 </el-col>
             </el-row>
@@ -557,14 +696,14 @@
                                     <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
                                 </div>
                             </div>
-                            <div class="topDataLi4">
-                                <!-- <div class="topDataMain">
-                                    <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{noticeCount}}</span>
-                                </div> -->
+                            <div class="topDataLi5">
                                 <div class="topDataMain">
-                                    <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{ complaintCount }}</span>
+                                    <span @click="goToList(9)">待审核企业</span>
+                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                </div>
+                                <div class="topDataMain">
+                                    <span @click="goToList(10)">待审核项目</span>
+                                    <span @click="goToList(10)">{{ projectCount }}</span>
                                 </div>
                             </div>
                         </div>
@@ -572,6 +711,88 @@
                 </el-col>
             </el-row>
 
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg3">
+                                <img src="@/assets/index/topIcon3.png" />
+                            </div>
+                            资讯发布数量
+                        </div>
+                        <div class="twbNumber">{{ allArticleCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg4">
+                                <img src="@/assets/index/topIcon4.png" />
+                            </div>
+                            商品发布数量
+                        </div>
+                        <div class="twbNumber">{{ allGoodsCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg5">
+                                <img src="@/assets/index/topIcon5.png" />
+                            </div>
+                            书刊音像发布数量
+                        </div>
+                        <div class="twbNumber">{{ allBookCount }}</div>
+                    </div>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg7">
+                                <img src="@/assets/index/topIcon7.png" />
+                            </div>
+                            求职发布数量
+                        </div>
+                        <div class="twbNumber">{{ allJobHuntingCount }}</div>
+                    </div>
+                </el-col> -->
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg6">
+                                <img src="@/assets/index/topIcon6.png" />
+                            </div>
+                            招聘发布数量
+                        </div>
+                        <div class="twbNumber">{{ allJobRecruitingCount }}</div>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg11">
+                                <img src="@/assets/index/topIcon11.png" />
+                            </div>
+                            企业发布数量
+                        </div>
+                        <div class="twbNumber">{{ allComplanyCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg12">
+                                <img src="@/assets/index/topIcon12.png" />
+                            </div>
+                            项目发布数量
+                        </div>
+                        <div class="twbNumber">{{ allProjectCount }}</div>
+                    </div>
+                </el-col>
+            </el-row>
+
 
 
             <!--lj 系统消息开始 -->
@@ -618,7 +839,7 @@
             <div style="height: 20px;" class="noticeTabs">
             </div>
 
-            <el-row :gutter="32">
+            <!-- <el-row :gutter="32">
                 <el-col :xs="24" :sm="24" :lg="12">
                     <div class="chartBox">
 
@@ -636,7 +857,7 @@
                         </div>
                     </div>
                 </el-col>
-            </el-row>
+            </el-row> -->
 
 
             <div style="height: 20px;" class="noticeTabs">
@@ -674,14 +895,14 @@
                                     <span @click="goToList(3)">{{ bookCount }}</span>
                                 </div>
                             </div>
-                            <div class="topDataLi4">
-                                <!-- <div class="topDataMain">
-                                    <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{noticeCount}}</span>
-                                </div> -->
+                            <div class="topDataLi5">
                                 <div class="topDataMain">
-                                    <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{ complaintCount }}</span>
+                                    <span @click="goToList(9)">待审核企业</span>
+                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                </div>
+                                <div class="topDataMain">
+                                    <span @click="goToList(10)">待审核项目</span>
+                                    <span @click="goToList(10)">{{ projectCount }}</span>
                                 </div>
                             </div>
                         </div>
@@ -689,7 +910,7 @@
                 </el-col>
             </el-row>
             <el-row :gutter="32">
-                <el-col :xs="24" :sm="24" :lg="8">
+                <el-col :xs="24" :sm="24" :lg="6">
                     <div class="topWindowBox">
                         <div class="twbTitle">
                             <div class="twbIconbg bg3">
@@ -700,7 +921,7 @@
                         <div class="twbNumber">{{ allArticleCount }}</div>
                     </div>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="8">
+                <el-col :xs="24" :sm="24" :lg="6">
                     <div class="topWindowBox">
                         <div class="twbTitle">
                             <div class="twbIconbg bg4">
@@ -711,7 +932,7 @@
                         <div class="twbNumber">{{ allGoodsCount }}</div>
                     </div>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="8">
+                <el-col :xs="24" :sm="24" :lg="6">
                     <div class="topWindowBox">
                         <div class="twbTitle">
                             <div class="twbIconbg bg5">
@@ -722,6 +943,28 @@
                         <div class="twbNumber">{{ allBookCount }}</div>
                     </div>
                 </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg11">
+                                <img src="@/assets/index/topIcon11.png" />
+                            </div>
+                            企业发布数量
+                        </div>
+                        <div class="twbNumber">{{ allComplanyCount }}</div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="6">
+                    <div class="topWindowBox">
+                        <div class="twbTitle">
+                            <div class="twbIconbg bg12">
+                                <img src="@/assets/index/topIcon12.png" />
+                            </div>
+                            项目发布数量
+                        </div>
+                        <div class="twbNumber">{{ allProjectCount }}</div>
+                    </div>
+                </el-col>
             </el-row>
         </div>
     </div>
@@ -766,6 +1009,8 @@ export default {
             jobHuntingCount: 0, //待审核求职
             noticeCount: 0, //待审核行政通知
             complaintCount: 0, //待审核行政投诉
+            complanyCount: 0, //待审核企业
+            projectCount: 0, //待审核项目
             //所有数据
             allWebsiteCount: 0,
             allArticleCount: 0,
@@ -776,6 +1021,8 @@ export default {
             allJobHuntingCount: 0,
             allNoticeCount: 0,
             allComplaintCount: 0,
+            allComplanyCount: 0, //待审核企业
+            allProjectCount: 0, //待审核项目
             sys_msg: {},//系统消息
             chat_msg: {},
             notice_msg: {},
@@ -788,7 +1035,9 @@ export default {
                 { label: '商品', value: '2' },
                 { label: '书刊音像', value: '3' },
                 { label: '招聘', value: '4' },
-                { label: '求职', value: '5' }
+                { label: '求职', value: '5' },
+                { label: '企业', value: '6' },
+                { label: '项目', value: '7' },
             ],
             lineChartData: [],//折线图目前展示哪个数据
             lineChartData1: [],//折线图数据 - 资讯
@@ -796,6 +1045,8 @@ export default {
             lineChartData3: [],//折线图数据 - 书刊音像
             lineChartData4: [],//折线图数据 - 招聘
             lineChartData5: [],//折线图数据 - 求职
+            lineChartData6: [],//折线图数据 - 企业
+            lineChartData7: [],//折线图数据 - 项目
             //圆环图
             ringChartData: [],//圆环图数据
             //用户身份
@@ -827,6 +1078,8 @@ export default {
         getData() {
             //获取首页数据
             this.$store.dispatch('public/getAdminIndex').then(res => {
+                console.log('res.data123123', res.data);
+
                 if (res.code == 200) {
                     //系统消息
                     this.sys_msg = res.data.sys_msg;
@@ -844,6 +1097,8 @@ export default {
                     this.jobHuntingCount = res.data.apply.jobHunting;
                     this.noticeCount = res.data.apply.notice;
                     this.complaintCount = res.data.apply.complaint;
+                    this.complanyCount = res.data.apply.company;
+                    this.projectCount = res.data.apply.project;
                     //所有数据
                     this.allWebsiteCount = res.data.website.count;
                     this.allCategoryCount = res.data.category.count;
@@ -854,6 +1109,8 @@ export default {
                     this.allJobHuntingCount = res.data.jobHunting.count;
                     this.allNoticeCount = res.data.notice.count;
                     this.allComplaintCount = res.data.complaint.count;
+                    this.allComplanyCount = res.data.company.count; //待审核企业
+                    this.allProjectCount = res.data.project.count; //待审核项目
                     //折线图
                     this.lineChartData = res.data.monthArticle;//当前展示的那个
                     this.lineChartData1 = res.data.monthArticle;//折线图数据 - 资讯
@@ -861,6 +1118,8 @@ export default {
                     this.lineChartData3 = res.data.monthBook;//圆环图数据 - 书刊音像
                     this.lineChartData4 = res.data.monthJobRecruiting;//圆环图数据 - 招聘
                     this.lineChartData5 = res.data.monthJobHunting;//圆环图数据 - 求职
+                    this.lineChartData6 = res.data.monthCompany;//圆环图数据 - 企业
+                    this.lineChartData7 = res.data.monthProject;//圆环图数据 - 项目
                     //圆环图
                     this.ringChartData = res.data.userType;
                 }
@@ -875,6 +1134,8 @@ export default {
             if (typenumber == 6) { this.$router.push({ path: '/noticeListApply' }) }
             if (typenumber == 7) { this.$router.push({ path: '/ncomplaintListApply' }) }
             if (typenumber == 8) { this.$router.push({ path: '/adList' }) }
+            if (typenumber == 9) { this.$router.push({ path: '/checkcompanyList' }) }
+            if (typenumber == 10) { this.$router.push({ path: '/checkprojectList' }) }
         },
         goToDetail(id, type) {
             //跳转到详情页
@@ -913,6 +1174,13 @@ export default {
                 case '群聊':
                     this.$router.push({ path: '/hall', query: { id: id } });
                     break;
+                case '公司':
+                    this.$router.push(`/creatCompany?id=${id}&to=checkCompany`);
+                    break;
+                case '项目':
+                    this.$router.push(`/creatProject?id=${id}&to=checkProject`);
+                    break;
+
             }
         },
         //切换折线图数据
@@ -933,11 +1201,18 @@ export default {
             if (type == 5) {
                 this.lineChartData = this.lineChartData5;
             }
+            if (type == 6) {
+                this.lineChartData = this.lineChartData6;
+            }
+            if (type == 7) {
+                this.lineChartData = this.lineChartData7;
+            }
         }
     },
     mounted() {
         //先获取用户身份
         this.getUserInfo()
+        this.changeLineChartData(1);
     }
 }
 </script>
@@ -992,7 +1267,7 @@ export default {
     align-items: center;
 
     .topDataLi1 {
-        width: 268px;
+        width: 248px;
         border-right: 1px solid #fff;
         height: 70px;
 
@@ -1007,7 +1282,7 @@ export default {
 
     .topDataLi2,
     .topDataLi3 {
-        width: 359px;
+        width: 318px;
         border-right: 1px solid #fff;
         height: 70px;
 
@@ -1017,11 +1292,25 @@ export default {
     }
 
     .topDataLi4 {
-        width: 268px;
+        width: 318px;
+        border-right: 1px solid #fff;
+        height: 70px;
+
+        .topDataMain {
+            margin: 0 auto;
+        }
+
+        .topDataMain:nth-child(1) {
+            margin-bottom: 20px;
+        }
+    }
+
+    .topDataLi5 {
+        width: 248px;
         height: 70px;
 
         .topDataMain {
-            margin-left: 90px;
+            margin-left: 70px;
         }
 
         .topDataMain:nth-child(1) {
@@ -1111,7 +1400,23 @@ export default {
         }
 
         .bg8 {
-            background: #FFFAF4;
+            background: #fffaf4;
+        }
+
+        .bg9 {
+            background: #e9f3fc;
+        }
+
+        .bg10 {
+            background: #ffe5e5;
+        }
+
+        .bg11 {
+            background: #f8f4fe;
+        }
+
+        .bg12 {
+            background: #f1f7fd;
         }
 
     }
@@ -1262,110 +1567,105 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 15px 30px;
-    border-bottom: 1px solid #E9F3FC;
+    padding: 15px 15px;
+    border-bottom: 1px solid #F9FAFB;
     /* Light border to separate items */
 }
 
 .sys_msg_class,
 .sys_msg_title,
 .sys_msg_time {
-    font-size: 16px;
+    font-size: 14px;
     color: #212227;
     /* Consistent with other text colors */
 }
 
 .sys_msg_class {
-    font-weight: bold;
-    width: 6%;
-    border-radius: 5%;
-    display: flex;
-    align-items: center;
-    padding: 2px;
-    justify-content: center;
-    margin-right: 2px;
+    margin-right: 10px;
+    width: 40px;
+    height: 21px;
+    line-height: 21px;
     font-size: 12px;
-    line-height: 12px;
     text-align: center;
-    vertical-align: middle;
-    border: 1px solid transparent; // 初始化边框，颜色由具体类决定
+    border-radius: 3px;
 }
 
 // 资讯
 .sys_msg_class.资讯 {
-    background-color: #66BFBF; // 资讯的背景色
-    border-color: #006666; // 资讯的边框色
-    color: #006666;
+    background-color: #dce9e2; // 资讯的背景色
+    color: #519c66;
 }
 
 // 商品
 .sys_msg_class.商品 {
-    background-color: #FFCC99; // 商品的背景色
-    border-color: #FF9933; // 商品的边框色
-    color: #FF9933;
+    background-color: #e4e8fd; // 商品的背景色
+    color: #5570f1;
 }
 
 // 书刊
 .sys_msg_class.书刊 {
-    background-color: #FFCCCC; // 书刊的背景色
-    border-color: #FF6666; // 书刊的边框色
-    color: #FF6666;
+    background-color: #e4e8fd; // 书刊的背景色
+    color: #5570f1;
 }
 
 // 招聘
 .sys_msg_class.招聘 {
-    background-color: #99CCFF; // 招聘的背景色
-    border-color: #3366CC; // 招聘的边框色
-    color: #3366CC;
+    background-color: #e4f3fd; // 招聘的背景色
+    color: #55b5f1;
 }
 
 // 求职
 .sys_msg_class.求职 {
-    background-color: #CCFFCC; // 求职的背景色
-    border-color: #669966; // 求职的边框色
-    color: #669966;
+    background-color: #e4f3fd; // 求职的背景色
+    color: #55b5f1;
 }
 
 // 通知
 .sys_msg_class.通知 {
-    background-color: #FFCCFF; // 通知的背景色
-    border-color: #CC66CC; // 通知的边框色
-    color: #CC66CC;
+    background-color: #f7e5e5; // 通知的背景色
+    color: #cc5f5f;
 }
 
 // 投诉
 .sys_msg_class.投诉 {
-    background-color: #FFCCCC; // 投诉的背景色
-    border-color: #CC3333; // 投诉的边框色
-    color: #CC3333;
+    background-color: #f7e5e5; // 投诉的背景色
+    color: #cc5f5f;
 }
 
 // 话题
 .sys_msg_class.话题 {
     background-color: #FFFFCC; // 话题的背景色
-    border-color: #CCCC66; // 话题的边框色
     color: #CCCC66;
 }
 
 //公告
 .sys_msg_class.公告 {
     background-color: #CCFFFF; // 公告的背景色
-    border-color: #3399FF; // 公告的边框色
     color: #3399FF;
 }
 
 // 单聊
 .sys_msg_class.单聊 {
-    background-color: #CCFFFF; // 单聊的背景色
-    border-color: #66CCCC; // 单聊的边框色
-    color: #66CCCC;
+    background-color: #fff7ed; // 单聊的背景色
+    color: #ffcc91;
 }
 
 // 群聊
 .sys_msg_class.群聊 {
-    background-color: #FFCCFF; // 群聊的背景色
-    border-color: #CC66CC; // 群聊的边框色
-    color: #CC66CC;
+    background-color: #fff7ed; // 群聊的背景色
+    color: #ffcc91;
+}
+
+//项目
+.sys_msg_class.项目 {
+    background-color: #f3ecfc; // 项目的背景色
+    color: #b489ed;
+}
+
+//企业
+.sys_msg_class.公司 {
+    background-color: #f3ecfc; // 企业的背景色
+    color: #b489ed;
 }
 
 // 通用样式，设置边框宽度和样式
@@ -1383,7 +1683,7 @@ export default {
 
 .tick {
     width: 14%;
-    color: #797e96;
+    color: #999999;
     font-size: 14px;
 }
 
@@ -1401,7 +1701,7 @@ export default {
     width: 20%;
     /* Adjust based on your preference */
     text-align: right;
-    color: #707B81;
+    color: #999999;
     /* Softer color for dates */
 }
 </style>

src/views/news/addBook.vue

@@ -501,6 +501,7 @@ export default {
           } else {
             this.form.status = 1
           }
+          this.form.website_id = this.form.website_id == '' ? 2 : this.form.website_id;
           this.form.price == '' ? this.form.price = 0 : this.form.price = this.form.price;
           this.form.market_price == '' ? this.form.market_price = 0 : this.form.market_price = this.form.market_price;
           this.form.page == '' ? this.form.page = 0 : this.form.page = this.form.page;

src/views/news/addJobHunting.vue

@@ -487,8 +487,8 @@ export default {
         phone: "",
         wx: "",
         birth: "",
-        politic: "",
-        language: "",
+        politic: null,
+        language: null,
         educational: "",
         // jobtime: "2025-02-21 00:00:00",//工作时间
         jobtime: "",//工作时间

src/views/news/addNcomplaint.vue

@@ -9,19 +9,17 @@
           <el-form-item label="投诉标题：" prop="title" class="custom-align-right">
             <el-input v-model="form.title" autocomplete="off" placeholder="请输入投诉标题"></el-input>
           </el-form-item>
-
-
-          <el-form-item label="发布范围：" prop="city_arr_id" class="custom-align-right">
-            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="请选择发布范围" :props="cityData"
+          <el-form-item label="投诉地区：" prop="city_arr_id" class="custom-align-right">
+            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="请选择投诉地区" :props="cityData"
               filterable clearable @change="changeData"></el-cascader>
           </el-form-item>
-          <el-form-item label="行政职能：" prop="department_arr_id" class="custom-align-right">
-            <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="请选择行政职能"
+          <el-form-item label="投诉类型：" prop="department_arr_id" class="custom-align-right">
+            <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="请选择投诉类型"
               popper-class="my_cascader" :props="searchDepartmentData" filterable clearable
               @change="changeData"></el-cascader>
           </el-form-item>
-          <el-form-item label="行政人员：" prop="re_user_ids" class="custom-align-right">
-            <el-select v-model="form.re_user_ids" placeholder="请选择行政人员" multiple filterable clearable
+          <el-form-item label="处理人：" prop="re_user_ids" class="custom-align-right">
+            <el-select v-model="form.re_user_ids" placeholder="请选择处理人" multiple filterable clearable
               @visible-change="getDUser">
               <el-option v-for="item in re_user_ids" :key="item.id" :label="item.user_name + '/' + item.nickname"
                 :value="item.user_id">
@@ -41,7 +39,7 @@
 
 
           <el-form-item label="发生日期：" prop="start" class="custom-align-right">
-            <el-date-picker v-model="form.start" placeholder="请选择发生日期">
+            <el-date-picker v-model="form.start" placeholder="请选择发生日期" @change="changeTime">
             </el-date-picker>
           </el-form-item>
 
@@ -75,7 +73,7 @@
           <el-form-item label="投诉方式" prop="type" class="custom-align-right">
             <el-radio-group v-model="form.type">
               <el-radio :label="1">匿名</el-radio>
-              <el-radio :label="2">实名</el-radio>
+              <!-- <el-radio :label="2">实名</el-radio> -->
             </el-radio-group>
           </el-form-item>
           <!-- <el-form-item label="建立群聊：" prop="is_group" class="custom-align-right">
@@ -326,19 +324,25 @@ export default {
       this.form.re_user_ids = [];
       this.getDUser();
     },
+    changeTime(val) {
+      console.log("val1111111111", val);
+      this.form.start = this.formatDateToYYYYMMDD(val);
+      console.log("val111111111122222", this.form.start);
+
+    },
     //获取行政人员
     getDUser() {
       // this.form.re_user_ids = [];
       let department_id = this.form.department_arr_id;
       let city_id = this.form.city_arr_id;
-      if (department_id.length == 0) {
-        this.$message.warning('请选择行政职能');
-        return;
-      }
-      if (city_id.length == 0) {
-        this.$message.warning('请选择行政区划');
-        return;
-      }
+      // if (department_id.length == 0) {
+      //   this.$message.warning('请选择投诉类型');
+      //   return;
+      // }
+      // if (city_id.length == 0) {
+      //   this.$message.warning('请选择投诉地区');
+      //   return;
+      // }
       department_id = department_id.at(-1) || 0;
       city_id = city_id.at(-1) || 0;
       let parames = {
@@ -495,6 +499,12 @@ export default {
         return date;
       }
     },
+    formatDateToYYYYMMDD(date) {
+      let year = date.getFullYear();
+      let month = String(date.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
+      let day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
     //1.3 清理表单
     cleatForm() {
       this.form = {
@@ -560,7 +570,8 @@ export default {
         this.form.is_group = parseInt(res.data.is_group);
         this.form.group_name = res.data.group_name;
         this.form.want = res.data.want;
-        this.form.start = res.data.start ? new Date(res.data.start) : null; // 处理时间格式
+        // this.form.start = res.data.start ? new Date(res.data.start) : null; // 处理时间格式
+        this.form.start = res.data.start; // 处理时间格式
         this.form.re_user_ids = Array.isArray(res.data.re_user_ids) ? res.data.re_user_ids : JSON.parse(res.data.re_user_ids);
         this.getDUser();
       })
@@ -603,9 +614,9 @@ export default {
         if (valid) {
           // 拷贝对象form，处理另外的，并提交
           const formData = { ...this.form };
-          if (formData.start) {
-            formData.start = formatLocalDate(formData.start);
-          }
+          // if (formData.start) {
+          //   // formData.start = formatDateToYYYYMMDD(formData.start);
+          // }
           if (formData.department_arr_id.length == 0) {
             formData.department_id = 0;
           }
@@ -770,4 +781,9 @@ export default {
   }
 }
 
-//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>
+.photo_tips {
+  font-size: 14px;
+  color: #666666;
+}
+
+//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>

src/views/news/addNotice.vue

@@ -20,7 +20,7 @@
               <el-radio :label="1">常规</el-radio>
               <el-radio :label="2">紧急</el-radio>
               <el-radio :label="3">特急</el-radio>
-            </el-radio-group>
+            </el-radio-group> 
           </el-form-item>
           <el-form-item label="内容：" prop="content" class="custom-align-right">
             <!--这里是富文本-->
@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="发布日期：" prop="time" class="custom-align-right">
             <el-date-picker v-model="form.time" type="daterange" range-separator="至" start-placeholder="开始日期"
-              end-placeholder="结束日期" :picker-options="pickerOptions">
+              end-placeholder="结束日期" :picker-options="pickerOptions" @change="changeTime">
             </el-date-picker>
           </el-form-item>
           <!-- {{ hovering }}{{ file }} -->
@@ -78,7 +78,8 @@
 
           <el-form-item label="群聊名称：" prop="group_name" class="custom-align-right" v-if="form.is_group == 1"
             :disabled="this.$route.query.id != undefined">
-            <el-input v-model="form.group_name" autocomplete="off" placeholder="请输入群聊名称"></el-input>
+            <el-input v-model="form.group_name" autocomplete="off" placeholder="请输入群聊名称"
+              :disabled="this.$route.query.id != undefined"></el-input>
           </el-form-item>
         </div>
       </el-form>
@@ -166,6 +167,9 @@ export default {
         is_group: 0,//是否创建群聊：1：是，0：否
         group_name: '',//群聊名称
         time: [],//发布日期
+        status: 1,//状态：1：草稿，2：已发布
+        start: '',//开始时间
+        end: '',//结束时间
       },
       //1.2 表单验证规则
       formRules: {
@@ -177,6 +181,7 @@ export default {
         content: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         address: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         is_group: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        group_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         time: [{ required: true, trigger: 'blur', validator: validateArray }],
       },
       //1.3富文本编辑器配置
@@ -338,6 +343,10 @@ export default {
         });
       })
     },
+    changeTime(val) {
+      this.form.start = this.formatDateToYYYYMMDD(val[0]);
+      this.form.end = this.formatDateToYYYYMMDD(val[1]);
+    },
     //1.提交表单 start ------------------------------------------------------------>
     beforeAvatarUpload(file) {
       console.log(file.type, '--------------------------------');
@@ -407,26 +416,36 @@ export default {
             this.form.department_arr_id = JSON.stringify(this.form.department_arr_id);
           }
           if (typeof this.form.time == 'object' && this.form.time.length > 0) {
-            this.form.start = this.formatDate(this.form.time[0]);
-            this.form.end = this.formatDate(this.form.time[1]);
+            // this.form.start = this.formatDate(this.form.time[0]);
+            // this.form.end = this.formatDate(this.form.time[1]);
             delete this.form.time;
           }
           delete this.form.cat_arr_id;
           delete this.form.timelist;
           delete this.form.catid;
           this.form.file = this.file;
-          if (this.userType == 10000) {
-            this.form.status = 2
-          } else {
-            this.form.status = 1
-          }
+          // if (this.userType == 10000) {
+          //   this.form.status = 2
+          // } else {
+          //   this.form.status = 1
+          // }
           this.$store.dispatch('news/addNotice', this.form).then(res => {
             if (res.code == 200) {
-              //汇报结果
-              this.$message({
-                type: 'success',
-                message: '已成功添加通知！'
-              });
+              // 管理员
+              if (this.userType == 10000) {
+                let data = {
+                  id: res.data,
+                  status: 2
+                }
+                this.$store.dispatch('news/updateNoticeStatus', data).then(res => {
+                  if (res.code == 200) {
+                    this.$message({
+                      type: 'success',
+                      message: '已成功添加通知！'
+                    });
+                  }
+                })
+              }
               this.cleatForm();
               //返回列表页
               this.returnPage()
@@ -451,6 +470,12 @@ export default {
         return date;
       }
     },
+    formatDateToYYYYMMDD(date) {
+      let year = date.getFullYear();
+      let month = String(date.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
+      let day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
     //1.3 清理表单
     cleatForm() {
     },
@@ -471,7 +496,7 @@ export default {
         id: this.$route.query.id
       };
       this.$store.dispatch('news/getNoticeInfo', data).then(res => {
-        console.log(res);
+        console.log('getNoticeInfo', res);
         this.form.name = res.data.name;
         // 回显导航池
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
@@ -493,6 +518,8 @@ export default {
         if (res.data.start != null && res.data.end != null) {
           this.form.time = [res.data.start, res.data.end];
         }
+        this.form.start = res.data.start;
+        this.form.end = res.data.end;
         this.form.file = res.data.file;
         this.file = res.data.file;
         const filePath = res.data.file;
@@ -562,8 +589,8 @@ export default {
           }
           console.log(typeof this.form.time, '---=-==-=')
           if (typeof this.form.time == 'object' && this.form.time.length > 0 && this.form.time[0] != '' && this.form.time[1] != '') {
-            this.form.start = this.formatDate(this.form.time[0]);
-            this.form.end = this.formatDate(this.form.time[1]);
+            // this.form.start = this.formatDateToYYYYMMDD(this.form.time[0]);
+            // this.form.end = this.formatDateToYYYYMMDD(this.form.time[1]);
             delete this.form.time;
           }
           delete this.form.cat_arr_id;
@@ -698,4 +725,4 @@ export default {
 
 }
 
-//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>
+//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>

src/views/news/bookListApply.vue

@@ -100,7 +100,7 @@
     <el-dialog title="请输入驳回理由" :visible.sync="examineWindow" :close-on-click-modal="false">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
-          <el-form-item label="驳回原因：" :label-width="formLabelWidth" prop="reason" class="custom-align-right">
+          <el-form-item label="驳回原因：" label-width="85px" prop="reason" class="custom-align-right">
             <el-input type="textarea" v-model="form.reason" class="custom-textarea" placeholder="请输入驳回原因"
               :rows="3"></el-input>
           </el-form-item>

src/views/news/ncomplaintList.vue

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="6">
             <div class="searchBox">
-              <div class="searchTitle">行政职能：</div>
+              <div class="searchTitle">投诉类型：</div>
               <el-select v-model="getApiData.department_id" placeholder="请选择..">
                 <el-option v-for="department in department" :key="department.id" :label="department.name"
                   :value="department.id"></el-option>
@@ -58,9 +58,9 @@
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
             <el-table-column prop="title" label="投诉主题" width="">
             </el-table-column>
-            <el-table-column prop="department_name" label="行政职能" width="">
+            <el-table-column prop="department_name" label="投诉类型" width="">
             </el-table-column>
-            <el-table-column prop="cityname" label="接收人" width="">
+            <el-table-column prop="cityname" label="投诉地区" width="">
             </el-table-column>
 
             <el-table-column prop="status" label="审核状态" width="">

src/views/news/ncomplaintListApply.vue

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="6">
             <div class="searchBox">
-              <div class="searchTitle">行政职能：</div>
+              <div class="searchTitle">投诉类型：</div>
               <el-select v-model="getApiData.department_id" placeholder="请选择..">
                 <el-option v-for="department in department" :key="department.id" :label="department.name"
                   :value="department.id"></el-option>
@@ -57,7 +57,7 @@
             </el-table-column>
             <el-table-column prop="department_name" label="投诉类型" width="">
             </el-table-column>
-            <el-table-column prop="cityname" label="接收人" width="">
+            <el-table-column prop="cityname" label="投诉地区" width="">
             </el-table-column>
 
             <el-table-column prop="status" label="审核状态" width="">

src/views/news/ncomplaintListDeal.vue

@@ -13,11 +13,10 @@
           </el-col>
           <el-col :span="6">
             <div class="searchBox">
-              <div class="searchTitle">行政职能：</div>
+              <div class="searchTitle">投诉类型：</div>
               <el-select v-model="getApiData.department_id" placeholder="请选择..">
                 <el-option v-for="department in department" :key="department.id" :label="department.name"
                   :value="department.id"></el-option>
-
               </el-select>
             </div>
           </el-col>
@@ -57,7 +56,7 @@
             </el-table-column>
             <el-table-column prop="department_name" label="投诉类型" width="">
             </el-table-column>
-            <el-table-column prop="cityname" label="接收人" width="">
+            <el-table-column prop="cityname" label="投诉地区" width="">
             </el-table-column>
 
             <el-table-column prop="status" label="审核状态" width="">
@@ -97,15 +96,18 @@
             <el-table-column fixed="right" label="操作" width="400" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listMainBtn" v-if="scope.row.deal == 1" @click="getUpRow(scope.row.id, tableData)"><i
-                      class="el-icon-check"></i>处理
+                  <div class="listMainBtn" v-if="scope.row.deal == 1" @click="getUpRow(scope.row.id, tableData)">
+                    <i class="el-icon-check"></i>处理
                   </div>
-                  <div class="listMainBtn" v-if="scope.row.deal == 2" @click="setOverRow(scope.row.id, tableData)"><i
-                      class="el-icon-check"></i>完结
+                  <div class="listMainBtn" v-if="scope.row.deal == 2" @click="setOverRow(scope.row.id, tableData)">
+                    <i class="el-icon-check"></i>完结
+                  </div>
+                  <div class="listMainBtn" v-if="scope.row.deal == 4" @click="getReason(scope.row.id, tableData)">
+                    <i class="el-icon-check"></i>理由
+                  </div>
+                  <div class="listEditBtn" @click="goEdit(scope.row.id, tableData)">
+                    <i class="el-icon-edit-outline"></i>编辑
                   </div>
-
-                  <div class="listEditBtn" @click="goEdit(scope.row.id, tableData)"><i
-                      class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>
             </el-table-column>
@@ -128,7 +130,8 @@
     <el-dialog title="请输入驳回理由" :visible.sync="examineWindow" :close-on-click-modal="false">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
-          <el-form-item label="驳回原因：" :label-width="formLabelWidth" prop="reason" class="custom-align-right">
+          <el-form-item label="驳回原因：" :label-width="formLabelWidth" prop="reason" class="custom-align-right"
+            label-width="85px">
             <el-input type="textarea" v-model="form.reason" class="custom-textarea" placeholder="请输入驳回原因"
               :rows="3"></el-input>
           </el-form-item>
@@ -142,6 +145,14 @@
       </div>
     </el-dialog>
     <!--弹出框1：外部表单弹出框 end------------------------------------------------------------>
+    <!-- 弹出框2 驳回理由 start-->
+    <el-dialog title="驳回理由" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false">
+      <span>{{ reason }}</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 弹出框2 驳回理由 end -->
     <!--表格内容 end------------------------------------------------------------>
   </div>
 </template>
@@ -161,6 +172,8 @@ export default {
   },
   data() {
     return {
+      dialogVisible: false,//弹出框2
+      reason: "",//驳回理由
       //1.列表和分页相关 start ------------------------------------------------------------>
       tableDivTitle: "投诉列表",
       tableData: [],//内容
@@ -212,6 +225,7 @@ export default {
                 message: '操作成功！'
               });
               this.getData();
+              this.reason = this.form.reason
               this.form.reason = "";//清空上一次的输入
               this.examineWindow = false;
             }
@@ -261,6 +275,23 @@ export default {
 
       })
     },
+    //查看驳回理由
+    getReason(id) {
+      let data = {
+        id: id
+      };
+      this.$store.dispatch('news/getComplaintInfo', data).then(res => {
+        if (res.code == 200) {
+          this.reason = res.data.deal_reason
+          this.dialogVisible = true
+        } else {
+          this.$message({
+            message: res.message,
+            type: '网络错误,没有获取到驳回理由!'
+          })
+        }
+      })
+    },
     upRow(id, deal, status) {
       let data = {
         id: id,

src/views/news/noticeListApply.vue

@@ -28,7 +28,7 @@
 
     <div class="layerBoxNoBg">
       <div>
-        <el-button type="primary" @click="goCreat">发布通知</el-button>
+        <!-- <el-button type="primary" @click="goCreat">发布通知</el-button> -->
       </div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>
@@ -215,7 +215,6 @@ export default {
         distinguishCancelAndClose: true,  // 关键配置项，用于区分取消和关闭按钮
         type: 'warning'
       }).then(() => {
-
         this.upRow(id, 2)
       }).catch((the_reback) => {
         //输入驳回理由