Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

# Conflicts:
#	src/pages/learn/index.vue

.env.dev.js

@@ -5,8 +5,8 @@ const UNI_APP = {
 		// banshou: 'https://m.banshou.com', //扳手app
 	},
 	systemUrl: {
-		apiUrl: 'http://192.168.1.22', //java端域名请求头
-		// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
+		// apiUrl: 'http://192.168.1.22', //java端域名请求头
+		apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
 	},
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/'
 }