Browse Source

版本1.2.5 新增单独跳转报事页面网格码

master
lihenian 5 years ago
parent
commit
348eb3bf15
  1. 5
      epdc-resident-mp-yushan/app.json
  2. 20
      epdc-resident-mp-yushan/pages/complete/components/personalInfo/personalInfo.js
  3. 28
      epdc-resident-mp-yushan/pages/index/index.js
  4. 363
      epdc-resident-mp-yushan/pages/index_bk/index.js
  5. 10
      epdc-resident-mp-yushan/pages/index_bk/index.json
  6. 86
      epdc-resident-mp-yushan/pages/index_bk/index.wxml
  7. 528
      epdc-resident-mp-yushan/pages/index_bk/index.wxss
  8. 2
      epdc-resident-mp-yushan/pages/toRegister/toRegister.js
  9. 279
      epdc-resident-mp-yushan/project.config.json
  10. 16
      epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js
  11. 21
      epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.wxml
  12. 9
      epdc-resident-mp-yushan/utils/config.js

5
epdc-resident-mp-yushan/app.json

@ -213,12 +213,15 @@
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
},
"usingComponents": {
"complete-info-dialog": "./components/completeInfoDialog/completeInfoDialog"
},
"networkTimeout": {
"request": 60000
},
"permission": {
"scope.userLocation": {
"desc": "党群e家将获取您的位置信息"
"desc": "微笑榆山将获取您的位置信息"
}
},
"sitemapLocation": "sitemap84.json",

20
epdc-resident-mp-yushan/pages/complete/components/personalInfo/personalInfo.js

@ -354,7 +354,7 @@ Component({
content: res.data.resultMsg,
success: () => {
wx.reLaunch({
url: "/pages/indexNew/indexNew"
url: "/pages/index/index"
})
}
})
@ -365,10 +365,14 @@ Component({
duration: 2000,
complete: () => {
setTimeout(() => {
const pages = getCurrentPages()
if (pages[pages.length - 2].is === "subpages/discussion/pages/addIssue/addIssue") {
wx.setStorageSync('redirectToAddIssue', 'RP')
}
wx.reLaunch({
url: "/pages/indexNew/indexNew"
url: "/pages/index/index"
})
}, 2000)
}, 1000)
}
})
}
@ -383,7 +387,7 @@ Component({
content: res.data.resultMsg,
success: () => {
wx.reLaunch({
url: "/pages/indexNew/indexNew"
url: "/pages/index/index"
})
}
})
@ -394,10 +398,14 @@ Component({
duration: 2000,
complete: () => {
setTimeout(() => {
const pages = getCurrentPages()
if (pages[pages.length - 2].is === "subpages/discussion/pages/addIssue/addIssue") {
wx.setStorageSync('redirectToAddIssue', 'RP')
}
wx.reLaunch({
url: "/pages/indexNew/indexNew"
url: "/pages/index/index"
})
}, 2000)
}, 1000)
}
})
}

28
epdc-resident-mp-yushan/pages/index/index.js

@ -30,11 +30,20 @@ Page({
},
onLoad (options) {
if (options.scene) {
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight,
gridId: options.scene
})
if (options.scene.indexOf('RP') > -1) {
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight,
gridId: options.scene.substring(0, options.scene.length - 2)
})
wx.setStorageSync('redirectToAddIssue', options.scene.substr(options.scene.length - 2, 2))
} else {
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight,
gridId: options.scene
})
}
} else {
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
@ -96,7 +105,14 @@ Page({
url: '/pages/toRegister/toRegister'
})
} else {
that.initLoad()
if (wx.getStorageSync('redirectToAddIssue')) {
wx.navigateTo({
url: '/subpages/discussion/pages/addIssue/addIssue'
})
} else {
that.initLoad()
}
}
}
})

363
epdc-resident-mp-yushan/pages/index_bk/index.js

@ -1,363 +0,0 @@
var api = require('../../utils/api.js')
var global = require('../../utils/config.js')
import { getTimestamp } from '../../utils/common'
const app = getApp()
Page({
data: {
first: true,
nomorenews: true,
departmentName: '',
consultFlag: false,
options: {
autoplay: false,
circular: true,
interval: 3000,
duration: 100,
previousMargin: 50,
nextMargin: 0,
displayMultipleItems: 3,
currentSwiper: '',
},
options2: {
autoplay: false,
circular: true,
interval: 3000,
duration: 100,
previousMargin: 50,
nextMargin: 0,
displayMultipleItems: 3,
currentSwiper: '',
},
swiperBannerList: [],
swiperData: [
{
headUrl: '',
linkType: 2,
name: '222'
},
{
headUrl: '',
linkType: 2,
name: '222'
}
],
fromScan: false,
gid: '',
nvabarData: {
showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示
title: '微笑榆山', //导航栏 中间的标题
},
height: app.globalData.height * 2 + 20,
infoObj: {
time: '',
title: '',
amount: ''
},
noticeList: [],
innerHtmlStatus: true,
visibilityStatus: true,
pageNo: 1,
pageSize: 10,
timestamp: getTimestamp(),
newsList: [],
issueList: [],
projectList: [],
colorList: ['#fdf6e3', '#e9ecf5', '#f7eedf', '#efd9cc', '#e1efff'],
completeInfoDialogVisible: false, // 是否完善信息
loadMoreVisible: false,
loadMoreType: 'loading',
sudokuState: {
appraiseAvailable: '0',
consultAvailable: '0'
}
},
onShow: function () {
if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) {
if (!this.data.first) {
this.getBannerList()
this.getFirstInfo()
this.getNoticeList()
this.setData({
pageNo: 1,
newsList: []
})
this.getNewsList(),
this.getIndexSudokuState()
}
}
},
onLoad: function (options) {
console.log('options:', options)
if (options.scene) {
this.setData({
gid: decodeURIComponent(options.scene)
})
}
let that = this
setTimeout(function () {
that.getUserState()
}, 700)
},
getBannerList: function () {
let that = this
api.bannerList('0').then(function (res) {
console.log('res==', res.data)
that.setData({
swiperBannerList: res.data
})
})
},
// 加载新闻列表
getNewsList () {
let para = {
pageIndex: this.data.pageNo,
pageSize: this.data.pageSize,
timestamp: getTimestamp()
}
api.newsList(para).then((res) => {
this.setData({
loadMoreType: res.data.length === this.data.pageSize ? 'loading': 'none',
newsList: this.data.newsList.concat(res.data)
})
}).catch(() => {
this.setData({
loadMoreType: 'none',
newsList: []
})
})
},
onReachBottom() {
this.setData({
loadMoreVisible: true
})
if (this.data.loadMoreType === 'loading') {
this.setData({
pageNo: this.data.pageNo + 1,
pageSize: this.data.pageSize
})
this.getNewsList()
}
},
toDetail(e) {
wx.navigateTo({ url: '/subpages/home/pages/newsDetail/newsDetail?id=' + e.currentTarget.dataset.id })
},
getFirstInfo: function () {
let that = this
api.getFirstInfo().then(function (res) {
console.log('infoObj', res.data)
if (res.data !== null) {
that.setData({
infoObj: res.data
})
}
console.log('zheli', that.data.infoObj)
})
},
getNoticeList: function () {
let para = {
pageIndex: 1,
pageSize: 10,
timestamp: getTimestamp()
}
let that = this
api.noticelist(para).then(function (res) {
console.log('infoObj', res.data)
if (res.data !== null) {
that.setData({
noticeList: res.data
})
}
console.log('zheli', that.data.infoObj)
})
},
// 根据微信code查询用户当前状态
getUserState: function () {
let that = this
wx.login({
success(res) {
if (res.code) {
let code = res.code
api.getToken(code).then(function (res) {
let state = res.data.userState
console.log(state)
console.log('date', Date.parse(new Date()))
let date = Date.parse(new Date())
app.globalData.infoCompleted = state
wx.removeStorageSync('topGridName')
wx.setStorageSync('topGridName', res.data.grid)
wx.removeStorageSync('token')
wx.setStorageSync('token', res.data.token)
that.setData({
departmentName: res.data.grid
})
if (state == '0') {
if (that.data.gid !== '') { //扫码进来的
// 是否是网格长的情况
if (that.data.gid == 'gridLeader') { // 是网格长,进网格长注册
wx.redirectTo({
url: '/pages/gridLeaderRegister/gridLeaderRegister'
})
} else { // 不是网格长,进网格提示页
wx.redirectTo({
url: '/pages/formid/formid?gid=' + that.data.gid
})
}
} else { // 直接进首页
that.getBannerList()
that.getFirstInfo()
that.getNoticeList()
that.getNewsList()
that.getIndexSudokuState()
}
} else if (state == '4') { //未注册,跳到我要注册页面
if (that.data.gid !== '') { //扫码进来的
// 扫码进来未注册的情况,先进到前置页面获取formid
// 是否是网格长的情况
if (that.data.gid == 'gridLeader') { // 是网格长
wx.redirectTo({
url: '/pages/gridLeaderRegister/gridLeaderRegister'
})
} else {
wx.redirectTo({
url: '/pages/formid/formid?gid=' + that.data.gid
})
}
} else {
// 非扫码进入,通过搜索小程序直接进入的情况
wx.redirectTo({
url: '/pages/toRegister/toRegister'
})
// if (app.globalData.tempGridId == '') {
// wx.redirectTo({ // todo:
// url: '/pages/toRegister/toRegister?code=' + code + '&t=' + date
// })
// } else {
// wx.redirectTo({
// url: '/pages/formid/formid?gid=' + app.globalData.tempGridId
// })
// }
}
} else {
if (that.data.gid !== '') { //扫码进来的
// 是否是网格长的情况
if (that.data.gid == 'gridLeader') { // 是网格长,进网格长注册
wx.redirectTo({
url: '/pages/gridLeaderRegister/gridLeaderRegister'
})
} else { // 不是网格长,进网格提示页
wx.redirectTo({
url: '/pages/formid/formid?gid=' + that.data.gid
})
}
} else { // 直接进首页
that.getBannerList()
that.getFirstInfo()
that.getNoticeList()
that.getNewsList()
that.getIndexSudokuState()
}
}
})
} else {
console.log('登录失败' + res.errMsg)
}
}
})
},
changeGrid() {
wx.navigateTo({ url: '/subpages/changegrid/pages/changeGrid/changeGrid' })
},
swiperChange: function (e) {
this.setData({
'options.currentSwiper': e.detail.current
})
},
swiperChange2: function (e) {
this.setData({
'options2.currentSwiper': e.detail.current
})
},
// 点击-更多,跳转通知列表
moreNotice() {
wx.navigateTo({ url: '/subpages/home/pages/notice/notice' })
},
// 跳转我的消息
toInfoList() {
wx.navigateTo({ url: '/subpages/home/pages/info/info' })
},
// 跳转到我要报事
navigateToAddIssue () {
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return false
}
wx.navigateTo({
url: '/subpages/discussion/pages/addIssue/addIssue'
})
},
// 跳转到网格专员
navigatetoConsultion() {
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return false
}
wx.navigateTo({
url: '/subpages/home/pages/consultation/consultation'
})
},
// 跳转到通知公告
navigateToNotice () {
wx.navigateTo({
url: '/subpages/home/pages/notice/notice'
})
},
// 跳转到请您监督
navigatetoAppraise () {
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return false
}
const token = wx.getStorageSync('token')
wx.navigateTo({
url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}`
})
},
// 九宫格检查状态
getIndexSudokuState () {
api.getIndexSudokuState().then(res => {
console.log('九宫格状态', res)
let consultAvailable = '0'
let appraiseAvailable = '0'
if (res.data.length > 0) {
res.data.forEach(item => {
if (item.name === '咨询' && item.availableFlag === '1') {
consultAvailable = '1'
} else if (item.name === '干部评价' && item.availableFlag === '1') {
appraiseAvailable = '1'
}
})
}
this.setData({
sudokuState: {
consultAvailable,
appraiseAvailable
}
})
}).catch(() => {
this.setData({
sudokuState: {
consultAvailable: '0',
appraiseAvailable: '0'
}
})
})
}
})

10
epdc-resident-mp-yushan/pages/index_bk/index.json

@ -1,10 +0,0 @@
{
"navigationBarTitleText": "微笑榆山",
"navigationBarBackgroundColor": "#ff4e4a",
"navigationBarTextStyle": "white",
"usingComponents": {
"nav-bar": "/components/navbar/index",
"completeInfo-dialog": "../../components/completeInfoDialog/completeInfoDialog",
"load-more": "../../components/loadMore/loadMore"
}
}

86
epdc-resident-mp-yushan/pages/index_bk/index.wxml

@ -1,86 +0,0 @@
<!-- <wxs module="filter" src="../../utils/filter.wxs"></wxs> -->
<view class="home">
<view class="nav" bindtap="changeGrid">
<view class="nav-logo">
<image src="../../images/index-dang-logo.png" />
</view>
<view class="nav-subjection">{{departmentName}}</view>
<view class="nav-next">
<image class="image" src="../../images/next-white.png" />
</view>
</view>
<view class="slider-layout">
<swiper class="slider" indicator-dots='true' indicator-color='#999999' indicator-active-color='#ffffff' autoplay="{{alse}}">
<swiper-item wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<navigator wx:if="{{item.newsFlag=='1'}}" url="/subpages/home/pages/newsDetail/newsDetail?id={{item.id}}">
<image class="banner" src='{{item.imgUrl}}' mode="aspectFill"></image>
<view class='swiper-label'>
<view class="swiper-label-text">{{item.title}}</view>
</view>
</navigator>
<navigator wx:if="{{item.newsFlag=='0'}}" url="/subpages/home/pages/webview/webview?url={{item.url}}">
<image class="banner" src='{{item.imgUrl}}' mode="aspectFill"></image>
<view class='swiper-label'>
<view class="swiper-label-text">{{item.title}}</view>
</view>
</navigator>
</swiper-item>
</swiper>
</view>
<view class="border">
<!-- 我的消息 -->
<view class="notice">
<view class="notice-myinfo">
<view class="notice-myinfo-logo">
<image src="/images/home/wodexiaoxi.png" />
</view>
<view class="notice-myinfo-content" wx:if="{{infoObj.title != ''}}" bindtap="toInfoList">
<view class="notice-myinfo-content-top">
<span>{{infoObj.title}}</span>
<view class="amount" wx:if="{{infoObj.amount != '0'}}">{{infoObj.amount}}</view>
</view>
<view class="notice-myinfo-content-bottom">
<span>{{departmentName}}</span>
<span>{{infoObj.time.substring(0, 10)}}</span>
</view>
</view>
<view class="notice-myinfo-content" wx:else>暂无更多消息~</view>
</view>
</view>
<!-- 九宫格 -->
<view class="sudoku">
<view class="item" bindtap="navigateToAddIssue">
<image src="../../images/add-issue.png" />
<view hover-stay-time="150" hover-class="hover-sudoku" class="shadow"></view>
</view>
<view wx:if="{{sudokuState.consultAvailable === '1'}}" class="item" bindtap="navigatetoConsultion">
<image src="../../images/law.png" />
<view hover-stay-time="150" hover-class="hover-sudoku" class="shadow"></view>
</view>
<view class="item" bindtap="navigateToNotice">
<image src="../../images/notice.png" />
<view hover-stay-time="150" hover-class="hover-sudoku" class="shadow"></view>
</view>
<view wx:if="{{sudokuState.appraiseAvailable === '1'}}" class="item" bindtap="navigatetoAppraise">
<image src="../../images/appraise.png" />
<view hover-stay-time="150" hover-class="hover-sudoku" class="shadow"></view>
</view>
</view>
<!-- 新闻列表 -->
<view class="news-list">
<view class="news-list-li" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{newsList}}" data-id="{{item.id}}" bindtap="toDetail">
<view class="item-left">
<view class="title">{{item.newsTitle}}</view>
<view class="time">{{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}}</view>
<view class="address">{{item.deptName}}-{{item.newsCategoryName}}</view>
</view>
<view class="item-right">
<image preview="1" src="{{item.newsImageUrl}}" />
</view>
</view>
</view>
<load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>
<!-- 新闻列表 end -->
</view>
</view>
<completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></completeInfo-dialog>

528
epdc-resident-mp-yushan/pages/index_bk/index.wxss

@ -1,528 +0,0 @@
page {
background: #f7f7f7;
}
.home {
width: 100%;
height: 100%;
}
.nav {
height: 94rpx;
width: 100%;
padding: 0 20rpx;
box-sizing: border-box;
display: flex;
background: #ff4e4a;
justify-content: flex-start;
align-items: center;
}
.nav-logo {
width: 40rpx;
height: 40rpx;
}
.nav-logo image {
display: flex;
justify-content: center;
margin-top: 4rpx;
width: 32rpx;
height: 32rpx;
}
.nav-subjection {
font-size: 32rpx;
color: #fff;
margin-left: 6rpx;
}
.nav-next {
width: 26rpx;
height: 40rpx;
position: relative;
margin-left: 12rpx;
}
.nav-next image {
display: flex;
justify-content: center;
margin-top: 10rpx;
width: 16rpx;
height: 26rpx;
}
.border {
padding: 20rpx 20rpx 0;
box-sizing: border-box;
width: 100%;
}
.slider-layout {
height: 360rpx;
width: 100%;
padding: 20rpx 0;
box-sizing: border-box;
background: linear-gradient(to bottom, #ff4e4a 20%, #f7f7f7 20%, #f7f7f7 100%);
}
.slider {
min-width: 100%;
height: 320rpx;
}
.slider swiper-item navigator {
width: 100%;
height: 320rpx;
position: relative;
padding: 0rpx 30rpx;
box-sizing: border-box;
}
.banner {
overflow: hidden;
height: 320rpx;
display: flex;
width: 100%;
margin: 0rpx auto;
border-radius: 8px;
}
.swiper-label {
position: absolute;
bottom: 2rpx;
display: flex;
border-radius: 0 0 14rpx 14rpx;
left: 30rpx;
right: 30rpx;
height: 50rpx;
color: #ffffff;
font-size: 26rpx;
line-height: 50rpx;
padding-left: 20rpx;
background-color: rgba(0, 0, 0, 0.3);
}
.swiper-label-text{
width:70%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.wx-swiper-dots {
position: absolute;
left: unset!important;
right: 20rpx;
}
.wx-swiper-dots.wx-swiper-dots-horizontal {
margin-bottom: -3rpx;
margin-left: 170rpx;
}
.swiper-item navigator,.swiper-item2 navigator {
width: 100%;
height: 320rpx;
position: relative;
}
.slide-image {
width: 600rpx;
height: 100%;
border-radius: 4rpx;
}
.swiper-slide-active {
height: 360rpx;
transition: all .1s;
}
.notice {
height: 128rpx;
width: 100%;
background: #ffffff;
border-radius: 16rpx;
margin-bottom: 16rpx;
}
.notice-myinfo {
height: 128rpx;
width: 100%;
box-sizing: border-box;
padding: 0 24rpx;
}
.notice-myinfo-logo {
width: 72rpx;
height: 72rpx;
margin-top: 28rpx;
float: left;
}
.notice-myinfo-logo image {
width: 100%;
height: 100%;
}
.notice-myinfo-content {
margin-left: 100rpx;
height: 126rpx;
line-height: 126rpx;
font-size: 28rpx;
text-indent: 8rpx;
color: #999999;
}
.notice-myinfo-content-top {
display: flex;
justify-content: space-between;
padding-top: 22rpx;
}
.notice-myinfo-content-top span {
display: inline-block;
font-size: 32rpx;
font-weight: normal;
font-stretch: normal;
line-height: 42rpx;
letter-spacing: 0rpx;
color: #333333;
}
.notice-myinfo-content-top .amount {
width: 44rpx;
height: 34rpx;
font-size: 22rpx;
line-height: 30rpx;
text-align: center;
border-radius: 8rpx;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAgCAYAAABpRpp6AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAARtJREFUeNrs2L9qwlAUx/FjrOjmI0iHONS9r+C/h3Com9CCi5N7u7az7k4digi+gLi4WDq2g0NjO3VQ1Laxv4NHCYGu4Ry4B74QcpcP4SaQmwovixSbC3SFaugcZSnZ2aJXNEI99BJdTEXAZ+gOXcu1hvlB96gj1ydYGj2hCuka9rVRCdXRrycLtwqx0SmLkRjsoxvSP2z0PXnBMgbAbGwyuEp2psLgoiFwgcE5Q+C8R8bGgR3YgR3YgR3YgTXNzho4sAaeWgMPLIFn6NEK+As1UGgB/CH/nc/aP2sr9ECHQ5TJ8eZ/R1J8vjWUffOZMHSDFvxFQOv4Yhy8R33URe8aHzuDv+WQIpCNPda8oRk8R2+ohZba38A/AQYAbb8vEivhOYkAAAAASUVORK5CYII=);
background-size: 44rpx 34rpx;
text-indent: -1rpx;
color: #ffffff;
}
.notice-myinfo-content-bottom {
display: flex;
justify-content: space-between;
}
.notice-myinfo-content-bottom span {
font-size: 24rpx;
font-weight: normal;
font-stretch: normal;
line-height: 42rpx;
letter-spacing: 0rpx;
color: #999999;
}
.notice-broadcast {
height: 80rpx;
width: 100%;
padding: 0 23rpx;
box-sizing: border-box;
display: flex;
align-items: center;
}
.notice-broadcast-logo {
width: 32rpx;
height: 32rpx;
}
.notice-broadcast-logo image {
width: 100%;
height: 100%;
}
.havenotice {
overflow: hidden;
display: flex;
justify-content: space-between;
align-items: center;
height: 100%;
width: calc(100% - 37rpx);
}
.notice-broadcast-content {
margin-left: 12rpx;
width: 85%;
height: 20px;
position: relative;
top: 1px;
overflow: hidden;
}
.notice_list {
width: 100%;
}
.li {
color: #333333;
font-size: 28rpx;
width: 100%;
height: 40rpx;
line-height: 40rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.notice-broadcast-more {
font-size: 28rpx;
font-weight: normal;
color: #ffa650;
margin-top: 16rpx;
}
.nomorenotice {
color: #666666;
margin-left: 14rpx;
}
.swiperitem {
height: 100%;
}
.swiper-txt {
font-size: 28rpx;
color: #333333;
line-height: 40rpx;
}
.swiper-position {
position: absolute;
margin: -20rpx 0 0 20rpx;
width: calc(100% - 200rpx);
z-index: 2;
height: 46rpx;
overflow: hidden;
}
.swiperview .wx-swiper-dots {
display: none;
}
.news-list {
width: 100%;
background: #ffffff;
list-style: none;
border-radius: 15rpx;
}
.nomorenews{
display: flex;
justify-content: center;
align-items: center;
font-size:28rpx;
color:#999999;
padding: 20rpx;
}
.news-list-li {
height: 220rpx;
margin: 0 25rpx;
padding-top: 28rpx;
box-sizing: border-box;
border-bottom: 1px solid #eaeaea;
}
.news-list-li:last-child {
border:none;
}
.item-left {
width: 62%;
float: left;
height: 100%;
position: relative;
box-sizing: border-box;
padding-left: 8rpx;
}
.item-left .title {
white-space: normal !important;
width: 100%;
max-height: 100rpx;
font-size: 36rpx;
line-height: 40rpx;
letter-spacing: 1rpx;
color: #333333;
word-break: break-all;
overflow: hidden;
text-overflow: ellipsis;
word-wrap:break-word;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
margin-top: -4rpx;
}
.time {
font-size: 22rpx;
font-weight: normal;
color: #999999;
}
.address {
font-size: 22rpx;
font-weight: normal;
color: #999999;
position: absolute;
left: 8rpx;
bottom: 30rpx;
}
.item-right {
float: right;
width: 240rpx;
height: 170rpx;
}
.item-right image{
width: 240rpx;
height: 160rpx;
border-radius: 10rpx;
}
.swiper-wrapper {
width: 100%;
height: 100%;
}
.swiper-slide {
width: 100%;
height: 100%;
border-radius: 15rpx;
overflow: hidden;
}
.content {
width: 100%;
height: 100%;
background: #fdf6e3;
box-sizing: border-box;
padding: 0 20rpx;
}
.top {
height: 64rpx;
display: flex;
justify-content: space-between;
align-items: center;
padding-top: 5px;
}
.content .top .div {
width: 118rpx;
height: 44rpx;
color: #ffffff;
line-height: 38rpx;
text-align: center;
font-size: 24rpx;
}
.picture {
width: 100%;
height: 240rpx;
border-radius: 8rpx;
overflow: hidden;
}
.picture image{
width: 100%;
height: 240rpx;
}
.content .top .p {
color: #999999;
font-size: 20rpx;
}
.title {
height: 80rpx;
width: 100%;
line-height: 80rpx;
font-size: 36rpx;
color: #333333;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.remark {
width: 100%;
height: 48rpx;
line-height: 48rpx;
background: rgba(0, 0, 0, 0.05);
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
color: #777777;
font-size: 28rpx;
border-radius: 24rpx;
text-indent: 10px;
margin-bottom: 25rpx;
}
.info {
width: 100%;
height: 87rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.info .left {
display: flex;
align-items: center;
height: 100%;
position: relative;
top: 1px;
}
.info .left image {
width: 30rpx;
height: 30rpx;
margin-right: 8rpx;
border-radius: 50%;
overflow: hidden;
}
.info .left span {
display: inline-block;
color: #444444;
font-size: 20rpx;
}
.right {
width: 110rpx;
height: 36rpx;
border-radius: 18rpx;
background: rgba(0, 0, 0, 0.05);
display: flex;
align-items: center;
justify-content: center;
}
.right .div {
height: 36rpx;
line-height: 32rpx;
color: #999999;
font-size: 20rpx;
margin-right: 8rpx;
position: relative;
top: 1px;
}
.right image {
width: 26rpx;
height: 26rpx;
}
.sudoku {
width: 100%;
height: auto;
background: #fff;
border-radius: 16rpx;
box-sizing: border-box;
padding: 20rpx;
display: grid;
grid-template-columns: 1fr 1fr;
grid-column-gap: 20rpx;
grid-row-gap: 20rpx;
margin-bottom: 20rpx;
}
.sudoku .item {
position: relative;
height: 156rpx;
}
.sudoku .item image {
width: 100%;
height: 100%;
}
.sudoku .shadow {
border-radius: 16rpx;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.sudoku .hover-sudoku {
background: rgba(0,0,0,0.2);
}

2
epdc-resident-mp-yushan/pages/toRegister/toRegister.js

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

279
epdc-resident-mp-yushan/project.config.json

@ -1,192 +1,91 @@
{
"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,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false
},
"compileType": "miniprogram",
"libVersion": "2.10.4",
"appid": "wx50ebeb95943868cd",
"projectname": "%E5%BE%AE%E7%AC%91%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%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": "带参数二维码",
"pathName": "pages/index/index",
"query": "scene=1169158362718629889&inviteUserId=12345",
"scene": 1011
},
{
"id": 2,
"name": "网格长注册",
"pathName": "pages/index/index",
"query": "scene=gridLeader",
"scene": 1011
},
{
"id": 3,
"name": "补全用户信息",
"pathName": "pages/complete/complete",
"query": "",
"scene": null
},
{
"id": -1,
"name": "爱心互助",
"pathName": "pages/heart/heart",
"query": "",
"scene": null
},
{
"id": -1,
"name": "志愿者认证",
"pathName": "subpages/heart/pages/volunteer/volunteer",
"query": "",
"scene": null
},
{
"id": 5,
"name": "1",
"pathName": "subpages/home/pages/notice/notice",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/toRegister/toRegister",
"pathName": "pages/toRegister/toRegister",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/safety/pages/index/index",
"pathName": "subpages/safety/pages/index/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/property/property",
"pathName": "pages/property/property",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/register/register",
"pathName": "pages/register/register",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/discussion/pages/addIssue/addIssue",
"pathName": "subpages/discussion/pages/addIssue/addIssue",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/discussion/pages/categoryList/categoryList",
"pathName": "subpages/discussion/pages/categoryList/categoryList",
"query": "",
"scene": null
},
{
"id": -1,
"name": "心理咨询",
"pathName": "subpages/safety/pages/consultIndex/consultIndex",
"query": "",
"scene": null
},
{
"id": 13,
"name": "发布问题",
"pathName": "subpages/safety/pages/addQuestion/addQuestion",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/safety/pages/consultantDetail/consultantDetail",
"pathName": "subpages/safety/pages/consultantDetail/consultantDetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/safety/pages/consultantList/consultantList",
"pathName": "subpages/safety/pages/consultantList/consultantList",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/safety/pages/myQuestion/myQuestion",
"pathName": "subpages/safety/pages/myQuestion/myQuestion",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subpages/education/pages/index/index",
"pathName": "subpages/education/pages/index/index",
"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,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.10.4",
"appid": "wx50ebeb95943868cd",
"projectname": "%E5%BE%AE%E7%AC%91%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%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": "带参数二维码",
"pathName": "pages/index/index",
"query": "scene=1169158362718629889&inviteUserId=12345",
"scene": 1011
},
{
"id": 2,
"name": "网格长注册",
"pathName": "pages/index/index",
"query": "scene=gridLeader",
"scene": 1011
},
{
"id": 3,
"name": "补全用户信息",
"pathName": "pages/complete/complete",
"query": "",
"scene": null
}
]
}
}
}

16
epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js

@ -2,6 +2,7 @@ const QQMapWX = require('../../utils/qqmap-wx-jssdk')
import { $wuxActionSheet } from '../../../../dist/index'
const config = require('../../../../utils/config')
import { addIssue } from '../../utils/api'
const app = getApp()
Page({
data: {
@ -13,7 +14,8 @@ Page({
uploadImageList: [],
imageId: 1,
dialogVisible: false,
publishIssuePrevious: 0
publishIssuePrevious: 0,
completeInfoDialogVisible: false
},
onLoad () {
this.data.qqMapWX = new QQMapWX({
@ -22,6 +24,12 @@ Page({
this.getLocation().then(() => {
this.reverseLocation()
})
wx.removeStorageSync('redirectToAddIssue')
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
}
},
// 双向绑定 内容输入框
bindTextareaInput (e) {
@ -222,6 +230,12 @@ Page({
},
// 发布议题
publishIssue () {
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return false
}
if (!this.data.issueContent) {
wx.showToast({
title: '请填写议题内容',

21
epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.wxml

@ -1,5 +1,4 @@
<view class="add-issue">
<view class="issue-content">
<textarea maxlength="500" value="{{issueContent}}" bindblur="bindTextareaInput" bindinput="bindTextareaInput">
<view class="textarea-placeholder" style="display: {{issueContent ? 'none': 'block'}}">
@ -8,12 +7,7 @@
</view>
</textarea>
<view class="image-list">
<view
class="image-item"
wx:for="{{uploadImageList}}"
wx:for-index="index"
wx:for-item="item"
wx:key="imageId">
<view class="image-item" wx:for="{{uploadImageList}}" wx:for-index="index" wx:for-item="item" 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,7 +15,6 @@
<image wx:if="{{uploadImageList.length < 3}}" src="../../images/ig_tianjiatupian@2x.png" bindtap="chooseImage" />
</view>
</view>
<view class="issue-location">
<textarea maxlength="80" placeholder="请输入地址" placeholder-class="address-placeholder" value="{{addressContent}}" bindblur="bindAddressInput" bindinput="bindAddressInput"></textarea>
<view class="address">
@ -29,18 +22,10 @@
<view>议题定位</view>
</view>
</view>
<view class="publish-issue">
<button hover-class="hover-publish" bindtap="throttlePublisgIssue">发布</button>
</view>
</view>
<wux-actionsheet id="wux-actionsheet" />
<tip-dialog
dialogVisible="{{dialogVisible}}"
title="议题待审核"
content="{{['收到议题,我们会尽快审核。','家园因您而精彩,感谢您的参与!']}}"
confirmText="知道了"
bind:confirm="confirmDialog"
bind:cancel="confirmDialog">
</tip-dialog>
<tip-dialog dialogVisible="{{dialogVisible}}" title="议题待审核" content="{{['收到议题,我们会尽快审核。','家园因您而精彩,感谢您的参与!']}}" confirmText="知道了" bind:confirm="confirmDialog" bind:cancel="confirmDialog"></tip-dialog>
<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>

9
epdc-resident-mp-yushan/utils/config.js

@ -6,17 +6,8 @@ module.exports = {
};
function BASEURL() {
// return 'http://192.168.51.59:9094/epdc-api/api/' // 本地测试 接口地址
// return 'http://10.10.10.225:9094/epdc-api/api/' // 本地测试 接口地址
// return 'https://epdc-shibei.elinkit.com.cn/epdc-api/api/'
// return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
// return "https://epdc-test.elinkservice.cn/epdc-api/api/" // 测试环境 ip接口地址
// return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
// return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'httpss://epdc-kongcun.elinkit.com.cn/epdc-api/api/' // 孔村正式环境地址
// return "https://nei.netease.com/api/apimock-v2/ccdea843b26ece1e1f9873d6825e7a09/api/" //mock地址
// return 'https://epdc-test.elinkservice.cn/epdc-api/api/' // 先锋市北正式环境
return 'https://epdc-yushan.elinkservice.cn/epdc-api/api/' // 微笑榆山正式环境
}

Loading…
Cancel
Save