总后台&商家合同-订单管理：商家需要发货的商品订单，待收货状态，“查看物流”功能有误

src/views/businessOrder/index.vue

@@ -266,32 +266,25 @@
           // 查看物流-对话框
           // 查看物流-对话框
           viewLogistics(row){
           viewLogistics(row){
             // 1.打开对话框
             // 1.打开对话框
-            this.dialogVisible = true
-            this.form.waybillNo=row.waybillNo
-            if(row.waybillNo==undefined){
-              this.$message.error('订单数据异常,没有物流相关信息。')
-              this.dialogVisible = false
-            }else {
-              viewLogisticsApi(
-                {waybillNo:row.waybillNo,expressCompany:row.expressCompany}
-              ).then(r=>{
-                if(r.data.data.result==undefined){
-                    this.activities.push({"content":'用户已签收',
-                      "timestamp":undefined,color: '#0bbd87'})
-                  }else {
-                  for (let i = 0; i <r.data.data.result.list.length ; i++) {
-                    if(i === 0){
-                      this.activities.push({"content":r.data.data.result.list[i].status,
-                        "timestamp":r.data.data.result.list[i].time,color: '#0bbd87'})
-                    }else {
-                      this.activities.push({"content":r.data.data.result.list[i].status,
-                        "timestamp":r.data.data.result.list[i].time})
-                    }
-                  }
+            this.dialogVisible = true;
+            this.activities=[];
+            viewLogisticsApi(
+              {waybillNo:row.waybillNo,expressCompany:row.expressCompany}
+            ).then(r=>{
+              let jsonData = JSON.parse(r.data.data);
+              let jsonList = jsonData.result.list;
+              for (let i = 0; i <jsonList.length ; i++) {
+                if(i === 0){
+                  this.activities.push({"content":jsonList[i].status,
+                    "timestamp":jsonList[i].time,color: '#0bbd87'})
+                }else {
+                  this.activities.push({"content":jsonList[i].status,
+                    "timestamp":jsonList[i].time})
                 }
                 }
-              })
-            }
-         },
+              }
+
+            })
+          },
           // 查看详情
           // 查看详情
           checkTheDetails(row){
           checkTheDetails(row){
             this.$router.push('/businessOrder/details?id=' + row.id)
             this.$router.push('/businessOrder/details?id=' + row.id)