直播间修改

src/api/hisStore/storeDeliveryAbnormalOrder.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询物流异常订单列表
+export function listDeliveryAbnormalOrder(data) {
+  return request({
+    url: '/store/store/storeDeliveryAbnormalOrder/list',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询物流异常订单详情
+export function getDeliveryAbnormalOrder(id) {
+  return request({
+    url: '/store/store/storeDeliveryAbnormalOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 处理物流异常
+export function handleDeliveryException(data) {
+  return request({
+    url: '/store/store/storeDeliveryAbnormalOrder/handle',
+    method: 'post',
+    data: data
+  })
+}

src/views/hisStore/components/productOrder.vue

@@ -13,43 +13,47 @@
       <div class="operate-container"  v-if="order!=null">
         <span style="margin-left: 20px" class="color-danger">订单状态：
            <el-tag prop="status" v-for="(item, index) in statusOptions"   v-if="order.status==item.dictValue">{{item.dictLabel}}</el-tag>
+           <el-tag v-if="order.deliveryExceptionStatus === 1" type="danger" size="mini" style="margin-left: 8px;">物流异常</el-tag>
         </span>
-        <div class="operate-button-container" >
+        <div class="operate-button-container" v-if="deliveryAbnormalMode && order.deliveryExceptionStatus !== 2" v-hasPermi="['store:storeDeliveryAbnormalOrder:handle']">
+          <el-button size="mini" type="danger" @click="openDeliveryExceptionDialog">确认状态</el-button>
+        </div>
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode" >
           <el-button size="mini" @click="editOrder()"  v-hasPermi="['store:storeOrder:edit']" >修改订单</el-button>
         </div>
-        <div class="operate-button-container"  v-hasPermi="['store:storeOrder:finishOrder']" v-if="order.status===2">
+        <div class="operate-button-container"  v-hasPermi="['store:storeOrder:finishOrder']" v-if="!deliveryAbnormalMode && order.status===2">
           <el-button size="mini" @click="finishOrder()" >确认收货</el-button>
         </div>
-        <div class="operate-button-container" v-if="order.status==1||order.status==2"  v-hasPermi="['store:storeOrder:refundOrderMoney']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && (order.status==1||order.status==2)"  v-hasPermi="['store:storeOrder:refundOrderMoney']"  >
           <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
           <el-button size="mini" @click="showExpress()">查看物流</el-button>
         </div>
-        <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>
         </div>
-        <div class="operate-button-container" v-if="order.tuiMoneyStatus==1"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.tuiMoneyStatus==1"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney2()" >冻结</el-button>
         </div>
 
-        <div class="operate-button-container" v-if="order.status==3&&order.tuiMoneyStatus==null"  v-hasPermi="['store:storeOrder:addTuiMoney']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.status==3&&order.tuiMoneyStatus==null"  v-hasPermi="['store:storeOrder:addTuiMoney']"  >
           <el-button size="mini" @click="addTuiMoney()" >分佣</el-button>
         </div>
 
 <!--        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
           <el-button size="mini" @click="showErpOrder()" >查看ERP订单信息</el-button>
         </div>-->
-        <div class="operate-button-container" v-if="order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
           <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
         </div>
-        <div class="operate-button-container" >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode" >
           <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流</el-button>
         </div>
-        <div class="operate-button-container" v-if="order.status===0" >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.status===0" >
           <el-button size="mini" @click="editPayPostageOpen()"  v-hasPermi="['store:storeOrder:edit']" >修改运费</el-button>
         </div>
-        <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
+        <div class="operate-button-container" v-if="!deliveryAbnormalMode && order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
           <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
         </div>
         <!-- <div class="operate-button-container" v-show="order.status===2">
@@ -104,11 +108,25 @@
                   <el-tag prop="deliveryId" v-for="(item, index) in deliveryStatusOptions"    v-if="order!=null&&order.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item label="物流跟踪状态"  >
+            <el-descriptions-item :label="deliveryAbnormalMode ? '异常状态' : '物流跟踪状态'"  >
                 <span v-if="order!=null">
-                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryTypeOptions"    v-if="order!=null&&order.deliveryType==item.dictValue">{{item.dictLabel}}</el-tag>
+                  <template v-if="deliveryAbnormalMode">{{ formatDeliveryTypeText(order.deliveryType) }}</template>
+                  <template v-else>
+                    <el-tag prop="deliveryId" v-for="(item, index) in deliveryTypeOptions" v-if="order.deliveryType==item.dictValue">{{item.dictLabel}}</el-tag>
+                  </template>
                 </span>
             </el-descriptions-item>
+            <el-descriptions-item label="处理状态" v-if="deliveryAbnormalMode && order!=null">
+              <el-tag v-if="order.deliveryExceptionStatus === 1" type="danger" size="mini">待处理</el-tag>
+              <el-tag v-else-if="order.deliveryExceptionStatus === 2" type="success" size="mini">已处理</el-tag>
+              <span v-else>-</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="异常备注" v-if="deliveryAbnormalMode && order!=null">
+              <span>{{ order.deliveryExceptionRemark || '-' }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="物流异常备注" v-if="!deliveryAbnormalMode && order!=null && order.deliveryExceptionRemark">
+                <span>{{ order.deliveryExceptionRemark }}</span>
+            </el-descriptions-item>
             <el-descriptions-item label="物流结算费用"  >
                 <span v-if="order!=null&&order.deliveryPayMoney!=null ">
                   {{order.deliveryPayMoney.toFixed(2) }}
@@ -829,6 +847,26 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="确认状态" :visible.sync="deliveryExceptionDialog.open" width="480px" append-to-body>
+      <el-form label-width="100px">
+        <el-form-item label="异常状态">
+          <span>{{ formatDeliveryTypeText(order && order.deliveryType) }}</span>
+        </el-form-item>
+        <el-form-item label="异常备注">
+          <el-input
+            v-model="deliveryExceptionDialog.remark"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入异常备注（非必填）"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="deliveryExceptionDialog.open = false">取 消</el-button>
+        <el-button type="primary" @click="submitDeliveryExceptionConfirm">确 认</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -854,6 +892,7 @@ import {
   editPayDelivery,
   editPayPostage
 } from "@/api/hisStore/storeOrder";
+import { getDeliveryAbnormalOrder, handleDeliveryException } from "@/api/hisStore/storeDeliveryAbnormalOrder";
 import {listStoreProduct} from "@/api/hisStore/storeProduct";
 import {getTcmScheduleList} from "@/api/company/schedule";
 import Treeselect from "@riophae/vue-treeselect";
@@ -870,6 +909,12 @@ import{ getSignProjectName } from '@/api/course/qw/courseWatchLog'
 
 export default {
   name: "order",
+  props: {
+    deliveryAbnormalMode: {
+      type: Boolean,
+      default: false
+    }
+  },
   components: {
     Treeselect,
     Editor,
@@ -1057,6 +1102,10 @@ export default {
           { required: true, message: "运费不能为空", trigger: "blur" }
         ]
       },
+      deliveryExceptionDialog: {
+        open: false,
+        remark: ''
+      },
       // 删除商品相关
       removeProductLoading: false
     };
@@ -1596,7 +1645,8 @@ export default {
     getOrder(orderId){
         this.orderId=orderId;
         this.certificates = null;
-        getStoreOrder(orderId).then(response => {
+        const getFn = this.deliveryAbnormalMode ? getDeliveryAbnormalOrder : getStoreOrder;
+        getFn(orderId).then(response => {
             this.order = response.order;
             if(response.order.certificates != null){
               this.certificates = response.order.certificates;
@@ -1613,6 +1663,31 @@ export default {
             this.afterSales = response.afterSales;
         });
      },
+    formatDeliveryTypeText(value) {
+      if (!value) {
+        return '-';
+      }
+      const item = this.deliveryTypeOptions.find(d => d.dictValue === value || d.dictValue === String(value));
+      return item ? `${item.dictValue} ${item.dictLabel}` : value;
+    },
+    openDeliveryExceptionDialog() {
+      this.deliveryExceptionDialog.remark = this.order.deliveryExceptionRemark || '';
+      this.deliveryExceptionDialog.open = true;
+    },
+    submitDeliveryExceptionConfirm() {
+      handleDeliveryException({
+        orderId: this.order.id,
+        deliveryExceptionStatus: 2,
+        deliveryExceptionRemark: this.deliveryExceptionDialog.remark
+      }).then(() => {
+        this.msgSuccess('处理成功');
+        this.deliveryExceptionDialog.open = false;
+        this.getOrder(this.order.id);
+        if (this.deliveryAbnormalMode) {
+          this.$emit('refresh');
+        }
+      });
+    },
     editPayDeliveryHandle() {
       this.payDeliveryForm.id =  this.orderId;
       this.payDeliveryForm.payDelivery = this.order.payDelivery || 0.00;

src/views/hisStore/storeDeliveryAbnormalOrder/index.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名" prop="companyId">
+        <el-select filterable v-model="queryParams.companyId" placeholder="请选择公司名" @change="companyChange" clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <treeselect style="width: 220px" :clearable="false" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+
+      <el-form-item label="订单单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售名称" prop="companyUserNickName">
+        <el-input
+          v-model="queryParams.companyUserNickName"
+          placeholder="请输入销售名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="userPhone">
+        <el-input
+          v-model="queryParams.userPhone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="订单状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
+          <el-option
+            v-for="item in orderStatusOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="parseInt(item.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="物流单号" prop="deliveryId">
+        <el-input
+          v-model="queryParams.deliveryId"
+          placeholder="请输入物流单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="银行交易流水" prop="bankTransactionId" label-width="100">
+        <el-input
+          v-model="queryParams.bankTransactionId"
+          placeholder="请输入银行交易流水"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="处理状态" prop="deliveryExceptionStatus">
+        <el-select v-model="queryParams.deliveryExceptionStatus" placeholder="请选择处理状态" clearable size="small">
+          <el-option label="待处理" :value="1" />
+          <el-option label="已处理" :value="2" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="异常状态" prop="deliveryType">
+        <el-select v-model="queryParams.deliveryType" placeholder="请选择异常状态" clearable size="small" style="width: 220px">
+          <el-option
+            v-for="item in deliveryTypeOptions"
+            :key="item.dictValue"
+            :label="item.dictValue + ' ' + item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="提交时间" prop="createTime">
+        <el-date-picker
+          style="width:205.4px"
+          clearable
+          size="small"
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table height="500" border v-loading="loading" :data="storeOrderList" :row-class-name="tableRowClassName">
+      <el-table-column label="ID" align="center" prop="id" width="80" />
+      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="订单单号" align="center" prop="orderCode" width="180" />
+      <el-table-column label="支付单号" align="center" prop="payCode" />
+      <el-table-column label="会员手机号" align="center" prop="userPhone" />
+      <el-table-column label="订单状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-for="item in orderStatusOptions" :key="item.dictValue" v-if="scope.row.status == item.dictValue">{{ item.dictLabel }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="物流状态" align="center" prop="deliveryStatus">
+        <template slot-scope="scope">
+          <el-tag v-for="item in deliveryStatusOptions" :key="item.dictValue" v-if="scope.row.deliveryStatus == item.dictValue">{{ item.dictLabel }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="物流单号" align="center" prop="deliveryId" />
+      <el-table-column label="异常状态" align="center" prop="deliveryType" min-width="140">
+        <template slot-scope="scope">
+          <span>{{ formatDeliveryType(scope.row.deliveryType) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理状态" align="center" prop="deliveryExceptionStatus" width="100">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.deliveryExceptionStatus === 1" type="danger" size="mini">待处理</el-tag>
+          <el-tag v-else-if="scope.row.deliveryExceptionStatus === 2" type="success" size="mini">已处理</el-tag>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常备注" align="center" prop="deliveryExceptionRemark" min-width="160" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="操作" align="center" fixed="right" width="120px">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleShow(scope.row)"
+            v-hasPermi="['store:storeDeliveryAbnormalOrder:query']"
+          >查看/处理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-drawer size="75%" :title="title" :visible.sync="open" @close="handleDrawerClose">
+      <product-order ref="productOrder" delivery-abnormal-mode @refresh="getList" />
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { listDeliveryAbnormalOrder } from '@/api/hisStore/storeDeliveryAbnormalOrder'
+import productOrder from '../components/productOrder'
+import { getCompanyList } from '@/api/company/company'
+import { treeselect } from '@/api/company/companyDept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  watch: {
+    'queryParams.deptId': 'currDeptChange'
+  },
+  components: { productOrder, Treeselect },
+  name: 'StoreDeliveryAbnormalOrderList',
+  data() {
+    return {
+      companyId: undefined,
+      orderStatusOptions: [],
+      deliveryStatusOptions: [],
+      deliveryTypeOptions: [],
+      companys: [],
+      deptOptions: [],
+      loading: true,
+      showSearch: true,
+      total: 0,
+      storeOrderList: [],
+      title: '物流异常订单',
+      open: false,
+      dateRange: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderCode: null,
+        companyId: null,
+        deptId: null,
+        companyUserNickName: null,
+        userPhone: null,
+        productName: null,
+        status: null,
+        deliveryStatus: 4,
+        deliveryId: null,
+        bankTransactionId: null,
+        deliveryExceptionStatus: null,
+        deliveryType: null
+      }
+    }
+  },
+  created() {
+    getCompanyList().then(response => {
+      this.companys = response.data
+      if (this.companys != null && this.companys.length > 0) {
+        this.companyId = this.companys[0].companyId
+        this.getTreeselect()
+      }
+    })
+    this.getDicts('store_order_status').then(response => {
+      this.orderStatusOptions = response.data
+    })
+    this.getDicts('store_order_delivery_status').then(response => {
+      this.deliveryStatusOptions = response.data
+    })
+    this.getDicts('store_order_delivery_type').then(response => {
+      this.deliveryTypeOptions = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    formatDeliveryType(value) {
+      if (!value) {
+        return '-'
+      }
+      const item = this.deliveryTypeOptions.find(d => d.dictValue === value || d.dictValue === String(value))
+      return item ? `${item.dictValue} ${item.dictLabel}` : value
+    },
+    handleShow(row) {
+      this.title = '物流异常订单 - ' + row.orderCode
+      this.open = true
+      this.$nextTick(() => {
+        if (this.$refs.productOrder) {
+          this.$refs.productOrder.getOrder(row.id)
+        }
+      })
+    },
+    handleDrawerClose() {
+      this.getList()
+    },
+    getList() {
+      this.loading = true
+      listDeliveryAbnormalOrder(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.storeOrderList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    tableRowClassName({ row }) {
+      if (row.deliveryExceptionStatus === 2) {
+        return 'delivery-exception-handled-row'
+      }
+      return 'delivery-exception-row'
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.deliveryStatus = 4
+      this.queryParams.deliveryExceptionStatus = null
+      this.handleQuery()
+    },
+    getTreeselect() {
+      treeselect({ companyId: this.companyId }).then(response => {
+        this.deptOptions = response.data
+      })
+    },
+    companyChange(val) {
+      this.companyId = val
+      this.getTreeselect()
+    },
+    currDeptChange(val) {
+      this.queryParams.deptId = val
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+::v-deep .el-table .delivery-exception-row > td {
+  background-color: #fde2e2 !important;
+}
+::v-deep .el-table .delivery-exception-handled-row > td {
+  background-color: #e1f3d8 !important;
+}
+</style>

src/views/live/liveConsole/LiveConsole.vue

@@ -138,6 +138,7 @@
                     <a style="cursor: pointer;color: #ff0000;padding: 8px 8px 0 0;font-size: 12px;" @click.stop="blockUser(m)">拉黑</a>
                     <a v-if="m.singleVisible === 1" style="cursor: pointer;color: #ff0000;padding: 8px 8px 0 0;font-size: 12px;" @click.stop="singleVisible(m)">解除用户自见</a>
                     <a v-else style="cursor: pointer;color: #ff0000;padding: 8px 8px 0 0;font-size: 12px;" @click.stop="singleVisible(m)">用户自见</a>
+                    <a style="cursor: pointer;color: #ff0000;padding: 8px 8px 0 0;font-size: 12px;" @click.stop="replyUser(m)">回复</a>
                     <a style="cursor: pointer;color: #ff0000;padding: 8px 8px 0 0;font-size: 12px;" @click.stop="deleteMsg(m)">删除</a>
                   </el-col>
                 </el-row>
@@ -185,7 +186,7 @@
         <div class="message-actions">
           <button @click="sendMessage">发送消息</button>
           <button @click="sendPopMessage">弹窗消息</button>
-          <button @click="showTopMsgDialog">顶部消息</button>
+          <button @click="showTopMsgDialog">官方消息</button>
         </div>
       </div>
     </div>
@@ -231,8 +232,8 @@
       </div>
     </div>
 
-    <!-- 顶部消息对话框 -->
-    <el-dialog title="发送顶部消息" :visible.sync="topMsgDialogVisible" width="500px">
+    <!-- 官方消息对话框 -->
+    <el-dialog title="发送官方消息" :visible.sync="topMsgDialogVisible" width="500px">
       <el-form :model="topMsgForm" label-width="100px">
         <el-form-item label="消息内容">
           <el-input
@@ -535,6 +536,25 @@ export default {
       }
       this.socket.send(JSON.stringify(msg))
     },
+    replyUser(m) {
+      this.$prompt('请输入回复内容', '回复 ' + (m.nickName || m.userId), {
+        confirmButtonText: '发送',
+        cancelButtonText: '取消',
+        inputPattern: /\S+/,
+        inputErrorMessage: '回复内容不能为空'
+      }).then(({ value }) => {
+        const msg = {
+          liveId: this.liveId,
+          userId: m.userId,
+          userType: 1,
+          cmd: 'replyUser',
+          msg: value.trim(),
+          avatar: this.$store.state.user.user.avatar,
+          nickName: this.$store.state.user.user.nickName
+        }
+        this.socket.send(JSON.stringify(msg))
+      }).catch(() => {})
+    },
     deleteMsg(m){
       // 1. 弹出确认对话框
       this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
@@ -654,13 +674,13 @@ export default {
 
       this.newMsg = '';
     },
-    // 显示顶部消息对话框
+    // 显示官方消息对话框
     showTopMsgDialog() {
       this.topMsgForm.msg = '';
       this.topMsgForm.duration = 5;
       this.topMsgDialogVisible = true;
     },
-    // 发送顶部消息
+    // 发送官方消息
     sendTopMessage() {
       // 发送前简单校验
       if (this.topMsgForm.msg.trim() === '') {
@@ -687,7 +707,7 @@ export default {
       this.socket.send(JSON.stringify(msg))
 
       this.topMsgDialogVisible = false;
-      this.$message.success('顶部消息发送成功');
+      this.$message.success('官方消息发送成功');
     },
     sendMessage() {
       // 发送前简单校验
@@ -710,10 +730,20 @@ export default {
       this.newMsg = '';
     },
     handleWsMessage(event) {
-      let { code, data } = JSON.parse(event.data)
-      if (code === 200) {
-        let { cmd } = data
-        if (cmd === 'sendMsg') {
+      const res = JSON.parse(event.data)
+      const { code, data, msg } = res
+      if (code !== 200) {
+        this.$message.error(msg || '操作失败')
+        return
+      }
+      if (!data) {
+        if (msg) {
+          this.$message.success(msg)
+        }
+        return
+      }
+      let { cmd } = data
+      if (cmd === 'sendMsg') {
           let message = JSON.parse(data.data)
 
           let user = this.alDisplayList.find(u => u.userId === message.userId)
@@ -787,7 +817,6 @@ export default {
         } else if (cmd === 'live_end') {
 
         }
-      }
     },
     getLive(){
       getLive(this.liveId).then(res => {