Merge remote-tracking branch 'origin/gzb' into wzl

src/assets/less/common.less

@@ -63,6 +63,9 @@ body,
 .ivu-table {
   color: #798cb5;
   background-color: #ffffff66;
+  .ivu-table-header {
+    background-color: #e9f0ff;
+  }
   .ivu-table-header,
   .ivu-table-fixed-header {
     thead tr {
@@ -136,6 +139,7 @@ body,
   }
   .ivu-table-cell {
     line-height: 1.6;
+    padding: 0 8px;
   }
   // .ivu-table-overflowX {
   //   overflow: visible;
@@ -168,6 +172,9 @@ body,
       color: #339cff;
     }
   }
+  .ivu-page-options-sizer {
+    margin-right: 0;
+  }
 }
 //按钮圆角
 .ivu-btn,
@@ -202,6 +209,17 @@ fieldset[disabled] .ivu-input,
   background-color: #f3f4fc;
   user-select: none;
 }
+//下拉组件全局样式
+.ivu-select-dropdown-list {
+  padding: 0 5px;
+  .ivu-select-item-selected{
+    border-radius: 6px;
+  }
+  .ivu-select-item:hover {
+    color: #2d8cf0;
+    border-radius: 6px;
+  }
+}
 // 二级路由页面全局样式
 .page_root {
   width: 100%;
@@ -388,7 +406,6 @@ fieldset[disabled] .ivu-input,
     align-items: center;
     color: #339dff;
     > div {
-      margin: 0 4px;
       padding: 0 4px;
       cursor: pointer;
       &.action_del {

src/views/schoolSection/applicationStrategy/appStrategyManage.vue

@@ -44,7 +44,7 @@
           >
             修改
           </div>
-          <div v-if="searchForm.hasst" @click="toResetAppStrategy()">重置</div>
+          <div   style="font-size: 13px" v-if="searchForm.hasst" @click="toResetAppStrategy()">重置</div>
           <div @click="toSelectAppStrategy()">引用</div>
         </div>
       </div>
@@ -439,6 +439,7 @@ export default {
         display: flex;
         justify-content: flex-start;
         align-items: center;
+        font-size: 14px;
         > div {
           margin-left: 16px;
           cursor: pointer;

src/views/schoolSection/strategy/publicStrategy.vue

@@ -2,7 +2,10 @@
   <div class="index1">
     <div class="operation">
       <span @click="curState = 2">修改</span>
-      <span v-if="curClass.type === strategyInfo.sttype" @click="Reset"
+      <span
+        style="font-size: 13px"
+        v-if="curClass.type === strategyInfo.sttype"
+        @click="Reset"
         >重置</span
       >
       <span @click="getstPad_list">引用</span>