f0f90c51 by 杨炀

stage

1 parent fb5fd137
import {createPinia} from "pinia";
const store = createPinia()
export default store
......
......@@ -33,7 +33,7 @@
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......@@ -60,7 +60,7 @@
<el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......@@ -85,7 +85,7 @@
<el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......@@ -110,7 +110,7 @@
<el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......@@ -135,7 +135,7 @@
<el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......@@ -160,7 +160,7 @@
<el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
<el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
<p class="name">{{ c.xing }}{{c.ming}}
<p class="name">{{ c.realName }}
<el-icon @click.stop="editPerson(c.id)">
<Edit/>
</el-icon>
......
......@@ -319,10 +319,10 @@ function submitForm() {
return
}
}
// if(!form.value.passportUrl){
// ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file')
// return
// }
if(form.value.idcType != 0&&!form.value.passportUrl){
ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file')
return
}
if (typeof (form.value.regionId) === 'object') {
form.value.regionId = _.last(form.value.regionId)
}
......
......@@ -201,8 +201,14 @@
<el-row :gutter="20" class="pd20" v-else>
<el-col :span="24">
<div class="fr mb20">
<el-input size="small" v-model="queryGroupList.name" :prefix-icon="Search"
<div class="flex">
<el-input class="mr10" size="small" v-model="queryGroupList.groupName" :prefix-icon="Search"
:placeholder="language == 0 ? '请输入参赛队名称' :'Please enter the Team name'"
@change="getGroupListByCptId" clearable/>
<el-input size="small" v-model="queryGroupList.athleteName" :prefix-icon="Search"
:placeholder=" language == 0 ? '请输入运动员查询' :'Please enter the athlete name'"
@change="getGroupListByCptId" clearable/>
</div>
</div>
<el-table :data="signDoneGroupList">
<el-table-column prop="groupCode" align="center" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
......
......@@ -361,6 +361,7 @@ const upForm = ref({
})
const errorBox = ref(false)
const hideconfirmbtn = ref(false)
const isphone = ref(false)
const insuranceFeeTotal = ref(0)
const serviceFeeTotal = ref(0)
const zuQuery = ref({
......@@ -382,6 +383,13 @@ onMounted(() => {
language.value = 1
}
}
console.log(navigator.userAgent)
var is_mobile = navigator.userAgent.toLowerCase().match(/(ipod|ipad|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
if (is_mobile) {
isphone.value = true
} else {
isphone.value = false
}
})
if (useUserStore().user) {
isLogin.value = true
......@@ -453,6 +461,9 @@ function changePaytype() {
}
function goPay(){
if(payType.value=='2' && form.value.payTypeArr.indexOf('2')>-1){
if(isphone.value){
//移动支付
}
match.createWePay({orderId:orderId.value}).then(res=>{
wePayCodeUrl.value = res.data
hideconfirmbtn.value = true
......
......@@ -195,7 +195,6 @@ onMounted(() => {
console.log(cptId.value,route.query,route.params)
// 获取团体信息
getGroupInfo()
signType.value = route.query.signType
isNational.value = route.query.isNational
languageSource.value = route.query.languageSource
......
......@@ -50,9 +50,9 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="language==0?'团体类型':'Group type'" prop="type">
<el-select :disabled="language==1" v-model="form.type" :placeholder="typeOptions[language].selectPlaceholder" style="width: 100%;">
<el-select :disabled="form.type=='4'" v-model="form.type" :placeholder="typeOptions[language].selectPlaceholder" style="width: 100%;">
<el-option v-for="(o,index) in typeOptions[language].options" :label="o.text"
:key="index" :value="o.value" />
:key="index" :value="o.value" :disabled="o.disabled"/>
</el-select>
</el-form-item>
<el-form-item :label="language==0?'详细地址':'Detailed Address'" prop="address">
......@@ -131,7 +131,7 @@ const data = reactive({
{value:'1',text:'专业舞蹈学校'},
{value:'2',text:'培训机构/俱乐部'},
{value:'3',text:'地方协会'},
{value:'4',text:'国家协会'},
{value:'4',text:'国家协会',disabled:true},
]
},
1: {
......
......@@ -35,7 +35,7 @@
</div>
</el-form-item>
<el-form-item :label="language==0?'代表国家/地区':'Representing'" required prop="countryId">
<el-select filterable v-model="form.countryId">
<el-select filterable v-model="form.countryId" :disabled="language==0&&form.is=='0'">
<!-- <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id"/>-->
<el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
</el-select>
......@@ -321,6 +321,9 @@ const changeIs = (e) => {
if(e == 1){
form.value.type = '4'
} else {
if(language.value == '0'){
form.value.countryId = 240
}
form.value.type = ''
}
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!