Merge branch '08/24teamQuest' into 11/24SAAS

src/components/singe-file-upload/index.vue

@@ -123,7 +123,6 @@ export default {
       load.startLoading();
     },
     success(res, file) {
-      console.log(file)
       load.endLoading();
        let url = this.ossUploadUrl + '/' + this.dataObj.key
       if (url) {
@@ -136,6 +135,7 @@ export default {
         this.$emit("update:value",url);
         this.$emit("input", url);
         this.$emit("inputFile", file);
+        this.$emit('success')
         // val.data.name
 
        let res= {

src/views/resetTeaming/components/payInfoDetail.vue

@@ -208,6 +208,7 @@
                 :leBao="leBao"
                 @setAllTotal="setAllTotal"
                 v-if="$route.query.payUserType == 'SCHOOL'"
+                @checkType="checkType"
               />
               <backMoney
                 v-if="
@@ -928,6 +929,9 @@ export default {
         }
       );
     },
+    checkType(){
+      this.$refs.form.validate()
+    },
     submitForm() {
       this.$refs.form.validate(async (isok, obj) => {
         if (isok) {
@@ -1025,7 +1029,9 @@ export default {
         let dom = this.$refs[i];
         // 这里是针对遍历的情况（多个输入框），取值为数组
         if (Object.prototype.toString.call(dom) !== "[object Object]") {
-          dom = dom[0];
+          if(dom){
+            dom = dom[0];
+          }
         }
 
         // 第一种方法（包含动画效果）

src/views/resetTeaming/modals/pay.scss

@@ -30,8 +30,11 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    height: 36px;
-    line-height: 36px;
+    height: 40px;
+    line-height: 40px;
+    .el-radio {
+      line-height: 40px;
+    }
   }
   .teamCourseChiose {
     background-color: #f2f2f2;
@@ -61,6 +64,8 @@
 .titleFormItem {
   margin: 0;
   align-items: center;
+  height: 40px;
+  line-height: 40px;
 
   :deep(.el-form-item__content) {
     margin-top: 3px;

src/views/resetTeaming/modals/paySchoolInfo.vue

@@ -267,7 +267,6 @@
           >
           </el-date-picker>
         </el-form-item>
-
       </el-row>
       <el-row>
         <el-form-item
@@ -276,17 +275,24 @@
           :rules="[
             {
               required: true,
-              message: '请上传上传合同',
-              trigger: 'blur, change',
+              message: '请上传合同',
+              trigger: 'change',
             },
           ]"
         >
+          <template slot="label">
+            <p style="position: relative">
+              <span style="color: #f56c6c; margin-right: 4px">*</span>
+              上传合同
+            </p>
+          </template>
           <singe-file-upload
             tips="仅支持上传pdf格式文件"
             buttonText="上传合同"
             accept=".pdf"
             v-model="form.contractUrl"
             bucket_name="contracts"
+            @success="checkType"
           />
           <!-- bucket_name="cooperation" -->
         </el-form-item>
@@ -335,6 +341,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+
     </div>
   </div>
 </template>
@@ -359,7 +366,12 @@ export default {
       courseType,
     };
   },
-  methods: {},
+  methods: {
+    checkType(){
+      console.log('来了')
+      this.$emit('checkType')
+    }
+  },
   computed: {
     allTotal() {
       let num = 0;