diff --git a/common/js/dateUtil.js b/common/js/dateUtil.js
index 78ffaf2..418493e 100644
--- a/common/js/dateUtil.js
+++ b/common/js/dateUtil.js
@@ -31,5 +31,10 @@ export default {
let date = new Date(dateStr);
date.setHours(date.getHours() + hourAmount);
return date;
+ },
+ addMinutes(dateStr, minAmount) {
+ let date = new Date(dateStr);
+ date.setMinutes(date.getMinutes() + minAmount);
+ return date;
}
}
\ No newline at end of file
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index c10abde..2192d86 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -7,7 +7,8 @@
{{curUserInfo.name}}
-
+
+
0
我的钱包
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index 3728fae..8f6ee8d 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -3,7 +3,7 @@
返回
- 我的钱包
+ 交易明细
+
+
+ {{item.createTime}}
{{item.payMoney}}
@@ -56,19 +62,20 @@
data() {
return {
openStatusArr: [], //0打开，1收起
- myMoneyBag: {},
- bill: []
+ bill: [],
+ curUserInfo: {}
}
},
onLoad() {
this.loadData();
},
methods: {
- async loadData() {
- this.myMoneyBag = await this.$api.data('myMoneyBag');
-
+ async loadData() {
+ this.curUserInfo = this.$request.getCurUserInfo();
// 查询账单
- let billRes = await this.$request.qryFinancialCount();
+ let billRes = await this.$request.qryFinancialCount({
+ financialDetailTypes: [0,1]
+ });
this.bill = billRes.data;
for (let i = 0; i < this.bill.length; i++) {
this.openStatusArr.push('1');
@@ -93,7 +100,9 @@
})
let res = await this.$request.qryFinancialDetail({
beginTime: createTimeStr,
- endTime: finishTimeStr
+ endTime: finishTimeStr,
+ financialDetailTypes: [0,1],
+ payeeId: this.curUserInfo.workerId
});
// let newStatements = this.statements.concat();
// newStatements[curIndex] = res.rows;
diff --git a/pages/my/statement-desc.vue b/pages/my/statement-desc.vue
index 68aac6b..ac7a116 100644
--- a/pages/my/statement-desc.vue
+++ b/pages/my/statement-desc.vue
@@ -17,7 +17,9 @@
详情说明：
- {{statementDesc.remark}}
+
+ 结单金额
+ 大师傅/店铺提成金额
到帐备注：
@@ -30,11 +32,11 @@
提现单号：
- {{statementDesc.extractCode}}
+ {{statementDesc.code}}
发起时间：
- {{statementDesc.payTime}}
+ {{statementDesc.updateTime}}
订单编号：
@@ -42,7 +44,7 @@
订单时间：
- {{statementDesc.orderCreateTime}}
+ {{statementDesc.createTime}}
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index e7ce632..2209306 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -163,16 +163,25 @@
完成时间：{{order.workFinishTime}}
-
+
距完单分帐：
-
+
+
+
+ 银行发起（T+1）分账中：{{order.updateTime}}
+
+
+
+ 货款分账成功：{{order.updateTime}}
+