Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h5app/src/views/pages/work/task/edit.vue
#	h5app/src/views/pages/work/task/list.vue

h5app/src/views/pages/company/edit.vue

@@ -456,8 +456,9 @@ export default defineComponent({
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 ion-item {

h5app/src/views/pages/company/editPost.vue

@@ -303,8 +303,9 @@ export default defineComponent({
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 ion-item {

h5app/src/views/pages/jobhunt/edit.vue

@@ -87,7 +87,7 @@
         <ion-item>
           <div class="panel-title2">
             <div class="item-flag"></div>
-            <span style="font-size: 18px;">其他信息</span>
+            <span style="font-size: 16px;">其他信息</span>
           </div>
           <ion-avatar aria-hidden="true" slot="end" style="padding-top: 10px;" >
             <img alt="" src="@/assets/icon/arrow-down-bold.png" class="iconBtn"  @click="expandChange" v-if="!expand"/>
@@ -619,8 +619,9 @@ export default defineComponent({
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 .next-btn {

h5app/src/views/pages/jobhunt/educationEdit.vue

@@ -234,8 +234,9 @@ ion-input.custom{
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 .stepFlex {

h5app/src/views/pages/jobhunt/jobHuntEdit.vue

@@ -287,8 +287,9 @@ ion-input.custom{
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 .stepFlex {

h5app/src/views/pages/work/log/edit.vue

@@ -203,8 +203,9 @@ export default defineComponent({
 
 .title-item{
   margin-left: 15px;
-  color:#3a7be0;
-  font-size: 16px;
+  color:#1c3d70 !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 
 </style>