diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js index 0c35816..44ca24b 100644 --- a/epdc-resident-mp-yushan/pages/index/index.js +++ b/epdc-resident-mp-yushan/pages/index/index.js @@ -35,25 +35,27 @@ Page({ module: 'house', imgHeightFlag:true }, - { - icon: - 'https://epdc-yushan.elinkservice.cn/files-pro/20220324/118ea106d9ed40978f3e23cc51b43119.png', - // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png', // 蓝色 - tip: '指尖榆山', - module: 'fingerYushan', - }, + { + icon:'../../images/home/jifen.png', + tip: '社区团购', + module: 'pointRank', + }, + { + icon: + 'https://epdc-yushan.elinkservice.cn/files-pro/20220324/118ea106d9ed40978f3e23cc51b43119.png', + // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png', // 蓝色 + tip: '指尖榆山', + module: 'fingerYushan', + }, + //志愿服务 { icon: '../../images/hswy.png', - tip: '红色物业', + tip: '矛调超市', module: 'volunteerService', }, - { - icon:'../../images/home/jifen.png', - tip: '积分排名', - module: 'pointRank', - }, + // { // icon: // 'https://epdc-yushan.elinkservice.cn/files-pro/20220324/1083316800d948b4a8a4206dcb857722.png', @@ -496,9 +498,16 @@ Page({ url: '/pages/mine/mine' }) } else if (module === 'pointRank') { - wx.navigateTo({ - url: '/subpages/integralCentre/pages/index/index' - }) + // wx.navigateTo({ + // url: '/subpages/integralCentre/pages/index/index' + // }) + wx.navigateToMiniProgram({ + appId: 'wxbfc90d907beb18a3', + extraData:{}, + success(res) { + // 打开成功 + } + }) } }, // 获取最新社区资讯 diff --git a/epdc-resident-mp-yushan/project.config.json b/epdc-resident-mp-yushan/project.config.json index 177cbd4..3035ae4 100644 --- a/epdc-resident-mp-yushan/project.config.json +++ b/epdc-resident-mp-yushan/project.config.json @@ -41,7 +41,8 @@ "useCompilerPlugins": false, "ignoreUploadUnusedFiles": true, "useStaticServer": true, - "minifyWXML": true + "minifyWXML": true, + "condition": false }, "compileType": "miniprogram", "libVersion": "2.10.4", diff --git a/epdc-resident-mp-yushan/project.private.config.json b/epdc-resident-mp-yushan/project.private.config.json index b9ad90f..90c4d0c 100644 --- a/epdc-resident-mp-yushan/project.private.config.json +++ b/epdc-resident-mp-yushan/project.private.config.json @@ -122,6 +122,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "subpages/communityNews/pages/detail/detail", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js index d001edf..9581c92 100644 --- a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js +++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js @@ -6,14 +6,20 @@ Page({ detailId: '', detailObjContent: '', residentValue: 0, + imgFlag:false }, onLoad(option) { if (option.id) { - this.setData({ - detailId: option.id - }) - this.getDetail() - this.getResidentConfig() + console.log(option.id); + this.setData({ + detailId: option.id + }) + if(option.id =='7ae3b9b894fa66cb6261c84b09a28995'){ + this.getOne() + }else{ + this.getDetail() + } + this.getResidentConfig() } }, onUnload () { @@ -74,5 +80,28 @@ Page({ }).catch(err => { console.log(err) }) + }, + getOne(){ + //