126485c3 by 杨炀

no message

1 parent cdc810f0
...@@ -14,37 +14,38 @@ ...@@ -14,37 +14,38 @@
14 </div> 14 </div>
15 </div> 15 </div>
16 <div v-loading="loading" class="box"> 16 <div v-loading="loading" class="box">
17 <div v-for="(h,index) in list" :key="index"> 17 <div v-for="(h,index) in list" :key="index" class="routeItem">
18 <el-row :gutter="20" align="middle" class="w100"> 18 <el-row :gutter="20" align="middle" class="w100">
19 <el-col :span="4"> 19 <el-col :lg="2" :sm="6">
20 <div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }} 20 <div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }}
21 </div> 21 </div>
22 </el-col> 22 </el-col>
23 <el-col :span="6"> 23 <el-col :lg="6" >
24 <p class="esp">{{ h.checkIn }}</p> 24 <p class="esp text-center">{{ h.checkIn }}</p>
25 </el-col> 25 </el-col>
26 <el-col :span="4" class="text-center"> 26 <el-col :lg="4" :sm="6" class="text-center">
27 <img class="mauto w40px" src="@/assets/booking/wf.png"/> 27 <img class="mauto w40px" src="@/assets/booking/wf.png"/>
28 </el-col> 28 </el-col>
29 <el-col :span="6"> 29 <el-col :lg="6" >
30 <p class="esp ">{{ h.checkOut }}</p> 30 <p class="esp text-center">{{ h.checkOut }}</p>
31 </el-col> 31 </el-col>
32 <el-col :span="2"> 32 <el-col :lg="3" :sm="12">
33 <div v-if="language==0" class="price">¥ 33 <div v-if="language==0" class="price">
34 <span>{{h.upPrice}}</span> 34 ¥
35 </div> 35 <span>{{ h.upPrice }}</span>
36 <div v-else class="price"> 36 </div>
37 37 <div v-else class="price">
38 <span>{{h.upPriceEn}}</span> 38
39 </div> 39 <span>{{ h.upPriceEn }}</span>
40 40 </div>
41 </el-col> 41
42 <el-col :span="2"> 42 </el-col>
43 <el-button class="btn-lineG w100" round type="primary" @click="goOrder(h)"> 43 <el-col :lg="3" :sm="12">
44 {{ language == 0 ? '我要预订' : 'Select' }} 44 <el-button class="btn-lineG w100" round type="primary" @click="goOrder(h)">
45 </el-button> 45 {{ language == 0 ? '我要预订' : 'Select' }}
46 </el-col> 46 </el-button>
47 </el-row> 47 </el-col>
48 </el-row>
48 </div> 49 </div>
49 50
50 <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/> 51 <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/>
...@@ -275,15 +276,7 @@ function goOrder(item, car) { ...@@ -275,15 +276,7 @@ function goOrder(item, car) {
275 } 276 }
276 } 277 }
277 278
278 .price {
279 color: #FF8124;
280 font-size: 24px;
281 279
282 span {
283 font-size: 36px;
284 font-family: "DIN Alternate"
285 }
286 }
287 280
288 .bg-lineg { 281 .bg-lineg {
289 margin: auto; 282 margin: auto;
...@@ -304,5 +297,15 @@ function goOrder(item, car) { ...@@ -304,5 +297,15 @@ function goOrder(item, car) {
304 } 297 }
305 } 298 }
306 } 299 }
300 .routeItem{background: #fff;border-radius: 10px;margin: 0 0 20px;padding: 10px 20px;box-shadow: 0 0 6px #eee;
301 .price {
302 color: #FF8124;
303 font-size: 24px;
307 304
305 span {
306 font-size: 36px;
307 font-family: "DIN Alternate"
308 }
309 }
310 }
308 </style> 311 </style>
......
...@@ -275,9 +275,7 @@ function verifyCode() { ...@@ -275,9 +275,7 @@ function verifyCode() {
275 275
276 function codeSuccess(msg) { 276 function codeSuccess(msg) {
277 isShow.value = false 277 isShow.value = false
278 console.log('old', isCodeTrue.value)
279 isCodeTrue.value += 1 278 isCodeTrue.value += 1
280 console.log('new', isCodeTrue.value)
281 if (isCodeTrue.value == 1) { 279 if (isCodeTrue.value == 1) {
282 checkWdsf({card: form.value.card}).then(res => { 280 checkWdsf({card: form.value.card}).then(res => {
283 wdsfData.value = res.data 281 wdsfData.value = res.data
...@@ -397,8 +395,6 @@ function next() { ...@@ -397,8 +395,6 @@ function next() {
397 } 395 }
398 registerSingle(obj).then(res => { 396 registerSingle(obj).then(res => {
399 setToken(res.data.token) 397 setToken(res.data.token)
400
401 console.log(matchId.value)
402 afterR() 398 afterR()
403 }) 399 })
404 } 400 }
...@@ -423,7 +419,6 @@ function next() { ...@@ -423,7 +419,6 @@ function next() {
423 } 419 }
424 loginSingle(obj).then(res => { 420 loginSingle(obj).then(res => {
425 setToken(res.data.token) 421 setToken(res.data.token)
426 console.log(matchId.value)
427 afterR() 422 afterR()
428 }).catch(err => { 423 }).catch(err => {
429 424
...@@ -460,13 +455,12 @@ function forgetPassword(account) { ...@@ -460,13 +455,12 @@ function forgetPassword(account) {
460 useUserStore().setReLogin({account: account, active: 2}) 455 useUserStore().setReLogin({account: account, active: 2})
461 } 456 }
462 const ocrSuccess = (res) => { 457 const ocrSuccess = (res) => {
463 wdsfData.value.passportUrl = res.data.url 458 if (res.code == 200) {
464 if(res.code==200){
465 wdsfData.value.passportUrl = res.data.url 459 wdsfData.value.passportUrl = res.data.url
466 wdsfData.value.passportNumber = res.data.code 460 wdsfData.value.passportNumber = res.data.code
467 wdsfData.value.birthday = res.data.birth?.slice(0, 10) 461 wdsfData.value.birthday = res.data.birth?.slice(0, 10)
468 wdsfData.value.sex = res.data.sex 462 wdsfData.value.sex = res.data.sex
469 } else if(res.code==500){ 463 } else if (res.code == 500) {
470 ElMessage.warning(res.msg) 464 ElMessage.warning(res.msg)
471 } 465 }
472 } 466 }
......
...@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
82 }, 82 },
83 '/dev-api': { 83 '/dev-api': {
84 target: 'http://192.168.1.118:8081/', 84 // target: 'http://192.168.1.118:8081/',
85 // target: 'http://192.168.1.253:8081', 85 target: 'http://192.168.1.253:8081',
86 // target: 'https://jijin.wtwuxicenter.com/stage-api', 86 // target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api/', 87 // target: 'https://wdsfwuxicenter.com/stage-api/',
88 changeOrigin: true, 88 changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!