diff --git a/sub-government-screen-service/src/components/currentTime.vue b/sub-government-screen-service/src/components/currentTime.vue
index d596602..bab306a 100644
--- a/sub-government-screen-service/src/components/currentTime.vue
+++ b/sub-government-screen-service/src/components/currentTime.vue
@@ -42,11 +42,11 @@ const chearTime = () => {
};
onMounted(() => {
- // startTime();
+ startTime();
});
onUnmounted(() => {
- // chearTime();
+ chearTime();
});
defineExpose({
diff --git a/sub-operation-service/src/App.vue b/sub-operation-service/src/App.vue
index caba0cb..f69c268 100644
--- a/sub-operation-service/src/App.vue
+++ b/sub-operation-service/src/App.vue
@@ -31,6 +31,10 @@ body {
div {
box-sizing: border-box;
}
+ --el-color-primary: #25bf82;
+ --el-color-primary-light-3: #45dda1;
+ --el-color-primary-light-5: #8cddbd;
+
.el-input {
--el-input-focus-border-color: #25bf82;
--el-input-focus-border: #25bf82;
diff --git a/sub-operation-service/src/apis/index.js b/sub-operation-service/src/apis/index.js
new file mode 100644
index 0000000..c461776
--- /dev/null
+++ b/sub-operation-service/src/apis/index.js
@@ -0,0 +1,9 @@
+import request from '@/utils/axios';
+
+//云南省所有区域信息
+export function getRegion(code) {
+ let codeVal = code ? code : '530000';
+ return request('/system/area/region?areaCode=' + codeVal, {
+ method: 'GET',
+ });
+}
diff --git a/sub-operation-service/src/store/modules/user.js b/sub-operation-service/src/store/modules/user.js
index 8e96ab0..fd325d8 100644
--- a/sub-operation-service/src/store/modules/user.js
+++ b/sub-operation-service/src/store/modules/user.js
@@ -3,7 +3,7 @@ import { GenKey } from '@/config';
import { isEmpty, encode, decode } from '@/utils';
export const useUserStore = defineStore({
- id: GenKey('USER_STATE'),
+ id: GenKey('userStore'),
state: () => ({
token: null,
userInfo: {},
@@ -52,14 +52,14 @@ export const useUserStore = defineStore({
this.currentOrg = null;
this.orgList = [];
this.menus = [];
- localStorage.removeItem(GenKey('USER_STATE'));
+ localStorage.removeItem(GenKey('userStore'));
},
clear() {
- localStorage.removeItem(GenKey('USER_STATE'));
+ localStorage.removeItem(GenKey('userStore'));
},
},
persist: {
- key: GenKey('USER_STATE'),
+ key: GenKey('userStore'),
storage: window.localStorage,
},
});
diff --git a/sub-operation-service/src/styles/global.scss b/sub-operation-service/src/styles/global.scss
index 3babd08..eec2e32 100644
--- a/sub-operation-service/src/styles/global.scss
+++ b/sub-operation-service/src/styles/global.scss
@@ -1,6 +1,7 @@
// color
$legacy-ie: 10;
$color-main:#25BF82;
+$color-main-table-header:rgba(37,191,130,0.1);
$color-5a:#5A5A5A;
$color-000:#000;
$color-fff:#fff;
diff --git a/sub-operation-service/src/utils/axios.js b/sub-operation-service/src/utils/axios.js
index b42fc13..b34705a 100644
--- a/sub-operation-service/src/utils/axios.js
+++ b/sub-operation-service/src/utils/axios.js
@@ -45,15 +45,20 @@ const errorHandler = async (error) => {
*/
publicAxios.interceptors.request.use(async (config) => {
const UserStore = useUserStore();
- config.baseURL = config.isUpload ? VITE_APP_UPLOAD_API : VITE_APP_BASE_API;
+ switch (config.apisType) {
+ case 'upload': {
+ config.baseURL = VITE_APP_UPLOAD_API;
+ config.headers['Content-Type'] = config.uploadType;
+ break;
+ }
+ default: {
+ config.baseURL = VITE_APP_BASE_API;
+ }
+ }
if (UserStore.hasToken()) {
- config.headers['fairies-auth-token'] = config.headers['fairies-auth-token'] ?? UserStore.token;
- config.headers['fairies-org-id'] = UserStore.currentOrg;
+ config.headers['authorization'] = config.headers['authorization'] ?? UserStore.token;
config.headers['cache-control'] = 'no-cache';
config.headers.Pragma = 'no-cache';
- if (config?.isUpload) {
- config.headers['Content-Type'] = config.uploadType;
- }
}
if (config.method === 'POST' || config.method === 'DELETE') {
config.headers.Accept = 'application/json';
diff --git a/sub-operation-service/src/utils/permission.js b/sub-operation-service/src/utils/permission.js
index ffdf94f..34c7a5b 100644
--- a/sub-operation-service/src/utils/permission.js
+++ b/sub-operation-service/src/utils/permission.js
@@ -31,14 +31,16 @@ router.beforeEach(async (to, from, next) => {
} else {
try {
const PermissionStore = usePermissionStore();
- // 路由添加进去了没有及时更新 需要重新进去一次拦截
if (!PermissionStore.routes.length) {
- // 获取权限列表进行接口访问 因为这里页面要切换权限
const accessRoutes = await PermissionStore.generateRoutes(userStore.roles);
- accessRoutes.forEach((item) => router.addRoute(item)); // 动态添加访问路由表
- next({ ...to, replace: true }); // 这里相当于push到一个页面 不在进入路由拦截
+ accessRoutes.forEach((item) => router.addRoute(item));
+ return next({ ...to, replace: true });
} else {
- next(); // 如果不传参数就会重新执行路由拦截,重新进到这里
+ if (from.path.includes('/sub') && to.path.includes('/platform')) {
+ window.location.reload();
+ return;
+ }
+ next();
}
} catch (error) {
next(`/login?redirect=${to.path}`);
diff --git a/sub-operation-service/src/views/ecommerce/components/hotGoodsWordClould.vue b/sub-operation-service/src/views/ecommerce/components/hotGoodsWordClould.vue
new file mode 100644
index 0000000..787e18b
--- /dev/null
+++ b/sub-operation-service/src/views/ecommerce/components/hotGoodsWordClould.vue
@@ -0,0 +1,97 @@
+
+