diff --git a/components/TabBar/TabBar.scss b/components/TabBar/TabBar.scss
index af12d36..6673f26 100644
--- a/components/TabBar/TabBar.scss
+++ b/components/TabBar/TabBar.scss
@@ -4,7 +4,7 @@
width: 100%;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
- z-index: 999;
+ z-index: 2;
background-color: rgba(255, 255, 255, .5);
}
.page-total{
diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue
index 11e29ed..694011d 100644
--- a/components/TabBar/TabBar.vue
+++ b/components/TabBar/TabBar.vue
@@ -1,26 +1,25 @@
-
-
-
-
-
-
- {{item.name}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
-
-
-
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 75f912f..9d09dec 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -66,7 +66,7 @@
招聘
-
+
@@ -169,7 +169,7 @@
-
+
diff --git a/pages/my/myComdetail/myComdetail.vue b/pages/my/myComdetail/myComdetail.vue
index 31e01b9..ec53846 100644
--- a/pages/my/myComdetail/myComdetail.vue
+++ b/pages/my/myComdetail/myComdetail.vue
@@ -19,10 +19,10 @@
-
+ >修改 -->
diff --git a/pages/news/news.vue b/pages/news/news.vue
index 2d34df3..5a523f1 100644
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -1,10 +1,10 @@
-
+
热点要闻
-
+
园区快讯
@@ -48,7 +48,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
@@ -113,13 +113,15 @@
baseUrl: "http://deyanggaoxin.fengshiyun.com",
keyword: '',
isAdmin: false,
- categoryId: '360234116366468357'
+ // 判断你是否有图片
+ isImg:false,
+ // categoryId: '360234116366468357'
};
},
onLoad() {
let that = this
this.getUser()
- this.getNewsList()
+ this.getNewsList('360233879019193605')
},
methods: {
// 获取用户信息
@@ -144,10 +146,10 @@
}
},
// 获取新闻列表
- getNewsList() {
+ getNewsList(id) {
let that = this
that.API.getNewsList({
- categoryId:this.categorrId,
+ categoryId:id,
// keyword:this.keyword,
pageSize:500
}
@@ -169,9 +171,9 @@
console.log(that.newsList)
})
},
- onCouponTab(type) {
+ onCouponTab(type,id) {
this.TabShow = type;
- this.getNewsList()
+ this.getNewsList(id)
},
onArticle(item) {
uni.navigateTo({
diff --git a/pages/notice/notice.vue b/pages/notice/notice.vue
index 284ae87..8a32f1c 100644
--- a/pages/notice/notice.vue
+++ b/pages/notice/notice.vue
@@ -1,10 +1,10 @@
-
+
公示
-
+
通知
@@ -43,8 +43,8 @@
-
-
+
+
@@ -77,8 +77,8 @@
-
-
+
+
@@ -108,12 +108,13 @@ import utils from '../../service/utils';
// }
keyword:'',
- isAdmin:false
+ isAdmin:false,
+ baseUrl: "http://deyanggaoxin.fengshiyun.com",
};
},
onLoad() {
this.getUser()
- this.getNoticeList()
+ this.getNoticeList(this.categorrId)
},
methods: {
// 获取用户信息
@@ -138,10 +139,10 @@ import utils from '../../service/utils';
}
},
// 获取公式列表
- getNoticeList(){
+ getNoticeList(id){
let that = this
that.API.getNoticeList({
- categoryId:this.categorrId,
+ categoryId:id,
pageSize:500
}).then(res=>{
if(res.code == 200){
@@ -149,6 +150,7 @@ import utils from '../../service/utils';
return {
...it,
createTime:utils.formatTime(it.createTime),
+ isImg: it.imgUrl.length > 0
}
})
// if(that.noticeList.)
@@ -162,9 +164,10 @@ import utils from '../../service/utils';
url: '/pages/postNotice/postNotice'
})
},
- onCouponTab(type) {
+ onCouponTab(type,id) {
this.TabShow = type;
- this.getNoticeList()
+ this.categorrId = id
+ this.getNoticeList(id)
},
onArticle(item) {
uni.navigateTo({
@@ -182,6 +185,7 @@ import utils from '../../service/utils';
return {
...it,
createTime:utils.formatTime(it.createTime),
+ isImg: it.imgUrl.length > 0
}
})
// if(that.noticeList.)
diff --git a/pages/policy/policy.vue b/pages/policy/policy.vue
index ea4a094..2842a90 100644
--- a/pages/policy/policy.vue
+++ b/pages/policy/policy.vue
@@ -72,8 +72,11 @@
+
-
+
@@ -100,7 +103,8 @@
isAdmin: false,
categoryId: '360234017372505349',
baseUrl: "http://deyanggaoxin.fengshiyun.com",
- haveData:false
+ haveData:false,
+ isImg:false
};
},
onLoad() {
@@ -141,11 +145,12 @@
}).then(res => {
console.log(res)
that.AllList = res.data.list
- // console.log(that.AllList)
+ console.log('总的',that.AllList)
that.AllList = that.AllList.map(it => {
return {
...it,
- createTime: utils.formatTime(it.createTime)
+ createTime: utils.formatTime(it.createTime),
+ // isImg: it.imgUrl.length > 0
}
})
this.fenLeiList = that.AllList.filter(it=>{
@@ -154,6 +159,7 @@
if(this.fenLeiList === []){
this.haveData = true
}
+ console.log("this.AllList", this.AllList)
console.log("分类", this.fenLeiList)
})
},
@@ -188,7 +194,8 @@
that.AllList = that.AllList.map(it => {
return {
...it,
- createTime: utils.formatTime(it.createTime)
+ createTime: utils.formatTime(it.createTime),
+ // isImg: it.imgUrl.length > 0
}
})
this.fenLeiList = that.AllList
@@ -197,7 +204,7 @@
}
console.log("分类", this.fenLeiList)
})
- console.log(this.fenLeiList)
+ console.log('this.fenLeiList',this.fenLeiList)
console.log(type)
},
// 显示下方为国家级还是省级等
@@ -216,7 +223,8 @@
that.AllList = that.AllList.map(it => {
return {
...it,
- createTime: utils.formatTime(it.createTime)
+ createTime: utils.formatTime(it.createTime),
+ // isImg: it.imgUrl.length > 0
}
})
this.fenLeiList = that.AllList
@@ -234,14 +242,15 @@
search() {
let that = this
that.API.getPolicyList({
- categoryId: this.categoryId,
+ // categoryId: this.categoryId,
keyword: this.keyword
}).then(res => {
// console.log(res)
that.fenLeiList = res.data.list.map(it => {
return {
...it,
- createTime: utils.formatTime(it.createTime)
+ createTime: utils.formatTime(it.createTime),
+ // isImg: it.imgUrl.length > 0
}
})
if(this.fenLeiList === null){
diff --git a/pages/postCon/postCon.vue b/pages/postCon/postCon.vue
index 27a3e42..ba07baa 100644
--- a/pages/postCon/postCon.vue
+++ b/pages/postCon/postCon.vue
@@ -297,6 +297,10 @@ import utils from '../../service/utils';
uni.showToast({
icon: "success",
title: "更新成功!"
+ }).then(()=>{
+ uni.navigateTo({
+ url:"/pages/construct/construct"
+ })
})
}
}).catch((err)=>{
diff --git a/pages/postDemand/postDemand.vue b/pages/postDemand/postDemand.vue
index 9be6bd2..73fb4cb 100644
--- a/pages/postDemand/postDemand.vue
+++ b/pages/postDemand/postDemand.vue
@@ -197,6 +197,10 @@
uni.showToast({
icon:"success",
title:"发布成功"
+ }).then(()=>{
+ uni.navigateTo({
+ url:"/pages/demand/demand"
+ })
})
}
})
diff --git a/pages/postNews/postNews.vue b/pages/postNews/postNews.vue
index 08aba88..e2530f2 100644
--- a/pages/postNews/postNews.vue
+++ b/pages/postNews/postNews.vue
@@ -21,6 +21,23 @@
+
+
+ 隶属类别
+
+
+ {{TypeArray[TypeIndex]}}
+
+
+
+ {{TypeArray[TypeIndex]}}
+
+
+
+
+
+
+
@@ -74,7 +91,9 @@ import utils from '../../service/utils';
isId:'',
have:false,
detailData:[],
- categoryId:'360233879019193605'
+ categoryId:['360233879019193605','530363088214426885'],
+ TypeArray: ['热点要闻', '园区快讯'],
+ TypeIndex: 0,
};
},
@@ -97,6 +116,14 @@ import utils from '../../service/utils';
},
methods: {
+ /**
+ * 反馈类型
+ * @param {Object} val
+ */
+ FeedbackTypeCh(val) {
+ console.log(val);
+ this.TypeIndex = val.detail.value;
+ },
// 获取上传状态
select(e) {
console.log('选择文件:', e)
@@ -155,13 +182,15 @@ import utils from '../../service/utils';
postAll() {
console.log("进入POST")
let that = this
+ let categoryId = that.categoryId[that.TypeIndex]
+ console.log(categoryId)
if (that.uploadPath) {
console.log('jinru')
// console.log(uni.getStorageSync('token'))
var info = {
title: that.valiFormData.title,
bodyContent: that.valiFormData.bodyContent,
- categoryId:that.categoryId,
+ categoryId:categoryId,
creatorUserId: that.userCode.userId,
subTitle: that.valiFormData.subTitle,
imgUrl: that.uploadPath,
diff --git a/pages/postNotice/postNotice.vue b/pages/postNotice/postNotice.vue
index 2144739..1d15a1b 100644
--- a/pages/postNotice/postNotice.vue
+++ b/pages/postNotice/postNotice.vue
@@ -21,6 +21,23 @@
+
+
+ 隶属类别
+
+
+ {{TypeArray[TypeIndex]}}
+
+
+
+ {{TypeArray[TypeIndex]}}
+
+
+
+
+
+
+
@@ -74,7 +91,9 @@ import utils from '../../service/utils';
isId:'',
have:false,
detailData:[],
- categoryId:'360234116366468357'
+ categoryId:['360234116366468357','530362479830631685'],
+ TypeArray: ['公示', '通知'],
+ TypeIndex: 0,
};
},
@@ -97,6 +116,14 @@ import utils from '../../service/utils';
},
methods: {
+ /**
+ * 反馈类型
+ * @param {Object} val
+ */
+ FeedbackTypeCh(val) {
+ console.log(val);
+ this.TypeIndex = val.detail.value;
+ },
// 获取上传状态
select(e) {
console.log('选择文件:', e)
@@ -155,16 +182,20 @@ import utils from '../../service/utils';
postAll() {
console.log("进入POST")
let that = this
+ let categoryId = that.categoryId[that.TypeIndex]
+ console.log(categoryId)
+ console.log(that.uploadPath)
if (that.uploadPath) {
console.log('jinru')
// console.log(uni.getStorageSync('token'))
var info = {
title: that.valiFormData.title,
bodyContent: that.valiFormData.bodyContent,
- categoryId:that.categoryId,
+ categoryId:categoryId,
creatorUserId: that.userCode.userId,
subTitle: that.valiFormData.subTitle,
imgUrl: that.uploadPath,
+
}
console.log(info)
this.API.postInfo(info).then(res=>{
diff --git a/pages/postProduct/postProduct.vue b/pages/postProduct/postProduct.vue
index 28295bf..ecb3a8f 100644
--- a/pages/postProduct/postProduct.vue
+++ b/pages/postProduct/postProduct.vue
@@ -193,6 +193,10 @@
uni.showToast({
icon:"success",
title:"发布成功"
+ }).then(()=>{
+ uni.navigateTo({
+ url:'/pages/supply/supply'
+ })
})
}
diff --git a/pages/postTalent/postTalent.vue b/pages/postTalent/postTalent.vue
index e358aa4..29236f6 100644
--- a/pages/postTalent/postTalent.vue
+++ b/pages/postTalent/postTalent.vue
@@ -33,6 +33,7 @@
subTitle: '',
bodyContent: '',
post: '',
+ phone:''
},
creater: '',
rules: {
@@ -83,6 +84,10 @@
uni.showToast({
icon:"success",
title:'发布成功'
+ }).then(()=>{
+ uni.navigateTo({
+ url:'/pages/talent/talent'
+ })
})
}
})
diff --git a/pages/recommend/postRecommend/postRecommend.vue b/pages/recommend/postRecommend/postRecommend.vue
index c25444f..7fdb149 100644
--- a/pages/recommend/postRecommend/postRecommend.vue
+++ b/pages/recommend/postRecommend/postRecommend.vue
@@ -148,6 +148,29 @@
}
},
methods: {
+ // 获取用户信息
+ getUser() {
+ if (uni.getStorageSync('user')) {
+ let userCode = uni.getStorageSync("user")
+ console.log(userCode)
+ if(userCode.userInfo.userId === 'admin'){
+ this.isAdmin = true
+ }
+ console.log('用户已登录!')
+ }
+ else {
+ uni.showToast({
+ title: '请登录',
+ icon: 'none',
+ duration:1500
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/login/index'
+ })
+ })
+ }
+ },
// 获取上传状态
select(e) {
console.log('选择文件:', e)
@@ -204,6 +227,10 @@
uni.showToast({
icon:"success",
title:"发布成功!"
+ }).then(()=>{
+ uni.navigateTo({
+ url:'/pages/recommend/recommend'
+ })
})
}
})
diff --git a/pages/talentDetail/talentDetail.vue b/pages/talentDetail/talentDetail.vue
index 5cc1dce..020cf4c 100644
--- a/pages/talentDetail/talentDetail.vue
+++ b/pages/talentDetail/talentDetail.vue
@@ -24,12 +24,12 @@
收藏
-->
-