Browse Source

Merge branch 'release'

master
lihenian 5 years ago
parent
commit
043c2e6e87
  1. 3
      pages/discussion/components/issueItem/issueItem.wxml
  2. 4
      pages/discussion/components/issueItem/issueItem.wxss
  3. 3
      pages/discussion/components/projectItem/projectItem.wxml
  4. 4
      pages/discussion/components/projectItem/projectItem.wxss
  5. 10
      pages/heartNew/heartNew.js
  6. 3
      pages/mine/components/issueItem/issueItem.wxml
  7. 4
      pages/mine/components/issueItem/issueItem.wxss
  8. 3
      pages/mine/components/projectItem/projectItem.wxml
  9. 4
      pages/mine/components/projectItem/projectItem.wxss
  10. 2
      pages/toRegister/toRegister.js
  11. 6
      project.config.json
  12. 3
      subpages/discussion/components/issueItem/issueItem.wxml
  13. 4
      subpages/discussion/components/issueItem/issueItem.wxss
  14. 3
      subpages/discussion/components/projectItem/projectItem.wxml
  15. 4
      subpages/discussion/components/projectItem/projectItem.wxss
  16. 45
      subpages/discussion/pages/addIssue/addIssue.js
  17. 21
      subpages/discussion/pages/addIssue/addIssue.wxml
  18. 4
      subpages/discussion/pages/addIssue/addIssue.wxss
  19. 3
      subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml
  20. 8
      subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
  21. 1
      subpages/discussion/pages/discussionDetail/discussionDetail.js
  22. 13
      subpages/discussion/utils/api.js
  23. 2
      subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
  24. 3
      subpages/mine/pages/eventDetail/eventDetail.js
  25. 2
      subpages/mine/pages/eventDetail/eventDetail.wxml
  26. 7
      subpages/mine/pages/eventDetail/eventDetail.wxss
  27. 4
      subpages/oneKeyService/pages/index/index.js
  28. 5
      subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
  29. 2
      subpages/oneKeyService/pages/noticeDetail/noticeDetail.json
  30. 5
      subpages/oneKeyService/pages/warning/warning.js
  31. 2
      subpages/oneKeyService/pages/warning/warning.json
  32. 2
      utils/config.js
  33. 6
      utils/filter.wxs

3
pages/discussion/components/issueItem/issueItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="issue-item" bindtap="navigateToIssueDetail" data-issueid="{{issueObj.id}}">
<view class="header">
@ -27,7 +28,7 @@
src="{{item}}" />
</view>
<view class="issue-type">{{issueObj.categoryName}}</view>
<view class="issue-type"><view class="category-name" wx:if="{{issueObj.categoryName!=''}}">{{issueObj.categoryName}}</view><view class="tags">{{filter.getTags(issueObj.tagNames)}}</view></view>
<view class="hot-remark" wx:if="{{issueObj.comment.commentId}}">
<view class="top">

4
pages/discussion/components/issueItem/issueItem.wxss

@ -83,6 +83,10 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: flex;
}
.issue-item .issue-type .category-name {
margin-right: 20rpx;
}
.issue-item .hot-remark {

3
pages/discussion/components/projectItem/projectItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="project-item" bindtap="navigateToProjectDetail" data-projectid="{{projectObj.id}}">
<view class="header">
@ -27,7 +28,7 @@
src="{{item}}" />
</view>
<view class="issue-type">{{projectObj.categoryName}}</view>
<view class="issue-type"><view class="category-name" wx:if="{{projectObj.categoryName!=''}}">{{projectObj.categoryName}}</view><view class="tags">{{filter.getTags(projectObj.tagNames)}}</view></view>
<view class="hot-remark">
<view class="top">

4
pages/discussion/components/projectItem/projectItem.wxss

@ -83,6 +83,10 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: flex;
}
.project-item .issue-type .category-name {
margin-right: 20rpx;
}
.project-item .hot-remark {

10
pages/heartNew/heartNew.js

@ -92,6 +92,7 @@ Page({
let parms = {
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
nickname: this.data.searchName
}
this.volunteerlist(parms)
}
@ -137,6 +138,7 @@ Page({
let parms = {
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
nickname: this.data.searchName
}
this.volunteerlist(parms)
} else if (e.currentTarget.dataset.tab == "tab2") {
@ -260,14 +262,15 @@ Page({
})
return;
}
this.setData({
volunteerlist: [],
indexPage: 1
})
let parms = {
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
nickname: this.data.searchName
}
this.setData({
volunteerlist: []
})
this.volunteerlist(parms)
},
/**
@ -345,6 +348,7 @@ Page({
let parms = {
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
nickname: this.data.searchName
}
this.volunteerlist(parms)
} else if (this.data.selectedTab == "tab2") {

3
pages/mine/components/issueItem/issueItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="issue-item" bindtap="toDetail" data-issueid="{{issueObj.id}}" data-state="{{issueObj.stateName}}">
<view class="content">{{issueObj.content}}</view>
<view class="time">{{issueObj.distributeTime}}</view>
@ -13,7 +14,7 @@
src="{{item}}" />
</view>
<view class="type">
<view class="issue-catalogy">{{issueObj.categoryName}}</view>
<view class="issue-catalogy"><view class="category-name" wx:if="{{issueObj.categoryName!=''}}">{{issueObj.categoryName}}</view><view class="tags">{{filter.getTags(issueObj.tagNames)}}</view></view>
<view wx:if="{{issueObj.stateName == '未通过'}}" class="handle-type type-1">未通过</view>
<view wx:elif="{{issueObj.stateName == '待审核'}}" class="handle-type type-2">待审核</view>
<view wx:elif="{{issueObj.stateName == '讨论中'}}" class="handle-type type-3">讨论中</view>

4
pages/mine/components/issueItem/issueItem.wxss

@ -52,6 +52,10 @@
line-height: 40rpx;
color: #FFB400;
width: calc(100% - 100rpx);
display: flex;
}
.issue-item .type .issue-catalogy .category-name {
margin-right: 20rpx;
}
.issue-item .type .handle-type {
height: 34rpx;

3
pages/mine/components/projectItem/projectItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="project-item" bindtap="toDetail" data-itemid="{{projectObj.id}}" data-state="{{projectObj.stateName}}">
<view class="content">{{projectObj.itemContent}}</view>
<view class="time">{{projectObj.createdTime}}</view>
@ -13,7 +14,7 @@
src="{{item}}" />
</view>
<view class="type">
<view class="issue-catalogy">{{projectObj.categoryName}}</view>
<view class="issue-catalogy"><view class="category-name" wx:if="{{projectObj.categoryName!=''}}">{{projectObj.categoryName}}</view><view class="tags">{{filter.getTags(projectObj.tagNames)}}</view></view>
<view wx:if="{{projectObj.stateName == '处理中'}}" class="handle-type type-1">处理中</view>
<view wx:elif="{{projectObj.stateName == '已关闭'}}" class="handle-type type-2">已关闭</view>
<view wx:elif="{{projectObj.stateName == '处理完毕'}}" class="handle-type type-3">处理完毕</view>

4
pages/mine/components/projectItem/projectItem.wxss

@ -50,6 +50,10 @@
line-height: 40rpx;
color: #FFB400;
width: calc(100% - 100rpx);
display: flex;
}
.project-item .type .issue-catalogy .category-name {
margin-right: 20rpx;
}
.project-item .type .handle-type {
height: 34rpx;

2
pages/toRegister/toRegister.js

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

6
project.config.json

@ -111,9 +111,9 @@
"scene": null
},
{
"id": -1,
"name": "锦水档案",
"pathName": "subpages/understandJs/pages/archives/archives",
"id": 7,
"name": "我有事说",
"pathName": "subpages/discussion/pages/addIssue/addIssue",
"query": "",
"scene": null
},

3
subpages/discussion/components/issueItem/issueItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="issue-item" bindtap="navigateToIssueDetail" data-issueid="{{issueObj.id}}">
<view class="header">
@ -24,7 +25,7 @@
src="{{item}}" />
</view>
<view class="issue-type">{{issueObj.categoryName}}</view>
<view class="issue-type"><view class="category-name" wx:if="{{issueObj.categoryName!=''}}">{{issueObj.categoryName}}</view><view class="tags">{{filter.getTags(issueObj.tagNames)}}</view></view>
<view class="hot-remark" wx:if="{{issueObj.comment.commentId}}">
<view class="top">

4
subpages/discussion/components/issueItem/issueItem.wxss

@ -83,6 +83,10 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: flex;
}
.issue-item .issue-type .category-name {
margin-right: 20rpx;
}
.issue-item .hot-remark {

3
subpages/discussion/components/projectItem/projectItem.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="project-item" bindtap="navigateToProjectDetail" data-projectid="{{projectObj.id}}">
<view class="header">
@ -24,7 +25,7 @@
src="{{item}}" />
</view>
<view class="issue-type">{{projectObj.categoryName}}</view>
<view class="issue-type"><view class="category-name" wx:if="{{projectObj.categoryName!=''}}">{{projectObj.categoryName}}</view><view class="tags">{{filter.getTags(projectObj.tagNames)}}</view></view>
<view class="hot-remark">
<view class="top">

4
subpages/discussion/components/projectItem/projectItem.wxss

@ -83,6 +83,10 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: flex;
}
.project-item .issue-type .category-name {
margin-right: 20rpx;
}
.project-item .hot-remark {

45
subpages/discussion/pages/addIssue/addIssue.js

@ -1,7 +1,7 @@
const QQMapWX = require("../../utils/qqmap-wx-jssdk")
import { $wuxActionSheet } from "../../../../dist/index"
const config = require("../../../../utils/config")
import { addIssue } from "../../utils/api"
import { addIssue, getEventTagList } from "../../utils/api"
Page({
data: {
@ -17,9 +17,12 @@ Page({
focus: false,
isBlock: true,
violationsCount: 0,
isConReview: false
isConReview: false,
tagIds: [],
checkboxs: []
},
onLoad () {
this.getEventTagList()
this.data.qqMapWX = new QQMapWX({
key: "CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ"
})
@ -42,6 +45,22 @@ Page({
addressContent: e.detail.value
})
},
//获取事件标签列表
getEventTagList () {
getEventTagList().then(res => {
console.log(res.data)
for (let i=0; i<res.data.length; i++) {
this.data.checkboxs.push({
id: res.data[i].id,
name: res.data[i].tagName,
checked: false
})
}
this.setData({
checkboxs: this.data.checkboxs
})
})
},
// 获取经纬度
getLocation () {
return new Promise((resolve, reject) => {
@ -231,7 +250,8 @@ Page({
issueLongitude: this.data.longitude,
issueLatitude: this.data.latitude,
images: imagesList,
isConReview: this.data.isConReview
isConReview: this.data.isConReview,
tagIds: this.data.tagIds
}
wx.showLoading({
title: "加载中..."
@ -298,6 +318,25 @@ Page({
focus: true
})
},
checkboxClick (e) {
if (this.data.checkboxs[e.currentTarget.dataset.index].checked) {
this.data.checkboxs[e.currentTarget.dataset.index].checked = false
this.data.tagIds = [] //当前版本标签单选
} else {
for(let i=0;i<this.data.checkboxs.length;i++) {
this.data.checkboxs[i].checked = false
}
this.data.checkboxs[e.currentTarget.dataset.index].checked = true
this.data.tagIds = [] //当前版本标签单选
this.data.tagIds.push(this.data.checkboxs[e.currentTarget.dataset.index].id)
}
this.setData({
checkboxs: this.data.checkboxs
})
console.log(this.data.tagIds)
}
// toOperationDesc(phrase) { //常用于点击事件
// // console.log(phrase.currentTarget.dataset.phrase)
// this.setData({

21
subpages/discussion/pages/addIssue/addIssue.wxml

@ -13,7 +13,7 @@
wx:for="{{uploadImageList}}"
wx:for-index="index"
wx:for-item="item"
wx:key="{{item.imageId}}">
wx:key="imageId">
<image class="issue-image" src="{{item.imgUrl}}" />
<image wx:if="{{!item.uploaded}}" class="loading" src="../../images/loading.gif" />
<image bindtap="deleteImage" data-imageid="{{item.imageId}}" class="close" wx:else src="../../images/icon_close.png" />
@ -21,20 +21,13 @@
<image wx:if="{{uploadImageList.length < 3}}" src="../../images/ig_tianjiatupian@2x.png" bindtap="chooseImage" />
</view>
<view class="info-tips">
<view class="tips" bindtap="toOperationDesc" data-phrase="人大在倾听">
<checkbox-group class="info-tips">
<label class="tips" wx:for="{{checkboxs}}" wx:for-index="index" wx:for-item="item" wx:key="index" data-index="{{index}}" bindtap="checkboxClick">
<!-- <view class="spot"></view> -->
<checkbox></checkbox>
<view class="content display-inline">人大在倾听</view>
</view>
</view>
<view class="info-tips">
<view class="tips" bindtap="toOperationDesc" data-phrase="政协好商量">
<!-- <view class="spot"></view> -->
<checkbox></checkbox>
<view class="content display-inline">政协在监督</view>
</view>
</view>
<checkbox value="{{item.name}}" checked="{{item.checked}}"></checkbox>
<view class="content display-inline">{{item.name}}</view>
</label>
</checkbox-group>
<!-- <view class="new-info">希望人大代表倾听</view> -->
</view>

4
subpages/discussion/pages/addIssue/addIssue.wxss

@ -5,7 +5,7 @@ page {
.add-issue {
width: 100%;
height: 100%;
/* height: 100%; */
background: #f7f7f7;
box-sizing: border-box;
padding: 20rpx 20rpx 0;
@ -13,7 +13,7 @@ page {
.add-issue .issue-content {
width: 100%;
height: 730rpx;
/* height: 730rpx; */
border-radius: 16rpx;
background: #fff;
box-sizing: border-box;

3
subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../../../utils/filter.wxs" module="filter"></wxs>
<view class="detail-content">
<view class="user-info">
@ -42,4 +43,6 @@
</view>
</view>
<view class="tags">{{filter.getTags(detailObj.tagNames)}}</view>
</view>

8
subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss

@ -8,7 +8,11 @@
margin-bottom: 25rpx;
overflow: hidden;
}
.detail-content .tags {
color: #FFB400;
font-size: 28rpx;
margin: 30rpx 0rpx;
}
.detail-content .user-info {
width: 100%;
height: 64rpx;
@ -95,7 +99,7 @@
justify-content: center;
padding: 0 15rpx;
box-sizing: border-box;
margin-bottom: 105rpx;
margin-bottom: 60rpx;
}
.detail-content .altitude .normal {
width: calc(50% - 17rpx);

1
subpages/discussion/pages/discussionDetail/discussionDetail.js

@ -50,6 +50,7 @@ Page({
itemState: "", // 项目状态 0-处理中 5-已关闭 10-已结案
showSatisfactionEvaluation: false,
issueToProjectId: "", // 项目当中,之前的议题id
tagNames: []
},
typeStatisticsObj: { // 列表统计对象
attitudeNum: "",

13
subpages/discussion/utils/api.js

@ -3,14 +3,15 @@ const request = require("../../../utils/request")
/**
* 发布议题
*/
export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview }) {
export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview, tagIds }) {
return request.post("events/issue/submit", {
eventContent,
issueAddress,
issueLongitude,
issueLatitude,
images,
isConReview
isConReview,
tagIds
})
}
@ -313,3 +314,11 @@ export function getIssueHandleProgressV2 (issueId) {
export function getProjectHandleProgressV2 (itemId) {
return request.get(`events/item/v2/progress/${itemId}`)
}
/**
* 获取事件标签
*/
export function getEventTagList (itemId) {
return request.get(`events/issue/eventtag/list`)
}

2
subpages/heart/pages/leaderboardNew/leaderboardNew.wxml

@ -30,7 +30,7 @@
<view class="name">{{item.nickname}}</view>
<view class="info-detail">
<image class="heart-time" src="../../images/aixin.png"></image>
<view> 爱心时长 {{item.kindnessTime}}分钟</view>
<view> 爱心时长 {{item.kindnessTime}}小时</view>
<image class="enter-times" src="../../images/bofangcishu.png"></image>
<view> 参加次数 {{item.participationNum}}次</view>
</view>

3
subpages/mine/pages/eventDetail/eventDetail.js

@ -12,7 +12,8 @@ Page({
distributeTime: "",
content: "",
images: "",
advice: ""
advice: "",
tagNames: []
}
},
onLoad (options) {

2
subpages/mine/pages/eventDetail/eventDetail.wxml

@ -1,3 +1,4 @@
<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
<view class="event-detail">
<view class="event-content">
@ -24,6 +25,7 @@
class="image-item"
src="{{item}}" />
</view>
<view class="tags">{{filter.getTags(eventObj.tagNames)}}</view>
</view>
<view class="handle-progress">

7
subpages/mine/pages/eventDetail/eventDetail.wxss

@ -1,7 +1,7 @@
page {
width: 100%;
min-height: 100vh;
height: auto;
/* height: auto; */
overflow-y: auto;
}
.event-detail {
@ -74,6 +74,11 @@ page {
.event-content .image-list .image-item + .image-item {
margin-top: 20rpx;
}
.event-content .tags {
color: #FFB400;
font-size: 28rpx;
margin-bottom: 20rpx;
}
.handle-progress {
width: 100%;

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

@ -67,6 +67,10 @@ Page({
wx.navigateTo({
url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
})
} else if (e.currentTarget.dataset.modulecode == 'notice_cgjj') {
wx.navigateTo({
url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
})
}
}
})

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

@ -36,6 +36,11 @@ Page({
title: '安全365'
})
this.noticeDetail(options.id)
} else if(options.modulecode == 'notice_cgjj'){
wx.setNavigationBarTitle({
title: '城管聚焦'
})
this.noticeDetail(options.id)
}
},

2
subpages/oneKeyService/pages/noticeDetail/noticeDetail.json

@ -1,4 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "锦水"
"navigationBarTitleText": ""
}

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

@ -44,6 +44,11 @@ Page({
wx.setNavigationBarTitle({
title: '安全365'
})
}else if(options.modulecode == 'notice_cgjj'){
this.getBannerList('6')
wx.setNavigationBarTitle({
title: '城管聚焦'
})
}else{
this.getBannerList('2')
wx.setNavigationBarTitle({

2
subpages/oneKeyService/pages/warning/warning.json

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

2
utils/config.js

@ -13,7 +13,7 @@ function BASEURL() {
// return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'http://10.10.10.63:9094/epdc-api/api/'
// return 'http://192.168.43.19:9094/epdc-api/api/'
}
function WEBROOT() {

6
utils/filter.wxs

@ -23,6 +23,12 @@ var formatTime = function (strDate, format = "yyyy-MM-dd hh:mm:ss") {
}
return format;
}
var getTags = function (tags=[]) {
return tags.join(' ')
}
module.exports = {
formatTime: formatTime,//日期格式化
getTags: getTags
}
Loading…
Cancel
Save