diff --git a/.env.development b/.env.development index 8a6cea6..40f4be7 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 演示环境 #VUE_APP_BASE_API = 'https://p1.hzs413.com/inter-api/' -VUE_APP_BASE_API = 'http://localhost:8080' +VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_API = 'http://192.168.110.4:8080' diff --git a/.env.production b/.env.production index 5153629..cd959cc 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/inter-api' +VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API1 = 'http://index.hzs413.com' diff --git a/src/components/tradeDetails.vue b/src/components/tradeDetails.vue index 8435e8e..65475be 100644 --- a/src/components/tradeDetails.vue +++ b/src/components/tradeDetails.vue @@ -6,7 +6,11 @@ - + - + - +
- {{ '搜索' }} - {{ '重置' }} - + {{ + "搜索" + }} + {{ + "重置" + }}
@@ -91,19 +102,16 @@ - - - + + + - - - - \ No newline at end of file + diff --git a/src/util/request.js b/src/util/request.js index d3e63cb..115e976 100644 --- a/src/util/request.js +++ b/src/util/request.js @@ -1,106 +1,122 @@ /* - * @Descripttion: - * @version: + * @Descripttion: + * @version: * @Author: kBank * @Date: 2021-11-19 15:21:54 */ -import axios from 'axios' -import { Message, MessageBox,Loading } from 'element-ui' -import { getToken, getTokenMi } from '@/util/auth' -import store from '@/store' -import { tansParams, blobValidate } from "@/util/ruoyi" -import { saveAs } from 'file-saver' -import i18n from '@/assets/i18n/index' +import axios from "axios"; +import { Message, MessageBox, Loading } from "element-ui"; +import { getToken, getTokenMi } from "@/util/auth"; +import store from "@/store"; +import { tansParams, blobValidate } from "@/util/ruoyi"; +import { saveAs } from "file-saver"; +import i18n from "@/assets/i18n/index"; export let isRelogin = { show: false }; const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, - timeout: 100000 // request timeout -}) -let downloadLoadingInstance + timeout: 100000, // request timeout +}); +let downloadLoadingInstance; service.interceptors.request.use( - config => { - if (localStorage.getItem('lang')) { - config.headers['Accept-Language'] = localStorage.getItem('lang'); + (config) => { + if (localStorage.getItem("lang")) { + config.headers["Accept-Language"] = localStorage.getItem("lang"); } else { - config.headers['Accept-Language'] = 'zh-CN' + config.headers["Accept-Language"] = "zh-CN"; } if (getToken()) { - config.headers['Authorization'] = 'Bearer ' + getToken() + config.headers["Authorization"] = "Bearer " + getToken(); } if (getTokenMi()) { - config.headers['token'] = getTokenMi() + config.headers["token"] = getTokenMi(); } - config.headers['Source'] = '1' - return config + config.headers["Source"] = "1"; + return config; }, - error => { - return Promise.reject(error) + (error) => { + return Promise.reject(error); } -) +); service.interceptors.response.use( - response => { - const res = response.data + (response) => { + const res = response.data; if (res.code == 401 || res.code == 402 || res.code == 403) { if (!isRelogin.show) { isRelogin.show = true; // i18n.t('ENU_P_TYPE0') - MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText:'取消', type: 'warning' }).then(() => { - store.dispatch('LogOut').then(() => { - location.href = '/'; + MessageBox.confirm("登录状态已过期,请重新登录", "系统提示", { + confirmButtonText: "重新登录", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + store.dispatch("LogOut").then(() => { + location.href = "/"; + }); }) - }).catch(() => { - isRelogin.show = false; - }); + .catch(() => { + isRelogin.show = false; + }); } } else if (res.code == 500) { Message({ - message: res.msg || 'Error', - type: 'error', - duration: 5 * 1000 - }) - return Promise.reject(new Error(res.msg || 'Error')) + message: res.msg || "Error", + type: "error", + duration: 5 * 1000, + }); + return Promise.reject(new Error(res.msg || "Error")); } else { - return res + return res; } }, - error => { + (error) => { Message({ message: error.message, - type: 'error', - duration: 5 * 1000 - }) - return Promise.reject(error) + type: "error", + duration: 5 * 1000, + }); + return Promise.reject(error); } -) +); // 通用下载方法 export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ text: '正在下载数据，请稍候', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - return service.post(url, params, { - transformRequest: [(params) => { - return tansParams(params) - }], - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - responseType: 'blob', - ...config - }).then(async (data) => { - const isLogin = await blobValidate(data) - if (isLogin) { - const blob = new Blob([data]) - saveAs(blob, filename) - } else { - const resText = await data.text() - const rspObj = JSON.parse(resText) - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg) - } - downloadLoadingInstance.close() - }).catch((r) => { - console.error(r) - Message.error('下载文件出现错误，请联系管理员！') - downloadLoadingInstance.close() - }) + downloadLoadingInstance = Loading.service({ + text: "正在下载数据，请稍候", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); + return service + .post(url, params, { + transformRequest: [ + (params) => { + return tansParams(params); + }, + ], + headers: { "Content-Type": "application/x-www-form-urlencoded" }, + responseType: "blob", + ...config, + }) + .then(async (data) => { + const isLogin = await blobValidate(data); + if (isLogin) { + const blob = new Blob([data]); + saveAs(blob, filename); + } else { + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = + errorCode[rspObj.code] || rspObj.msg || errorCode["default"]; + Message.error(errMsg); + } + downloadLoadingInstance.close(); + }) + .catch((r) => { + console.error(r); + Message.error("下载文件出现错误，请联系管理员！"); + downloadLoadingInstance.close(); + }); } -export default service +export default service; diff --git a/vue.config.js b/vue.config.js index 9677786..d32b300 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,17 +1,17 @@ /* - * @Descripttion: - * @version: + * @Descripttion: + * @version: * @Author: kBank * @Date: 2022-09-29 10:04:55 */ // 引入等比适配插件 -const px2rem = require('postcss-px2rem') +const px2rem = require("postcss-px2rem"); // 配置基本大小 const postcss = px2rem({ // 基准大小 baseSize，需要和rem.js中相同 - remUnit: 16 -}) + remUnit: 16, +}); // 使用等比适配插件 module.exports = { @@ -19,27 +19,34 @@ module.exports = { css: { loaderOptions: { postcss: { - plugins: [ - postcss - ] - } - } + plugins: [postcss], + }, + }, }, configureWebpack: { externals: { - 'zhCN': 'zhCN', - 'enUS': 'enUS', - 'zhTC': 'zhTC', + zhCN: "zhCN", + enUS: "enUS", + zhTC: "zhTC", // 'ruRU':'ruRU', // 'frFR':'frFR', }, }, - chainWebpack: config => { - config - .plugin('html') - .tap(args => { - args[0].title = '会员系统' - return args - }) - } -} + chainWebpack: (config) => { + config.plugin("html").tap((args) => { + args[0].title = "会员系统"; + return args; + }); + }, + devServer: { + proxy: { + "/prod-api": { + target: "http://t-mana.beida413.com", + changeOrigin: true, + // pathRewrite: { + // "^/prod-api": "", + // }, + }, + }, + }, +};