小程序新版本

app.js

@@ -3,8 +3,13 @@ import {HTTP} from '/utils/http.js'
 const http = new HTTP()
 App({
   onLaunch: function (options) {
-    console.log('党群e家');
-    console.log(options);
+    wx.getSystemInfo({
+      success: res => {
+          this.globalData.systemInfo = res
+          this.globalData.windowHeight = res.windowHeight
+          this.globalData.screenHeight = res.screenHeight
+      }
+    })
     if(options.referrerInfo.hasOwnProperty('extraData')){
       this.globalData.navigate.mobile = options.referrerInfo.extraData.mobile,
       this.globalData.navigate.nickname = options.referrerInfo.extraData.nickname,
@@ -19,7 +24,9 @@ App({
     navigate:{
       mobile:'',
       nickname:'',
-      faceImg:''
-    }
+      faceImg:'',
+    },
+    windowHeight:'',
+    screenHeight:''
   }
 })

app.json

@@ -31,7 +31,8 @@
     "pages/resource/navigate/index",
     "pages/topics/loan/index",
     "pages/topics/rent/room/index",
-    "pages/topics/rent/detail/index"
+    "pages/topics/rent/detail/index",
+    "pages/resource/demand/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

components/image-button/index.js

@@ -8,6 +8,10 @@ Component({
     disable: {
       type: Boolean,
       value: false,
+    },
+    size:{
+      type:String,
+      value:'nomal'
     }
   },
 

components/image-button/index.wxml

@@ -1,5 +1,14 @@
 <!--components/image-botton/index.wxml-->
-<view class="image-button" bindtap="{{disable ? '' : 'onTap'}}">
-  <image class="image-btn-bg" src="{{disable ? 'images/btn_bg_disable.png':'images/btn_bg.png'}}"></image>
-  {{title}}
-</view>
+<block wx:if="{{size === 'small'}}">
+  <view class="image-button-small" bindtap="{{disable ? '' : 'onTap'}}">
+    <image class="image-btn-bg" src="{{disable ? 'images/btn_bg_disable.png':'images/btn_bg.png'}}"></image>
+    {{title}}
+  </view>
+</block>
+<block wx:else>
+  <view class="image-button" bindtap="{{disable ? '' : 'onTap'}}">
+    <image class="image-btn-bg" src="{{disable ? 'images/btn_bg_disable.png':'images/btn_bg.png'}}"></image>
+    {{title}}
+  </view>
+</block>
+

components/image-button/index.wxss

@@ -17,3 +17,14 @@
   height: 100%;
   z-index: -1;
 }
+
+.image-button-small{
+  width: 100%;
+  height: 40px;
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: white;
+  font-size: 15px;
+}

components/vant/popup/index.wxml

@@ -11,7 +11,7 @@
 <view
   wx:if="{{ inited }}"
   class="custom-class {{ classes }} {{ utils.bem('popup', [position, { round, safe: safeAreaInsetBottom, safeTop: safeAreaInsetTop }]) }}"
-  style="z-index: {{ zIndex }}; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
+  style="z-index: {{ zIndex }};border-radius:10px; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
   bind:transitionend="onTransitionEnd"
 >
   <slot />

components/vant/tabs/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{display:-webkit-flex;display:flex;overflow:hidden}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll{background-color:#fff;background-color:var(--tabs-nav-background-color,#fff)}.van-tabs__scroll--line{box-sizing:initial;height:calc(100% + 15px)}.van-tabs__scroll--card{margin:0 16px;margin:0 var(--padding-md,16px)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--card{box-sizing:border-box;height:30px;height:var(--tabs-card-height,30px);border:1px solid #ee0a24;border:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24);border-radius:2px;border-radius:var(--border-radius-sm,2px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--tabs-default-color,#ee0a24);line-height:28px;line-height:calc(var(--tabs-card-height, 30px) - 2*var(--border-width-base, 1px));border-right:1px solid #ee0a24;border-right:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;height:var(--tabs-bottom-bar-height,3px);border-radius:3px;border-radius:var(--tabs-bottom-bar-height,3px);background-color:#ee0a24;background-color:var(--tabs-bottom-bar-color,#ee0a24)}.van-tabs__track{position:relative;width:100%;height:100%}.van-tabs__track--animated{display:-webkit-flex;display:flex;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-tabs__content{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tab{position:relative;-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;text-align:center;cursor:pointer;color:#646566;color:var(--tab-text-color,#646566);font-size:14px;font-size:var(--tab-font-size,14px);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--tab-active-text-color,#323233)}.van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tab--complete{-webkit-flex:1 0 auto!important;flex:1 0 auto!important}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}
+@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{display:-webkit-flex;display:flex;overflow:hidden}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll{background-color:#fff;background-color:var(--tabs-nav-background-color,#fff)}.van-tabs__scroll--line{box-sizing:initial;height:calc(100% + 15px)}.van-tabs__scroll--card{margin:0 16px;margin:0 var(--padding-md,16px)}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--card{box-sizing:border-box;height:30px;height:var(--tabs-card-height,30px);border:1px solid #ee0a24;border:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24);border-radius:2px;border-radius:var(--border-radius-sm,2px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--tabs-default-color,#ee0a24);line-height:28px;line-height:calc(var(--tabs-card-height, 30px) - 2*var(--border-width-base, 1px));border-right:1px solid #ee0a24;border-right:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;font-weight:bolder;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;height:var(--tabs-bottom-bar-height,3px);border-radius:3px;border-radius:var(--tabs-bottom-bar-height,3px);background-color:#ee0a24;background-color:var(--tabs-bottom-bar-color,#ee0a24)}.van-tabs__track{position:relative;width:100%;height:100%}.van-tabs__track--animated{display:-webkit-flex;display:flex;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-tabs__content{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tab{position:relative;-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;text-align:center;cursor:pointer;color:#646566;color:var(--tab-text-color,#646566);font-size:14px;font-size:var(--tab-font-size,14px);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--tab-active-text-color,#323233)}.van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tab--complete{-webkit-flex:1 0 auto!important;flex:1 0 auto!important}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}

components/weui/dialog/dialog.wxml

@@ -1,4 +1,4 @@
-<view bindtap="close" class="weui-mask {{!show ? 'weui-mask_hidden' : '' }}" wx:if="{{mask}}"></view>
+<view bindtap="close" class="weui-mask {{!show ? 'weui-mask_hidden' : '' }}" wx:if="{{mask}}" catchtouchmove="{{true}}"></view>
 <view wx:if="{{show}}" bindtap="close" class="weui-dialog__wrp {{extClass}}">
     <view class="weui-dialog" catchtap="stopEvent">
       <view class="weui-dialog__hd">

components/weui/dialog/dialog.wxss

@@ -1 +1 @@
-.weui-mask{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0;background:rgba(0,0,0,0.6)}.weui-mask_transparent{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0}.weui-dialog__wrp{position:fixed;z-index:5000;top:16px;bottom:16px;left:16px;right:16px;text-align:center;font-size:0;display:-webkit-box;display:-webkit-flex;display:flex;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__wrp .weui-dialog{max-height:100%}.weui-dialog{background-color:#FFFFFF;text-align:center;border-radius:12px;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;max-height:90%}.weui-dialog__hd{padding:32px 24px 16px}.weui-dialog__title{font-weight:700;font-size:17px;line-height:1.4}.weui-dialog__bd{flex:1;overflow-y:auto;-webkit-overflow-scrolling:touch;padding:0 24px;margin-bottom:32px;min-height:40px;font-size:17px;line-height:1.4;overflow-wrap:break-word;-webkit-hyphens:auto;hyphens:auto;color:rgba(0,0,0,0.5)}.weui-dialog__bd:first-child{padding:32px 24px 0;font-weight:700;color:rgba(0,0,0,0.9);display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__ft{position:relative;line-height:64px;min-height:64px;font-size:17px;display:flex}.weui-dialog__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,0.1);color:rgba(0,0,0,0.1)}.weui-dialog__btn{display:block;flex:1;color:#576B95;font-weight:700;text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0);position:relative}.weui-dialog__btn:active{background-color:#ECECEC}.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid rgba(0,0,0,0.1);color:rgba(0,0,0,0.1)}.weui-dialog__btn:first-child:after{display:none}.weui-dialog__btn_default{color:rgba(0,0,0,0.9)}@media screen and (min-width:352px){.weui-dialog{width:320px;margin:0 auto}}.weui-dialog.weui-dialog_hidden{opacity:0;transform:scale3d(1, 1, 0)}.weui-dialog{opacity:1;-webkit-transform:scale3d(1, 1, 1);transform:scale3d(1, 1, 1);transition:all .3s ease-in}.weui-mask.weui-mask_hidden{opacity:0;transform:scale3d(1, 1, 0)}.weui-mask{opacity:1;transform:scale3d(1, 1, 1);transition:all .3s ease-in}
+.weui-mask{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0;background:rgba(0,0,0,0.6)}.weui-mask_transparent{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0}.weui-dialog__wrp{position:fixed;z-index:5000;top:16px;bottom:16px;left:16px;right:16px;text-align:center;font-size:0;display:-webkit-box;display:-webkit-flex;display:flex;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__wrp .weui-dialog{max-height:100%}.weui-dialog{background-color:#FFFFFF;text-align:center;border-radius:12px;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;max-height:90%}.weui-dialog__hd{padding:32px 24px 16px}.weui-dialog__title{font-weight:700;font-size:17px;line-height:1.4}.weui-dialog__bd{flex:1;overflow-y:auto;-webkit-overflow-scrolling:touch;padding:0 24px;/*margin-bottom:32px;*/min-height:40px;font-size:17px;line-height:1.4;overflow-wrap:break-word;-webkit-hyphens:auto;hyphens:auto;color:rgba(0,0,0,0.5)}.weui-dialog__bd:first-child{padding:32px 24px 0;font-weight:700;color:rgba(0,0,0,0.9);display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.weui-dialog__ft{position:relative;line-height:64px;min-height:64px;font-size:17px;display:flex}.weui-dialog__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid rgba(0,0,0,0.1);color:rgba(0,0,0,0.1)}.weui-dialog__btn{display:block;flex:1;color:#fa4646;font-weight:700;text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0);position:relative}.weui-dialog__btn:active{background-color:#ECECEC}.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid rgba(0,0,0,0.1);color:rgba(0,0,0,0.1)}.weui-dialog__btn:first-child:after{display:none}.weui-dialog__btn_default{color:rgba(0,0,0,0.9)}@media screen and (min-width:352px){.weui-dialog{width:320px;margin:0 auto}}.weui-dialog.weui-dialog_hidden{opacity:0;transform:scale3d(1, 1, 0)}.weui-dialog{opacity:1;-webkit-transform:scale3d(1, 1, 1);transform:scale3d(1, 1, 1);transition:all .3s ease-in}.weui-mask.weui-mask_hidden{opacity:0;transform:scale3d(1, 1, 0)}.weui-mask{opacity:1;transform:scale3d(1, 1, 1);transition:all .3s ease-in}

models/topic.js

@@ -14,7 +14,7 @@ const TopicBaseUrl = {
   topic_commentPraise_url: '/api/comment/addSupport/', // 点赞
   topic_addMessage_url:'/api/message/addMessage' ,// 留言箱
   topic_streets_url:'/api/whistle/getStreetList',//街道列表
-  topic_talents_url:'/api/whistle/save',//添加人才吹哨
+  topic_talents_url:'/api/whistle/commit',//添加人才吹哨
   topic_center_url:'/api/content/getListByCode', //赋能中心列表
   resource_type_url:'/api/resources/typelist',
   resource_list_url:'/api/resources/list',
@@ -179,15 +179,19 @@ class TopicModel extends HTTP {
 
 
   //添加人才吹哨
-  addTalents(content, picList,departId,typeCode,success){
+  addTalents(datas,success){
     let params = {
       url: TopicBaseUrl.topic_talents_url,
       method: Method.POST,
       data: {
-        content: content,
-        picList1: picList,
-        departId:departId,
-        typeCode:typeCode
+        content: datas.content,
+        picList1: datas.picList,
+        departId:datas.departId,
+        typeCode:datas.typeCode,
+        id:datas.id,
+        questionType:datas.questionType,
+        company:datas.company
+        
       },
       success: success
     }

models/user.js

@@ -16,8 +16,8 @@ const UserConst = {
   user_whistleDetail_url:'/api/whistle/getWhistleById', // 吹哨详情
   user_saveWhistleComment_url:'/api/whistle/saveComment' ,// 吹哨评价
   user_updatePhone_url:'/api/miniuser/updatephone',//更新电话号码
-  navigate_user_url:'/api/miniuser/wxregisterbyparams'
- 
+  navigate_user_url:'/api/miniuser/wxregisterbyparams',
+  whistle_message_url:'/api/whistle/getnoread'
 }
 class UserModel extends HTTP {
   constructor () {
@@ -104,6 +104,17 @@ class UserModel extends HTTP {
     this.request(params)
   }
 
+  getMyWhistleMessage(success){
+    let params = {
+      url: UserConst.whistle_message_url,
+      method: Method.POST,
+      data:{
+      },
+      success: success
+    }
+    this.request(params)
+  }
+
   getMyTopics(page,type,success){
     let params = {
       url: UserConst.user_myTopics_url,

pages/resource/detail/index.js

@@ -1,5 +1,6 @@
 // pages/resource/detail/index.js
 import { TopicModel } from '../../../models/topic.js'
+import { config } from '../../../config.js'
 let topicModel = new TopicModel()
 Page({
 
@@ -7,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    titlePic:"/images/temp_1.png",
+    titlePic:config.api_url + "/image/head.jpg",
     unStar: '/images/common/star.png',
     star: '/images/common/star_light.png',
     detail:{},
@@ -119,6 +120,11 @@ Page({
     })
 
 
+  },
+  onTap:function(){
+    wx.navigateTo({
+      url: '/pages/resource/demand/index?type=resource&id=' + this.data.detail.id
+    })
   }
 
 })

pages/resource/detail/index.wxml

@@ -18,3 +18,9 @@
     <rich-text nodes="{{detail.content}}"></rich-text>
   </view>
 <!-- <web-view src="https://m.qdjqt.com/#/?xihaian=&VNK=e92927fe&source=productList"></web-view> -->
+
+<view class="publish" bindtap="onTap">
+  <!-- <image src="/images/topic/publish.png"></image> -->
+  <view><view>我</view><view>赋</view></view>
+  <view><view>要</view><view>能</view></view>
+</view>

pages/resource/detail/index.wxss

@@ -59,3 +59,18 @@ page{
 .text{
   width: 90%;
 }
+
+.publish{
+  position: fixed;
+  width: 50px;
+  height: 50px;
+  right: 20px;
+  bottom: 40px;
+  background-color: #fa4646;
+  border-radius: 50%;
+  color:white;
+  display:flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 15px;
+}

pages/resource/index.json

@@ -2,7 +2,8 @@
   "usingComponents": {
     "van-popup": "/components/vant/popup/index",
     "resource":"./list/index",
-    "van-button": "/components/vant/button/index"
+    "van-button": "/components/vant/button/index",
+    "e-ibutton": "/components/image-button/index"
   },
   "onReachBottomDistance":50
 }

pages/resource/index.wxml

@@ -13,7 +13,10 @@
       <rich-text nodes="{{con}}"></rich-text>
     </view>
     <view class="button">
-      <van-button type="danger" size="large" bind:click="ok" style="width:100%">我知道了</van-button>
+      <!-- <van-button type="danger" size="large" bind:click="ok" style="width:100%">我知道了</van-button> -->
+      <view class="btnView">
+        <e-ibutton title="我知道了" bind:onTap="ok" size="small"/>
+      </view>
       <view class="btn" bindtap="never">不再提示</view>
     </view>
 

pages/resource/index.wxss

@@ -41,3 +41,6 @@ page{
   color: #f04040;
 }
 
+.btnView{
+  width:100%
+}

pages/resource/list/index.js

@@ -1,4 +1,5 @@
 // pages/resource/list/index.js
+import { config } from '../../../config.js'
 Component({
   /**
    * 组件的属性列表
@@ -11,14 +12,15 @@ Component({
     tp:{
       type:String,
       value:'1'
-    }
+    },
+    apartmentId:String
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-    titlePic:"/images/temp_1.jpg"
+    titlePic:config.api_url + "/image/head.jpg"
   },
 
   /**
@@ -52,6 +54,11 @@ Component({
       }
 
 
+    },
+    onTap:function(){
+      wx.navigateTo({
+        url: '/pages/resource/demand/index?type=rent&id=' + this.properties.apartmentId
+      })
     }
 
   }

pages/resource/list/index.wxml

@@ -4,12 +4,12 @@
     <view class="left">
       <block wx:if="{{tp == '1'}}">
         <view class="articleImg">
-          <image src="{{item.titlePic ? item.titlePic : titlePic}}" mode="widthFix" style="width:100%;"></image>
+          <image src="{{item.titlePic ? item.titlePic : titlePic}}" mode="widthFix" style="width:100%;height:0"></image>
         </view>
       </block>
       <block wx:if="{{tp == '2'}}">
         <view class="roomImg">
-          <image src="{{item.titlePic ? item.titlePic : titlePic}}" mode="widthFix" style="width:100%;"></image>
+          <image src="{{item.titlePic ? item.titlePic : titlePic}}" mode="widthFix" style="width:100%;height:0"></image>
         </view>
       </block>
       
@@ -18,7 +18,7 @@
         <block wx:if="{{tp == '1'}}">
           <view class="r_type">{{item.typeName}}</view>
         </block>
-        <block wx:if="{{tp == '2'}}">
+        <block wx:if="{{tp == '2' && item.price}}">
           <view class="r_type"><text style="color:#f25959">{{item.price}}</text>元/月</view>
         </block>
       </view>
@@ -27,3 +27,10 @@
   </view>
 </view>
 <view wx:if="{{list.length <= 0}}" class="page_empty">暂无数据</view>
+
+<block wx:if="{{tp == '2'}}">
+  <view class="publish" bindtap="onTap">
+    <view><view>我</view><view>租</view></view>
+    <view><view>要</view><view>房</view></view>
+  </view>
+</block>

pages/resource/list/index.wxss

@@ -83,3 +83,18 @@
   color: #aaa;
   text-align: center;
 }
+
+.publish{
+  position: fixed;
+  width: 50px;
+  height: 50px;
+  right: 20px;
+  bottom: 40px;
+  background-color: #fa4646;
+  border-radius: 50%;
+  color:white;
+  display:flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 15px;
+}

pages/topics/center/index.js

@@ -1,4 +1,5 @@
 // pages/topics/interactive/index.js
+const app = getApp()
 Component({
   /**
    * 组件的属性列表
@@ -11,7 +12,8 @@ Component({
     typeList:{
       type:Array,
       value:[],
-    }
+    },
+    nodes:String
   },
   /**
    * 组件的初始数据
@@ -26,11 +28,26 @@ Component({
       {pic:'heart',color:'#febc30',bg_color:'#fff3d9'},
       {pic:'graduation-cap',color:'#bea0fe',bg_color:'#f5f0ff'},
       {pic:'comments',color:'#4d9fff',bg_color:'#e9f6fc'},
-    ]
+    ],
+    dialogShow: false,
+    buttons: [{text: '不同意'}, {text: '同意并继续'}],
+    listShow:false,
+    height:app.globalData.windowHeight - 44
   },
   attached: function () {
     console.log("center页面")
     console.log(this.properties.list)
+    var flag = wx.getStorageSync('agreement');
+    // var flag = false;
+    if(!flag){
+      this.setData({
+        dialogShow:true
+      })
+    }else{
+      this.setData({
+        listShow:true
+      })
+    }
 
   },
 
@@ -56,6 +73,20 @@ Component({
     },
     deleteTopic(e){
       this.triggerEvent('deleteTopic', { id: e.detail.id })
+    },
+    tapDialogButton(e) {
+
+      if(e.detail.index == 1){ //确认
+        wx.setStorageSync('agreement', '1');
+        this.setData({
+          dialogShow: false,
+          listShow:true
+      })
+      }else{
+        wx.switchTab({
+          url: '/pages/home/index',
+        })
+      }
     }
   }
 })

pages/topics/center/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-grid": "/components/vant/grid/index",
     "van-grid-item": "/components/vant/grid-item/index",
-    "resource":"/pages/resource/list/index"
+    "resource":"/pages/resource/list/index",
+    "mp-dialog": "/components/weui/dialog/dialog"
   }
 }

pages/topics/center/index.wxml

@@ -1,4 +1,5 @@
 <!--pages/topics/interactive/index.wxml-->
+<block wx:if="{{listShow}}">
 <swiper class="nav" >
   <swiper-item>
     <van-grid column-num="4" border="{{false}}"> 
@@ -7,7 +8,7 @@
           <view class="circular" style="background-color:{{icon[index].bg_color}}">
             <text class="fa fa-{{icon[index].pic}} fa-lg" style="color:{{icon[index].color}};font-size:28px"></text>
           </view>
-          <view>{{item.typeName}}</view>
+          <view class="title">{{item.typeName}}</view>
         </van-grid-item>
       </block>
     </van-grid>
@@ -20,5 +21,17 @@
 
 </swiper>
 
-<resource style="width:100%" list="{{list}}"/>
+
+  <resource style="width:100%" list="{{list}}"/>
+</block>
+<block wx:else>
+  <view style="height:{{height}}px"></view>
+</block>
+
+
+<mp-dialog title="用户协议" show="{{dialogShow}}" bindbuttontap="tapDialogButton" buttons="{{buttons}}" mask-closable="{{false}}" >
+  <view style="width:100%;text-align:left;height:600rpx">
+    <rich-text nodes="{{nodes}}"></rich-text>
+  </view>
+</mp-dialog>
 

pages/topics/center/index.wxss

@@ -18,3 +18,8 @@ image{
   justify-content: center;
 }
 
+.title{
+  font-size: 13px;
+  margin-top: 5px;
+}
+

pages/topics/index.js

@@ -5,10 +5,9 @@ import { TopicModel } from '../../models/topic.js'
 import { store } from '../../utils/store.js'
 import { UserModel } from '../../models/user.js'
 let userModel = new UserModel()
-
+const app = getApp()
 dayjs.extend(relativeTime)
 let topicModel = new TopicModel()
-const app = getApp()
 Page({
 
   /**
@@ -24,10 +23,13 @@ Page({
     typeList:[],
     page:1,
     next:true,
-    tab:"5",
-    active:"5",
+    tab:"",
+    active:"1",
     loan:{},
-    apartment:[]
+    apartment:[],
+    nodes:'',
+    rentNode:'',
+    height:app.globalData.windowHeight - 44
 
   },
 
@@ -51,11 +53,15 @@ Page({
           goodIdeaList: [],
           centerList: [],
           page:1,
-          next:true,
-          // tab:"5",
-          // active:"5",
+          next:true
         })
 
+        if(!this.data.tab){
+          this.setData({
+            tab:'1'
+          })
+        }
+
         return this.getData(this.data.tab);
       } else {
         console.log('未绑定手机号码')
@@ -229,6 +235,7 @@ Page({
         list = list.concat(res.result.records);
         th.setData({
           centerList: list,
+          nodes:res.result.agreement
         })
       }else{
         th.setData({
@@ -250,7 +257,8 @@ Page({
     if(this.data.apartment.length == 0){
       topicModel.getApartment(res=>{
         this.setData({
-          apartment:res.result
+          apartment:res.result.list,
+          rentNode:res.result.agreement
         })
       })
     }

pages/topics/index.json

@@ -11,7 +11,8 @@
     "van-tab": "/components/vant/tab/index",
     "van-tabs": "/components/vant/tabs/index",
     "loan":"./loan/index",
-    "rent":"./rent/index"
+    "rent":"./rent/index",
+    "mp-dialog": "/components/weui/dialog/dialog"
   },
   "navigationBarTitleText": "赋能中心",
   "onReachBottomDistance":50

pages/topics/index.wxml

@@ -2,27 +2,44 @@
 <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" >
+      <block wx:if="{{tab == '1'}}">
+        <view style="height:{{height}}px">
+          <center list="{{centerList}}" typeList="{{typeList}}" nodes="{{nodes}}"/>
+        </view>
+        <!-- <center list="{{centerList}}" typeList="{{typeList}}" nodes="{{nodes}}"/> -->
+      </block>
+    </van-tab>
     <van-tab title="租房子" name="5">
-      <rent  list="{{apartment}}" />
+      <block wx:if="{{tab == '5'}}">
+        <view style="height:{{height}}px">
+          <rent  list="{{apartment}}" nodes="{{rentNode}}"/>
+        </view>
+      </block>
     </van-tab>
     <van-tab title="找贷款" name="4">
       <block wx:if="{{tab == '4'}}">
-        <loan detail="{{loan}}" />
+        <loan detail="{{loan}}" style=""/>
       </block>
     </van-tab>
-    <van-tab title="寻资源" name="1" >
-      <center list="{{centerList}}" typeList="{{typeList}}"/>
-    </van-tab>
     <van-tab title="报需求" name="2"> 
       <talents  />
     </van-tab>
     <van-tab title="交朋友" name="3">
-      <interactive list="{{topicList}}" bind:deleteTopic="deleteTopic"/>
+      <view style="height:{{height}}px">
+        <interactive list="{{topicList}}" bind:deleteTopic="deleteTopic"/>
+      </view>
     </van-tab>
 
 
   </van-tabs>
 
+<!-- <mp-dialog title="用户协议" show="{{dialogShow}}" bindbuttontap="tapDialogButton" buttons="{{buttons}}" mask-closable="{{false}}" >
+  <view style="width:100%;text-align:left;height:600rpx">
+    <rich-text nodes="{{nodes}}"></rich-text>
+  </view>
+</mp-dialog> -->
+  
 
 
 

pages/topics/index.wxss

@@ -1,5 +1,14 @@
 /* pages/topics/index.wxss */
+page{
+  height: 100%;
+}
 .content-wrapper{
+  height: 100%;
+  width: 100%;
   display: flex;
   flex-direction: column;
 }
+
+.content{
+  overflow: scroll;
+}

pages/topics/loan/index.js

@@ -1,4 +1,6 @@
 // pages/topics/loan/index.js
+import { config } from '../../../config.js'
+const app = getApp()
 Component({
   /**
    * 组件的属性列表
@@ -15,7 +17,9 @@ Component({
    */
   data: {
     // url:'https://m.qdjqt.com/#/enterpriseLoan?xihaian=&VNK=e92927fe'
-    url:'https://m.qdjqt.com/#/enterpriseLoan?location=ShiBei&regsource=ShiBeiOrg'
+    url:'https://m.qdjqt.com/#/enterpriseLoan?location=ShiBei&regsource=ShiBeiOrg',
+    imgUrl:config.api_url+'/image/loan.jpg',
+    height:''
   },
 
   /**
@@ -28,5 +32,12 @@ Component({
         url: '/pages/resource/navigate/index?url=' + encodeURIComponent(url)
       })
     }
-  }
+  },
+  attached: function() {
+    console.log(app.globalData.windowHeight)
+    console.log(app.globalData.screenHeight)
+    this.setData({
+      height:app.globalData.windowHeight - 44
+    })
+  },
 })

pages/topics/loan/index.wxml

@@ -1,18 +1,18 @@
 <!--pages/topics/loan/index.wxml-->
-<!-- <view class="con">
-  <view class="img">
+<view class="con" style="background: url({{imgUrl}}) no-repeat; background-size:cover;background-position-y:bottom;height:{{height}}px">
+  <!-- <view class="img">
     <image src="{{detail.titlePic}}"></image>
   </view>
   <view class="title">{{detail.title}}</view>
   <view class="text">
     <rich-text nodes="{{detail.content}}"></rich-text>
-  </view>
-</view>
+  </view> -->
+
 
 
 
 <view class="btnView">
   <e-ibutton title="查看详情" bind:onTap="check"/>
-</view> -->
-
-<web-view src="{{url}}"></web-view>
+</view>
+</view>
+<!-- <web-view src="{{url}}"></web-view> -->

pages/topics/loan/index.wxss

@@ -1,8 +1,13 @@
 /* pages/topics/loan/index.wxss */
+
 .con{
   display: flex;
   flex-direction: column;
   align-items: center;
+  /* background-size:cover;
+  background-position-y:top;
+  background-size: 100% 100%; */
+  /* height: 500px; */
 }
 .img{
   width: 200px;
@@ -17,7 +22,7 @@
   bottom: 0;
   left: 0;
   right: 0;
-  background-color: white;
+  /* background-color: white; */
 }
 
 .text{

pages/topics/rent/detail/index.js

@@ -84,6 +84,19 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  previewImage:function(e){
+    // var current = e.target.dataset.src;
+    var th = this;
+    if(th.data.detail.titlePic){
+      var urls =  [th.data.detail.titlePic];
+      wx.previewImage({
+        urls:urls// 需要预览的图片http链接列表  
+      })
+    }else{
+      return;
+    }
+    
   },
   onClickCollect:function(){
     this.setData({

pages/topics/rent/detail/index.wxml

@@ -6,7 +6,9 @@
       </view>
       <view class="content">
         <view class="tit">{{detail.title}}</view>
-        <view class="r_type"><text style="color:#f25959">{{detail.price}}</text>元/月</view>
+        <block wx:if="{{detail.price}}">
+          <view class="r_type"><text style="color:#f25959">{{detail.price}}</text>元/月</view>
+        </block>
       </view>
     </view>
     <view class="right">

pages/topics/rent/index.js

@@ -8,15 +8,25 @@ Component({
   properties: {
     list:{
       type:Array,
-      value:[]
-    }
+      value:[],
+    },
+    nodes:String
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-    img:'../../../images/'
+    img:'../../../images/',
+    show:false
+  },
+  ready:function(){
+    var flag = wx.getStorageSync('rent');
+    if(!flag){
+      this.setData({
+        show:true
+      })
+    }
   },
 
   /**
@@ -28,6 +38,17 @@ Component({
       wx.navigateTo({
         url: '/pages/topics/rent/room/index?id=' + id + '&title=' + e.currentTarget.dataset.title
       })
+    },
+    ok:function(){
+      this.setData({
+        show:false
+      })
+    },
+    never:function(){
+      wx.setStorageSync('rent', '1')
+      this.setData({
+        show:false
+      })
     }
   }
 })

pages/topics/rent/index.json

@@ -1,6 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-    "van-button": "/components/vant/button/index"
+    "van-button": "/components/vant/button/index",
+    "van-popup": "/components/vant/popup/index",
+    "e-ibutton": "/components/image-button/index"
   }
 }

pages/topics/rent/index.wxml

@@ -13,3 +13,25 @@
     </view>
   </block>
 </view>
+
+<van-popup 
+  show="{{ show }}" 
+  bind:close="onClose"
+  custom-style="height: 80%;width:80%"
+  
+  >
+  <view class="tips">
+    <view class="tips-title">住房平台使用须知</view>
+    <view class="tips-con">
+      <rich-text nodes="{{nodes}}"></rich-text>
+    </view>
+    <view class="button">
+      <!-- <van-button type="danger" size="large" bind:click="ok" style="width:100%">我知道了</van-button> -->
+      <view class="btnView">
+        <e-ibutton title="我知道了" bind:onTap="ok" size="small"/>
+      </view>
+      <view class="btn" bindtap="never">不再提示</view>
+    </view>
+
+  </view>
+</van-popup>

pages/topics/rent/index.wxss

@@ -56,3 +56,41 @@
 }
 
 
+.tips{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+
+.tips-title{
+  display: flex;
+  align-items: center;
+  height: 10%;
+  font-size: 20px;
+}
+.tips-con{
+  height: 72%;
+  width: 90%;
+  overflow: scroll;
+}
+
+.button{
+  width: 80%;
+  height: 18%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.btn{
+  text-decoration:underline;
+  font-size:13px;
+  margin-top:5px;
+  color: #f04040;
+}
+
+.btnView{
+  width:100%
+}

pages/topics/rent/room/index.wxml

@@ -1,2 +1,2 @@
 <!--pages/topics/rent/room/index.wxml-->
-<resource style="width:100%" list="{{list}}" tp="2"/>
+<resource style="width:100%" list="{{list}}" tp="2" apartmentId="{{apartmentId}}"/>

pages/topics/talents/index.js

@@ -9,7 +9,8 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    type:String,
+    tpId:String
   },
 
   /**
@@ -32,20 +33,9 @@ Component({
     streetID:'',
     typeCode:'',
     textareaValue:'',
-    error:''
+    error:'',
+    company:''
   },
-  // lifetimes: {
-  //   attached: function () {
-  //     // 在组件实例进入页面节点树时执行
-  //   },
-  //   detached: function () {
-  //     // 在组件实例被从页面节点树移除时执行
-  //   }
-  // },
-  // attached: function () {
-  //   console.log('啦啦啦')
-  // },
-
   /**
    * 组件的方法列表
    */
@@ -189,7 +179,7 @@ Component({
     },
 
     submit() {
-      let th =this;
+      var th =this;
       if (this.data.messageDetail.length >200){
         wx.showModal({
           title: '提示',
@@ -206,24 +196,68 @@ Component({
         })
         return
       }
-      //判断是否选择街道
-      if (this.data.streetID === ''){
-        wx.showModal({
-          title: '提示',
-          content: '请输入街道',
-          showCancel:false
-        })
-        return
+      
+      if(this.properties.type != 'resource'){
+        //判断是否选择街道
+        if (this.data.streetID === ''){
+          wx.showModal({
+            title: '提示',
+            content: '请输入街道',
+            showCancel:false
+          })
+          return
+        }
       }
-      if (this.data.typeCode === ''){
-        wx.showModal({
-          title: '提示',
-          content: '请选择需求类型',
-          showCancel:false
-        })
-        return
+      if(this.properties.type === ''){
+        if (this.data.typeCode === ''){
+          wx.showModal({
+            title: '提示',
+            content: '请选择需求类型',
+            showCancel:false
+          })
+          return
+        }
       }
-      topicModel.addTalents(this.data.messageDetail, this.data.files,this.data.streetID,this.data.typeCode,res=>{
+
+      if(this.properties.type === 'rent'){
+        if (this.data.company === ''){
+          wx.showModal({
+            title: '提示',
+            content: '请输入工作单位',
+            showCancel:false
+          })
+          return
+        }
+
+        if(this.data.files.length <= 0){
+          wx.showModal({
+            title: '提示',
+            content: '请上传身份证、学历等相关证书',
+            showCancel:false
+          })
+          return
+        }
+      }
+
+      if(this.properties.type == 'resource'){
+        var questionType = 0;
+      }else if(this.properties.type == 'rent'){
+        var questionType = 1;
+      }else{
+        var questionType = 2;
+      }
+
+      var data = {
+        content:this.data.messageDetail,
+        picList:this.data.files,
+        departId:this.data.streetID,
+        typeCode:this.data.typeCode,
+        questionType:questionType,
+        id:this.properties.tpId,
+        company:this.data.company
+      }
+
+      topicModel.addTalents(data,res=>{
         const id = res.result; 
         if(res.code === 200){
           this.setData({
@@ -239,14 +273,22 @@ Component({
               confirmText:'查看进度',
               success (res) {
                 if (res.confirm) {
-                wx.redirectTo({
-                    url: '/pages/user/myWhistle/whistleDetail/index?id='+id,       
-                 })
-                } else if (res.cancel) {
-                  setTimeout(function(){  th.setData({
-                    textareaValue:''
-                  }) }, 500);
-                  console.log('用户点击知道了')
+                  wx.redirectTo({
+                      url: '/pages/user/myWhistle/whistleDetail/index?id='+id,       
+                  })
+                }else if (res.cancel) { // 点击知道了
+                  if(th.properties.type == ''){
+                    setTimeout(function(){  
+                      th.setData({
+                        textareaValue:''
+                      }) 
+                    }, 500);
+                  }else{
+                    console.log(1212);
+                    wx.navigateBack({
+                      delta: 1
+                    })
+                  }
                 }
               }
             })
@@ -257,6 +299,12 @@ Component({
         streetsIndex: 0,
         typeListIndex:0,
       })
+    },
+    company:function(e){
+      var company = e.detail.value;
+      this.setData({
+        company:company
+      })
     }
   },
 

pages/topics/talents/index.wxml

@@ -13,33 +13,44 @@
         <mp-uploader ext-class="myUploader"  delete="true" binddelete="deleteFile" upload="{{uplaodFile}}" files="{{files}}" select="{{selectFile}}" max-count="9" title=""></mp-uploader>
       </view>
     </view>
+    <block wx:if="{{type == 'rent'}}">
+      <text style="color:red;font-size:12px">请上传身份证、学历、职称、技能等相关证书</text>
+    </block>
     <!-- 线 -->
     <view class="line-view"></view>
 
+  <block wx:if="{{type != 'resource'}}">
     <view class="select-view">
       <!-- 字体图标 -->
       <view class="select-mark">
         <text class="fa fa-navicon fa-lg"></text>
       </view>
 
+      <block wx:if="{{type == 'rent'}}">
+        <view class="select-con"><text>工作单位</text><input type="text" bindinput='company' placeholder="请输入" placeholder-style='text-align:right'/></view>
+
+      </block>
+      <block wx:else>
+              <!-- 选项 -->
+        <view class="select-picker">
+          <picker bindchange="bindPickerTypeChange" value="{{typeListIndex}}" range="{{typeList}}" >
+            <view>
+              <block wx:if="{{typeListIndex == 0}}">
+              需求类型
+              </block>
+              <block wx:else>
+              {{typeList[typeListIndex]}}
+              </block> 
+            </view>
+          </picker>
+        </view>
+        <!-- 字体图标 -->
+        <view class="select-mark">
+          <text class="fa fa-angle-right fa-lg" style="color:#ACACAE"></text>
+        </view> 
+
+      </block>
 
-      <!-- 选项 -->
-      <view class="select-picker">
-        <picker bindchange="bindPickerTypeChange" value="{{typeListIndex}}" range="{{typeList}}" >
-          <view>
-            <block wx:if="{{typeListIndex == 0}}">
-            需求类型
-            </block>
-            <block wx:else>
-            {{typeList[typeListIndex]}}
-            </block> 
-          </view>
-        </picker>
-      </view>
-      <!-- 字体图标 -->
-      <view class="select-mark">
-        <text class="fa fa-angle-right fa-lg" style="color:#ACACAE"></text>
-      </view> 
     </view>  
     <!-- 所在街道 -->
     <view class="select-view">
@@ -65,6 +76,7 @@
         <text class="fa fa-angle-right fa-lg" style="color:#ACACAE"></text>
       </view> 
     </view>   
+  </block> 
 </view>
 <view class="btnView">
   <e-ibutton title="提交" bind:onTap="submit"/>

pages/topics/talents/index.wxss

@@ -91,3 +91,16 @@
   flex: 1;
   margin:0px 20px;
 }
+
+.select-con{
+  margin-left:20px;
+  flex:1;
+  display: flex;
+  justify-content: space-between;
+}
+
+input{
+  flex:1;
+  margin-left:20px;
+  margin-top: 3px;
+}

pages/user/index.js

@@ -16,6 +16,7 @@ Page({
   data: {
     messageTotal: Number,
     isAuth:false,
+    whistle:false
   },
 
   
@@ -161,6 +162,18 @@ Page({
         messageTotal: Number(res.result.total)
       })
     })
+
+    userModel.getMyWhistleMessage(res=>{
+      if(res.result.reminders == 1){
+        this.setData({
+          whistle: true
+        })
+      }else{
+        this.setData({
+          whistle: false
+        })
+      }
+    })
   },
 
   // cell点击

pages/user/index.wxml

@@ -52,6 +52,7 @@
       title="我的需求"
       link="true" 
       ext-class="cell-item">
+      <view wx:if="{{whistle}}" slot="footer" class="msg_footer">需求有新的处理</view>
     </mp-cell>
     <mp-cell 
       bindtap="onTapItem" data-type="myActivity"

pages/user/myFavorite/index.wxml

@@ -2,28 +2,28 @@
 <view class="title">
   <view class="option" bindtap="refresh" data-type="1">
     <block wx:if="{{type == '1'}}">
-      <text style="color:#1989fa;">宣传栏</text>
+      <view class="text active">宣传栏</view>
     </block>
     <block wx:else>
-      宣传栏
+      <view class="text">宣传栏</view>
     </block>
   </view>
 
   <view class="option" bindtap="refresh" data-type="2">
     <block wx:if="{{type == '2'}}">
-      <text style="color:#1989fa;">通知公告</text>
+      <view class="text active">通知公告</view>
     </block>
     <block wx:else>
-      通知公告
+      <view class="text">通知公告</view>
     </block>
   </view>
 
   <view class="option" bindtap="refresh" data-type="3">
     <block wx:if="{{type == '3'}}">
-      <text style="color:#1989fa;">赋能中心</text>
+      <view class="text active">赋能中心</view>
     </block>
     <block wx:else>
-      赋能中心
+      <view class="text">赋能中心</view>
     </block>
   </view>
 </view>

pages/user/myFavorite/index.wxss

@@ -28,6 +28,7 @@ page{
   display:flex;
   align-items: center;
   justify-content:center;
+
 }
 
 .content{
@@ -37,3 +38,15 @@ page{
   /* height: calc(100% - 80rpx);  */
   /* overflow: scroll; */
 }
+
+.active{
+  border-bottom:3px solid #fa4646;
+}
+
+.text{
+  width:50%;
+  height: 100%;
+  display:flex;
+  align-items: center;
+  justify-content:center;
+}

pages/user/myWhistle/index.js

@@ -31,6 +31,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+
+    this.setData({
+      page:1,
+      next:true,
+      list:[]
+    })
     var data = {
       page:this.data.page,
       pageSize:this.data.pageSize

pages/user/myWhistle/whistleDetail/index.js

@@ -20,6 +20,7 @@ Page({
     var id = options.id;
     userModel.getWhistleDetail(id,res=>{
       var img = res.result.picList.split(";");
+      img.pop();
       this.setData({
         detail:res.result,
         img:img,

pages/user/myWhistle/whistleDetail/index.wxml

@@ -2,14 +2,15 @@
 <wxs module="whistle" src="../whistle.wxs"></wxs>
 
 <view class="title">
-  <view>
+  <!-- <view>
     <view>{{detail.createTime}}</view>
     <view>{{detail.departName}}</view>
-  </view>
+  </view> -->
   <view style="color:{{whistle.getColor(detail.status)}}">{{whistle.getStatus(detail.status)}}</view>
 </view>
 
 <view class="content">
+  <view class="date">提交时间:{{detail.createTime}}</view>
   <view class="con">{{detail.content}}</view>
 
   <block wx:if="{{detail.picList}}">
@@ -23,7 +24,20 @@
       </block>
     </view>
   </block>
+  <view class="info">
+    <view>
+      <block wx:if="{{detail.questionType == 0}}">资源类型：{{detail.typeName}}</block>
+      <block wx:if="{{detail.questionType == 1}}">租房类型：{{detail.typeName}}</block>
+      <block wx:if="{{detail.questionType == 2}}">需求类型：{{detail.typeName}}</block>
+    </view>
+    <block  wx:if="{{detail.departName}}">
+      <view>所在街道：{{detail.departName}}</view>
+    </block>
+    <block  wx:if="{{detail.company}}">
+      <view>工作单位：{{detail.company}}</view>
+    </block>
     
+  </view>
 </view>
 
 <view class="process">

pages/user/myWhistle/whistleDetail/index.wxss

@@ -17,7 +17,7 @@ page{
 }
 
 .content{
-  width: 90%;
+  width: 95%;
   /* height: 200px; */
   margin-top: 5px;
   border-bottom: 1rpx solid rgba(0, 0, 0, 0.116);
@@ -28,7 +28,7 @@ page{
 }
 
 .con{
-  width:90%;
+  width:95%;
   margin-top:20rpx;
   margin-bottom: 20rpx;
   font-size: 26rpx;
@@ -36,9 +36,20 @@ page{
   align-items: center;
 }
 
+.date{
+  width:95%;
+  font-size: 26rpx;
+}
+
+.info{
+  width:95%;
+  font-size: 26rpx;
+  margin-bottom: 5px;
+}
+
 .image-show{
   height: 220rpx;
-  width:90%;
+  width:95%;
   overflow-x:scroll;
   white-space:nowrap;
   margin-top:30rpx;
@@ -53,7 +64,7 @@ page{
 }
 
 .process{
-  width: 90%;
+  width: 95%;
   /* margin-top:20px; */
   display: flex;
   flex-direction: column;

pages/weChatAuth/index.js

@@ -4,7 +4,7 @@ import { UserModel } from '../../models/user.js'
 let userModel = new UserModel()
 import { AuthModel } from '../../models/auth.js'
 let authModel = new AuthModel()
-
+import { config } from '../../config.js'
 
 Page({
 
@@ -12,6 +12,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    titlePic:config.api_url + "/image/head.jpg",
     canIUse: wx.canIUse('button.open-type.getUserInfo'),
     nickName: '',
     avatarUrl: '',

pages/weChatAuth/index.wxml

@@ -7,7 +7,7 @@
   <view class="page_bd">
     <view class="image_view">
       <view class="title">市北人才</view>
-      <image class="img" src="/images/temp_1.png"></image>
+      <image class="img" src="{{titlePic}}"></image>
     </view>
     <view class="description">
       <view class="h1">
@@ -31,7 +31,7 @@
   <view class="page_bd">
     <view class="image_view">
       <view class="title">市北人才</view>
-      <image class="img" src="/images/temp_1.png"></image>
+      <image class="img" src="{{titlePic}}"></image>
     </view>
     <view class="description">
       <view class="h1">