来活动

components/cell/index.wxss

@@ -4,7 +4,7 @@
   border-bottom: 1px solid #E7E7E7;
   display: flex;
   flex-direction: row;
-  padding: 10px 20rpx;
+  padding: 20rpx 20rpx;
 }
 .cell-left {
   flex:1;

models/topic.js

@@ -338,7 +338,7 @@ class TopicModel extends HTTP {
   getActivityList(source, page, success) {
     let params = {
       url: TopicBaseUrl.activity_list_url,
-      method: Method.POST,
+      method: Method.GET,
       data: {
         source:source,
         pageNo:page,

pages/resource/detail/index.wxss

@@ -85,6 +85,7 @@ page{
 .resource-activity-lists .list-title{
   font-size: 32rpx;
   color: #4f4f4f;
+  padding-left: 20rpx;
 }
 .section_line {
   padding: 0;

pages/topics/activity/activity Registration/index.js

@@ -1,169 +0,0 @@
-// pages/topics/activity/activitySign/index.js
-import {
-  store
-} from '../../../../utils/store.js'
-import {
-  TopicModel
-} from '../../../../models/topic.js'
-let topicModel = new TopicModel()
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    aId: '',
-    username: '',
-    company: '',
-    phone: ''
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    console.log(options)
-    this.setData({
-      aId: options.activityId
-    })
-    this.initFormData()
-    // console.log(this.data.aId)
-  },
-  initFormData() {
-    let {
-      nickName,
-      phone
-    } = store.readUserInfo()
-    this.setData({
-      username: nickName,
-      phone: phone
-    })
-  },
-  changeCompany: function (e) {
-    var company = e.detail.value;
-    this.setData({
-      company: company
-    })
-  },
-  changeUsername: function (e) {
-    var username = e.detail.value;
-    this.setData({
-      username: username
-    })
-  },
-  changePhone: function (e) {
-    let isPhoneFlag = this.isPhone(e.detail.value)
-    if (!isPhoneFlag) {
-      wx.showToast({
-        title: '请输入正确格式的手机号',
-        icon: 'none',
-        duration: 2000,
-      })
-      return;
-    }
-    this.setData({
-      phone: e.detail.value
-    })
-  },
-  isPhone(value) {
-    if (!/^1(3|4|5|7|8)\d{9}$/.test(value)) {
-      return false
-    } else {
-      return true
-    }
-  },
-  submit() {
-    var th = this;
-    if (this.data.username === '') {
-      wx.showModal({
-        title: '提示',
-        content: '请输入姓名',
-        showCancel: false
-      })
-      return
-    }
-    if (this.data.phone === '') {
-      wx.showModal({
-        title: '提示',
-        content: '请输入联系电话',
-        showCancel: false
-      })
-      return
-    }
-    this.onlineSignApi()
-  },
-  //在线报名
-  onlineSignApi() {
-    topicModel.onlineSign(this.data.aId, res => {
-      if (res.code == 200) {
-        console.log(res.code);
-        wx.showModal({
-          title: res.message,
-          showCancel: false, //是否显示取消按钮
-          confirmText: "确定", //默认是“确定”
-          success: function (res) {
-            app.globalData.currentTab = "5"
-            wx.switchTab({
-              url: '../../../topics/index'
-            })
-          },
-        })
-      }
-      if (res.code != 200) {
-        wx.showToast({
-          title: res.message,
-          icon: 'none'
-        })
-      }
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/topics/activity/activity Registration/index.wxml

@@ -1,27 +0,0 @@
-<!--pages/topics/activity/activitySign/index.wxml-->
-<view class="container">
-  <view class="select-view">
-    <view class="select-con">
-      <text>姓名</text>
-      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changeUsername' placeholder="请输入姓名"
-        placeholder-style='text-align:right;color:#ACACAE;' value="{{username}}"/>
-    </view>
-  </view>
-  <view class="select-view">
-    <view class="select-con">
-      <text>工作单位</text>
-      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changeCompany' placeholder="请输入工作单位"
-        placeholder-style='text-align:right;color:#ACACAE;' value="{{company}}"/>
-    </view>
-  </view>
-  <view class="select-view">
-    <view class="select-con">
-      <text>联系电话</text>
-      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changePhone' placeholder="请输入联系电话"
-        placeholder-style='text-align:right;color:#ACACAE;' value="{{phone}}"/>
-    </view>
-  </view>
-</view>
-<view class="btnView">
-    <e-ibutton title="提交" bind:onTap="submit" />
-  </view>

pages/topics/activity/activitySign/index.js

@@ -1,18 +1,120 @@
 // pages/topics/activity/activitySign/index.js
+import {
+  store
+} from '../../../../utils/store.js'
+import {
+  TopicModel
+} from '../../../../models/topic.js'
+let topicModel = new TopicModel()
+const app = getApp()
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    aId: '',
+    username: '',
+    company: '',
+    phone: ''
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      aId: options.activityId
+    })
+    this.initFormData()
+    // console.log(this.data.aId)
+  },
+  initFormData() {
+    let {
+      nickName,
+      phone
+    } = store.readUserInfo()
+    this.setData({
+      username: nickName,
+      phone: phone
+    })
+  },
+  changeCompany: function (e) {
+    var company = e.detail.value;
+    this.setData({
+      company: company
+    })
+  },
+  changeUsername: function (e) {
+    var username = e.detail.value;
+    this.setData({
+      username: username
+    })
+  },
+  changePhone: function (e) {
+    let isPhoneFlag = this.isPhone(e.detail.value)
+    if (!isPhoneFlag) {
+      wx.showToast({
+        title: '请输入正确格式的手机号',
+        icon: 'none',
+        duration: 2000,
+      })
+      return;
+    }
+    this.setData({
+      phone: e.detail.value
+    })
+  },
+  isPhone(value) {
+    if (!/^1(3|4|5|7|8)\d{9}$/.test(value)) {
+      return false
+    } else {
+      return true
+    }
+  },
+  submit() {
+    var th = this;
+    if (this.data.username === '') {
+      wx.showModal({
+        title: '提示',
+        content: '请输入姓名',
+        showCancel: false
+      })
+      return
+    }
+    if (this.data.phone === '') {
+      wx.showModal({
+        title: '提示',
+        content: '请输入联系电话',
+        showCancel: false
+      })
+      return
+    }
+    this.onlineSignApi()
+  },
+  //在线报名
+  onlineSignApi() {
+    topicModel.onlineSign(this.data.aId, res => {
+      if (res.code == 200) {
+        console.log(res.code);
+        wx.showModal({
+          title: res.message,
+          showCancel: false, //是否显示取消按钮
+          confirmText: "确定", //默认是“确定”
+          success: function (res) {
+            app.globalData.currentTab = "5"
+            wx.switchTab({
+              url: '../../../topics/index'
+            })
+          },
+        })
+      }
+      if (res.code != 200) {
+        wx.showToast({
+          title: res.message,
+          icon: 'none'
+        })
+      }
+    })
   },
 
   /**

pages/topics/activity/activitySign/index.wxml

@@ -1,2 +1,27 @@
 <!--pages/topics/activity/activitySign/index.wxml-->
-<text>pages/topics/activity/activitySign/index.wxml</text>
+<view class="container">
+  <view class="select-view">
+    <view class="select-con">
+      <text>姓名</text>
+      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changeUsername' placeholder="请输入姓名"
+        placeholder-style='text-align:right;color:#ACACAE;' value="{{username}}"/>
+    </view>
+  </view>
+  <view class="select-view">
+    <view class="select-con">
+      <text>工作单位</text>
+      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changeCompany' placeholder="请输入工作单位"
+        placeholder-style='text-align:right;color:#ACACAE;' value="{{company}}"/>
+    </view>
+  </view>
+  <view class="select-view">
+    <view class="select-con">
+      <text>联系电话</text>
+      <input style="margin-right:20px;text-align: right;" type="text" bindinput='changePhone' placeholder="请输入联系电话"
+        placeholder-style='text-align:right;color:#ACACAE;' value="{{phone}}"/>
+    </view>
+  </view>
+</view>
+<view class="btnView">
+    <e-ibutton title="提交" bind:onTap="submit" />
+  </view>

pages/topics/activity/cell/index.wxss

@@ -124,7 +124,7 @@ image{
   margin-left: -120px;
   display: flex;
   flex-direction: row;
-  padding: 60rpx 28rpx 40rpx 34rpx;
+  padding: 60rpx 20rpx 40rpx 20rpx;
   align-items: center;
 }
 .del {

pages/topics/activity/index.wxss

@@ -1 +1,5 @@
 /* pages/topics/activity/index.wxss */
+.container{
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}

pages/topics/index.js

@@ -56,7 +56,7 @@ Page({
     //文章关联链接跳转 显示 报需求 还是来活动 tab
     let curTab = app.globalData.currentTab
     if (curTab) {
-      console.log("currentTab:" + curTab)
+      // console.log("currentTab:" + curTab)
       this.setData({
         active: curTab,
         tab: curTab
@@ -70,8 +70,6 @@ Page({
           topicList: [],
           goodIdeaList: [],
           centerList: [],
-          oceanList: [],
-          spaceList: [],
           activityList: [],
           page: 1,
           next: true
@@ -168,8 +166,6 @@ Page({
       tab: tab,
       topicList: [],
       centerList: [],
-      oceanList: [],
-      spaceList: [],
       activityList: [],
     })
 
@@ -181,7 +177,6 @@ Page({
     switch (tab) {
       case "3":
         return this.fetchCenterList()
-        // return this.fetchTopicList();
       case "5":
         return this.fetchActivityList();
       default:
@@ -287,21 +282,22 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
+    console.log('---触底了---')
     var next = this.data.next;
     var tab = this.data.tab;
     var page = this.data.page;
     if (!next) {
       return;
     }
-
     this.setData({
       page: page + 1
     })
-
     switch (tab) {
       case "3":
-        return this.fetchCenterList();
+        this.fetchCenterList()
-        // return this.fetchTopicList();
+        return;
+      case "5":
+        return this.fetchActivityList();
       default:
         return;
     }
@@ -325,8 +321,6 @@ Page({
               case 0:
                 return that.fetchTopicList()
               case 1:
-                // return that.fetchGoodIdeaList()
-                //GoodIdea修改为center
                 return that.fetchCenterList()
             }
           }
@@ -379,7 +373,7 @@ Page({
     var list = th.data.activityList;
     let source = ''
     topicModel.getActivityList(source, page, res => {
-      console.log('活动列表')
+      console.log('活动列表---')
       console.log(res)
       if (res.result.records.length == 0 && page == 1) {
         wx.showToast({
@@ -412,6 +406,7 @@ Page({
           page: page - 1
         })
       }
+
     })
   },
 

pages/topics/reportDemand/index.js

@@ -1,7 +1,13 @@
 // pages/topics/reportDemand/index.js
-import { config } from '../../../config.js'
+import {
-import { store } from '../../../utils/store.js'
+  config
-import { TopicModel } from '../../../models/topic.js'
+} from '../../../config.js'
+import {
+  store
+} from '../../../utils/store.js'
+import {
+  TopicModel
+} from '../../../models/topic.js'
 let topicModel = new TopicModel()
 Page({
 
@@ -39,6 +45,7 @@ Page({
     this.setData({
       uplaodFile: this.uplaodFile.bind(this)
     })
+    this.initFormData()
     this.getStreetList()
     this.getWhistleTypeList()
   },
@@ -361,5 +368,15 @@ Page({
     this.setData({
       username: username
     })
-  }
+  },
+  initFormData() {
+    let {
+      nickName,
+      phone
+    } = store.readUserInfo()
+    this.setData({
+      username: nickName,
+      phone: phone
+    })
+  },
 })

pages/topics/reportDemand/index.wxml

@@ -28,7 +28,7 @@
     <view class="select-con">
       <text>姓名</text>
       <input style="margin-right:20px;text-align: right;" type="text" bindinput='username' placeholder="请输入姓名"
-        placeholder-style='text-align:right;color:#ACACAE;' />
+        placeholder-style='text-align:right;color:#ACACAE;'  value="{{username}}"/>
     </view>
   </view>
   <view class="select-view">