From 756cb28daa32d9450611428e085de09d8767be16 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Sun, 23 Nov 2025 16:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E6=AD=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE=E7=9A=84API?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(ui): 在顶部导航栏添加客服按钮及样式
添加客服按钮功能，包括获取IM链接和用户信息验证

refactor(order): 重构分销订单状态显示逻辑
统一订单状态显示为"未完成"、"完成"和"退款"，并调整对应颜色
---
 manager/src/api/pages.js                      |  2 +-
 .../views/distribution/distributionOrder.vue  | 13 +++----
 seller/src/views/Main.vue                     | 37 +++++++++++++++++++
 .../views/distribution/distributionOrder.vue  | 18 ++++-----
 seller/src/views/main.scss                    | 14 +++++++
 5 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/manager/src/api/pages.js b/manager/src/api/pages.js
index 1663dd13..ce6b4e10 100644
--- a/manager/src/api/pages.js
+++ b/manager/src/api/pages.js
@@ -114,5 +114,5 @@ export const getPrivacy = (type) => {
 }
 //修改隐私协议数据
 export const updatePrivacy = (id,type,params) => {
-    return putRequest(`/other/article/updateArticle/${type}?id=${id}`, params, {"Content-Type": "application/json"})
+    return putRequest(`/other/article/updateArticle/${type}/${id}`, params, {"Content-Type": "application/json"})
 }
\ No newline at end of file
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index b1596b5f..41329b4f 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -210,7 +210,7 @@
       },
       filterStatus (status) { // 过滤订单状态
         const arr = [
-          {status: 'WAIT_BILL', title: '待结算'},
+          {status: 'NO_COMPLETED', title: '未完成'},
           {status: 'COMPLETE', title: '完成'},
           {status: 'REFUND', title: '退款'},
         ]
@@ -219,21 +219,20 @@
             return arr[i].title;
           }
         }
+        return '未完成'; // 默认返回未完成
       },
       filterStatusColor (status) { // 状态tag标签颜色
         const arr = [
-          {status: 'WAIT_BILL', color: 'blue'},
-          {status: 'WAIT_CASH', color: 'orange'},
-          {status: 'COMPLETE_CASH', color: 'green'},
-          {status: 'CANCEL', color: 'red'},
-          {status: 'NO_COMPLETED', color: 'red'},
-          {status: 'REFUND', color: 'magenta'},
+          {status: 'NO_COMPLETED', color: 'orange'},
+          {status: 'COMPLETE', color: 'green'},
+          {status: 'REFUND', color: 'red'},
         ]
         for (let i=0;i<arr.length;i++) {
           if (arr[i].status === status) {
             return arr[i].color;
           }
         }
+        return 'orange'; // 默认返回橙色
       }
     },
     mounted() {
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index cfba04fa..13d42126 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -29,6 +29,11 @@
               class="user-dropdown-innercon"
             >
               <ul class="nav-list">
+                <li class="nav-item " @click="im">
+                  <Tooltip content="联系客服">
+                    <Button type="info" size="small" :loading='load' icon="md-chatbubbles">客服</Button>
+                  </Tooltip>
+                </li>
                 <li class="nav-item " @click="handleClickSetting">
                   <Tooltip content="设置">
                     <Icon size="16" type="md-settings" />
@@ -88,6 +93,8 @@ import configDrawer from "@/views/main-components/config-drawer.vue";
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
 import { logout } from "@/api/index";
+import { getIMDetail } from "@/api/common";
+import { userMsg } from "@/api/index";
 const config = require("@/config/index.js");
 export default {
   components: {
@@ -103,6 +110,8 @@ export default {
       userInfo: {}, // 用户信息
 
       storeSideLogo: "", //logo图片
+      IMLink: "", // IM链接
+      load: false, // 加载IM状态
     };
   },
   computed: {
@@ -131,6 +140,34 @@ export default {
     handleClickSetting() {
       this.$refs.config.open();
     },
+    
+    /**
+     * 点击登录im的时候需要去判断一下当前店铺信息是否失效
+     * 失效的话重新请求刷新token保证最新的token去访问im
+     */
+    async im () {
+       // 获取访问Token
+       let accessToken = this.getStore("accessToken");
+       this.load = true
+       await this.getIMDetailMethods();
+       const userInfo = await userMsg();
+       this.load = false
+       if (userInfo.success && this.IMLink) {
+         window.open(`${this.IMLink}?token=` + accessToken);
+       }
+       else{
+         this.$Message.error("请登录后再联系客服");
+       }
+     },
+
+    // 获取im信息
+     async getIMDetailMethods () {
+       let res = await getIMDetail();
+       if (res.success) {
+         this.IMLink = res.result;
+       }
+     },
+    
     // 初始化方法
     init() {
       // 菜单
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index d88d844e..934c924f 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -63,16 +63,14 @@ export default {
           width: 100,
           sortable: false,
           render: (h, params) => {
-            if (params.row.distributionOrderStatus == "COMPLETE_CASH") {
-              return h("Tag", { props: { color: "green" } },"提现完成");
-            } else if (params.row.distributionOrderStatus == "WAIT_BILL") {
-              return h("Tag", { props: { color: "blue" } } ,"待结算");
-            } else if (params.row.distributionOrderStatus == "WAIT_CASH") {
-              return h("Tag", { props: { color: "orange" } }, "待提现");
-            } else if (params.row.distributionOrderStatus == "CANCEL") {
-              return h("Tag", { props: { color: "red" } }, "订单已取消");
-            }else if (params.row.distributionOrderStatus == "REFUND") {
-              return h("Tag", { props: { color: "magenta" } }, "退款");
+            if (params.row.distributionOrderStatus == "NO_COMPLETED") {
+              return h("Tag", { props: { color: "orange" } }, "未完成");
+            } else if (params.row.distributionOrderStatus == "COMPLETE") {
+              return h("Tag", { props: { color: "green" } }, "完成");
+            } else if (params.row.distributionOrderStatus == "REFUND") {
+              return h("Tag", { props: { color: "red" } }, "退款");
+            } else {
+              return h("Tag", { props: { color: "orange" } }, "未完成");
             }
 
           },
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
index 1728fca6..ee3d5909 100644
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@@ -188,6 +188,20 @@
         align-items: center;
       }
 
+      /* 顶部右侧自定义按钮列表，确保水平排列 */
+      .nav-list {
+        display: inline-flex;
+        align-items: center;
+        gap: 10px;
+        list-style: none;
+        margin: 0;
+        padding: 0;
+      }
+      .nav-list .nav-item {
+        display: inline-flex;
+        align-items: center;
+      }
+
 
       .full-screen-btn-con {
         display: inline-block;