精简搜索函数, 添加页面

miniprogram/pages/logs/loginLog/loginLog.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -25,12 +32,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -38,16 +40,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/logs/loginLog/loginLog.wxml

@@ -4,11 +4,11 @@
     bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name">
     <view slot="content">
       <search-input label="登录IP" value="{{params.login_ip}}" data-key="login_ip"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <date-picker-plugin title="登录开始日期" value="{{params.login_timeL}}" data-key="login_timeL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="登录结束日期" value="{{params.login_timeU}}" data-key="login_timeU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/logs/operateLog/operateLog.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -25,12 +32,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -38,16 +40,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/logs/operateLog/operateLog.wxml

@@ -4,12 +4,12 @@
     bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name">
     <view slot="content">
       <search-input label="操作IP" value="{{params.client_ip}}" data-key="client_ip"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
       <date-picker-plugin title="操作开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="操作结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>