diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index b479180..2356b55 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -14,6 +14,8 @@
+
+
@@ -71,21 +73,24 @@
startTime:'',
endTime:'',
listData:[],
+ wqlistData:[],
titleData:'',
page:1,
limit:10,
shouyiMoeny:'',
+ wqsyshow:false,
}
},
onLoad(e) {
this.orderType=e.type;
- this.shouyiMoeny=e.shouyiMoeny;
+ // this.shouyiMoeny=e.shouyiMoeny;
this.userId = uni.getStorageSync("artificerId");
this.getTime()
this.getData();
+ // this.getWangqiTime();
},
onPullDownRefresh: function() {
this.page = 1;
@@ -128,6 +133,9 @@
this.startTime=year + '-' + monthJia + '-' + 21
this.endTime=year + '-' + monthJia + '-' + dayEnd;
}
+ if(!this.orderType){
+ this.orderType = 1;
+ }
},
getData(){
var that=this;
@@ -143,14 +151,43 @@
if (res.code == 0) {
if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
that.listData = [...that.listData, ...res.data.list]; //追加新数据
+ that.shouyiMoeny = res.earnings;//收益信息
} else {
that.$queue.showToast(res.msg);
}
});
},
+ //获取往期集合
+ // getWangqiTime(){
+ // var that=this;
+ // let data = {
+ // userId:that.userId,
+ // }
+ // that.$Request.getT('/app/artificer/getZqhzList', data).then(res => {
+ // console.log('------>',res)
+ // if (res.code == 0) {
+ // that.wqlistData = res.data;
+ // } else {
+ // that.$queue.showToast(res.msg);
+ // }
+ // });
+ // },
+ //
+ // wqlistCallback(index){
+ // console.log("wqlistCallback-->",index)
+ // this.wqsyshow = false;
+ // var startAndEnd = this.wqlistData[index].label.split(" 至 ");
+ // console.log("startAndEnd---->",startAndEnd)
+ // this.startTime = startAndEnd[0];
+ // this.endTime = startAndEnd[1];
+ // console.log("startTime>",this.startTime)
+ // console.log("endTime>",this.endTime)
+ // this.getData();
+ // },
wangqi(){//往期收益 跳页
+ // this.wqsyshow = true;
uni.navigateTo({
- url:'/pages/index/previousEarnings'
+ url:'/pages/index/previousEarnings?orderType='+this.orderType
})
},
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 076a8f0..e313a7b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -804,15 +804,18 @@ export default {
// 获取APP端首页物料记录数据
getHomeMaterialPackageList() {
let artificerId = uni.getStorageSync("artificerId");
- this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this
- .currentPage ? this
- .currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => {
- if (res && res.data && res.code === 0) {
- this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
- // this.formatHomeMaterialPackageList = [];
- this.homeMaterialPackageList = res.data;
- }
- })
+ if(artificerId){
+ this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this
+ .currentPage ? this
+ .currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => {
+ if (res && res.data && res.code === 0) {
+ this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
+ // this.formatHomeMaterialPackageList = [];
+ this.homeMaterialPackageList = res.data;
+ }
+ })
+ }
+
},
clickIcon(index) {
console.log(index);
diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index f1ba07b..003a1c3 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -1,173 +1,344 @@
-
-
-
- 序号 |
- 开始日期 |
- 结束日期 |
- 金额 |
- 操作 |
-
-
- 01 |
- 2024.01.01 |
- 2024.01.01 |
- ¥653.40 |
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{item.status=='3'?'已完成':'待评价'}}
+
+ 预约时间:
+ {{item.serveTime}}
+
+
+
+
+
+
+
\ No newline at end of file