diff --git a/pages/topics/attract/index.js b/pages/topics/attract/index.js
index b890490..4cd5420 100644
--- a/pages/topics/attract/index.js
+++ b/pages/topics/attract/index.js
@@ -1,30 +1,71 @@
// pages/topics/attract/index.js
+import {
+ TopicModel
+} from '../../../models/topic'
+let topicModel = new TopicModel()
Component({
/**
* 组件的属性列表
*/
- properties: {
- list:{
- type:Array,
- value:[],
- },
- spaceList:{
- type:Array,
- value:[],
- },
- },
+ properties: {},
/**
* 组件的初始数据
*/
data: {
-
+ //促招引的列表
+ oceanList: [],
+ spaceList: [],
+ },
+ attached: function () {
+ this.fetchAttractList()
},
-
/**
* 组件的方法列表
*/
methods: {
+ //促招引
+ fetchAttractList() {
+ var th = this;
+ var page = 1;
+ var pageSize = 3
+ topicModel.getAttractList('sc-hyrcfnzx', page, pageSize, res => {
+ console.log('海洋人才赋能中心-->', res)
+ const datas = res.list
+ let tempDatas = []
+ datas.forEach(item => {
+ tempDatas.push({
+ id: item.id,
+ title: item.title,
+ image: item.titlePic,
+ showTop: item.isTop == 1 ? true : false,
+ time: item.createTime,
+ readed: item.isRead == 0 ? false : true
+ })
+ })
+ th.setData({
+ oceanList: tempDatas,
+ })
+ })
+ topicModel.getAttractList('sc-ztkj', page, pageSize, res => {
+ console.log('折腾空间-->', res)
+ const datas = res.list
+ let tempDatas = []
+ datas.forEach(item => {
+ tempDatas.push({
+ id: item.id,
+ title: item.title,
+ image: item.titlePic,
+ showTop: item.isTop == 1 ? true : false,
+ time: item.createTime,
+ readed: item.isRead == 0 ? false : true
+ })
+ })
+ th.setData({
+ spaceList:tempDatas,
+ })
+ })
+ },
//海洋人才赋能中心详情
clickListItem(e) {
//console.log(e.detail)
@@ -33,7 +74,17 @@ Component({
index
} = e.detail
this.setData({
- [`list[${index}].readed`]: true
+ [`oceanList[${index}].readed`]: true
+ })
+ this.goOceanDetail(id)
+ },
+ clickListItemSpace(e) {
+ const {
+ id,
+ index
+ } = e.detail
+ this.setData({
+ [`oceanList[${index}].readed`]: true
})
this.goOceanDetail(id)
},
@@ -43,10 +94,10 @@ Component({
})
},
//海洋人才赋能中心更多
- goOceanMore(){
+ goOceanMore() {
wx.navigateTo({
url: `/pages/topics/attract/ocean/index`,
-
+
})
},
//折腾空间中心详情
@@ -67,10 +118,10 @@ Component({
})
},
//折腾空间中心更多
- goSpaceMore(){
+ goSpaceMore() {
wx.navigateTo({
url: `/pages/topics/attract/space/index`,
})
},
}
-})
+})
\ No newline at end of file
diff --git a/pages/topics/attract/index.wxml b/pages/topics/attract/index.wxml
index 55f8ebc..c1aa844 100644
--- a/pages/topics/attract/index.wxml
+++ b/pages/topics/attract/index.wxml
@@ -7,8 +7,8 @@
海洋人才赋能中心
更多>
-
-
+
+
@@ -21,7 +21,7 @@
更多>
-
+
diff --git a/pages/topics/index.js b/pages/topics/index.js
index eb3b2fe..db697da 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -37,9 +37,6 @@ Page({
rentNode: '',
height: app.globalData.windowHeight - 44,
flag: 0,
- //促招引的列表
- oceanList: [],
- spaceList: [],
//来活动
activityList:[]
},
@@ -182,9 +179,6 @@ Page({
getData: function (tab) {
console.log(tab)
switch (tab) {
- case "1":
- return this.fetchAttractList();
- // return this.fetchCenterList();
case "3":
return this.fetchCenterList()
// return this.fetchTopicList();
@@ -240,25 +234,6 @@ Page({
})
},
-
- //促招引
- fetchAttractList() {
- var th = this;
- var page = 1;
- var pageSize = 3
- topicModel.getAttractList('sc-hyrcfnzx', page, pageSize, res => {
- console.log('海洋人才赋能中心-->', res)
- th.setData({
- oceanList: res.list,
- })
- })
- topicModel.getAttractList('sc-ztkj', page, pageSize, res => {
- console.log('折腾空间-->', res)
- th.setData({
- spaceList: res.list,
- })
- })
- },
//赋能中心
fetchCenterList() {
// let page = this.data.currPage;
@@ -324,8 +299,6 @@ Page({
})
switch (tab) {
- case "1":
- return this.fetchAttractList();
case "3":
return this.fetchCenterList();
// return this.fetchTopicList();
diff --git a/pages/topics/index.wxml b/pages/topics/index.wxml
index fca72d0..907c68d 100644
--- a/pages/topics/index.wxml
+++ b/pages/topics/index.wxml
@@ -5,7 +5,7 @@
-
+
diff --git a/pages/topics/reportDemand/index.wxml b/pages/topics/reportDemand/index.wxml
index 2b9a112..aadd100 100644
--- a/pages/topics/reportDemand/index.wxml
+++ b/pages/topics/reportDemand/index.wxml
@@ -23,7 +23,7 @@
-
+
姓名
diff --git a/pages/user/index.js b/pages/user/index.js
index 8c61c9d..22cc01c 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -180,7 +180,7 @@ Page({
serviceData.push(pList.slice(i, i + 8))
};
// console.log(serviceData)
- // console.log(service)
+ console.log('service-->',service)
this.setData({
service: service,
servicePublic: serviceData
@@ -388,5 +388,19 @@ Page({
}
})
return;
+ },
+ goTraffic(){
+ wx.navigateToMiniProgram({
+ appId: 'wx0773fc2238f4ca70',
+ path: '',
+ envVersion: 'release', // 打开正式版
+ success(res) {
+ // 打开成功
+ console.log('打开成功')
+ },
+ fail: function (err) {
+ console.log(err);
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 370cce0..210ecfd 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -65,7 +65,7 @@
{{it.server_name}}
-
+