diff --git a/src/App.vue b/src/App.vue
index 1cfde9e..69eacf5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@
const description = ref('');
import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云
const isRY = ref(false);
+import useUserStore from '@/store/modules/user';
const appStore = useUserStore();
watch(
() => appStore.token,
@@ -122,4 +123,13 @@
color: #666666;
}
}
+
+:deep(.el-message) {
+ z-index: 9999999 !important;
+}
+
+
diff --git a/src/App.vue b/src/App.vue
index 1cfde9e..69eacf5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@
const description = ref('');
import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云
const isRY = ref(false);
+import useUserStore from '@/store/modules/user';
const appStore = useUserStore();
watch(
() => appStore.token,
@@ -122,4 +123,13 @@
color: #666666;
}
}
+
+:deep(.el-message) {
+ z-index: 9999999 !important;
+}
+
+
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index 4b2f79a..8366383 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -280,14 +280,14 @@
}
.blue {
- color: #61cdfa;
+ color: #2cb7ff;
}
.green {
- color: #a9fa61;
+ color: #00fcff;
}
.yellow {
- color: #fabf61;
+ color: #ff993e;
}
}
diff --git a/src/App.vue b/src/App.vue
index 1cfde9e..69eacf5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@
const description = ref('');
import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云
const isRY = ref(false);
+import useUserStore from '@/store/modules/user';
const appStore = useUserStore();
watch(
() => appStore.token,
@@ -122,4 +123,13 @@
color: #666666;
}
}
+
+:deep(.el-message) {
+ z-index: 9999999 !important;
+}
+
+
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index 4b2f79a..8366383 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -280,14 +280,14 @@
}
.blue {
- color: #61cdfa;
+ color: #2cb7ff;
}
.green {
- color: #a9fa61;
+ color: #00fcff;
}
.yellow {
- color: #fabf61;
+ color: #ff993e;
}
}
diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index fbdc5b4..0fbb3ff 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -1,44 +1,51 @@
-import {
- ElMessage,
- ElMessageBox,
- ElNotification,
- ElLoading,
-} from "element-plus";
+import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus';
let loadingInstance;
export default {
// 消息提示
msg(content) {
- ElMessage.info(content);
+ ElMessage.info({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 错误消息
msgError(content) {
- ElMessage.error(content);
+ ElMessage.error({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 成功消息
msgSuccess(content) {
- ElMessage.success(content);
+ ElMessage.success({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 警告消息
msgWarning(content) {
- ElMessage.warning(content);
+ ElMessage.warning({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 弹出提示
alert(content) {
- ElMessageBox.alert(content, "系统提示");
+ ElMessageBox.alert(content, '系统提示');
},
// 错误提示
alertError(content) {
- ElMessageBox.alert(content, "系统提示", { type: "error" });
+ ElMessageBox.alert(content, '系统提示', { type: 'error' });
},
// 成功提示
alertSuccess(content) {
- ElMessageBox.alert(content, "系统提示", { type: "success" });
+ ElMessageBox.alert(content, '系统提示', { type: 'success' });
},
// 警告提示
alertWarning(content) {
- ElMessageBox.alert(content, "系统提示", { type: "warning" });
+ ElMessageBox.alert(content, '系统提示', { type: 'warning' });
},
// 通知提示
notify(content) {
@@ -58,18 +65,18 @@
},
// 确认窗体
confirm(content, confirmButtonText, cancelButtonText) {
- return ElMessageBox.confirm(content, "系统提示", {
- confirmButtonText: confirmButtonText || "确定",
- cancelButtonText: cancelButtonText || "取消",
- type: "warning",
+ return ElMessageBox.confirm(content, '系统提示', {
+ confirmButtonText: confirmButtonText || '确定',
+ cancelButtonText: cancelButtonText || '取消',
+ type: 'warning',
});
},
// 提交内容
prompt(content) {
- return ElMessageBox.prompt(content, "系统提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ return ElMessageBox.prompt(content, '系统提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
});
},
// 打开遮罩层
@@ -77,7 +84,7 @@
loadingInstance = ElLoading.service({
lock: true,
text: content,
- background: "rgba(0, 0, 0, 0.7)",
+ background: 'rgba(0, 0, 0, 0.7)',
});
},
// 关闭遮罩层
diff --git a/src/App.vue b/src/App.vue
index 1cfde9e..69eacf5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@
const description = ref('');
import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云
const isRY = ref(false);
+import useUserStore from '@/store/modules/user';
const appStore = useUserStore();
watch(
() => appStore.token,
@@ -122,4 +123,13 @@
color: #666666;
}
}
+
+:deep(.el-message) {
+ z-index: 9999999 !important;
+}
+
+
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index 4b2f79a..8366383 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -280,14 +280,14 @@
}
.blue {
- color: #61cdfa;
+ color: #2cb7ff;
}
.green {
- color: #a9fa61;
+ color: #00fcff;
}
.yellow {
- color: #fabf61;
+ color: #ff993e;
}
}
diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index fbdc5b4..0fbb3ff 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -1,44 +1,51 @@
-import {
- ElMessage,
- ElMessageBox,
- ElNotification,
- ElLoading,
-} from "element-plus";
+import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus';
let loadingInstance;
export default {
// 消息提示
msg(content) {
- ElMessage.info(content);
+ ElMessage.info({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 错误消息
msgError(content) {
- ElMessage.error(content);
+ ElMessage.error({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 成功消息
msgSuccess(content) {
- ElMessage.success(content);
+ ElMessage.success({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 警告消息
msgWarning(content) {
- ElMessage.warning(content);
+ ElMessage.warning({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 弹出提示
alert(content) {
- ElMessageBox.alert(content, "系统提示");
+ ElMessageBox.alert(content, '系统提示');
},
// 错误提示
alertError(content) {
- ElMessageBox.alert(content, "系统提示", { type: "error" });
+ ElMessageBox.alert(content, '系统提示', { type: 'error' });
},
// 成功提示
alertSuccess(content) {
- ElMessageBox.alert(content, "系统提示", { type: "success" });
+ ElMessageBox.alert(content, '系统提示', { type: 'success' });
},
// 警告提示
alertWarning(content) {
- ElMessageBox.alert(content, "系统提示", { type: "warning" });
+ ElMessageBox.alert(content, '系统提示', { type: 'warning' });
},
// 通知提示
notify(content) {
@@ -58,18 +65,18 @@
},
// 确认窗体
confirm(content, confirmButtonText, cancelButtonText) {
- return ElMessageBox.confirm(content, "系统提示", {
- confirmButtonText: confirmButtonText || "确定",
- cancelButtonText: cancelButtonText || "取消",
- type: "warning",
+ return ElMessageBox.confirm(content, '系统提示', {
+ confirmButtonText: confirmButtonText || '确定',
+ cancelButtonText: cancelButtonText || '取消',
+ type: 'warning',
});
},
// 提交内容
prompt(content) {
- return ElMessageBox.prompt(content, "系统提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ return ElMessageBox.prompt(content, '系统提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
});
},
// 打开遮罩层
@@ -77,7 +84,7 @@
loadingInstance = ElLoading.service({
lock: true,
text: content,
- background: "rgba(0, 0, 0, 0.7)",
+ background: 'rgba(0, 0, 0, 0.7)',
});
},
// 关闭遮罩层
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ff07953..103504c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -38,6 +38,7 @@
.then(res => {
const data = res.data;
data.user.posts = data.posts;
+ console.log('data.user', data.user);
this.userInfo = data.user;
const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar;
diff --git a/src/App.vue b/src/App.vue
index 1cfde9e..69eacf5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@
const description = ref('');
import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云
const isRY = ref(false);
+import useUserStore from '@/store/modules/user';
const appStore = useUserStore();
watch(
() => appStore.token,
@@ -122,4 +123,13 @@
color: #666666;
}
}
+
+:deep(.el-message) {
+ z-index: 9999999 !important;
+}
+
+
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index 4b2f79a..8366383 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -280,14 +280,14 @@
}
.blue {
- color: #61cdfa;
+ color: #2cb7ff;
}
.green {
- color: #a9fa61;
+ color: #00fcff;
}
.yellow {
- color: #fabf61;
+ color: #ff993e;
}
}
diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index fbdc5b4..0fbb3ff 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -1,44 +1,51 @@
-import {
- ElMessage,
- ElMessageBox,
- ElNotification,
- ElLoading,
-} from "element-plus";
+import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus';
let loadingInstance;
export default {
// 消息提示
msg(content) {
- ElMessage.info(content);
+ ElMessage.info({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 错误消息
msgError(content) {
- ElMessage.error(content);
+ ElMessage.error({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 成功消息
msgSuccess(content) {
- ElMessage.success(content);
+ ElMessage.success({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 警告消息
msgWarning(content) {
- ElMessage.warning(content);
+ ElMessage.warning({
+ message: content,
+ customClass: 'message-zindex',
+ });
},
// 弹出提示
alert(content) {
- ElMessageBox.alert(content, "系统提示");
+ ElMessageBox.alert(content, '系统提示');
},
// 错误提示
alertError(content) {
- ElMessageBox.alert(content, "系统提示", { type: "error" });
+ ElMessageBox.alert(content, '系统提示', { type: 'error' });
},
// 成功提示
alertSuccess(content) {
- ElMessageBox.alert(content, "系统提示", { type: "success" });
+ ElMessageBox.alert(content, '系统提示', { type: 'success' });
},
// 警告提示
alertWarning(content) {
- ElMessageBox.alert(content, "系统提示", { type: "warning" });
+ ElMessageBox.alert(content, '系统提示', { type: 'warning' });
},
// 通知提示
notify(content) {
@@ -58,18 +65,18 @@
},
// 确认窗体
confirm(content, confirmButtonText, cancelButtonText) {
- return ElMessageBox.confirm(content, "系统提示", {
- confirmButtonText: confirmButtonText || "确定",
- cancelButtonText: cancelButtonText || "取消",
- type: "warning",
+ return ElMessageBox.confirm(content, '系统提示', {
+ confirmButtonText: confirmButtonText || '确定',
+ cancelButtonText: cancelButtonText || '取消',
+ type: 'warning',
});
},
// 提交内容
prompt(content) {
- return ElMessageBox.prompt(content, "系统提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ return ElMessageBox.prompt(content, '系统提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
});
},
// 打开遮罩层
@@ -77,7 +84,7 @@
loadingInstance = ElLoading.service({
lock: true,
text: content,
- background: "rgba(0, 0, 0, 0.7)",
+ background: 'rgba(0, 0, 0, 0.7)',
});
},
// 关闭遮罩层
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ff07953..103504c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -38,6 +38,7 @@
.then(res => {
const data = res.data;
data.user.posts = data.posts;
+ console.log('data.user', data.user);
this.userInfo = data.user;
const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar;
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index f2d1eda..85bb79a 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -2,25 +2,28 @@
+
-
+
-
+
@@ -42,7 +45,7 @@
-
+
{{ item.registerPlatform }}
{{ item.isOnlion == 1 ? '在线 ' : '离线 ' }}
@@ -78,12 +81,11 @@
-