2023-3-27

mallplusui-web-admin/config/index.js

@@ -1,69 +1,80 @@
  'use strict'
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
+ // Template version: 1.3.1
+ // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require('path')
+ const path = require('path')
 
-module.exports = {
-  dev: {
 
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
+ module.exports = {
+ 	dev: {
+ 		env: require('./dev.env'),
+ 		// Paths
+ 		assetsSubDirectory: 'static',
+ 		assetsPublicPath: '/',
+ 		proxyTable: {
+ 			'/api': { // 匹配所有以 '/api'开头的请求路径
+ 				target: 'http://192.168.3.9:8085', // 代理目标的基础路径
+ 				// target: 'https://260e7735j5.oicp.vip', // 代理目标的基础路径
+ 				// target: process.env.VUE_APP_URL, // 代理目标的基础路径
+ 				changeOrigin: true, // 支持跨域
+ 				pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
+ 					'^/api': ''
+ 				}
+ 			}
+ 		},
 
-    // Various Dev Server settings
-    host: '127.0.0.1', // can be overwritten by process.env.HOST localhost
-    port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+ 		// Various Dev Server settings
+ 		host: '127.0.0.1', // can be overwritten by process.env.HOST localhost
+ 		port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ 		autoOpenBrowser: false,
+ 		errorOverlay: true,
+ 		notifyOnErrors: true,
+ 		poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
 
-    /**
-     * Source Maps
-     */
+ 		/**
+ 		 * Source Maps
+ 		 */
 
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-module-eval-source-map',
+ 		// https://webpack.js.org/configuration/devtool/#development
+ 		devtool: 'cheap-module-eval-source-map',
 
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
+ 		// If you have problems debugging vue-files in devtools,
+ 		// set this to false - it *may* help
+ 		// https://vue-loader.vuejs.org/en/options.html#cachebusting
+ 		cacheBusting: true,
 
-    cssSourceMap: true
-  },
+ 		cssSourceMap: true
+ 	},
 
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+ 	build: {
+ 		// Template for index.html
+ 		index: path.resolve(__dirname, '../dist/index.html'),
 
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: './',
+ 		// Paths
+ 		assetsRoot: path.resolve(__dirname, '../dist'),
+ 		assetsSubDirectory: 'static',
+ 		assetsPublicPath: './',
 
-    /**
-     * Source Maps
-     */
+ 		/**
+ 		 * Source Maps
+ 		 */
 
-    productionSourceMap: true,
-    // https://webpack.js.org/configuration/devtool/#production
-    // devtool: '#source-map',
+ 		productionSourceMap: true,
+ 		// https://webpack.js.org/configuration/devtool/#production
+ 		// devtool: '#source-map',
 
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: true,
-    productionGzipExtensions: ['js', 'css'],
+ 		// Gzip off by default as many popular static hosts such as
+ 		// Surge or Netlify already gzip all static assets for you.
+ 		// Before setting to `true`, make sure to:
+ 		// npm install --save-dev compression-webpack-plugin
+ 		productionGzip: true,
+ 		productionGzipExtensions: ['js', 'css'],
 
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}
+ 		// Run the build command with an extra argument to
+ 		// View the bundle analyzer report after build finishes:
+ 		// `npm run build --report`
+ 		// Set to `true` or `false` to always turn it on or off
+ 		bundleAnalyzerReport: process.env.npm_config_report
+ 	}
+ }

mallplusui-web-admin/src/api/order.js

@@ -70,6 +70,7 @@ export function orderData(params) {
 
 export function exportExcel(params) {
 	return request({
+		  baseURL: '/api',
 		url: '/oms/OmsOrder/exportExcel',
 		method: 'post',
 		responseType: 'blob', // 表明返回服务器返回的数据类型

mallplusui-web-admin/src/main.js

@@ -10,6 +10,13 @@ import VCharts from 'v-charts'
 import '@/styles/index.scss' // global css
 
 import App from './App'
+import Axios from 'axios'
+
+Vue.prototype.$axios = Axios
+Axios.defaults.baseURL = '/api'
+Axios.defaults.headers.post['Content-Type'] = 'application/json';
+
+
 import router from './router'
 import store from './store'
 // 全局自定义组件

mallplusui-web-admin/src/views/oms/order/index1.vue

@@ -798,7 +798,7 @@
 				exportExcel(this.listQuery).then((resp) => {
 					// loading.close()
 					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
+						type: 'application/vnd.ms-excel;charset=utf-8'
 					})
 					const fileName = '订单列表' + '.xls'
 					const elink = document.createElement('a')