update topic

pages/topics/goodIdea/cell/index.js

@@ -29,12 +29,13 @@ Component({
     },
     onClickPraise(e) {
       const sIndex = e.currentTarget.dataset.index
-      // var selectItem = e.currentTarget.dataset.item
+      var selectItem = e.currentTarget.dataset.item
+      console.log(selectItem)
       // var isPraise = "itemData.isPraise"
       // this.setData({
       //   [isPraise]:!isPraise
       // })
-
+      console.log('啦啦啦')
       this.triggerEvent('tapGoodIdeaPraise', {index:sIndex})
       // const commentList = this.data.commentList
       // const tempList = []
@@ -47,8 +48,21 @@ Component({
       // this.setData({
       //   commentList: tempList,
       // })
-      // this.fetchGoodIdeaPraise(selectItem.id)
+      this.fetchGoodIdeaPraise(selectItem.groupId)
       // 评论点赞
-    }
+    },
+
+    fetchGoodIdeaPraise(id) {
+      topicModel.topicCommentPraise(id, res => {
+        console.log(res)
+        if (res.code === 200) {
+          wx.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+          // this.fetchDetailComment()
+        }
+      })
+    },
   }
 })

pages/topics/interactive/submitTopic/index.js

@@ -1,4 +1,6 @@
 // pages/topics/interactive/submitTopic/index.js
+import { config } from '../../../../config.js'
+
 Page({
 
   /**
@@ -76,8 +78,54 @@ Page({
   onShareAppMessage: function () {
 
   },
-  upload: function (e) {
+  // upload: function (e) {
+  //   console.log(e)
+  //   var that = this;
+  //   wx.chooseImage({
+  //     sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+  //     sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+  //     success: function (res) {
+  //       // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+  //       that.setData({
+  //         files: that.data.files.concat(res.tempFilePaths)
+  //       });
+
+  //       wx.uploadFile({
+  //         url: config + "/api/common/upload",
+  //         filePath: path[0],
+  //         name: 'files',
+  //         header: { "Content-Type": "multipart/form-data" },
+  //         success: function (res) {
+  //           console.log(res);
+  //           if (res.statusCode != 200) {
+  //             wx.showModal({
+  //               title: '提示',
+  //               content: '上传失败',
+  //               showCancel: false
+  //             })
+  //             return;
+  //           }
+  //         },
+  //         fail: function (e) {
+  //           console.log(e);
+  //           wx.showModal({
+  //             title: '提示',
+  //             content: '上传失败',
+  //             showCancel: false
+  //           })
+  //         },
+  //         complete: function () {
+  //           wx.hideToast();  //隐藏Toast
+  //         }
+  //       })
+  //     }
+  //   })
+  // },
+  chooseImage: function (e) {
+    console.log('啦啦啦')
     console.log(e)
+    var filePath;
+
     var that = this;
     wx.chooseImage({
       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -87,25 +135,44 @@ Page({
         that.setData({
           files: that.data.files.concat(res.tempFilePaths)
         });
+
+        var files = that.data.files
+        console.log(config.api_url)
+        for (var i = 0; i < files.length; i++) {
+          filePath = files[i]
+          wx.uploadFile({
+            url: config.api_url + "/api/common/upload",
+            filePath: filePath,
+            name: 'files',
+            success: function (res) {
+              console.log(that.data.files)
+              console.log(res);
+              if (res.statusCode != 200) {
+                wx.showModal({
+                  title: '提示',
+                  content: '上传失败',
+                  showCancel: false
+                })
+                return;
+              }
+            },
+            fail: function (e) {
+              console.log(e);
+              wx.showModal({
+                title: '提示',
+                content: '上传失败',
+                showCancel: false
+              })
+            },
+            complete: function () {
+              wx.hideToast();  //隐藏Toast
+            }
+          })
+        }
       }
+      
     })
   },
-  chooseImage: function (e) {
-    console.log('啦啦啦')
-    // console.log(e)
-    // var that = this;
-    // wx.chooseImage({
-    //   sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-    //   sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-    //   success: function (res) {
-    //     console.log('啦啦啦')
-    //     // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
-    //     that.setData({
-    //       files: res.tempFilePaths
-    //     });
-    //   }
-    // })
-  },
   // previewImage: function (e) {
   //   console.log(e)
   //   wx.previewImage({
@@ -122,21 +189,36 @@ Page({
   selectFile(files) {
     console.log('files', files)
     // 返回false可以阻止某次文件上传
+
+    
   },
   uplaodFile(files) {
     console.log('upload files', files)
     // 文件上传的函数，返回一个promise
     return new Promise((resolve, reject) => {
-      setTimeout(() => {
+      files.tempFilePaths.forEach(item=>{
-        reject('some error')
+        wx.uploadFile({
-      }, 1000)
+          url: config.api_url + "/api/common/upload",
+          filePath: item,
+          name: 'files',
+          success: (res)=> {
+            console.log(res);
+            const data = JSON.parse(res.data)
+            const image = {
+              url: config.api_url + '/' + data.result,
+            }
+            this.setData({
+              files: [...this.data.files, image]
+            })
+            resolve(this.data.files)
+          }
+        })
+      })
     })
   },
-  deleteFile(e){
-    console.log(e.detai)
-  },
 
   submit(){
+
     console.log(this.data.topicTitle,this.data.topicDetail)
     console.log(this.data.files)
   }

pages/topics/interactive/submitTopic/index.wxml

@@ -5,7 +5,7 @@
   <textarea class="textArea" value="{{topicDetail}}" bindinput="bindTextAreaInput" placeholder="详情内容" />
   <mp-cells ext-class="uploader_bd">
       <mp-cell>
-          <mp-uploader ext-class="myUploader" binddelete="deleteFile" bindfail="uploadError" bindsuccess="uploadSuccess" select="{{selectFile}}" upload="{{uplaodFile}}" files="{{files}}" max-count="5" delete="true"></mp-uploader>
+          <mp-uploader ext-class="myUploader" binddelete="deleteFile" upload="{{uplaodFile}}" files="{{files}}" max-count="5" delete="true"></mp-uploader>
       </mp-cell>
   </mp-cells>
   <view class="btnView">

pages/user/myIdea/index.js

@@ -166,6 +166,7 @@ Page({
     console.log(itemData);
   },
   tapGoodIdeaPraise(e){
+    console.log('啦啦啦')
     console.log(e)
   }
 })

pages/user/myMessage/cell/index.wxml

@@ -1,14 +1,14 @@
 <!--pages/user/myMessage/cell/index.wxml-->
-<view class="cell" bindtap="onTap">
+<view class="cell" id="cell" bindtap="onTap">
   <view class="item-left">
     <!-- <image wx:if="{{itemData.msgType === 0}}" src="/images/user/activity_icon.png"></image> -->
-    <image wx:if="{{itemData.msgType === 1}}" src="/images/user/msg_icon.png"></image>
+    <image class="img" wx:if="{{itemData.msgType === 1}}" src="/images/user/msg_icon.png"></image>
-    <image wx:if="{{itemData.msgType === 2}}" src="/images/user/activity_icon.png"></image>
+    <image class="img" wx:if="{{itemData.msgType === 2}}" src="/images/user/activity_icon.png"></image>
   </view>
   <view class="item-right">
     <view class="item-text">
-      <view>{{itemData.msgName}}</view>
+      <view class="msgName">{{itemData.msgName}}</view>
-      <view>{{itemData.title}}</view>
+      <view class="title">{{itemData.title}}</view>
     </view>
     <view class="item-time">{{itemData.time}}</view>
   </view>

pages/user/myMessage/cell/index.wxss

@@ -9,7 +9,7 @@
   width: 40px;
   height: 40px;
 }
-image{
+.img{
   width: 40px;
   height: 40px;
 }
@@ -21,11 +21,11 @@ image{
   padding: 10px;
   border-bottom: 1px solid #E7E7E7;
 }
-.item-text :first-child{
+.msgName{
   font-size: 15px;
   color: #171717;
 }
-.item-text :last-child{
+.title{
   font-size: 13px;
   color: #999999;
 }

pages/user/myMessage/index.js

@@ -11,26 +11,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    list:[
+    list:[],
-      {
-        msgName:"活动提醒",
-        msgType:0,
-        title:"您的报名活动还有两天开始，立即查看",
-        time:"11:58"
-      },
-      {
-        msgName: "消息提醒",
-        msgType: 1,
-        title: "您的评论被点赞，立即查看",
-        time: "11:58"
-      },
-      {
-        msgName: "系统提醒",
-        msgType: 2,
-        title: "您的报名活动还有两天开始，查看详情",
-        time: "11:58"
-      }
-    ],
     currentPage: 1
   },