From fcd0a853512f6dcb8b71cef6ff574a292fd30211 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 22 Oct 2020 15:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E5=B1=85=E5=8A=A1=E5=85=AC=E5=BC=80=E6=A8=A1=E5=9D=97=E6=94=B9?= =?UTF-8?q?=E7=89=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/oneKeyService/pages/index/index.js | 5 ++- .../pages/laobingzaixian/laobingzaixian.js | 20 +++++++++-- .../pages/laobingzaixian/laobingzaixian.json | 2 +- .../pages/laobingzaixian/laobingzaixian.wxss | 19 ++++++----- .../laobingzaixianDict/laobingzaixianDict.js | 1 + .../laobingzaixianDict.wxml | 21 +++++++++--- .../laobingzaixianDict.wxss | 34 +++++++++++++++++++ .../pages/noticeDetail/noticeDetail.js | 2 +- utils/config.js | 4 +-- 9 files changed, 87 insertions(+), 21 deletions(-) diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index e91fdeb..91bd40e 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -72,8 +72,11 @@ Page({ url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` }) } else if (e.currentTarget.dataset.modulecode == 'notice_jwgk') { + // wx.navigateTo({ + // url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + // }) wx.navigateTo({ - url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + url: `../laobingzaixian/laobingzaixian?modulecode=${e.currentTarget.dataset.modulecode}` }) } else if (e.currentTarget.dataset.modulecode == 'notice_yjfu_lbzx') { wx.navigateTo({ diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js index 1b0c574..06b5c28 100644 --- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js +++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js @@ -20,13 +20,27 @@ Page({ duration: 500, //幻灯片切换时长(ms) currentSwiper: 0, showTitle: true, //视频标题 + dictType: 'notice_yjfu_lbzx', // 居务公开，老兵在线 }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.getBannerList('7') + this.setData({ + dictType: options.modulecode + }) + if (options.modulecode == 'notice_jwgk') { + wx.setNavigationBarTitle({ + title: '居务公开' + }) + this.getBannerList('8') + } else if (options.modulecode == 'notice_yjfu_lbzx') { + wx.setNavigationBarTitle({ + title: '老兵在线' + }) + this.getBannerList('7') + } this.getFullDictInfo() }, @@ -56,7 +70,7 @@ Page({ }, getFullDictInfo () { - const dictType = 'notice_yjfu_lbzx' + const dictType = this.data.dictType api.modulelist(dictType).then(res => { this.setData({ deptList: res.data, @@ -135,7 +149,7 @@ Page({ navigateToDict (e) { console.log(e.currentTarget.dataset.dict) wx.navigateTo({ - url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=notice_yjfu_lbzx&dictValue=${e.currentTarget.dataset.dict.moduleCode}` + url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=${this.data.dictType}&dictValue=${e.currentTarget.dataset.dict.moduleCode}` }) } }) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json index 60b95d2..8db8a6b 100644 --- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json +++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "老兵在线", + "navigationBarTitleText": "", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata" diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss index 9e5fee7..f8b7726 100644 --- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss +++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss @@ -89,7 +89,7 @@ button::after { display: grid; grid-template-columns: 1fr; place-items: center; - gap: 20rpx 0; + gap: 24rpx 0; width: 690rpx; padding: 20rpx 0; margin: 0rpx auto; @@ -101,7 +101,7 @@ button::after { } .list-item { width: 100%; - height: 130rpx; + height: 160rpx; background: #fff; display: flex; justify-content: space-between; @@ -114,7 +114,7 @@ button::after { font-family:PingFang SC; font-weight:bold; color:rgba(51,51,51,1); - margin-left: 40rpx; + margin-left: 42rpx; display: flex; align-items: center; } @@ -126,7 +126,7 @@ button::after { .list-item .list-name .list-icon { width: 106rpx; height: 106rpx; - margin-right: 10rpx; + margin-right: 14rpx; } /* 轮播图start */ @@ -156,7 +156,7 @@ button::after { .page-body { padding-top: 30rpx; background: #fff; - height: 300rpx; + height: 350rpx; } .page-section { @@ -182,7 +182,7 @@ button::after { .page-section-spacing { box-sizing: border-box; /* padding: 0 20rpx; */ - height: 300rpx; + height: 350rpx; background-color: #fff; } @@ -201,15 +201,16 @@ button::after { .swiper-item { display: block; - height: 300rpx; + height: 350rpx; } .banner { overflow: hidden; - height: 300rpx; + height: 350rpx; display: flex; width: 100%; border-radius: 16rpx; + margin-bottom: 8rpx; } .dots { @@ -241,7 +242,7 @@ button::after { swiper { width: 710rpx; - height: 300rpx; + height: 350rpx; box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1); border-radius: 16rpx; overflow: hidden; diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js index 1e0b135..9b4701c 100644 --- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js +++ b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js @@ -29,6 +29,7 @@ Page({ dictType: options.dictType, dictValue: options.dictValue }) + console.log(options) this.getSclerotiaList() }, diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml index a44cd86..132b478 100644 --- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml +++ b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml @@ -1,19 +1,32 @@ - + - {{item.noticeTitle}} - + {{item.noticeTitle}} {{item.deptName}} {{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}} + + + + {{item.noticeTitle}} + + {{common.getStr(item.noticeContent)}} + + - \ No newline at end of file + + + + module.exports.getStr = function(content) { + return content.replace(getRegExp('<\/?.+?\/?>|[ ]','g'),'') + } + \ No newline at end of file diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss index 84488fe..7542295 100644 --- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss +++ b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss @@ -83,4 +83,38 @@ page { position: absolute; width: 100%; height: 100%; + } + + .list-all .list-item-2 { + width: 100%; + padding: 40rpx 28rpx; + margin-top: 16rpx; + background: #fff; + box-sizing: border-box; + } + + .list-all .list-item-2 .name { + font-size: 34rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); + line-height: 50rpx; + } + + .list-all .list-item-2 .info { + margin-top: 15rpx; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: rgba(153, 153, 153, 1); + } + + .list-all .list-item-2 .info text { + line-height: 46rpx; + overflow: hidden; + text-overflow: ellipsis; + word-wrap: break-word; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + font-size: 30rpx; } \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index a892e49..826083e 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -43,7 +43,7 @@ Page({ this.noticeDetail(options.id) } else if(options.modulecode == 'notice_jwgk'){ wx.setNavigationBarTitle({ - title: '居务公开' + title: options.modulename }) this.noticeDetail(options.id) } else if(options.modulecode == 'notice_yjfu_lbzx'){ diff --git a/utils/config.js b/utils/config.js index e94fe91..d099316 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.19:9094/epdc-api/api/' }