“yueshang” 1 anno fa
parent
commit
fac8d3016e

+ 1 - 0
.gitignore

@@ -22,3 +22,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 /vite.config.js
+/vite.config.js

BIN
src/assets/images/perCenter/PencilSimple.png


+ 14 - 2
src/views/liveChat/index.vue

@@ -264,10 +264,22 @@ const handleNewMessage = async () => {
     websoctStore.newMessage = false; // 重置新消息标记
   }
 };
-watchEffect(() => {
+
+watchEffect(async() => {
   if (websoctStore.messOne?.fromId) {
     msgRecordEvent(websoctStore.messOne.fromId);
-    getMsgList();
+    const res= await msgFriend();
+  //圆点======
+  searchData.value.map(k=>{
+    res.rows.map((i) => {
+    if (i.fromId == websoctStore.messOne?.fromId||i.toId == websoctStore.messOne?.fromId) {
+      k=i
+      k.showCircel = true;
+    }
+  });
+  })
+  // 圆点======
+    // getMsgList();
   }
 });
 // 滚动翻页========

+ 2 - 2
src/views/system/user/profile/index.vue

@@ -12,7 +12,7 @@
                   <div class="text-center">
                      <userAvatar :user="state.user" />
                      <div class="user-name">{{ state.user.userName }}</div>
-                     <div class="emails">{{ state.user.email }}sfsdf</div>
+                     <div class="emails" v-if="state.user.email">{{ state.user.email }}</div>
                   </div>
                   <ul class="list-group list-group-striped" style="color: #505870 !important;">
                      <!-- <li class="list-group-item">
@@ -47,7 +47,7 @@
             <el-card>
                <template v-slot:header>
                  <div class="clearfix">
-                   <span>基本资料</span>
+                   <span>信息修改</span>
                  </div>
                </template>
                <el-tabs v-model="activeTab">

+ 20 - 2
src/views/system/user/profile/resetPwd.vue

@@ -10,8 +10,8 @@
          <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
       </el-form-item>
       <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-      <el-button type="danger" @click="close">关闭</el-button>
+      <el-button type="primary" @click="submit" class="sure">保存</el-button>
+      <el-button type="danger" @click="close" class="cancel">关闭</el-button>
       </el-form-item>
    </el-form>
 </template>
@@ -55,3 +55,21 @@ function close() {
   proxy.$tab.closePage();
 };
 </script>
+<style lang="scss" scoped>
+:deep(.el-form-item--default .el-form-item__label){
+  color: #505870 !important;
+  font-weight: 400;
+  font-size: 14px;
+}
+.el-button{
+  width: 120px;
+}
+:deep(.sure.el-button){
+  --el-button-bg-color:#2E6BC8
+}
+:deep(.cancel.el-button){
+  --el-button-bg-color:#fff;
+  color: #505870;
+  --el-button-border-color:#C1CCE3;
+}
+</style>

+ 27 - 8
src/views/system/user/profile/userInfo.vue

@@ -1,5 +1,11 @@
 <template>
    <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="性别">
+         <el-radio-group v-model="user.sex">
+            <el-radio label="0">男</el-radio>
+            <el-radio label="1">女</el-radio>
+         </el-radio-group>
+      </el-form-item>
       <el-form-item label="用户昵称" prop="nickName">
          <el-input v-model="user.nickName" maxlength="30" />
       </el-form-item>
@@ -9,15 +15,10 @@
       <el-form-item label="邮箱" prop="email">
          <el-input v-model="user.email" maxlength="50" />
       </el-form-item>
-      <el-form-item label="性别">
-         <el-radio-group v-model="user.sex">
-            <el-radio label="0">男</el-radio>
-            <el-radio label="1">女</el-radio>
-         </el-radio-group>
-      </el-form-item>
+      
       <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-      <el-button type="danger" @click="close">关闭</el-button>
+      <el-button type="primary" @click="submit" class="sure">保存</el-button>
+      <el-button type="danger" @click="close" class="cancel">关闭</el-button>
       </el-form-item>
    </el-form>
 </template>
@@ -54,3 +55,21 @@ function close() {
   proxy.$tab.closePage();
 };
 </script>
+<style lang="scss" scoped>
+:deep(.el-form-item--default .el-form-item__label){
+  color: #505870 !important;
+  font-weight: 400;
+  font-size: 14px;
+}
+.el-button{
+  width: 120px;
+}
+:deep(.sure.el-button){
+  --el-button-bg-color:#2E6BC8
+}
+:deep(.cancel.el-button){
+  --el-button-bg-color:#fff;
+  color: #505870;
+  --el-button-border-color:#C1CCE3;
+}
+</style>

+ 0 - 74
vite.config.js

@@ -1,74 +0,0 @@
-import {
-	defineConfig,
-	loadEnv
-} from 'vite'
-import path from 'path'
-import createVitePlugins from './vite/plugins'
-
-// https://vitejs.dev/config/
-export default defineConfig(({
-	mode,
-	command
-}) => {
-	const env = loadEnv(mode, process.cwd())
-	const {
-		VITE_APP_ENV
-	} = env
-	return {
-		// 部署生产环境和开发环境下的URL。
-		// 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上
-		// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
-		base: VITE_APP_ENV === 'production' ? '/' : '/',
-		plugins: createVitePlugins(env, command === 'build'),
-		resolve: {
-			// https://cn.vitejs.dev/config/#resolve-alias
-			alias: {
-				// 设置路径
-				'~': path.resolve(__dirname, './'),
-				// 设置别名
-				'@': path.resolve(__dirname, './src')
-			},
-			// https://cn.vitejs.dev/config/#resolve-extensions
-			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
-		},
-		// vite 相关配置
-		server: {
-			port: 81,
-			host: true,
-			open: true,
-			proxy: {
-				// https://cn.vitejs.dev/config/#server-proxy
-				'/dev-api': {
-					// target: 'http://192.168.1.28:8080/',
-					// target: 'http://8.142.173.95:19527/',
-					target:'http://192.168.1.28:8080/',
-					changeOrigin: true,
-					rewrite: (p) => p.replace(/^\/dev-api/, '')
-				},
-				//websocket代理
-				'/websocket': {				
-					// target:'ws://8.142.173.95:19527/websocket',
-					// target:'ws://192.168.1.28:8080/websocket',
-					target:'ws://192.168.1.11:8080/websocket',
-					changeOrigin: true,
-					rewrite: (p) => p.replace(/^\/websocket/, '')
-				}
-			}
-		},
-		//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
-		css: {
-			postcss: {
-				plugins: [{
-					postcssPlugin: 'internal:charset-removal',
-					AtRule: {
-						charset: (atRule) => {
-							if (atRule.name === 'charset') {
-								atRule.remove();
-							}
-						}
-					}
-				}]
-			}
-		}
-	}
-})