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

models/topic.js

@@ -151,13 +151,14 @@ class TopicModel extends HTTP {
     this.request(params)
   }
 
-  addMessage(title,content,success){
+  addMessage(title, content, picList,success){
     let params = {
       url: TopicBaseUrl.topic_addMessage_url,
       method: Method.POST,
       data: {
         title:title,
-        content: content
+        content: content,
+        picList: picList,
       },
       success: success
     }

pages/topics/index.js

@@ -45,22 +45,23 @@ Page({
   },
   onShow: function () {
     // 页面出现在前台时执行
-    console.log('啦啦啦')
     let segmentIndex = this.data.segmentIndex
     if (segmentIndex === 0 || segmentIndex === 1){
       wx.pageScrollTo({
         scrollTop: 0,
       })
+
+      this.setData({
+        currPage: 1,
+      })
+      switch (this.data.segmentIndex) {
+        case 0:
+          return this.fetchTopicList()
+        case 1:
+          return this.fetchGoodIdeaList()
+      }
     }
-    this.setData({
+    
-      currPage: 1,
-    })
-    switch (this.data.segmentIndex) {
-      case 0:
-        return this.fetchTopicList()
-      case 1:
-        return this.fetchGoodIdeaList()
-    }
   },
   fetchTopicList () {
     let page = this.data.currPage
@@ -174,14 +175,24 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    this.setData({
+    let segmentIndex = this.data.segmentIndex
-      currPage: 1,
+    if (segmentIndex === 2){
-    })
+      wx.stopPullDownRefresh()
-    switch (this.data.segmentIndex) {
+    }
-      case 0:
+    if (segmentIndex === 0 || segmentIndex === 1) {
-        return this.fetchTopicList()
+      wx.pageScrollTo({
-      case 1:
+        scrollTop: 0,
-        return this.fetchGoodIdeaList()
+      })
+
+      this.setData({
+        currPage: 1,
+      })
+      switch (this.data.segmentIndex) {
+        case 0:
+          return this.fetchTopicList()
+        case 1:
+          return this.fetchGoodIdeaList()
+      }
     }
   },
 
@@ -189,16 +200,24 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    const page = this.data.currPage + 1
+    let segmentIndex = this.data.segmentIndex
-    this.setData({
+    if(segmentIndex === 2){
-      currPage: page
+      return
-    })
-    switch (this.data.segmentIndex) {
-      case 0:
-        return this.fetchTopicList()
-      case 1:
-        return this.fetchGoodIdeaList()
     }
+    
+    if (segmentIndex === 0 || segmentIndex === 1) {
+      const page = this.data.currPage + 1
+      this.setData({
+        currPage: page
+      })
+      switch (this.data.segmentIndex) {
+        case 0:
+          return this.fetchTopicList()
+        case 1:
+          return this.fetchGoodIdeaList()
+      }
+    }
+    
   },
 
   // 定义点击标题的事件处理函数，将选中标题的id赋值给selectedTitle

pages/topics/interactive/cell/index.wxss

@@ -10,21 +10,25 @@
 .left{
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
   /* width: 70%; */
   flex:1;
+  height: 80px;
+  
 }
 .leftActive{
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 80px;
 }
 .left-bottom{
   display: flex;
   flex: row;
   justify-content: space-between;
+  padding: 5px 0;
 }
 .left-bottom-userInfo{
-  padding: 5px 0;
   display: flex;
   flex: row;
   align-items: center;
@@ -121,6 +125,7 @@ image{
 .content {
   width: 100%;
   /* padding: 10px; */
+  
   line-height: 22px;
   margin-right:0;
   -webkit-transition: all 0.4s;

pages/topics/message/index.js

@@ -1,4 +1,6 @@
 // pages/topics/common/message/index.js
+import { config } from '../../../config.js'
+import { store } from '../../../utils/store.js'
 import { TopicModel } from '../../../models/topic.js'
 let topicModel = new TopicModel()
 
@@ -16,11 +18,32 @@ Component({
   data: {
     messageTitle:"",
     messageDetail:"",
+    files: [],
   },
+  // lifetimes: {
+  //   attached: function () {
+  //     // 在组件实例进入页面节点树时执行
+  //   },
+  //   detached: function () {
+  //     // 在组件实例被从页面节点树移除时执行
+  //   }
+  // },
+  // attached: function () {
+  //   console.log('啦啦啦')
+  // },
 
   /**
    * 组件的方法列表
    */
+  attached: function () {
+    console.log('啦啦啦')
+    this.setData({
+      uplaodFile: this.uplaodFile.bind(this)
+    })
+
+
+    
+  },
   methods: {
     bindTextInput(e) {
       this.setData({
@@ -32,6 +55,48 @@ Component({
         messageDetail: e.detail.value
       })
     },
+
+    uplaodFile(files) {
+      console.log('upload files', files)
+      // 文件上传的函数，返回一个promise
+      const token = store.readToken()
+      console.log(token)
+      return new Promise((resolve, reject) => {
+        files.tempFilePaths.forEach(item => {
+          wx.uploadFile({
+            url: config.api_url + "/api/common/view",
+            filePath: item,
+            header: {
+              'token': token,
+              'content-type': 'application/json',
+            },
+            name: 'files',
+            success: (res) => {
+              console.log(res);
+              const data = JSON.parse(res.data)
+              const image = {
+                url: config.api_url + '/' + data.result.imgUrl,
+              }
+              this.setData({
+                files: [...this.data.files, image]
+              })
+              resolve(this.data.files)
+            }
+          })
+        })
+      })
+    },
+    deleteFile(e) {
+      console.log(e)
+      let tempImages = this.data.files
+      const index = e.detail.index
+
+      tempImages.splice(index, 1);
+      this.setData({
+        files: tempImages
+      })
+    },
+
     submit() {
       if (this.data.messageTitle === '') {
         wx.showModal({
@@ -50,11 +115,12 @@ Component({
         return
       }
 
-      topicModel.addMessage(this.data.messageTitle, this.data.messageDetail,res=>{
+      topicModel.addMessage(this.data.messageTitle, this.data.messageDetail,this.data.files,res=>{
         if(res.code === 200){
           this.setData({
             messageTitle:'',
-            messageDetail: ''
+            messageDetail: '',
+            files:[],
           },()=>{
             wx.showToast({
               title: res.message,

pages/topics/message/index.json

@@ -1,6 +1,9 @@
 {
   "component": true,
   "usingComponents": {
-    "e-ibutton": "/components/image-button/index"
+    "e-ibutton": "/components/image-button/index",
+    "mp-cells": "/components/weui/cells/cells",
+    "mp-cell": "/components/weui/cell/cell",
+    "mp-uploader": "/components/weui/uploader/uploader"
   }
 }

pages/topics/message/index.wxml

@@ -10,6 +10,13 @@
       <view class="must_fill">＊</view>
       <textarea class="textArea" value="{{messageDetail}}" bindinput="bindTextAreaInput" placeholder="请输入正文" />
     </view>
+
+    <mp-cells ext-class="uploader_msg_bd">
+      <mp-cell>
+          <mp-uploader ext-class="myUploader" binddelete="deleteFile" upload="{{uplaodFile}}" files="{{files}}" max-count="9" delete="true"></mp-uploader>
+      </mp-cell>
+    </mp-cells>
+
     <view class="btnView">
       <e-ibutton title="提交" bind:onTap="submit"/>
     </view>

pages/topics/message/index.wxss

@@ -51,3 +51,20 @@
     #D70403 100%
   );
 }
+
+.uploader_msg_bd .weui-cell{
+  padding: 10px 0 10px 0;
+}
+/* .uploader_bd ::before{
+  border-top: none;
+} */
+.uploader_msg_bd .weui-uploader__title,.weui-uploader__info{
+  font-size: 14px;
+}
+.uploader_msg_bd .weui-uploader__input,
+.uploader_msg_bd .weui-uploader__input-box,
+.uploader_msg_bd .weui-uploader__file_status,
+.uploader_msg_bd .weui-uploader__img{
+  width: 77px;
+  height: 77px;
+}

pages/user/myActivity/index.js

@@ -14,7 +14,7 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面加载
+   * 生命周期函数--监听页面加载1
    */
   onLoad: function (options) {
     this.setData({

pages/user/myFavorite/index.js

@@ -24,6 +24,9 @@ Page({
     this.setData({
       currentPage: 1
     })
+    wx.pageScrollTo({
+      scrollTop: 0,
+    })
     this.fetchMyFavoriteList()
   },
   fetchMyFavoriteList () {

pages/user/myIdea/index.js

@@ -22,12 +22,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    
+  },
+  onShow: function () {
     this.setData({
       currentPage: 1
     })
+    wx.pageScrollTo({
+      scrollTop: 0,
+    })
     this.fetchMyIdeaList()
   },
-
   fetchMyIdeaList(){
     let page = this.data.currentPage
     userModel.goldenList(page,res=>{

pages/user/myTopics/index.js

@@ -27,6 +27,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
+  },
+  onShow: function () {
+    this.setData({
+      currentPage: 1
+    })
+    wx.pageScrollTo({
+      scrollTop: 0,
+    })
     this.fetchMyTopicList()
   },
   /**

pages/user/myTopics/myParticipant/cell/index.wxss

@@ -10,21 +10,24 @@
 .left{
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
   /* width: 70%; */
   flex:1;
+  height: 80px;
 }
 .leftActive{
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 80px;
 }
 .left-bottom{
   display: flex;
   flex: row;
   justify-content: space-between;
+  padding: 5px 0;
 }
 .left-bottom-userInfo{
-  padding: 5px 0;
   display: flex;
   flex: row;
   align-items: center;