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 @@
-
-
- 我要
- 赋能
-
\ No newline at end of file
+
+
+
+
+ 我要
+ 赋能
+
+
\ 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 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
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 @@
- 工作单位
-
+
+ 工作单位
+
+
+
+
+
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 }