@@ -271,6 +271,10 @@ var config = { | |||||
* 积分券详情 | * 积分券详情 | ||||
*/ | */ | ||||
integralDetail:'/wxCoupon/findById', | integralDetail:'/wxCoupon/findById', | ||||
/** | |||||
* 会员积分记录 | |||||
*/ | |||||
integralList:'/credit/list' | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: weappId | AppId: weappId | ||||
@@ -3,6 +3,7 @@ var app = getApp(); | |||||
const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
let util = require("../../../utils/util"); | let util = require("../../../utils/util"); | ||||
const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
const {creditType} = require("../../../utils/creditType"); | |||||
Page({ | Page({ | ||||
/** | /** | ||||
@@ -15,7 +16,8 @@ Page({ | |||||
showcontent: false, | showcontent: false, | ||||
loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
bgg: imgurl.bgg.url, | bgg: imgurl.bgg.url, | ||||
allow_load: true | |||||
allow_load: true, | |||||
creditAmount:0 | |||||
}, | }, | ||||
/** | /** | ||||
@@ -41,13 +43,18 @@ Page({ | |||||
var that = this; | var that = this; | ||||
if (that.data.allow_load) { | if (that.data.allow_load) { | ||||
Http.get({ | Http.get({ | ||||
url: config.api.scoreHistory, | |||||
url: config.api.integralList, | |||||
data: { | data: { | ||||
pageNum: pageNum, | pageNum: pageNum, | ||||
pageSize: 20, | pageSize: 20, | ||||
} | } | ||||
}).then(res => { | }).then(res => { | ||||
res.data.list.map(file => { | res.data.list.map(file => { | ||||
creditType.map((item,index)=>{ | |||||
if (file.creditType==item.value){ | |||||
file.creditTypeName = item.name; | |||||
} | |||||
}) | |||||
file.createDate = util.formatTime( | file.createDate = util.formatTime( | ||||
file.createDate, | file.createDate, | ||||
"yyyy-MM-dd hh:mm:ss" | "yyyy-MM-dd hh:mm:ss" | ||||
@@ -59,8 +66,10 @@ Page({ | |||||
}); | }); | ||||
} | } | ||||
that.data.list = that.data.list.concat(res.data.list); | that.data.list = that.data.list.concat(res.data.list); | ||||
console.log(that.data.list,22222222222) | |||||
that.setData({ | that.setData({ | ||||
list: that.data.list | |||||
list: that.data.list, | |||||
creditAmount: that.data.list[0].creditAmount | |||||
}); | }); | ||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
@@ -1,5 +1,5 @@ | |||||
{ | { | ||||
"navigationBarTitleText": "积分记录", | |||||
"navigationBarTitleText": "积分变更记录", | |||||
"enablePullDownRefresh": true, | "enablePullDownRefresh": true, | ||||
"usingComponents": {} | "usingComponents": {} | ||||
} | } |
@@ -1,6 +1,6 @@ | |||||
<view class='head'> | <view class='head'> | ||||
<text>当前</text> | <text>当前</text> | ||||
<text>{{score}}</text> | |||||
<text>{{creditAmount+'分'}}</text> | |||||
<!-- <view class='rule' bindtap='gotorule'>规则</view> --> | <!-- <view class='rule' bindtap='gotorule'>规则</view> --> | ||||
<image class='bg' src='{{bgg}}' mode='widthFix'></image> | <image class='bg' src='{{bgg}}' mode='widthFix'></image> | ||||
</view> | </view> | ||||
@@ -8,21 +8,12 @@ | |||||
<text class='title'>积分明细</text> | <text class='title'>积分明细</text> | ||||
<view class='content clearfix' wx:for="{{list}}" wx:key="{{index}}"> | <view class='content clearfix' wx:for="{{list}}" wx:key="{{index}}"> | ||||
<view class='le'> | <view class='le'> | ||||
<text wx:if="{{item.scoreType==1}}">每日登录</text> | |||||
<text wx:if="{{item.scoreType==2}}">消费</text> | |||||
<text wx:if="{{item.scoreType==3}}">绑车牌</text> | |||||
<text wx:if="{{item.scoreType==4}}">连接WIFI</text> | |||||
<text wx:if="{{item.scoreType==5}}">微信用户昵称授权</text> | |||||
<text wx:if="{{item.scoreType==6}}">微信用户手机授权</text> | |||||
<text wx:if="{{item.scoreType==7}}">完善个人信息</text> | |||||
<text wx:if="{{item.scoreType==8}}">会员导入</text> | |||||
<text wx:if="{{item.scoreType==9}}">{{item.reason}}</text> | |||||
<text>{{item.creditTypeName}}</text> | |||||
<text>{{item.createDate}}</text> | <text>{{item.createDate}}</text> | ||||
</view> | </view> | ||||
<view class='fr'> | <view class='fr'> | ||||
<text wx:if="{{item.scoreAmount>0&&item.scoreType==8}}">重置为{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{item.scoreAmount>0&&item.scoreType!=8}}">+{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{0>=item.scoreAmount}}">{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{item.creditNum>0}}" style="color:#00B4FF;">+{{item.creditNum}}分</text> | |||||
<text wx:if="{{item.creditNum<0}}">{{item.creditNum}}分</text> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> |
@@ -0,0 +1,17 @@ | |||||
let creditType=[ | |||||
{ name: "每日登录", value: "1" }, | |||||
{ name: "消费", value: "2" }, | |||||
{ name: "帮车牌", value: "3" }, | |||||
{ name: "连接WIFI", value: "4" }, | |||||
{ name: "微信昵称授权", value: "5" }, | |||||
{ name: "微信用户手机授权", value: "6" }, | |||||
{ name: "完善个人信息", value: "7" }, | |||||
{ name: "积分导入", value: "8" }, | |||||
{ name: "消费积分", value: "9" }, | |||||
{ name: "消费积分", value: "10" }, | |||||
{ name: "积分兑换", value: "11" }, | |||||
{ name: "线下积分扣除", value: "12" }, | |||||
] | |||||
module.exports = { | |||||
creditType | |||||
} |