diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue index f75f8d8..a47b0d1 100644 --- a/pages/my/my-money-bag.vue +++ b/pages/my/my-money-bag.vue @@ -31,8 +31,8 @@ - - + + - + @@ -80,13 +80,13 @@ bill: [], curUserInfo: {}, billingStateList: [{ - code: 1, + code: '1', name: '待到帐' },{ - code: 6, + code: '6', name: '已取消' },{ - code: 5, + code: '5', name: '已到帐' }], billingStateObj: null @@ -110,12 +110,18 @@ this.openStatusArr = []; for (let i = 0; i < this.bill.length; i++) { this.openStatusArr.push('1'); + this.$nextTick(() => { + this.$refs.collapseItem[i].onClick(false, 'init'); + }) } + this.$nextTick(() => { + this.$refs.collapse.resize(); + }) }, async showStatement(e) { let curIndex = e.currentTarget.dataset.index; // 1为缩起状态,0为展开状态 - if (this.openStatusArr[curIndex] == '1' && !this.bill[curIndex].statement) { + if (this.openStatusArr[curIndex] == '1' && (!this.bill[curIndex].statement || this.bill[curIndex].statement.length === 0)) { let createTime = new Date(new Date(this.bill[curIndex].createTime).setHours(0)); let createMonth = createTime.getMonth() + 1; let createYear = createTime.getFullYear(); @@ -144,7 +150,7 @@ this.bill = newBill; // #ifdef MP this.$nextTick(() => { - this.$refs.collapse[curIndex].resize(); + this.$refs.collapse.resize(); uni.hideLoading(); }) // #endif diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 3e9fde5..eb35449 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -164,31 +164,38 @@ 完成时间:{{order.workFinishTime}} - + 距完单分帐: - + + v-if="order.orderDetailId != null && tabCur === 3 && order.drawCashStatus === 0 && $dateUtil.addHours(order.workFinishTime, 1).getTime() < new Date().getTime()"> 银联发起(T+1)支付中 - + + v-if="order.orderDetailId != null && order.drawCashStatus === 1"> - 银联确认已划帐(到帐中) + 银联确认已划帐(到帐中),分账时间:{{order.drawCashTime}} - + + + + 已到帐:{{order.arrivalTime}} + + + + 提现失败 @@ -958,26 +965,26 @@ let res = await this.$request.updateDetailOrder(params); return res; }, - async ledgerAccountcountdownTimeup(order = {}, index) { - let res = await this.$request.updateDetailOrder({ - id: order.orderDetailId, - ledgerAccountStatus: 1 - }); - if (!res || res.code !== 0) { - uni.showToast({ - icon: 'none', - title: '分账倒计时异常,订单号:' + order.orderDetailId, - duration: 2000 - }) - } else if (this.tabCur === 3) { - // TODO:更新此订单信息 - uni.showToast({ - icon: 'none', - title: '订单编码:' + order.orderDetailCode + '已进入分账中,请再次点击确认中栏目', - duration: 3000 - }) - } - }, + // async ledgerAccountcountdownTimeup(order = {}, index) { + // let res = await this.$request.updateDetailOrder({ + // id: order.orderDetailId, + // ledgerAccountStatus: 1 + // }); + // if (!res || res.code !== 0) { + // uni.showToast({ + // icon: 'none', + // title: '分账倒计时异常,订单号:' + order.orderDetailId, + // duration: 2000 + // }) + // } else if (this.tabCur === 3) { + // // TODO:更新此订单信息 + // uni.showToast({ + // icon: 'none', + // title: '订单编码:' + order.orderDetailCode + '已进入分账中,请再次点击确认中栏目', + // duration: 3000 + // }) + // } + // }, showArrangeFailTime(e) { this.showTimeArrangeModal = false; this.showEditTimeArrangeModal = false;