zc订单地址

src/views/order/order/order_processing.vue

@@ -568,6 +568,7 @@ export default {
       orderDetAPI(id).then(res =>{
         if (res.data.code == 0) {
           this.order = res.data.data
+          this.order.invoiceContext = this.order.invoiceContext?this.order.invoiceContext:'1'
           this.returnOfGoods = res.data.data.returnOfGoods
           this.orderinfoList = []
           res.data.data.commodityList.forEach((item,index) => {
@@ -582,7 +583,7 @@ export default {
               this.orderinfoList.push(item)
             }
           })
-          console.log(this.orderinfoList,'&&&&******')
+          
           this.salesOrderList = this.orderinfoList
           this.statusHis = res.data.data.orderStatusLogVOList
           this.addressInfo = res.data.data.deliveryAddressVO

src/views/order/returnGoods/order_processing.vue

@@ -335,20 +335,14 @@ export default {
       returnOrderDetAPI({orderId:this.orderid,refundId:this.refundId}).then(res =>{
         if (res.data.code == 0) {
           this.order = res.data.data
+          this.order.invoiceContext = this.order.invoiceContext?this.order.invoiceContext:'1'
           this.returnOfGoods = res.data.data.returnOfGoods
           this.orderinfoList = res.data.data.commodityList
-          this.statusHis = res.data.data.orderStatusLogVOList
-          this.addressInfo = res.data.data.deliveryAddressVO
-          this.getAddList()
-          let data = this.order.orderType=='5'?{'0':1,'1':2,'2':3,'6':4}:{'0':1,'1':2,'6':3}
-          console.log(data,6666666)
-          this.activeProgress = data[this.order.status]
-
           this.$nextTick(() => {
             let selectedList = []
             this.returnTotalPrice = 0
             this.orderinfoList.forEach((item,index) => {
-              if(item.refundId || this.returnOfGoods.refundId){
+              if(item.refundId){
                 this.returnTotalPrice += Number(item.realPrice) * Number(item.num)
                 selectedList.push(item)
               }
@@ -359,6 +353,13 @@ export default {
               })
             }
           })
+          
+          this.statusHis = res.data.data.orderStatusLogVOList
+          this.addressInfo = res.data.data.deliveryAddressVO
+          this.getAddList()
+          let data = this.order.orderType=='5'?{'0':1,'1':2,'2':3,'6':4}:{'0':1,'1':2,'6':3}
+          this.activeProgress = data[this.order.status]
+          
         } else {
           this.$message.error('获取数据失败');
         }