From a26fb8a67e0da62a0a844e4325d62bf8468ff210 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Mon, 21 Sep 2020 20:14:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E6=9C=89=E4=BA=8B=E8=AF=B4-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/discussion/top-flag.png | Bin 0 -> 916 bytes .../components/projectItem/projectItem.wxml | 5 ++++- .../components/projectItem/projectItem.wxss | 11 ++++++++++- project.config.json | 16 ++++++++-------- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 images/discussion/top-flag.png diff --git a/images/discussion/top-flag.png b/images/discussion/top-flag.png new file mode 100644 index 0000000000000000000000000000000000000000..ac9998e711c371e676822411c6b089bb2c6ae5dc GIT binary patch literal 916 zcmV;F18e+=P)<9Re-`M}di8H0>*J4>%vx`%9sQ>}lW{ za1po*^foM=dSBnx2qPRX04ITiDzXLODR2yUz2SXlBKw>40*-M`(R3ELITA$O?G3O~ zMfM1AKNv6D1ANFU8m564nn5hYXERRN0#b6`H1ur)703I=mJntRodTZAWOoBAz-P_S z5>Vrd5esMM9iU74l!1hdtMPU*CgRt0mRi~=nFM)j641ggKK1^xO!feK0uEEOIU+(N zCLR-Hdm3Ww`ZjX@fd3vR?QLny7d}Tz5-8hF!6Nk~`$Hx><4Cq95vXv2!fTX(&U%(> zJ#w!y@wn|CvK4_v71^TViBe6o#a%i`(+!zy&ZD3ZmN;xDWyN-p#Y)}+*9bS^ zxSytGp5)diVA*2<^Z(JKC6YR>wij4}IIYNJO~t>?ssr{cRoz)WSIUWt{kLmT;y)ra zuTm{Xt2r0z*-R7@*Lmc{e7+`cvu$TZ*@1bYTDLMRW{{pOk*ZDJUz>b8o3nVfrSq&U zjGGEIE?LH?O2}9mAMxKd30d)Ck#a&Ug~!Eu<_z1;U!G+p)ppNP&b7Wx4Sgf>Hq#*w zLA>q6hOvqCFl8lXe6~QG-pgdyN~$1OUDp?ZY+o)~ma;VK1D{rD5ZhmO0q@4_n-lv8 z@I=1IJo^#YH#RgIAuA-#0EbnceFSUs6a1QyJsyzE0I1#M<2Y@B? q#E6j;e|-ZU1E)arnX2ng0R{l970jTMq-CW50000{{projectObj.nickname}} - {{projectObj.stateName}} + + + {{projectObj.stateName}} + {{projectObj.itemContent}} diff --git a/pages/discussion/components/projectItem/projectItem.wxss b/pages/discussion/components/projectItem/projectItem.wxss index 5423f81..9691021 100644 --- a/pages/discussion/components/projectItem/projectItem.wxss +++ b/pages/discussion/components/projectItem/projectItem.wxss @@ -46,7 +46,16 @@ text-align: center; padding: 0 8rpx; } - +.project-item .header .state { + display: flex; + justify-content: center; + align-items: center; +} +.project-item .header .state image{ + width: 65rpx; + height: 30rpx; + margin-right: 20rpx; +} .project-item .content { color: #333; font-size: 36rpx; diff --git a/project.config.json b/project.config.json index 0e8739b..76ed0e0 100644 --- a/project.config.json +++ b/project.config.json @@ -38,23 +38,23 @@ "simulatorType": "wechat", "simulatorPluginLibVersion": {}, "condition": { - "search": { + "plugin": { "current": -1, "list": [] }, - "conversation": { - "current": -1, + "game": { + "currentL": -1, "list": [] }, - "plugin": { + "gamePlugin": { "current": -1, "list": [] }, - "game": { - "currentL": -1, + "search": { + "current": -1, "list": [] }, - "gamePlugin": { + "conversation": { "current": -1, "list": [] }, @@ -65,7 +65,7 @@ "id": 0, "name": "pages/formid/formid", "pathName": "pages/formid/formid", - "query": "gid=1233592630168813569", + "query": "gid=1252832420898570242", "scene": 1011 }, { From 2bd8b49dc5000f860bd475196e331e6b7a78c7ab Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Sun, 27 Sep 2020 16:05:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=85=E5=8A=A1=E5=85=AC=E5=BC=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9Bv1.4.40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 284 +++++++++--------- subpages/oneKeyService/pages/index/index.js | 4 + .../pages/noticeDetail/noticeDetail.js | 5 + .../oneKeyService/pages/warning/warning.js | 5 + 5 files changed, 157 insertions(+), 143 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 67e3b4d..7c83a0d 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.38" + const versionNum = "1.4.39" 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 4669972..0e8739b 100644 --- a/project.config.json +++ b/project.config.json @@ -1,144 +1,144 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, - "setting": { - "urlCheck": false, - "es6": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": true, - "coverView": true, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "useIsolateContext": true, - "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false - }, - "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%9 1%E7%AB%AF", - "debugOptions": { - "hidedInDevtools": [] - }, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, - "plugin": { - "current": -1, - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "gamePlugin": { - "current": -1, - "list": [] - }, - "miniprogram": { - "current": -1, - "list": [ - { - "id": 0, - "name": "pages/formid/formid", - "pathName": "pages/formid/formid", - "query": "gid=1233592630168813569", - "scene": 1011 - }, - { - "id": 1, - "name": "pages/indexNew/indexNew", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1233592247862198274", - "scene": 1011 - }, - { - "id": 2, - "name": "网格长注册", - "pathName": "pages/index/index", - "query": "scene=gridLeader", - "scene": 1011 - }, - { - "id": 3, - "name": "subpages/home/pages/newsDetail/newsDetail", - "pathName": "subpages/home/pages/newsDetail/newsDetail", - "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", - "scene": null - }, - { - "id": -1, - "name": "社群列表", - "pathName": "subpages/associationNew/pages/associationlist/associationlist", - "query": "", - "scene": null - }, - { - "id": 5, - "name": "数据端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1277169327606366209&from=analysis", - "scene": null - }, - { - "id": 6, - "name": "工作端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1280737901335838721&from=work", - "scene": null - }, - { - "id": 7, - "name": "我有事说", - "pathName": "subpages/discussion/pages/addIssue/addIssue", - "query": "", - "scene": null - }, - { - "id": 8, - "name": "搜索页面", - "pathName": "subpages/oneKeyService/pages/search/search", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "注册页面", - "pathName": "pages/toRegister/toRegister", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "query": "", - "scene": null - } - ] - } - } + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useIsolateContext": true, + "useCompilerModule": false, + "userConfirmedUseCompilerModuleSwitch": false + }, + "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%9 1%E7%AB%AF", + "debugOptions": { + "hidedInDevtools": [] + }, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "search": { + "current": -1, + "list": [] + }, + "conversation": { + "current": -1, + "list": [] + }, + "plugin": { + "current": -1, + "list": [] + }, + "game": { + "currentL": -1, + "list": [] + }, + "gamePlugin": { + "current": -1, + "list": [] + }, + "miniprogram": { + "current": -1, + "list": [ + { + "id": 0, + "name": "pages/formid/formid", + "pathName": "pages/formid/formid", + "query": "gid=1233592630168813569", + "scene": 1011 + }, + { + "id": 1, + "name": "pages/indexNew/indexNew", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1233592247862198274", + "scene": 1011 + }, + { + "id": 2, + "name": "网格长注册", + "pathName": "pages/index/index", + "query": "scene=gridLeader", + "scene": 1011 + }, + { + "id": 3, + "name": "subpages/home/pages/newsDetail/newsDetail", + "pathName": "subpages/home/pages/newsDetail/newsDetail", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", + "scene": null + }, + { + "id": -1, + "name": "社群列表", + "pathName": "subpages/associationNew/pages/associationlist/associationlist", + "query": "", + "scene": null + }, + { + "id": 5, + "name": "数据端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1277169327606366209&from=analysis", + "scene": null + }, + { + "id": 6, + "name": "工作端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1280737901335838721&from=work", + "scene": null + }, + { + "id": 7, + "name": "我有事说", + "pathName": "subpages/discussion/pages/addIssue/addIssue", + "query": "", + "scene": null + }, + { + "id": 8, + "name": "搜索页面", + "pathName": "subpages/oneKeyService/pages/search/search", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "注册页面", + "pathName": "pages/toRegister/toRegister", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "query": "", + "scene": null + } + ] + } + } } \ No newline at end of file diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index be2b1eb..2e3b590 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -71,6 +71,10 @@ Page({ wx.navigateTo({ url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_jwgk') { + 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 8746f45..c4b55f1 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -41,6 +41,11 @@ Page({ title: '城管聚焦' }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_jwgk'){ + wx.setNavigationBarTitle({ + title: '居务公开' + }) + this.noticeDetail(options.id) } }, diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js index b5890d0..716bf3a 100644 --- a/subpages/oneKeyService/pages/warning/warning.js +++ b/subpages/oneKeyService/pages/warning/warning.js @@ -49,6 +49,11 @@ Page({ wx.setNavigationBarTitle({ title: '城管聚焦' }) + }else if(options.modulecode == 'notice_jwgk'){ + // this.getBannerList('6') + wx.setNavigationBarTitle({ + title: '居务公开' + }) }else{ this.getBannerList('2') wx.setNavigationBarTitle({ From c0a6b5cbc685a4d6bb8b6b8358b5b044caa65e9a Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Sun, 27 Sep 2020 16:39:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E7=A0=81=E9=94=A6=E6=B0=B4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=A6=E6=B0=B4=E7=A4=BE=E5=8C=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/understandJs/pages/delicious/delicious.js | 9 +++++++++ subpages/understandJs/pages/delicious/delicious.json | 2 +- subpages/understandJs/pages/index/index.js | 4 ++++ subpages/understandJs/pages/noticeDetail/noticeDetail.js | 5 +++++ utils/config.js | 4 ++-- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/subpages/understandJs/pages/delicious/delicious.js b/subpages/understandJs/pages/delicious/delicious.js index df1637b..30b0275 100644 --- a/subpages/understandJs/pages/delicious/delicious.js +++ b/subpages/understandJs/pages/delicious/delicious.js @@ -22,6 +22,15 @@ Page({ this.setData({ noticeCategory:options.modulecode }) + if(options.modulecode == 'notice_taste'){ + wx.setNavigationBarTitle({ + title: '锦水味道' + }) + }else if(options.modulecode == 'notice_jssq'){ + wx.setNavigationBarTitle({ + title: '锦水社区' + }) + } this.noticelist(); }, noticelist () { diff --git a/subpages/understandJs/pages/delicious/delicious.json b/subpages/understandJs/pages/delicious/delicious.json index f6b48ec..8db8a6b 100644 --- a/subpages/understandJs/pages/delicious/delicious.json +++ b/subpages/understandJs/pages/delicious/delicious.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "锦水味道", + "navigationBarTitleText": "", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata" diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js index 6bccb8a..b7b345b 100644 --- a/subpages/understandJs/pages/index/index.js +++ b/subpages/understandJs/pages/index/index.js @@ -89,6 +89,10 @@ Page({ wx.navigateTo({ url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_jssq') { + wx.navigateTo({ + url: `../delicious/delicious?modulecode=${e.currentTarget.dataset.modulecode}` + }) } } }) \ No newline at end of file diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js index 5741b70..0d85310 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js @@ -35,6 +35,11 @@ Page({ title: "锦水味道" }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_jssq'){ + wx.setNavigationBarTitle({ + title: "锦水社区" + }) + this.noticeDetail(options.id) } else if(options.modulecode == "notice_impression"){ wx.setNavigationBarTitle({ title: "锦水印象" diff --git a/utils/config.js b/utils/config.js index e94fe91..d099316 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.19:9094/epdc-api/api/' } From fea4b24f2d402b6a6773d4514022c4f105d8f1d5 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Sun, 27 Sep 2020 17:26:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.40=20=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9C=8D=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=B1=85=E5=8A=A1?= =?UTF-8?q?=E5=85=AC=E5=BC=80=E6=A8=A1=E5=9D=97;=E8=A7=A3=E7=A0=81?= =?UTF-8?q?=E9=94=A6=E6=B0=B4=E5=A2=9E=E5=8A=A0=E9=94=A6=E6=B0=B4=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=A8=A1=E5=9D=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 8 ++++++-- utils/config.js | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 7c83a0d..195c7dc 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.39" + const versionNum = "1.4.40" 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 0e8739b..02ca678 100644 --- a/project.config.json +++ b/project.config.json @@ -24,8 +24,12 @@ "outputPath": "" }, "useIsolateContext": true, - "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "useMultiFrameRuntime": false, + "useApiHook": true }, "compileType": "miniprogram", "libVersion": "2.8.2", diff --git a/utils/config.js b/utils/config.js index d099316..e94fe91 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.19:9094/epdc-api/api/' }