Merge remote-tracking branch 'origin/dev' into dev

zhangmeng
Showing 6 changed files with 63 additions and 23 deletions
src/viewsPc/booking/addInvoice.vue
src/viewsPc/center/myMatch.vue
src/viewsPc/match/components/addCoach.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/matchNews.vue
src/viewsPc/news/list.vue
--- a/src/viewsPc/booking/addInvoice.vue
View file @cf59198
+++ b/src/viewsPc/booking/addInvoice.vue
View file @cf59198
@@ -138,9 +138,7 @@
              <div class="tip" v-if="remark">
                <label>{{ language == 0 ?'开票须知':'Invoice Notice' }}:</label>
-                <div>
+                <div v-html="remark"></div>
-                 {{remark}}
-                </div>
              </div>
            </div>
          </el-col>
@@ -361,7 +359,8 @@ function goEditAddress(id) {
 function getRemark() {
  getBaseInfoByActiveId(cptId).then(res=>{
     if(res.data){
-       remark.value = res.data.remarks
+       // remark.value = res.data.remarks
+       remark.value = res.data.remarks.replace(/\n/g, '<br>')
     }
  })
 }
--- a/src/viewsPc/center/myMatch.vue
View file @cf59198
+++ b/src/viewsPc/center/myMatch.vue
View file @cf59198
@@ -76,6 +76,7 @@ import useUserStore from "@/store/modules/user";
 import cache from "@/plugins/cache";
 import {useStorage} from "@vueuse/core/index";
 import {refundApply} from "@/apiPc/match";
+import dayjs from "dayjs";
 const language= useStorage('language',0)
 const router = useRouter()
 const {proxy} = getCurrentInstance()
@@ -146,6 +147,13 @@ function continueSign(n){
    })
    return
  }
+  if(n.signEndTime <= dayjs().format('YYYY-MM-DD HH:mm:ss')){
+    ElMessage({
+      message: language.value==0?'赛事报名已结束无法继续报名':'The event registration has ended.',
+      type: 'warning'
+    })
+    return
+  }
  if (user.utype == '1') {
    // 个人报名
    router.push({
--- a/src/viewsPc/match/components/addCoach.vue
View file @cf59198
+++ b/src/viewsPc/match/components/addCoach.vue
View file @cf59198
@@ -46,11 +46,12 @@
          </el-form-item>
        </el-col>
        <el-col :lg="12">
-          <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth" required>
+          <el-form-item :label="language==0?'出生日期1':'Date of Birth'" prop="birth" required>
            <el-date-picker
                v-model="form.birth" :disabled="editgay&&form.labelArr.indexOf('0')>-1"
                style="width: 100%;"
                type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                :disabled-date="disabledBirth"
            />
          </el-form-item>
          <el-form-item :label="language==0?'主要会员角色':'roles'" prop="labelArr">
@@ -106,7 +107,7 @@
 import {reactive, ref, toRefs, watch} from 'vue'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
-import {ElMessage} from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import _ from 'lodash'
 import {useStorage} from "@vueuse/core/index";
 const language= useStorage('language',0)
@@ -249,6 +250,10 @@ function reset(){
    })
  }
 }
+function disabledBirth(date) {
+  const today = dayjs().format('YYYY-MM-DD')
+  return (date.getTime() >= dayjs(today).valueOf())
+}
 function getCountryList() {
  match.countryList().then(res => {
    countryList.value = res.data
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @cf59198
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @cf59198
@@ -90,8 +90,9 @@
                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
            <el-input v-model="form.idcCode" :disabled="editgay" @blur="giveBirthDay"/>
          </el-form-item>
-          <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth"
+          <el-form-item :label="language==0?'2出生日期':'Date of Birth'" prop="birth"
-                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
+                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1"
+                        :disabled-date="disabledBirth">
            <el-date-picker
                v-model="form.birth" :disabled="form.idcType=='0'"
                style="width: 100%;"
@@ -137,7 +138,7 @@
 import {reactive, ref, toRefs, watch} from 'vue'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
-import {ElMessage} from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import _ from 'lodash'
 import {useStorage} from "@vueuse/core/index";
 import {checkWdsf, getCaptchaSms} from "@/apiPc/match";
@@ -284,6 +285,9 @@ watch(show, (value) => {
    // proxy.$refs['dialogRef'].clearValidate()
  })
 })
+function disabledBirth(time) {
+  return time.getTime() > new Date().getTime()
+}
 function resetCode() {
  isCodeTrue.value = false
 }
--- a/src/viewsPc/match/components/matchNews.vue
View file @cf59198
+++ b/src/viewsPc/match/components/matchNews.vue
View file @cf59198
@@ -9,18 +9,23 @@
    <div class="indexTitle">
      <h3 class="leftboderTT">{{ language==0?'赛事报道':'Special reports' }}</h3>
-<!--      <a class="more" @click="goList(query2.sortId,'专题报道')">MORE</a>-->
+      <a class="more" v-if="newsList2.length>3" @click="goList(query2.code,'专题报道')">MORE</a>
    </div>
    <div>
-      <div class="item" v-for="n in newsList2" :key="n.id" @click="goDetail(n)">
+      <div class="item news2" v-for="(n,index) in newsList2" v-show="index<3" :key="n.id" @click="goDetail(n)">
-        <p class="esp">{{ n.name }}</p>
+        <div class="imgbox" v-if="n.picUrl" @click="goDetail(n)">
+          <img :src="fillImgUrl(n.picUrl)">
+        </div>
+        <div>
+          <p class="esp_2">{{ n.name }}</p>
+        </div>
      </div>
    </div>
    <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'赛事视频':'VEDIOS' }}</h3>
 <!--      <a class="more" @click="goList(10000006,'赛事视频')">MORE</a>-->
    </div>
-    <div class="item" v-for="n in newsList" :key="n.id" @click="goDetail(n)">
+    <div class="item" v-for="(n,index) in newsList" v-show="index<3" :key="n.id" @click="goDetail(n)">
      <div class="videoImgbox" @click="goDetail(n)">
        <img :src="fillImgUrl(n.picUrl)">
      </div>
@@ -28,7 +33,7 @@
    <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'赛事图片':'PHOTOS' }}</h3>
 <!--      <a class="more" @click="goList(10000007,'赛事图片')">MORE</a>-->
    </div>
-    <div v-for="n in newsList3" :key="n.id" @click="goDetail(n)">
+    <div v-for="(n,index) in newsList3" v-show="index<3" :key="n.id" @click="goDetail(n)">
      <div class="picbox"><img :src="fillImgUrl(n.picUrl)"/></div>
    </div>
  </el-card>
@@ -51,17 +56,17 @@ const newsList = ref([])
 const newsList2 = ref([])
 const newsList3 = ref([])
 const query1 = ref({
-  pageSize: 1,
+  pageSize: 5,
  pageNum: 1,
  code:  `${props.matchId}${language.value == 0 ?'100':'101'}2`
 })
 const query2 = ref({
-  pageSize: 3,
+  pageSize: 5,
  pageNum: 1,
  code:  `${props.matchId}${language.value == 0 ?'100':'101'}1`
 })
 const query3 = ref({
-  pageSize: 1,
+  pageSize: 5,
  pageNum: 1,
  code:  `${props.matchId}${language.value == 0 ?'100':'101'}3`
 })
@@ -90,7 +95,8 @@ const goList = (sortId,name) => {
  router.push({
    path: `/news/list/${sortId}`,
    query:{
-      kindName:name
+      kindName:name,
+      code:sortId
    }
  })
 }
@@ -106,6 +112,12 @@ const goDetail = (n) => {
 </script>
 <style scoped lang="scss">
+.news2{display: flex;margin: 0 0 20px;
+  .imgbox{margin-right: 15px;height: calc(900px/16);width: 100px;
+    img{object-fit: cover;width:100px;height: 100%;}
+  }
+  .esp_2{margin: 0;}
+}
 .indexTitle{margin: 20px 0 12px;
 h3{
  font-size: 20px;
--- a/src/viewsPc/news/list.vue
View file @cf59198
+++ b/src/viewsPc/news/list.vue
View file @cf59198
@@ -13,7 +13,8 @@
                <p>{{ n.belongTime?.substring(0, 7).replace(/-/g, '/') }}</p>
              </div>
              <div v-if="n.picUrl" class="imgbox">
-                <img :src="fillImgUrl_webSite(n.picUrl)">
+                <img v-if="query.code" :src="fillImgUrl(n.picUrl)">
+                <img v-else :src="fillImgUrl_webSite(n.picUrl)">
              </div>
              <div class="item-body">
                <h3 class="esp_2" v-html="n.name" />
@@ -42,7 +43,7 @@
 <script setup>
 import { ArrowRight, Search } from '@element-plus/icons-vue'
 import { onMounted, ref } from 'vue'
-import { getNewsListById } from '@/apiPc/webSite'
+import {getNewsListById, getnoteListcptid} from '@/apiPc/webSite'
 import { useRoute, useRouter } from 'vue-router'
 import {useStorage} from "@vueuse/core/index";
 const language = useStorage('language', 0)
@@ -58,11 +59,22 @@ const query = ref({
 })
 onMounted(() => {
  console.log(route)
-  query.value.sortId = route.params.id
  kindName.value = route.query.kindName
-  getList()
-})
+  if(route.query.code){
+    query.value.code = route.query.code
+    getnotebycode()
+  } else {
+    query.value.sortId = route.params.id
+    getList()
+  }
+})
+const getnotebycode = () => {
+  getnoteListcptid(query.value).then(res => {
+    newsList.value = res.rows
+    total.value = res.total
+  })
+}
 const getList = () => {
  console.log(query.value)
  getNewsListById(query.value).then(res => {