Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

华明祺
Showing 9 changed files with 74 additions and 29 deletions
src/viewsPc/booking/travel.vue
src/viewsPc/booking/travelOrder.vue
src/viewsPc/center/myMatch.vue
src/viewsPc/components/homeQuick.vue
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/addWdsf.vue
src/viewsPc/match/components/quick-row.vue
src/viewsPc/match/pay.vue
--- a/src/viewsPc/booking/travel.vue
View file @4d13c8e
+++ b/src/viewsPc/booking/travel.vue
View file @4d13c8e
@@ -52,7 +52,7 @@
          </el-card>
        </el-col>
      </el-row>
-      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
+      <el-empty v-show="!loading&&list.length===0" :image="`/img/order_no.png`" :image-size="228" description="" />
      <div style="height: 50px" />
    </div>
  </div>
--- a/src/viewsPc/booking/travelOrder.vue
View file @4d13c8e
+++ b/src/viewsPc/booking/travelOrder.vue
View file @4d13c8e
@@ -73,7 +73,7 @@
                <div v-if="needPersonNum>0" class="fakeFormItem">
                  <label>需填写{{ needPersonNum }}位游客</label>
                  <div>
-                    <div v-show="needPersonNum > hasPersonNum">还需填写{{ needPersonNum-hasPersonNum }}位游客</div>
+                    <label class="text-warning" v-show="needPersonNum > hasPersonNum">还需填写{{ needPersonNum-hasPersonNum }}位游客</label>
                  </div>
                </div>
                <div v-for="(n,i) in gateList" :key="i">
@@ -237,6 +237,7 @@ const checkPersonNum = () => {
  _.each(gateList.value, item => {
    needPersonNum.value += item.count
    _.each(item.personArr, person => {
+      console.log(person)
      if (person.customerId) {
        hasPersonNum.value++
      }
@@ -359,8 +360,10 @@ function submit() {
    submitOrderScenic(form.value).then(res => {
      if (res.data) {
-        if (res.data.roomNum == -100) {
+        if (res.data.orderId == -400) {
          ElMessage.warning(language.value == 0 ? '剩余票数不足' : 'The remaining number of rooms is insufficient')
+        } else if (res.data.orderId == -300) {
+          ElMessage.warning(language.value == 0 ? '提交失败,请稍后再试' : 'Submission failed, please try again later')
        } else {
          // 去付钱
          router.push({
--- a/src/viewsPc/center/myMatch.vue
View file @4d13c8e
+++ b/src/viewsPc/center/myMatch.vue
View file @4d13c8e
--- a/src/viewsPc/components/homeQuick.vue
View file @4d13c8e
+++ b/src/viewsPc/components/homeQuick.vue
View file @4d13c8e
@@ -123,7 +123,7 @@ function popRemark(type) {
      (form.value.isMealView == 0 && type == '4') ||
      (form.value.isPhotoView == 0 && type == '5') ||
      (form.value.isTicket == 0 && type == '0') ||
-      (form.value.isTravel == 0 && type == '8')
+      (form.value.isScenicView == 0 && type == '8')
  ) {
    building()
    return
--- a/src/viewsPc/match/chooseProject.vue
View file @4d13c8e
+++ b/src/viewsPc/match/chooseProject.vue
View file @4d13c8e
@@ -172,6 +172,8 @@
            </el-button>
            <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
+              <br v-if="language == 1">
+              <br v-if="language == 1">
              <el-checkbox
                v-model="checked"
                :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
@@ -481,11 +483,13 @@ function submitForm(n) {
 function commit() {
  if (language.value == 0 && insuranceFlag.value == 2 && checked.value == '0') {
-    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
+    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事方帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
      language.value == 0 ? '提示' : 'Tip', {
        confirmButtonText: language.value == 0 ? '是' : 'Yes',
        cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
-        type: 'warning'
+        type: 'warning',
+        closeOnClickModal: false,
+        showClose: false
      }).then(() => {
      checked.value = '1'
      router.push({
@@ -909,7 +913,7 @@ function handelInsurance() {
 .father {
  position: relative;
-  height: 50px;
+  height: 85px;
 }
 .checkbox {
--- a/src/viewsPc/match/chooseSportsman.vue
View file @4d13c8e
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @4d13c8e
@@ -183,6 +183,8 @@
            </el-button>
            <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
+              <br v-if="language == 1">
+              <br v-if="language == 1">
              <el-checkbox
                v-model="checked"
                :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
@@ -437,11 +439,13 @@ function submitForm() {
        type: 'warning'
      })
  } else if (language.value == 0 && insuranceFlag.value == '2' && checked.value == 0) {
-    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
+    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事方帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
      language.value == 0 ? '提示' : 'Tip', {
        confirmButtonText: language.value == 0 ? '是' : 'Yes',
        cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
-        type: 'warning'
+        type: 'warning',
+        closeOnClickModal: false,
+        showClose: false
      }).then(() => {
      checked.value = '1'
      router.push({
@@ -1083,7 +1087,7 @@ function handelInsurance() {
 .father {
  position: relative;
-  height: 60px;
+  height: 85px;
 }
 .checkbox {
--- a/src/viewsPc/match/components/addWdsf.vue
View file @4d13c8e
+++ b/src/viewsPc/match/components/addWdsf.vue
View file @4d13c8e
@@ -249,6 +249,7 @@ const ocrSuccess = (res) => {
    form.value.passportNumber = res.data.code
    form.value.birth = res.data.birth?.slice(0, 10)
    form.value.sex = res.data.sex
+    form.value.certName = res.data.name
  } else if (res.code == 500) {
    ElMessage.warning(res.msg)
  }
--- a/src/viewsPc/match/components/quick-row.vue
View file @4d13c8e
+++ b/src/viewsPc/match/components/quick-row.vue
View file @4d13c8e
@@ -171,7 +171,7 @@ function popRemark(type) {
    || (form.value.isMealView == 0 && type == '4')
    || (form.value.isPhotoView == 0 && type == '5')
    || (form.value.isTicket == 0 && type == '0')
-    || (form.value.isTravel == 0 && type == '8')
+    || (form.value.isScenicView == 0 && type == '8')
  ) {
    building()
    return
--- a/src/viewsPc/match/pay.vue
View file @4d13c8e
+++ b/src/viewsPc/match/pay.vue
View file @4d13c8e
@@ -3,7 +3,9 @@
    <div v-if="!errorBox" class="box">
      <el-card :body-style="{ padding: '0px' }" class="mt20">
        <div slot="header">
-          <div class="bg-lineg">{{ language == 0 ? '报名缴费清单' : 'Registration Payment List' }}</div>
+          <div class="bg-lineg">
+            {{ language == 0 ? '报名缴费清单' : 'Registration Payment List' }}
+          </div>
        </div>
        <match-info-row v-if="matchId" :match-id="matchId" />
        <div v-if="isLogin">
@@ -11,7 +13,8 @@
          <coach-info-row v-if="groupId" :group-id="groupId" :match-id="matchId" />
          <div v-if="user.utype=='1'&&myMemberTable.length>0" class="pd20">
-            <div class="leftboderTT">{{ language == 0 ? '随行人员清单' : 'List of accompanying personnel' }}
+            <div class="leftboderTT">
+              {{ language == 0 ? '随行人员清单' : 'List of accompanying personnel' }}
            </div>
            <div>
              <el-table :data="myMemberTable" border class="mt20">
@@ -41,7 +44,9 @@
            </div>
          </div>
          <div v-if="signInfoList?.length>0||zuQuery.athName" class="pd20">
-            <div class="leftboderTT">{{ language == 0 ? '参赛人员保险费' : 'Participant Insurance Fee' }}
+            <div class="leftboderTT">
+              <!--              {{ language == 0 ? '' + '参赛人员保险费' : 'Participant Insurance Fee'  }}-->
+              {{ language == 0 ? '' + '参赛人员' : 'Participant' }}
              <div class="fr">
                <el-input
                  v-model="zuQuery.athName" :prefix-icon="Search" clearable
@@ -51,12 +56,18 @@
            </div>
            <!--            人员列表-->
            <sign-info-table
-              v-if="matchId" :has-action="false" :list="signInfoList" :match-id="matchId"
+              v-if="matchId"
-              :show-summary="true" :total="insuranceFeeTotal" class="mt20"
+              :has-action="false"
+              :list="signInfoList"
+              :match-id="matchId"
+              :show-summary="buy==1"
+              :total="insuranceFeeTotal"
+              class="mt20"
            />
          </div>
          <div v-if="zuTableList?.length>0||zuQuery.groName" class="pd20">
-            <div class="leftboderTT">{{ language == 0 ? '参赛设项服务费' : 'Registration Fee for Event Entry' }}
+            <div class="leftboderTT">
+              {{ language == 0 ? '参赛设项服务费' : 'Registration Fee for Event Entry' }}
              <div class="fr">
                <el-input
                  v-model="zuQuery.groName" :prefix-icon="Search" clearable
@@ -65,7 +76,10 @@
              </div>
            </div>
            <zu-table
-              :has-action="false" :list="zuTableList" :show-summary="true" :total="serviceFeeTotal"
+              :has-action="false"
+              :list="zuTableList"
+              :show-summary="true"
+              :total="serviceFeeTotal"
              class="mt20"
            />
          </div>
@@ -96,12 +110,13 @@
                <div v-if="signInfoList?.length>0" class="item"><label>{{
                  language == 0 ? '参赛服务费' : 'REGISTRATION FEE'
                }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ serviceFeeTotal }}</span></div>
-                <div v-if="zuTableList?.length>0" class="item"><label>{{
+                <div v-if="zuTableList?.length>0 &&buy!='0'" class="item"><label>{{
                  language == 0 ? '保险费' : 'INSURANCE'
                }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ insuranceFeeTotal }}</span></div>
-                <div class="item"><label>{{ language == 0 ? '费用总计' : 'Total Cost' }}：</label><span
+                <div class="item">
-                  class="size26"
+                  <label>{{ language == 0 ? '费用总计' : 'Total Cost' }}：</label>
-                >{{ language == 0 ? '¥' : '€' }}{{ form.totalFee }}</span></div>
+                  <span class="size26">{{ language == 0 ? '¥' : '€' }}{{ form.totalFee }}</span>
+                </div>
              </div>
            </el-col>
          </el-row>
@@ -162,7 +177,9 @@
        </el-row>
      </el-card>
      <el-card v-if="form.auditStatus=='2'&&form.payStatus=='0'&&Number(form.totalFee)>0" class="mb60">
-        <div class="leftboderTT">{{ language == 0 ? '选择支付方式' : 'Choose payment method' }}</div>
+        <div class="leftboderTT">
+          {{ language == 0 ? '选择支付方式' : 'Choose payment method' }}
+        </div>
        <div class="mt20">
          <el-radio-group v-model="payType" @change="changePaytype">
            <!--            0 线下 1 支付宝 2 微信 3 paypal-->
@@ -291,6 +308,7 @@
          <div v-if="payType == '3'">
            <table cellpadding="0" cellspacing="0" class="table-border table">
+              <tbody>
                <tr>
                  <th class="head" colspan="2">
                    {{ language == 0 ? '线下缴费的收款信息' : 'Offline Payment Collection Information' }}
@@ -358,6 +376,8 @@
                    <span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
                  </td>
                </tr>
+              </tbody>
            </table>
            <div class="text-center">
@@ -432,7 +452,9 @@
        </el-form-item>
      </div>
      <div class="tip mt20">
-        <label>{{ language == 0 ? '开电子收据须知' : 'Receipt notice' }}:</label>
+        <label>
+          {{ language == 0 ? '开电子收据须知' : 'Receipt notice' }}:
+        </label>
        <div class="pd10">
          {{ remark }}
        </div>
@@ -467,6 +489,7 @@ import { useStorage } from '@vueuse/core/index'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getBaseInfoByActiveId, getReceipt } from '@/apiPc/booking'
+const buy = ref(route.query.buy || '0')
 const isLogin = ref(false)
 const language = useStorage('language', 0)
 const signInfoList = ref([])
@@ -486,7 +509,8 @@ const insuranceFeeTotal = ref(0)
 const serviceFeeTotal = ref(0)
 const zuQuery = ref({
  cptId: matchId.value,
-  groupId: groupId.value
+  groupId: groupId.value,
+  buy: route.query.buy || '0'
 })
 const user = useUserStore().user
 const remark = ref('')
@@ -521,7 +545,10 @@ if (useUserStore().user) {
 }
 function getData() {
-  return match.getMyOrderDetail({ orderId: orderId.value }).then(res => {
+  return match.getMyOrderDetail({
+    orderId: orderId.value,
+    buy: buy.value
+  }).then(res => {
    totalFee.value = res.data.totalFee
    form.value = res.data
    form.value.payTypeArr = res.data.payType.split(',')
@@ -560,6 +587,7 @@ function upRR() {
 function getSignList() {
  match.getMySignInfoList(zuQuery.value).then(res => {
+    console.log(res)
    insuranceFeeTotal.value = 0
    serviceFeeTotal.value = 0
    signInfoList.value = res.data?.singleData || []
@@ -571,6 +599,7 @@ function getSignList() {
      serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee)
    }
  }).catch(err => {
+    console.log(err)
    if (isLogin.value) {
      router.push({ name: 'myMatch' })
    }
@@ -643,7 +672,8 @@ function exportSignList(n) {
  var obj = {
    cptId: matchId.value,
    groupId: groupId.value,
-    type: n
+    type: n,
+    buy: buy.value
  }
  var fileName
  if (language.value == 0) {
@@ -670,7 +700,8 @@ function exportSignList(n) {
 function exportPdf() {
  var obj = {
    cptId: matchId.value,
-    groupId: groupId.value
+    groupId: groupId.value,
+    buy: buy.value
  }
  var fileName
  if (language.value == 0) {
@@ -740,6 +771,7 @@ function downloadAndSend() {
      showSJ()
    })
  }).catch(err => {
+    console.log(err)
    loading.value = false
  })
 }
@@ -748,7 +780,8 @@ const showSJ = () => {
  // 查看电子收据预览信息
  var obj = {
    orderId: form.value.oid,
-    type: 1
+    type: 1,
+    buy: buy.value
  }
  if (form.value.receiptFlag == '0') {
    obj.receiptInfo = lpName.value