|
|
@@ -49,8 +49,8 @@
|
|
|
<span class="s2">{{i.num}}</span>
|
|
|
</span>
|
|
|
</p>
|
|
|
- <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/settle.png" v-if="i.status == 0 || i.status == 2" />
|
|
|
- <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/wait.png" v-if="i.status == 1 || i.status == 4" />
|
|
|
+ <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/settle.png" v-if="settledStatus.includes(i.status)" />
|
|
|
+ <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/wait.png" v-if="waitStatus.includes(i.status)" />
|
|
|
<p class="flex_r flex_jb">
|
|
|
<span class="s3">{{ i.update_time }}</span>
|
|
|
<span class="s3">{{ i.type_id == 4 ? '智慧结算' : i.type_id == 1 ? '自助结算' : '其它' }}</span>
|
|
|
@@ -85,12 +85,14 @@ export default {
|
|
|
day_income: 0,
|
|
|
total_money: 0,
|
|
|
unsettle_money: 0
|
|
|
- }
|
|
|
+ },
|
|
|
+ settledStatus: [],
|
|
|
+ waitStatus: []
|
|
|
};
|
|
|
},
|
|
|
onLoad(da) {
|
|
|
console.log(da);
|
|
|
- this.current = da.s || 0
|
|
|
+ // this.current = da.s || 0
|
|
|
this.shop_id = da.shop_id
|
|
|
},
|
|
|
onShow() {
|
|
|
@@ -113,6 +115,8 @@ export default {
|
|
|
if (res.code === 0) {
|
|
|
this.statusList = JSON.parse(res.data.statusList)
|
|
|
this.count = res.data.data.count
|
|
|
+ this.settledStatus = res.data.data.statusList.settledStatus
|
|
|
+ this.waitStatus = res.data.data.statusList.waitStatus
|
|
|
if (res.data.data.data.data.length > 0) {
|
|
|
this.list = this.list.concat(res.data.data.data.data);
|
|
|
} else {
|