Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n

 Conflicts:

	src/views/home/index.vue

README.md

@@ -98,6 +98,10 @@ vue-admin-perfect
 └─ vite.config.ts         # vite 配置
 ```
 
+### 十、微信交流群
+|                                      微信二维码                                      |
+| :----------------------------------------------------------------------------------: |
+| <img src="http://182.61.5.190:8889/we.png" width=170/> |
 
 
 

src/router/modules/externalLink.ts

@@ -12,6 +12,12 @@ const externalLink = [{
         icon: 'link'
     },
     children: [
+        {
+            path: 'wechat',
+            name: 'wechat',
+            component: () => import('@/views/externalLinks/wechat/index.vue'),
+            meta: { title: '加微信群',  icon: 'MenuIcon' }
+        },
         {
             path: 'https://github.com/zouzhibin/vue-admin-perfect',
             name: 'github',

src/router/modules/system.ts

@@ -9,7 +9,8 @@ const systemRouter = [{
     name: 'system',
     meta: {
         title: '系统管理',
-        icon: 'ElementPlus'
+        icon: 'ElementPlus',
+        roles:['other']
     },
     children: [
         {
@@ -22,19 +23,19 @@ const systemRouter = [{
             path: 'user',
             component: () => import('@/views/system/user/index.vue'),
             name: 'user',
-            meta: { title: '用户管理', roles: ['other'] , icon: 'MenuIcon'}
+            meta: { title: '用户管理' , icon: 'MenuIcon'}
         },
         {
             path: 'role',
             component: () => import('@/views/system/role/index.vue'),
             name: 'role',
-            meta: { title: '角色管理', roles: ['other'], icon: 'MenuIcon' }
+            meta: { title: '角色管理', icon: 'MenuIcon' }
         },
         {
             path: 'menu',
             component: () => import('@/views/system/menu/index.vue'),
             name: 'menu',
-            meta: { title: '菜单管理', roles: ['other'] , icon: 'MenuIcon'}
+            meta: { title: '菜单管理',  icon: 'MenuIcon'}
         },
     ]
 }]

src/views/chat/components/u-chartBox/chat.js

@@ -1,9 +1,10 @@
 export const chatData = [
   {
     is_self: 0,
-    created_at: '2022-03-11',
-    content: 'hello 你好呀!',
+    created_at: '2022-11-15',
+    content: 'http://182.61.5.190:8889/we.png',
     id: 1,
+    type: 2, // 文字
   },
   {
     is_self: 1,
@@ -12,4 +13,5 @@ export const chatData = [
     id: 2,
     type: 1, // 文字
   },
+
 ]

src/views/chat/components/u-chartBox/index.vue

@@ -9,7 +9,15 @@
               <img src="@/assets/image/avatar.png" />
             </div>
             <div style="position: relative; display: flex">
-              <div class="receive-message-info" v-html="item.content"></div>
+              <div class="receive-message-info" v-html="item.content" v-if="item.type===1"></div>
+              <div class="public-show-pic" v-else-if="item.type === 2">
+                <el-image
+                    :src="item.content"
+                    :preview-src-list="[item.content]"
+                    style="max-width: 200px"
+                    :data-resid="Date.now()"
+                />
+              </div>
             </div>
           </div>
         </div>

src/views/chat/index.vue

@@ -1,16 +1,25 @@
 <template>
-  <u-container-layout>
-    <div>
-      <div style="margin-bottom: 15px"
+  <div class="app-container">
+    <div class="app-container-inner m-chat">
+      <div style="margin-bottom: 15px;flex-shrink: 0"
         >聊天内容框，功能有发送emoji表情，上传图片，发送图片，内容滚动，发送文字</div
       >
-      <u-chat-box />
+      <u-chat-box class="m-chat-box"/>
     </div>
-  </u-container-layout>
+  </div>
 </template>
 
 <script lang="ts" setup>
   import UChatBox from './components/u-chartBox/index.vue'
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.m-chat{
+  display: flex;
+  flex-direction: column;
+  .m-chat-box{
+    flex: 1;
+    overflow: hidden;
+  }
+}
+</style>

src/views/externalLinks/wechat/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="app-container">
+    <div class="app-container-inner">
+      <div style="margin-bottom: 20px">欢迎大家加微信哈，共同讨论，学习</div>
+      <el-image
+          src="http://182.61.5.190:8889/we.png"
+          :preview-src-list="['http://182.61.5.190:8889/we.png']"
+          style="max-width: 200px"
+          :data-resid="Date.now()"
+      />
+    </div>
+  </div>
+</template>