Merge branch 'master' into 'master'

Master index页面发起网络请求，并做了H5跨域请求处理。 See merge request !6

Merge branch 'master' into 'master'
Master index页面发起网络请求，并做了H5跨域请求处理。 See merge request !6
Adam
2 parents 066667dc4f 7b2f948d4f
Showing 2 changed files Show diff stats
src/App.vue
src/vue.config.js
@@ -6,6 +6,7 @@
             console.log('App Launch')
         },
         onShow() {
+
             console.log('App Show')
         },
         onHide() {
@@ -0,0 +1,17 @@
+// const webpackApiMocker = require('mocker-api')
+
+// module.exports = {
+//     devServer: {
+//         before(app) {
+//             webpackApiMocker(app, path.resolve('./mock/index.js'))
+//         },
+//         proxy: {
+//             '/app/prod/list': {
+//                 target: 'https://api.glass.xiuyetang.com/',
+//                 pathRewrite: {
+//                     '^/app': ''
+//                 }
+//             }
+//         },
+//     }
+// }
 \ No newline at end of file
...	...	@@ -0,0 +1,17 @@
	1	+// const webpackApiMocker = require('mocker-api')
	2	+
	3	+// module.exports = {
	4	+// devServer: {
	5	+// before(app) {
	6	+// webpackApiMocker(app, path.resolve('./mock/index.js'))
	7	+// },
	8	+// proxy: {
	9	+// '/app/prod/list': {
	10	+// target: 'https://api.glass.xiuyetang.com/',
	11	+// pathRewrite: {
	12	+// '^/app': ''
	13	+// }
	14	+// }
	15	+// },
	16	+// }
	17	+// }
0	18	\ No newline at end of file
...	...