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

eslint 校验

master
lihenian 5 years ago
parent
60ded2d86a f23124df85
commit
143ae0df9f
19 changed files with 1617 additions and 1435 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. 3
      app.json
  2. 6
      components/activity/activity.js
  3. 76
      components/activity/activity.wxml
  4. BIN
      images/home/call.png
  5. 23
      pages/heartNew/heartNew.js
  6. 178
      pages/heartNew/heartNew.wxml
  7. 768
      pages/heartNew/heartNew.wxss
  8. 61
      pages/indexNew/indexNew.js
  9. 17
      pages/indexNew/indexNew.json
  10. 332
      pages/indexNew/indexNew.wxml
  11. 1260
      pages/indexNew/indexNew.wxss
  12. 2
      pages/toRegister/toRegister.js
  13. 2
      project.config.json
  14. 59
      subpages/integralCentre/pages/index/index.js
  15. 144
      subpages/integralCentre/pages/index/index.wxml
  16. 11
      subpages/understandJs/pages/archives/archives.js
  17. 58
      subpages/understandJs/pages/archives/archives.wxml
  18. 14
      subpages/understandJs/pages/index/index.js
  19. 38
      utils/api.js

3
app.json
View File

@ -67,7 +67,8 @@
"pages/gOfficialsList/gOfficialsList", "pages/gOfficialsList/gOfficialsList",
"pages/talklist/talklist", "pages/talklist/talklist",
"pages/eventlist/eventlist", "pages/eventlist/eventlist",
"pages/addTopic/addTopic" "pages/addTopic/addTopic",
"pages/guideInfo/guideInfo"
] ]
}, },
{ {

6
components/activity/activity.js
View File

@ -1,8 +1,7 @@
var api = require("../../utils/activity.js") var api = require("../../utils/activity.js")
Component({ Component({
properties: { properties: {
state: Number state: Number,
}, },
data: { data: {
activityList: [], activityList: [],
@ -32,7 +31,7 @@ Component({
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
@ -73,5 +72,4 @@ Component({
}) })
} }
} }
}) })

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

23
pages/heartNew/heartNew.js
View File

@ -277,7 +277,7 @@ Page({
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]
}) })
}) })
}, },
@ -344,4 +344,25 @@ Page({
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

@ -71,6 +71,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) {
@ -126,6 +129,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 (){
@ -137,6 +148,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
})
} }
}) })
} }
@ -415,6 +430,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"
@ -467,7 +515,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) => {
@ -481,5 +529,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

2
pages/toRegister/toRegister.js
View File

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

2
project.config.json
View File

@ -65,7 +65,7 @@
"id": 0, "id": 0,
"name": "带参数二维码", "name": "带参数二维码",
"pathName": "pages/index/index", "pathName": "pages/index/index",
"query": "scene=1215152928323555330&inviteUserId=12345", "query": "scene=1277169327606366209&inviteUserId=12345",
"scene": 1011 "scene": 1011
}, },
{ {

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

@ -1,7 +1,8 @@
// subpages/integralCentre/pages/index/index.js // subpages/integralCentre/pages/index/index.js
import { import {
pointsRecordlist, pointsRecordlist,
userPointsRankinglist userPointsRankinglist,
gradeRankinglist
} from "../../../../utils/api" } from "../../../../utils/api"
import { import {
getTimestamp getTimestamp
@ -30,11 +31,16 @@ Page({
type: "1", type: "1",
name: "街道排名", name: "街道排名",
select: false select: false
},
{
type: "2",
name: "等级排名",
select: false
} }
], ],
timestamp: getTimestamp(), timestamp: getTimestamp(),
loadMoreType: "none", loadMoreType: "none",
loadMoreVisible: false, loadMoreVisible: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
@ -87,8 +93,11 @@ Page({
loadMoreType: "loading", loadMoreType: "loading",
loadMoreVisible: true, loadMoreVisible: true,
}) })
if ( e.currentTarget.dataset.type == "2") {
that.pointsRankinglist() that.gradeRankinglist()
} else {
that.pointsRankinglist()
}
}, },
// 积分记录-积分排行接口 // 积分记录-积分排行接口
@ -172,6 +181,11 @@ Page({
}, },
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {},
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
@ -200,11 +214,9 @@ Page({
this.setData({ this.setData({
loadMoreVisible: true loadMoreVisible: true
}) })
if (this.data.selectTab == "tab1") { if (this.data.selectTab == "tab1") {
// this.pointsRankinglist(); //积分排行 // this.pointsRankinglist(); //积分排行
} else { } else {
if (this.data.loadMoreType === "loading") { if (this.data.loadMoreType === "loading") {
this.setData({ this.setData({
pageIndex: this.data.pageIndex + 1, pageIndex: this.data.pageIndex + 1,
@ -217,6 +229,41 @@ Page({
} }
}, },
//6.28 等级排行榜
gradeRankinglist () {
let that = this
const para = {
pageIndex: 1,
pageSize: 20,
timestamp: getTimestamp()
}
gradeRankinglist(para).then(res => {
that.setData({
pointsRankingUser: res.data.currentUser,
pointsRankinglist: that.data.pointsRankinglist.concat(res.data.rank),
})
if (that.data.pointsRankinglist.length > 0) {
that.setData({
nodatapointsRanking: false,
loadMoreType: "none",
})
} else {
that.setData({
nodatapointsRanking: true,
loadMoreType: "none",
loadMoreVisible: false,
})
}
}).catch(err => {
that.setData({
pointsRankinglist: [],
nodatapointsRanking: true,
loadMoreType: "none",
loadMoreVisible: false,
})
console.log(err)
})
},
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */

144
subpages/integralCentre/pages/index/index.wxml
View File

@ -1,73 +1,73 @@
<view class="home"> <view class="home">
<view class='title'> <view class='title'>
<text class="number">{{points}}</text> <text class="number">{{points}}</text>
<text class="name">积分</text> <text class="name">积分</text>
</view> </view>
<!-- tabbar --> <!-- tabbar -->
<view class="tab-bar"> <view class="tab-bar">
<view class="tab tab1 {{selectTab === 'tab1' ? 'select-tab' : ''}}" data-tab="tab1" bindtap="onTabChange">积分排行 </view> <view class="tab tab1 {{selectTab === 'tab1' ? 'select-tab' : ''}}" data-tab="tab1" bindtap="onTabChange">积分排行 </view>
<view class="tab tab2 {{selectTab === 'tab2' ? 'select-tab' : ''}}" data-tab="tab2" bindtap="onTabChange">积分记录</view> <view class="tab tab2 {{selectTab === 'tab2' ? 'select-tab' : ''}}" data-tab="tab2" bindtap="onTabChange">积分记录</view>
<view class="select-bar {{selectTab === 'tab1' ? 'tab1' : 'tab2'}}"></view> <view class="select-bar {{selectTab === 'tab1' ? 'tab1' : 'tab2'}}"></view>
</view> </view>
<!-- 积分排行 --> <!-- 积分排行 -->
<block wx:if="{{selectTab === 'tab1'}}"> <block wx:if="{{selectTab === 'tab1'}}">
<view class="Top"></view> <view class="Top"></view>
<view class="tab-item"> <view class="tab-item">
<button wx:for="{{typeList}}" wx:key="index" wx:for-index="index" bindtap="onButtonChange" hover-class="hover-btn" data-type="{{item.type}}" id="item-{{ item.type }}" class="{{item.select ? 'font-w' : 'font-b'}}"> <button wx:for="{{typeList}}" wx:key="index" wx:for-index="index" bindtap="onButtonChange" hover-class="hover-btn" data-type="{{item.type}}" id="item-{{ item.type }}" class="{{item.select ? 'font-w' : 'font-b'}}">
{{item.name}} {{item.name}}
</button> </button>
</view> </view>
<view class="ph-list" wx:if="{{pointsRankingUser}}"> <view class="ph-list" wx:if="{{pointsRankingUser}}">
<view class="left"> <view class="left">
<!-- 左边图片 --> <!-- 左边图片 -->
<view class="left-img"> <view class="left-img">
<view class="list-number_frist">{{pointsRankingUser.rank}}</view> <view class="list-number_frist">{{pointsRankingUser.rank}}</view>
</view> </view>
<!-- 名字 --> <!-- 名字 -->
<view class="list-name">{{pointsRankingUser.realName}}</view> <view class="list-name">{{pointsRankingUser.realName||pointsRankingUser.nickName}}</view>
</view> </view>
<view class="right">{{pointsRankingUser.points}}</view> <view class="right">{{pointsRankingUser.points||pointsRankingUser.grade}}</view>
</view> </view>
<view class="warning">注：该排行仅显示已完善信息用户</view> <view class="warning">注：该排行仅显示已完善信息用户</view>
<!-- <view class="marginTop"></view> --> <!-- <view class="marginTop"></view> -->
<view class="ph-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{pointsRankinglist}}"> <view class="ph-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{pointsRankinglist}}">
<view class="left"> <view class="left">
<!-- 左边图片 --> <!-- 左边图片 -->
<view class="left-img"> <view class="left-img">
<!-- <image class="img-bg" wx:if="{{index == 0}}" src="../../images/first.png"></image> <!-- <image class="img-bg" wx:if="{{index == 0}}" src="../../images/first.png"></image>
<image class="img-bg" wx:elif="{{index == 1}}" src="../../images/second.png"></image> <image class="img-bg" wx:elif="{{index == 1}}" src="../../images/second.png"></image>
<image class="img-bg" wx:elif="{{index == 2}}" src="../../images/third.png"></image> --> <image class="img-bg" wx:elif="{{index == 2}}" src="../../images/third.png"></image> -->
<!-- <image class="img-bg" wx:else src="../../images/fourth.png"></image> --> <!-- <image class="img-bg" wx:else src="../../images/fourth.png"></image> -->
<!-- <view wx:if="{{index < 3}}" class="list-number">{{item.rank}}</view> --> <!-- <view wx:if="{{index < 3}}" class="list-number">{{item.rank}}</view> -->
<view class="{{index < 3 ? 'list-number_frist' : 'list-number_'}} {{index===0 ? 'color1_' : index===1 ? 'color2_' : index===2 ? 'color2_' : ''}}">{{item.rank}}</view> <view class="{{index < 3 ? 'list-number_frist' : 'list-number_'}} {{index===0 ? 'color1_' : index===1 ? 'color2_' : index===2 ? 'color2_' : ''}}">{{item.rank}}</view>
</view> </view>
<!-- 名字 --> <!-- 名字 -->
<view class="list-name">{{item.realName}}</view> <view class="list-name">{{item.realName||item.nickName}}</view>
</view> </view>
<view class="right">{{item.points}}</view> <view class="right">{{item.points||item.grade}}</view>
</view> </view>
<no-data isShow="{{nodatapointsRanking}}"></no-data> <no-data isShow="{{nodatapointsRanking}}"></no-data>
</block> </block>
<!-- 积分记录 --> <!-- 积分记录 -->
<block wx:else> <block wx:else>
<view class="Top"></view> <view class="Top"></view>
<view class="jf-title"> <view class="jf-title">
<view class="jf-title-item">事件名称</view> <view class="jf-title-item">事件名称</view>
<view class="jf-title-item-two">积分</view> <view class="jf-title-item-two">积分</view>
<view class="jf-title-item-last">时间</view> <view class="jf-title-item-last">时间</view>
</view> </view>
<!-- 积分记录列表 --> <!-- 积分记录列表 -->
<view class="jf-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{pointsRecordlist}}"> <view class="jf-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{pointsRecordlist}}">
<view class="jf-list-li color1">{{item.ruleDesc}}</view> <view class="jf-list-li color1">{{item.ruleDesc}}</view>
<view class="jf-list-li-two color2"> <view class="jf-list-li-two color2">
<text wx:if="{{item.operationType == 0}}">-</text> <text wx:if="{{item.operationType == 0}}">-</text>
<text wx:else>+</text>{{item.points}}</view> <text wx:else>+</text>{{item.points}}</view>
<view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view> <view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view>
</view> </view>
<no-data isShow="{{nodatapointsRecord}}"></no-data> <no-data isShow="{{nodatapointsRecord}}"></no-data>
</block> </block>
<!--加载更多提示--> <!--加载更多提示-->
<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more> <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
</view> </view>

11
subpages/understandJs/pages/archives/archives.js
View File

@ -11,6 +11,9 @@ Page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function () {
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
@ -59,5 +62,13 @@ Page({
*/ */
onShareAppMessage: function () { onShareAppMessage: function () {
},
searchFile () {
wx.showToast({
title: "未查询到相关档案",
icon: "none",
duration: 2000
})
} }
}) })

58
subpages/understandJs/pages/archives/archives.wxml
View File

@ -1,29 +1,29 @@
<view class="mian"> <view class="mian">
<view class="search"> <view class="search">
<view class="item-all"> <view class="item-all">
<view class="item-left"> <view class="item-left">
<image src="../../images/search.png"></image> <image src="../../images/search.png"></image>
<input placeholder-class="placeholder-style" placeholder="输入档案关键字"></input> <input placeholder-class="placeholder-style" placeholder="输入档案关键字"></input>
</view> </view>
<button class="item-right">搜索</button> <button class="item-right" bindtap="searchFile">搜索</button>
</view> </view>
</view> </view>
</view> </view>
<view class="list-item"> <!-- <view class="list-item">
<view class="list-name">玫瑰街道医疗物质采购档案</view> <view class="list-name">玫瑰街道医疗物质采购档案</view>
<view class="list-position"> <view class="list-position">
<image src="../../images/wenjian.png"></image> <image src="../../images/wenjian.png"></image>
<view class="list-position-name">存放位置：玫瑰街道档案室</view> <view class="list-position-name">存放位置：玫瑰街道档案室</view>
</view> </view>
</view> </view>
<view class="list-item"> <view class="list-item">
<view class="list-name">玫瑰街道医疗物质采购档案</view> <view class="list-name">玫瑰街道医疗物质采购档案</view>
<view class="list-position"> <view class="list-position">
<image src="../../images/wenjian.png"></image> <image src="../../images/wenjian.png"></image>
<view class="list-position-name">存放位置：玫瑰街道档案室</view> <view class="list-position-name">存放位置：玫瑰街道档案室</view>
</view> </view>
</view> </view> -->

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

@ -85,14 +85,14 @@ Page({
url: `../sclerotia/sclerotia?modulecode=${e.currentTarget.dataset.modulecode}` url: `../sclerotia/sclerotia?modulecode=${e.currentTarget.dataset.modulecode}`
}) })
} else if (e.currentTarget.dataset.modulecode == "module_file") {//档案 } else if (e.currentTarget.dataset.modulecode == "module_file") {//档案
wx.showToast({ // wx.showToast({
title: "敬请期待", // title: '敬请期待',
icon: "none", // icon: 'none',
duration: 1000 // duration: 1000
})
// wx.navigateTo({
// url: '../archives/archives'
// }) // })
wx.navigateTo({
url: "../archives/archives"
})
} }
} }
}) })

38
utils/api.js
View File

@ -52,7 +52,10 @@ module.exports = {
completePartyInfoV2: completePartyInfoV2, completePartyInfoV2: completePartyInfoV2,
userPointsRankinglist:userPointsRankinglist, userPointsRankinglist:userPointsRankinglist,
getDefaultGridInfo:getDefaultGridInfo, getDefaultGridInfo:getDefaultGridInfo,
getResidentConfig:getResidentConfig getResidentConfig:getResidentConfig,
getScrip:getScrip,
getHomePhone:getHomePhone,
gradeRankinglist:gradeRankinglist
} }
function getToken (wxCode) { function getToken (wxCode) {
@ -169,7 +172,7 @@ function changeGrid (gridId) {
* @param {*} param0 * @param {*} param0
*/ */
// function getUserInfo() { // function getUserInfo() {
// return fly.get("/app-user/user/getInfoById") // return fly.get('/app-user/user/getInfoById')
// } // }
function getUserInfo () { function getUserInfo () {
return fly.get("app-user/user/getInfoById") return fly.get("app-user/user/getInfoById")
@ -383,7 +386,7 @@ function clock (data) {
// * 志愿者认证 // * 志愿者认证
// */ // */
// function authenticate(data) { // function authenticate(data) {
// return fly.post("app-user/volunteer/authenticate", data) // return fly.post('app-user/volunteer/authenticate', data)
// } // }
/** /**
@ -484,4 +487,33 @@ function getDefaultGridInfo () {
// 获取居民端配置 // 获取居民端配置
function getResidentConfig () { function getResidentConfig () {
return fly.get("residentConfig/getResidentConfig") return fly.get("residentConfig/getResidentConfig")
}
// *****************************获取临时凭证接口****6.22***************end
// 获取临时凭证用于跳转到数据端
function getScrip () {
return fly.post("admin/getScrip")
}
// 获取首页电话
function getHomePhone () {
return fly.get("imgConfig/getImgUrl/3")
}
/**
* 积分记录-等级排行接口 6.28
* timestamp String 第一页查询发起时的时间
* pageIndex Number 页码
* pageSize Number 页容量
*/
function gradeRankinglist ({
timestamp,
pageIndex,
pageSize
}) {
return fly.get("app-user/user/gradeRanking/list", {
timestamp,
pageIndex,
pageSize
})
} }
Write Preview
Loading…
Cancel
Save