yuhongqi 4 дней назад
Родитель
Сommit
8e9aa12751

+ 15 - 0
src/api/live/liveOrder.js

@@ -147,3 +147,18 @@ export function getUserPhone(id) {
     method: 'get'
   })
 }
+
+export function editDeliveryId(data){
+  return request({
+    url: '/live/liveOrder/editDeliveryId',
+    method: 'put',
+    data: data
+  })
+}
+
+export function getOrderExpress(orderId){
+  return request({
+    url: '/live/liveOrder/express/'+orderId,
+    method: 'get'
+  })
+}

+ 10 - 0
src/views/live/liveConsole/index.vue

@@ -1154,6 +1154,16 @@ export default {
           // 4. 关键:重新筛选所有Tab的显示列表,确保状态同步
           this.refreshUserDisplayLists(u);
 
+          // 5. 通过 WebSocket 通知后端更新 Redis 禁言列表,发消息时会据此判断
+          const wsMsg = {
+            liveId: this.liveId,
+            userId: u.userId,
+            cmd: 'mutedUser',
+            status: u.msgStatus,
+            userType: 1
+          };
+          this.socket.send(JSON.stringify(wsMsg));
+
           let msg = u.msgStatus === 0 ? "已解禁" : "已禁言"
           this.msgSuccess(msg);
           return

+ 31 - 11
src/views/live/liveOrder/liveOrderDetails.vue

@@ -259,8 +259,8 @@
             <el-option key="YD"  label="韵达" value="YD" />
           </el-select>
         </el-form-item>
-        <el-form-item label="物流单号" prop="deliverySn"  >
-          <el-input v-model="editDyForm.deliverySn" placeholder="请输入物流单号" />
+        <el-form-item label="物流单号" prop="deliveryId"  >
+          <el-input v-model="editDyForm.deliveryId" placeholder="请输入物流单号" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -300,7 +300,7 @@
 
 
 <script>
-import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder, getUserPhone, getLiveOrderAddress} from "@/api/live/liveOrder";
+import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, editDeliveryId,getOrderExpress, getExpress, listOrderitem, tuiOrder, getUserPhone, getLiveOrderAddress} from "@/api/live/liveOrder";
 
 
 export default {
@@ -326,9 +326,10 @@ export default {
         followDoctorId:null,
       },
       editDyForm:{
-        orderId:null,
-        deliveryId:null,
-        deliveryCode:null,
+        id: null,
+        orderId: null,
+        deliveryId: null,
+        deliveryCode: null,
       },
       showList:true,
       edit:{
@@ -389,7 +390,7 @@ export default {
         remark:"",
       },
       editDyRules:{
-        deliverySn: [
+        deliveryId: [
           { required: true, message: "物流单号不能为空", trigger: "blur" }
         ],
         deliveryCode: [
@@ -522,6 +523,15 @@ export default {
     editDelivery(){
       this.editDy.open = true;
       this.editDyForm.orderId = this.item.orderId;
+      if (scope && scope.row) {
+        this.editDyForm.id = scope.row.id;
+        this.editDyForm.deliveryCode = scope.row.deliverSn;
+        this.editDyForm.deliveryId = scope.row.deliverId;
+      } else {
+        this.editDyForm.id = null;
+        this.editDyForm.deliveryCode = null;
+        this.editDyForm.deliveryId = '';
+      }
 
     },
     showListD(){
@@ -846,18 +856,28 @@ export default {
     submitEditDyForm(){
       this.$refs["editDyForm"].validate(valid => {
         if (valid) {
-          console.log(this.editDyForm)
-          updateLiveOrder(this.editDyForm).then(response => {
+          const params = {
+            orderId: this.editDyForm.orderId,
+            deliverSn: this.editDyForm.deliveryCode,
+            deliverId: this.editDyForm.deliveryId,
+            type: 1
+          };
+          if (this.editDyForm.id != null) {
+            params.id = this.editDyForm.id;
+          }
+          editDeliveryId(params).then(response => {
             if (response.code === 200) {
               this.msgSuccess("操作成功");
               this.editDy.open = false;
               getLiveOrder(this.item.orderId).then(response => {
                 this.item = response.data;
-                // this.getlogList(this.item.orderId);
                 this.$parent.$parent.getList();
               });
+              getOrderExpress(this.item.orderId).then(response => {
+                this.deliverList = response.data || [];
+              });
             }
-          });
+          })
         }
       });
     },

+ 1 - 0
src/views/live/liveOrder/myIndex.vue

@@ -165,6 +165,7 @@
     <el-table border v-loading="loading" :data="liveOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单ID" align="center" prop="orderId"/>
+      <el-table-column label="直播ID" align="center" prop="liveId"/>
       <el-table-column label="订单号" align="center" prop="orderCode" />
       <el-table-column label="用户ID" align="center" prop="userId" />
       <el-table-column label="收货人" align="center" prop="userName" />

+ 7 - 1
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login" id="loginBox">
     <div class="login-con">
-        <div class="title">御君方管理平台</div>
+        <div class="title">{{ title }}</div>
       <el-form   ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
@@ -59,9 +59,15 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import defaultSettings from '@/settings'
 
 export default {
   name: "Login",
+  computed: {
+    title() {
+      return defaultSettings.title || '御君方管理平台'
+    }
+  },
   data() {
     return {
       codeUrl: "",

+ 1 - 1
vue.config.js

@@ -6,7 +6,7 @@ const defaultSettings = require('./src/settings.js')
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 // 定义压缩文件类型 压缩JS大小
 const productionGzipExtensions = ['js', 'css']
- 
+
 
 
 function resolve(dir) {