订单优化和售后列表静态页面

src/views/system/order/components/orderDetail.vue

@@ -137,13 +137,23 @@
             <el-button size="mini" type="primary" @click="addRemark">添加备注</el-button>
           </div>
           <div style="width: 75%; min-height: 100px; border: 1px solid #eee; padding: 10px;">
-            <dl v-for="(item, index) in orderDetail.remark_list"
-                :key="index"
-                class="remark-con"
-            >
-              <dt>{{item.date_time}}</dt>
-              <dd>{{item.content}}</dd>
-            </dl>
+
+<!--            <el-timeline-item-->
+<!--              v-for="(remarkItem, index) in orderDetail.remark"-->
+<!--              :key="index"-->
+<!--              color="#0bbd87"-->
+<!--              :timestamp="formatter(remarkItem.date_time)">-->
+<!--              {{remarkItem.content}}-->
+<!--            </el-timeline-item>-->
+<!--            </el-timeline>-->
+<!--            <div ">暂无留言备注</div>-->
+
+            <p v-if="orderDetail.remark.length == 0" style="color:#999;">暂无备注</p>
+            <div v-for="(remarkItem, index) in orderDetail.remark" :key="index" class="remark-con">
+              <span class="remark-time">{{ formatter(remarkItem.date_time) }}</span>
+              <span class="remark-text">{{ remarkItem.content }}</span>
+            </div>
+
           </div>
         </div>
       </div>
@@ -308,41 +318,9 @@ export default {
       goods_ids: null, // 发货的商品订单 id
     }
   },
-  created() {
-
-  },
-  mounted() {
-
-  },
-  computed: {
-    // goodsFreight() {
-    //   let freight = 0
-    //   // if (this.orderDetail) {
-    //   //   this.orderDetail.item.map(item => {
-    //   //     freight += item.freight
-    //   //   })
-    //   // }
-    //   return freight
-    // },
-    // goodsPrice() {
-    //   let price = 0
-    //   if (this.orderDetail) {
-    //     this.orderDetail.item.map(item => {
-    //       price += item.goods_list[0].price
-    //     })
-    //   }
-    //   return price
-    // },
-    // goodsNum() {
-    //   let goodsNum = 0
-    //   if (this.orderDetail) {
-    //     this.orderDetail.item.map(item => {
-    //       goodsNum += item.goods_list[0].num
-    //     })
-    //   }
-    //   return goodsNum
-    // }
-  },
+  watch: {},
+  created() {},
+  mounted() {},
   methods: {
     /** 商品 发货状态 */
     goodsStatusFormatter(status) {
@@ -589,13 +567,8 @@ export default {
     // 订单详情
     handleInfo() {
       this.detailDialog = true
-      let order_id = this.orderDetail.id
-      orderInfo({order_id: order_id}).then(res => {
-        if (res.code == 1 && res.data) {
-          this.orderDetail = res.data.order
-          this.orderGoodsDetail = res.data.order_goods_detail ? res.data.order_goods_detail : [];
-        }
-      })
+      let id = this.orderDetail.id
+      this.$emit('updateOrder',id);
     },
     // 选中的表格
     handleSelectionChange(val) {
@@ -861,6 +834,20 @@ export default {
 
   /*  留言框样式 */
   .remark-con {
-    border: 1px solid #eee;
+    line-height:28px;
+    color: #333;
+    box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
+    margin: 10px;
+    padding: 10px;
+  }
+  .remark-con > p {
+    margin: 0;
+    padding: 10px;
+  }
+  .remark-con .remark-time {
+    padding: 0 20px;
+  }
+  .remark-con .remark-text {
+
   }
 </style>

src/views/system/order/index.vue

@@ -146,7 +146,7 @@
     <el-dialog title="订单详情" width="85%" :close-on-click-modal="false" :destroy-on-close="true"
                :visible.sync="detailDialog" center :before-close="handleClose">
       <div style="height:100%;">
-        <order-detail :order-detail="order_detail" :order-goods-detail="order_goods_detail" :express-lists="expressLists"/>
+        <order-detail :order-detail="order_detail" :order-goods-detail="order_goods_detail" :express-lists="expressLists" @updateOrder="updateOrder"/>
       </div>
     </el-dialog>
     <!--  批量发货  -->
@@ -205,6 +205,7 @@
   import {dateFormat} from '@/utils'
   import OrderDetail from './components/orderDetail.vue'
   import XLSX from "xlsx"
+  import {isArray} from "../../../utils/validate";
 
   export default {
     components: {
@@ -230,7 +231,9 @@
         detailDialog: false,
         isDeliveryOpen: false,
         excelList: [],
-        order_detail: null, // 订单信息
+        order_detail: {
+          remark: []
+        }, // 订单信息
         order_goods_detail: [], // 订单商品信息
         expressLists: [],
         fullHeight:'',
@@ -510,14 +513,40 @@
         let order_id = row.order_id
         orderInfo({order_id: order_id}).then(res => {
           if (res.code == 1 && res.data) {
-            // order 对象 订单信息 order_goods_detail-订单商品信息数组
-            this.order_detail = res.data.order
+            // 留言备注，需要单独处理
+            let remarkList = []
+            // res.data.order.remark 返回数据格式比较多，不判断了
+            try {
+              remarkList = JSON.parse(res.data.order.remark)
+            } catch (e) {
+              remarkList = []
+              console.log(99,e);
+            }
+
+            res.data.order.remark = remarkList
+            this.order_detail = res.data.order;
+
+            // let isArray = Array.isArray(remarkList)
+            //
+            // if(isArray) {
+            //   res.data.order.remark = remarkList
+            //   this.order_detail = res.data.order;
+            // }else {
+            //
+            // }
+
             this.order_goods_detail = res.data.order_goods_detail ? res.data.order_goods_detail : [];
-            //console.log("详情数据",this.order_goods_detail);
+
+            //console.log('备注留言返回原始数据',res.data.order.remark);
             // this.$router.push({path: '/system/goods/management'});
           }
         })
       },
+      /** 更新 订单备注 */
+      updateOrder(id) {
+        let row = {order_id: id}
+        this.handleInfo(row);
+      },
       // 获取物流信息
       getExpressList() {
         expressList().then(res => {

src/views/system/retreat/editOrder.vue

+<template>
+  <div>
+    售后详情成功
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "EditOrder",
+    data() {
+      return {
+
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>