Browse Source

Merge branch 'feature/point' into release

* feature/point:
  chore:修改接口地址
  feat:新增积分核销功能
release
FightingN 5 years ago
parent
commit
5796675ed7
  1. 25
      api/integralCentre.js
  2. 377
      app.json
  3. 4
      components/loadMore/loadMore.js
  4. 2
      components/loadMore/loadMore.wxml
  5. 2
      pages/toRegister/toRegister.js
  6. 26
      project.config.json
  7. BIN
      subpages/integralCentre/images/code.png
  8. BIN
      subpages/integralCentre/images/exchange.png
  9. 79
      subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js
  10. 9
      subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json
  11. 33
      subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml
  12. 113
      subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss
  13. 68
      subpages/integralCentre/pages/index/index.js
  14. 3
      subpages/integralCentre/pages/index/index.json
  15. 29
      subpages/integralCentre/pages/index/index.wxml
  16. 49
      subpages/integralCentre/pages/index/index.wxss
  17. 5
      utils/config.js

25
api/integralCentre.js

@ -0,0 +1,25 @@
const request = require("../utils/request")
/**
* 获取积分核销兑换码
*/
export function getCode() {
return request.get("userpointsverification/getqrcode")
}
/**
* 获取居民兑换记录接口
* @param behaviorCode 积分动作编码
* @param pageIndex Number 页码
* @param pageSize Number 页容量
*/
export function getPointsLogs({
behaviorCode,
pageIndex,
pageSize
}) {
return request.get("userpointsverification/getpointslogs", {
behaviorCode,
pageIndex,
pageSize
})
}

377
app.json

@ -1,189 +1,190 @@
{
"pages": [
"pages/start/start",
"pages/indexNew/indexNew",
"pages/index/index",
"pages/mine/mine",
"pages/association/association",
"pages/discussion/discussion",
"pages/toRegister/toRegister",
"pages/toScan/toScan",
"pages/complete/complete",
"pages/formid/formid",
"pages/register/register",
"pages/detail/detail",
"pages/accept/accept",
"pages/gridLeaderRegister/gridLeaderRegister",
"pages/heart/heart",
"pages/heartNew/heartNew"
],
"subPackages": [
{
"root": "subpages/home",
"name": "home",
"pages": [
"pages/webview/webview",
"pages/agreement/agreement",
"pages/notice/notice",
"pages/noticeNew/noticeNew",
"pages/info/info",
"pages/noticeDetail/noticeDetail",
"pages/newsDetail/newsDetail",
"pages/newsList/newsList",
"pages/messageDetail/messageDetail"
]
},
{
"root": "subpages/changegrid",
"name": "changeGrid",
"pages": [
"pages/changeGrid/changeGrid"
]
},
{
"root": "subpages/association",
"name": "association",
"pages": [
"pages/joinassociation/joinassociation",
"pages/createassociation/createassociation",
"pages/associationMember/associationMember",
"pages/associationDetail/associationDetail",
"pages/inviteFriend/inviteFriend",
"pages/incomingVerify/incomingVerify",
"pages/unpassAssociation/unpassAssociation",
"pages/topicList/topicList",
"pages/addTopic/addTopic",
"pages/topicDetail/topicDetail",
"pages/replyOrRemark/replyOrRemark",
"pages/changeToIssue/changeToIssue"
]
},
{
"root": "subpages/associationNew",
"name": "associationNew",
"pages": [
"pages/associationlist/associationlist",
"pages/community/community",
"pages/gMembersList/gMembersList",
"pages/gOfficialsList/gOfficialsList",
"pages/talklist/talklist",
"pages/eventlist/eventlist",
"pages/addTopic/addTopic",
"pages/guideInfo/guideInfo"
]
},
{
"root": "subpages/discussion",
"name": "discussion",
"pages": [
"pages/addIssue/addIssue",
"pages/discussionDetail/discussionDetail",
"pages/publishEvaluation/publishEvaluation",
"pages/remarkOrReply/remarkOrReply",
"pages/searchDiscussion/searchDiscussion",
"pages/categoryList/categoryList"
]
},
{
"root": "subpages/mine",
"name": "mine",
"pages": [
"pages/eventDetail/eventDetail",
"pages/inviteRecord/inviteRecord",
"pages/gridManage/gridManage"
]
},
{
"root": "subpages/integralCentre",
"name": "integralCentre",
"pages": [
"pages/index/index"
]
},
{
"root": "subpages/heart",
"pages": [
"pages/heartDetail/heartDetail",
"pages/leaderboard/leaderboard",
"pages/leaderboardNew/leaderboardNew",
"pages/myNews/myNews",
"pages/clockIn/clockIn",
"pages/volunteer/volunteer",
"pages/signed/signed",
"pages/refusedOrEndedDetail/refusedOrEndedDetail",
"pages/cancelDetail/cancelDetail",
"pages/noticeDetail/noticeDetail",
"pages/myApply/myApply",
"pages/myApplyList/myApplyList",
"pages/myApplyDetail/myApplyDetail",
"pages/bannerDetail/bannerDetail",
"pages/groupBuyList/groupBuyList",
"pages/groupBuyListMy/groupBuyListMy",
"pages/groupBuyDetail/groupBuyDetail",
"pages/groupBuyConfirmList/groupBuyConfirmList",
"pages/evaluate/evaluate",
"pages/dropByList/dropByList",
"pages/groupBuyPublish/groupBuyPublish",
"pages/dropByPublish/dropByPublish",
"pages/noticeNewDetail/noticeNewDetail",
"pages/noticeNewList/noticeNewList"
]
},
{
"root": "subpages/oneKeyService",
"pages": [
"pages/index/index",
"pages/directTo/directTo",
"pages/archives/archives",
"pages/archivesDept/archivesDept",
"pages/archivesDetail/archivesDetail",
"pages/noticeDetail/noticeDetail",
"pages/moduleList/moduleList",
"pages/reportIssue/reportIssue",
"pages/reportIssueList/reportIssueList",
"pages/reportIssueDetail/reportIssueDetail"
]
}
],
"preloadRule": {
"pages/indexNew/indexNew": {
"network": "all",
"packages": [
"subpages/changegrid"
]
},
"pages/discussion/discussion": {
"network": "all",
"packages": [
"discussion"
]
},
"pages/association/association": {
"network": "all",
"packages": [
"subpages/association"
]
},
"pages/mine/mine": {
"network": "all",
"packages": [
"mine"
]
}
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
},
"networkTimeout": {
"request": 6000
},
"permission": {
"scope.userLocation": {
"desc": "e锦水将获取您的位置信息"
}
},
"sitemapLocation": "sitemap.json"
{
"pages": [
"pages/start/start",
"pages/indexNew/indexNew",
"pages/index/index",
"pages/mine/mine",
"pages/association/association",
"pages/discussion/discussion",
"pages/toRegister/toRegister",
"pages/toScan/toScan",
"pages/complete/complete",
"pages/formid/formid",
"pages/register/register",
"pages/detail/detail",
"pages/accept/accept",
"pages/gridLeaderRegister/gridLeaderRegister",
"pages/heart/heart",
"pages/heartNew/heartNew"
],
"subPackages": [
{
"root": "subpages/home",
"name": "home",
"pages": [
"pages/webview/webview",
"pages/agreement/agreement",
"pages/notice/notice",
"pages/noticeNew/noticeNew",
"pages/info/info",
"pages/noticeDetail/noticeDetail",
"pages/newsDetail/newsDetail",
"pages/newsList/newsList",
"pages/messageDetail/messageDetail"
]
},
{
"root": "subpages/changegrid",
"name": "changeGrid",
"pages": [
"pages/changeGrid/changeGrid"
]
},
{
"root": "subpages/association",
"name": "association",
"pages": [
"pages/joinassociation/joinassociation",
"pages/createassociation/createassociation",
"pages/associationMember/associationMember",
"pages/associationDetail/associationDetail",
"pages/inviteFriend/inviteFriend",
"pages/incomingVerify/incomingVerify",
"pages/unpassAssociation/unpassAssociation",
"pages/topicList/topicList",
"pages/addTopic/addTopic",
"pages/topicDetail/topicDetail",
"pages/replyOrRemark/replyOrRemark",
"pages/changeToIssue/changeToIssue"
]
},
{
"root": "subpages/associationNew",
"name": "associationNew",
"pages": [
"pages/associationlist/associationlist",
"pages/community/community",
"pages/gMembersList/gMembersList",
"pages/gOfficialsList/gOfficialsList",
"pages/talklist/talklist",
"pages/eventlist/eventlist",
"pages/addTopic/addTopic",
"pages/guideInfo/guideInfo"
]
},
{
"root": "subpages/discussion",
"name": "discussion",
"pages": [
"pages/addIssue/addIssue",
"pages/discussionDetail/discussionDetail",
"pages/publishEvaluation/publishEvaluation",
"pages/remarkOrReply/remarkOrReply",
"pages/searchDiscussion/searchDiscussion",
"pages/categoryList/categoryList"
]
},
{
"root": "subpages/mine",
"name": "mine",
"pages": [
"pages/eventDetail/eventDetail",
"pages/inviteRecord/inviteRecord",
"pages/gridManage/gridManage"
]
},
{
"root": "subpages/integralCentre",
"name": "integralCentre",
"pages": [
"pages/index/index",
"pages/exchangeIndex/exchangeIndex"
]
},
{
"root": "subpages/heart",
"pages": [
"pages/heartDetail/heartDetail",
"pages/leaderboard/leaderboard",
"pages/leaderboardNew/leaderboardNew",
"pages/myNews/myNews",
"pages/clockIn/clockIn",
"pages/volunteer/volunteer",
"pages/signed/signed",
"pages/refusedOrEndedDetail/refusedOrEndedDetail",
"pages/cancelDetail/cancelDetail",
"pages/noticeDetail/noticeDetail",
"pages/myApply/myApply",
"pages/myApplyList/myApplyList",
"pages/myApplyDetail/myApplyDetail",
"pages/bannerDetail/bannerDetail",
"pages/groupBuyList/groupBuyList",
"pages/groupBuyListMy/groupBuyListMy",
"pages/groupBuyDetail/groupBuyDetail",
"pages/groupBuyConfirmList/groupBuyConfirmList",
"pages/evaluate/evaluate",
"pages/dropByList/dropByList",
"pages/groupBuyPublish/groupBuyPublish",
"pages/dropByPublish/dropByPublish",
"pages/noticeNewDetail/noticeNewDetail",
"pages/noticeNewList/noticeNewList"
]
},
{
"root": "subpages/oneKeyService",
"pages": [
"pages/index/index",
"pages/directTo/directTo",
"pages/archives/archives",
"pages/archivesDept/archivesDept",
"pages/archivesDetail/archivesDetail",
"pages/noticeDetail/noticeDetail",
"pages/moduleList/moduleList",
"pages/reportIssue/reportIssue",
"pages/reportIssueList/reportIssueList",
"pages/reportIssueDetail/reportIssueDetail"
]
}
],
"preloadRule": {
"pages/indexNew/indexNew": {
"network": "all",
"packages": [
"subpages/changegrid"
]
},
"pages/discussion/discussion": {
"network": "all",
"packages": [
"discussion"
]
},
"pages/association/association": {
"network": "all",
"packages": [
"subpages/association"
]
},
"pages/mine/mine": {
"network": "all",
"packages": [
"mine"
]
}
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
},
"networkTimeout": {
"request": 6000
},
"permission": {
"scope.userLocation": {
"desc": "e锦水将获取您的位置信息"
}
},
"sitemapLocation": "sitemap.json"
}

4
components/loadMore/loadMore.js

@ -1,6 +1,6 @@
Component({
data: {
},
externalClasses: ['load-more-child'],
data: {},
properties: {
loadMoreVisible: {
type: Boolean,

2
components/loadMore/loadMore.wxml

@ -1,4 +1,4 @@
<view class="load-more" style="visibility: {{loadMoreVisible ? 'visible' : 'hidden'}}">
<view class="load-more load-more-child" style="visibility: {{loadMoreVisible ? 'visible' : 'hidden'}}">
<block wx:if="{{loadMoreType == 'loading'}}">
<image class="load-image" src="../../images/loading.gif" />
<view class="load-text">正在加载中...</view>

2
pages/toRegister/toRegister.js

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

26
project.config.json

@ -49,14 +49,6 @@
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"list": []
},
@ -144,6 +136,24 @@
"pathName": "subpages/oneKeyService/pages/moduleList/moduleList",
"query": "pid=4d667ea4ff8fb045b03a68a9d24207e9&bannerflag=1&categorycode=notice_jsqf&modulestyle=2&categoryname=锦水清风",
"scene": null
},
{
"name": "积分中心",
"pathName": "subpages/integralCentre/pages/index/index",
"query": "",
"scene": null
},
{
"name": "积分中心",
"pathName": "subpages/integralCentre/pages/exchangeIndex/exchangeIndex",
"query": "",
"scene": null
},
{
"name": "带参网格码生成",
"pathName": "pages/index/index",
"query": "scene=1233592630168813569",
"scene": null
}
]
}

BIN
subpages/integralCentre/images/code.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
subpages/integralCentre/images/exchange.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

79
subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js

@ -0,0 +1,79 @@
import {
getCode,
getPointsLogs
} from "../../../../api/integralCentre.js"
Page({
data: {
codeUrl: '',
behaviorCode: 'points_exchange', //积分动作编码
pageIndex: 1,
pageSize: 10,
pointList: [],
loadMoreVisible: false, //false
loadMoreType: "none",
showLoading: true,
nodata: false,
_timer: null,
},
onLoad: function () {
this.getCode()
this.getPointsLogs()
if (this.data._timer) {
clearInterval()
}
let _timer = null
_timer = setInterval(() => {
console.log('刷新')
this.getCode()
}, 1000 * 180)
},
getCode() {
this.setData({
showLoading: true
})
getCode().then(res => {
this.setData({
codeUrl: res.data.codeUrl,
showLoading: false
})
}).catch(err => {})
},
getNewCode() {
this.getCode()
},
// 获取居民兑换记录接口
getPointsLogs() {
let para = {
pageIndex: this.data.pageIndex,
pageSize: this.data.pageSize,
behaviorCode: this.data.behaviorCode,
}
getPointsLogs(para).then((res) => {
this.setData({
loadMoreVisible: true,
loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
pointList: this.data.pointList.concat(res.data)
})
if (this.data.pointList.length == 0) {
this.setData({
loadMoreVisible: false,
nodata: true
})
}
}).catch(() => {
this.setData({
nodata: true
})
})
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
console.log('下拉了')
if (this.data.loadMoreType === 'loading') {
this.data.pageIndex += 1,
this.getPointsLogs()
}
},
})

9
subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json

@ -0,0 +1,9 @@
{
"usingComponents": {
"load-more": "../../../../components/loadMore/loadMore",
"no-data": "../../../../components/nodata/nodata"
},
"navigationBarTitleText": "积分中心",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#DD5245"
}

33
subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml

@ -0,0 +1,33 @@
<view class="exchange-index">
<view class="exchange-header">
<view class="background"></view>
<view class="exchange-code">
<view class="code-text">
<image src="../../images/code.png" class="code" />
<text>兑换码</text>
</view>
<image src="{{codeUrl}}" class="code-img" bind:tap="getNewCode" wx:if="{{!showLoading}}" />
<view class="code-img" wx:if="{{showLoading}}">
<image src="../../../../images/loading.gif" class='loading' />
</view>
<view class="code-footer" bind:tap="getNewCode">请点击兑换码刷新</view>
</view>
</view>
<view class="exchange-time">
<view class="time-title">
<text class="" style="margin-left:90rpx">兑换时间</text>
<text class="" style="margin-left:220rpx">说明</text>
<text class="" style="margin-left:160rpx">积分</text>
</view>
<view class="time-item-box">
<view class="time-item" wx:for="{{pointList}}">
<text class="time-item-time">{{item.operationTime}}</text>
<text class="time-item-remark">{{item.remark?item.remark:'暂无核销记录说明'}}</text>
<!-- <text class="time-item-num">-1000</text> -->
<text class="time-item-num">{{item.operationType==='1'? '+':'-'}}{{item.points}}</text>
</view>
</view>
</view>
<no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
<load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}" load-more-child='load-more-exchange'></load-more>
</view>

113
subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss

@ -0,0 +1,113 @@
page {
/* background: #f7f7f7; */
}
.exchange-index {
width: 100%;
box-sizing: border-box;
}
.exchange-header {
height: 680rpx;
/* border: 1rpx solid red; */
}
.exchange-header .background {
box-sizing: border-box;
width: 100%;
height: 80rpx;
background: #DD5245;
}
.exchange-header .exchange-code {
box-sizing: border-box;
width: 660rpx;
height: 630rpx;
margin: 0 auto;
position: absolute;
top: 2%;
left: 50%;
transform: translate(-50%, 0%);
background: #FFFFFF;
border-radius: 20rpx;
padding: 40rpx 30rpx;
box-shadow: 0px 0px 20rpx #eee;
}
.exchange-code .code-text {
color: 32rpx;
font-weight: bold;
}
.exchange-code .code-text text {
vertical-align: middle;
}
.exchange-code .code-text .code {
width: 32rpx;
height: 32rpx;
vertical-align: middle;
margin-right: 10rpx;
}
.exchange-code .code-img {
width: 400rpx;
height: 400rpx;
margin-left: 110rpx;
margin-top: 50rpx;
}
.loading {
width: 60rpx;
height: 60rpx;
margin-top: 170rpx;
margin-left: 150rpx;
}
.exchange-code .code-footer {
margin-left: 200rpx;
font-size: 28rpx;
color: #999;
}
.exchange-time .time-title {
box-sizing: border-box;
width: 100%;
font-weight: bold;
font-size: 30rpx;
color: #151515;
}
.time-item-box {
padding: 0 20rpx;
}
.exchange-time .time-item-box .time-item {
box-sizing: border-box;
width: 100%;
display: flex;
justify-content: space-around;
font-size: 30rpx;
margin-top: 50rpx;
}
.exchange-time .time-item-box .time-item .time-item-time {
width: 45%;
color: #151515;
}
.exchange-time .time-item-box .time-item .time-item-remark {
width: 40%;
color: #151515;
}
.exchange-time .time-item-box .time-item .time-item-num {
width: 15%;
color: #D60000;
text-align: center;
}
/* 覆盖组件样式 */
.load-more-exchange {
background: #fff !important;
}

68
subpages/integralCentre/pages/index/index.js

@ -1,4 +1,5 @@
// subpages/integralCentre/pages/index/index.js
const app = getApp()
import {
pointsRecordlist,
userPointsRankinglist,
@ -23,36 +24,39 @@ Page({
rankingType: 0, //排名方式
selectTab: "tab1",
typeList: [{ //排名方式:0-周,1-月
type: "0",
name: "网格排名",
select: true
},
{
type: "1",
name: "街道排名",
select: false
},
{
type: "2",
name: "等级排名",
select: false
}
type: "0",
name: "网格排名",
select: true
},
{
type: "1",
name: "街道排名",
select: false
},
{
type: "2",
name: "等级排名",
select: false
}
],
timestamp: getTimestamp(),
loadMoreType: "none",
loadMoreVisible: false
loadMoreVisible: false,
infoCompleted: 0, //是否完善了用户信息
completeInfoDialogVisible: false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({ //前面页面传过来的积分总数
points: options.points
points: options.points,
infoCompleted: app.globalData.infoCompleted
})
this.pointsRankinglist(); //初始化加载积分记录列表
},
// tab 切换
onTabChange (e) {
onTabChange(e) {
this.setData({
pageIndex: 1,
pageSize: 15,
@ -60,7 +64,7 @@ Page({
loadMoreVisible: true,
pointsRecordlist: [],
pointsRankinglist: [],
pointsRankingUser: {},//当前用户排名信息
pointsRankingUser: {}, //当前用户排名信息
selectTab: e.currentTarget.dataset.tab,
nodatapointsRecord: false,
nodatapointsRanking: false,
@ -93,15 +97,15 @@ Page({
loadMoreType: "loading",
loadMoreVisible: true,
})
if ( e.currentTarget.dataset.type == "2") {
if (e.currentTarget.dataset.type == "2") {
that.gradeRankinglist()
} else {
that.pointsRankinglist()
}
}
},
// 积分记录-积分排行接口
pointsRankinglist () {
pointsRankinglist() {
let that = this
const para = {
pageIndex: 1,
@ -138,7 +142,7 @@ Page({
},
// 积分记录-积分记录接口
pointsRecordlist () {
pointsRecordlist() {
let that = this
const para = {
pageIndex: this.data.pageIndex,
@ -170,10 +174,6 @@ Page({
console.log(err)
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
@ -230,7 +230,7 @@ Page({
},
//6.28 等级排行榜
gradeRankinglist () {
gradeRankinglist() {
let that = this
const para = {
pageIndex: 1,
@ -264,12 +264,24 @@ Page({
console.log(err)
})
},
bindtapIntegralRule () {
bindtapIntegralRule() {
console.log('获取积分规则')
wx.navigateTo({
url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?categorycode=notice_points_rule&categoryname=积分规则`
})
},
// 积分兑换页面
goExchangeIndex() {
if (this.data.infoCompleted == 0) {
this.setData({
completeInfoDialogVisible: !this.data.completeInfoDialogVisible
})
return false
}
wx.navigateTo({
url: '/subpages/integralCentre/pages/exchangeIndex/exchangeIndex'
})
},
/**
* 用户点击右上角分享
*/

3
subpages/integralCentre/pages/index/index.json

@ -4,6 +4,7 @@
"navigationBarBackgroundColor": "#DD5245",
"usingComponents": {
"load-more": "../../../../components/loadMore/loadMore",
"no-data":"../../../../components/nodata/nodata"
"no-data": "../../../../components/nodata/nodata",
"completeInfo-dialog": "../../../../components/completeInfoDialog/completeInfoDialog"
}
}

29
subpages/integralCentre/pages/index/index.wxml

@ -2,12 +2,22 @@
<view class='title'>
<text class="number">{{points}}</text>
<text class="name">积分</text>
<view class="rule" bindtap="bindtapIntegralRule">积分规则<image src="../../images/note.png" /></view>
<view class="rule">
<view class="exchange-box">
<image src='../../images/exchange.png' class="exchange" bind:tap="goExchangeIndex" />
</view>
<text bindtap="bindtapIntegralRule">积分规则</text>
<image src="../../images/note.png" class="note" bindtap="bindtapIntegralRule" />
</view>
</view>
<!-- tabbar -->
<view class="tab-bar">
<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 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="select-bar {{selectTab === 'tab1' ? 'tab1' : 'tab2'}}"></view>
</view>
<!-- 积分排行 -->
@ -40,15 +50,15 @@
<image class="img-bg" wx:elif="{{index == 2}}" src="../../images/third.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 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 class="list-name">{{item.realName||item.nickName}}</view>
</view>
<view class="right">{{item.points||item.grade}}</view>
</view>
<no-data isShow="{{nodatapointsRanking}}"></no-data>
</block>
<!-- 积分记录 -->
@ -64,11 +74,14 @@
<view class="jf-list-li color1">{{item.ruleDesc}}</view>
<view class="jf-list-li-two color2">
<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>
<no-data isShow="{{nodatapointsRecord}}"></no-data>
</block>
<!--加载更多提示-->
<!-- 加载更多提示 -->
<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
<completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></completeInfo-dialog>
</view>

49
subpages/integralCentre/pages/index/index.wxss

@ -35,19 +35,35 @@ page {
}
.title .rule {
box-sizing: border-box;
width: 100%;
color: white;
position: absolute;
display: flex;
align-items: center;
left: 570rpx;
top: 40rpx;
/* left: 570rpx; */
top: 10rpx;
font-size: 28rpx;
padding-left: 20rpx;
}
.title .rule image{
.title .rule .note {
width: 30rpx;
height: 30rpx;
margin-left: 10rpx;
/* margin-right: 382rpx; */
}
.exchange-box {
margin-right: 360rpx;
}
.title .exchange {
width: 190rpx;
height: 90rpx;
vertical-align: middle;
}
.tab-bar {
width: 100%;
height: 80rpx;
@ -277,30 +293,35 @@ button::after {
margin-top: 3rpx;
margin-left: 1rpx;
}
.list-number_frist{
.list-number_frist {
position: relative;
z-index: 100;
width: 100%;
height: 38rpx;
line-height: 38rpx;
text-align: center;
font-size:38rpx;
font-weight:bold;
font-style:italic;
color:rgba(51,51,51,1);
font-size: 38rpx;
font-weight: bold;
font-style: italic;
color: rgba(51, 51, 51, 1);
}
.color1_{
color:#d42e31;
.color1_ {
color: #d42e31;
text-align: center;
}
.color2_{
color:#dd5800;
.color2_ {
color: #dd5800;
text-align: center;
}
.color3_{
color:#ffa800;
.color3_ {
color: #ffa800;
text-align: center;
}
.list-number_ {
position: relative;
z-index: 100;

5
utils/config.js

@ -6,9 +6,10 @@ module.exports = {
};
function BASEURL() {
return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
// return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'http://192.168.43.8:9094/epdc-api/api/'
// return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/'
}
function WEBROOT() {

Loading…
Cancel
Save