From 1f02b45600cacc71fa51d0ae1d2f67f99ee35ca4 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 10 Aug 2021 09:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/change-password/change-password.vue |  5 +-
 .../src/views/goods/goods-info/goodsApply.vue |  2 +-
 manager/src/views/main.scss                   |  4 +-
 manager/src/views/member/advance/recharge.vue | 58 ++++++-------
 manager/src/views/order/order/orderList.vue   |  5 +-
 .../promotion/pointsGoods/pointsGoods.vue     |  3 +-
 .../src/views/promotion/seckill/seckill.vue   |  3 -
 .../seller/bill/accountStatementBill.vue      | 22 +++--
 manager/src/views/seller/bill/bill.vue        | 38 ++++----
 .../src/views/seller/shop/shopAuditList.vue   | 50 ++++++-----
 manager/src/views/seller/shop/shopList.vue    | 68 +++++++--------
 .../src/views/sys/app-version/appVersion.vue  | 22 +++--
 .../src/views/sys/log-manage/logManage.vue    | 66 +++++++-------
 .../sys/message/noticeMessageTemplate.vue     | 86 ++++++++-----------
 .../sys/setting-manage/platformSetting.vue    | 10 +--
 .../src/views/sys/user-manage/userManage.vue  | 51 ++++++-----
 16 files changed, 233 insertions(+), 260 deletions(-)

diff --git a/manager/src/views/change-password/change-password.vue b/manager/src/views/change-password/change-password.vue
index 5633d9ac..2d94edec 100644
--- a/manager/src/views/change-password/change-password.vue
+++ b/manager/src/views/change-password/change-password.vue
@@ -4,10 +4,9 @@
   <div>
     <Card class="change-pass">
       <p slot="title">
-        <Icon type="key"></Icon>
         修改密码
       </p>
-      <div>
+      <div class="mt_10">
         <Form ref="editPasswordForm" :model="editPasswordForm" :label-width="100" label-position="right" :rules="passwordValidate" style="width:450px">
           <FormItem label="原密码" prop="oldPass">
             <Input type="password" v-model="editPasswordForm.oldPassword" placeholder="请输入现在使用的密码"></Input>
@@ -19,7 +18,7 @@
             <Input type="password" v-model="editPasswordForm.rePassword" placeholder="请再次输入新密码"></Input>
           </FormItem>
           <FormItem>
-            <Button type="primary" style="width: 100px;margin-right:5px" :loading="savePassLoading" @click="saveEditPass">保存
+            <Button type="primary" class="mr_10" :loading="savePassLoading" @click="saveEditPass">保存
             </Button>
             <Button @click="cancelEditPass">取消</Button>
           </FormItem>
diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue
index c38ada86..26a7fbad 100644
--- a/manager/src/views/goods/goods-info/goodsApply.vue
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -27,7 +27,7 @@
             style="width: 200px"
           />
         </Form-item>
-        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
       </Form>
       <Table
         :loading="loading"
diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss
index d696df11..e743f5e0 100644
--- a/manager/src/views/main.scss
+++ b/manager/src/views/main.scss
@@ -302,8 +302,6 @@
 }
 
 .menu-bar::-webkit-scrollbar {
-  // width: 6px;
-  // height: 6px;
   display: none;
 }
 
@@ -330,4 +328,4 @@
   right: 4px;
   z-index: 100;
   top: 1px;
-}
+}
\ No newline at end of file
diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue
index f4ffbec5..f70a10e3 100644
--- a/manager/src/views/member/advance/recharge.vue
+++ b/manager/src/views/member/advance/recharge.vue
@@ -1,33 +1,32 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
-          <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="充值单号" prop="rechargeSn">
-            <Input
-              type="text"
-              v-model="searchForm.rechargeSn"
-              placeholder="请输入充值单号"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="支付时间">
+      <Form
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        :label-width="70"
+        class="search-form"
+      >
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="充值单号" prop="rechargeSn">
+          <Input
+            type="text"
+            v-model="searchForm.rechargeSn"
+            placeholder="请输入充值单号"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="支付时间">
           <DatePicker
             v-model="selectDate"
             type="datetimerange"
@@ -38,9 +37,8 @@
             style="width: 200px"
           ></DatePicker>
         </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Table
         :loading="loading"
         border
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 14f67c1c..3b4b8328 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="search">
+  <div>
     <Card>
       <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
         <Form-item label="订单号" prop="orderSn">
@@ -20,7 +20,6 @@
         <Form-item label="下单时间">
           <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
         </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         <Form-item label="订单状态" prop="orderStatus">
           <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
             <Option value="UNPAID">未付款</Option>
@@ -32,7 +31,7 @@
             <Option value="CANCELLED">已取消</Option>
           </Select>
         </Form-item>
-        
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
       </Form>
       <div>
         <download-excel class="export-excel-wrapper" :data="data" :fields="fields" :fetch="exportOrder" name="商品订单.xls">
diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
index 1c79e069..753d2b28 100644
--- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -16,10 +16,11 @@
               <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
           <Form-item label="SKU编码">
             <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" clearable style="width: 200px" />
           </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          
         </Form>
       </Row>
       <Row class="operation padding-row">
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index 662a5dc4..3d58cffa 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -21,9 +21,6 @@
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
-      <!-- <Row class="operation padding-row">
-        <Button type="primary" @click="add">添加活动</Button>
-      </Row> -->
       <Tabs value="list" class="mt_10" @on-click="clickTabPane">
         <TabPane label="秒杀活动列表" name="list">
           <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue
index f4b2b339..e6f16a0f 100644
--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -1,19 +1,17 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="账单编号" prop="sn">
-            <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
-          </Form-item>
-          <Form-item label="出帐时间" prop="createTime">
-            <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
-            </DatePicker>
-          </Form-item>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="账单编号" prop="sn">
+          <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="出帐时间" prop="createTime">
+          <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+          </DatePicker>
+        </Form-item>
 
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" @on-selection-change="changeSelect">
       </Table>
       <Row type="flex" justify="end" class="mt_10">
diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue
index 45ac8f8a..e237518d 100644
--- a/manager/src/views/seller/bill/bill.vue
+++ b/manager/src/views/seller/bill/bill.vue
@@ -1,26 +1,24 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="账单编号" prop="sn">
-            <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
-          </Form-item>
-          <Form-item label="出帐时间" prop="createTime">
-            <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
-            </DatePicker>
-          </Form-item>
-          <Form-item label="筛选状态">
-            <Select v-model="searchForm.billStatus" style="width:160px">
-              <Option value="">全部</Option>
-              <Option value="OUT">已出账</Option>
-              <Option value="CHECK">已核对</Option>
-              <Option value="COMPLETE">已完成</Option>
-            </Select>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="账单编号" prop="sn">
+          <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="出帐时间" prop="createTime">
+          <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+          </DatePicker>
+        </Form-item>
+        <Form-item label="筛选状态">
+          <Select v-model="searchForm.billStatus" style="width:160px">
+            <Option value="">全部</Option>
+            <Option value="OUT">已出账</Option>
+            <Option value="CHECK">已核对</Option>
+            <Option value="COMPLETE">已完成</Option>
+          </Select>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Row class="operation padding-row">
         <Button @click="delAll">批量删除</Button>
       </Row>
diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue
index 8fe24232..01837082 100644
--- a/manager/src/views/seller/shop/shopAuditList.vue
+++ b/manager/src/views/seller/shop/shopAuditList.vue
@@ -1,32 +1,30 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="店铺名称" prop="storeName">
-            <Input
-              type="text"
-              v-model="searchForm.storeName"
-              placeholder="请输入店铺名称"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="创建时间" prop="createTime">
-            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="店铺名称" prop="storeName">
+          <Input
+            type="text"
+            v-model="searchForm.storeName"
+            placeholder="请输入店铺名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="创建时间" prop="createTime">
+          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
index 68aa50a5..72cfa1a2 100644
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -1,41 +1,39 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="店铺名称" prop="storeName">
-            <Input
-              type="text"
-              v-model="searchForm.storeName"
-              placeholder="请输入店铺名称"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="店铺状态">
-            <Select v-model="searchForm.storeDisable" clearable style="width: 200px">
-              <Option value="OPEN">开启中</Option>
-              <Option value="CLOSED">已关闭</Option>
-              <Option value="APPLY">申请中</Option>
-              <Option value="APPLYING">审核中</Option>
-              <Option value="REFUSED">审核拒绝</Option>
-            </Select>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          <Form-item label="创建时间" prop="createTime">
-            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-          </Form-item>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="店铺名称" prop="storeName">
+          <Input
+            type="text"
+            v-model="searchForm.storeName"
+            placeholder="请输入店铺名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="店铺状态">
+          <Select v-model="searchForm.storeDisable" clearable style="width: 200px">
+            <Option value="OPEN">开启中</Option>
+            <Option value="CLOSED">已关闭</Option>
+            <Option value="APPLY">申请中</Option>
+            <Option value="APPLYING">审核中</Option>
+            <Option value="REFUSED">审核拒绝</Option>
+          </Select>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        <Form-item label="创建时间" prop="createTime">
+          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+      </Form>
       <Row class="operation padding-row">
         <Button @click="add" type="primary">添加</Button>
       </Row>
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
index fe26ba64..b4a3eb01 100644
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -1,22 +1,26 @@
 <template>
   <div class="search">
     <Card>
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form" @keydown.enter.native="handleSearch">
-          <Form-item label="系统类型" prop="orderSn">
-            <Select v-model="searchForm.type" placeholder="请选择系统类型" clearable style="width: 200px">
-              <Option value="IOS">苹果</Option>
-              <Option value="ANDROID">安卓</Option>
-            </Select>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
-        </Form>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form" @keydown.enter.native="handleSearch">
+        <Form-item label="系统类型" prop="orderSn">
+          <Select v-model="searchForm.type" placeholder="请选择系统类型" clearable style="width: 200px">
+            <Option value="IOS">苹果</Option>
+            <Option value="ANDROID">安卓</Option>
+          </Select>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+      </Form>
+
       <Button class="mt_10 mb_10" @click="addAppVersion" type="primary">添加</Button>
+
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
           size="small" show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
+    
     <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1000">
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
         <FormItem label="版本名称" prop="versionName">
diff --git a/manager/src/views/sys/log-manage/logManage.vue b/manager/src/views/sys/log-manage/logManage.vue
index 6de64c69..f1902238 100644
--- a/manager/src/views/sys/log-manage/logManage.vue
+++ b/manager/src/views/sys/log-manage/logManage.vue
@@ -2,40 +2,38 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70"   class="search-form">
-          <Form-item label="搜索日志" prop="searchKey">
-            <Input
-              type="text"
-              v-model="searchForm.searchKey"
-              placeholder="请输入搜索日志内容"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="操作人" prop="operatorName">
-            <Input
-              type="text"
-              v-model="searchForm.operatorName"
-              placeholder="请输入操作人"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="创建时间">
-            <DatePicker
-              type="daterange"
-              v-model="selectDate"
-              format="yyyy-MM-dd"
-              clearable
-              @on-change="selectDateRange"
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70"   class="search-form">
+        <Form-item label="搜索日志" prop="searchKey">
+          <Input
+            type="text"
+            v-model="searchForm.searchKey"
+            placeholder="请输入搜索日志内容"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="操作人" prop="operatorName">
+          <Input
+            type="text"
+            v-model="searchForm.operatorName"
+            placeholder="请输入操作人"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="创建时间">
+          <DatePicker
+            type="daterange"
+            v-model="selectDate"
+            format="yyyy-MM-dd"
+            clearable
+            @on-change="selectDateRange"
+            placeholder="选择起始时间"
+            style="width: 200px"
+          ></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Row class="operation padding-row">
         <Button @click="getLogList" icon="md-refresh">刷新</Button>
         <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue
index 2d84cbbc..4f483a6a 100644
--- a/manager/src/views/sys/message/noticeMessageTemplate.vue
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -6,48 +6,41 @@
           <Tabs value="MESSAGE" @on-click="paneChange">
 
             <TabPane label="站内信列表" name="MESSAGE">
-              <Row @keydown.enter.native="handleSearch">
-                <Form ref="searchForm" :model="searchMessageForm" inline :label-width="70" class="search-form">
-                  <Form-item label="消息标题" prop="title">
-                    <Input
-                      type="text"
-                      v-model="searchMessageForm.title"
-                      placeholder="请输入消息标题"
-                      clearable
-                      style="width: 200px"
-                    />
-                  </Form-item>
+              <Form ref="searchForm" :model="searchMessageForm" inline :label-width="70" class="search-form">
+                <Form-item label="消息标题" prop="title">
+                  <Input
+                    type="text"
+                    v-model="searchMessageForm.title"
+                    placeholder="请输入消息标题"
+                    clearable
+                    style="width: 200px"
+                  />
+                </Form-item>
 
-                  <Form-item label="消息内容" prop="content">
-                    <Input
-                      type="text"
-                      v-model="searchMessageForm.content"
-                      placeholder="请输入消息内容"
-                      clearable
-                      style="width: 200px"
-                    />
-                  </Form-item>
+                <Form-item label="消息内容" prop="content">
+                  <Input
+                    type="text"
+                    v-model="searchMessageForm.content"
+                    placeholder="请输入消息内容"
+                    clearable
+                    style="width: 200px"
+                  />
+                </Form-item>
 
-                  <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+                <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
 
-                </Form>
-              </Row>
+              </Form>
               <Row class="operation" style="margin-top: 20px">
                 <Button @click="sendMessage" type="primary">发送消息</Button>
               </Row>
-              <Row>
-                <Table
-                  :loading="loading"
-                  border
-                  :columns="messageColumns"
-                  :data="messageData"
-                  ref="table"
-                  sortable="custom"
-                  @on-sort-change="messageChangeSort"
-                  @on-selection-change="messageChangeSelect"
-                ></Table>
-              </Row>
-              <Row type="flex" justify="end" class="mt_10 mb_10">
+              <Table
+                class="mr_10"
+                :loading="loading"
+                border
+                :columns="messageColumns"
+                :data="messageData"
+              ></Table>
+              <Row type="flex" justify="end" class="mt_10 mb_10 mr_10">
                 <Page
                   :current="searchMessageForm.pageNumber"
                   :total="messageDataTotal"
@@ -64,16 +57,14 @@
             </TabPane>
 
             <TabPane label="通知类站内信" name="SETTING">
-              <Row>
-                <Table
-                  :loading="loading"
-                  border
-                  :columns="noticeColumns"
-                  :data="noticeData"
-                  ref="table"
-                ></Table>
-              </Row>
-              <Row type="flex" justify="end" class="mt_10">
+              <Table
+                :loading="loading"
+                border
+                class="mr_10"
+                :columns="noticeColumns"
+                :data="noticeData"
+              ></Table>
+              <Row type="flex" justify="end" class="mt_10 mr_10">
                 <Page
                   :current="searchForm.pageNumber"
                   :total="noticeDataTotal"
@@ -193,8 +184,7 @@
         <Button type="text" @click="messageModalVisible = false">取消</Button>
         <Button type="primary" :loading="submitLoading" @click="sendMessageSubmit"
         >发送
-        </Button
-        >
+        </Button>
       </div>
     </Modal>
 
diff --git a/manager/src/views/sys/setting-manage/platformSetting.vue b/manager/src/views/sys/setting-manage/platformSetting.vue
index 368ebf87..edf9f31e 100644
--- a/manager/src/views/sys/setting-manage/platformSetting.vue
+++ b/manager/src/views/sys/setting-manage/platformSetting.vue
@@ -5,11 +5,11 @@
         <TabPane label="基础设置" name="base">
           <div style="display:flex;position:relative">
             <Form
-                    ref="baseForm"
-                    :model="base"
-                    :label-width="140"
-                    label-position="right"
-                    :rules="baseValidate"
+              ref="baseForm"
+              :model="base"
+              :label-width="140"
+              label-position="right"
+              :rules="baseValidate"
             >
               <FormItem label="网站名称" prop="siteName">
                 <Input type="text" v-model="base.siteName" placeholder="请输入网站名称" style="width: 350px"/>
diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue
index e419b46a..06fd3964 100644
--- a/manager/src/views/sys/user-manage/userManage.vue
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -1,33 +1,30 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="用户名">
-            <Input
-              type="text"
-              v-model="searchForm.username"
-              placeholder="请输入用户名"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="联系方式">
-            <Input
-              type="text"
-              v-model="searchForm.mobile"
-              placeholder="请输入联系方式"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-
-          <Form-item label="部门">
-            <department-choose @on-change="handleSelectDep" style="width: 150px;" ref="dep"></department-choose>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="用户名">
+          <Input
+            type="text"
+            v-model="searchForm.username"
+            placeholder="请输入用户名"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="联系方式">
+          <Input
+            type="text"
+            v-model="searchForm.mobile"
+            placeholder="请输入联系方式"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="部门">
+          <department-choose @on-change="handleSelectDep" style="width: 150px;" ref="dep"></department-choose>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <Row class="operation padding-row">
         <Button @click="add" type="primary">添加</Button>
         <Button @click="delAll">批量删除</Button>