Merge remote-tracking branch 'origin/master'

h5app/src/components/postSelection.vue

@@ -88,7 +88,7 @@ ion-segment-button {
   </ion-button>
   <ion-page>
     <ion-content class="ion-padding">
-      <ion-modal trigger="open-modal" :backdrop-dismiss="false" :is-open="isOpen" :initial-breakpoint="1"
+      <ion-modal trigger="open-modal" :backdrop-dismiss="false" @willPresent="onRest()" :is-open="isOpen" :initial-breakpoint="1"
                  :breakpoints="[0, 1]">
         <ion-toolbar>
           <ion-item>
@@ -335,6 +335,42 @@ export default defineComponent({
       isOpen.value = false;
       context.emit("SetProfessionID", selectProfessionInfo);
     }
+
+    const onRest = () => {
+      selectModelList.splice(0,1,
+        {
+          index: 0,
+          name: '分类一',
+          isSelect: false,
+          disabled: true,
+          professionName: '',
+          professionID: '',
+          professionList: [] as any
+        });
+      selectModelList.splice(1,1,{
+          index: 1,
+          name: '分类二',
+          isSelect: false,
+          disabled: true,
+          professionName: '',
+          professionID: '',
+          professionList: [] as any
+        });
+
+      selectModelList.splice(2,1,  {
+          index: 2,
+          name: '岗位',
+          isSelect: false,
+          disabled: true,
+          professionName: '',
+          professionID: '',
+          professionList: [] as any
+        });
+      selectProfessionInfo.value = '';
+      selectProfessionInfo.text = '';
+      professionLevelList.value = [];
+    }
+
     return {
       isOpen,
       selectType,
@@ -345,6 +381,7 @@ export default defineComponent({
       onSelect,
       onCancel,
       onConfirm,
+      onRest
     };
   }
 })

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

@@ -33,7 +33,6 @@
               <ion-input readonly placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.professionName" class="custom">
               </ion-input>
-<!--              <picker :ProfessionID="dataModel.professionID" aria-disabled="false"  @SetProfessionID="onSetProfessionID"></picker>-->
               <post-selection :ProfessionID="dataModel.professionID" @SetProfessionID="onSetProfessionID"></post-selection>
               <ion-note slot="error">请选择岗位</ion-note>
             </ion-item>