Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/imgMgt/about/index.vue
#	src/views/imgMgt/corporateHonor/index.vue
#	src/views/imgMgt/homeBanner/index.vue
#	src/views/imgMgt/researchHonor/index.vue
#	src/views/imgMgt/talentCenter/index.vue
#	src/views/imgMgt/teamStyle/index.vue
#	src/views/websiteRelated/friendlyLinks/index.vue

src/components/GxUpload/index.vue

@@ -106,9 +106,6 @@ const handlePreview = async (file) => {
 
 // 修改handleChange方法
 const handleChange = ({ file, fileList: updatedList }) => {
-    console.log(111)
-    console.log(file.status)
-    console.log(updatedList)
     // 处理上传成功的情况
     if (file.status === 'done') {
         const response = file.response;

src/locales/lang/zh-CN/menu.js

@@ -37,7 +37,7 @@ export default {
     about:'关于海邻',
     researchHonor:'科研成果',
     corporateHonor:'企业荣誉',
-    talentCenter:'人才中心',
+    talentCenter:'办公环境',
     teamStyle:'团队风采',
     Dynamic:'海邻动态',
     companyNews:'公司动态',

src/router/util.js

@@ -73,10 +73,7 @@ export function formatRoutes(routes = [], parent = {}) {
     const modules = import.meta.glob('../views/**/*.vue')
     return routes
         .map((item) => {
-            console.log(111)
             const localRoute = find(toList(localRoutes), { name: item.name })
-            console.log(222,localRoute)
-
             if (!localRoute) return
             const component = localRoute?.component || 'exception/404'
             const isLink = localRoute?.meta?.type === 'link'

src/views/dynamic/companyNews/index.vue

@@ -136,7 +136,7 @@ async function getPageList() {
         const { success, data, total } = await apis.dynamic
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/dynamic/mediaReports/index.vue

@@ -129,7 +129,7 @@ async function getPageList() {
         const { success, data, total } = await apis.dynamic
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/dynamic/videoCenter/index.vue

@@ -170,7 +170,7 @@ async function getPageList() {
         const { success, data, total } = await apis.videoCenter
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/importantEvents/index.vue

@@ -119,7 +119,7 @@ async function getPageList() {
         const { success, data, total } = await apis.importantEvents
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/list/basic/index.vue

@@ -143,7 +143,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/list/card/index.vue

@@ -115,7 +115,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/list/search/applications/index.vue

@@ -147,7 +147,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/list/search/articles/index.vue

@@ -154,7 +154,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/list/search/projects/index.vue

@@ -131,7 +131,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/list/table/index.vue

@@ -194,7 +194,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/product/components/EditDialog.vue

@@ -239,6 +239,8 @@ async function handleEdit(record = {}) {
     formData.value = {
         ...data,
         categoryIDs:data.categoryID,
+        categoryID:data.categoryID,
+        categoryRootID:data.categoryRootID,
         standard: data.standard || [{
             label: '',
             val: '',

src/views/product/index.vue

@@ -168,7 +168,7 @@ async function getPageList() {
         const { success, data, total } = await apis.products
             .getProductsList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/productType/index.vue

@@ -72,7 +72,7 @@ async function getPageList() {
         const { success, data, total } = await apis.categorys
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/recruitment/index.vue

@@ -127,7 +127,7 @@ async function getPageList() {
         const { success, data, total } = await apis.recruitment
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/system/dict/index.vue

@@ -107,7 +107,7 @@ async function getPageList() {
         const { code, data } = await apis.common
             .getPageList({
                 pageSize,
-                page: current,
+                current:current,
             })
             .catch(() => {
                 throw new Error()

src/views/system/logger/index.vue

@@ -162,7 +162,7 @@ async function getPageList() {
         const { success, data, total } = await apis.system
             .getLoggers({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
                 startTime: startTime.value,
                 endTime: endTime.value,

src/views/system/role/index.vue

@@ -158,7 +158,7 @@ async function getPageList() {
         const { success, data, total } = await apis.role
             .getRoleList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/system/user/index.vue

@@ -153,7 +153,7 @@ async function getPageList() {
         const { success, data, total } = await apis.users
             .getUsersList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {

src/views/team/index.vue

@@ -146,7 +146,7 @@ async function getPageList() {
         const { success, data, total } = await apis.team
             .getDataList({
                 pageSize,
-                page: current,
+                current:current,
                 ...searchFormData.value,
             })
             .catch(() => {