9.5 世锦赛修改功能

@@ -228,7 +228,7 @@ export function cancelOrder2(orderId) {
 // 取消
 // 取消
 export function cancelOrderBody(data) {
 export function cancelOrderBody(data) {
   return request({
   return request({
-    url: `/ota/norder/cancelOrderBackBody`,
+    url: `/ota/norder/applyOrderBackBody`,
     method: 'post',
     method: 'post',
     data: data
     data: data
   })
   })

@@ -2,7 +2,7 @@
   <div class="pd20">
   <div class="pd20">
     <div style="margin-bottom: 20px">
     <div style="margin-bottom: 20px">
       <el-button type="primary" @click="downloadAll">{{ language == 0 ? '合并生成缴费单' : 'Download Consolidated Invoice' }}</el-button>
       <el-button type="primary" @click="downloadAll">{{ language == 0 ? '合并生成缴费单' : 'Download Consolidated Invoice' }}</el-button>
-      <el-button type="primary" @click="showDialog">合并上传缴费单</el-button>
+      <el-button type="primary" @click="showDialog">{{ language == 0 ? '合并上传缴费单' : 'Upload Consolidated Invoice' }}</el-button>
     </div>
     </div>
     <div v-for="b in list" class="item">
     <div v-for="b in list" class="item">
       <div class="title">
       <div class="title">
@@ -292,15 +292,24 @@ const cancel = (row) => {
 // }
 // }
 
 
 const unsubscribe = () => {
 const unsubscribe = () => {
-  proxy.$modal.confirm(language.value == 0 ? `确定退款吗 ?` : 'Are you sure to refund?').then(() => {
-    return cancelOrderBody(unsubscribeForm.value).then(res => {
-      ElMessage({
-        message: language.value == 0 ? '已提交退款，请等待审核!' : 'Refund has been submitted, please wait for review!',
-        type: 'success'
+  proxy.$refs['infoRef'].validate(async valid => {
+    if (valid) {
+      proxy.$modal.confirm(language.value == 0 ? `确定退款吗 ?` : 'Are you sure to refund?').then(() => {
+        return cancelOrderBody(unsubscribeForm.value).then(res => {
+          ElMessage({
+            message: language.value == 0 ? '已提交退款，请等待审核!' : 'Refund has been submitted, please wait for review!',
+            type: 'success'
+          })
+          show2.value = false
+          emit('refresh')
+        })
       })
       })
-      emit('refresh')
-    })
+    } else {
+      proxy.$modal.msgError('请完善信息')
+    }
   })
   })
+
+
 }
 }
 
 
 const downInvoice = (row) => {
 const downInvoice = (row) => {
@@ -352,7 +361,7 @@ const pf = ref([])
 const submitProofAll = () => {
 const submitProofAll = () => {
   let selectList = props.list.filter(item => item.ischeck==true)
   let selectList = props.list.filter(item => item.ischeck==true)
   let ids = selectList.map(item => item.id)
   let ids = selectList.map(item => item.id)
-  if (!pf.value) {
+  if (!pf.value || pf.value.length <= 0) {
     ElMessage.warning(language.value == 0 ? '请上传凭证' : 'Please upload a voucher')
     ElMessage.warning(language.value == 0 ? '请上传凭证' : 'Please upload a voucher')
     return
     return
   }
   }
@@ -385,7 +394,16 @@ const unsubscribeForm = ref({
   beneficiaryBankAddress:'',
   beneficiaryBankAddress:'',
   swiftCode:'',
   swiftCode:'',
 })
 })
-const unsubscribeRules = ref([])
+const unsubscribeRules = ref({
+  noc: { required: true, message: language.value == 0 ? '请输入队伍名称' : 'please input noc', trigger: 'blur' },
+  athleteName: { required: true, message: language.value == 0 ? '请输入预定人名称' : 'please input Athlete Name', trigger: 'blur' },
+  beneficiaryName: { required: true, message: language.value == 0 ? '请输入收款人名称' : 'please input Beneficiary Name', trigger: 'blur' },
+  beneficiaryAddress: { required: true, message: language.value == 0 ? '请输入收款人地址' : 'please input Beneficiary Address', trigger: 'blur' },
+  beneficiaryBankName: { required: true, message: language.value == 0 ? '请输入收款人开户银行' : 'please input Beneficiary Bank Name', trigger: 'blur' },
+  beneficiaryBankAccountNumber: { required: true, message: language.value == 0 ? '请输入收款人银行账号' : 'please input Beneficiary Bank Account Number', trigger: 'blur' },
+  beneficiaryBankAddress: { required: true, message: language.value == 0 ? '请输入收款人银行地址' : 'please input Beneficiary Bank Address', trigger: 'blur' },
+  swiftCode: { required: true, message: language.value == 0 ? '请输入SWIFT 码' : 'please input SWIFT Code', trigger: 'blur' },
+})
 const showunsubscribe = (row) => {
 const showunsubscribe = (row) => {
   unsubscribeForm.value = {
   unsubscribeForm.value = {
     id:row.id,
     id:row.id,

@@ -84,8 +84,8 @@ export default defineConfig(({mode, command}) => {
         },
         },
         '/dev-api': {
         '/dev-api': {
           // target: 'http://192.168.1.118:8082/',
           // target: 'http://192.168.1.118:8082/',
-          target: 'http://192.168.1.22:8082',
-          // target: 'https://tk005.wxjylt.com/stage-api',
+          // target: 'http://192.168.1.22:8082',
+          target: 'https://tk005.wxjylt.com/stage-api',
           // target: 'http://124.70.181.90:1880/stage-api',
           // target: 'http://124.70.181.90:1880/stage-api',
           // target: 'https://sys.2025wtcwuxi.com/stage-api/',
           // target: 'https://sys.2025wtcwuxi.com/stage-api/',
           changeOrigin: true,
           changeOrigin: true,