up.

z_ele/src/api/xm/channel/model/index.ts

@@ -8,5 +8,6 @@ export interface Channel {}
  * 会员搜索条件
  */
 export interface ChannelParam extends PageParam {
-  account?: string;
+  name?: string;
+  keyword?: string;
 }

z_ele/src/views/xm/channel/components/member-search.vue

@@ -11,36 +11,17 @@
           <el-form-item label="账号">
             <el-input
               clearable
-              v-model.trim="form.account"
+              v-model.trim="form.keyword"
-              placeholder="请输入(会员ID/手机号/ip)"
+              placeholder="请输入(渠道ID/渠道代码/渠道标识)"
             />
           </el-form-item>
         </el-col>
-        <el-col :lg="6" :md="18" :sm="17" :xs="24">
+        <el-col :lg="4" :md="8" :sm="12" :xs="24">
-          <el-form-item label="注册时间">
+          <el-form-item label="渠道名称">
-            <el-date-picker
+            <el-input
-              unlink-panels
+              clearable
-              type="datetimerange"
+              v-model.trim="form.name"
-              v-model="registerTime"
+              placeholder="请输入(渠道ID/渠道代码/渠道标识)"
-              range-separator="-"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              class="ele-fluid"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :lg="6" :md="18" :sm="17" :xs="24">
-          <el-form-item label="在线时间">
-            <el-date-picker
-              unlink-panels
-              type="datetimerange"
-              v-model="onlineTime"
-              range-separator="-"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              class="ele-fluid"
             />
           </el-form-item>
         </el-col>
@@ -57,31 +38,20 @@
 
 <script lang="ts" setup>
   import { useFormData } from '@/utils/use-form-data';
-  import type { MemberParam } from '@/api/xm/member/model';
+  import type { ChannelParam } from '@/api/xm/channel/model';
-  import { ref } from 'vue';
 
   const emit = defineEmits<{
-    (e: 'search', where?: MemberParam): void;
+    (e: 'search', where?: ChannelParam): void;
   }>();
 
   /** 表单数据 */
-  const [form, resetFields] = useFormData<MemberParam>({
+  const [form, resetFields] = useFormData<ChannelParam>({
-    account: ''
+    name: '',
+    keyword: ''
   });
-  const registerTime = ref([]);
-  const onlineTime = ref([]);
   /** 搜索 */
   const search = () => {
     let where: any = { ...form };
-    if (registerTime.value.length == 2 && registerTime.value[0]) {
-      where.registerStartTime = registerTime.value[0];
-      where.registerEndTime = registerTime.value[1];
-    }
-    if (onlineTime.value.length == 2 && onlineTime.value[0]) {
-      where.onlineStartTime = onlineTime.value[0];
-      where.onlineEndTime = onlineTime.value[1];
-    }
-
     emit('search', where);
   };
 

z_ele/src/views/xm/channel/index.vue

@@ -17,11 +17,11 @@
         <template #toolbar> </template>
         <template #action="{ row }">
           <el-link type="primary" underline="never" @click="openEdit(row)">
-            详情
+            编辑
           </el-link>
           <el-divider direction="vertical" />
           <el-link type="danger" underline="never" @click="remove(row)">
-            注销
+            删除
           </el-link>
         </template>
       </ele-pro-table>
@@ -67,40 +67,23 @@
       align: 'center'
     },
     {
-      prop: 'memberId',
+      prop: 'channelId',
-      label: '会员ID',
+      label: '渠道ID',
       width: 80
     },
     {
-      prop: 'channel.name',
+      prop: 'code',
-      label: '注册渠道',
+      label: '渠道代码',
+      width: 80
+    },
+    {
+      prop: 'name',
+      label: '渠道名称',
       minWidth: 120
     },
-    {
-      prop: 'realname',
-      label: '姓名',
-      width: 80
-    },
-    {
-      prop: 'telephoneMd5',
-      label: '手机号MD5',
-      minWidth: 300
-    },
-    {
-      prop: 'onlineIp',
-      label: '最后在线Ip',
-      width: 170,
-      align: 'center'
-    },
-    {
-      prop: 'onlineTime',
-      label: '最后在线时间',
-      width: 170,
-      align: 'center'
-    },
     {
       prop: 'createTime',
-      label: '注册时间',
+      label: '创建时间',
       width: 170,
       align: 'center'
     },