no message

src/views/mallManagement/order/order_detail/index.vue

@@ -8,6 +8,8 @@
             <span>订单编号：{{ orderDetail.orderId }}</span>
             <span>下单时间：{{ orderDetail.createTime }}</span>
             <span>商户：{{ orderDetail.companyWechatName || '无' }}</span>
+            <span v-if="orderDetail.cancelName">"取消人：{{ orderDetail.cancelName }}</span>
+            <span v-if="orderDetail.cancelTime">取消时间：{{ orderDetail.cancelTime }}</span>
             <!-- <span>网点：{{ orderDetail.websitName || '无' }}</span> -->
             <el-tag v-if="orderDetail.isOld == 'YES'">以旧换新</el-tag>
             <div class="fr">

src/views/mallManagement/order/order_list/index.vue

@@ -128,7 +128,8 @@
                 <el-tab-pane label="待发货" name="DFH"></el-tab-pane>
                 <el-tab-pane label="已发货" name="YFH"></el-tab-pane>
                 <el-tab-pane label="已完成" name="OVER"></el-tab-pane>
-                <el-tab-pane label="退款/取消" name="CLOSE"></el-tab-pane>
+                <el-tab-pane label="已关闭" name="CLOSE"></el-tab-pane>
+                <el-tab-pane label="已取消" name="CANCEL"></el-tab-pane>
                 <el-tab-pane label="已超时" name="TIMEOUT"></el-tab-pane>
               </el-tabs>
               <el-button v-if="$restrict('batchNote')" class="fl" type="primary" size="small" @click="batchRemark"
@@ -352,7 +353,7 @@
                           @confirm="quediingshoukuan(order.orderId)"
                           v-if="
                             ['NO_PAID', 'PART_PAID'].includes(order.payStatus) &&
-                            !['DQR', 'CLOSE', 'TIMEOUT'].includes(order.orderStatus) &&
+                            !['DQR', 'CLOSE', 'TIMEOUT', 'CANCEL'].includes(order.orderStatus) &&
                             !['WECHAT'].includes(order.payTypeId)
                           "
                         >
@@ -1450,7 +1451,7 @@ export default {
     },
     changeTabs(tab, event) {
       var v = tab.$options.propsData.name
-      if (['NOPAY', 'DQR', 'DFH', 'YFH', 'OVER', 'CLOSE', 'TIMEOUT'].includes(v)) {
+      if (['NOPAY', 'DQR', 'DFH', 'YFH', 'OVER', 'CLOSE', 'CANCEL', 'TIMEOUT'].includes(v)) {
         this.screenForm.payStatus = ''
         this.screenForm.orderStatus = v
       } else if (['NO_PAID', 'PART_PAID', 'PAID'].includes(v)) {