|
|
@@ -50,30 +50,27 @@ export default {
|
|
50
|
50
|
},
|
|
51
|
51
|
created() {
|
|
52
|
52
|
console.log(this.deliveryDataArr, "deliveryDataArr");
|
|
53
|
|
- if ((this.deliveryDataArr && this.deliveryDataArr, length > 0)) {
|
|
|
53
|
+ if (this.deliveryDataArr && this.deliveryDataArr.length > 0) {
|
|
54
|
54
|
this.deliveryDataArr.forEach((item) => {
|
|
55
|
55
|
if (item.identityType == 1) {
|
|
56
|
56
|
let applicantdata = item.logisticsInfo;
|
|
57
|
57
|
this.applicantdelivery = JSON.parse(applicantdata);
|
|
58
|
|
- this.expressOne = this.applicantdelivery;
|
|
59
|
|
- console.log(this.expressOne, "this.expressOne");
|
|
60
|
|
- if (this.expressOne.length > 0) {
|
|
61
|
|
- this.expressOne.list.forEach((item) => {
|
|
|
58
|
+ if (this.applicantdelivery.list) {
|
|
|
59
|
+ this.applicantdelivery.list.forEach((item) => {
|
|
62
|
60
|
item.content = item.datetime;
|
|
63
|
61
|
item.timestamp = item.remark;
|
|
64
|
62
|
});
|
|
|
63
|
+ this.expressOne = this.applicantdelivery;
|
|
65
|
64
|
}
|
|
66
|
65
|
} else {
|
|
67
|
66
|
let applicantdata = item.logisticsInfo;
|
|
68
|
67
|
this.applicantdelivery = JSON.parse(applicantdata);
|
|
69
|
68
|
if (this.applicantdelivery.list) {
|
|
|
69
|
+ this.applicantdelivery.list.forEach((item) => {
|
|
|
70
|
+ item.content = item.datetime;
|
|
|
71
|
+ item.timestamp = item.remark;
|
|
|
72
|
+ });
|
|
70
|
73
|
this.expressTwo = this.applicantdelivery;
|
|
71
|
|
- if (this.expressOne.length > 0) {
|
|
72
|
|
- this.expressTwo.forEach((item) => {
|
|
73
|
|
- item.content = item.datetime;
|
|
74
|
|
- item.timestamp = item.remark;
|
|
75
|
|
- });
|
|
76
|
|
- }
|
|
77
|
74
|
}
|
|
78
|
75
|
}
|
|
79
|
76
|
});
|