冲突

0bf99ddf · zhengzy · 10fa606f · 0bf99ddf · 0bf99ddf · 0bf99ddf
Commit 0bf99ddf authored Apr 25, 2021 by zhengzy
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 365 additions and 370 deletions

.env.dev.js .env.dev.js +2 -2

.env.js .env.js +1 -1

index.vue src/pages/learn/index.vue +362 -367

No files found.
--- a/.env.dev.js
+++ b/.env.dev.js
 const UNI_APP = {
 	ucenterUrl: {
-		apiUrl: 'http://rest-u.yunya.com', //php端域名请求头
+		apiUrl: 'http://192.168.1.46', //php端域名请求头
-		// xueUrl: 'https://xue.banshouhui.com', //学院
+		xueUrl: 'http://192.168.1.46:8088', //学院
 		// banshou: 'https://m.banshou.com', //扳手app
 	},
 	systemUrl: {

--- a/.env.js
+++ b/.env.js
 ;
 (function() {
-	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境  
+	let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
 	let ENV_VAR = null;
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {

--- a/src/pages/learn/index.vue
+++ b/src/pages/learn/index.vue