Merge commit '1dafe2e5' into dev

@@ -196,7 +196,7 @@
     <addCoachEn ref="dialogAddCoachEnRef" @submitForm="getMyMemberTable" />
     <addCoachEn ref="dialogAddCoachEnRef" @submitForm="getMyMemberTable" />
     <dialogExtraForm ref="popExtraForm" @submitForm="getSignInfoList" />
     <dialogExtraForm ref="popExtraForm" @submitForm="getSignInfoList" />
     
     
-    <insuranceView ref="insuranceViewRef" />
+    <insuranceView ref="insuranceViewRef" @checkedChange="checkedChange" @submitForm="submitForm" />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -491,15 +491,16 @@ function commit() {
         closeOnClickModal: false,
         closeOnClickModal: false,
         showClose: false
         showClose: false
       }).then(() => {
       }).then(() => {
-      checked.value = '1'
-      router.push({
-        name: 'signPreview',
-        query: {
-          matchId: matchId.value,
-          buy: checked.value
-          
-        }
-      })
+      // checked.value = '1'
+      // router.push({
+      //   name: 'signPreview',
+      //   query: {
+      //     matchId: matchId.value,
+      //     buy: checked.value
+      //
+      //   }
+      // })
+      handelInsurance()
     }).catch(() => {
     }).catch(() => {
       router.push({
       router.push({
         name: 'signPreview',
         name: 'signPreview',
@@ -730,7 +731,11 @@ function switchTabletype() {
 }
 }
 
 
 function handelInsurance() {
 function handelInsurance() {
-  proxy.$refs['insuranceViewRef'].open(insuranceAgreement.value)
+  proxy.$refs['insuranceViewRef'].open(insuranceAgreement.value, checked.value)
+}
+
+function checkedChange(v) {
+  checked.value = v
 }
 }
 </script>
 </script>
 
 

@@ -223,7 +223,7 @@
     <!--      <el-tour-step v-if="projectIds.length>0" target="#signUpBtn" title="第四步" description="点击报项"/>-->
     <!--      <el-tour-step v-if="projectIds.length>0" target="#signUpBtn" title="第四步" description="点击报项"/>-->
     <!--    </el-tour>-->
     <!--    </el-tour>-->
     
     
-    <insuranceView ref="insuranceViewRef" />
+    <insuranceView ref="insuranceViewRef" @checkedChange="checkedChange" @submitForm="submitForm" />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -447,16 +447,18 @@ function submitForm() {
         closeOnClickModal: false,
         closeOnClickModal: false,
         showClose: false
         showClose: false
       }).then(() => {
       }).then(() => {
-      checked.value = '1'
-      router.push({
-        name: 'signPreview',
-        query: {
-          matchId: matchId.value,
-          groupId: groupId.value,
-          isNational: isNational.value,
-          buy: checked.value
-        }
-      })
+      // checked.value = '1'
+      // router.push({
+      //   name: 'signPreview',
+      //   query: {
+      //     matchId: matchId.value,
+      //     groupId: groupId.value,
+      //     isNational: isNational.value,
+      //     buy: checked.value
+      //   }
+      // })
+      
+      handelInsurance()
     }).catch(() => {
     }).catch(() => {
       router.push({
       router.push({
         name: 'signPreview',
         name: 'signPreview',
@@ -858,7 +860,11 @@ watch(choosedchoosed, (newVal, oldVal) => {
 })
 })
 
 
 function handelInsurance() {
 function handelInsurance() {
-  proxy.$refs['insuranceViewRef'].open(insuranceAgreement.value)
+  proxy.$refs['insuranceViewRef'].open(insuranceAgreement.value, checked.value)
+}
+
+function checkedChange(v) {
+  checked.value = v
 }
 }
 </script>
 </script>
 
 

 <template>
 <template>
   <el-dialog
   <el-dialog
-    v-model="show" :close-on-click-modal="false" :title="language==0?'赛事购买协会':'Event Insurance Procurement Agreement'" append-to-body center
+    v-model="show" :close-on-click-modal="false"
+    :title="language==0?'赛事购买协会':'Event Insurance Procurement Agreement'" append-to-body center
     class="pcloginpop"
     class="pcloginpop"
     close-icon="CircleClose" destroy-on-close
     close-icon="CircleClose" destroy-on-close
     width="1100px"
     width="1100px"
   >
   >
     <div v-html="data" />
     <div v-html="data" />
+    <div class="checkbox">
+      <el-checkbox
+        v-model="checked"
+        :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
+        false-value="0"
+        size="large" true-value="1"
+        @change="checkedChange"
+      />
+    </div>
     <template #footer>
     <template #footer>
       <div class="dialog-footer text-center">
       <div class="dialog-footer text-center">
         <el-button class="btn-lineG w200px" round type="primary" @click="submitForm">{{
         <el-button class="btn-lineG w200px" round type="primary" @click="submitForm">{{
@@ -23,17 +33,24 @@ import { useStorage } from '@vueuse/core/index'
 
 
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
-const emit = defineEmits(['submitForm'])
+const emit = defineEmits(['submitForm', 'checkedChange'])
+const checked = ref('0')
 const show = ref(false)
 const show = ref(false)
 const data = ref()
 const data = ref()
 
 
-const open = (row) => {
+const open = (row, num) => {
   show.value = true
   show.value = true
+  checked.value = num || '0'
   data.value = row
   data.value = row
 }
 }
 
 
 function submitForm() {
 function submitForm() {
   show.value = false
   show.value = false
+  emit('submitForm')
+}
+
+function checkedChange() {
+  emit('checkedChange', checked.value)
 }
 }
 
 
 
 
@@ -42,73 +59,13 @@ defineExpose({ open })
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
-.threeFour {
-  width: 100%;
-  
-  .el-upload--picture-card {
-    width: 120px;
-    height: 160px;
-  }
-  
-  .el-upload-list--picture-card .el-upload-list__item {
-    width: 120px;
-    height: 160px;
-  }
-}
-
-.tip {
-  font-size: 13px;
-  color: #999;
-  margin: 10px 0;
+.checkbox {
   
   
-  i {
-    color: red;
-    margin: 0 4px 0 0;
+  span {
+    color: #453DEA;
+    position: relative;
+    top: -1px;
+    cursor: pointer
   }
   }
 }
 }
-
-.shenfen {
-  .el-upload--picture-card {
-    width: 320px;
-    height: 200px;
-  }
-  
-  .el-upload-list--picture-card .el-upload-list__item {
-    width: 320px;
-    height: 200px;
-  }
-}
-
-.touxiang {
-  :deep(.el-upload--picture-card ) {
-    width: 140px;
-    height: 200px;
-  }
-}
-
-.touxiang {
-  :deep(.el-upload-list__item ) {
-    width: 140px;
-    height: 200px;
-  }
-  
-}
-
-.el-form--inline .el-form-item {
-  width: 100%
-}
-
-
-.boxDialog {
-  .el-dialog__header {
-    background: linear-gradient(#ed2c22, #fe6d45);
-    margin-right: 0;
-    height: 52px;
-    
-    span {
-      color: #fff;
-    }
-  }
-}
-
 </style>
 </style>

@@ -641,7 +641,10 @@ function goLogin() {
 
 
 function goGeren() {
 function goGeren() {
   // 注册
   // 注册
-  router.push({ name: 'personalRegister', query: { matchId: matchId.value }})
+  router.push({
+    name: 'personalRegister',
+    query: { matchId: matchId.value }
+  })
 }
 }
 
 
 function popChangeType() {
 function popChangeType() {
@@ -675,7 +678,7 @@ function checkIsSign() {
         })
         })
         return Promise.reject('rejected message')
         return Promise.reject('rejected message')
         break
         break
-      case '2':
+      case '2':// 报名审批拒绝
         ElMessageBox.confirm(
         ElMessageBox.confirm(
           language.value == 0 ? '报名审批拒绝，是否重新报名' : 'Registration approval rejected. Do you want to register again',
           language.value == 0 ? '报名审批拒绝，是否重新报名' : 'Registration approval rejected. Do you want to register again',
           language.value == 0 ? '提示' : 'Warning',
           language.value == 0 ? '提示' : 'Warning',
@@ -689,7 +692,7 @@ function checkIsSign() {
         })
         })
         return Promise.reject('rejected message')
         return Promise.reject('rejected message')
         break
         break
-      case '3':
+      case '3':// 报名已取消
         ElMessageBox.confirm(
         ElMessageBox.confirm(
           language.value == 0 ? '报名已取消，是否重新报名' : 'Registration cancelled. Do you want to register again',
           language.value == 0 ? '报名已取消，是否重新报名' : 'Registration cancelled. Do you want to register again',
           language.value == 0 ? '提示' : 'Warning',
           language.value == 0 ? '提示' : 'Warning',

@@ -139,7 +139,6 @@
         </div>
         </div>
       </el-card>
       </el-card>
     </div>
     </div>
-    <insuranceView ref="insuranceViewRef" />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -150,7 +149,6 @@ import MatchInfoRow from '@/viewsPc/match/components/matchInfo-row'
 import GroupInfoRow from '@/viewsPc/match/components/groupInfo-row'
 import GroupInfoRow from '@/viewsPc/match/components/groupInfo-row'
 import CoachInfoRow from '@/viewsPc/match/components/coachInfo-row'
 import CoachInfoRow from '@/viewsPc/match/components/coachInfo-row'
 import SignInfoTable from '@/viewsPc/match/components/signInfo-table'
 import SignInfoTable from '@/viewsPc/match/components/signInfo-table'
-import insuranceView from './components/insuranceView.vue'
 
 
 import { getCurrentInstance, ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import cache from '@/plugins/cache'
 import cache from '@/plugins/cache'
@@ -203,9 +201,6 @@ function getMatch() {
   }).then(res => {
   }).then(res => {
     signEndTime.value = res.data.signEndTime
     signEndTime.value = res.data.signEndTime
     matchData.value = res.data
     matchData.value = res.data
-    if (matchData.value.insuranceFlag == '2' && route.query.buy == '1') {
-      proxy.$refs['insuranceViewRef'].open(matchData.value.insuranceAgreement)
-    }
   }).catch(err => {
   }).catch(err => {
     router.push({ name: 'matchList' })
     router.push({ name: 'matchList' })
   })
   })