elink-star
/
epdc-resident-mp-js
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'release'

master tagv1.4.40
lihenian 5 years ago
parent
d0ad61c941 fea4b24f2d
commit
4226c98a63
12 changed files with 194 additions and 146 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      images/discussion/top-flag.png
  2. 5
      pages/discussion/components/projectItem/projectItem.wxml
  3. 11
      pages/discussion/components/projectItem/projectItem.wxss
  4. 2
      pages/toRegister/toRegister.js
  5. 288
      project.config.json
  6. 4
      subpages/oneKeyService/pages/index/index.js
  7. 5
      subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
  8. 5
      subpages/oneKeyService/pages/warning/warning.js
  9. 9
      subpages/understandJs/pages/delicious/delicious.js
  10. 2
      subpages/understandJs/pages/delicious/delicious.json
  11. 4
      subpages/understandJs/pages/index/index.js
  12. 5
      subpages/understandJs/pages/noticeDetail/noticeDetail.js

BIN
images/discussion/top-flag.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 916 B

5
pages/discussion/components/projectItem/projectItem.wxml
View File

@ -7,7 +7,10 @@
<view class="name">{{projectObj.nickname}}</view> <view class="name">{{projectObj.nickname}}</view>
<image class="dang" wx:if="{{projectObj.partyFlag == '1'}}" src="../../../../images/mine/ic_dangbiaoqian.png" /> <image class="dang" wx:if="{{projectObj.partyFlag == '1'}}" src="../../../../images/mine/ic_dangbiaoqian.png" />
</view> </view>
<view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view> <view class="state">
<image wx:if="{{projectObj.topFlag == '1' ? true : false}}" src="../../../../images/discussion/top-flag.png" />
<view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view>
</view>
</view> </view>
<view class="content">{{projectObj.itemContent}}</view> <view class="content">{{projectObj.itemContent}}</view>

11
pages/discussion/components/projectItem/projectItem.wxss
View File

@ -46,7 +46,16 @@
text-align: center; text-align: center;
padding: 0 8rpx; 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 { .project-item .content {
color: #333; color: #333;
font-size: 36rpx; font-size: 36rpx;

2
pages/toRegister/toRegister.js
View File

@ -21,7 +21,7 @@ Page({
// } // }
// }) // })
let that = this let that = this
const versionNum = "1.4.38" const versionNum = "1.4.40"
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag

288
project.config.json
View File

@ -1,144 +1,148 @@
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [] "ignore": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"postcss": true, "postcss": true,
"preloadBackgroundData": false, "preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"coverView": true, "coverView": true,
"autoAudits": false, "autoAudits": false,
"showShadowRootInWxmlPanel": true, "showShadowRootInWxmlPanel": true,
"scopeDataCheck": false, "scopeDataCheck": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": true,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false,
}, "packNpmManually": false,
"compileType": "miniprogram", "packNpmRelationList": [],
"libVersion": "2.8.2", "useMultiFrameRuntime": false,
"appid": "wx6dcf544cdae7d4ec", "useApiHook": true
"projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", },
"debugOptions": { "compileType": "miniprogram",
"hidedInDevtools": [] "libVersion": "2.8.2",
}, "appid": "wx6dcf544cdae7d4ec",
"isGameTourist": false, "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF",
"simulatorType": "wechat", "debugOptions": {
"simulatorPluginLibVersion": {}, "hidedInDevtools": []
"condition": { },
"search": { "isGameTourist": false,
"current": -1, "simulatorType": "wechat",
"list": [] "simulatorPluginLibVersion": {},
}, "condition": {
"conversation": { "search": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"plugin": { "conversation": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"game": { "plugin": {
"currentL": -1, "current": -1,
"list": [] "list": []
}, },
"gamePlugin": { "game": {
"current": -1, "currentL": -1,
"list": [] "list": []
}, },
"miniprogram": { "gamePlugin": {
"current": -1, "current": -1,
"list": [ "list": []
{ },
"id": 0, "miniprogram": {
"name": "pages/formid/formid", "current": -1,
"pathName": "pages/formid/formid", "list": [
"query": "gid=1233592630168813569", {
"scene": 1011 "id": 0,
}, "name": "pages/formid/formid",
{ "pathName": "pages/formid/formid",
"id": 1, "query": "gid=1233592630168813569",
"name": "pages/indexNew/indexNew", "scene": 1011
"pathName": "pages/indexNew/indexNew", },
"query": "scene=1233592247862198274", {
"scene": 1011 "id": 1,
}, "name": "pages/indexNew/indexNew",
{ "pathName": "pages/indexNew/indexNew",
"id": 2, "query": "scene=1233592247862198274",
"name": "网格长注册", "scene": 1011
"pathName": "pages/index/index", },
"query": "scene=gridLeader", {
"scene": 1011 "id": 2,
}, "name": "网格长注册",
{ "pathName": "pages/index/index",
"id": 3, "query": "scene=gridLeader",
"name": "subpages/home/pages/newsDetail/newsDetail", "scene": 1011
"pathName": "subpages/home/pages/newsDetail/newsDetail", },
"query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", {
"scene": null "id": 3,
}, "name": "subpages/home/pages/newsDetail/newsDetail",
{ "pathName": "subpages/home/pages/newsDetail/newsDetail",
"id": -1, "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569",
"name": "社群列表", "scene": null
"pathName": "subpages/associationNew/pages/associationlist/associationlist", },
"query": "", {
"scene": null "id": -1,
}, "name": "社群列表",
{ "pathName": "subpages/associationNew/pages/associationlist/associationlist",
"id": 5, "query": "",
"name": "数据端跳转", "scene": null
"pathName": "pages/indexNew/indexNew", },
"query": "scene=1277169327606366209&from=analysis", {
"scene": null "id": 5,
}, "name": "数据端跳转",
{ "pathName": "pages/indexNew/indexNew",
"id": 6, "query": "scene=1277169327606366209&from=analysis",
"name": "工作端跳转", "scene": null
"pathName": "pages/indexNew/indexNew", },
"query": "scene=1280737901335838721&from=work", {
"scene": null "id": 6,
}, "name": "工作端跳转",
{ "pathName": "pages/indexNew/indexNew",
"id": 7, "query": "scene=1280737901335838721&from=work",
"name": "我有事说", "scene": null
"pathName": "subpages/discussion/pages/addIssue/addIssue", },
"query": "", {
"scene": null "id": 7,
}, "name": "我有事说",
{ "pathName": "subpages/discussion/pages/addIssue/addIssue",
"id": 8, "query": "",
"name": "搜索页面", "scene": null
"pathName": "subpages/oneKeyService/pages/search/search", },
"query": "", {
"scene": null "id": 8,
}, "name": "搜索页面",
{ "pathName": "subpages/oneKeyService/pages/search/search",
"id": -1, "query": "",
"name": "注册页面", "scene": null
"pathName": "pages/toRegister/toRegister", },
"query": "", {
"scene": null "id": -1,
}, "name": "注册页面",
{ "pathName": "pages/toRegister/toRegister",
"id": -1, "query": "",
"name": "subpages/heart/pages/leaderboardNew/leaderboardNew", "scene": null
"pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", },
"query": "", {
"scene": null "id": -1,
} "name": "subpages/heart/pages/leaderboardNew/leaderboardNew",
] "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew",
} "query": "",
} "scene": null
}
]
}
}
} }

4
subpages/oneKeyService/pages/index/index.js
View File

@ -71,6 +71,10 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` 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}`
})
} }
} }
}) })

5
subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
View File

@ -41,6 +41,11 @@ Page({
title: '城管聚焦' title: '城管聚焦'
}) })
this.noticeDetail(options.id) this.noticeDetail(options.id)
} else if(options.modulecode == 'notice_jwgk'){
wx.setNavigationBarTitle({
title: '居务公开'
})
this.noticeDetail(options.id)
} }
}, },

5
subpages/oneKeyService/pages/warning/warning.js
View File

@ -49,6 +49,11 @@ Page({
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: '城管聚焦' title: '城管聚焦'
}) })
}else if(options.modulecode == 'notice_jwgk'){
// this.getBannerList('6')
wx.setNavigationBarTitle({
title: '居务公开'
})
}else{ }else{
this.getBannerList('2') this.getBannerList('2')
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({

9
subpages/understandJs/pages/delicious/delicious.js
View File

@ -22,6 +22,15 @@ Page({
this.setData({ this.setData({
noticeCategory:options.modulecode noticeCategory:options.modulecode
}) })
if(options.modulecode == 'notice_taste'){
wx.setNavigationBarTitle({
title: '锦水味道'
})
}else if(options.modulecode == 'notice_jssq'){
wx.setNavigationBarTitle({
title: '锦水社区'
})
}
this.noticelist(); this.noticelist();
}, },
noticelist () { noticelist () {

2
subpages/understandJs/pages/delicious/delicious.json
View File

@ -1,5 +1,5 @@
{ {
"navigationBarTitleText": "锦水味道", "navigationBarTitleText": "",
"usingComponents": { "usingComponents": {
"load-more": "../../../../components/loadMore/loadMore", "load-more": "../../../../components/loadMore/loadMore",
"no-data":"../../../../components/nodata/nodata" "no-data":"../../../../components/nodata/nodata"

4
subpages/understandJs/pages/index/index.js
View File

@ -89,6 +89,10 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}` 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}`
})
} }
} }
}) })

5
subpages/understandJs/pages/noticeDetail/noticeDetail.js
View File

@ -35,6 +35,11 @@ Page({
title: "锦水味道" title: "锦水味道"
}) })
this.noticeDetail(options.id) this.noticeDetail(options.id)
} else if(options.modulecode == 'notice_jssq'){
wx.setNavigationBarTitle({
title: "锦水社区"
})
this.noticeDetail(options.id)
} else if(options.modulecode == "notice_impression"){ } else if(options.modulecode == "notice_impression"){
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: "锦水印象" title: "锦水印象"

Write Preview
Loading…
Cancel
Save