no message

杨炀
Showing 8 changed files with 66 additions and 43 deletions
src/assets/js/data.js
src/components/ImageUpload/index.vue
src/layoutPc/components/AppBottom.vue
src/viewsPc/components/pickup.vue
src/viewsPc/index.vue
src/viewsPc/index_en.vue
src/viewsPc/match/components/addWdsf.vue
src/viewsPc/match/detail_en.vue
--- a/src/assets/js/data.js
View file @ce4653c
+++ b/src/assets/js/data.js
View file @ce4653c
@@ -276,14 +276,14 @@ export const comList = [{text: '国资企业(含央企和本地)', value: '0'}, 
 export const rankList = [
    {
-        index: '1',
+        index: '1',//名次
-        code: 'lt',
+        code: 'lt',//国旗code
-        name: 'Evaldas Sodeika - Ieva Zukauskaite',
+        name: 'Evaldas Sodeika - Ieva Zukauskaite',//组合
-        gj: '立陶宛',
+        gj: '立陶宛',//国家
-        en_gj: 'LTU',
+        en_gj: 'LTU',//国家简称
-        jin: '1',
+        jin: '1',//金
-        yin: '0',
+        yin: '0',//银
-        tong: '0'
+        tong: '0'//铜
    },
    {
        index: '1',
--- a/src/components/ImageUpload/index.vue
View file @ce4653c
+++ b/src/components/ImageUpload/index.vue
View file @ce4653c
@@ -28,7 +28,7 @@
      <el-upload
        ref="imageUpload"
        :multiple="limit > 1"
-        :action="uploadImgUrl"
+        :action="actionUrl || uploadImgUrl"
        list-type="picture-card"
        :on-success="handleUploadSuccess"
        :before-upload="handleBeforeUpload"
@@ -79,7 +79,7 @@
 <script setup>
 import { getToken } from '@/utils/auth'
-import { computed, getCurrentInstance, ref, watch } from 'vue'
+import { computed, getCurrentInstance, ref, watch, defineProps, defineEmits  } from 'vue'
 import _ from 'lodash'
 const props = defineProps({
@@ -107,6 +107,10 @@ const props = defineProps({
  disabled: {
    type: Boolean,
    default: false
+  },
+  action: {
+    type: String,
+    default: ''
  }
 })
@@ -119,16 +123,18 @@ const accept = computed(() => {
    }
  }).join(',')
 })
+const actionUrl = computed(() => {
+  return props.action ? baseUrl + props.action : ''
+})
 const { proxy } = getCurrentInstance()
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'response'])
 const number = ref(0)
 const uploadList = ref([])
 const dialogImageUrl = ref('')
 const dialogVisible = ref(false)
 const baseUrl = import.meta.env.VITE_APP_BASE_API
 const uploadImgUrl = ref(
-  import.meta.env.VITE_APP_BASE_API + '/upload/uploadImgToLocalServer'
+    baseUrl + '/upload/uploadImgToLocalServer'
 ) // 上传的图片服务器地址
 const headers = ref({ Authorization: 'Bearer ' + getToken() })
 const fileList = ref([])
@@ -167,6 +173,7 @@ watch(
 // 上传前loading加载
 function handleBeforeUpload(file) {
+  console.log('handleBeforeUpload', props)
  let isImg = false
  if (props.fileType.length) {
    let fileExtension = ''
@@ -205,16 +212,22 @@ function handleExceed() {
 // 上传成功回调
 function handleUploadSuccess(res, file) {
-  if (res.code === 200) {
+  if (!actionUrl.value) {
-    uploadList.value.push({ name: file.name, url: res.data || res.msg })
+    if (res.code === 200) {
-    uploadedSuccessfully()
+      uploadList.value.push({ name: file.name, url: res.data || res.msg })
-  } else {
+      uploadedSuccessfully()
-    number.value--
+    } else {
-    proxy.$modal.closeLoading()
+      number.value--
-    proxy.$modal.msgError(res.msg)
+      proxy.$modal.closeLoading()
-    proxy.$refs.imageUpload.handleRemove(file)
+      proxy.$modal.msgError(res.msg)
-    uploadedSuccessfully()
+      proxy.$refs.imageUpload.handleRemove(file)
+      uploadedSuccessfully()
+    }
+  }else {
+    proxy?.$modal.closeLoading()
+    emit('response', res)
  }
 }
 // 删除图片
--- a/src/layoutPc/components/AppBottom.vue
View file @ce4653c
+++ b/src/layoutPc/components/AppBottom.vue
View file @ce4653c
 <template>
  <div class="footAll">
    <div class="box" style="max-width: 90%">
-      <el-row style="align-items: center;" v-if="language==0">
+      <el-row align="middle" v-if="language==0">
        <el-col :lg="10" :md="10" :xs="10">
          <ul>
            <li>邮编：214000</li>
@@ -11,7 +11,7 @@
          </ul>
        </el-col>
        <el-col :lg="10" :md="10" :xs="10">
-          <ul style="text-align: right">
+          <ul class="text-right">
            <li>客服及报障电话:15606190026</li>
            <li>客服及报障邮箱: info@wdsfwuxicenter.com</li>
          </ul>
@@ -22,14 +22,14 @@
            <p class="text-center mt10">微博关注</p>
          </div>
        </el-col>
-        <el-col :span="24" style="border-top:  1px solid #fff">
+        <el-col :span="24" style="border-top:  1px solid #d0d0d0">
          <div class="text-center copyright pd10">版权所有@无锡和畅赛事运营有限公司
            &ensp;&ensp
            <a target="_blank" href="https://beian.miit.gov.cn/">ICP备案号：苏ICP备2023054420号-2</a></div>
        </el-col>
      </el-row>
-      <el-row style="align-items: center;" v-if="language===1">
+      <el-row  align="middle" v-if="language===1">
        <el-col :span="14">
          <ul>
            <li>Postal code：214000</li>
@@ -37,7 +37,7 @@
          </ul>
        </el-col>
        <el-col :span="6">
-          <ul style="text-align: right">
+          <ul class="text-right">
            <li>Telephone:086-15606190026</li>
            <li>E-mail:info@wdsfwuxicenter.com</li>
          </ul>
@@ -48,7 +48,7 @@
            <p class="text-center mt10">Weibo</p>
          </div>
        </el-col>
-        <el-col :span="24" style="border-top:  1px solid #fff">
+        <el-col :span="24" style="border-top:  1px solid #d0d0d0">
          <div class="text-center copyright pd10">Copyright@Wuxi Hechang Sports Operations Co., Ltd
            <a target="_blank" href="https://beian.miit.gov.cn/">ICP：苏ICP备2023054420号-2</a></div>
        </el-col>
--- a/src/viewsPc/components/pickup.vue
View file @ce4653c
+++ b/src/viewsPc/components/pickup.vue
View file @ce4653c
@@ -128,6 +128,10 @@
            <el-form-item :label="language==0?'联系电话':'Contact Phone Number'" prop="downOffBo.phone" required>
              <el-input v-model="form.downOffBo.phone"/>
            </el-form-item>
+<!--            todo 增加邮箱字段，登记成功后发送邮件通知-->
+            <el-form-item :label="language==0?'联系邮箱':'Contact Email'" prop="downOffBo.email" required>
+              <el-input v-model="form.downOffBo.email"/>
+            </el-form-item>
            <el-form-item :label="language==0?'送机人数':'Number of People'" prop="downOffBo.counts" required>
              <el-input-number v-model="form.downOffBo.counts"/>
--- a/src/viewsPc/index.vue
View file @ce4653c
+++ b/src/viewsPc/index.vue
View file @ce4653c
@@ -125,7 +125,7 @@
                  <download/>
                </el-icon>
              </a>
-<!--              <a class="zn-btn ml20 btn-q forPc"  v-show="matchData?.id=='1778253367748993026'" @click="popMaster">青少年公益课报名</a>-->
+              <a class="zn-btn ml20 btn-q forPc"  v-if="matchData.isCourseView==1" @click="popMaster">青少年公益课报名</a>
              <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">背号查询</a>
              <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'" @click="schSearch">日程查询</a>
            </div>
--- a/src/viewsPc/index_en.vue
View file @ce4653c
+++ b/src/viewsPc/index_en.vue
View file @ce4653c
@@ -96,9 +96,9 @@
                  GUIDELINE
                  <el-icon><download /></el-icon>
                </a>
-<!--                <a class="zn-btn ml20 btn-q forPc"  v-show="matchData?.id=='1778253367748993026'" style="font-size: 15px;margin-right: 20px" @click="popMaster">-->
+                <a class="zn-btn ml20 btn-q forPc" v-if="matchData.isCourseView==1" style="font-size: 15px;margin-right: 20px" @click="popMaster">
-<!--                  Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>-->
+                  Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>
-<!--                </a>-->
+                </a>
                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="backNumberSearch">Competition Number</a>
                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="schSearchSearch">Schedule Inquiry</a>
--- a/src/viewsPc/match/components/addWdsf.vue
View file @ce4653c
+++ b/src/viewsPc/match/components/addWdsf.vue
View file @ce4653c
@@ -73,16 +73,10 @@
        </el-radio-group>
      </el-form-item>
-      <el-form-item :label="language==0?'出生日期':'Date of Birth'" required>
-        <el-date-picker
-            v-model="form.birth"
-            style="width: 100%;" :disabled-date="disabledBirth"
-            type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
      <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
-        <image-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false"
+        <image-upload action="/common/getPersonInfoFromCert/3" v-model="form.passportUrl" :limit="1" :is-show-tip="false"
-                      :button-text="language==0?'上传':'Upload'"/>
+                      :button-text="language==0?'上传':'Upload'"
+                      @response="ocrSuccess"/>
        <div class="tip">
          <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等 </span>
          <span v-else>
@@ -91,6 +85,14 @@
        </div>
      </el-form-item>
+      <el-form-item :label="language==0?'出生日期':'Date of Birth'" required>
+        <el-date-picker
+            v-model="form.birth"
+            style="width: 100%;" :disabled-date="disabledBirth"
+            type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
      <el-form-item :label="language==0?'证件号':'Passport number'" required>
        <el-input v-model="form.passportNumber"/>
      </el-form-item>
@@ -224,6 +226,10 @@ watch(show, (value) => {
    proxy.$refs['dialogRef'].clearValidate()
  })
 })
+const ocrSuccess = (res) => {
+  // todo 增加护照ocr识别 识别外国人护照姓名，出生年月
+  console.log(res)
+}
 function submitForm() {
  if (!form.value.passportNumber) {
--- a/src/viewsPc/match/detail_en.vue
View file @ce4653c
+++ b/src/viewsPc/match/detail_en.vue
View file @ce4653c
@@ -336,8 +336,8 @@
      </div>
    </el-dialog>
-<!--    v-if="matchData.leagueId==0&&matchId=='1802602359043600385'"-->
+<!--    v-if="matchData.leagueId==0"-->
-    <a class="ding" @click="openPickup" >{{ language==0?'接 / 送机服务':'Pick-up/drop-off service' }}</a>
+    <a class="ding" v-if="matchData.isAirView" @click="openPickup" >{{ language==0?'接 / 送机服务':'Pick-up/drop-off service' }}</a>
    <pickup ref="pickupRef"></pickup>
  </div>
 </template>