Merge refs/remotes/origin/master into refs/heads/master

pages/topics/message/index.js

@@ -64,7 +64,7 @@ Component({
       return new Promise((resolve, reject) => {
         files.tempFilePaths.forEach(item => {
           wx.uploadFile({
-            url: config.api_url + "/api/common/view",
+            url: config.api_url + "/api/common/upload",
             filePath: item,
             header: {
               'token': token,

pages/user/myActivity/index.js

@@ -48,9 +48,9 @@ Page({
             list: list
           })
         } else {
-          const page = this.data.currPage - 1
+          const page = this.data.currentPage - 1
           this.setData({
-            currPage: page
+            currentPage: page
           })
           wx.showToast({
             title: '已加载全部',

pages/user/myFavorite/index.js

@@ -58,9 +58,9 @@ Page({
             list: list
           })
         } else {
-          const page = this.data.currPage - 1
+          const page = this.data.currentPage - 1
           this.setData({
-            currPage: page
+            currentPage: page
           })
           wx.showToast({
             title: '已加载全部',
@@ -77,7 +77,7 @@ Page({
    */
   onPullDownRefresh: function () {
     this.setData({
-      currPage: 1,
+      currentPage: 1,
     })
     this.fetchMyFavoriteList()
   },
@@ -88,7 +88,7 @@ Page({
   onReachBottom: function () {
     let page = this.data.currentPage + 1
     this.setData({
-      currPage: page,
+      currentPage: page,
     })
     this.fetchMyFavoriteList()
   },

pages/user/myIdea/index.js

@@ -68,9 +68,9 @@ Page({
             list: list
           })
         } else {
-          const page = this.data.currPage - 1
+          const page = this.data.currentPage - 1
           this.setData({
-            currPage: page
+            currentPage: page
           })
           wx.showToast({
             title: '已加载全部',
@@ -136,7 +136,7 @@ Page({
           icon: 'none',
           success() {
             that.setData({
-              currPage: 1,
+              currentPage: 1,
             })
             switch (that.data.segmentIndex) {
               case 0:

pages/user/myMessage/index.js

@@ -21,9 +21,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
+  },
+  onShow: function () {
+    this.setData({
+      currentPage: 1,
+    })
+    wx.pageScrollTo({
+      scrollTop: 0,
+    })
     this.fetchMyMessageList()
   },
-
   fetchMyMessageList(){
     let page = this.data.currentPage
     userModel.getMyMessageList(page,res=>{
@@ -54,9 +62,9 @@ Page({
             list: list
           })
         } else {
-          const page = this.data.currPage - 1
+          const page = this.data.currentPage - 1
           this.setData({
-            currPage: page
+            currentPage: page
           })
           wx.showToast({
             title: '已加载全部',
@@ -75,7 +83,7 @@ Page({
    */
   onPullDownRefresh: function () {
     this.setData({
-      currPage: 1,
+      currentPage: 1,
     })
     this.fetchMyMessageList()
   },
@@ -84,9 +92,9 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    const page = this.data.currPage + 1
+    const page = this.data.currentPage + 1
     this.setData({
-      currPage: page
+      currentPage: page
     })
     this.fetchMyMessageList()
   },

pages/user/myTopics/index.js

@@ -88,9 +88,9 @@ Page({
             list: list
           })
         } else {
-          const page = this.data.currPage - 1
+          const page = this.data.currentPage - 1
           this.setData({
-            currPage: page
+            currentPage: page
           })
           wx.showToast({
             title: '已加载全部',