LuChongMei 10 mēneši atpakaļ
vecāks
revīzija
8e187d3760
4 mainītis faili ar 8 papildinājumiem un 8 dzēšanām
  1. 2 2
      src/config/index.js
  2. 0 2
      src/main.js
  3. 4 3
      src/utils/config.js
  4. 2 1
      vue.config.js

+ 2 - 2
src/config/index.js

@@ -1,11 +1,11 @@
 var defaultConfig = {
 
-    // baseUrl : 'http://2.142.215.98:8010/hs',//政务网环境地址
+    baseUrl : 'http://2.142.215.98:8010/hs',//政务网环境地址
 
     //baseUrl : 'http://192.168.1.102:3000',
 
     // baseUrl: 'http://localhost:3000',
-    baseUrl: '/api',
+    // baseUrl: '/api',
 
     timeout: '50000',
 

+ 0 - 2
src/main.js

@@ -7,7 +7,6 @@ import './styles/style.css';
 import api from '@/api';
 import axios from 'axios';
 import dictUtils from '@/utils/dictUtils'
-import auth from '@/utils/auth'
 
 
 import { NavBar, Button, Form, Field, CellGroup, Tabbar, TabbarItem, Icon, Toast, Image as VanImage, Grid, GridItem, Row, Col, Tab, Tabs, Popup, PickerGroup, DatePicker, TimePicker, Picker, Uploader, Dialog, List, Cell, Cascader, Search, RadioGroup, Radio, DropdownMenu, DropdownItem, SwipeCell, Checkbox, CheckboxGroup, Swipe, SwipeItem, Loading, TextEllipsis, TreeSelect, Sidebar, SidebarItem } from 'vant';
@@ -61,5 +60,4 @@ app.use(router)
 app.config.globalProperties.$API = api
 app.config.globalProperties.$axios = axios
 app.config.globalProperties.$dictUtils = dictUtils
-app.config.globalProperties.$hasPermission = auth.hasPermission // 权限方法
 app.mount('#app')

+ 4 - 3
src/utils/config.js

@@ -5,10 +5,11 @@ if (process.env.NODE_ENV === 'development') {
     //APP_SERVER_URL = 'http://192.168.139.110:8084'
     //APP_SERVER_URL = 'http://192.168.139.74:8080'
     //APP_SERVER_URL = 'http://192.168.139.77:8084'    
-    //APP_SERVER_URL = 'http://localhost:8084'
+    // APP_SERVER_URL = 'http://192.168.139.9:8084'
     //测试线上
-    APP_SERVER_URL = 'http://192.168.139.102:8084'
-    
+    // APP_SERVER_URL = 'http://192.168.139.102:8084'
+    APP_SERVER_URL = '/api'
+
 } else {
     // 生产环境
     APP_SERVER_URL = 'http://2.142.215.98:8010/hs'

+ 2 - 1
vue.config.js

@@ -9,7 +9,8 @@ module.exports = defineConfig({
         proxy: {
             '/api': {
                 //target:'http://124.70.137.152:8095',// http://2.142.215.98:8010
-                target: 'http://192.168.139.102:8084', // 
+                // target: 'http://192.168.139.9:8084',
+                target: 'http://2.142.215.98:8010',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': '/'