Merge remote-tracking branch 'origin/master'

h5app/src/components/industrySelection.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-button id="industryModel" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadIndustryID">选择
+  <ion-button id="industryModel" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadIndustryID()">选择
   </ion-button>
   <ion-page>
     <ion-content class="ion-padding">
@@ -9,13 +9,13 @@
         <ion-toolbar>
           <ion-item>
             <ion-buttons slot="start">
-              <ion-button fill="clear" @click="onCancel">取消</ion-button>
+              <ion-button fill="clear" @click="onCancel()">取消</ion-button>
             </ion-buttons>
             <ion-label style="font-size: 12px;white-space: pre-wrap; word-wrap: break-word;">
               {{ selectIndustryInfo.text }}
             </ion-label>
             <ion-buttons slot="end">
-              <ion-button fill="clear" :disabled="selectIndustryInfo.value==''" @click="onConfirm">确定</ion-button>
+              <ion-button fill="clear" :disabled="selectIndustryInfo.value==''" @click="onConfirm()">确定</ion-button>
             </ion-buttons>
           </ion-item>
           <ion-item>

h5app/src/components/ocCategorySelection.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-button id="ocCategoryModal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadOccupationalID">选择
+  <ion-button id="ocCategoryModal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadOccupationalID()">选择
   </ion-button>
   <ion-page>
     <ion-content class="ion-padding">
@@ -8,13 +8,13 @@
         <ion-toolbar>
           <ion-item>
             <ion-buttons slot="start">
-              <ion-button fill="clear" @click="onCancel">取消</ion-button>
+              <ion-button fill="clear" @click="onCancel()">取消</ion-button>
             </ion-buttons>
             <ion-label style="font-size: 12px;white-space: pre-wrap; word-wrap: break-word;">
               {{ selectOccupationInfo.text }}
             </ion-label>
             <ion-buttons slot="end">
-              <ion-button fill="clear" :disabled="selectOccupationInfo.value==''" @click="onConfirm">确定</ion-button>
+              <ion-button fill="clear" :disabled="selectOccupationInfo.value==''" @click="onConfirm()">确定</ion-button>
             </ion-buttons>
           </ion-item>
           <ion-item>

h5app/src/components/postSelection.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-button id="open-modal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadProfessionInfo">选择
+  <ion-button id="open-modal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadProfessionInfo()">选择
   </ion-button>
   <ion-page >
     <ion-content class="ion-padding">
@@ -8,13 +8,13 @@
         <ion-toolbar>
           <ion-item>
             <ion-buttons slot="start">
-              <ion-button fill="clear" @click="onCancel">取消</ion-button>
+              <ion-button fill="clear" @click="onCancel()">取消</ion-button>
             </ion-buttons>
             <ion-label style="font-size: 12px;white-space: pre-wrap; word-wrap: break-word;">
               {{ selectProfessionInfo.text }}
             </ion-label>
             <ion-buttons slot="end">
-              <ion-button fill="clear" :disabled="selectProfessionInfo.value==''" @click="onConfirm">确定</ion-button>
+              <ion-button fill="clear" :disabled="selectProfessionInfo.value==''" @click="onConfirm()">确定</ion-button>
             </ion-buttons>
           </ion-item>
           <ion-item>

h5app/src/components/postSelectionLike.vue

@@ -1,17 +1,17 @@
 <template>
-  <ion-button id="postSelectionLike" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="onOpen">选择
+  <ion-button id="postSelectionLike" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="onOpen()">选择
   </ion-button>
   <ion-page>
     <ion-content class="ion-padding">
-      <ion-modal trigger="postSelectionLike" :is-open="isOpen" @willPresent="onRest">
+      <ion-modal trigger="postSelectionLike" :is-open="isOpen" @willPresent="onRest()">
         <ion-header class="header-theme2">
           <ion-toolbar>
             <ion-buttons slot="start">
-              <ion-icon :icon="arrowBackOutline" @click="onOpen"></ion-icon>
+              <ion-icon :icon="arrowBackOutline" @click="onOpen()"></ion-icon>
             </ion-buttons>
             <ion-title>岗位名称</ion-title>
             <ion-buttons slot="end">
-              <ion-button fill="clear" @click="onConfirm">确定</ion-button>
+              <ion-button fill="clear" @click="onConfirm()">确定</ion-button>
             </ion-buttons>
           </ion-toolbar>
         </ion-header>
@@ -19,7 +19,7 @@
           <ion-item class="search-item" style="--border-style: unset; --inner-padding-end: 0px;--padding-start: 0px;">
             <ion-input placeholder="请输入岗位名称" class="custom"
                        v-model="searchParams.professionName"
-                       @input="reload" :clear-on-edit="true"
+                       @input="reload()" :clear-on-edit="true"
                        style="border: 1px solid #f2f2f5;border-radius: 14px;--padding-start: 10px;height: 35px;">
               <ion-icon slot="start" :icon="searchOutline" aria-hidden="true"></ion-icon>
             </ion-input>
@@ -28,8 +28,8 @@
             <div class="list-content">
               <ion-list>
                 <ion-item v-for="(record,key) in dataList" :key="key">
-                  <ion-label @click="onSelect(record)" >
-                    <span v-html="formatStr(record.professionName)"></span>({{record.parentProfessionName}})
+                  <ion-label @click="onSelect(record)">
+                    <span v-html="formatStr(record.professionName)"></span>({{ record.parentProfessionName }})
                   </ion-label>
                 </ion-item>
               </ion-list>
@@ -85,15 +85,25 @@ export default defineComponent({
       })
       loading.value = false;
     }
-
+    const reloadBool = ref(true);
     const reload = () => {
       dataList.value = [];
       searchParams.pageIndex = 1;
-      loadData();
+      if(reloadBool.value==false){
+        return;
+      }
+
+      reloadBool.value = false;
+      getProfessionLikeList(searchParams).then(data => {
+        dataList.value = dataList.value.concat(data.list);
+        total.value = data.total;
+        reloadBool.value = true;
+      })
     }
 
     const onScroll = (e: any) => {
       setTimeout(() => {
+        console.log("onScroll:", dataList.value.length)
         e.target.complete();
         if (pagination.value.total.value > pagination.value.current * pagination.value.pageSize) {
           searchParams.pageIndex += 1;
@@ -103,7 +113,7 @@ export default defineComponent({
     }
 
     const onConfirm = () => {
-      if(searchParams.professionName){
+      if (searchParams.professionName) {
         resultInfo.text = searchParams.professionName;
         context.emit("resultInfo", resultInfo);
       }
@@ -130,11 +140,11 @@ export default defineComponent({
     }
 
     const formatStr = (str: any) => {
-      if(!str){
+      if (!str) {
         return "";
       }
 
-      return str.replace(searchParams.professionName,'<span style="color: coral">'+searchParams.professionName+'</span>');
+      return str.replace(searchParams.professionName, '<span style="color: coral">' + searchParams.professionName + '</span>');
     }
 
     return {

h5app/src/components/workCategorySelection.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-button id="workCategoryModal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadWorkCategoryInfo">选择
+  <ion-button id="workCategoryModal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadWorkCategoryInfo()">选择
   </ion-button>
   <ion-page >
     <ion-content class="ion-padding">
@@ -8,13 +8,13 @@
         <ion-toolbar>
           <ion-item>
             <ion-buttons slot="start">
-              <ion-button fill="clear" @click="onCancel">取消</ion-button>
+              <ion-button fill="clear" @click="onCancel()">取消</ion-button>
             </ion-buttons>
             <ion-label style="font-size: 12px;white-space: pre-wrap; word-wrap: break-word;">
               {{ selectWorkCategoryInfo.text }}
             </ion-label>
             <ion-buttons slot="end">
-              <ion-button fill="clear" :disabled="selectWorkCategoryInfo.value==''" @click="onConfirm">确定</ion-button>
+              <ion-button fill="clear" :disabled="selectWorkCategoryInfo.value==''" @click="onConfirm()">确定</ion-button>
             </ion-buttons>
           </ion-item>
           <ion-item>

h5app/src/views/pages/jobUserInfo/index.vue

@@ -167,11 +167,11 @@ export default defineComponent({
 .user_img {
   .img-list {
     width:100%;
-    padding-left: 125px;
   }
 
   .img-item:first-child,.img-item:first-child img{
     width: 120px;
+    margin:0 auto;
   }
 
   .img-item:not(:first-child){

vue/src/views/baseSettings/label/selectLabel.vue

@@ -24,7 +24,7 @@
             <a-divider orientation="left"><span style="padding-left: 22px;">自定义标签</span></a-divider>
             <a-divider orientation="right">
               <Space>
-                <a-button @click="onLabelModel">
+                <a-button @click="onLabelModel()">
 <!--                  <template #icon>-->
 <!--                    <plus-circle-outlined/>-->
 <!--                  </template>-->

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -233,9 +233,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-
-      </a-col>
-        <a-col :span="8">
           <a-form-item label="婚姻状况" :label-col="{span:6}" name="maritalStatusID">
             <a-select
               ref="select"
@@ -246,6 +243,14 @@
             >
             </a-select>
           </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="电子邮箱"
+            :label-col="{ span: 6 }"
+            name="email">
+            <a-input v-model:value="dataModel.email" placeholder=""/>
+          </a-form-item>
 <!--          <a-form-item-->
 <!--            label="血型"-->
 <!--            :label-col="{ span: 6 }"-->
@@ -349,12 +354,6 @@
 <!--          </a-form-item>-->
         </a-col>
         <a-col :span="8">
-          <a-form-item
-            label="电子邮箱"
-            :label-col="{ span: 6 }"
-            name="email">
-            <a-input v-model:value="dataModel.email" placeholder=""/>
-          </a-form-item>
         </a-col>
       </a-row>