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

增加我有事要阅；首页电话从接口获取；首页服务样式修改；志愿者页面咨询热线点击拨打；精彩说说样式调整；新增等级排名页面；增加论坛指南

master
ZhaoTongYao 5 years ago
parent
cb9286ff3c
commit
e7e6d63fd9
15 changed files with 2632 additions and 2523 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. 153
      components/activity/activity.js
  2. 76
      components/activity/activity.wxml
  3. BIN
      images/home/call.png
  4. 713
      pages/heartNew/heartNew.js
  5. 178
      pages/heartNew/heartNew.wxml
  6. 768
      pages/heartNew/heartNew.wxss
  7. 61
      pages/indexNew/indexNew.js
  8. 17
      pages/indexNew/indexNew.json
  9. 332
      pages/indexNew/indexNew.wxml
  10. 1260
      pages/indexNew/indexNew.wxss
  11. 4
      project.config.json
  12. 467
      subpages/integralCentre/pages/index/index.js
  13. 54
      utils/activity.js
  14. 1016
      utils/api.js
  15. 56
      utils/config.js

153
components/activity/activity.js
View File

@ -1,78 +1,77 @@
var api = require('../../utils/activity.js') var api = require('../../utils/activity.js')
const app = getApp() const app = getApp()
Component({ Component({
properties: { properties: {
state: Number state: Number,
}, },
data: { data: {
activityList: [], activityList: [],
nomore: false nomore: false
}, },
attached: function() {}, attached: function() {},
ready: function() {}, ready: function() {},
pageLifetimes: { pageLifetimes: {
show: function() {}, show: function() {},
}, },
methods: { methods: {
getActivityList(params) { getActivityList(params) {
let that = this let that = this
that.setData({ that.setData({
selectedTab: params.selectedTab selectedTab: params.selectedTab
}) })
if (params.qkdat == true) { if (params.qkdat == true) {
console.log('清空') console.log('清空')
that.setData({ that.setData({
activityList: [], activityList: [],
nomore: false nomore: false
}) })
} }
api.getActivityList(params).then((res) => { api.getActivityList(params).then((res) => {
console.log(res.data) console.log(res.data)
that.setData({ that.setData({
activityList: that.data.activityList.concat(res.data) activityList: that.data.activityList.concat(res.data)
}) })
console.log(res.data.length) //console.log(res.data.length)
//数据访问成功 //数据访问成功
var myEventDetail = { var myEventDetail = {
listLength: res.data.length listLength: res.data.length
} }
that.triggerEvent('toActDetail', myEventDetail) that.triggerEvent('toActDetail', myEventDetail)
if (res.data.length == 0) { if (res.data.length == 0) {
that.setData({ that.setData({
nomore: true nomore: true
}) })
} }
}) })
}, },
toActDetail(e) { toActDetail(e) {
console.log('selectedTab::::'+this.data.selectedTab) console.log('selectedTab::::'+this.data.selectedTab)
const id = e.currentTarget.dataset.id const id = e.currentTarget.dataset.id
const actcurrentstate = e.currentTarget.dataset.actcurrentstate const actcurrentstate = e.currentTarget.dataset.actcurrentstate
const signupflag = e.currentTarget.dataset.signupflag const signupflag = e.currentTarget.dataset.signupflag
this.triggerEvent('toActDetail', { this.triggerEvent('toActDetail', {
actId: id actId: id
}) })
wx.navigateTo({ wx.navigateTo({
url: `/subpages/heart/pages/heartDetail/heartDetail?id=${id}&actcurrentstate=${actcurrentstate}&signupflag=${signupflag}&selectedTab=${this.data.selectedTab}` url: `/subpages/heart/pages/heartDetail/heartDetail?id=${id}&actcurrentstate=${actcurrentstate}&signupflag=${signupflag}&selectedTab=${this.data.selectedTab}`
}) })
}, },
updateActivityList(params) { updateActivityList(params) {
api.getActivityList(params).then(res => { api.getActivityList(params).then(res => {
console.log('详情回列表刷新数据', res) console.log('详情回列表刷新数据', res)
const index = this.data.activityList.findIndex(item => item.id === res.data[0].id) const index = this.data.activityList.findIndex(item => item.id === res.data[0].id)
if (index > -1) { if (index > -1) {
this.data.activityList.splice(index, 1, res.data[0]) this.data.activityList.splice(index, 1, res.data[0])
} else { } else {
this.data.activityList.splice(index, 1) this.data.activityList.splice(index, 1)
} }
this.setData({ this.setData({
activityList: this.data.activityList activityList: this.data.activityList
}) })
}) })
} }
} }
}) })

76
components/activity/activity.wxml
View File

@ -1,39 +1,39 @@
<view class="layout" wx:for="{{activityList}}"> <view class="layout" wx:for="{{activityList}}">
<view data-id="{{item.id}}" <view data-id="{{item.id}}"
data-actCurrentState="{{item.actCurrentState}}" data-actCurrentState="{{item.actCurrentState}}"
data-signupFlag="{{item.signupFlag}}" data-signupFlag="{{item.signupFlag}}"
bindtap="toActDetail"> bindtap="toActDetail">
<view class="img"> <view class="img">
<image class="imgsrc" src="{{item.headPic}}" mode="aspectFill"/> <image class="imgsrc" src="{{item.headPic}}" mode="aspectFill"/>
<view class="user-state" wx:if="{{item.actCurrentState=='0'}}">报名中</view> <view class="user-state" wx:if="{{item.actCurrentState=='0'}}">报名中</view>
<view class="user-state" wx:if="{{item.actCurrentState=='1'}}">已报满</view> <view class="user-state" wx:if="{{item.actCurrentState=='1'}}">已报满</view>
<view class="user-state" wx:if="{{item.actCurrentState=='2'}}">未开始</view> <view class="user-state" wx:if="{{item.actCurrentState=='2'}}">未开始</view>
<view class="user-state" wx:if="{{item.actCurrentState=='3'}}">进行中</view> <view class="user-state" wx:if="{{item.actCurrentState=='3'}}">进行中</view>
<view class="user-state" wx:if="{{item.actCurrentState=='4'}}">已结束</view> <view class="user-state" wx:if="{{item.actCurrentState=='4'}}">已结束</view>
<view class="user-state" wx:if="{{item.actCurrentState=='5'}}">已取消</view> <view class="user-state" wx:if="{{item.actCurrentState=='5'}}">已取消</view>
</view> </view>
<view class="infos"> <view class="infos">
<view class="infos_title">{{item.title}}</view> <view class="infos_title">{{item.title}}</view>
<view class="infos_times"> <view class="infos_times">
<view> <view>
<image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A6WAcS1lAAABQRNkl7Y828.png" /> <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A6WAcS1lAAABQRNkl7Y828.png" />
活动时间：{{item.actStartTime}}至 活动时间：{{item.actStartTime}}至
</view> </view>
<view class="endtime">{{item.actEndTime}}</view> <view class="endtime">{{item.actEndTime}}</view>
<view> <view>
<image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A7-AKfhbAAABTg-ZMDk458.png" /> <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A7-AKfhbAAABTg-ZMDk458.png" />
<text>活动地点：{{item.actAddress}}</text> <text>活动地点：{{item.actAddress}}</text>
</view> </view>
</view> </view>
<view class="infos_nums"> <view class="infos_nums" wx:if="{{!(state==2&&item.actCurrentState=='4')}}">
<span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span> <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
<span wx:else class="total">活动名额 {{item.actQuota}}人</span> <span wx:else class="total">活动名额 {{item.actQuota}}人</span>
<span class="signed">已报名 {{item.signupNum}}人</span> <span class="signed">已报名 {{item.signupNum}}人</span>
</view> </view>
</view> </view>
</view> </view>
<image class="signed-logo" wx:if="{{item.signupFlag=='1'}}" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A-CAIEeKAABSBTxj8ns662.png" /> <image class="signed-logo" wx:if="{{item.signupFlag=='1'}}" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A-CAIEeKAABSBTxj8ns662.png" />
</view> </view>
<!-- <view hidden="{{nomore}}" class="loadmore">上滑加载更多</view> <!-- <view hidden="{{nomore}}" class="loadmore">上滑加载更多</view>
<view hidden="{{!nomore}}" class="loadmore">没有更多了~</view> --> <view hidden="{{!nomore}}" class="loadmore">没有更多了~</view> -->

BIN
images/home/call.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

713
pages/heartNew/heartNew.js
View File

@ -1,347 +1,368 @@
// pages/heartNew/heartNew.js // pages/heartNew/heartNew.js
const app = getApp() const app = getApp()
var api = require('../../utils/activity.js') var api = require('../../utils/activity.js')
import { import {
getTimestamp getTimestamp
} from '../../utils/common' } from '../../utils/common'
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
statusHeight: 0, // 自定义头部状态栏高度 statusHeight: 0, // 自定义头部状态栏高度
navigationHeight: 0, // 自定义头部导航栏高度 navigationHeight: 0, // 自定义头部导航栏高度
selectedTab: 'tab0', selectedTab: 'tab0',
// banner 相关 // banner 相关
banner: [], banner: [],
indicatorDots: false, //指示点 indicatorDots: false, //指示点
autoplay: true, //true false,//自动播放 autoplay: true, //true false,//自动播放
circular: true, //衔接滑动 circular: true, //衔接滑动
interval: 4000, //自动播放间隔时长(ms) interval: 4000, //自动播放间隔时长(ms)
duration: 500, //幻灯片切换时长(ms) duration: 500, //幻灯片切换时长(ms)
currentSwiper: 0, currentSwiper: 0,
// banner 相关end // banner 相关end
// 列表相关 // 列表相关
loadMoreVisible: false, //false loadMoreVisible: false, //false
loadMoreType: 'none', //loading none loadMoreType: 'none', //loading none
dingdan: false,//判断订单列表隐藏 dingdan: false,//判断订单列表隐藏
jingcai: true,//判断精彩列表隐藏 jingcai: true,//判断精彩列表隐藏
indexPage: 1, indexPage: 1,
pageSize: 10, pageSize: 10,
qkdat: false,//判断是否清空数据 qkdat: false,//判断是否清空数据
actId: '',//判断返回以后是否需要刷新列表 actId: '',//判断返回以后是否需要刷新列表
volunteerlist:[],//志愿者列表 volunteerlist:[],//志愿者列表
listLength:0,//数据长度判断是否需要加载 listLength:0,//数据长度判断是否需要加载
getImgUrl:'', getImgUrl:'',
ifClickImage:false,//因为志友多多点击图片查看大图，会出现列表刷新的bug，所以加这个字段进行控制 ifClickImage:false,//因为志友多多点击图片查看大图，会出现列表刷新的bug，所以加这个字段进行控制
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.bannerListV2() this.bannerListV2()
this.getImgUrl()//获取配置图片 this.getImgUrl()//获取配置图片
this.setData({ this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight, statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight,
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 0, actType: 0,
qkdat: true, qkdat: true,
selectedTab:this.data.selectedTab selectedTab:this.data.selectedTab
} }
this.selectComponent("#state-0").getActivityList(parms) this.selectComponent("#state-0").getActivityList(parms)
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady: function () { onReady: function () {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
if(this.data.selectedTab == 'tab1'){//刷新志友 if(this.data.selectedTab == 'tab1'){//刷新志友
if(this.data.ifClickImage){//如果为true就不可以刷新,判断完成以后重新置为false if(this.data.ifClickImage){//如果为true就不可以刷新,判断完成以后重新置为false
this.setData({ this.setData({
ifClickImage: false ifClickImage: false
}) })
}else{ }else{
this.setData({ this.setData({
loadMoreVisible: false, loadMoreVisible: false,
loadMoreType: 'none', loadMoreType: 'none',
indexPage: 1, indexPage: 1,
}) })
this.setData({ this.setData({
dingdan: true, dingdan: true,
jingcai: true, jingcai: true,
volunteerlist:[],//列表置空 volunteerlist:[],//列表置空
listLength:0 listLength:0
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
} }
this.volunteerlist(parms) this.volunteerlist(parms)
} }
} }
if (this.data.actId) { if (this.data.actId) {
this.setData({ this.setData({
loadMoreVisible: false, loadMoreVisible: false,
loadMoreType: 'none', loadMoreType: 'none',
indexPage: 1, indexPage: 1,
}) })
this.updateActivityList() this.updateActivityList()
} }
}, },
// tab 切换 // tab 切换
tabBarChange(e) { tabBarChange(e) {
this.setData({ this.setData({
loadMoreVisible: false, loadMoreVisible: false,
loadMoreType: 'none', loadMoreType: 'none',
indexPage: 1, indexPage: 1,
}) })
if (e.currentTarget.dataset.tab == 'tab0') { if (e.currentTarget.dataset.tab == 'tab0') {
this.setData({ this.setData({
dingdan: false, dingdan: false,
jingcai: true, jingcai: true,
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 0,//活动列表类型（0-招募令，1-精彩活动） actType: 0,//活动列表类型（0-招募令，1-精彩活动）
qkdat: true, qkdat: true,
selectedTab:e.currentTarget.dataset.tab selectedTab:e.currentTarget.dataset.tab
} }
this.selectComponent("#state-0").getActivityList(parms) this.selectComponent("#state-0").getActivityList(parms)
} else if (e.currentTarget.dataset.tab == 'tab1') { } else if (e.currentTarget.dataset.tab == 'tab1') {
this.setData({ this.setData({
dingdan: true, dingdan: true,
jingcai: true, jingcai: true,
volunteerlist:[],//列表置空 volunteerlist:[],//列表置空
listLength:0 listLength:0
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
} }
this.volunteerlist(parms) this.volunteerlist(parms)
} else if (e.currentTarget.dataset.tab == 'tab2') { } else if (e.currentTarget.dataset.tab == 'tab2') {
this.setData({ this.setData({
dingdan: true, dingdan: true,
jingcai: false, jingcai: false,
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 1,//活动列表类型（0-招募令，1-精彩活动） actType: 1,//活动列表类型（0-招募令，1-精彩活动）
qkdat: true, qkdat: true,
selectedTab:e.currentTarget.dataset.tab selectedTab:e.currentTarget.dataset.tab
} }
this.selectComponent("#state-2").getActivityList(parms) this.selectComponent("#state-2").getActivityList(parms)
} else if (e.currentTarget.dataset.tab == 'tab3') { } else if (e.currentTarget.dataset.tab == 'tab3') {
this.setData({ this.setData({
dingdan: true, dingdan: true,
jingcai: true, jingcai: true,
}) })
wx.navigateTo({ wx.navigateTo({
url: `/subpages/heart/pages/leaderboardNew/leaderboardNew` url: `/subpages/heart/pages/leaderboardNew/leaderboardNew`
}) })
} }
this.setData({ this.setData({
selectedTab: e.currentTarget.dataset.tab selectedTab: e.currentTarget.dataset.tab
}) })
}, },
// 返回以后刷新列表 // 返回以后刷新列表
updateActivityList() { updateActivityList() {
if ((this.data.selectedTab === 'tab0')) { if ((this.data.selectedTab === 'tab0')) {
let params = { let params = {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 0, actType: 0,
actId: this.data.actId, actId: this.data.actId,
selectedTab:this.data.selectedTab selectedTab:this.data.selectedTab
} }
this.selectComponent("#state-0").updateActivityList(params) this.selectComponent("#state-0").updateActivityList(params)
} else if (this.data.selectedTab === 'tab2') { } else if (this.data.selectedTab === 'tab2') {
let params = { let params = {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 1, actType: 1,
actId: this.data.actId, actId: this.data.actId,
selectedTab:this.data.selectedTab selectedTab:this.data.selectedTab
} }
this.selectComponent("#state-2").updateActivityList(params) this.selectComponent("#state-2").updateActivityList(params)
} }
this.setData({ this.setData({
actId: '' actId: ''
}) })
}, },
// 志愿者列表 // 志愿者列表
volunteerlist(params){ volunteerlist(params){
let that = this let that = this
api.volunteerlist(params).then(function (res) { api.volunteerlist(params).then(function (res) {
if (res.data.length !== that.data.pageSize) { if (res.data.length !== that.data.pageSize) {
that.setData({ that.setData({
loadMoreVisible: true, loadMoreVisible: true,
loadMoreType: 'none', loadMoreType: 'none',
}) })
} }
that.setData({ that.setData({
listLength:res.data.length, listLength:res.data.length,
volunteerlist:that.data.volunteerlist.concat(res.data) volunteerlist:that.data.volunteerlist.concat(res.data)
}) })
}) })
}, },
//返回上一级 //返回上一级
goback() { goback() {
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1
}) })
}, },
// banner 切换 // banner 切换
swiperChange: function (e) { swiperChange: function (e) {
this.setData({ this.setData({
currentSwiper: e.detail.current currentSwiper: e.detail.current
}) })
}, },
// 通过判断列表的长度断定是否显示加载中 // 通过判断列表的长度断定是否显示加载中
toActDetailDown(e) { toActDetailDown(e) {
if (e.detail.listLength !== this.data.pageSize) { if (e.detail.listLength !== this.data.pageSize) {
this.setData({ this.setData({
loadMoreVisible: true, loadMoreVisible: true,
loadMoreType: 'none', loadMoreType: 'none',
}) })
} }
this.setData({ this.setData({
actId: e.detail.actId, actId: e.detail.actId,
listLength: e.detail.listLength listLength: e.detail.listLength
}) })
}, },
clickImage(e){ clickImage(e){
this.setData({ this.setData({
ifClickImage: e.detail, ifClickImage: e.detail,
}) })
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide: function () { onHide: function () {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload: function () { onUnload: function () {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh: function () { onPullDownRefresh: function () {
this.bannerListV2() this.bannerListV2()
}, },
bannerListV2: function () { bannerListV2: function () {
let that = this let that = this
let params = { let params = {
bannerType:"0" bannerType:"0"
} }
api.bannerList(params).then(function (res) { api.bannerList(params).then(function (res) {
that.setData({ that.setData({
banner: res.data banner: res.data
}) })
wx.stopPullDownRefresh(); wx.stopPullDownRefresh();
}) })
}, },
// 获取配置图片 // 获取配置图片
getImgUrl:function(){//0：咨询热线 getImgUrl:function(){//0：咨询热线
let that = this let that = this
api.getImgUrl('0').then(function (res) { api.getImgUrl('0').then(function (res) {
that.setData({ that.setData({
getImgUrl: res.data[0].imgUrl getImgUrl: res.data[0]
}) })
}) })
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function () {
if (this.data.listLength !== this.data.pageSize) { if (this.data.listLength !== this.data.pageSize) {
this.setData({ this.setData({
loadMoreVisible: true, loadMoreVisible: true,
loadMoreType: 'none', loadMoreType: 'none',
}) })
} else { } else {
this.setData({ this.setData({
loadMoreVisible: true, loadMoreVisible: true,
loadMoreType: 'loading', loadMoreType: 'loading',
}) })
} }
if (this.data.selectedTab == 'tab0') { if (this.data.selectedTab == 'tab0') {
this.setData({ this.setData({
indexPage: this.data.indexPage + 1 indexPage: this.data.indexPage + 1
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 0, actType: 0,
selectedTab:this.data.selectedTab selectedTab:this.data.selectedTab
} }
this.selectComponent("#state-0").getActivityList(parms) this.selectComponent("#state-0").getActivityList(parms)
}else if(this.data.selectedTab == 'tab1'){ }else if(this.data.selectedTab == 'tab1'){
this.setData({ this.setData({
indexPage: this.data.indexPage + 1 indexPage: this.data.indexPage + 1
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
} }
this.volunteerlist(parms) this.volunteerlist(parms)
} else if (this.data.selectedTab == 'tab2') { } else if (this.data.selectedTab == 'tab2') {
this.setData({ this.setData({
indexPage: this.data.indexPage + 1 indexPage: this.data.indexPage + 1
}) })
let parms = { let parms = {
pageIndex: this.data.indexPage, pageIndex: this.data.indexPage,
pageSize: this.data.pageSize, pageSize: this.data.pageSize,
timestamp: getTimestamp(), timestamp: getTimestamp(),
actType: 1, actType: 1,
selectedTab:this.data.selectedTab selectedTab:this.data.selectedTab
} }
this.selectComponent("#state-2").getActivityList(parms) this.selectComponent("#state-2").getActivityList(parms)
} }
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage: function () { onShareAppMessage: function () {
}, },
//跳转志愿者认证页面 //跳转志愿者认证页面
govolunteer() { govolunteer() {
wx.navigateTo({ wx.navigateTo({
url: `/subpages/heart/pages/volunteer/volunteer` url: `/subpages/heart/pages/volunteer/volunteer`
}) })
}, },
//拨打电话
getPhone(e) {
// return false
wx.showModal({
title: '拨打电话',
content: ``,
cancelColor: '#29B9A5',
confirmColor: '#29B9A5',
success: (res) => {
if (res.confirm) {
console.log('用户点击确定')
wx.makePhoneCall({
phoneNumber: e.currentTarget.dataset.number
})
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
}
}) })

178
pages/heartNew/heartNew.wxml
View File

@ -1,90 +1,90 @@
<view class="header" style="height: {{statusHeight + navigationHeight}}px;"> <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
<image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" /> <image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" />
<view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;"> <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
<view class="goback" bindtap="goback"> <view class="goback" bindtap="goback">
<image src="../../images/goback.png" /> <image src="../../images/goback.png" />
</view> </view>
<view class="title" bindtap="goback"> <view class="title" bindtap="goback">
<view class="title-right">志愿者去哪儿</view> <view class="title-right">志愿者去哪儿</view>
</view> </view>
<!-- 志愿者去哪儿 --> <!-- 志愿者去哪儿 -->
</view> </view>
</view> </view>
<view class="home" style="margin-top: {{statusHeight + navigationHeight}}px"> <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
<view class="belong-grid"> <view class="belong-grid">
<image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" /> <image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" />
<view class="newbelong-grid"> <view class="newbelong-grid">
<view class="grid"> <view class="grid" bindtap="getPhone" data-number="{{getImgUrl.remark}}">
<image src="{{getImgUrl}}" /> <image src="{{getImgUrl.imgUrl}}" />
</view> </view>
<view class="volunteer" bindtap="govolunteer"> <view class="volunteer" bindtap="govolunteer">
<image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717MhrKAB80nAAApr5c7VJQ292.png" /> <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717MhrKAB80nAAApr5c7VJQ292.png" />
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="banner-main"> <view class="banner-main">
<view class="page-body"> <view class="page-body">
<view class="page-section page-section-spacing swiper"> <view class="page-section page-section-spacing swiper">
<swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange"> <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
<block wx:if="{{banner.length > 0}}"> <block wx:if="{{banner.length > 0}}">
<block wx:for="{{banner}}" wx:key="*this"> <block wx:for="{{banner}}" wx:key="*this">
<swiper-item> <swiper-item>
<view class="swiper-item" data-id="{{item.actId}}"> <view class="swiper-item" data-id="{{item.actId}}">
<image class="banner" src='{{item.bannerImg}}' mode="aspectFill" /> <image class="banner" src='{{item.bannerImg}}' mode="aspectFill" />
</view> </view>
</swiper-item> </swiper-item>
</block> </block>
</block> </block>
<block wx:else> <block wx:else>
<swiper-item> <swiper-item>
<view> <view>
<image class="banner" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717N1ouAPcXVAAJZd_4ygpQ518.jpg" mode="aspectFill" /> <image class="banner" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717N1ouAPcXVAAJZd_4ygpQ518.jpg" mode="aspectFill" />
</view> </view>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
<!-- 重置小圆点的样式 --> <!-- 重置小圆点的样式 -->
<view class="dots"> <view class="dots">
<block wx:for="{{ banner }}" wx:key="index"> <block wx:for="{{ banner }}" wx:key="index">
<view class="dot {{index == currentSwiper ? ' active' : '' }}"></view> <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
</block> </block>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="tab-all"> <view class="tab-all">
<view class="tab-bar"> <view class="tab-bar">
<view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange"> <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">
订单多多 订单多多
</view> </view>
<view class="tab tab1 {{selectedTab === 'tab1' ? 'select' : ''}}" data-tab="tab1" bindtap="tabBarChange"> <view class="tab tab1 {{selectedTab === 'tab1' ? 'select' : ''}}" data-tab="tab1" bindtap="tabBarChange">
志友朵朵 志友朵朵
</view> </view>
<view class="tab tab2 {{selectedTab === 'tab2' ? 'select' : ''}}" data-tab="tab2" bindtap="tabBarChange"> <view class="tab tab2 {{selectedTab === 'tab2' ? 'select' : ''}}" data-tab="tab2" bindtap="tabBarChange">
精彩说说 精彩说说
</view> </view>
<view class="tab tab3 {{selectedTab === 'tab3' ? 'select' : ''}}" data-tab="tab3" bindtap="tabBarChange"> <view class="tab tab3 {{selectedTab === 'tab3' ? 'select' : ''}}" data-tab="tab3" bindtap="tabBarChange">
积分火火 积分火火
</view> </view>
<view class="select-bar {{selectedTab}}"></view> <view class="select-bar {{selectedTab}}"></view>
</view> </view>
</view> </view>
<!-- 订单多多列表 --> <!-- 订单多多列表 -->
<view class="details-top" hidden="{{dingdan}}"> <view class="details-top" hidden="{{dingdan}}">
<activity bind:toActDetail="toActDetailDown" id="state-0" state="0"></activity> <activity bind:toActDetail="toActDetailDown" id="state-0" state="0"></activity>
</view> </view>
<!-- 志友朵朵 --> <!-- 志友朵朵 -->
<block wx:if="{{ selectedTab == 'tab1' }}"> <block wx:if="{{ selectedTab == 'tab1' }}">
<view class="details-top"> <view class="details-top">
<view class="volunteer-box"> <view class="volunteer-box">
<volunteer-list bind:clickImage="clickImage" wx:for="{{volunteerlist}}" volunteerItemObj="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="{{index}}"></volunteer-list> <volunteer-list bind:clickImage="clickImage" wx:for="{{volunteerlist}}" volunteerItemObj="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="{{index}}"></volunteer-list>
</view> </view>
<!-- <view class="show">*按姓氏拼音排序</view> --> <!-- <view class="show">*按姓氏拼音排序</view> -->
</view> </view>
</block> </block>
<!-- 精彩说说 --> <!-- 精彩说说 -->
<view class="details-top" hidden="{{jingcai}}"> <view class="details-top" hidden="{{jingcai}}">
<activity bind:toActDetail="toActDetailDown" id="state-2" state="2"></activity> <activity bind:toActDetail="toActDetailDown" id="state-2" state="2"></activity>
</view> </view>
<load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more> <load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>

768
pages/heartNew/heartNew.wxss
View File

@ -1,385 +1,385 @@
page { page {
width: 100%; width: 100%;
height: auto; height: auto;
overflow-y: auto; overflow-y: auto;
background: #f7f7f7; background: #f7f7f7;
} }
.header { .header {
position: fixed; position: fixed;
width: 100%; width: 100%;
top: 0; top: 0;
left: 0; left: 0;
z-index: 999; z-index: 999;
} }
.header .header-bg { .header .header-bg {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
z-index: 10; z-index: 10;
left: 0; left: 0;
top: 0; top: 0;
} }
.header .navigation { .header .navigation {
/* width: calc(100% - 46rpx); /* width: calc(100% - 46rpx);
margin-left: 46rpx; */ margin-left: 46rpx; */
display: flex; display: flex;
align-items: center; align-items: center;
/* justify-content: center; */ /* justify-content: center; */
position: relative; position: relative;
z-index: 100; z-index: 100;
} }
.header .navigation .goback { .header .navigation .goback {
width: 16rpx; width: 16rpx;
margin-left: 30rpx; margin-left: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.header .navigation .goback image { .header .navigation .goback image {
width: 16rpx; width: 16rpx;
height: 28rpx; height: 28rpx;
} }
.header .navigation .title { .header .navigation .title {
display: flex; display: flex;
align-items: center; align-items: center;
/* justify-content: center; */ /* justify-content: center; */
width: calc(100% - 46rpx); width: calc(100% - 46rpx);
margin-left: 46rpx; margin-left: 46rpx;
color: rgba(255, 255, 255, 0.9); color: rgba(255, 255, 255, 0.9);
font-size: 32rpx; font-size: 32rpx;
letter-spacing: 2rpx; letter-spacing: 2rpx;
} }
.header .navigation .title .title-right { .header .navigation .title .title-right {
/* margin-right: 46rpx; */ /* margin-right: 46rpx; */
} }
.home { .home {
width: 100%; width: 100%;
} }
.belong-grid { .belong-grid {
width: 100%; width: 100%;
height: 138rpx; height: 138rpx;
box-sizing: border-box; box-sizing: border-box;
padding-top: 16rpx; padding-top: 16rpx;
position: relative; position: relative;
} }
.belong-grid .newbelong-grid { .belong-grid .newbelong-grid {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
/* align-items: center; */ align-items: flex-end;
justify-content: space-between; justify-content: space-between;
} }
.belong-grid .belong-grid-bg { .belong-grid .belong-grid-bg {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 10; z-index: 10;
} }
.belong-grid .newbelong-grid .grid { .belong-grid .newbelong-grid .grid {
margin-left: 21rpx; margin-left: 28rpx;
/* width: 90%; */ /* width: 90%; */
width: calc(100% - 234rpx); width: calc(100% - 234rpx);
height: 62rpx; height: 62rpx;
position: relative; position: relative;
z-index: 100; z-index: 100;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.belong-grid .newbelong-grid .grid image { .belong-grid .newbelong-grid .grid image {
width: 100%; width: 532rpx;
height: 46rpx; height: 66rpx;
} }
.belong-grid .newbelong-grid .volunteer { .belong-grid .newbelong-grid .volunteer {
margin-right: 15rpx; margin-right: 15rpx;
width: 90rpx; width: 108rpx;
height: 62rpx; height: 68rpx;
position: relative; position: relative;
z-index: 100; z-index: 100;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.belong-grid .newbelong-grid .volunteer image { .belong-grid .newbelong-grid .volunteer image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
/* banner 样式 */ /* banner 样式 */
.banner-main { .banner-main {
position: absolute; position: absolute;
width: calc(100% - 60rpx); width: calc(100% - 60rpx);
height: 300rpx; height: 300rpx;
margin-left: 30rpx; margin-left: 30rpx;
background-color: #fff; background-color: #fff;
z-index: 997; z-index: 997;
margin-top: -36rpx; margin-top: -36rpx;
box-shadow: 0px 6px 21px 0px rgba(122, 122, 122, 0.23); box-shadow: 0px 6px 21px 0px rgba(122, 122, 122, 0.23);
border-radius: 17rpx; border-radius: 17rpx;
} }
.page-body { .page-body {
/* padding-top: 30rpx; */ /* padding-top: 30rpx; */
/* background: #fff; */ /* background: #fff; */
} }
.page-section { .page-section {
width: 100%; width: 100%;
margin-bottom: 60rpx; margin-bottom: 60rpx;
} }
.page-section_center { .page-section_center {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.page-section:last-child { .page-section:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.page-section-gap { .page-section-gap {
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
} }
.page-section-spacing { .page-section-spacing {
box-sizing: border-box; box-sizing: border-box;
/* padding: 0 20rpx; */ /* padding: 0 20rpx; */
height: 300rpx; height: 300rpx;
} }
swiper { swiper {
height: 300rpx; height: 300rpx;
} }
.page-section-title { .page-section-title {
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
margin-bottom: 10rpx; margin-bottom: 10rpx;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;
} }
.page-section-gap .page-section-title { .page-section-gap .page-section-title {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
} }
.demo-text-1 { .demo-text-1 {
position: relative; position: relative;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #1aad19; background-color: #1aad19;
color: #fff; color: #fff;
font-size: 36rpx; font-size: 36rpx;
} }
.demo-text-1:before { .demo-text-1:before {
content: 'A'; content: 'A';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.demo-text-2 { .demo-text-2 {
position: relative; position: relative;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #2782d7; background-color: #2782d7;
color: #fff; color: #fff;
font-size: 36rpx; font-size: 36rpx;
} }
.demo-text-2:before { .demo-text-2:before {
content: 'B'; content: 'B';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.demo-text-3 { .demo-text-3 {
position: relative; position: relative;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #f1f1f1; background-color: #f1f1f1;
color: #353535; color: #353535;
font-size: 36rpx; font-size: 36rpx;
} }
.demo-text-3:before { .demo-text-3:before {
content: 'C'; content: 'C';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
button { button {
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
button:last-child { button:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.page-section-title { .page-section-title {
padding: 0; padding: 0;
} }
.swiper-item { .swiper-item {
display: block; display: block;
height: 300rpx; height: 300rpx;
} }
.banner { .banner {
overflow: hidden; overflow: hidden;
height: 300rpx; height: 300rpx;
display: flex; display: flex;
width: 100%; width: 100%;
border-radius: 16rpx; border-radius: 16rpx;
} }
.dots { .dots {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: -23rpx; margin-top: -23rpx;
z-index: 999; z-index: 999;
position: relative; position: relative;
/* padding-bottom: 10rpx; */ /* padding-bottom: 10rpx; */
} }
.dots .dot { .dots .dot {
width: 20rpx; width: 20rpx;
height: 6rpx; height: 6rpx;
margin-left: 8rpx; margin-left: 8rpx;
background: rgba(247, 247, 247, 1); background: rgba(247, 247, 247, 1);
opacity: 0.38; opacity: 0.38;
border-radius: 3rpx; border-radius: 3rpx;
transition: all 0.3s; transition: all 0.3s;
} }
.dots .dot.active { .dots .dot.active {
width: 20rpx; width: 20rpx;
background: rgba(247, 247, 247, 1); background: rgba(247, 247, 247, 1);
border-radius: 3rpx; border-radius: 3rpx;
opacity: 1; opacity: 1;
/* background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%); */ /* background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%); */
} }
/* banner end */ /* banner end */
.tab-all { .tab-all {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 370rpx; height: 370rpx;
background-color: #fff; background-color: #fff;
z-index: 996; z-index: 996;
} }
.tab-bar { .tab-bar {
margin-top: 278rpx; margin-top: 278rpx;
width: 100%; width: 100%;
height: 92rpx; height: 92rpx;
background: #fff; background: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
} }
.tab-bar .tab { .tab-bar .tab {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
color: rgba(171, 171, 171, 1); color: rgba(171, 171, 171, 1);
width: 25%; width: 25%;
height: 100%; height: 100%;
line-height: 92rpx; line-height: 92rpx;
/* text-indent: 20rpx; */ /* text-indent: 20rpx; */
text-align: center; text-align: center;
position: relative; position: relative;
z-index: 10; z-index: 10;
} }
.tab-bar .tab.select { .tab-bar .tab.select {
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
color: rgba(229, 15, 0, 1); color: rgba(229, 15, 0, 1);
} }
.tab-bar .select-bar { .tab-bar .select-bar {
position: absolute; position: absolute;
left: 14rpx; left: 14rpx;
bottom: 0rpx; bottom: 0rpx;
width: 30rpx; width: 30rpx;
height: 8rpx; height: 8rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #fc5555; background: #fc5555;
z-index: 1; z-index: 1;
} }
.tab-bar .tab0.select-bar { .tab-bar .tab0.select-bar {
left: calc(12.5% - 15rpx); left: calc(12.5% - 15rpx);
transition: left 0.3s linear; transition: left 0.3s linear;
} }
.tab-bar .tab1.select-bar { .tab-bar .tab1.select-bar {
left: calc(37.5% - 15rpx); left: calc(37.5% - 15rpx);
transition: left 0.3s linear; transition: left 0.3s linear;
} }
.tab-bar .tab2.select-bar { .tab-bar .tab2.select-bar {
left: calc(62.5% - 15rpx); left: calc(62.5% - 15rpx);
transition: left 0.3s linear; transition: left 0.3s linear;
} }
.tab-bar .tab3.select-bar { .tab-bar .tab3.select-bar {
left: calc(87.5% - 15rpx); left: calc(87.5% - 15rpx);
transition: left 0.3s linear; transition: left 0.3s linear;
} }
.tab-bar .hover-tab { .tab-bar .hover-tab {
background: #f7f7f7; background: #f7f7f7;
} }
/* 内容 */ /* 内容 */
.details-top { .details-top {
margin-top: 385rpx; margin-top: 385rpx;
} }
.volunteer-box { .volunteer-box {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0rpx 40rpx 19rpx 40rpx; padding: 0rpx 40rpx 19rpx 40rpx;
} }
.show { .show {
padding: 0rpx 40rpx; padding: 0rpx 40rpx;
height: 24rpx; height: 24rpx;
font-size: 24rpx; font-size: 24rpx;
line-height: 24rpx; line-height: 24rpx;
font-weight: 500; font-weight: 500;
color: #C5C5C5; color: #C5C5C5;
} }

61
pages/indexNew/indexNew.js
View File

@ -72,6 +72,9 @@ Page({
loadMoreType: 'none', loadMoreType: 'none',
loadMoreVisible: false, loadMoreVisible: false,
defaultGridId:'',//默认网格 defaultGridId:'',//默认网格
leaderGridId:'', //领导网格6.22
completeInfoDialogVisible: false, //完善信息
homePagePhone: {}
}, },
onShow: function() { onShow: function() {
if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) { if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) {
@ -127,6 +130,14 @@ Page({
// 获取默认网格 // 获取默认网格
this.getResidentConfig() this.getResidentConfig()
api.getHomePhone().then( res => {
if (res.code === 0 && res.msg === 'success') {
this.data.homePagePhone = res.data[0]
this.setData({
homePagePhone: this.data.homePagePhone
})
}
})
}, },
// 获取默认网格 // 获取默认网格
getResidentConfig(){ getResidentConfig(){
@ -138,6 +149,10 @@ Page({
that.setData({ that.setData({
defaultGridId:item.residentValue defaultGridId:item.residentValue
}) })
} else if (item.residentType === 'default_grid' && item.residentCode === 'leader_grid') {
that.setData({
leaderGridId:item.residentValue
})
} }
}) })
} }
@ -508,6 +523,39 @@ Page({
}) })
} }
}, },
// 我有事阅 6.22
wysy() {
if(this.data.departmentId != this.data.leaderGridId){//领导网格处理
wx.showToast({
title: '无法使用该板块',
icon: 'none',
duration: 3000
})
}else{
if (this.verifyCompleteInfo()) {
return false
}
api.getScrip().then(res => {
if (res.code === 0 && res.msg === 'success') {
console.log('getScrip',res.data)
wx.navigateToMiniProgram({
appId: 'wx3ea0a6fb71ddf659',
path: 'pages/login/login?scrip='+res.data,
extraData: {
scrip: res.data
},
envVersion: 'trial',//trial //develop
success(res) {
console.log(res)
},
fail(err) {
console.log(err)
}
})
}
})
}
},
dqhd() { dqhd() {
wx.navigateTo({ wx.navigateTo({
url: `../../subpages/associationNew/pages/associationlist/associationlist` url: `../../subpages/associationNew/pages/associationlist/associationlist`
@ -560,7 +608,7 @@ Page({
// return false // return false
wx.showModal({ wx.showModal({
title: '拨打电话', title: '拨打电话',
content: `您确定拨打${e.currentTarget.dataset.number}`, content: ``,
cancelColor: '#29B9A5', cancelColor: '#29B9A5',
confirmColor: '#29B9A5', confirmColor: '#29B9A5',
success: (res) => { success: (res) => {
@ -574,5 +622,16 @@ Page({
} }
} }
}) })
},
// 检查 是否完善信息6.22
verifyCompleteInfo () {
if (app.globalData.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return true
} else {
return false
}
} }
}) })

17
pages/indexNew/indexNew.json
View File

@ -1,9 +1,10 @@
{ {
"navigationBarTitleText": "e锦水", "navigationBarTitleText": "e锦水",
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"usingComponents": { "usingComponents": {
"nav-bar": "/components/navbar/index", "nav-bar": "/components/navbar/index",
"load-more": "../../components/loadMore/loadMore" "load-more": "../../components/loadMore/loadMore",
} "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog"
}
} }

332
pages/indexNew/indexNew.wxml
View File

@ -1,163 +1,169 @@
<wxs module="filter" src="../../utils/filter.wxs"></wxs> <wxs module="filter" src="../../utils/filter.wxs"></wxs>
<view class="header" style="height: {{statusHeight + navigationHeight}}px;"> <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
<image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" /> <image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" />
<view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">e锦水</view> <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">e锦水</view>
</view> </view>
<view class="home" style="margin-top: {{statusHeight + navigationHeight}}px"> <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
<!--所属网格--> <!--所属网格-->
<view class="belong-grid"> <view class="belong-grid">
<image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" /> <image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" />
<view class="newbelong-grid"> <view class="newbelong-grid">
<view class="grid" bindtap="changeGrid"> <view class="grid" bindtap="changeGrid">
<image class="party-logo" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk1aAGwwcAAAFdGPP-1s507.png" /> <image class="party-logo" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk1aAGwwcAAAFdGPP-1s507.png" />
<view class="grid-name">{{departmentName}}</view> <view class="grid-name">{{departmentName}}</view>
<image class="more-grid" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk3uAAMMcAAADckZSIh0279.png" /> <image class="more-grid" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk3uAAMMcAAADckZSIh0279.png" />
</view> </view>
<view class="my-and-news"> <view class="my-and-news">
<image wx:if="{{infoObj.title == ''}}" bindtap="noMore" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" /> <image wx:if="{{infoObj.title == ''}}" bindtap="noMore" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" />
<image wx:else bindtap="toInfoList" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7161EWKAIXwXAAAD4DwRkd4543.png" /> <image wx:else bindtap="toInfoList" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7161EWKAIXwXAAAD4DwRkd4543.png" />
<!-- <image bindtap="toMine" class="my" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB716n_HiAZ9BOAAAIkMWBOnA191.png" /> --> <!-- <image bindtap="toMine" class="my" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB716n_HiAZ9BOAAAIkMWBOnA191.png" /> -->
</view> </view>
</view> </view>
<view class="newImage"> <view class="newImage">
<image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160_caAFDdeAACsQB7kto8691.png"></image> <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160_caAFDdeAACsQB7kto8691.png"></image>
</view> </view>
</view> </view>
<!-- banner swiperBannerList --> <!-- banner swiperBannerList -->
<view class="banner"> <view class="banner">
<swiper circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" current="{{currentIndex}}" bindchange="swiperChange"> <swiper circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" current="{{currentIndex}}" bindchange="swiperChange">
<swiper-item wx:for="{{swiperBannerList}}" wx:key="index" wx:for-index="index" wx:for-item="item"> <swiper-item wx:for="{{swiperBannerList}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="banner-item" data-id="{{item.id}}" data-url="{{item.url}}" data-newsflag="{{item.newsFlag}}" bindtap="navigatetoBannerDetail"> <view class="banner-item" data-id="{{item.id}}" data-url="{{item.url}}" data-newsflag="{{item.newsFlag}}" bindtap="navigatetoBannerDetail">
<image mode="aspectFill" class="banner-img" src="{{item.imgUrl}}" /> <image mode="aspectFill" class="banner-img" src="{{item.imgUrl}}" />
<view class="banner-content"> <view class="banner-content">
<view class="title"> <view class="title">
<view class="title-text">{{item.title}}</view> <view class="title-text">{{item.title}}</view>
</view> </view>
<view class="indication"> <view class="indication">
<block wx:for="{{swiperBannerList}}" wx:key="index"> <block wx:for="{{swiperBannerList}}" wx:key="index">
<view class="spot{{index == currentIndex? ' active' : ''}}"></view> <view class="spot{{index == currentIndex? ' active' : ''}}"></view>
</block> </block>
</view> </view>
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<!-- 通知 --> <!-- 通知 -->
<!-- <view class="notice"> <!-- <view class="notice">
<view class="left"> <view class="left">
<image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk6iAMXkjAAAJcTi5eUU272.png"></image> <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk6iAMXkjAAAJcTi5eUU272.png"></image>
<view class="circle"></view> <view class="circle"></view>
<view class="havenotice" wx:if="{{noticeList.length > 0}}"> <view class="havenotice" wx:if="{{noticeList.length > 0}}">
<view class="notice-broadcast-content" class="scrollNotice"> <view class="notice-broadcast-content" class="scrollNotice">
<view class="ul list swiper-wrapper" class="notice_list"> <view class="ul list swiper-wrapper" class="notice_list">
<view class="swiperview swiper-position"> <view class="swiperview swiper-position">
<swiper class="swiperitem" indicator-dots="true" autoplay="true" vertical="true" circular="true"> <swiper class="swiperitem" indicator-dots="true" autoplay="true" vertical="true" circular="true">
<block wx:for="{{noticeList}}" wx:key="index" wx:for-item="item" wx:for-index="index"> <block wx:for="{{noticeList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<swiper-item> <swiper-item>
<navigator url="/subpages/home/pages/noticeDetail/noticeDetail?id={{item.id}}"> <navigator url="/subpages/home/pages/noticeDetail/noticeDetail?id={{item.id}}">
<text class="swiper-txt">{{item.noticeTitle}}</text> <text class="swiper-txt">{{item.noticeTitle}}</text>
</navigator> </navigator>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
</view> </view>
</view> </view>
</view> </view>
</view> --> </view> -->
<!-- <view class="notice-info" wx:if="{{noticeList.length > 0}}">疫情防控社区、医疗机构防控网格图联系方···</view> --> <!-- <view class="notice-info" wx:if="{{noticeList.length > 0}}">疫情防控社区、医疗机构防控网格图联系方···</view> -->
<!-- </view> --> <!-- </view> -->
<!-- <view class="right"> <!-- <view class="right">
<image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk7iAHRq-AAAFYLGulzU493.png"></image> <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk7iAHRq-AAAFYLGulzU493.png"></image>
<view class="name" wx:if="{{noticeList.length > 0}}">{{noticeList.length}}</view> <view class="name" wx:if="{{noticeList.length > 0}}">{{noticeList.length}}</view>
<view class="name" wx:else>0</view> <view class="name" wx:else>0</view>
</view> --> </view> -->
<!-- </view> --> <!-- </view> -->
<view class="newnotice" bindtap="getPhone" data-number="87875655"> <view class="newnotice" bindtap="getPhone" data-number="{{homePagePhone.remark}}">
<image class="image1" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/14/rBAB717t5zeAR7mBAAAe8_LOKr8883.png"></image> <image class="image1" src="{{homePagePhone.imgUrl}}"></image>
<!-- <image class="image2" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161AbyAfYVeAAAdNklNbvM579.png"></image> --> <image class="image-call" src="../../images/home/call.png"></image>
<!-- <text></text> --> <!-- <image class="image2" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161AbyAfYVeAAAdNklNbvM579.png"></image> -->
</view> <!-- <text></text> -->
</view>
<!-- 我有话说 -->
<view class="grid-all-new"> <!-- 我有话说 -->
<button bindtap="wyss" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn"> <view class="grid-all-new">
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BRGARAefAAGNonPzguk041.png'></image> <button bindtap="wyss" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:if="{{departmentId != leaderGridId}}">
</button> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BRGARAefAAGNonPzguk041.png'></image>
<view class="weui-btn-right"> </button>
<button bindtap="goheart" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn"> <button bindtap="wysy" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:else>
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BqiAGT25AADji64eXU8518.png'></image> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/16/rBAB717xXhKATMiMAAAvjvVWdAA612.png'></image>
</button> </button>
<button bindtap="dqhd" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn"> <view class="weui-btn-right">
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169FteAZi7IAACvNYI5st0319.png'></image> <button bindtap="goheart" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
<!-- <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161Bt2ALFoDAADqKvNuMrQ441.png'></image> --> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BqiAGT25AADji64eXU8518.png'></image>
</button> </button>
</view> <button bindtap="dqhd" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
</view> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169FteAZi7IAACvNYI5st0319.png'></image>
<!-- <view class="grid-all"> <!-- <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161Bt2ALFoDAADqKvNuMrQ441.png'></image> -->
<button bindtap="wyss" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn"> </button>
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nki6AIOnKAAEFtEe51uE843.png'></image> </view>
</button> </view>
<!-- <view class="grid-all">
<button bindtap="dqhd" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn"> <button bindtap="wyss" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkqeAFhyBAAEedWqz2eE440.png'></image> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nki6AIOnKAAEFtEe51uE843.png'></image>
</button> </button>
<button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn"> <button bindtap="dqhd" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkrqAB9DJAAEx8Bq_7R8226.png'></image> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkqeAFhyBAAEedWqz2eE440.png'></image>
</button> </button>
<button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn"> <button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nks6ALQtRAAExnBUFGQs281.png'></image> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkrqAB9DJAAEx8Bq_7R8226.png'></image>
</button> </button>
</view> -->
<!-- 九宫格 --> <button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
<view class="grid-new"> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nks6ALQtRAAExnBUFGQs281.png'></image>
<view class="grid-new-item"> </button>
<button bindtap="gointegralCentre" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn"> </view> -->
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161B_qAe-m2AAChh4x0hS4857.png'></image> <!-- 九宫格 -->
</button> <view class="grid-new">
<view class="grid-new-text">积分排名</view> <view class="grid-new-item">
</view> <button bindtap="gointegralCentre" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
<view class="grid-new-item"> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161B_qAe-m2AAChh4x0hS4857.png'></image>
<button bindtap="moreNotice" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn"> </button>
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161ChOAayOhAACQGnm1tII484.png'></image> <view class="grid-new-text">积分排名</view>
</button> </view>
<view class="grid-new-text">政策导航</view> <view class="grid-new-item">
</view> <button bindtap="moreNotice" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
<view class="grid-new-item"> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161ChOAayOhAACQGnm1tII484.png'></image>
<button bindtap="toUnderstandJs" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn"> </button>
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161CkmAQ8ljAACCxDg25qk058.png'></image> <view class="grid-new-text">政策导航</view>
</button> </view>
<view class="grid-new-text">了解锦水</view> <view class="grid-new-item">
</view> <button bindtap="toUnderstandJs" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
<view class="grid-new-item"> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161CkmAQ8ljAACCxDg25qk058.png'></image>
<button bindtap="toMine" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn"> </button>
<image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161Co6AYOnYAACU4vWwdsU999.png'></image> <view class="grid-new-text">了解锦水</view>
</button> </view>
<view class="grid-new-text">个人中心</view> <view class="grid-new-item">
</view> <button bindtap="toMine" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
</view> <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161Co6AYOnYAACU4vWwdsU999.png'></image>
<!-- 列表 --> </button>
<view class="list-all"> <view class="grid-new-text">个人中心</view>
<view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{newsList}}" data-id="{{item.id}}" bindtap="toDetail"> </view>
<view class="item-info"> </view>
<view class="item-info-name">{{item.newsTitle}} <!-- 列表 -->
</view> <view class="list-all">
<view class="item-info-time"> <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{newsList}}" data-id="{{item.id}}" bindtap="toDetail">
<text>{{item.deptName}}-{{item.newsCategoryName}}</text> <view class="item-info">
<text>{{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}}</text> <view class="item-info-name">{{item.newsTitle}}
</view> </view>
</view> <view class="item-info-time">
<image src="{{item.newsImageUrl}}"></image> <text>{{item.deptName}}-{{item.newsCategoryName}}</text>
<view wx:if="{{item.readFlag === '0'}}" class="label"> <text>{{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}}</text>
<image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169_pSALSbKAAALvZBEa2A131.png"></image> </view>
</view> </view>
</view> <image src="{{item.newsImageUrl}}"></image>
</view> <view wx:if="{{item.readFlag === '0'}}" class="label">
<!-- <view hidden="{{nomorenews}}" class="nomorenews">没有更多了~</view> --> <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169_pSALSbKAAALvZBEa2A131.png"></image>
<!--加载更多提示--> </view>
<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more> </view>
</view> </view>
<!-- <view hidden="{{nomorenews}}" class="nomorenews">没有更多了~</view> -->
<!--加载更多提示-->
<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
</view>
<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>

1260
pages/indexNew/indexNew.wxss
View File

File diff suppressed because it is too large

4
project.config.json
View File

@ -22,9 +22,9 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false,
"useIsolateContext": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",

467
subpages/integralCentre/pages/index/index.js
View File

@ -1,232 +1,237 @@
// subpages/integralCentre/pages/index/index.js // subpages/integralCentre/pages/index/index.js
import { import {
pointsRecordlist, pointsRecordlist,
pointsRankinglist, pointsRankinglist,
userPointsRankinglist userPointsRankinglist
} from '../../../../utils/api' } from '../../../../utils/api'
import { import {
getTimestamp getTimestamp
} from '../../../../utils/common' } from '../../../../utils/common'
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
nodatapointsRecord: false, nodatapointsRecord: false,
nodatapointsRanking: false, nodatapointsRanking: false,
points: 0, //积分 points: 0, //积分
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
pointsRecordlist: [], //积分记录列表 pointsRecordlist: [], //积分记录列表
pointsRankinglist: [], //积分排行 pointsRankinglist: [], //积分排行
rankingType: 0, //排名方式 rankingType: 0, //排名方式
selectTab: 'tab1', selectTab: 'tab1',
typeList: [{ //排名方式：0-周，1-月 typeList: [{ //排名方式：0-周，1-月
type: '0', type: '0',
name: '网格排名', name: '网格排名',
select: true select: true
}, },
{ {
type: '1', type: '1',
name: '街道排名', name: '街道排名',
select: false select: false
} },
], {
timestamp: getTimestamp(), type: '2',
loadMoreType: 'none', name: '等级排名',
loadMoreVisible: false, select: false
}, }
/** ],
* 生命周期函数--监听页面加载 timestamp: getTimestamp(),
*/ loadMoreType: 'none',
onLoad: function(options) { loadMoreVisible: false,
this.setData({ //前面页面传过来的积分总数 },
points: options.points /**
}) * 生命周期函数--监听页面加载
this.pointsRankinglist(); //初始化加载积分记录列表 */
}, onLoad: function(options) {
// tab 切换 this.setData({ //前面页面传过来的积分总数
onTabChange(e) { points: options.points
this.setData({ })
pageIndex: 1, this.pointsRankinglist(); //初始化加载积分记录列表
pageSize: 15, },
loadMoreType: 'loading', // tab 切换
loadMoreVisible: true, onTabChange(e) {
pointsRecordlist: [], this.setData({
pointsRankinglist: [], pageIndex: 1,
pointsRankingUser: {},//当前用户排名信息 pageSize: 15,
selectTab: e.currentTarget.dataset.tab, loadMoreType: 'loading',
nodatapointsRecord: false, loadMoreVisible: true,
nodatapointsRanking: false, pointsRecordlist: [],
}) pointsRankinglist: [],
if (this.data.selectTab == 'tab1') { pointsRankingUser: {},//当前用户排名信息
this.pointsRankinglist(); //积分排行 selectTab: e.currentTarget.dataset.tab,
} else { nodatapointsRecord: false,
this.pointsRecordlist(); //初始化加载积分记录列表 nodatapointsRanking: false,
} })
}, if (this.data.selectTab == 'tab1') {
// 排行切换 this.pointsRankinglist(); //积分排行
onButtonChange: function(e) { } else {
const list = this.data.typeList this.pointsRecordlist(); //初始化加载积分记录列表
let that = this; }
list.forEach(item => { },
if (item.type === e.currentTarget.dataset.type) { // 排行切换
item.select = true onButtonChange: function(e) {
} else { const list = this.data.typeList
item.select = false let that = this;
} list.forEach(item => {
}) if (item.type === e.currentTarget.dataset.type) {
that.setData({ item.select = true
typeList: list, } else {
rankingType: e.currentTarget.dataset.type, item.select = false
pageIndex: 1, }
pageSize: 15, })
timestamp: this.data.timestamp, that.setData({
pointsRankinglist: [], typeList: list,
nodatapointsRanking: false, rankingType: e.currentTarget.dataset.type,
loadMoreType: 'loading', pageIndex: 1,
loadMoreVisible: true, pageSize: 15,
}) timestamp: this.data.timestamp,
pointsRankinglist: [],
that.pointsRankinglist() nodatapointsRanking: false,
}, loadMoreType: 'loading',
loadMoreVisible: true,
// 积分记录-积分排行接口 })
pointsRankinglist() {
let that = this that.pointsRankinglist()
const para = { },
pageIndex: 1,
pageSize: 20, // 积分记录-积分排行接口
timestamp: this.data.timestamp, pointsRankinglist() {
rankingType: this.data.rankingType, //排名方式：0-周，1-月 let that = this
} const para = {
userPointsRankinglist(para).then(res => { pageIndex: 1,
that.setData({ pageSize: 20,
pointsRankingUser: res.data.currentUser, timestamp: this.data.timestamp,
pointsRankinglist: that.data.pointsRankinglist.concat(res.data.rank), rankingType: this.data.rankingType, //排名方式：0-周，1-月
}) }
if (that.data.pointsRankinglist.length > 0) { userPointsRankinglist(para).then(res => {
that.setData({ that.setData({
nodatapointsRanking: false, pointsRankingUser: res.data.currentUser,
loadMoreType: 'none', pointsRankinglist: that.data.pointsRankinglist.concat(res.data.rank),
}) })
} else { if (that.data.pointsRankinglist.length > 0) {
that.setData({ that.setData({
nodatapointsRanking: true, nodatapointsRanking: false,
loadMoreType: 'none', loadMoreType: 'none',
loadMoreVisible: false, })
}) } else {
} that.setData({
}).catch(err => { nodatapointsRanking: true,
that.setData({ loadMoreType: 'none',
pointsRankinglist: [], loadMoreVisible: false,
nodatapointsRanking: true, })
loadMoreType: 'none', }
loadMoreVisible: false, }).catch(err => {
}) that.setData({
console.log(err) pointsRankinglist: [],
}) nodatapointsRanking: true,
}, loadMoreType: 'none',
loadMoreVisible: false,
// 积分记录-积分记录接口 })
pointsRecordlist() { console.log(err)
let that = this })
const para = { },
pageIndex: this.data.pageIndex,
pageSize: this.data.pageSize, // 积分记录-积分记录接口
timestamp: this.data.timestamp, pointsRecordlist() {
} let that = this
pointsRecordlist(para).then(res => { const para = {
that.setData({ pageIndex: this.data.pageIndex,
pointsRecordlist: that.data.pointsRecordlist.concat(res.data), pageSize: this.data.pageSize,
loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none', timestamp: this.data.timestamp,
}) }
if (that.data.pointsRecordlist.length > 0) { pointsRecordlist(para).then(res => {
that.setData({ that.setData({
nodatapointsRecord: false, pointsRecordlist: that.data.pointsRecordlist.concat(res.data),
}) loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
} else { })
that.setData({ if (that.data.pointsRecordlist.length > 0) {
nodatapointsRecord: true, that.setData({
loadMoreVisible: false, nodatapointsRecord: false,
}) })
} } else {
}).catch(err => { that.setData({
that.setData({ nodatapointsRecord: true,
loadMoreType: 'none', loadMoreVisible: false,
loadMoreVisible: false, })
pointsRecordlist: [], }
nodatapointsRecord: true, }).catch(err => {
}) that.setData({
console.log(err) loadMoreType: 'none',
}) loadMoreVisible: false,
}, pointsRecordlist: [],
nodatapointsRecord: true,
})
console.log(err)
})
/** },
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
}, /**
* 生命周期函数--监听页面初次渲染完成
/** */
* 生命周期函数--监听页面显示 onReady: function() {
*/
onShow: function(options) {}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面显示
*/ */
onHide: function() { onShow: function(options) {},
}, /**
* 生命周期函数--监听页面隐藏
/** */
* 生命周期函数--监听页面卸载 onHide: function() {
*/
onUnload: function() { },
}, /**
* 生命周期函数--监听页面卸载
/** */
* 页面相关事件处理函数--监听用户下拉动作 onUnload: function() {
*/
onPullDownRefresh: function() { },
}, /**
* 页面相关事件处理函数--监听用户下拉动作
/** */
* 页面上拉触底事件的处理函数 onPullDownRefresh: function() {
*/
onReachBottom: function() { },
this.setData({
loadMoreVisible: true /**
}) * 页面上拉触底事件的处理函数
*/
if (this.data.selectTab == 'tab1') { onReachBottom: function() {
// this.pointsRankinglist(); //积分排行 this.setData({
} else { loadMoreVisible: true
})
if (this.data.loadMoreType === 'loading') {
this.setData({ if (this.data.selectTab == 'tab1') {
pageIndex: this.data.pageIndex + 1, // this.pointsRankinglist(); //积分排行
pageSize: this.data.pageSize, } else {
timestamp: this.data.timestamp,
nodatapointsRecord: false, if (this.data.loadMoreType === 'loading') {
}) this.setData({
this.pointsRecordlist(); //初始化加载积分记录列表 pageIndex: this.data.pageIndex + 1,
} pageSize: this.data.pageSize,
} timestamp: this.data.timestamp,
}, nodatapointsRecord: false,
})
/** this.pointsRecordlist(); //初始化加载积分记录列表
* 用户点击右上角分享 }
*/ }
onShareAppMessage: function() { },
} /**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
}) })

54
utils/activity.js
View File

@ -1,28 +1,28 @@
var fly = require('./request.js') var fly = require('./request.js')
module.exports = { module.exports = {
getActivityList: getActivityList, getActivityList: getActivityList,
bannerList, bannerList,
bannerListV2, bannerListV2,
volunteerlist, volunteerlist,
getImgUrl getImgUrl
} }
function getActivityList(params) { function getActivityList(params) {
return fly.get('heart/act/list', params) return fly.get('heart/act/list', params)
} }
function bannerList(params) { function bannerList(params) {
return fly.get('heart/act/banner/list',params) return fly.get('heart/act/banner/list',params)
} }
function bannerListV2() { function bannerListV2() {
return fly.get('heart/actbanner/banner/list') return fly.get('heart/actbanner/banner/list')
} }
// 志愿者列表 // 志愿者列表
function volunteerlist(params) { function volunteerlist(params) {
return fly.get('app-user/volunteer/list',params) return fly.get('app-user/volunteer/list',params)
} }
// 获取配置图片 // 获取配置图片
function getImgUrl(imgType) { function getImgUrl(imgType) {
return fly.get(`imgConfig/getImgUrl/${imgType}`) return fly.get(`imgConfig/getImgUrl/${imgType}`)
} }

1016
utils/api.js
View File

File diff suppressed because it is too large

56
utils/config.js
View File

@ -1,28 +1,28 @@
module.exports = { module.exports = {
BASEURL: BASEURL, BASEURL: BASEURL,
WEBROOT: WEBROOT, WEBROOT: WEBROOT,
Token: getToken, Token: getToken,
userId: "" userId: ""
}; };
function BASEURL() { function BASEURL() {
// return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
// return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
// return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址
// return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
// return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
} }
function WEBROOT() { function WEBROOT() {
// return "http://10.10.10.117:8080/#/" // 本地 h5前端地址 // return "http://10.10.10.117:8080/#/" // 本地 h5前端地址
return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址 return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址
// return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址 // return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址
// return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址 // return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址
// return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址 // return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址
} }
function getToken() { function getToken() {
return wx.getStorageSync("token"); return wx.getStorageSync("token");
} }

Write Preview
Loading…
Cancel
Save