From 275b6e4f10a504eefbb9e7b4ac5087fa33c739ec Mon Sep 17 00:00:00 2001
From: xuxu <xuxubarca@163.com>
Date: Thu, 17 Sep 2020 14:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                          |  2 +-
 pages/resource/detail/index.js    |  2 +-
 pages/resource/list/index.js      |  4 ++--
 pages/topics/index.js             | 10 ++++++----
 pages/topics/index.json           |  1 +
 pages/topics/rent/detail/index.js |  2 +-
 pages/topics/rent/index.js        |  2 +-
 pages/topics/rent/index.wxml      |  2 +-
 pages/topics/rent/room/index.js   |  2 ++
 pages/topics/talents/index.wxml   |  2 +-
 pages/topics/talents/index.wxss   |  2 +-
 11 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app.json b/app.json
index 29aeaf5..a833c47 100644
--- a/app.json
+++ b/app.json
@@ -36,7 +36,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "市北人才",
+    "navigationBarTitleText": "市北人才赋能平台",
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
diff --git a/pages/resource/detail/index.js b/pages/resource/detail/index.js
index 6f4207f..9908240 100644
--- a/pages/resource/detail/index.js
+++ b/pages/resource/detail/index.js
@@ -20,7 +20,7 @@ Page({
   onLoad: function (options) {
     var id = options.id;
     topicModel.getResourceDetail(id,res=>{
-
+      wx.setNavigationBarTitle({ title:res.result.typeName})
       if(res.result.isCollection == 1){
         this.setData({
           isCollect:true,
diff --git a/pages/resource/list/index.js b/pages/resource/list/index.js
index 523b3ed..0859e43 100644
--- a/pages/resource/list/index.js
+++ b/pages/resource/list/index.js
@@ -31,7 +31,7 @@ Component({
         return;
       }
   
-      if(this.properties.tp == '1'){
+      if(this.properties.tp == '1'){ // 资源列表
         if(e.currentTarget.dataset.url){
           wx.navigateTo({
             url: '/pages/resource/navigate/index?url=' + encodeURIComponent(e.currentTarget.dataset.url)
@@ -44,7 +44,7 @@ Component({
           })
           return;
         }
-      }else if(this.properties.tp == '2'){
+      }else if(this.properties.tp == '2'){ // 房屋列表
         wx.navigateTo({
           url: '/pages/topics/rent/detail/index?id=' + e.currentTarget.dataset.id
         })
diff --git a/pages/topics/index.js b/pages/topics/index.js
index e994da4..10961a3 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -247,11 +247,13 @@ Page({
     })
   },
   fetchRent:function(){
-    topicModel.getApartment(res=>{
-      this.setData({
-        apartment:res.result
+    if(this.data.apartment.length == 0){
+      topicModel.getApartment(res=>{
+        this.setData({
+          apartment:res.result
+        })
       })
-    })
+    }
   },
   /**
    * 页面上拉触底事件的处理函数
diff --git a/pages/topics/index.json b/pages/topics/index.json
index 5904856..028bda2 100644
--- a/pages/topics/index.json
+++ b/pages/topics/index.json
@@ -13,5 +13,6 @@
     "loan":"./loan/index",
     "rent":"./rent/index"
   },
+  "navigationBarTitleText": "赋能中心",
   "onReachBottomDistance":50
 }
\ No newline at end of file
diff --git a/pages/topics/rent/detail/index.js b/pages/topics/rent/detail/index.js
index 45e83c3..d82fcf5 100644
--- a/pages/topics/rent/detail/index.js
+++ b/pages/topics/rent/detail/index.js
@@ -20,7 +20,7 @@ Page({
   onLoad: function (options) {
     var id = options.id;
     topicModel.getRoomDetail(id,res=>{
-
+      wx.setNavigationBarTitle({ title:res.result.title})
       if(res.result.isCollection == 1){
         this.setData({
           isCollect:true,
diff --git a/pages/topics/rent/index.js b/pages/topics/rent/index.js
index 19d25d7..bae3e89 100644
--- a/pages/topics/rent/index.js
+++ b/pages/topics/rent/index.js
@@ -26,7 +26,7 @@ Component({
     check:function(e){
       var id = e.currentTarget.id;
       wx.navigateTo({
-        url: '/pages/topics/rent/room/index?id=' + id
+        url: '/pages/topics/rent/room/index?id=' + id + '&title=' + e.currentTarget.dataset.title
       })
     }
   }
diff --git a/pages/topics/rent/index.wxml b/pages/topics/rent/index.wxml
index aa29742..b8bffb4 100644
--- a/pages/topics/rent/index.wxml
+++ b/pages/topics/rent/index.wxml
@@ -8,7 +8,7 @@
       </view>
       <view class="content">
         <view><text class="fa fa-map-marker fa-lg"></text> <text class="address">{{item.address}}</text></view>
-        <view><van-button type="danger" size="small" bind:click="check" id="{{item.id}}">查看</van-button></view>
+        <view><van-button type="danger" size="small" bind:click="check" id="{{item.id}}" data-title="{{item.title}}">查看</van-button></view>
       </view>
     </view>
   </block>
diff --git a/pages/topics/rent/room/index.js b/pages/topics/rent/room/index.js
index a63a1ce..0af8e5b 100644
--- a/pages/topics/rent/room/index.js
+++ b/pages/topics/rent/room/index.js
@@ -18,6 +18,8 @@ Page({
    */
   onLoad: function (options) {
     var id = options.id;
+    var title = options.title;
+    wx.setNavigationBarTitle({ title:title});
     this.setData({
       apartmentId:id
     })
diff --git a/pages/topics/talents/index.wxml b/pages/topics/talents/index.wxml
index 3ed519b..9945326 100644
--- a/pages/topics/talents/index.wxml
+++ b/pages/topics/talents/index.wxml
@@ -19,7 +19,7 @@
     <view class="select-view">
       <!-- 字体图标 -->
       <view class="select-mark">
-        <text class="fa fa-list fa-lg"></text>
+        <text class="fa fa-navicon fa-lg"></text>
       </view>
 
       
diff --git a/pages/topics/talents/index.wxss b/pages/topics/talents/index.wxss
index 76354e5..1ab5914 100644
--- a/pages/topics/talents/index.wxss
+++ b/pages/topics/talents/index.wxss
@@ -87,5 +87,5 @@
 }
 .select-picker{
   flex: 1;
-  margin:0px 10px;
+  margin:0px 20px;
 }