From 33f22a4b430e6dc4b48553e82614315cd7762f07 Mon Sep 17 00:00:00 2001
From: xuxu <xuxubarca@163.com>
Date: Mon, 12 Oct 2020 13:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E8=83=BD=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B1=8F=E8=94=BD=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E5=AE=B9=E6=98=93=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                        |  5 +++--
 pages/resource/detail/index.js   |  9 ++++++++-
 pages/resource/detail/index.wxml | 13 ++++++++-----
 pages/topics/index.js            |  7 +++++--
 pages/topics/index.wxml          | 24 ++++++++++++++----------
 pages/topics/talents/index.wxml  |  9 +++++++--
 utils/http.js                    | 14 +++++++++++++-
 7 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/config.js b/config.js
index aa8c660..f467eb9 100644
--- a/config.js
+++ b/config.js
@@ -1,5 +1,6 @@
 const config = {
-  // api_url: 'http://192.168.42.44:8083/fqsb', // 服务器地址
-  api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb'
+  // api_url: 'http://192.168.42.39:7101/fqsb', // 服务器地址
+  api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb' // 正式环境
+  // api_url: 'https://dingoa.elinkit.com.cn/fqsb', // 测试环境
 }
 export { config }
\ No newline at end of file
diff --git a/pages/resource/detail/index.js b/pages/resource/detail/index.js
index a7716e7..da749f6 100644
--- a/pages/resource/detail/index.js
+++ b/pages/resource/detail/index.js
@@ -12,7 +12,8 @@ Page({
     unStar: '/images/common/star.png',
     star: '/images/common/star_light.png',
     detail:{},
-    isCollect:false
+    isCollect:false,
+    show:false
   },
 
   /**
@@ -22,6 +23,12 @@ Page({
     var id = options.id;
     topicModel.getResourceDetail(id,res=>{
       wx.setNavigationBarTitle({ title:res.result.typeName})
+
+      if(res.result.typeCode != 'zcfn'){
+        this.setData({
+          show:true
+        })
+      }
       if(res.result.isCollection == 1){
         this.setData({
           isCollect:true,
diff --git a/pages/resource/detail/index.wxml b/pages/resource/detail/index.wxml
index 40cf2e1..2eb98e6 100644
--- a/pages/resource/detail/index.wxml
+++ b/pages/resource/detail/index.wxml
@@ -19,8 +19,11 @@
   </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> -->
-  <text>我要</text>
-  <text>赋能</text>
-</view>
\ No newline at end of file
+
+<block wx:if="{{show}}">
+  <view class="publish" bindtap="onTap">
+    <!-- <image src="/images/topic/publish.png"></image> -->
+    <text>我要</text>
+    <text>赋能</text>
+  </view>
+</block>
\ No newline at end of file
diff --git a/pages/topics/index.js b/pages/topics/index.js
index ec63c70..c6273c0 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -29,7 +29,8 @@ Page({
     apartment:[],
     nodes:'',
     rentNode:'',
-    height:app.globalData.windowHeight - 44
+    height:app.globalData.windowHeight - 44,
+    flag:0
 
   },
 
@@ -38,7 +39,9 @@ Page({
    */
 
   onLoad: function () {
-
+    this.setData({
+      flag:app.globalData.flag
+    })
   },
 
   //进入页面判断是否绑定微信号，如果绑定手机号根据segmentIndex的数值fetch留言互动和赋能中心的资源，否则退回注册页面或者首页
diff --git a/pages/topics/index.wxml b/pages/topics/index.wxml
index c5a91ac..0c0928b 100644
--- a/pages/topics/index.wxml
+++ b/pages/topics/index.wxml
@@ -17,19 +17,23 @@
         </scroll-view>
       </block>
     </van-tab>
-    <van-tab title="找贷款" name="4">
-      <block wx:if="{{tab == '4'}}">
-        <loan detail="{{loan}}" style=""/>
-      </block>
-    </van-tab>
+    <block wx:if="{{flag}}">
+      <van-tab title="找贷款" name="4">
+        <block wx:if="{{tab == '4'}}">
+          <loan detail="{{loan}}" style=""/>
+        </block>
+      </van-tab>
+    </block>
     <van-tab title="报需求" name="2"> 
       <talents  />
     </van-tab>
-    <van-tab title="交朋友" name="3">
-      <scroll-view scroll-y style="height:{{height}}px" bindscrolltolower="onReachBottom">
-        <interactive list="{{topicList}}" bind:deleteTopic="deleteTopic"/>
-      </scroll-view>
-    </van-tab>
+    <block wx:if="{{flag}}">
+      <van-tab title="交朋友" name="3">
+        <scroll-view scroll-y style="height:{{height}}px" bindscrolltolower="onReachBottom">
+          <interactive list="{{topicList}}" bind:deleteTopic="deleteTopic"/>
+        </scroll-view>
+      </van-tab>
+    </block>
 
 
   </van-tabs>
diff --git a/pages/topics/talents/index.wxml b/pages/topics/talents/index.wxml
index b56602f..53f69b5 100644
--- a/pages/topics/talents/index.wxml
+++ b/pages/topics/talents/index.wxml
@@ -27,8 +27,13 @@
       </view>
 
       <block wx:if="{{type == 'rent'}}">
-        <view class="select-con"><text>工作单位</text><input type="text" bindinput='company' placeholder="请输入" placeholder-style='text-align:right'/></view>
-
+        <view class="select-con">
+          <text>工作单位</text>
+          <input style="margin-right:20px" type="text" bindinput='company' placeholder="请输入" placeholder-style='text-align:right;color:#ACACAE;'/>
+        </view>
+        <view class="select-mark">
+          <text class="fa fa-angle-right fa-lg" style="color:#ACACAE"></text>
+        </view> 
       </block>
       <block wx:else>
               <!-- 选项 -->
diff --git a/utils/http.js b/utils/http.js
index fb66bc5..517b948 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -7,7 +7,8 @@ const Method = {
 }
 // 定义一些通用常量
 const HTTPConst = {
-  TokenURL: '/api/miniuser/getToken'
+  TokenURL: '/api/miniuser/getToken',
+  configURL:'/api/config/info'
 }
 class HTTP {
   constructor() {
@@ -112,5 +113,16 @@ class HTTP {
       })
     })
   }
+
+  getConfig(success){
+    let params = {
+      url: HTTPConst.configURL,
+      method: Method.GET,
+      data: {
+      },
+      success: success
+    }
+    this.request(params)
+  }
 }
 export { HTTP, Method, HTTPConst }