From 91af64fc7c5e9d9de2cb46a7ad87b313b1e59f97 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 29 Jul 2020 17:31:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=EF=BC=9B=E9=94=A6=E6=B0=B4=E7=A1=AC=E6=A0=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/indexNew/indexNew.js | 7 ++++++- project.config.json | 13 +++++++------ .../associationNew/pages/eventlist/eventlist.wxss | 2 +- subpages/home/pages/newsDetail/newsDetail.js | 14 +++++++++++++- .../understandJs/pages/sclerotia/sclerotia.wxml | 2 +- .../understandJs/pages/sclerotia/sclerotia.wxss | 2 ++ 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 3d891c5..57fb268 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -99,6 +99,7 @@ Page({ const para = { shareType: options.shareType, id: options.id, + detailId: options.detailId, type: options.type ? options.type : "", defaultGridId: options.defaultGridId ? options.defaultGridId : "", } @@ -351,7 +352,11 @@ Page({ wx.navigateTo({ url: `/subpages/heart/pages/heartDetail/heartDetail?id=${para.id}` }) - } + } else if (para.shareType === 'newsDetail') { + wx.navigateTo({ + url: `/subpages/home/pages/newsDetail/newsDetail?id=${para.detailId}` + }) + } wx.removeStorageSync("shareObj") } that.getResidentConfig() diff --git a/project.config.json b/project.config.json index 6f2a731..8991d91 100644 --- a/project.config.json +++ b/project.config.json @@ -63,16 +63,16 @@ "list": [ { "id": 0, - "name": "带参数二维码", - "pathName": "pages/index/index", - "query": "scene=1277169327606366209&inviteUserId=12345", + "name": "pages/formid/formid", + "pathName": "pages/formid/formid", + "query": "gid=1233592630168813569", "scene": 1011 }, { "id": 1, "name": "pages/indexNew/indexNew", "pathName": "pages/indexNew/indexNew", - "query": "gid=1175270967490244609", + "query": "scene=1233592630168813569", "scene": 1011 }, { @@ -83,10 +83,10 @@ "scene": 1011 }, { - "id": -1, + "id": 3, "name": "subpages/home/pages/newsDetail/newsDetail", "pathName": "subpages/home/pages/newsDetail/newsDetail", - "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", "scene": null }, { @@ -128,6 +128,7 @@ "id": -1, "name": "注册页面", "pathName": "pages/toRegister/toRegister", + "query": "", "scene": null } ] diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss index a5c475d..5dfd6bb 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -60,7 +60,7 @@ page { } .image-list { - width: calc(100% - 58rpx); + /* width: calc(100% - 58rpx); */ margin-top: 30rpx; display: grid; grid-template-columns: repeat(auto-fit, minmax(208rpx, 1fr)); diff --git a/subpages/home/pages/newsDetail/newsDetail.js b/subpages/home/pages/newsDetail/newsDetail.js index a114cb8..adfad9b 100644 --- a/subpages/home/pages/newsDetail/newsDetail.js +++ b/subpages/home/pages/newsDetail/newsDetail.js @@ -11,6 +11,7 @@ Page({ infoCompleted: 0, noticeObjContent: "", residentValue:0,//配置时间 + defaultGridId: '' //默认网格id }, onLoad (options) { this.setData({ @@ -162,7 +163,7 @@ Page({ // }) } }, - // 获取默认配置 阅读时间 + // 获取默认配置, 阅读时间, 获取默认网格 getResidentConfig (){ let that = this api_getResidentConfig.getResidentConfig().then(res => { @@ -172,6 +173,10 @@ Page({ that.setData({ residentValue:parseInt(item.residentValue) }) + } else if (item.residentCode === "default_grid" && item.residentType === "default_grid") { + that.setData({ + defaultGridId: item.residentValue + }) } }) that.countDown() @@ -213,4 +218,11 @@ Page({ onUnload: function () { clearInterval(this.data.timer) }, + //2020.7.29 新闻转发-没注册过的人进入默认网格 + onShareAppMessage(res) { + return { + title: '新闻资讯-新闻详情', + path: `/pages/indexNew/indexNew?shareType=newsDetail&detailId=${this.data.detailId}&defaultGridId=${this.data.defaultGridId}` + } + }, }) \ No newline at end of file diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxml b/subpages/understandJs/pages/sclerotia/sclerotia.wxml index 6d7e767..a44cd86 100644 --- a/subpages/understandJs/pages/sclerotia/sclerotia.wxml +++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxml @@ -2,6 +2,7 @@ + {{item.noticeTitle}} @@ -10,7 +11,6 @@ {{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}} - diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxss b/subpages/understandJs/pages/sclerotia/sclerotia.wxss index 55527f3..84488fe 100644 --- a/subpages/understandJs/pages/sclerotia/sclerotia.wxss +++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxss @@ -44,6 +44,7 @@ page { -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; + margin: 0 auto; } .list-all .list-item .item-info .item-info-time { @@ -54,6 +55,7 @@ page { display: flex; flex-direction: row; justify-content: space-between; + left: 22rpx; } .list-all .list-item .item-info .item-info-time text { From 56ed607228177a62d325b6bb3569e0a8292dde4d Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Thu, 30 Jul 2020 17:25:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.20=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E9=97=BB=E8=BD=AC=E5=8F=91=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E8=BF=9B=E5=85=A5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=9B=E9=94=A6=E6=B0=B4=E7=A1=AC=E6=A0=B8?= =?UTF-8?q?-=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E5=B7=A6=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 36d710e..e17ecc3 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.19" + const versionNum = "1.4.20" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag