diff --git a/images/discussion/top-flag.png b/images/discussion/top-flag.png
new file mode 100644
index 0000000..ac9998e
Binary files /dev/null and b/images/discussion/top-flag.png differ
diff --git a/pages/discussion/components/projectItem/projectItem.wxml b/pages/discussion/components/projectItem/projectItem.wxml
index b379b0e..5045bc5 100644
--- a/pages/discussion/components/projectItem/projectItem.wxml
+++ b/pages/discussion/components/projectItem/projectItem.wxml
@@ -7,7 +7,10 @@
{{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/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 67e3b4d..195c7dc 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.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 4669972..02ca678 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,144 +1,148 @@
{
- "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": true,
+ "userConfirmedUseCompilerModuleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "useMultiFrameRuntime": false,
+ "useApiHook": true
+ },
+ "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({
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: "锦水印象"