Merge branch 'iteration-0906' into jenkins

src/components/layout/layoutTop.tsx

@@ -41,7 +41,7 @@ export default defineComponent({
     const gotoSchool = () => {
       router.push({ path: '/setting', query: { activeTab: 'school' } });
     };
-
+    const suggestionOptionRef = ref()
     const resetPwd = () => {
       showWord.value = true;
     };
@@ -50,7 +50,13 @@ export default defineComponent({
       body.className = 'myBody body';
     }
 
-
+    const showOption = ()=>{
+      showSuggestionViseble.value = true
+      if(suggestionOptionRef.value){
+        suggestionOptionRef.value.onReset()
+      }
+      console.log(suggestionOptionRef.value,'suggestionOptionRef')
+    }
 
     onMounted(() => {
 
@@ -102,7 +108,7 @@ export default defineComponent({
                 trigger: () => (
                   <div
                     class={styles.optons}
-                    onClick={() => (showSuggestionViseble.value = true)}>
+                    onClick={showOption}>
                     <NImage src={opinionIcon} previewDisabled></NImage>
                   </div>
                 ),
@@ -258,10 +264,10 @@ export default defineComponent({
           <NModal
             class={['modalTitle', 'background', styles.suggestWrap]}
             v-model:show={showSuggestionViseble.value}
-            preset="card"
-            display-directive='if'
+            display-directive='show'
             showIcon={false}>
             <SuggestionOption
+            ref={suggestionOptionRef}
               onClose={() =>
                 (showSuggestionViseble.value = false)
               }></SuggestionOption>

src/components/layout/modals/suggestion-option.module.less

@@ -23,6 +23,14 @@
   background-size: 754px 672px;
 }
 
+.hiddenBox {
+  visibility: hidden;
+}
+
+.showBox {
+  visibility: visible;
+}
+
 .suggestOption {
   .updateBtnGroup {
     padding: 0;
@@ -213,6 +221,32 @@
     animation: forUp linear .3s forwards,
   }
 
+  .updatePassword.isend {
+    top: -180px;
+
+    .inBack {
+      background: url(../images/inBack5.png) no-repeat;
+      background-size: 754px 672px;
+      z-index: 300;
+    }
+
+    .formWrap {
+      top: 450px;
+    }
+
+    .sealing {
+      opacity: 1;
+    }
+
+    .submitBtn {
+      opacity: 0;
+    }
+
+    .messageWrap {
+      opacity: 0;
+    }
+  }
+
   .updatePassword {
     // padding: 0 12px;
 

src/components/layout/modals/suggestion-option.tsx

@@ -29,11 +29,12 @@ import {
   getSuggestionList,
   sysParamConfigPage
 } from '../modals/api';
+import { nextTick } from 'process';
 
 export default defineComponent({
   name: 'train-update',
   emits: ['close', 'submit'],
-  setup(props, { emit }) {
+  setup(props, { emit,expose }) {
     const message = useMessage();
     const userStore = useUserStore();
     const forms = reactive({
@@ -46,6 +47,7 @@ export default defineComponent({
     });
     const state = reactive([]) as any;
     const isubmit = ref(false)
+
     const suggestionTypeList = ref([] as any);
     const ossUploadUrl = `https://gyt.ks3-cn-beijing.ksyuncs.com/`;
     const uploadRef = ref();
@@ -55,6 +57,8 @@ export default defineComponent({
     const tempFiileBuffer = ref();
     const email = ref('');
     const phone = ref('');
+    const isLoading = ref(false)
+    const ishidden= ref(false)
     const onSubmit = async () => {
       // if (!forms.suggestionTypeId) {
       //   message.error('请选择反馈类型');
@@ -83,7 +87,8 @@ export default defineComponent({
           // message.success('提交成功');
           setTimeout(()=>{
             onReset()
-            emit('close');
+            ishidden.value = true
+            emit('close')
           },3000)
 
         } catch (e) {
@@ -94,6 +99,8 @@ export default defineComponent({
 
     };
     const onReset = ()=>{
+      ishidden.value = false
+      isubmit.value = false
       forms.suggestionTypeId=null
       forms.clientType='TEACHER'
       forms.content= ''
@@ -101,6 +108,7 @@ export default defineComponent({
       forms.type= 'APP'
       forms.mobileNo= userStore.getUserInfo.phone
     }
+    expose({onReset})
     const onBeforeUpload = async (options: any) => {
       console.log(options, 'onBeforeUpload');
       const file = options.file;
@@ -220,8 +228,8 @@ export default defineComponent({
       getPhoneInfo();
     });
     return () => (
-      <div class={styles.suggestOption}>
-      <div class={[styles.updatePassword,isubmit.value?styles.isAni:'']}>
+      <div class={[styles.suggestOption]}>
+      <div class={[styles.updatePassword,isubmit.value?styles.isAni:'',ishidden.value?styles.isend:null]}>
         <div class={[styles.formWrap,isubmit.value?styles.isAni:'']}>
           <NImage
             class={styles.closeBtn}