diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 34e6bd4..15d51c8 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -7,12 +7,12 @@
-
+
@@ -22,11 +22,47 @@
- 业绩积分:596(项目金额累计积分，兑换比例为1:1)
+ 业绩积分:{{yjjf}}(项目金额累计积分，兑换比例为1:1)
- 更多
+
-
+
+
+ 已完成
+
+ 预约时间:
+ {{item.serveTime}}
+
+
+
+
+
- 时长积分: 36(在线时长10分钟可获取1积分)
+ 时长积分: {{zxscjf}}(在线时长10分钟可获取1积分)
- 更多
+
@@ -140,9 +140,9 @@
- 充值积分: 2000(充值积分比例为1:1)
+ 充值积分: {{ddczjf}}(充值积分比例为1:1)
- 更多
+
@@ -261,10 +261,75 @@
data(){
return{
type:'center',
- titleList:''
+ titleList:'',
+ startTime:'',
+ endTime:'',
+ userId:'',
+ czjf:'0',
+ czjfList:[],
+ ddczjf:'0',
+ ddczList:[],
+ yjjf:'0',
+ yjjfList:[],
+ zxscjf:'0',
+ zxscList:[],
+ sumJf:'0',
}
},
+ onLoad(e) {
+ this.userId = uni.getStorageSync("artificerId");
+ this.getTime()
+ this.getData();
+ },
methods:{
+ getTime(){
+ let now = new Date();
+ let year = now.getFullYear();
+ let month = now.getMonth() + 1; // JavaScript中月份是从0开始计数，需加1
+ let monthJia=month<10?'0'+month:month;
+ let day = now.getDate();
+ let currentDate = year + '-' + monthJia + '-' + day;
+ let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate();
+ if(day>=1&&day<=10){
+ this.startTime=year + '-' + monthJia + '-01';
+ this.endTime=year + '-' + monthJia + '-' + 10;
+ }else if(day>=11&&day<=20){
+ this.startTime=year + '-' + monthJia + '-' + 11;
+ this.endTime=year + '-' + monthJia + '-' + 20;
+ }else if(day>=21&&day<=dayEnd){
+ this.startTime=year + '-' + monthJia + '-' + 21
+ this.endTime=year + '-' + monthJia + '-' + dayEnd;
+ }
+ if(!this.orderType){
+ this.orderType = 1;
+ }
+ },
+ getData(){
+ var that=this;
+ let data = {
+ userId:that.userId,
+ startTime:that.startTime,
+ endTime:that.endTime,
+ }
+ that.$Request.getT('/app/artificer/getJifenList', data).then(res => {
+ console.log(res);
+ if (res.code == 0) {
+ that.czjf = res.czjf;
+ that.czjfList = res.czjfList;
+ that.ddczjf = res.ddczjf;
+ that.ddczList = res.ddczList;
+ that.yjjf = res.yjjf;
+ that.yjjfList = res.yjjfList;
+ that.zxscjf = res.zxscjf;
+ that.zxscList = res.zxscList;
+ that.sumJf = res.sumJf;
+ // that.listData = [...that.listData, ...res.data.list]; //追加新数据
+ // that.shouyiMoeny = res.earnings;//收益信息
+ } else {
+ that.$queue.showToast(res.msg);
+ }
+ });
+ },
jieshi(){
uni.navigateTo({
url:'/pages/index/currentPointsDetail'