|
@@ -93,11 +93,7 @@
|
|
|
|
|
|
|
|
//发送get请求
|
|
//发送get请求
|
|
|
Vue.http.get('/doc/api/page', _param)
|
|
Vue.http.get('/doc/api/page', _param)
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
//Vue.http.get('mock/pages.json', _param)
|
|
//Vue.http.get('mock/pages.json', _param)
|
|
|
-=======
|
|
|
|
|
- // Vue.http.get('mock/pages.json', _param)
|
|
|
|
|
->>>>>>> cd8657e2dcffe17efd02cd055f8e6dfd6d703c96
|
|
|
|
|
.then(function(res) {
|
|
.then(function(res) {
|
|
|
_that.pages = res.data;
|
|
_that.pages = res.data;
|
|
|
if (_that.pages.length < 1) {
|
|
if (_that.pages.length < 1) {
|
java110