Merge branch 'master' of ssh://192.168.1.202:8088/lx/shares

pages/attention/attention.js

@@ -60,22 +60,21 @@ Page({
       onInit: initChart
     },
     array:[],
+    currentPage:1
 
   },
   onLoad: function() {
     var that = this;
     // 获取关注的信息
+    console.log(this.data.currentPage)
     var userId={
-      userId:wx.getStorageSync('openid')
-      // userId:'ocVI541TGfnTChi5DlIa7beac2YM'
-    }
-    // console.log(userId);
+      userId:wx.getStorageSync('openid'),
+      currPage:this.data.currentPage
+    };
     var that = this;
-    // this.getFollow(userId);
     wx.showLoading({title: '加载中…'})
-    wxRequest.followList(userId).then((res)=>{
-      
-      // console.log(res);
+    wxRequest.followList(userId).then((res)=>{     
+      console.log(res);
       // console.log(res.data.data); 
       wx.hideLoading()    
       if(res.statusCode==200){

project.config.json

@@ -20,6 +20,7 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],