Merge branch 'dev' into 'master'

fix: 问题修改

See merge request !32

src/common/api/axios.js

@@ -5,7 +5,7 @@ import router from '@/router'
 
 
 const axios = Axios.create({
 const axios = Axios.create({
   baseURL: window.apiHostSetting.VUE_APP_BASE_URL + '/api',
   baseURL: window.apiHostSetting.VUE_APP_BASE_URL + '/api',
-  timeout: 30 * 1000,
+  timeout: 30 * 1000
 })
 })
 let HTTPNUM = 0
 let HTTPNUM = 0
 axios.interceptors.request.use((config) => {
 axios.interceptors.request.use((config) => {
@@ -29,6 +29,8 @@ axios.interceptors.response.use(
         Vue.prototype.$message({
         Vue.prototype.$message({
           type: 'error',
           type: 'error',
           message: res.data.message,
           message: res.data.message,
+          offset: 200,
+          duration: 1000
         })
         })
         sessionStorage.setItem('active', 'true')
         sessionStorage.setItem('active', 'true')
         // router
         // router
@@ -43,6 +45,8 @@ axios.interceptors.response.use(
         Vue.prototype.$message({
         Vue.prototype.$message({
           message: res.data.message,
           message: res.data.message,
           type: 'warning',
           type: 'warning',
+          offset: 200,
+          duration: 1000
         })
         })
         return Promise.reject(res.data)
         return Promise.reject(res.data)
       } else if (res.data.code === 403) {
       } else if (res.data.code === 403) {
@@ -52,10 +56,12 @@ axios.interceptors.response.use(
           Vue.prototype.$message({
           Vue.prototype.$message({
             type: 'error',
             type: 'error',
             message: res.data.message,
             message: res.data.message,
+            offset: 200,
+            duration: 1000
           })
           })
           router
           router
             .replace({
             .replace({
-              name: 'login',
+              name: 'login'
             })
             })
             .catch((err) => {
             .catch((err) => {
               console.log(err)
               console.log(err)
@@ -65,12 +71,12 @@ axios.interceptors.response.use(
       } else if (res.data.code === 500) {
       } else if (res.data.code === 500) {
         Vue.prototype.$alert(
         Vue.prototype.$alert(
           '<div style="max-height:500px;overflow:auto">' +
           '<div style="max-height:500px;overflow:auto">' +
-          res.data.message +
-          '</div>',
+            res.data.message +
+            '</div>',
           '错误提示',
           '错误提示',
           {
           {
-            dangerouslyUseHTMLString: true,
-          },
+            dangerouslyUseHTMLString: true
+          }
         )
         )
       }
       }
     } else {
     } else {
@@ -78,26 +84,23 @@ axios.interceptors.response.use(
         if (res.data) {
         if (res.data) {
           const fileReader = new FileReader()
           const fileReader = new FileReader()
           fileReader.readAsText(res.data)
           fileReader.readAsText(res.data)
-          fileReader.onload = function(ev) {
+          fileReader.onload = function (ev) {
             console.log(ev.target.result)
             console.log(ev.target.result)
             Vue.prototype.$alert(ev.target.result, '提示', {
             Vue.prototype.$alert(ev.target.result, '提示', {
               confirmButtonText: '确定',
               confirmButtonText: '确定',
-              callback: () => {
-              },
+              callback: () => {}
             })
             })
           }
           }
         } else {
         } else {
           Vue.prototype.$alert('请求参数有误', '提示', {
           Vue.prototype.$alert('请求参数有误', '提示', {
             confirmButtonText: '确定',
             confirmButtonText: '确定',
-            callback: () => {
-            },
+            callback: () => {}
           })
           })
         }
         }
       } else if (res.status === 404) {
       } else if (res.status === 404) {
         Vue.prototype.$alert('请求不存在', '提示', {
         Vue.prototype.$alert('请求不存在', '提示', {
           confirmButtonText: '确定',
           confirmButtonText: '确定',
-          callback: () => {
-          },
+          callback: () => {}
         })
         })
       }
       }
     }
     }
@@ -107,16 +110,16 @@ axios.interceptors.response.use(
   (error) => {
   (error) => {
     Vue.prototype.$alert(error.message, 'Error', {
     Vue.prototype.$alert(error.message, 'Error', {
       confirmButtonText: '确定',
       confirmButtonText: '确定',
-      callback: () => {
-      },
+      callback: () => {}
     })
     })
     return Promise.reject(error)
     return Promise.reject(error)
-  },
+  }
 )
 )
 
 
 export function get(url, params) {
 export function get(url, params) {
   return new Promise((resolve, reject) => {
   return new Promise((resolve, reject) => {
-    axios.get(url, { params })
+    axios
+      .get(url, { params })
       .then((res) => {
       .then((res) => {
         if (res.status === 200 && res.data) {
         if (res.status === 200 && res.data) {
           resolve(res.data)
           resolve(res.data)
@@ -132,7 +135,8 @@ export function get(url, params) {
 
 
 export function post(url, params, headers) {
 export function post(url, params, headers) {
   return new Promise((resolve, reject) => {
   return new Promise((resolve, reject) => {
-    axios.post(url, params, headers)
+    axios
+      .post(url, params, headers)
       .then((res) => {
       .then((res) => {
         if (res.status === 200 && res.data) {
         if (res.status === 200 && res.data) {
           resolve(res.data)
           resolve(res.data)

src/router/index.js

@@ -106,7 +106,7 @@ const routes = [
         component: () => import('@/views/system/sku-sort.vue'),
         component: () => import('@/views/system/sku-sort.vue'),
         name: 'system_sku-sort',
         name: 'system_sku-sort',
         meta: {
         meta: {
-          title: '属性类别管理',
+          title: '属性类管理',
         },
         },
       },
       },
       {
       {
@@ -114,7 +114,7 @@ const routes = [
         component: () => import('@/views/system/sku-manage.vue'),
         component: () => import('@/views/system/sku-manage.vue'),
         name: 'system_sku-manage',
         name: 'system_sku-manage',
         meta: {
         meta: {
-          title: '商品属性管理',
+          title: '属性值管理',
         },
         },
       },
       },
       {
       {