From 468b8d2b7cf70639e31fefba37aef2d44146bad6 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Mon, 3 Aug 2020 17:06:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E5=8D=B0=E8=B1=A1banner?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=97=E5=88=9B=E5=8D=AB=E7=94=9F=E5=9F=8E?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E5=85=A8360=E6=A8=A1=E5=9D=97=EF=BC=9B?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=85=A5=E5=8F=A3=E7=A7=BB=E8=87=B3=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/home/signin.png | Bin 0 -> 8961 bytes images/home/signined.png | Bin 0 -> 4321 bytes pages/indexNew/indexNew.js | 52 ++++++++++++++- pages/indexNew/indexNew.json | 3 +- pages/indexNew/indexNew.wxml | 11 +++- pages/indexNew/indexNew.wxss | 24 ++++++- pages/mine/mine.js | 60 +++++++++--------- pages/mine/mine.wxml | 4 +- project.config.json | 6 +- subpages/oneKeyService/pages/index/index.js | 8 +++ .../pages/noticeDetail/noticeDetail.js | 10 +++ .../oneKeyService/pages/warning/warning.js | 44 +++++++++++-- .../oneKeyService/pages/warning/warning.wxml | 5 +- .../oneKeyService/pages/warning/warning.wxss | 4 ++ .../pages/noticeDetail/noticeDetail.js | 14 +--- .../pages/noticeDetail/noticeDetail.wxml | 17 +---- utils/config.js | 4 +- 17 files changed, 192 insertions(+), 74 deletions(-) create mode 100644 images/home/signin.png create mode 100644 images/home/signined.png diff --git a/images/home/signin.png b/images/home/signin.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4b961fbd2340e6c647831aebd509689a2d9c46 GIT binary patch literal 8961 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 b_{0AK+eKth#WZtj00000NkvXXu0mjf`(!1^ literal 0 HcmV?d00001 diff --git a/images/home/signined.png b/images/home/signined.png new file mode 100644 index 0000000000000000000000000000000000000000..2d5c43624a348acb8cdadc4b7e6017e4a232f471 GIT binary patch literal 4321 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 P00000NkvXXu0mjfM=)iw literal 0 HcmV?d00001 diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 57fb268..82b9c6b 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -75,11 +75,16 @@ Page({ workGridId:'', //工作网格7.08 completeInfoDialogVisible: false, //完善信息 homePagePhone: {}, - fromprogram: '' //来自工作端=work 或者 数据分析端=leader 的跳转 + fromprogram: '', //来自工作端=work 或者 数据分析端=leader 的跳转, + visible: false, + signMsg: '', + signCode: 0, + isSignUp: 0 }, onShow: function () { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { if (!this.data.first) { + this.getUserInfo() this.loadGridList() this.getBannerList() this.getFirstInfo() @@ -361,6 +366,7 @@ Page({ } that.getResidentConfig() that.getHomePhone() + that.getUserInfo() that.loadGridList() that.getBannerList() that.getFirstInfo() @@ -630,5 +636,49 @@ Page({ } else { return false } + }, + // 获取用户信息 + getUserInfo () { + api.getUserInfo().then(res => { + console.log("用户信息", res) + this.setData({ + isSignUp: res.data.isSignUp + }) + }).catch(err => { + this.setData({ + isSignUp: 0 + }) + console.log(err) + }) + }, + //签到 2020.07.31 + toSignIn () { + if (this.data.isSignUp == 1) { + return + } + api.userInfoSignUp().then(res => { + console.log(res.data) + if (res.code === 0) { + // 显示提醒 + this.setData({ + signCode: res.code, + signMsg: res.data, + visible: true + }); + } else { + this.setData({ + signCode: res.code, + signMsg: res.msg, + visible: true + }); + } + }) + }, + // 关闭签到提醒 + onClose() { + this.getUserInfo() + this.setData({ + visible: false + }); } }) \ No newline at end of file diff --git a/pages/indexNew/indexNew.json b/pages/indexNew/indexNew.json index 0b63bd2..49f2c18 100644 --- a/pages/indexNew/indexNew.json +++ b/pages/indexNew/indexNew.json @@ -5,6 +5,7 @@ "usingComponents": { "nav-bar": "/components/navbar/index", "load-more": "../../components/loadMore/loadMore", - "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog" + "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog", + "wux-popup": "../../dist/popup/index" } } \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 27124e0..e95deae 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -15,6 +15,10 @@ {{departmentName}} + @@ -169,4 +173,9 @@ - \ No newline at end of file + + + + + 确定 + \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss index ac9a988..4000388 100644 --- a/pages/indexNew/indexNew.wxss +++ b/pages/indexNew/indexNew.wxss @@ -60,9 +60,22 @@ page { z-index: 10; } +.belong-grid .newbelong-grid .signin-btn { + width: 140rpx; + height: 44rpx; + position: absolute; + z-index: 99; + right: 80rpx; +} + +.belong-grid .newbelong-grid .signin-btn image { + width: 100%; + height: 100%; +} + .belong-grid .newbelong-grid .grid { /* width: 90%; */ - width: calc(100% - 129rpx); + width: calc(100% - 240rpx); height: 34rpx; position: relative; z-index: 100; @@ -89,7 +102,7 @@ page { } .belong-grid .newbelong-grid .my-and-news { - width: 129rpx; + width: 80rpx; height: 34rpx; position: relative; z-index: 100; @@ -631,3 +644,10 @@ page { height: 100%; width: 100%; } + +.popup__button { + width: 100%; + text-align: center; + font-size: 36rpx; + color: #04BCA0; +} \ No newline at end of file diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 5395c43..f84b5cc 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -335,34 +335,34 @@ Page({ }) }, - //签到 2020.07.24 - toSignUp () { - if (this.data.userInfo.isSignUp == 1) { - return - } - api.userInfoSignUp().then(res => { - console.log(res.data) - if (res.code === 0) { - // 显示提醒 - this.setData({ - signCode: res.code, - signMsg: res.data, - visible: true - }); - } else { - this.setData({ - signCode: res.code, - signMsg: res.msg, - visible: true - }); - } - }) - }, - // 关闭签到提醒 - onClose() { - this.getUserInfo() - this.setData({ - visible: false - }); - } + // 签到 2020.07.24 + // toSignUp () { + // if (this.data.userInfo.isSignUp == 1) { + // return + // } + // api.userInfoSignUp().then(res => { + // console.log(res.data) + // if (res.code === 0) { + // // 显示提醒 + // this.setData({ + // signCode: res.code, + // signMsg: res.data, + // visible: true + // }); + // } else { + // this.setData({ + // signCode: res.code, + // signMsg: res.msg, + // visible: true + // }); + // } + // }) + // }, + // // 关闭签到提醒 + // onClose() { + // this.getUserInfo() + // this.setData({ + // visible: false + // }); + // } }) \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index c0f0554..c4d442c 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -26,14 +26,14 @@ - + diff --git a/project.config.json b/project.config.json index 6fc0371..24ee6f9 100644 --- a/project.config.json +++ b/project.config.json @@ -17,15 +17,15 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, - "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "useIsolateContext": true, "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false + "userConfirmedUseCompilerModuleSwitch": false, + "compileHotReLoad": false, + "useIsolateContext": true }, "compileType": "miniprogram", "libVersion": "2.8.2", diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index e3e88f3..eb0899f 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -59,6 +59,14 @@ Page({ wx.navigateTo({ url: `../directTo/directTo?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_zcwsc') { + wx.navigateTo({ + url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + }) + } else if (e.currentTarget.dataset.modulecode == 'notice_aq') { + wx.navigateTo({ + url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + }) } } }) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index e557b32..7cb8e38 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -26,6 +26,16 @@ Page({ title: '锦水警事' }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_zcwsc'){ + wx.setNavigationBarTitle({ + title: '众创卫生城' + }) + this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_aq'){ + wx.setNavigationBarTitle({ + title: '安全360' + }) + this.noticeDetail(options.id) } }, diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js index d09c359..d8bffad 100644 --- a/subpages/oneKeyService/pages/warning/warning.js +++ b/subpages/oneKeyService/pages/warning/warning.js @@ -18,7 +18,7 @@ Page({ indicatorDots: false, //指示点 autoplay: true, //true,//自动播放 circular: true, //衔接滑动 - interval: 3000, //自动播放间隔时长(ms) + interval: 5000, //自动播放间隔时长(ms) duration: 500, //幻灯片切换时长(ms) currentSwiper: 0, }, @@ -34,14 +34,24 @@ Page({ wx.setNavigationBarTitle({ title: '锦水印象' }) + }else if(options.modulecode == 'notice_zcwsc'){ + this.getBannerList('4') + wx.setNavigationBarTitle({ + title: '众创卫生城' + }) + }else if(options.modulecode == 'notice_aq'){ + this.getBannerList('5') + wx.setNavigationBarTitle({ + title: '安全360' + }) }else{ + this.getBannerList('2') wx.setNavigationBarTitle({ title: '锦水警事' }) } this.noticelist() - this.getBannerList() }, /** @@ -105,9 +115,9 @@ Page({ }) }, - getBannerList: function() { + getBannerList: function(bannerNum) { let that = this - api.bannerList('2').then(function(res) { + api.bannerList(bannerNum).then(function(res) { // console.log('res==', res.data) that.setData({ swiperBannerList: res.data @@ -115,10 +125,34 @@ Page({ }) }, swiperChange: function(e) { + wx.createVideoContext('video'+this.data.currentSwiper).pause() this.setData({ - currentSwiper: e.detail.current + currentSwiper: e.detail.current, + autoplay: true }) }, + 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 + }) + }, // swiperChange2: function(e) { // this.setData({ // 'options2.currentSwiper': e.detail.current, diff --git a/subpages/oneKeyService/pages/warning/warning.wxml b/subpages/oneKeyService/pages/warning/warning.wxml index 090b059..013e86a 100644 --- a/subpages/oneKeyService/pages/warning/warning.wxml +++ b/subpages/oneKeyService/pages/warning/warning.wxml @@ -1,5 +1,5 @@ - diff --git a/utils/config.js b/utils/config.js index 5986183..6cf2c13 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,13 +6,13 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.19:9094/epdc-api/api/' }