预定查询
Showing
12 changed files
with
180 additions
and
124 deletions
| ... | @@ -185,4 +185,40 @@ export function queryTicket(qy) { | ... | @@ -185,4 +185,40 @@ export function queryTicket(qy) { |
| 185 | params: qy | 185 | params: qy |
| 186 | }) | 186 | }) |
| 187 | } | 187 | } |
| 188 | 188 | // 酒店 | |
| 189 | export function orderRoomList(qy) { | ||
| 190 | return request({ | ||
| 191 | url: `/ota/orderRoom/getReservationRecordList`, | ||
| 192 | method: 'get', | ||
| 193 | params: qy | ||
| 194 | }) | ||
| 195 | } | ||
| 196 | // 接送 | ||
| 197 | export function orderCarList(qy) { | ||
| 198 | return request({ | ||
| 199 | url: `/ota/orderCar/getReservationRecordList`, | ||
| 200 | method: 'get', | ||
| 201 | params: qy | ||
| 202 | }) | ||
| 203 | } | ||
| 204 | export function orderMealList(qy) { | ||
| 205 | return request({ | ||
| 206 | url: `/ota/orderMeal/getReservationRecordList`, | ||
| 207 | method: 'get', | ||
| 208 | params: qy | ||
| 209 | }) | ||
| 210 | } | ||
| 211 | export function orderScenicList(qy) { | ||
| 212 | return request({ | ||
| 213 | url: `/ota/orderScenic/getReservationRecordList`, | ||
| 214 | method: 'get', | ||
| 215 | params: qy | ||
| 216 | }) | ||
| 217 | } | ||
| 218 | export function orderTicketList(qy) { | ||
| 219 | return request({ | ||
| 220 | url: `/ota/orderTicket/getReservationRecordList`, | ||
| 221 | method: 'get', | ||
| 222 | params: qy | ||
| 223 | }) | ||
| 224 | } | ... | ... |
| ... | @@ -75,7 +75,7 @@ onMounted(() => { | ... | @@ -75,7 +75,7 @@ onMounted(() => { |
| 75 | function getList() { | 75 | function getList() { |
| 76 | query.value.activityId = route.params.cptId | 76 | query.value.activityId = route.params.cptId |
| 77 | getActivityRestaurantList(query.value).then(res => { | 77 | getActivityRestaurantList(query.value).then(res => { |
| 78 | list.value = res.rows | 78 | list.value = res.rows.filter(item => item.viewStatus == '1'); |
| 79 | }) | 79 | }) |
| 80 | } | 80 | } |
| 81 | 81 | ... | ... |
| ... | @@ -75,7 +75,7 @@ onMounted(()=>{ | ... | @@ -75,7 +75,7 @@ onMounted(()=>{ |
| 75 | function getList() { | 75 | function getList() { |
| 76 | loading.value = true | 76 | loading.value = true |
| 77 | booking.getMakeUpList(query.value).then(res=>{ | 77 | booking.getMakeUpList(query.value).then(res=>{ |
| 78 | list.value = res.rows | 78 | list.value = res.rows.filter(item => item.viewStatus == 1) |
| 79 | loading.value = false | 79 | loading.value = false |
| 80 | }).catch(e=>{ | 80 | }).catch(e=>{ |
| 81 | loading.value = false | 81 | loading.value = false | ... | ... |
| ... | @@ -75,7 +75,7 @@ onMounted(()=>{ | ... | @@ -75,7 +75,7 @@ onMounted(()=>{ |
| 75 | function getList() { | 75 | function getList() { |
| 76 | loading.value = true | 76 | loading.value = true |
| 77 | booking.getShootList(query.value).then(res=>{ | 77 | booking.getShootList(query.value).then(res=>{ |
| 78 | list.value = res.rows | 78 | list.value = res.rows.filter(item => item.viewStatus == 1) |
| 79 | loading.value = false | 79 | loading.value = false |
| 80 | }).catch(e=>{ | 80 | }).catch(e=>{ |
| 81 | loading.value = false | 81 | loading.value = false | ... | ... |
| ... | @@ -159,17 +159,20 @@ | ... | @@ -159,17 +159,20 @@ |
| 159 | </div> | 159 | </div> |
| 160 | </div> | 160 | </div> |
| 161 | <div class="select_item_box"> | 161 | <div class="select_item_box"> |
| 162 | <div class="select_item"> | 162 | <div class="select_item-tag"> |
| 163 | <div | 163 | <div |
| 164 | v-for="it in tickList[selectForm.sessionType]" | 164 | v-for="it in tickList[selectForm.sessionType]" |
| 165 | :key="it.id" | 165 | :key="it.id" |
| 166 | :class="[ | 166 | |
| 167 | it.id == selectForm.latstId ? 'tagActive' : 'tag', | 167 | |
| 168 | it.isView==0?'forbid':'' | ||
| 169 | ]" | ||
| 170 | @click="selectTick(it)" | 168 | @click="selectTick(it)" |
| 171 | > | 169 | > |
| 172 | {{ it.name }} | 170 | <span v-if="it.viewStatus === '1'" :class="[ |
| 171 | it.id == selectForm.latstId ? 'tagActive' : 'tag', | ||
| 172 | it.isView==0?'forbid':'' | ||
| 173 | ]" > | ||
| 174 | {{ it.name}} | ||
| 175 | </span> | ||
| 173 | </div> | 176 | </div> |
| 174 | <div class="father"> | 177 | <div class="father"> |
| 175 | <el-image | 178 | <el-image |
| ... | @@ -665,6 +668,65 @@ getmatchData() | ... | @@ -665,6 +668,65 @@ getmatchData() |
| 665 | cursor: no-drop; | 668 | cursor: no-drop; |
| 666 | } | 669 | } |
| 667 | } | 670 | } |
| 671 | .select_item-tag{ | ||
| 672 | display: flex; | ||
| 673 | flex-wrap: wrap; | ||
| 674 | // gap: 10px; | ||
| 675 | user-select: none; | ||
| 676 | |||
| 677 | .tag_t { | ||
| 678 | padding: 1px 15px; | ||
| 679 | font-weight: 400; | ||
| 680 | font-size: 14px; | ||
| 681 | color: #493ceb; | ||
| 682 | border-radius: 6px; | ||
| 683 | border: 1px solid #453dea; | ||
| 684 | margin-left: 5px; | ||
| 685 | } | ||
| 686 | |||
| 687 | .tag { | ||
| 688 | display: flex; | ||
| 689 | padding: 12px 18px; | ||
| 690 | background: #eeeeee; | ||
| 691 | border-radius: 4px; | ||
| 692 | border: 1px solid #29343c; | ||
| 693 | font-size: 14px; | ||
| 694 | color: #4a4a4a; | ||
| 695 | margin-right: 10px; | ||
| 696 | margin-bottom: 10px; | ||
| 697 | cursor: pointer; | ||
| 698 | } | ||
| 699 | |||
| 700 | .tagActive { | ||
| 701 | display: flex; | ||
| 702 | padding: 12px 18px; | ||
| 703 | background: #fff; | ||
| 704 | border-radius: 4px; | ||
| 705 | border: 1px solid #493ceb; | ||
| 706 | font-size: 14px; | ||
| 707 | color: #493ceb; | ||
| 708 | margin-right: 10px; | ||
| 709 | margin-bottom: 10px; | ||
| 710 | cursor: pointer; | ||
| 711 | } | ||
| 712 | |||
| 713 | .tao { | ||
| 714 | border: 1px solid #493ceb; | ||
| 715 | font-size: 14px; | ||
| 716 | color: #493ceb; | ||
| 717 | margin-left: 10px; | ||
| 718 | } | ||
| 719 | |||
| 720 | .tagDisabled { | ||
| 721 | padding: 12px 18px; | ||
| 722 | background: #878787; | ||
| 723 | border-radius: 4px; | ||
| 724 | border: 1px solid #29343c; | ||
| 725 | font-size: 14px; | ||
| 726 | color: #4a4a4a; | ||
| 727 | cursor: no-drop; | ||
| 728 | } | ||
| 729 | } | ||
| 668 | } | 730 | } |
| 669 | 731 | ||
| 670 | .btn { | 732 | .btn { |
| ... | @@ -871,4 +933,11 @@ getmatchData() | ... | @@ -871,4 +933,11 @@ getmatchData() |
| 871 | } | 933 | } |
| 872 | } | 934 | } |
| 873 | } | 935 | } |
| 936 | .view-status-mark { | ||
| 937 | color: #493ceb; /* 与票档主题色一致 */ | ||
| 938 | font-size: 12px; /* 小于票型名称字号,避免突兀 */ | ||
| 939 | margin-left: 4px; /* 与名称保持间距 */ | ||
| 940 | font-weight: 500; | ||
| 941 | |||
| 942 | } | ||
| 874 | </style> | 943 | </style> | ... | ... |
| ... | @@ -100,7 +100,7 @@ onMounted(() => { | ... | @@ -100,7 +100,7 @@ onMounted(() => { |
| 100 | function getList() { | 100 | function getList() { |
| 101 | loading.value = true | 101 | loading.value = true |
| 102 | booking.getScenicList(query.value).then(res => { | 102 | booking.getScenicList(query.value).then(res => { |
| 103 | list.value = res.rows | 103 | list.value = res.rows.filter(item => item.viewStatus == '1'); |
| 104 | loading.value = false | 104 | loading.value = false |
| 105 | console.log(list.value) | 105 | console.log(list.value) |
| 106 | }).catch(e => { | 106 | }).catch(e => { | ... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog | 2 | <el-dialog v-model="show" :append-to-body="true" :close-on-click-modal="false" :show-close="showClose" :title="title" |
| 3 | v-model="show" | 3 | center class="pcloginpop" close-icon="CircleClose" destroy-on-close style="max-width: 450px;min-width: 350px" |
| 4 | :append-to-body="true" | 4 | @close="close"> |
| 5 | :close-on-click-modal="false" | ||
| 6 | :show-close="showClose" | ||
| 7 | :title="title" | ||
| 8 | center | ||
| 9 | class="pcloginpop" | ||
| 10 | close-icon="CircleClose" | ||
| 11 | destroy-on-close | ||
| 12 | style="max-width: 450px;min-width: 350px" | ||
| 13 | @close="close" | ||
| 14 | > | ||
| 15 | <div class="pd10" /> | 5 | <div class="pd10" /> |
| 16 | <el-form | 6 | <el-form v-if="loginStatus == 0" ref="loginRef" :model="loginForm" :rules="language == 0 ? loginRules : loginRules_en" |
| 17 | v-if="loginStatus==0" ref="loginRef" :model="loginForm" | 7 | class="login-form"> |
| 18 | :rules="language==0?loginRules:loginRules_en" class="login-form" | ||
| 19 | > | ||
| 20 | <el-form-item prop="username"> | 8 | <el-form-item prop="username"> |
| 21 | 9 | ||
| 22 | <el-input | 10 | <el-input v-model.trim="loginForm.username" :placeholder="language == 0 ? '账号(注册时使用的邮箱)' : 'Account (e-mail)'" |
| 23 | v-model.trim="loginForm.username" | 11 | auto-complete="off" size="large" /> |
| 24 | :placeholder="language==0?'账号(注册时使用的邮箱)':'Account (e-mail)'" | ||
| 25 | auto-complete="off" | ||
| 26 | size="large" | ||
| 27 | /> | ||
| 28 | </el-form-item> | 12 | </el-form-item> |
| 29 | <el-form-item prop="password"> | 13 | <el-form-item prop="password"> |
| 30 | <el-input | 14 | <el-input v-model.trim="loginForm.password" :placeholder="language == 0 ? '密码' : 'Password'" auto-complete="off" |
| 31 | v-model.trim="loginForm.password" | 15 | show-password size="large" type="password" @keyup.enter="handleLogin" /> |
| 32 | :placeholder="language==0?'密码':'Password'" | ||
| 33 | auto-complete="off" show-password | ||
| 34 | size="large" | ||
| 35 | type="password" | ||
| 36 | @keyup.enter="handleLogin" | ||
| 37 | /> | ||
| 38 | </el-form-item> | 16 | </el-form-item> |
| 39 | <el-form-item v-if="captchaEnabled" prop="code"> | 17 | <el-form-item v-if="captchaEnabled" prop="code"> |
| 40 | <el-input | 18 | <el-input v-model.trim="loginForm.code" :placeholder="language == 0 ? '验证码' : 'Code'" auto-complete="off" size="large" |
| 41 | v-model.trim="loginForm.code" | 19 | @keyup.enter="handleLogin"> |
| 42 | :placeholder="language==0?'验证码':'Code'" | ||
| 43 | auto-complete="off" | ||
| 44 | size="large" | ||
| 45 | @keyup.enter="handleLogin" | ||
| 46 | > | ||
| 47 | <template #append> | 20 | <template #append> |
| 48 | <div class="login-code"> | 21 | <div class="login-code"> |
| 49 | <img :src="codeUrl" class="login-code-img" @click="getCode"> | 22 | <img :src="codeUrl" class="login-code-img" @click="getCode"> |
| ... | @@ -54,14 +27,8 @@ | ... | @@ -54,14 +27,8 @@ |
| 54 | </el-form-item> | 27 | </el-form-item> |
| 55 | 28 | ||
| 56 | <el-form-item style="width:100%;"> | 29 | <el-form-item style="width:100%;"> |
| 57 | <el-button | 30 | <el-button :loading="loading" class="loginBtn" size="large" style="width:100%;" type="primary" |
| 58 | :loading="loading" | 31 | @click.prevent="handleLogin"> |
| 59 | class="loginBtn" | ||
| 60 | size="large" | ||
| 61 | style="width:100%;" | ||
| 62 | type="primary" | ||
| 63 | @click.prevent="handleLogin" | ||
| 64 | > | ||
| 65 | <span v-if="!loading">{{ language == 0 ? '登 录' : 'Login' }}</span> | 32 | <span v-if="!loading">{{ language == 0 ? '登 录' : 'Login' }}</span> |
| 66 | <span v-else>{{ language == 0 ? '登 录 中...' : 'Logging in' }}</span> | 33 | <span v-else>{{ language == 0 ? '登 录 中...' : 'Logging in' }}</span> |
| 67 | </el-button> | 34 | </el-button> |
| ... | @@ -69,15 +36,12 @@ | ... | @@ -69,15 +36,12 @@ |
| 69 | <el-form-item> | 36 | <el-form-item> |
| 70 | <!-- <span style="color: #999;font-size: 12px;">*默认密码是会员号+证件号后四位+)*%</span>--> | 37 | <!-- <span style="color: #999;font-size: 12px;">*默认密码是会员号+证件号后四位+)*%</span>--> |
| 71 | <div style="display: flex;justify-content: space-between;width: 100%;"> | 38 | <div style="display: flex;justify-content: space-between;width: 100%;"> |
| 72 | <a | 39 | <a class="text-primary" @click="showChangePassword">{{ language == 0 ? '忘记密码' : 'Forgot password' }}?</a> |
| 73 | class="text-primary" | ||
| 74 | @click="showChangePassword" | ||
| 75 | >{{ language == 0 ? '忘记密码' : 'Forgot password' }}?</a> | ||
| 76 | <a class="text-primary" @click="showRegister">{{ language == 0 ? '账号注册' : 'Register' }}></a> | 40 | <a class="text-primary" @click="showRegister">{{ language == 0 ? '账号注册' : 'Register' }}></a> |
| 77 | </div> | 41 | </div> |
| 78 | </el-form-item> | 42 | </el-form-item> |
| 79 | <el-form-item> | 43 | <el-form-item> |
| 80 | <div v-if="language==0" class="agreeLine"> | 44 | <div v-if="language == 0" class="agreeLine"> |
| 81 | 登录或注册即代表同意 | 45 | 登录或注册即代表同意 |
| 82 | <a target="_blank" @click="goAgreement">《用户协议》</a>和 | 46 | <a target="_blank" @click="goAgreement">《用户协议》</a>和 |
| 83 | <a target="_blank" @click="goPolicy">《隐私政策》</a> | 47 | <a target="_blank" @click="goPolicy">《隐私政策》</a> |
| ... | @@ -90,7 +54,7 @@ | ... | @@ -90,7 +54,7 @@ |
| 90 | </el-form-item> | 54 | </el-form-item> |
| 91 | </el-form> | 55 | </el-form> |
| 92 | 56 | ||
| 93 | <div v-if="loginStatus==1"> | 57 | <div v-if="loginStatus == 1"> |
| 94 | <a class="poLeft" @click="close()"> | 58 | <a class="poLeft" @click="close()"> |
| 95 | <el-icon> | 59 | <el-icon> |
| 96 | <ArrowLeftBold /> | 60 | <ArrowLeftBold /> |
| ... | @@ -103,36 +67,25 @@ | ... | @@ -103,36 +67,25 @@ |
| 103 | <h3>{{ language == 0 ? '个人用户' : 'Individual' }}</h3> | 67 | <h3>{{ language == 0 ? '个人用户' : 'Individual' }}</h3> |
| 104 | </div> | 68 | </div> |
| 105 | </div> | 69 | </div> |
| 106 | <div v-if="loginStatus==2"> | 70 | <div v-if="loginStatus == 2"> |
| 107 | <a class="poLeft" @click="close()"> | 71 | <a class="poLeft" @click="close()"> |
| 108 | <el-icon> | 72 | <el-icon> |
| 109 | <ArrowLeftBold /> | 73 | <ArrowLeftBold /> |
| 110 | </el-icon> | 74 | </el-icon> |
| 111 | </a> | 75 | </a> |
| 112 | <el-form | 76 | <el-form ref="changePasswordRef" :model="changePasswordForm" |
| 113 | ref="changePasswordRef" :model="changePasswordForm" | 77 | :rules="language == 0 ? changePasswordRules : changePasswordRules_en" class="login-form"> |
| 114 | :rules="language==0?changePasswordRules:changePasswordRules_en" class="login-form" | ||
| 115 | > | ||
| 116 | <el-form-item prop="username"> | 78 | <el-form-item prop="username"> |
| 117 | 79 | ||
| 118 | <el-input | 80 | <el-input v-model.trim="changePasswordForm.username" :placeholder="language == 0 ? '注册时使用的邮箱' : 'E-mail'" |
| 119 | v-model.trim="changePasswordForm.username" | 81 | auto-complete="off" size="large" @change="changePasswordFormUsername" /> |
| 120 | :placeholder="language==0?'注册时使用的邮箱':'E-mail'" | ||
| 121 | auto-complete="off" size="large" | ||
| 122 | @change="changePasswordFormUsername" | ||
| 123 | /> | ||
| 124 | </el-form-item> | 82 | </el-form-item> |
| 125 | <el-form-item> | 83 | <el-form-item> |
| 126 | <el-input | 84 | <el-input v-model.trim="changePasswordForm.code" :placeholder="language == 0 ? '验证码' : 'Code'" auto-complete="off" |
| 127 | v-model.trim="changePasswordForm.code" | 85 | size="large" @keyup.enter="handleLogin"> |
| 128 | :placeholder="language==0?'验证码':'Code'" | ||
| 129 | auto-complete="off" | ||
| 130 | size="large" | ||
| 131 | @keyup.enter="handleLogin" | ||
| 132 | > | ||
| 133 | <template #append> | 86 | <template #append> |
| 134 | <el-button plain style="width: 110px;" type="primary" @click="sendsmsMsg"> | 87 | <el-button plain style="width: 110px;" type="primary" @click="sendsmsMsg"> |
| 135 | <van-count-down v-if="counting" :time="60000" format="ss" @finish="counting=false"> | 88 | <van-count-down v-if="counting" :time="60000" format="ss" @finish="counting = false"> |
| 136 | <template #default="timeData"> | 89 | <template #default="timeData"> |
| 137 | <span class="text-primary">{{ timeData.seconds }}{{ language == 0 ? '秒' : 's' }}</span> | 90 | <span class="text-primary">{{ timeData.seconds }}{{ language == 0 ? '秒' : 's' }}</span> |
| 138 | </template> | 91 | </template> |
| ... | @@ -147,42 +100,24 @@ | ... | @@ -147,42 +100,24 @@ |
| 147 | </template> | 100 | </template> |
| 148 | </el-input> | 101 | </el-input> |
| 149 | <!-- <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">--> | 102 | <!-- <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">--> |
| 150 | <Vcode | 103 | <Vcode :fail-text="failVcode" :show="isShow" :slider-text="sliderText" :success-text="successVcode" |
| 151 | :fail-text="failVcode" :show="isShow" :slider-text="sliderText" :success-text="successVcode" | 104 | :z-index="9999" @success="codeSuccess" /> |
| 152 | :z-index="9999" @success="codeSuccess" | ||
| 153 | /> | ||
| 154 | <!-- </div>--> | 105 | <!-- </div>--> |
| 155 | </el-form-item> | 106 | </el-form-item> |
| 156 | 107 | ||
| 157 | <el-form-item prop="password"> | 108 | <el-form-item prop="password"> |
| 158 | <el-input | 109 | <el-input v-model.trim="changePasswordForm.password" :placeholder="language == 0 ? '新密码' : 'New password'" |
| 159 | v-model.trim="changePasswordForm.password" | 110 | auto-complete="off" show-password size="large" type="password" @keyup.enter="handleLogin" /> |
| 160 | :placeholder="language==0?'新密码':'New password'" | ||
| 161 | auto-complete="off" show-password | ||
| 162 | size="large" | ||
| 163 | type="password" | ||
| 164 | @keyup.enter="handleLogin" | ||
| 165 | /> | ||
| 166 | </el-form-item> | 111 | </el-form-item> |
| 167 | <el-form-item prop="confirmPassword"> | 112 | <el-form-item prop="confirmPassword"> |
| 168 | <el-input | 113 | <el-input v-model.trim="changePasswordForm.confirmPassword" |
| 169 | v-model.trim="changePasswordForm.confirmPassword" | 114 | :placeholder="language == 0 ? '确认密码' : 'Confirm password'" auto-complete="off" show-password size="large" |
| 170 | :placeholder="language==0?'确认密码':'Confirm password'" | 115 | type="password" /> |
| 171 | auto-complete="off" show-password | ||
| 172 | size="large" | ||
| 173 | type="password" | ||
| 174 | /> | ||
| 175 | </el-form-item> | 116 | </el-form-item> |
| 176 | <el-form-item style="width:100%;"> | 117 | <el-form-item style="width:100%;"> |
| 177 | <el-button | 118 | <el-button :loading="loading" class="loginBtn" size="large" style="width:100%;" type="primary" |
| 178 | :loading="loading" | 119 | @click.prevent="handleChangePassword"> |
| 179 | class="loginBtn" | 120 | <span v-if="language == 0">确定</span> |
| 180 | size="large" | ||
| 181 | style="width:100%;" | ||
| 182 | type="primary" | ||
| 183 | @click.prevent="handleChangePassword" | ||
| 184 | > | ||
| 185 | <span v-if="language==0">确定</span> | ||
| 186 | <span v-else>Submit</span> | 121 | <span v-else>Submit</span> |
| 187 | </el-button> | 122 | </el-button> |
| 188 | </el-form-item> | 123 | </el-form-item> |
| ... | @@ -624,7 +559,8 @@ const goPolicy = () => { | ... | @@ -624,7 +559,8 @@ const goPolicy = () => { |
| 624 | flex: 1 1 auto; | 559 | flex: 1 1 auto; |
| 625 | } | 560 | } |
| 626 | 561 | ||
| 627 | .el-input-group__append button.el-button, .el-input-group__append button.el-button:hover { | 562 | .el-input-group__append button.el-button, |
| 563 | .el-input-group__append button.el-button:hover { | ||
| 628 | color: var(--el-color-primary); | 564 | color: var(--el-color-primary); |
| 629 | background: #efefff; | 565 | background: #efefff; |
| 630 | border: var(--el-color-primary) solid 1px; | 566 | border: var(--el-color-primary) solid 1px; | ... | ... |
| ... | @@ -86,12 +86,12 @@ | ... | @@ -86,12 +86,12 @@ |
| 86 | application of visa invitation letter and purchasing insurance etc.</span> | 86 | application of visa invitation letter and purchasing insurance etc.</span> |
| 87 | </div> | 87 | </div> |
| 88 | </el-form-item> | 88 | </el-form-item> |
| 89 | <el-form-item :label="language==0?'证件号':'Passport number'" required> | ||
| 90 | <el-input v-model="wdsfData.passportNumber" /> | ||
| 91 | </el-form-item> | ||
| 92 | <el-form-item :label="language==0?'姓名':'Name'" required> | 89 | <el-form-item :label="language==0?'姓名':'Name'" required> |
| 93 | <el-input v-model.trim="wdsfData.certName" /> | 90 | <el-input v-model.trim="wdsfData.certName" /> |
| 94 | </el-form-item> | 91 | </el-form-item> |
| 92 | <el-form-item :label="language==0?'证件号':'Passport number'" required> | ||
| 93 | <el-input v-model="wdsfData.passportNumber" /> | ||
| 94 | </el-form-item> | ||
| 95 | <el-form-item :label="language==0?'性别':'Gender'" required> | 95 | <el-form-item :label="language==0?'性别':'Gender'" required> |
| 96 | <el-radio-group v-model="wdsfData.sex"> | 96 | <el-radio-group v-model="wdsfData.sex"> |
| 97 | <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio> | 97 | <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio> |
| ... | @@ -105,6 +105,9 @@ | ... | @@ -105,6 +105,9 @@ |
| 105 | style="width: 100%;" type="date" value-format="YYYY-MM-DD" | 105 | style="width: 100%;" type="date" value-format="YYYY-MM-DD" |
| 106 | /> | 106 | /> |
| 107 | </el-form-item> | 107 | </el-form-item> |
| 108 | <el-form-item :label="language==0?'联系方式':'Contact Information'" required> | ||
| 109 | <el-input v-model.trim="wdsfData.phone" /> | ||
| 110 | </el-form-item> | ||
| 108 | 111 | ||
| 109 | <div class="h30" /> | 112 | <div class="h30" /> |
| 110 | 113 | ||
| ... | @@ -372,6 +375,10 @@ function bigNext() { | ... | @@ -372,6 +375,10 @@ function bigNext() { |
| 372 | ElMessage.warning(language.value == 0 ? '请输入姓名' : 'Please enter your name') | 375 | ElMessage.warning(language.value == 0 ? '请输入姓名' : 'Please enter your name') |
| 373 | return | 376 | return |
| 374 | } | 377 | } |
| 378 | if (!wdsfData.value.phone) { | ||
| 379 | ElMessage.warning(language.value == 0 ? '请输入联系方式' : 'Please enter your phone') | ||
| 380 | return | ||
| 381 | } | ||
| 375 | if (user && user.utype == '3') { | 382 | if (user && user.utype == '3') { |
| 376 | const obj = { | 383 | const obj = { |
| 377 | card: form.value.card, | 384 | card: form.value.card, |
| ... | @@ -381,6 +388,7 @@ function bigNext() { | ... | @@ -381,6 +388,7 @@ function bigNext() { |
| 381 | birth: wdsfData.value.birthday, | 388 | birth: wdsfData.value.birthday, |
| 382 | certName: wdsfData.value.certName, | 389 | certName: wdsfData.value.certName, |
| 383 | passportNumber: wdsfData.value.passportNumber, | 390 | passportNumber: wdsfData.value.passportNumber, |
| 391 | phone:wdsfData.value.phone, | ||
| 384 | ocrFlag: '1' | 392 | ocrFlag: '1' |
| 385 | } | 393 | } |
| 386 | if (Array.isArray(wdsfData.value.passportUrl)) { | 394 | if (Array.isArray(wdsfData.value.passportUrl)) { |
| ... | @@ -424,6 +432,7 @@ function next() { | ... | @@ -424,6 +432,7 @@ function next() { |
| 424 | certName: wdsfData.value.certName, | 432 | certName: wdsfData.value.certName, |
| 425 | birth: wdsfData.value.birthday, | 433 | birth: wdsfData.value.birthday, |
| 426 | passportNumber: wdsfData.value.passportNumber, | 434 | passportNumber: wdsfData.value.passportNumber, |
| 435 | phone:wdsfData.value.phone, | ||
| 427 | ocrFlag: '1' | 436 | ocrFlag: '1' |
| 428 | } | 437 | } |
| 429 | if (Array.isArray(wdsfData.value.passportUrl)) { | 438 | if (Array.isArray(wdsfData.value.passportUrl)) { |
| ... | @@ -449,6 +458,7 @@ function next() { | ... | @@ -449,6 +458,7 @@ function next() { |
| 449 | // personId: wdsfData.value.personId, | 458 | // personId: wdsfData.value.personId, |
| 450 | username: wdsfData.value.email, | 459 | username: wdsfData.value.email, |
| 451 | password: form.value.password, | 460 | password: form.value.password, |
| 461 | phone:wdsfData.value.phone, | ||
| 452 | ocrFlag: '1' | 462 | ocrFlag: '1' |
| 453 | } | 463 | } |
| 454 | if (Array.isArray(wdsfData.value.passportUrl)) { | 464 | if (Array.isArray(wdsfData.value.passportUrl)) { | ... | ... |
| ... | @@ -64,35 +64,40 @@ export default defineConfig(({ mode, command }) => { | ... | @@ -64,35 +64,40 @@ export default defineConfig(({ mode, command }) => { |
| 64 | proxy: { | 64 | proxy: { |
| 65 | // https://cn.vitejs.dev/config/#server-proxy | 65 | // https://cn.vitejs.dev/config/#server-proxy |
| 66 | '/dev-api/ztx-train': { | 66 | '/dev-api/ztx-train': { |
| 67 | // target: 'http://192.168.1.118:1896/stage-api', | 67 | target: 'http://192.168.1.22:8081', |
| 68 | target: 'https://wdsfwuxicenter.com/stage-api', | 68 | // target: 'https://wdsfwuxicenter.com/stage-api', |
| 69 | // target: 'https://jijin.wtwuxicenter.com/stage-api', | ||
| 69 | changeOrigin: true, | 70 | changeOrigin: true, |
| 70 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') | 71 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') |
| 71 | }, | 72 | }, |
| 72 | '/dev-api/ztx-match': { | 73 | '/dev-api/ztx-match': { |
| 73 | // target: 'http://192.168.1.118:8081', | 74 | target: 'http://192.168.1.22:8081', |
| 74 | target: 'https://wdsfwuxicenter.com/stage-api', | 75 | // target: 'https://jijin.wtwuxicenter.com/stage-api', |
| 76 | // target: 'https://wdsfwuxicenter.com/stage-api', | ||
| 75 | // target: 'https://wdsfwuxicenter.com/stage-api/', | 77 | // target: 'https://wdsfwuxicenter.com/stage-api/', |
| 76 | changeOrigin: true, | 78 | changeOrigin: true, |
| 77 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') | 79 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') |
| 78 | }, | 80 | }, |
| 79 | '/dev-api/ztx-webSite': { | 81 | '/dev-api/ztx-webSite': { |
| 80 | // target: 'http://192.168.1.118:8081', | 82 | target: 'http://192.168.1.22:8081', |
| 81 | target: 'https://wdsfwuxicenter.com/stage-api', | 83 | // target: 'https://wdsfwuxicenter.com/stage-api', |
| 84 | // target: 'https://jijin.wtwuxicenter.com/stage-api', | ||
| 82 | changeOrigin: true, | 85 | changeOrigin: true, |
| 83 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') | 86 | rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') |
| 84 | }, | 87 | }, |
| 85 | '/dev-api': { | 88 | '/dev-api': { |
| 86 | // target: 'http://192.168.1.213:8081/', | 89 | target: 'http://192.168.1.22:8081', |
| 87 | // target: 'http://192.168.1.169:8081', | 90 | // target: 'http://192.168.1.169:8081', |
| 88 | // target: 'https://jijin.wtwuxicenter.com/stage-api', | 91 | // target: 'https://jijin.wtwuxicenter.com/stage-api', |
| 89 | target: 'https://wdsfwuxicenter.com/stage-api/', | 92 | // target: 'https://wdsfwuxicenter.com/stage-api/', |
| 93 | // target: 'https://jijin.wtwuxicenter.com/stage-api', | ||
| 90 | changeOrigin: true, | 94 | changeOrigin: true, |
| 91 | rewrite: (p) => p.replace(/^\/dev-api/, '') | 95 | rewrite: (p) => p.replace(/^\/dev-api/, '') |
| 92 | }, | 96 | }, |
| 93 | '/ticket': { | 97 | '/ticket': { |
| 94 | // target: 'http://192.168.1.242:8081/', | 98 | // target: 'https://jijin.wtwuxicenter.com/stage-api', |
| 95 | target: 'https://wdsfwuxicenter.com/h5/', | 99 | target: 'http://192.168.1.22:8081', |
| 100 | // target: 'https://wdsfwuxicenter.com/h5/', | ||
| 96 | // target: 'https://ticketh5.wdsfwuxicenter.com/h5/', | 101 | // target: 'https://ticketh5.wdsfwuxicenter.com/h5/', |
| 97 | changeOrigin: true, | 102 | changeOrigin: true, |
| 98 | rewrite: (p) => p.replace(/^\/ticket/, '') | 103 | rewrite: (p) => p.replace(/^\/ticket/, '') | ... | ... |
-
Please register or sign in to post a comment