Merge branch 'xieying' of gitadmin/tuoheng_qmhh_web into develop

package_first/pages/ActivityApply/index.js

      */
     data: {
         activityId: null,
+        activityInfo:{},
         userInfo: {
             applyName: '',
             applyPhone: ''
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        const activityId = options.id
+        const activityInfo = JSON.parse(decodeURIComponent(options.activityInfo))
         this.setData({
-            activityId
+            activityInfo
         })
     },
 
               return
         }
         const openid = wx.getStorageSync('openid')
+        const userInfo = wx.getStorageSync('userInfo')
         const params = {
             ...this.data.userInfo,
             openid,
-            activityId: this.data.activityId
+            nickname:userInfo.nickname,
+            activityId: this.data.activityInfo.id,
+            activityTitle:this.data.activityInfo.activityTitle
         }
         activitySubmit(params)
         .then(res=>{
-            console.log(res);
+            if(res.code==0){
+                wx.showToast({
+                  title: '报名成功',
+                  icon:"none"
+                }),
+                setTimeout(()=>{
+                    wx.navigateBack()
+                }
+                ,2000)
+            }
         })
     },
 

package_first/pages/AddPicture/index.js

                                 icon:'none'
                             })
                             setTimeout(()=>{
-                                wx.redirectTo({
-                                  url: '../../pages/AttentionMethod/index',
-                                })
+                                wx.navigateBack()
                             },2000)
                         }
                     }).finally(()=>{

package_first/pages/AttentionMethod/index.js

      * 页面的初始数据
      */
     data: {
-
+        status:null
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+        let status = options.status
+        this.setData({
+            status
+        })
     },
 
     /**
 
     },
     goPage(e){
+        console.log();
+        if(this.data.status==1){
+            wx.showToast({
+              title: '您已参加该活动',
+              icon:"none"
+            })
+            return
+        }
         wx.navigateTo({
             url: `/package_first/pages/AddPicture/index`,
         })

package_first/pages/ProtectionActivity/index.js

      * 页面的初始数据
      */
     data: {
+        tikStatus:null,
         entersList:[
             {
                 title:'关注抖音',
         }else{
             const data = { openid }
             api_getIsApply(data).then(res=>{
-                console.log(res);
+                let tikStatus = res.data
                 entersList[0].isJoin = res.data == 2 ? true:false
-                this.setData({ entersList })
+                this.setData({ entersList,tikStatus })
             })
         }
 
     },
     goPage(e){
         const { path } = e.currentTarget.dataset
-        wx.navigateTo({
-            url: path
-        })
+        if(path=='/package_first/pages/AttentionMethod/index'){
+            wx.navigateTo({
+                url: '/package_first/pages/AttentionMethod/index?status='+this.data.tikStatus
+            })
+        }else{
+            wx.navigateTo({
+                url: path
+            })
+        }
     },
     homepage(e){
         wx.switchTab({

package_first/pages/VolunteerDetail/index.js

             })
             return
         }
-
         if(this.data.status === 3){
+            let activityInfo = JSON.stringify(this.data.activityInfo)
             wx.navigateTo({
-                url:"/package_first/pages/ActivityApply/index?id=" + this.data.activityInfo.id
+                url:"/package_first/pages/ActivityApply/index?activityInfo=" +  encodeURIComponent(activityInfo)
             })
         }
       },