diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..813ad4e 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/rotation.js b/src/api/rotation.js
new file mode 100644
index 0000000..0ec0d41
--- /dev/null
+++ b/src/api/rotation.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request';
+
+// 分页查询所有轮播列表
+export function getRotationList(params) {
+ return request({
+ url: '/show/list',
+ params
+ });
+}
+// 添加轮播
+export function addRotation(data) {
+ return request({
+ url: '/show/create',
+ method:'post',
+ data
+ });
+}
+// 删除轮播
+export function deleteRotation(params) {
+ return request({
+ url: '/show/delete',
+ method:'post',
+ params
+ });
+}
+// 修改轮播
+export function updateRotation(data) {
+ return request({
+ url: '/show/update',
+ method:'post',
+ data
+ });
+}
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e263760..813ad4e 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/router/dynamicRoutes.js b/src/router/dynamicRoutes.js
index e4d4fba..0e82cfb 100644
--- a/src/router/dynamicRoutes.js
+++ b/src/router/dynamicRoutes.js
@@ -12,6 +12,7 @@ import accountManagement from './modules/accountManagement';
import customerService from './modules/customerService';
import feedback from './modules/feedback';
import settings from './modules/settings';
+import rotation from './modules/rotation';
export const DynamicRoutes = [
// 政策管理
@@ -28,6 +29,8 @@ export const DynamicRoutes = [
customerService,
// 意见反馈
feedback,
+ // 轮播管理
+ rotation,
// 系统设置
settings
];
diff --git a/src/router/modules/rotation.js b/src/router/modules/rotation.js
new file mode 100644
index 0000000..eaeee0d
--- /dev/null
+++ b/src/router/modules/rotation.js
@@ -0,0 +1,17 @@
+import Layout from '@/layout';
+// 轮播管理
+const nestedRouter = {
+ path: '',
+ component: Layout,
+ redirect: 'index',
+ children: [
+ {
+ path: 'rotation',
+ component: resolve => require(['@/views/rotation/index'], resolve),
+ name: 'rotation',
+ meta: { title: '轮播管理', icon: 'row' }
+ }
+ ]
+};
+
+export default nestedRouter;
diff --git a/src/views/account/index.vue b/src/views/account/index.vue
index 4618291..98b9a5b 100644
--- a/src/views/account/index.vue
+++ b/src/views/account/index.vue
@@ -4,11 +4,6 @@
+
+
+ 查询
+
+
diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue
index 8c23d2f..1e8c0b9 100644
--- a/src/views/customer/index.vue
+++ b/src/views/customer/index.vue
@@ -4,11 +4,6 @@
+
+
+ 查询
+
+
@@ -42,11 +42,11 @@
type="index"
>
-
+
-
+
筛选搜索
-
-
- 查询
-
-
+
+
+ 查询
+
+
@@ -41,12 +41,12 @@
align="center"
type="index"
>
-
-
+
+
diff --git a/src/views/policy/library/index.vue b/src/views/policy/library/index.vue
index 12a0fae..45f9e3f 100644
--- a/src/views/policy/library/index.vue
+++ b/src/views/policy/library/index.vue
@@ -4,11 +4,6 @@
+
+
+ 查询
+
+
diff --git a/src/views/policy/tag/index.vue b/src/views/policy/tag/index.vue
index 40e7bef..7cfc4c6 100644
--- a/src/views/policy/tag/index.vue
+++ b/src/views/policy/tag/index.vue
@@ -21,13 +21,13 @@
添加标签
- 查看标签
diff --git a/src/views/rotation/index.vue b/src/views/rotation/index.vue
new file mode 100644
index 0000000..33d07ad
--- /dev/null
+++ b/src/views/rotation/index.vue
@@ -0,0 +1,216 @@
+
+
+
+
+ 数据列表
+
+ 添加轮播
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ numTop }}
+
+
+
@@ -294,10 +296,51 @@ export default {
error: function () {
console.log('连接错误');
},
+ msgTips(){
+ let that = this;
+ if (!('Notification' in window)) {
+ console.log('浏览器不支持消息通知');
+ return;
+ }
+ Notification.requestPermission(function(permission) {
+ //如果不是当前页面，标题栏闪动+消息提示
+ if (document.hidden) {
+ var options = {
+ body: '您有新的未读消息，请及时处理',
+ silent: true
+ };
+ var notification = new Notification('消息通知', options);
+ notification.onclick = function() {
+ window.open(`/service`, '_blank');
+ };
+ //标题栏闪动
+ var defaultTitle = document.title;
+ if (that.isReceive) {
+ return;
+ } else {
+ that.isReceive = true;
+ }
+ that.timer = setInterval(function() {
+ var title = document.title;
+ if (document.hidden && that.isReceive) {
+ if (/你有新消息/.test(title) == false) {
+ document.title = '【你有新消息】';
+ } else {
+ document.title = defaultTitle;
+ }
+ } else {
+ that.isReceive = false;
+ document.title = defaultTitle;
+ }
+ }, 500);
+ }
+ });
+ },
getMessage(msg) {
const data = JSON.parse(msg.data);
console.log(JSON.parse(msg.data));
const msgInfo = JSON.parse(msg.data);
+ this.msgTips()
// 遍历用户列表 新消息的用户未读数量加加
if (msgInfo.sendUserId === this.activeId) {
this.info.push(msgInfo);
@@ -358,6 +401,7 @@ export default {
align-items: center;
.el-avatar {
position: relative;
+ background: unset;
img {
width: 40px;
height: 40px;
diff --git a/src/views/technology/achievement/index.vue b/src/views/technology/achievement/index.vue
index 51a638a..3d99509 100644
--- a/src/views/technology/achievement/index.vue
+++ b/src/views/technology/achievement/index.vue
@@ -4,11 +4,6 @@
+
+
+ 查询
+
+
@@ -42,11 +42,11 @@
type="index"
>
-
+
筛选搜索
-
-
- 查询
-
-
+
+
+ 查询
+
+
@@ -42,11 +42,11 @@
type="index"
>
-
+