Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

src/views/login.vue

@@ -34,7 +34,7 @@
             </div>
           </el-form-item>
           <el-checkbox class="login-remb" v-model="loginForm.rememberMe"
-            style="margin: 0px 0px 25px 0px">记住密码</el-checkbox>
+            style="margin: 10px 0px 25px 0px">记住密码</el-checkbox>
           <el-form-item style="width: 100%">
             <el-button :loading="loading" class="login-btn" size="medium" type="primary" style="width: 100%"
               @click.native.prevent="handleLogin">
@@ -260,6 +260,7 @@ export default {
     input {
       height: 50px;
       border-color: #266faa72;
+      padding:0 50px;
     }
   }
 

src/views/risk/plan/ledger.vue

@@ -42,7 +42,15 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
+
     </el-form>
+    <el-row :gutter="10" class="mb8">
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center">