angelo
/
web-base-pc
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(env): update proxy

This commit is contained in:
ywk 2025-04-10 13:49:24 +08:00
parent e2cf9a7659
commit 4b5d8c42ec
5 changed files with 151 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -6,7 +6,7 @@ ENV = 'development'
# 演示环境 # 演示环境
#VUE_APP_BASE_API = 'https://p1.hzs413.com/inter-api/' #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' # VUE_APP_BASE_API = 'http://192.168.110.4:8080'

2
.env.production
View File

@ -2,5 +2,5 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = '/inter-api' VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API1 = 'http://index.hzs413.com' VUE_APP_BASE_API1 = 'http://index.hzs413.com'

54
src/components/tradeDetails.vue
View File

@ -6,7 +6,11 @@
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交易类型'" prop="tradeType"> <el-form-item :label="'交易类型'" prop="tradeType">
<el-select clearable v-model="queryParams.tradeType" :placeholder="'请选择'"> <el-select
clearable
v-model="queryParams.tradeType"
:placeholder="'请选择'"
>
<el-option <el-option
v-for="(item, index) in tradeTypeList" v-for="(item, index) in tradeTypeList"
:key="index" :key="index"
@ -18,7 +22,11 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'账户类型'" prop="pkAccount"> <el-form-item :label="'账户类型'" prop="pkAccount">
<el-select clearable v-model="queryParams.pkAccount" :placeholder="'请选择'"> <el-select
clearable
v-model="queryParams.pkAccount"
:placeholder="'请选择'"
>
<el-option <el-option
v-for="(item, index) in pkAccountList" v-for="(item, index) in pkAccountList"
:key="index" :key="index"
@ -29,7 +37,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'交易时间'" prop="teamCode"> <el-form-item :label="'交易时间'" prop="teamCode">
<el-date-picker <el-date-picker
v-model="thetime" v-model="thetime"
type="daterange" type="daterange"
@ -44,9 +52,12 @@
<el-col :span="4"> <el-col :span="4">
<div class="searchbox"> <div class="searchbox">
<el-button class="btn2" @click="research">{{ '搜索' }}</el-button> <el-button class="btn2" @click="research">{{
<el-button class="btn1" @click="chongzhi">{{ '重置' }}</el-button> "搜索"
}}</el-button>
<el-button class="btn1" @click="chongzhi">{{
"重置"
}}</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -93,17 +104,14 @@
prop="creationTime" prop="creationTime"
:label="'交易时间'" :label="'交易时间'"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column align="center" prop="remarks" :label="'备注'">
align="center" <template slot-scope="scope">
prop="remarks" <span v-if="scope.row.montage == 0">
:label="'备注'" {{ scope.row.tradeTypeVal }}{{ scope.row.sourceCode }}</span
>
> <span v-else> {{ scope.row.remarks }}</span>
<template scope="scope"> </template>
<span v-if="scope.row.montage==0"> {{ scope.row.tradeTypeVal }}{{ scope.row.sourceCode }}</span> </el-table-column>
<span v-else> {{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
:total="total" :total="total"
@ -116,9 +124,9 @@
</div> </div>
</template> </template>
<script> <script>
import pagination from "@/components/pagination.vue"; import pagination from "@/components/pagination.vue";
import { mapGetters } from 'vuex' import { mapGetters } from "vuex";
import { import {
getTransactionDetails, getTransactionDetails,
getTradeTypeList, getTradeTypeList,
@ -135,7 +143,7 @@ export default {
}, },
}, },
computed: { computed: {
...mapGetters(['userInfo', 'specialCarNum']), ...mapGetters(["userInfo", "specialCarNum"]),
}, },
data() { data() {
return { return {
@ -155,7 +163,7 @@ export default {
}; };
}, },
watch: { watch: {
$route(n, o) { $route() {
this.specialArea = 4; this.specialArea = 4;
}, },
}, },
@ -206,7 +214,7 @@ export default {
}); });
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return "warning-row"; return "warning-row";
} else if (rowIndex % 2 == 0) { } else if (rowIndex % 2 == 0) {
@ -218,7 +226,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-table .warning-row { ::v-deep .el-table .warning-row {
background: #f9f9f9; background: #f9f9f9;
} }

150
src/util/request.js
View File

@ -4,103 +4,119 @@
* @Author: kBank * @Author: kBank
* @Date: 2021-11-19 15:21:54 * @Date: 2021-11-19 15:21:54
*/ */
import axios from 'axios' import axios from "axios";
import { Message, MessageBox,Loading } from 'element-ui' import { Message, MessageBox, Loading } from "element-ui";
import { getToken, getTokenMi } from '@/util/auth' import { getToken, getTokenMi } from "@/util/auth";
import store from '@/store' import store from "@/store";
import { tansParams, blobValidate } from "@/util/ruoyi" import { tansParams, blobValidate } from "@/util/ruoyi";
import { saveAs } from 'file-saver' import { saveAs } from "file-saver";
import i18n from '@/assets/i18n/index' import i18n from "@/assets/i18n/index";
export let isRelogin = { show: false }; export let isRelogin = { show: false };
const service = axios.create({ const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, baseURL: process.env.VUE_APP_BASE_API,
timeout: 100000 // request timeout timeout: 100000, // request timeout
}) });
let downloadLoadingInstance let downloadLoadingInstance;
service.interceptors.request.use( service.interceptors.request.use(
config => { (config) => {
if (localStorage.getItem('lang')) { if (localStorage.getItem("lang")) {
config.headers['Accept-Language'] = localStorage.getItem('lang'); config.headers["Accept-Language"] = localStorage.getItem("lang");
} else { } else {
config.headers['Accept-Language'] = 'zh-CN' config.headers["Accept-Language"] = "zh-CN";
} }
if (getToken()) { if (getToken()) {
config.headers['Authorization'] = 'Bearer ' + getToken() config.headers["Authorization"] = "Bearer " + getToken();
} }
if (getTokenMi()) { if (getTokenMi()) {
config.headers['token'] = getTokenMi() config.headers["token"] = getTokenMi();
} }
config.headers['Source'] = '1' config.headers["Source"] = "1";
return config return config;
}, },
error => { (error) => {
return Promise.reject(error) return Promise.reject(error);
} }
) );
service.interceptors.response.use( service.interceptors.response.use(
response => { (response) => {
const res = response.data const res = response.data;
if (res.code == 401 || res.code == 402 || res.code == 403) { if (res.code == 401 || res.code == 402 || res.code == 403) {
if (!isRelogin.show) { if (!isRelogin.show) {
isRelogin.show = true; isRelogin.show = true;
// i18n.t('ENU_P_TYPE0') // i18n.t('ENU_P_TYPE0')
MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText:'取消', type: 'warning' }).then(() => { MessageBox.confirm("登录状态已过期,请重新登录", "系统提示", {
store.dispatch('LogOut').then(() => { confirmButtonText: "重新登录",
location.href = '/'; cancelButtonText: "取消",
type: "warning",
})
.then(() => {
store.dispatch("LogOut").then(() => {
location.href = "/";
});
}) })
}).catch(() => { .catch(() => {
isRelogin.show = false; isRelogin.show = false;
}); });
} }
} else if (res.code == 500) { } else if (res.code == 500) {
Message({ Message({
message: res.msg || 'Error', message: res.msg || "Error",
type: 'error', type: "error",
duration: 5 * 1000 duration: 5 * 1000,
}) });
return Promise.reject(new Error(res.msg || 'Error')) return Promise.reject(new Error(res.msg || "Error"));
} else { } else {
return res return res;
} }
}, },
error => { (error) => {
Message({ Message({
message: error.message, message: error.message,
type: 'error', type: "error",
duration: 5 * 1000 duration: 5 * 1000,
}) });
return Promise.reject(error) return Promise.reject(error);
} }
) );
// 通用下载方法 // 通用下载方法
export function download(url, params, filename, config) { export function download(url, params, filename, config) {
downloadLoadingInstance = Loading.service({ text: '正在下载数据，请稍候', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) downloadLoadingInstance = Loading.service({
return service.post(url, params, { text: "正在下载数据，请稍候",
transformRequest: [(params) => { spinner: "el-icon-loading",
return tansParams(params) background: "rgba(0, 0, 0, 0.7)",
}], });
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, return service
responseType: 'blob', .post(url, params, {
...config transformRequest: [
}).then(async (data) => { (params) => {
const isLogin = await blobValidate(data) return tansParams(params);
if (isLogin) { },
const blob = new Blob([data]) ],
saveAs(blob, filename) headers: { "Content-Type": "application/x-www-form-urlencoded" },
} else { responseType: "blob",
const resText = await data.text() ...config,
const rspObj = JSON.parse(resText) })
const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] .then(async (data) => {
Message.error(errMsg) const isLogin = await blobValidate(data);
} if (isLogin) {
downloadLoadingInstance.close() const blob = new Blob([data]);
}).catch((r) => { saveAs(blob, filename);
console.error(r) } else {
Message.error('下载文件出现错误，请联系管理员！') const resText = await data.text();
downloadLoadingInstance.close() 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;

47
vue.config.js
View File

@ -5,13 +5,13 @@
* @Date: 2022-09-29 10:04:55 * @Date: 2022-09-29 10:04:55
*/ */
// 引入等比适配插件 // 引入等比适配插件
const px2rem = require('postcss-px2rem') const px2rem = require("postcss-px2rem");
// 配置基本大小 // 配置基本大小
const postcss = px2rem({ const postcss = px2rem({
// 基准大小 baseSize，需要和rem.js中相同 // 基准大小 baseSize，需要和rem.js中相同
remUnit: 16 remUnit: 16,
}) });
// 使用等比适配插件 // 使用等比适配插件
module.exports = { module.exports = {
@ -19,27 +19,34 @@ module.exports = {
css: { css: {
loaderOptions: { loaderOptions: {
postcss: { postcss: {
plugins: [ plugins: [postcss],
postcss },
] },
}
}
}, },
configureWebpack: { configureWebpack: {
externals: { externals: {
'zhCN': 'zhCN', zhCN: "zhCN",
'enUS': 'enUS', enUS: "enUS",
'zhTC': 'zhTC', zhTC: "zhTC",
// 'ruRU':'ruRU', // 'ruRU':'ruRU',
// 'frFR':'frFR', // 'frFR':'frFR',
}, },
}, },
chainWebpack: config => { chainWebpack: (config) => {
config config.plugin("html").tap((args) => {
.plugin('html') args[0].title = "会员系统";
.tap(args => { return args;
args[0].title = '会员系统' });
return args },
}) devServer: {
} proxy: {
} "/prod-api": {
target: "http://t-mana.beida413.com",
changeOrigin: true,
// pathRewrite: {
// "^/prod-api": "",
// },
},
},
},
};