From 529bfcd6660f6707b5ab1cd7412f166bb5b25836 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 11:16:16 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E9=9A=90=E8=97=8FDeepMate=E5=92=8CDeepExpl?=
 =?UTF-8?q?ore"=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95=E8=BF=87"=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=92=8C"=E6=98=AF=E5=90=A6=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95"=E5=88=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index 620230d..2ce997b 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -35,7 +35,7 @@
               </div>
             </div>
             <div class="search-group2">
-              <div class="search-item">
+              <!-- <div class="search-item">
                 <span class="form-label">是否登录过</span>
                 <el-select 
                   v-model="searchFormDM.is_login" 
@@ -46,7 +46,7 @@
                   <el-option label="登录过" value="1" />
                   <el-option label="未登录过" value="0" />
                 </el-select>
-              </div>
+              </div> -->
               <div class="search-item">
                 <span class="form-label">客户类型</span> 
                 <el-select 
@@ -125,7 +125,7 @@
         <el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
         <el-table-column prop="dcname" label="姓名" align="center" header-align="center"/>
         <el-table-column prop="inviter" label="归属" align="center" header-align="center"/>
-        <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
+        <!-- <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
           <template #default="scope">
             <el-tag
               v-if="scope.row.is_login === 1"
@@ -144,7 +144,7 @@
               没登录过
             </el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
         <el-table-column prop="token_num" label="token数量" align="center" header-align="center"/>
         <el-table-column prop="updated_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
@@ -273,7 +273,7 @@
               </div>
             </div>
             <div class="search-groupDE2">
-              <div class="search-itemDE">
+              <!-- <div class="search-itemDE">
                 <span class="form-labelDE">是否登录过</span>
                 <el-select 
                   v-model="searchFormDE.is_login" 
@@ -284,7 +284,7 @@
                   <el-option label="登录过" value="1" />
                   <el-option label="未登录过" value="0" />
                 </el-select>
-              </div>
+              </div> -->
               <div class="search-itemDE">
                 <span class="form-labelDE">客户类型</span> 
                 <el-select 
@@ -381,7 +381,7 @@
         <el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
         <el-table-column prop="dcname" label="姓名" align="center" header-align="center"/>
         <el-table-column prop="inviter" label="归属" align="center" header-align="center"/>
-        <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
+        <!-- <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
           <template #default="scope">
             <el-tag
               v-if="scope.row.is_login === 1"
@@ -400,7 +400,7 @@
               没登录过
             </el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="name" label="指标名称" align="center" header-align="center" width="200">
           <template #default="scope">
             <el-tooltip 

From ac6da393eee7a1de477a1b29e8a50f0fabf582b2 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 11:26:33 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E9=9A=90=E8=97=8Ftoken=E5=88=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index 2ce997b..9deb268 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -146,7 +146,7 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
-        <el-table-column prop="token_num" label="token数量" align="center" header-align="center"/>
+        <!-- <el-table-column prop="token_num" label="token数量" align="center" header-align="center"/> -->
         <el-table-column prop="updated_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
         <el-table-column label="操作" align="center" header-align="center">
           <template #default="scope">

From 1ca808e6ec017b6063858537232bbea3a57ba0bc Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 11:53:01 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=85=8D?=
 =?UTF-8?q?=E8=B4=B9token=E5=92=8C=E4=BB=98=E8=B4=B9token=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index 9deb268..aba52be 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -147,6 +147,8 @@
         </el-table-column> -->
         <el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
         <!-- <el-table-column prop="token_num" label="token数量" align="center" header-align="center"/> -->
+        <el-table-column prop="remain_free_num" label="免费token" align="center" header-align="center"/>
+        <el-table-column prop="remain_num" label="付费token" align="center" header-align="center"/>
         <el-table-column prop="updated_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
         <el-table-column label="操作" align="center" header-align="center">
           <template #default="scope">

From 2674e7cb1839c8e234002193ad51f54a77dfc5ac Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 13:59:49 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E3=80=81=E4=BB=98=E8=B4=B9token=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index aba52be..3a4f89c 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -197,9 +197,14 @@
           <label class="form-label">设置用户次数</label>
           <div class="count-group">
             <!-- Deep Mate：不可编辑文本框 -->
-            <el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
+            <el-input v-model="dmText" disabled style="width: 120px; margin-right: 16px;"/>
+            <!-- token类型下拉框 -->
+            <el-select v-model="token_type" style="width: 100px; margin-right: 16px;">
+              <el-option label="免费token" value="free_num" />
+              <el-option label="付费token" value="pay_num" />
+            </el-select>
             <!-- token数量：只能正整数 -->
-            <el-input v-model.number="token_num" type="number" style="width: 210px;" placeholder="请输入次数(只能为正)"/>
+            <el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(只能为正)"/>
           </div>
         </div>
 
@@ -208,8 +213,13 @@
           <div class="count-group">
             <!-- Deep Mate：不可编辑文本框 -->
             <el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
+            <!-- token类型下拉框 -->
+            <el-select v-model="token_type" style="width: 140px; margin-right: 16px;">
+              <el-option label="免费token" value="free_num" />
+              <el-option label="付费token" value="pay_num" />
+            </el-select>
             <!-- token数量：支持正负整数 -->
-            <el-input v-model.number="token_num" type="number" style="width: 210px;" placeholder="请输入次数(可正负)"/>
+            <el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(可正负)"/>
           </div>
         </div>
 
@@ -766,6 +776,7 @@ const dialogVisibleDM = ref(false);
 const hlidsInput = ref(''); 
 const dmText = ref('Deep Mate');
 const token_num = ref('');
+const token_type = ref('free_num'); // token类型：free_num-免费token, pay_num-付费token
 
 // DeepMate编辑回显内容
 const deadtoken = ref('');
@@ -855,8 +866,10 @@ const submitFormDM = async () => {
         .map(item => item.trim())
         .filter(item => item)
         .join('\n'),
-      // token数量
-      token_num: token_num.value,
+      // token数量根据类型分别传递
+      ...(token_type.value === 'free_num' 
+        ? { free_num: token_num.value } 
+        : { pay_num: token_num.value }),
       // 备注
       remark: remark.value.trim(),
       // 操作人
@@ -893,6 +906,7 @@ const cancelDM = () => {
 const resetFormDM = () => {
   hlidsInput.value = '';
   token_num.value = '';
+  token_type.value = 'free_num';
   remark.value = '';
   operator.value = '';
 };

From 572655cda4f4fa9c934cd7371f8f0d3c365c2e50 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 14:05:56 +0800
Subject: [PATCH 5/9] =?UTF-8?q?token=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index 3a4f89c..ba3ea28 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -146,9 +146,9 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
-        <!-- <el-table-column prop="token_num" label="token数量" align="center" header-align="center"/> -->
+        <el-table-column prop="remain_num" label="token数量" align="center" header-align="center"/>
         <el-table-column prop="remain_free_num" label="免费token" align="center" header-align="center"/>
-        <el-table-column prop="remain_num" label="付费token" align="center" header-align="center"/>
+        <el-table-column prop="remain_pay_num" label="付费token" align="center" header-align="center"/>
         <el-table-column prop="updated_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
         <el-table-column label="操作" align="center" header-align="center">
           <template #default="scope">

From b777e7923338df6ac7b099d89d01d21b50e912e7 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 15:13:32 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/userPermissions.js                |  9 +++++++++
 src/views/UserPermissions/LogDeepMate.vue | 16 +++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/api/userPermissions.js b/src/api/userPermissions.js
index 54edf3d..3f5713a 100644
--- a/src/api/userPermissions.js
+++ b/src/api/userPermissions.js
@@ -47,6 +47,15 @@ export function logMListApi(params) {
   });
 }
 
+// deepMate操作日志
+export function logDeepMateApi(params) {
+  return request({
+    url: base_url + "/admin/deepMate/operation/record/list",
+    method: "post",
+    data: params,
+  });
+}
+
 // 行情期限--获取用户列表
 export function userMListApi(params) {
   return request({
diff --git a/src/views/UserPermissions/LogDeepMate.vue b/src/views/UserPermissions/LogDeepMate.vue
index 238d6f5..e6ba670 100644
--- a/src/views/UserPermissions/LogDeepMate.vue
+++ b/src/views/UserPermissions/LogDeepMate.vue
@@ -23,7 +23,8 @@
         <el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
         <el-table-column prop="name" label="姓名" align="center" header-align="center"/>
         <el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
-        <el-table-column prop="token_change_num" label="token数量" align="center" header-align="center"/>
+        <el-table-column prop="type" label="类型" align="center" header-align="center"/>
+        <el-table-column prop="num" label="数量" align="center" header-align="center"/>
         <el-table-column prop="created_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
         <el-table-column prop="remark" label="备注" align="center" header-align="center">
           <template #default="scope">
@@ -53,7 +54,7 @@
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import { logMListApi } from '../../api/userPermissions'
+import { logDeepMateApi } from '../../api/userPermissions'
 import { useRoute, useRouter } from 'vue-router'; 
 
 // token
@@ -86,19 +87,16 @@ const currentPage = ref(1);
 const pageSize = ref(10); 
 
 // 获取表格数据
-const logTableData = async (dccode) => {
+const logTableData = async (jwcode) => {
   try {
     tableLoading.value = true;
     const requestParams = {
       token: token,
-      dccode: dccode, 
-      type: 2,
-      sort_field: sortProp.value,
-      sort_order: sortOrder.value,
+      jwcode: jwcode,
       page: currentPage.value,
-      page_size: pageSize.value     
+      page_size: pageSize.value
     };
-    const data = await logMListApi(requestParams);
+    const data = await logDeepMateApi(requestParams);
     tableData.value = data.list
     datatotal.value = data.total
   } catch (error) {

From aa22571caf3afbf22df6aae711f32ae6c4644478 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 15:27:25 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?token=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index ba3ea28..16db78f 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -214,10 +214,10 @@
             <!-- Deep Mate：不可编辑文本框 -->
             <el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
             <!-- token类型下拉框 -->
-            <el-select v-model="token_type" style="width: 140px; margin-right: 16px;">
+            <!-- <el-select v-model="token_type" style="width: 140px; margin-right: 16px;">
               <el-option label="免费token" value="free_num" />
               <el-option label="付费token" value="pay_num" />
-            </el-select>
+            </el-select> -->
             <!-- token数量：支持正负整数 -->
             <el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(可正负)"/>
           </div>

From d1574f71dc79de4c48df11e0a7bfc6266802fa5f Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 15:31:15 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index 16db78f..ce4cd4e 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -758,7 +758,7 @@ const exportListDM = () => {
 const handleEditDM = (row) => {
   dialogVisibleDM.value = true;
   hlidsInput.value = row.dccode;
-  deadtoken.value = row.token_num;
+  deadtoken.value = row.remain_num;
 };
 
 // DeepMate操作日志按钮

From cb075e7d26757292477c20753a8b629b7a858172 Mon Sep 17 00:00:00 2001
From: songjie <bestsongj@163.com>
Date: Tue, 17 Mar 2026 15:47:03 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=AE=8C=E6=88=90=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/UserPermissions/Module.vue | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/UserPermissions/Module.vue b/src/views/UserPermissions/Module.vue
index ce4cd4e..6fdc2ab 100644
--- a/src/views/UserPermissions/Module.vue
+++ b/src/views/UserPermissions/Module.vue
@@ -190,6 +190,8 @@
         <div class="info-container" v-if="addOrUpdataDM === 0">
           <span class="info-item">HLid: {{ hlidsInput }}</span>
           <span class="info-item">剩余次数：{{ deadtoken }}</span>
+          <span class="info-item">免费token：{{ deadtokenFree }}</span>
+          <span class="info-item">付费token：{{ deadtokenPay }}</span>
         </div>
 
         <!-- 设置数量 -->
@@ -212,12 +214,12 @@
           <label class="form-label">修改用户次数</label>
           <div class="count-group">
             <!-- Deep Mate：不可编辑文本框 -->
-            <el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
+            <el-input v-model="dmText" disabled style="width: 120px; margin-right: 16px;"/>
             <!-- token类型下拉框 -->
-            <!-- <el-select v-model="token_type" style="width: 140px; margin-right: 16px;">
+            <el-select v-model="token_type" style="width: 120px; margin-right: 16px;">
               <el-option label="免费token" value="free_num" />
               <el-option label="付费token" value="pay_num" />
-            </el-select> -->
+            </el-select>
             <!-- token数量：支持正负整数 -->
             <el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(可正负)"/>
           </div>
@@ -759,6 +761,8 @@ const handleEditDM = (row) => {
   dialogVisibleDM.value = true;
   hlidsInput.value = row.dccode;
   deadtoken.value = row.remain_num;
+  deadtokenFree.value = row.remain_free_num;
+  deadtokenPay.value = row.remain_pay_num;
 };
 
 // DeepMate操作日志按钮
@@ -780,6 +784,8 @@ const token_type = ref('free_num'); // token类型：free_num-免费token, pay_n
 
 // DeepMate编辑回显内容
 const deadtoken = ref('');
+const deadtokenFree = ref('');
+const deadtokenPay = ref('');
 
 // DeepMate判断开通还是编辑
 const addOrUpdataDM = ref(0);
@@ -1493,14 +1499,15 @@ const openDetail = async(dccode) => {
 .info-container {
   display: flex;
   align-items: center;
-  gap: 40px; 
-  padding: 0 20px 18px; 
-  color: #333; 
-  font-size: 16px; 
+  gap: 20px;
+  padding: 0 20px 18px;
+  color: #333;
+  font-size: 14px;
+  flex-wrap: wrap;
 }
 
 .info-item {
-  white-space: nowrap; 
+  white-space: nowrap;
 }
 
 /* Tab容器 */