diff --git a/components/activity/activity.wxss b/components/activity/activity.wxss index 845edfb..5200898 100644 --- a/components/activity/activity.wxss +++ b/components/activity/activity.wxss @@ -1,5 +1,6 @@ .layout { display: table; + width: 100%; /* width: calc(100% - 40rpx); */ height: 276rpx; /* border-radius: 10rpx; */ diff --git a/images/mine/signedup.png b/images/mine/signedup.png deleted file mode 100644 index ebb0128..0000000 Binary files a/images/mine/signedup.png and /dev/null differ diff --git a/images/mine/signup.png b/images/mine/signup.png index c3eebfb..412121e 100644 Binary files a/images/mine/signup.png and b/images/mine/signup.png differ diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index e02dbfd..514d3a9 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -35,11 +35,12 @@ page { } .header .navigation .goback { - width: 16rpx; - margin-left: 30rpx; + width: 40rpx; + padding-left: 14rpx; display: flex; align-items: center; justify-content: center; + height: 100%; } .header .navigation .goback image { diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxss b/pages/mine/components/topicItemNew/topicItemNew.wxss index 883a9ab..7a309d8 100644 --- a/pages/mine/components/topicItemNew/topicItemNew.wxss +++ b/pages/mine/components/topicItemNew/topicItemNew.wxss @@ -2,7 +2,7 @@ /* width: calc(100% - 40rpx); */ padding: 40rpx 29rpx 20rpx 29rpx; background: #fff; - margin-top: 20rpx; + margin-bottom: 20rpx; border-radius: 16rpx; } @@ -44,6 +44,7 @@ font-weight: 500; color: rgba(51, 51, 51, 1); line-height: 54rpx; + margin-top: 10rpx; } .image-list { @@ -66,7 +67,7 @@ margin-top: 21rpx; display: flex; align-items: center; - justify-content: space-between; + justify-content: space-around; /* justify-content: center; */ height: 28rpx; padding: 0 50rpx; @@ -96,7 +97,7 @@ .comment { /* width: calc(100% - 98rpx); */ - padding: 26rpx 20rpx; + padding: 16rpx 20rpx 26rpx; background: #F2F2F2; border-radius: 8rpx; margin-top: 25rpx; @@ -104,7 +105,7 @@ .comment .comment-list { width: 100%; - margin-top: 11rpx; + margin-top: 10rpx; font-size: 28rpx; color: #999999; } diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 5aa4d8d..5395c43 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -248,6 +248,7 @@ Page({ faceImg: "", nickname: "", partyFlag: "0", + isSignUp: 0, points: 0, grade: 0 } @@ -336,6 +337,9 @@ Page({ //签到 2020.07.24 toSignUp () { + if (this.data.userInfo.isSignUp == 1) { + return + } api.userInfoSignUp().then(res => { console.log(res.data) if (res.code === 0) { diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index b93fac6..c0f0554 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -26,14 +26,13 @@ - - - - + + + + 签 到 + 已签到 + + diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index e9e4cd8..0d505a9 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -46,7 +46,7 @@ page { } .personal-info .box .content .bottom text{ color: #fff; - font-size: 30rpx; + font-size: 28rpx; line-height: 30rpx; flex: 1; text-align: center; @@ -119,7 +119,7 @@ page { width: 142rpx; height: 46rpx; position: relative; - margin-right: 14rpx; + margin-right: 16rpx; margin-top: 22rpx; } .personal-info .box .content .top .complete-info .complete-image { @@ -144,12 +144,16 @@ page { height: 46rpx; line-height: 46rpx; margin-left: 10rpx; + width: 88rpx; + text-align: center; } .personal-info .box .content .top .complete-info .complete-content .rightsword { width: 14rpx; height: 18rpx; object-fit: cover; - margin-left: 8rpx; + /* margin-left: 8rpx; */ + position: absolute; + right: 4rpx; } .personal-info .box .content .bottom .operation { flex: 1; diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 497f2f5..36d710e 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.18" + const versionNum = "1.4.19" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index fda3e97..6d80207 100644 --- a/project.config.json +++ b/project.config.json @@ -30,7 +30,7 @@ "compileType": "miniprogram", "libVersion": "2.8.2", "appid": "wx6dcf544cdae7d4ec", - "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%91%E7%AB%AF", + "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", "debugOptions": { "hidedInDevtools": [] }, diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss index 8de40e5..1cd7de3 100644 --- a/subpages/associationNew/components/communityList/communityList.wxss +++ b/subpages/associationNew/components/communityList/communityList.wxss @@ -1,6 +1,10 @@ .hover-btn { box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); } +.community-list { + position: relative; + top: -50rpx; +} .community-item{ width: 690rpx; height: 300rpx; @@ -8,6 +12,7 @@ position: relative; margin: 0 auto; margin-top: 28rpx; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } .community-item image{ width: 100%; @@ -19,7 +24,7 @@ width: 100%; height: 100%; position: absolute; - background: rgba(0, 0, 0, 0.1); + background: rgba(0, 0, 0, 0.2); border-radius: 10rpx; text-align: center; display: flex; @@ -32,11 +37,13 @@ line-height: 70rpx; display: inline-block; height: 70rpx; - background: rgba(0, 0,0,0.3); + /* background: rgba(0, 0,0,0.3); */ border-radius: 5rpx; overflow: hidden; color: white; - text-shadow: 2rpx 2rpx 0rpx #999; + text-shadow: 2rpx 2rpx 4rpx #666; + font-weight: 800; + letter-spacing: 8rpx; } .btn-container { width: 100%; diff --git a/subpages/associationNew/images/navbarbk.png b/subpages/associationNew/images/navbarbk.png new file mode 100644 index 0000000..8d8ae36 Binary files /dev/null and b/subpages/associationNew/images/navbarbk.png differ diff --git a/subpages/associationNew/pages/associationlist/associationlist.js b/subpages/associationNew/pages/associationlist/associationlist.js index 825a8c3..91d2fb7 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.js +++ b/subpages/associationNew/pages/associationlist/associationlist.js @@ -4,6 +4,7 @@ import { getJoinGroup, getImageUrl2 } from "../../utils/api" +const app = getApp() Page({ data: { associationList: [], @@ -11,10 +12,16 @@ Page({ loadMoreType: "none", pageNo: 1, pageSize: 10, - imageUrlList: [], + imageUrlList: [], + statusHeight: 0, // 自定义头部状态栏高度 + navigationHeight: 0, // 自定义头部导航栏高度 }, onLoad: function () { // this.getPartyGroupList(); + this.setData({ + statusHeight: app.globalData.deviceInfo.statusHeight, + navigationHeight: app.globalData.deviceInfo.navigationHeight, + }) getImageUrl2().then(res => { this.setData({ imageUrlList: [...res.data] @@ -38,7 +45,9 @@ Page({ this.getPartyGroupList() } }, - + _backhome () { + wx.navigateBack() + }, //获取党群列表 getPartyGroupList () { getPartyGroupList().then(res => { diff --git a/subpages/associationNew/pages/associationlist/associationlist.json b/subpages/associationNew/pages/associationlist/associationlist.json index 1e1da6b..50a5f09 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.json +++ b/subpages/associationNew/pages/associationlist/associationlist.json @@ -1,4 +1,6 @@ { + "navigationStyle": "custom", + "navigationBarTextStyle":"white", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "community-list": "../../components/communityList/communityList" diff --git a/subpages/associationNew/pages/associationlist/associationlist.wxml b/subpages/associationNew/pages/associationlist/associationlist.wxml index 0ff92b4..836aac9 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.wxml +++ b/subpages/associationNew/pages/associationlist/associationlist.wxml @@ -1,6 +1,12 @@ - + + + + 党群列表 + + + - {{detail.title}} + {{detail.title}} - + + diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss index 0e8ec01..e09217f 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxss +++ b/subpages/heart/pages/heartDetail/heartDetail.wxss @@ -17,12 +17,14 @@ page{ .top-font { color: #fff; - display: block; + display: flex; position: absolute; - top: 67rpx; + top: 0rpx; left: 20rpx; right: 20rpx; font-size: 44rpx; + height: 188rpx; + align-items: center; } .position-absolute { diff --git a/subpages/integralCentre/images/note.png b/subpages/integralCentre/images/note.png new file mode 100644 index 0000000..12ede2a Binary files /dev/null and b/subpages/integralCentre/images/note.png differ diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js index 84b4f04..fcb7107 100644 --- a/subpages/integralCentre/pages/index/index.js +++ b/subpages/integralCentre/pages/index/index.js @@ -264,6 +264,12 @@ Page({ console.log(err) }) }, + bindtapIntegralRule () { + console.log('获取积分规则') + wx.navigateTo({ + url: `/subpages/understandJs/pages/noticeDetail/noticeDetail?modulecode=notice_points_rule` + }) + }, /** * 用户点击右上角分享 */ diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml index 98bdfc8..a128684 100644 --- a/subpages/integralCentre/pages/index/index.wxml +++ b/subpages/integralCentre/pages/index/index.wxml @@ -2,6 +2,7 @@ {{points}} 积分 + 积分规则 diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss index 6b09a26..2b29b9f 100644 --- a/subpages/integralCentre/pages/index/index.wxss +++ b/subpages/integralCentre/pages/index/index.wxss @@ -34,6 +34,20 @@ page { margin-top: 29rpx; } +.title .rule { + color: white; + position: absolute; + display: flex; + align-items: center; + left: 570rpx; + top: 40rpx; + font-size: 28rpx; +} +.title .rule image{ + width: 30rpx; + height: 30rpx; + margin-left: 10rpx; +} .tab-bar { width: 100%; height: 80rpx; diff --git a/subpages/oneKeyService/pages/archives/archives.wxss b/subpages/oneKeyService/pages/archives/archives.wxss index c0dbfea..82c589d 100644 --- a/subpages/oneKeyService/pages/archives/archives.wxss +++ b/subpages/oneKeyService/pages/archives/archives.wxss @@ -90,13 +90,12 @@ button::after { display: grid; grid-template-columns: 1fr; place-items: center; - gap: 30rpx 0; + gap: 20rpx 0; width: 690rpx; padding: 20rpx 0; - margin: 296rpx auto 0rpx; - /* position: absolute; - top: 296rpx; - left: 30rpx; */ + margin: 180rpx auto 0rpx; + position: relative; + z-index: 999; } .list-item { width: 100%; diff --git a/subpages/oneKeyService/pages/directTo/directTo.wxss b/subpages/oneKeyService/pages/directTo/directTo.wxss index 738cd14..7bdbc74 100644 --- a/subpages/oneKeyService/pages/directTo/directTo.wxss +++ b/subpages/oneKeyService/pages/directTo/directTo.wxss @@ -8,10 +8,11 @@ page { height: 196rpx; width: 100%; padding: 0 30rpx; + box-sizing: border-box; } .list-item .top { - width: calc(100% - 60rpx); + width: 100%; height: 90rpx; border-bottom: 1rpx solid #f7f7f7; font-size: 34rpx; @@ -21,7 +22,7 @@ page { } .list-item .bottom { - width: calc(100% - 60rpx); + width: 100%; height: 106rpx; display: flex; align-items: center; diff --git a/subpages/oneKeyService/pages/index/index.wxss b/subpages/oneKeyService/pages/index/index.wxss index 54ff08f..ae41edd 100644 --- a/subpages/oneKeyService/pages/index/index.wxss +++ b/subpages/oneKeyService/pages/index/index.wxss @@ -8,6 +8,7 @@ margin-bottom: 28rpx; padding: 0; background: #fff; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } button::after { diff --git a/subpages/oneKeyService/pages/policyList/policyList.wxss b/subpages/oneKeyService/pages/policyList/policyList.wxss index 23ab170..18d34d6 100644 --- a/subpages/oneKeyService/pages/policyList/policyList.wxss +++ b/subpages/oneKeyService/pages/policyList/policyList.wxss @@ -57,10 +57,11 @@ page { background: #fff; padding: 38rpx 30rpx; margin-top: 16rpx; + box-sizing: border-box; } .list-li .item-name { - width: calc(100% - 60rpx); + width: 100%; font-size: 34rpx; font-weight: 500; color: rgba(51, 51, 51, 1); diff --git a/subpages/understandJs/pages/index/index.wxss b/subpages/understandJs/pages/index/index.wxss index 54ff08f..ae41edd 100644 --- a/subpages/understandJs/pages/index/index.wxss +++ b/subpages/understandJs/pages/index/index.wxss @@ -8,6 +8,7 @@ margin-bottom: 28rpx; padding: 0; background: #fff; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } button::after { diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js index c0a4b61..2077daa 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js @@ -11,7 +11,16 @@ Page({ pageIndex:1, pageSize:10, noticeCategory:'', - preloadVisible: true + preloadVisible: true, + isNeedBanner: false, + bannerList: [], + indicatorDots: false, //指示点 + autoplay: true, //true,//自动播放 + circular: true, //衔接滑动 + interval: 5000, //自动播放间隔时长(ms) + duration: 500, //幻灯片切换时长(ms) + currentSwiper: 0, + nodata: false }, /** @@ -30,6 +39,12 @@ Page({ wx.setNavigationBarTitle({ title: "锦水印象" }) + this.setData({ + isNeedBanner: true + }) + if (this.data.isNeedBanner) { + this.videoBannerList() + } this.noticelist() } else if(options.modulecode == 'notice_yh'){ wx.setNavigationBarTitle({ @@ -41,9 +56,60 @@ Page({ title: "锦水警事" }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_points_rule'){ + wx.setNavigationBarTitle({ + title: '积分规则' + }) + this.noticelist() } }, + swiperChange: function(e) { + this.setData({ + currentSwiper: e.detail.current + }) + }, + bindplay() { + this.setData({ + autoplay: false + }) + wx.getNetworkType({ + success (res) { + const networkType = res.networkType + if (res.networkType != 'wifi') { + wx.showToast({ + title: '当前为非WI-FI环境，请注意流量消耗', + icon: 'none', + duration: 3000 + }) + } + } + }) + }, + bindended() { + this.setData({ + autoplay: true + }) + }, + bindVideoEnterPictureInPicture() { + console.log('进入小窗模式') + }, + bindVideoLeavePictureInPicture() { + console.log('退出小窗模式') + }, + videoErrorCallback(e) { + console.log('视频错误信息:') + console.log(e.detail.errMsg) + }, + videoBannerList () { + api.videoBannerList('3').then( res => { + this.setData({ + bannerList: res.data + }) + }).catch(err => { + console.log(err) + }) + }, noticelist () { let that = this; let params = { @@ -52,7 +118,16 @@ Page({ noticeCategory: that.data.noticeCategory } api.noticelist(params).then(function (res) { - that.noticeDetail(res.data[0].id) + if (res.data.length == 0) { + that.setData({ + nodata: true + }) + } else { + that.setData({ + nodata: false + }) + that.noticeDetail(res.data[0].id) + } }).catch(err => { console.log(err) }) diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.json b/subpages/understandJs/pages/noticeDetail/noticeDetail.json index d8bbc60..ed1ed57 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.json +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.json @@ -1,4 +1,6 @@ { - "usingComponents": {}, + "usingComponents": { + "no-data": "../../../../components/nodata/nodata" + }, "navigationBarTitleText": "" } \ No newline at end of file diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml index 9c43ce3..47a8177 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml @@ -1,5 +1,41 @@ - +