Merge branch 'dev' into order

@@ -17,8 +17,10 @@
                   <h3 class="panel-title" v-else>My Information</h3>
                   <h3 class="panel-title" v-else>My Information</h3>
                 </div>
                 </div>
                 <div class="panel-body">
                 <div class="panel-body">
+                  <div v-if="form.danceMate">
                     <div class="text-danger fontsize14 mb10" v-if="language==0">*报名双人项目请勾选您的舞伴</div>
                     <div class="text-danger fontsize14 mb10" v-if="language==0">*报名双人项目请勾选您的舞伴</div>
                     <div class="text-danger fontsize14 mb10" v-else>*Please select your dance mate if you are signing up for a double event</div>
                     <div class="text-danger fontsize14 mb10" v-else>*Please select your dance mate if you are signing up for a double event</div>
+                  </div>
                   <div class="chooseForm" style="display: flex;flex-wrap: wrap;">
                   <div class="chooseForm" style="display: flex;flex-wrap: wrap;">
                     <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;">
                     <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;">
                       <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/>
                       <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/>
@@ -56,15 +58,15 @@
                         </el-checkbox>
                         </el-checkbox>
                       </el-checkbox-group>
                       </el-checkbox-group>
                     </div>
                     </div>
-                    <div style="min-width:50%;" v-else @click="addMate">
-                      <div class="addBttn" style="margin: 0 auto">+</div>
-                      <div class="text-center mt10 text-primary text-sm">
-                        Please add your partner
-                        <el-icon>
-                          <Edit/>
-                        </el-icon>
-                      </div>
-                    </div>
+<!--                    <div style="min-width:50%;" v-else @click="addMate" hidden>-->
+<!--                      <div class="addBttn" style="margin: 0 auto">+</div>-->
+<!--                      <div class="text-center mt10 text-primary text-sm">-->
+<!--                        Please add your partner-->
+<!--                        <el-icon>-->
+<!--                          <Edit/>-->
+<!--                        </el-icon>-->
+<!--                      </div>-->
+<!--                    </div>-->
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>

@@ -252,25 +252,32 @@ function submitForm() {
       if (Array.isArray(form.value.passportUrl)) {
       if (Array.isArray(form.value.passportUrl)) {
         form.value.passportUrl = form.value.passportUrl[0].url
         form.value.passportUrl = form.value.passportUrl[0].url
       }
       }
-      if(groupId=='0'){
+      if(groupId=='0'||!groupId){
+        addPersonal()
+      } else {
+        if(groupId){
+          addGroupMember()
+        }
+      }
+    }
+  }
+}
+function addPersonal() {
   match.savePersonForMyPerson(form.value).then(res => {
   match.savePersonForMyPerson(form.value).then(res => {
     ElMessage.success('保存成功')
     ElMessage.success('保存成功')
     show.value = false
     show.value = false
     emit('submitForm', res.data)
     emit('submitForm', res.data)
   })
   })
-      } else {
+}
+function addGroupMember() {
   form.value.groupId = groupId
   form.value.groupId = groupId
   match.savePersonForMyGroup(form.value).then(res => {
   match.savePersonForMyGroup(form.value).then(res => {
     ElMessage.success(language.value == 0 ?'保存成功':'Save successful')
     ElMessage.success(language.value == 0 ?'保存成功':'Save successful')
     show.value = false
     show.value = false
     emit('submitForm')
     emit('submitForm')
   })
   })
-      }
 
 
-    }
-  }
 }
 }
-
 function cancel() {
 function cancel() {
   show.value = false
   show.value = false
   showVcode.value = false
   showVcode.value = false

@@ -10,8 +10,7 @@
 
 
             <el-calendar v-model="calendarValue">
             <el-calendar v-model="calendarValue">
               <template #date-cell="data">
               <template #date-cell="data">
-                <div v-if="data.data.day.slice(8,10)==22" class="primaryDate date">22</div>
-                <div v-else class="date">
+                <div class="date" :class="data.data.day==calendarValue?'primaryDate':''" @click="selectDate(data.data.day)">
                   {{ data.data.day.slice(8,10) }}
                   {{ data.data.day.slice(8,10) }}
                 </div>
                 </div>
 
 
@@ -85,7 +84,7 @@ const ztxPlanList = ref([])
 const planList = ref([])
 const planList = ref([])
 const schList = ref([])
 const schList = ref([])
 const loading = ref(false)
 const loading = ref(false)
-const calendarValue = ref('2024-07-22')
+const calendarValue = ref(new Date())
 
 
 
 
 // onMounted(() => {
 // onMounted(() => {
@@ -101,6 +100,10 @@ const calendarValue = ref('2024-07-22')
 //   }
 //   }
 // })
 // })
 
 
+function selectDate(date) {
+  console.log(date,calendarValue.value)
+}
+
 function getPlanList() {
 function getPlanList() {
   loading.value = true
   loading.value = true