Merge branch 'master' of http://git.liuniu946.com/lhl/tlfb

manifest.json

@@ -73,7 +73,8 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://tl.frp.liuniu946.com/api",
+                    // "target" : "http://tl.frp.liuniu946.com/api",
+					"target" : "http://tl.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages/user/jindou.vue

@@ -127,10 +127,10 @@ export default {
 				},
 			)
 				.then(({ data }) => {
-					navItem.orderList = navItem.orderList.concat(data);
+					navItem.orderList = navItem.orderList.concat(data.list);
 					console.log(navItem.orderList)
 					navItem.page++;
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;

pages/user/jinquan.vue

@@ -22,7 +22,7 @@
 						<view v-for="(item, i) in ls.list" class="order-item flex">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.title }}</text>
+									<text>{{ item.mark }}</text>
 								</view>
 
 								<view class="time">