modify

pages/home/index.js

@@ -41,6 +41,16 @@ Page({
       menus: ['shareAppMessage']
     });
   },
+  // onShareAppMessage() {
+ 
+  //   return {
+  //     title: '报需求',
+  //     // path: '/pages/topics/reportDemand/index',
+  //     path:'/pages/topics/index'
+    
+  //   }
+  // },
+
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

pages/topics/activity/activitySign/index.js

@@ -112,7 +112,7 @@ Page({
           showCancel: false, //是否显示取消按钮
           confirmText: "确定", //默认是“确定”
           success: function (res) {
-            app.globalData.currentTab = "5"
+            app.globalData.currentTab = "1"
             wx.switchTab({
               url: '../../../topics/index'
             })

pages/topics/attract/oceanDetail/index.js

@@ -114,12 +114,12 @@ Page({
   goLinkPage(e) {
    
     if (e.currentTarget.dataset.association == '1') {
-      app.globalData.currentTab = "3"
+      app.globalData.currentTab = "4"
       wx.switchTab({
         url: '../../../topics/index'
       })
     } else {
-      app.globalData.currentTab = "5"
+      app.globalData.currentTab = "1"
       wx.switchTab({
         url: '../../../topics/index'
       })

pages/topics/attract/spaceDetail/index.js

@@ -112,12 +112,12 @@ Page({
    goLinkPage(e) {
     console.log('链接--',e)
     if (e.currentTarget.dataset.association == '1') {
-      app.globalData.currentTab = "3"
+      app.globalData.currentTab = "4"
       wx.switchTab({
         url: '../../../topics/index'
       })
     } else {
-      app.globalData.currentTab = "5"
+      app.globalData.currentTab = "1"
       wx.switchTab({
         url: '../../../topics/index'
       })

pages/topics/index.js

@@ -75,6 +75,7 @@ Page({
   onShow: function () {
     //文章关联链接跳转 显示 报需求 还是来活动 tab
     let curTab = app.globalData.currentTab
+    console.log('app.globalData.currentTab--',app.globalData.currentTab)
     if (curTab) {
       // console.log("currentTab:" + curTab)
       this.setData({
@@ -138,7 +139,6 @@ Page({
       }
     } else {
       console.log('未绑定微信')
-
       if (app.globalData.navigate.mobile) {
         var params = {
           phone: app.globalData.navigate.mobile,
@@ -178,6 +178,7 @@ Page({
   changeTabs: function (e) {
     console.log('点击tab--',e)
     var tab = e.detail.name;
+    app.globalData.currentTab=tab
     this.setData({
       page: 1,
       next: true,
@@ -193,9 +194,10 @@ Page({
   getData: function (tab) {
     console.log('tab--',tab)
     switch (tab) {
-      case "3":
+      case "4":
         return this.fetchCenterList()
-      case "5":
+      // case "5":
+      case "1":
         return this.fetchActivityList();
       default:
         return;
@@ -310,10 +312,11 @@ Page({
       page: page + 1
     })
     switch (tab) {
-      case "3":
+      case "4":
         this.fetchCenterList()
         return;
-      case "5":
+      // case "5":
+      case "1":
         return this.fetchActivityList();
       default:
         return;

pages/topics/index.wxml

@@ -2,28 +2,33 @@
 <view class="content-wrapper">
   <!-- <e-segment bind:tapSegment="tapSegment" headerTitles="{{headerTitles}}" defaultSelectIndex="{{selectedTitle}}"/> -->
   <van-tabs bind:click="changeTabs" active="{{active}}" swipe-threshold="5">
-    <van-tab title="促招引" name="1">
+    <van-tab title="来活动" name="1">
-      <block wx:if="{{tab == '1'}}">
+        <block wx:if="{{tab == '1'}}">
+          <activity list="{{activityList}}" bind:quitEvent="changeActivityStatus" />
+        </block>
+      </van-tab>
+    <van-tab title="促招引" name="2">
+      <block wx:if="{{tab == '2'}}">
         <scroll-view scroll-y style="height:{{height}}px" bindscrolltolower="onReachBottom">
           <attract />
         </scroll-view>
       </block>
     </van-tab>
-    <van-tab title="租房子" name="2">
+    <van-tab title="租房子" name="3">
-      <block wx:if="{{tab == '2'}}">
+      <block wx:if="{{tab == '3'}}">
-       <lease></lease>
+        <lease></lease>
       </block>
     </van-tab>
-    <van-tab title="报需求" name="3">
+    <van-tab title="报需求" name="4">
-      <block wx:if="{{tab == '3'}}">
+      <block wx:if="{{tab == '4'}}">
         <scroll-view scroll-y style="height:{{height}}px" bindscrolltolower="onReachBottom">
           <demand typeList="{{typeList}}" nodes="{{nodes}}" />
         </scroll-view>
       </block>
     </van-tab>
     <block wx:if="{{flag}}">
-      <van-tab title="找贷款" name="4">
+      <van-tab title="找贷款" name="5">
-        <block wx:if="{{tab == '4'}}">
+        <block wx:if="{{tab == '5'}}">
           <loan detail="{{loan}}" />
         </block>
       </van-tab>
@@ -33,13 +38,14 @@
         <loan  />
       </block>
     </van-tab> -->
-    <block wx:if="{{flag}}">
+    <!-- <block wx:if="{{flag}}">
       <van-tab title="来活动" name="5">
         <block wx:if="{{tab == '5'}}">
           <activity list="{{activityList}}" bind:quitEvent="changeActivityStatus"/>
         </block>
       </van-tab>
-    </block>
+    </block> -->
+
     <!-- <van-tab title="报需求" name="3"> 
       <talents  />
     </van-tab>