Merge branch 'test' into dev_install

# Conflicts:
#	pages/index.vue

nuxt.config.js

@@ -1,9 +1,5 @@
-// const env = require('./env')
-// module.exports = {
-//   env: {
-//     NUXT_ENV: env[process.env.MODE]
-//   }
-// }
+const env = require('./env')
+
 export default {
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
@@ -64,5 +60,8 @@ export default {
         component: resolve(__dirname, 'pages/404.vue')
       })
     }
+  },
+  env: {
+    NUXT_ENV: env[process.env.MODE]
   }
 }

pages/index.vue

@@ -131,7 +131,8 @@ const api = {
 	test: 'https://testapi.denet.me',
 }
 
-const baseURL = api[process.env.MODE]
+const baseURL = api[process.env.NUXT_ENV.MODE]
+
 
 export default {
 	name: "index",
@@ -234,7 +235,7 @@ export default {
 			}
 		},
 		async getRedPacket() {
-			let { data } = await axios.post(`${this.base_url}/denet/post/luckdrop/receiveLuckdrop`, {
+			let { data } = await axios.post(`${baseURL}/denet/post/luckdrop/receiveLuckdrop`, {
 				baseInfo: {
 					appVersionCode: this.appVersionCode,
 					mid: this.mid
@@ -272,7 +273,7 @@ export default {
 		},
 		async getReceivedList() {
 
-			let { data } = await axios.post(`${this.base_url}/denet/post/luckdrop/getReceivedList`, {
+			let { data } = await axios.post(`${baseURL}/denet/post/luckdrop/getReceivedList`, {
 				baseInfo: {
 					appVersionCode: this.appVersionCode,
 					mid: this.mid
@@ -339,7 +340,6 @@ export default {
 				data.data.postBizData = JSON.parse(data.data.postBizData)
 			}
 			return {
-				base_url:baseURL,
 				detail: data.data,
 			}
 		}