no message

杨炀
Showing 5 changed files with 24 additions and 17 deletions
src/viewsPc/booking/hotelOrder.vue
src/viewsPc/match/chooseCoach.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/addCoach.vue
vite.config.js
--- a/src/viewsPc/booking/hotelOrder.vue
View file @607a7ec
+++ b/src/viewsPc/booking/hotelOrder.vue
View file @607a7ec
@@ -484,11 +484,7 @@ function submit() {
            }
          })
        }
-      } else {
-        ElMessage.warning(language.value == 0 ? '无可预订的房间' : 'No rooms available to book')
      }
-    }).catch(err => {
-      ElMessage.warning(language.value == 0 ? '无可预订的房间' : 'No rooms available to book')
    })
  })
 }
--- a/src/viewsPc/match/chooseCoach.vue
View file @607a7ec
+++ b/src/viewsPc/match/chooseCoach.vue
View file @607a7ec
@@ -7,7 +7,7 @@
        <team-sign-step v-if="user.utype=='2'" :activeStep="1" :language="language"/>
      </el-card>
-      <el-card class="mt20">
+      <el-card class="mt20" v-if="isNational">
        <h3 class="text-center text-danger" v-if="language==0">是否添加随行人员，如果没有，请点击下一步，跳过此步骤</h3>
        <h3 class="text-center text-danger" v-else>
          Do you need to add accompanying persons? If not, please proceed to the next step.
@@ -49,8 +49,8 @@
              <div class="card-header">
                <img src="@/assets/sign/tag02.png"/>
                {{ language==0?'领队':'HEAD OF TEAM' }}
-<!--                <span class="tip" v-if="language==0">（教练/领队，至少选择一项）</span>-->
+                <span class="tip" v-if="language==0&&!isNational">（必选一位领队）</span>
-<!--                <span class="tip" v-else>（Coach/Team Leader, select at least one）</span>-->
+                <span class="tip" v-if="language==1&&!isNational">（Team Leader select at least one）</span>
              </div>
            </template>
            <div class="chooseForm">
@@ -313,10 +313,10 @@ function geren() {
 }
 function goNext() {
-  // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
+  if (!isNational.value && (form.value.leader.length == 0)) {
-  //   ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
+    ElMessage.warning(language.value==0?'必选一位领队':'Team Leaders select at least one')
-  //   return
+    return
-  // }
+  }
  // (personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&&
  // (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&&
  // (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&&
--- a/src/viewsPc/match/chooseSportsman.vue
View file @607a7ec
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @607a7ec
@@ -620,7 +620,14 @@ function checkTwo(a,b) {
      if(isNational.value){
        ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
      } else {
-        ElMessage.warning(language.value == 0 ? `${a.realName}/${b.realName} 已经和其他人组成舞伴，无法报名,请重新选择`:`${a.realName}/${b.realName} has already formed a dancer with another person, cannot sign up: please select again`)
+        ElMessageBox.confirm(language.value == 0 ? `${a.realName}/${b.realName} 已经和其他人组成舞伴，无法报名,请重新选择`:`${a.realName}/${b.realName} has already formed a dancer with another person, cannot sign up: please select again`,
+            language.value == 0 ? '提示' : 'Tips', {
+              confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
+              showCancelButton: false,
+              type: 'warning'
+            }).then(() => {
+              console.log('Confirm')
+            })
      }
    }
  })
--- a/src/viewsPc/match/components/addCoach.vue
View file @607a7ec
+++ b/src/viewsPc/match/components/addCoach.vue
View file @607a7ec
@@ -8,7 +8,7 @@
      <el-row :gutter="30" class="mt30">
        <el-col :lg="12" class="touxiang">
-          <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
+          <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" :required="form.labelArr.indexOf('0')>-1">
            <ImageUpload2
                v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
                :is-show-tip="false"
@@ -140,7 +140,7 @@ const data = reactive({
    // regionId: [{ required: true, message: '必填', trigger: 'change' }],
    birth: [{required: true, message: '必填', trigger: 'change'}],
    // address: [{ required: true, message: '必填', trigger: 'blur' }],
-    picUrl: [{required: true, message: '必填', trigger: 'blur'}],
+    // picUrl: [{required: true, message: '必填', trigger: 'blur'}],
    sex: [{required: true, message: '必填', trigger: 'change'}],
    labelArr: [{required: true, message: '必填', trigger: 'change'}]
  },
@@ -153,7 +153,7 @@ const data = reactive({
    // regionId: [{ required: true, message: 'required', trigger: 'change' }],
    birth: [{required: true, message: 'required', trigger: 'change'}],
    // address: [{ required: true, message: 'required', trigger: 'blur' }],
-    picUrl: [{required: true, message: 'required', trigger: 'blur'}],
+    // picUrl: [{required: true, message: 'required', trigger: 'blur'}],
    sex: [{required: true, message: 'required', trigger: 'change'}],
    labelArr: [{required: true, message: 'required', trigger: 'change'}]
  },
@@ -304,6 +304,10 @@ function giveBirthDay() {
 function submitForm() {
  proxy.$refs['dialogRef'].validate((valid) => {
    if (valid) {
+      if(!form.value.picUrl&&form.value.labelArr.indexOf('0')>-1){
+        ElMessage.warning(language.value == 0 ? '请上传个人照片' :'Please upload  your photo')
+        return
+      }
      // 验证身份证号
      if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
        ElMessage.warning('请输入正确的身份证号码')
--- a/vite.config.js
View file @607a7ec
+++ b/vite.config.js
View file @607a7ec
@@ -82,8 +82,8 @@ export default defineConfig(({ mode, command }) => {
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
        },
        '/dev-api': {
-          // target: 'http://192.168.1.118:8081/',
+          target: 'http://192.168.1.118:8081/',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
        }