diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e39ead --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.uviewui.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e39ead --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.uviewui.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/components/card.vue b/components/card.vue index 1022aa1..c13f91e 100644 --- a/components/card.vue +++ b/components/card.vue @@ -29,11 +29,11 @@ - + 真 {{currentShow.approveRate}} - + 假 {{currentShow.againstRate}} @@ -46,6 +46,7 @@ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e39ead --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.uviewui.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/components/card.vue b/components/card.vue index 1022aa1..c13f91e 100644 --- a/components/card.vue +++ b/components/card.vue @@ -29,11 +29,11 @@ - + 真 {{currentShow.approveRate}} - + 假 {{currentShow.againstRate}} @@ -46,6 +46,7 @@ diff --git a/pages.json b/pages.json index e475694..c06d303 100644 --- a/pages.json +++ b/pages.json @@ -238,7 +238,7 @@ "path" : "supervisor/supervisor", "style" : { - "navigationBarTitleText": "申请流程", + "navigationBarTitleText": "加入我们", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#398ae4", "navigationBarTextStyle": "white" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e39ead --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.uviewui.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/components/card.vue b/components/card.vue index 1022aa1..c13f91e 100644 --- a/components/card.vue +++ b/components/card.vue @@ -29,11 +29,11 @@ - + 真 {{currentShow.approveRate}} - + 假 {{currentShow.againstRate}} @@ -46,6 +46,7 @@ diff --git a/pages.json b/pages.json index e475694..c06d303 100644 --- a/pages.json +++ b/pages.json @@ -238,7 +238,7 @@ "path" : "supervisor/supervisor", "style" : { - "navigationBarTitleText": "申请流程", + "navigationBarTitleText": "加入我们", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#398ae4", "navigationBarTextStyle": "white" diff --git a/pages/index/index.vue b/pages/index/index.vue index 0c634d8..278b222 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,9 +12,9 @@ - - - + + + @@ -180,6 +180,7 @@ tzggList: [], // 通知公告列表 pyxxList: [], // 辟谣信息列表 aljxList: [], // 案例警醒列表 + rotationList: [], // 轮播图数据 eventList: [ { id: 'tzgg', @@ -207,6 +208,7 @@ this.fetchNoticeList() // 获取通知公告列表 this.fetchPyxxList() // 获取辟谣信息列表 this.fetchAljxList() // 案例警醒列表 + this.fetchRotationList() //轮播图 }, //分享好友 onShareAppMessage() { @@ -273,6 +275,28 @@ }) } }, + + // 获取轮播图列表 + fetchRotationList() { + const param = { + pageIndex: 1, //当前页数（必传） + pageSize: 13, //每页数 （必传） + yuzhong: 'zh',//（必传）固定值 + siteRoleCode: 'xjwljb', //（必传）固定值 + catalogCode: 'ssxw', //（必传）固定值 + } + getNoticeList(param).then(res => { + this.rotationList = res.filter(item => item.contentSmallImage).map(item => { + return { + catalogId: item.catalogId, + id: item.id, + title: item.title, + publishTime: stamp2Time(item.publishDate), + img: item.contentSmallImage + } + }) + }) + }, // 获取通知公告列表 fetchNoticeList() { const param = { @@ -322,8 +346,10 @@ pageSize: 2, // siteRoleCode: 'zzqwxbPortal', // catalogCode: 'yykt' - siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦 - catalogCode: 'rdjj' + // siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦 + // catalogCode: 'rdjj' + siteRoleCode: 'xjwljb', //（必传）固定值 + catalogCode: 'ssxw', //（必传）固定值 } getPyxxList(param).then(res => { this.aljxList = res.map(item => { @@ -338,17 +364,26 @@ }, // 点击标题 clickTitle(val, type) { + let url = ''; - if(type === 'tzgg') { // 通知公告 - url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}` + if(type === 'tzgg' || type=== 'swiper' || type ==='aljx') { // 通知公告 + url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}` + `&label=${type === 'tzgg' ? '通知公告' : '热点聚焦'}` } else if(type === 'pyxx') { // 辟谣信息 url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}` - } else { // 案例警醒 - url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}` - } - wx.navigateTo({ - url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url) - }) + } + // else { // 案例警醒 + // url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&catalogId=${val.catalogId}` + // } + // if (type === 'tzgg') { + // wx.navigateTo({ + // url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url) + `&label=通知公告` + // }) + // } else { + wx.navigateTo({ + url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url) + }) + // } + } } } diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e39ead --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.uviewui.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/components/card.vue b/components/card.vue index 1022aa1..c13f91e 100644 --- a/components/card.vue +++ b/components/card.vue @@ -29,11 +29,11 @@ - + 真 {{currentShow.approveRate}} - + 假 {{currentShow.againstRate}} @@ -46,6 +46,7 @@ diff --git a/pages.json b/pages.json index e475694..c06d303 100644 --- a/pages.json +++ b/pages.json @@ -238,7 +238,7 @@ "path" : "supervisor/supervisor", "style" : { - "navigationBarTitleText": "申请流程", + "navigationBarTitleText": "加入我们", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#398ae4", "navigationBarTextStyle": "white" diff --git a/pages/index/index.vue b/pages/index/index.vue index 0c634d8..278b222 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,9 +12,9 @@ - - - + + + @@ -180,6 +180,7 @@ tzggList: [], // 通知公告列表 pyxxList: [], // 辟谣信息列表 aljxList: [], // 案例警醒列表 + rotationList: [], // 轮播图数据 eventList: [ { id: 'tzgg', @@ -207,6 +208,7 @@ this.fetchNoticeList() // 获取通知公告列表 this.fetchPyxxList() // 获取辟谣信息列表 this.fetchAljxList() // 案例警醒列表 + this.fetchRotationList() //轮播图 }, //分享好友 onShareAppMessage() { @@ -273,6 +275,28 @@ }) } }, + + // 获取轮播图列表 + fetchRotationList() { + const param = { + pageIndex: 1, //当前页数（必传） + pageSize: 13, //每页数 （必传） + yuzhong: 'zh',//（必传）固定值 + siteRoleCode: 'xjwljb', //（必传）固定值 + catalogCode: 'ssxw', //（必传）固定值 + } + getNoticeList(param).then(res => { + this.rotationList = res.filter(item => item.contentSmallImage).map(item => { + return { + catalogId: item.catalogId, + id: item.id, + title: item.title, + publishTime: stamp2Time(item.publishDate), + img: item.contentSmallImage + } + }) + }) + }, // 获取通知公告列表 fetchNoticeList() { const param = { @@ -322,8 +346,10 @@ pageSize: 2, // siteRoleCode: 'zzqwxbPortal', // catalogCode: 'yykt' - siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦 - catalogCode: 'rdjj' + // siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦 + // catalogCode: 'rdjj' + siteRoleCode: 'xjwljb', //（必传）固定值 + catalogCode: 'ssxw', //（必传）固定值 } getPyxxList(param).then(res => { this.aljxList = res.map(item => { @@ -338,17 +364,26 @@ }, // 点击标题 clickTitle(val, type) { + let url = ''; - if(type === 'tzgg') { // 通知公告 - url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}` + if(type === 'tzgg' || type=== 'swiper' || type ==='aljx') { // 通知公告 + url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}` + `&label=${type === 'tzgg' ? '通知公告' : '热点聚焦'}` } else if(type === 'pyxx') { // 辟谣信息 url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}` - } else { // 案例警醒 - url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}` - } - wx.navigateTo({ - url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url) - }) + } + // else { // 案例警醒 + // url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&catalogId=${val.catalogId}` + // } + // if (type === 'tzgg') { + // wx.navigateTo({ + // url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url) + `&label=通知公告` + // }) + // } else { + wx.navigateTo({ + url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url) + }) + // } + } } } diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 2e53bce..b42c399 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -6,7 +6,7 @@ - {{nickName}} + @@ -41,6 +41,14 @@ +