diff --git a/app.json b/app.json
index a833c47..8a61954 100644
--- a/app.json
+++ b/app.json
@@ -57,7 +57,7 @@
       },
       {
         "pagePath": "pages/topics/index",
-        "text": "议事厅",
+        "text": "赋能中心",
         "iconPath": "/images/tab/topics.png",
         "selectedIconPath": "/images/tab/topics_highlight.png"
       },
diff --git a/models/topic.js b/models/topic.js
index 2258ad4..1a68393 100644
--- a/models/topic.js
+++ b/models/topic.js
@@ -16,7 +16,7 @@ const TopicBaseUrl = {
   topic_streets_url:'/api/whistle/getStreetList',//街道列表
   topic_talents_url:'/api/whistle/save',//添加人才吹哨
   topic_center_url:'/api/content/getListByCode', //赋能中心列表
-  resource_type_url:'/api/resources/typelist ',
+  resource_type_url:'/api/resources/typelist',
   resource_list_url:'/api/resources/list',
   resource_detail_url:'/api/resources/queryById',
   resource_collect_url:'/api/resources/collectResources/',
diff --git a/pages/article/index.json b/pages/article/index.json
index d8b13cb..ce7a4b2 100644
--- a/pages/article/index.json
+++ b/pages/article/index.json
@@ -1,5 +1,4 @@
 {
-  "navigationBarTitleText": "赋能中心",
   "usingComponents": {
     "e-ibutton": "/components/image-button/index"
   }
diff --git a/pages/resource/detail/index.js b/pages/resource/detail/index.js
index 9908240..07865bc 100644
--- a/pages/resource/detail/index.js
+++ b/pages/resource/detail/index.js
@@ -110,6 +110,11 @@ Page({
           title: '收藏成功',
           icon: 'none'
         })
+      }else{
+        wx.showToast({
+          title: '取消收藏',
+          icon: 'none'
+        })
       }
     })
 
diff --git a/pages/resource/list/index.wxml b/pages/resource/list/index.wxml
index e0b9ca3..59a76fb 100644
--- a/pages/resource/list/index.wxml
+++ b/pages/resource/list/index.wxml
@@ -25,4 +25,5 @@
     </view>
     <view class="right"><text class="fa fa-angle-right fa-lg"></text></view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<view wx:if="{{list.length <= 0}}" class="page_empty">暂无数据</view>
\ No newline at end of file
diff --git a/pages/resource/list/index.wxss b/pages/resource/list/index.wxss
index cd3b8e6..fbd7470 100644
--- a/pages/resource/list/index.wxss
+++ b/pages/resource/list/index.wxss
@@ -73,4 +73,13 @@
 .tips-con{
   width: 90%;
   height: 90;
+}
+
+.page_empty {
+  width: 100%;
+  height: 100px;
+  margin-top: 20px;
+  font-size: 14px;
+  color: #aaa;
+  text-align: center;
 }
\ No newline at end of file
diff --git a/pages/topics/interactive/topicArticle/index.js b/pages/topics/interactive/topicArticle/index.js
index 70543b6..33a6643 100644
--- a/pages/topics/interactive/topicArticle/index.js
+++ b/pages/topics/interactive/topicArticle/index.js
@@ -247,22 +247,21 @@ Page({
   // 弹出框 确认
   confirm: function () {
     if(this.data.confirmTag){
-      this.setData({
-        confirmTag:false,
-        hiddenmodalput:true,
-      })
       if (!this.data.currentComment){
         wx.showToast({
           title: '请输入评论',
           icon: 'none'
         })
         this.setData({
-          hiddenmodalput: true,
           confirmTag:true,
           currentComment: ''
         })
         return
       }
+      this.setData({
+        confirmTag:false,
+        hiddenmodalput:true,
+      })
       topicModel.topicAddComment(this.data.currentComment, this.data.topicId,res=>{
         if(res.code === 200){
           this.setData({
diff --git a/pages/topics/loan/index.js b/pages/topics/loan/index.js
index d1d0220..8186b48 100644
--- a/pages/topics/loan/index.js
+++ b/pages/topics/loan/index.js
@@ -14,7 +14,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    url:'https://m.qdjqt.com/#/enterpriseLoan?xihaian=&VNK=e92927fe'
+    // url:'https://m.qdjqt.com/#/enterpriseLoan?xihaian=&VNK=e92927fe'
+    url:'https://m.qdjqt.com/#/enterpriseLoan?location=ShiBei&regsource=ShiBeiOrg'
   },
 
   /**
diff --git a/pages/topics/rent/detail/index.js b/pages/topics/rent/detail/index.js
index d82fcf5..57c8277 100644
--- a/pages/topics/rent/detail/index.js
+++ b/pages/topics/rent/detail/index.js
@@ -97,6 +97,11 @@ Page({
           title: '收藏成功',
           icon: 'none'
         })
+      }else{
+        wx.showToast({
+          title: '取消收藏',
+          icon: 'none'
+        })
       }
     })
 
diff --git a/pages/topics/rent/room/index.js b/pages/topics/rent/room/index.js
index 0af8e5b..7a41d0c 100644
--- a/pages/topics/rent/room/index.js
+++ b/pages/topics/rent/room/index.js
@@ -72,7 +72,7 @@ Page({
   onReachBottom: function () {
     var th = this;
     var next = th.data.next;
-    var typeCode = th.data.typeCode;
+    var apartmentId = th.data.apartmentId;
     if(!next){
       return;
     }
@@ -80,7 +80,7 @@ Page({
     var nextPage = page + 1;
     var list = th.data.list;
 
-    topicModel.getRoomList(typeCode,nextPage,res=>{
+    topicModel.getRoomList(apartmentId,nextPage,res=>{
 
       if(res.result.records.length > 0){
         list = list.concat(res.result.records);
diff --git a/pages/topics/talents/index.js b/pages/topics/talents/index.js
index 8df21ff..73f7305 100644
--- a/pages/topics/talents/index.js
+++ b/pages/topics/talents/index.js
@@ -31,7 +31,8 @@ Component({
     //选择后获取的街道的I,
     streetID:'',
     typeCode:'',
-    textareaValue:''
+    textareaValue:'',
+    error:''
   },
   // lifetimes: {
   //   attached: function () {
@@ -82,7 +83,6 @@ Component({
       })
       //把streett添加第一项设为空
       typeList.unshift('') 
-      console.log(111111111)
       console.log(typeList)
 
       this.setData({
@@ -96,23 +96,34 @@ Component({
   },
   methods: {
     bindPickerStreetsChange: function(e) {
-      // console.log("1"+e.detail.value)
       this.setData({
         streetsIndex: e.detail.value
       })
-      // console.log("2"+this.data.streetsIndex)
-      this.setData({
-        streetID: this.data.results[this.data.streetsIndex-1].id
-      })
-      // console.log(this.data.streetID)
+      if(e.detail.value == '0'){
+        this.setData({
+          streetID: ''
+        })
+      }else{
+        this.setData({
+          streetID: this.data.results[this.data.streetsIndex-1].id
+        })
+      }
+
     },
     bindPickerTypeChange:function(e){
       this.setData({
         typeListIndex: e.detail.value
       })
-      this.setData({
-        typeCode: this.data.list[this.data.typeListIndex-1].typeCode
-      })
+      if(e.detail.value == '0'){
+        this.setData({
+          typeCode: ''
+        })
+      }else{
+        this.setData({
+          typeCode: this.data.list[this.data.typeListIndex-1].typeCode
+        })
+      }
+
     },
     bindTextInput(e) {
       this.setData({
@@ -124,11 +135,15 @@ Component({
       this.setData({
           messageDetail: e.detail.value,
       })
-      if(e.detail.value.length>200){
-        wx.showToast({
-          title: '超过字数',
-          duration: 2000,
-          icon: 'none'
+      console.log(e.detail.value.length)
+      if(e.detail.value.length >= 200){
+        // wx.showToast({
+        //   title: '超过字数',
+        //   duration: 2000,
+        //   icon: 'none'
+        // })
+        this.setData({
+          error: '已达最大字数'
         })
       }
     },
@@ -203,7 +218,7 @@ Component({
       if (this.data.typeCode === ''){
         wx.showModal({
           title: '提示',
-          content: '请选择赋能类型',
+          content: '请选择需求类型',
           showCancel:false
         })
         return
diff --git a/pages/topics/talents/index.json b/pages/topics/talents/index.json
index 719cee5..fa5dc8a 100644
--- a/pages/topics/talents/index.json
+++ b/pages/topics/talents/index.json
@@ -4,6 +4,7 @@
     "e-ibutton": "/components/image-button/index",
     "mp-cells": "/components/weui/cells/cells",
     "mp-cell": "/components/weui/cell/cell",
-    "mp-uploader": "/components/weui/uploader/uploader"
+    "mp-uploader": "/components/weui/uploader/uploader",
+    "mp-toptips": "/components/weui/toptips/toptips"
   }
 }
\ No newline at end of file
diff --git a/pages/topics/talents/index.wxml b/pages/topics/talents/index.wxml
index 9945326..bac0d62 100644
--- a/pages/topics/talents/index.wxml
+++ b/pages/topics/talents/index.wxml
@@ -6,7 +6,7 @@
     <view class="question-image">
       <!-- 文本框 -->
       <view class="item">
-        <textarea class="textArea" maxlength="210"  bindinput="bindTextAreaInput" placeholder="请描述您的问题（200字内）" value="{{textareaValue}}" />
+        <textarea class="textArea" maxlength="200"  bindinput="bindTextAreaInput" placeholder="请描述您的问题（200字内）" value="{{textareaValue}}" />
       </view>
       <!-- 添加图片 -->
       <view style="z-index:10">
@@ -65,7 +65,8 @@
         <text class="fa fa-angle-right fa-lg" style="color:#ACACAE"></text>
       </view> 
     </view>    
-    <view class="btnView">
-      <e-ibutton title="提交" bind:onTap="submit"/>
-    </view>
 </view>
+<view class="btnView">
+  <e-ibutton title="提交" bind:onTap="submit"/>
+</view>
+<mp-toptips msg="{{error}}" type="error" show="{{error}}"></mp-toptips>
\ No newline at end of file
diff --git a/pages/topics/talents/index.wxss b/pages/topics/talents/index.wxss
index 1ab5914..8f2f27e 100644
--- a/pages/topics/talents/index.wxss
+++ b/pages/topics/talents/index.wxss
@@ -1,7 +1,8 @@
 /* pages/topics/talent/message/index.wxss */
 @import '../../../style/font.wxss';
 .container{
-  padding: 0px 20px;
+  padding: 0px 20px 90px 20px;
+  overflow: scroll;
 }
 .item{
   display: flex;
@@ -31,6 +32,7 @@
 }
 .btnView{
   position: fixed;
+  height:50px;
   padding: 10px 20px 20px 20px;
   bottom: 0;
   left: 0;
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 5ad34f2..807bbe9 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -49,7 +49,7 @@
     <mp-cell
       bindtap="onTapItem" data-type="myWhistle"
       icon="/images/user/pins.png"
-      title="我的吹哨"
+      title="我的需求"
       link="true" 
       ext-class="cell-item">
     </mp-cell>
diff --git a/pages/user/myFavorite/index.js b/pages/user/myFavorite/index.js
index 11816b8..7b1ebd0 100644
--- a/pages/user/myFavorite/index.js
+++ b/pages/user/myFavorite/index.js
@@ -124,7 +124,8 @@ Page({
   refresh:function(e){
     var type = e.currentTarget.dataset.type;
     this.setData({
-      type:type
+      type:type,
+      currentPage: 1
     });
     this.fetchMyFavoriteList();
   }
diff --git a/pages/user/myFavorite/index.wxml b/pages/user/myFavorite/index.wxml
index 8b070f1..28cb82f 100644
--- a/pages/user/myFavorite/index.wxml
+++ b/pages/user/myFavorite/index.wxml
@@ -20,10 +20,10 @@
 
   <view class="option" bindtap="refresh" data-type="3">
     <block wx:if="{{type == '3'}}">
-      <text style="color:#1989fa;">议事厅</text>
+      <text style="color:#1989fa;">赋能中心</text>
     </block>
     <block wx:else>
-      议事厅
+      赋能中心
     </block>
   </view>
 </view>
diff --git a/pages/user/myWhistle/index.json b/pages/user/myWhistle/index.json
index 6863354..d3286ba 100644
--- a/pages/user/myWhistle/index.json
+++ b/pages/user/myWhistle/index.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "我的吹哨",
+  "navigationBarTitleText": "我的需求",
   "usingComponents": {},
   "onReachBottomDistance":50
 }
\ No newline at end of file
diff --git a/pages/user/myWhistle/index.wxml b/pages/user/myWhistle/index.wxml
index 58a7dba..81e7363 100644
--- a/pages/user/myWhistle/index.wxml
+++ b/pages/user/myWhistle/index.wxml
@@ -15,3 +15,4 @@
   </view>
 
 </block>
+<view wx:if="{{list.length <= 0}}" class="page_empty">暂无数据</view>
diff --git a/pages/user/myWhistle/index.wxss b/pages/user/myWhistle/index.wxss
index f012b73..378288e 100644
--- a/pages/user/myWhistle/index.wxss
+++ b/pages/user/myWhistle/index.wxss
@@ -40,3 +40,12 @@ page{
   align-items: center;
   justify-content:space-between;
 }
+
+.page_empty {
+  width: 100%;
+  height: 100px;
+  margin-top: 20px;
+  font-size: 14px;
+  color: #aaa;
+  text-align: center;
+}
diff --git a/pages/user/myWhistle/whistleDetail/index.wxml b/pages/user/myWhistle/whistleDetail/index.wxml
index b246aa7..3aff52d 100644
--- a/pages/user/myWhistle/whistleDetail/index.wxml
+++ b/pages/user/myWhistle/whistleDetail/index.wxml
@@ -71,9 +71,12 @@
     </view>
     <block wx:for="{{commentList}}">
       <view class="comment">
+        <view style="font-weight:800;">
+          {{item.departName}}
+        </view>
         <view class="com-top">
           <view>
-              {{item.departName}} <van-rate readonly value="{{ item.score }}" color="#ee0a24"/> <text> {{whistle.getEvaluate(item.score)}}</text>
+              <van-rate readonly value="{{ item.score }}" color="#ee0a24"/> <text> {{whistle.getEvaluate(item.score)}}</text>
           </view>
           <view>{{item.commentDate}}</view>
         </view>