开发ing

src/views/preRegManage/edit.vue

@@ -437,6 +437,9 @@ export default Vue.extend({
     </div>
     <div class="comp-edit">
       <template v-if="getIndexByKey(currentKey) === -1">
+        <div class="button">
+          <el-button type="primary">保存表单</el-button>
+        </div>
         <div class="title">表单设定</div>
         <div class="body">
           <div class="tips">表单名称</div>
@@ -444,9 +447,6 @@ export default Vue.extend({
           <div class="tips">表单介绍</div>
           <el-input type="textarea" v-model="formInfo.desc" placeholder="请输入表单介绍" />
         </div>
-        <div class="button">
-          <el-button type="primary">保存表单</el-button>
-        </div>
       </template>
       <template v-else>
         <div class="title">
@@ -863,9 +863,9 @@ export default Vue.extend({
       position: relative;
       box-shadow: 0 1px 4px 0 #00000022;
       display: grid;
-      grid-template-rows: auto 1fr auto;
+      grid-template-rows: auto auto 1fr;
       .body{
-        padding: 0 24px;
+        padding: 0 16px;
         display: flex;
         flex-direction: column;
         align-items: flex-end;
@@ -897,10 +897,10 @@ export default Vue.extend({
       .button{
         display: flex;
         justify-content: flex-end;
-        padding: 24px;
+        padding: 16px;
       }
       .title{
-        padding: 24px;
+        padding: 16px;
         display: flex;
         align-items: center;
         .icon{

src/views/setting/rolesSetting.vue

@@ -55,36 +55,39 @@ export default Vue.extend({
       </div>
       <div class="scroll">
         <div class="menu">
-          <div class="menu-item" v-for="(item,index) in menuRouter">
-            <div class="name">
-              <span :class="item.meta.icon">{{item.meta.title}}</span>
-              <el-switch></el-switch>
-            </div>
-            <div class="children" v-if="item.meta.func">
-              <div class="menu-item" v-for="(func,index) in item.meta.func">
-                <div class="name">
-                  <span>{{func.name}}</span>
-                  <el-switch></el-switch>
-                </div>
+          <template v-for="(item,index) in menuRouter">
+            <div  class="menu-item">
+              <div class="name">
+                <span :class="item.meta.icon">{{item.meta.title}}</span>
+                <el-switch class="switch"></el-switch>
               </div>
-            </div>
-            <div class="children" v-if="item.children">
-              <div class="menu-item" v-for="(child,index) in item.children">
-                <div class="name">
-                  <span :class="child.meta.icon">{{child.meta.title}}</span>
-                  <el-switch></el-switch>
+              <div class="children" v-if="item.meta.func">
+                <div class="menu-item" v-for="(func,index) in item.meta.func">
+                  <div class="name">
+                    <span>{{func.name}}</span>
+                    <el-switch class="switch"></el-switch>
+                  </div>
                 </div>
-                <div class="children" v-if="child.meta.func">
-                  <div class="menu-item" v-for="(func,index) in child.meta.func">
-                    <div class="name">
-                      <span>{{func.name}}</span>
-                      <el-switch></el-switch>
+              </div>
+              <div class="children" v-if="item.children">
+                <div class="menu-item" v-for="(child,index) in item.children">
+                  <div class="name">
+                    <span :class="child.meta.icon">{{child.meta.title}}</span>
+                    <el-switch class="switch"></el-switch>
+                  </div>
+                  <div class="children" v-if="child.meta.func">
+                    <div class="menu-item" v-for="(func,index) in child.meta.func">
+                      <div class="name">
+                        <span>{{func.name}}</span>
+                        <el-switch class="switch"></el-switch>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
+            <div class="hr"></div>
+          </template>
         </div>
       </div>
     </div>
@@ -131,11 +134,19 @@ export default Vue.extend({
         border-radius: 8px;
         box-shadow: 0 0 8px 0 #00000018;
         width: 100%;
+        .hr:not(:last-child){
+          width: calc(100% - 16px);
+          margin: 8px;
+          border-bottom: 1px solid #d8dde4;
+        }
         .menu-item{
           border-radius: 8px;
           cursor: default;
           border-right: 2px solid transparent;
-          padding: 10px 16px;
+          padding: 10px 0 10px 16px;
+          .switch{
+            margin-right: 16px;
+          }
           .name{
             color: $menuText;
             font-size: 17px;