diff --git a/src/Mini-12306前端开发/pages.json b/src/Mini-12306前端开发/pages.json index 78a8edcc..c33f74f2 100644 --- a/src/Mini-12306前端开发/pages.json +++ b/src/Mini-12306前端开发/pages.json @@ -17,6 +17,12 @@ "navigationBarTitleText": "Mini-12306" } }, + { + "path": "pages/index/passenge-list", + "style": { + "navigationBarTitleText": "Mini-12306" + } + }, { "path": "pages/index/ticket", "style": { @@ -69,6 +75,12 @@ "style": { "navigationBarTitleText": "Mini-12306" } + }, + { + "path": "pages/index/newpassenger", + "style": { + "navigationBarTitleText": "Mini-12306" + } } ], "globalStyle": { diff --git a/src/Mini-12306前端开发/pages/index/Home.vue b/src/Mini-12306前端开发/pages/index/Home.vue index 3e6f124f..889a6feb 100644 --- a/src/Mini-12306前端开发/pages/index/Home.vue +++ b/src/Mini-12306前端开发/pages/index/Home.vue @@ -69,7 +69,8 @@ export default { }; // 发送POST请求,确保将formData转换为JSON字符串 uni.request({ - url: 'http://192.168.251.7:8000/search_train/', // 后端接口地址 + // url: 'http://192.168.251.7:8000/search_train/', // 后端接口地址 + url: 'http://localhost:8000/search_train/', method: 'POST', data: JSON.stringify(formData), // 将formData转换为JSON字符串 header: { diff --git a/src/Mini-12306前端开发/pages/index/Login.vue b/src/Mini-12306前端开发/pages/index/Login.vue index 25338c76..63ee1dd2 100644 --- a/src/Mini-12306前端开发/pages/index/Login.vue +++ b/src/Mini-12306前端开发/pages/index/Login.vue @@ -47,7 +47,8 @@ export default { // 发送POST请求,确保将formData转换为JSON字符串 uni.request({ - url: 'http://192.168.251.7:8000/login_view/', // 后端接口地址 + // url: 'http://192.168.251.7:8000/login_view/', // 后端接口地址 + url: 'http://localhost:8000/login_view/', method: 'POST', data: JSON.stringify(formData), // 将formData转换为JSON字符串 header: { diff --git a/src/Mini-12306前端开发/pages/index/Orders.vue b/src/Mini-12306前端开发/pages/index/Orders.vue index e76125d9..687bc97f 100644 --- a/src/Mini-12306前端开发/pages/index/Orders.vue +++ b/src/Mini-12306前端开发/pages/index/Orders.vue @@ -1,36 +1,30 @@ @@ -38,85 +32,75 @@ export default { data() { return { - orderNumber: '20240418001', - passengerName: '张三', - trainNumber: 'G1234', - seat: '商务座', - totalAmount: 500 + activeTab: 'unpaid', // 当前选中的选项卡,默认为待支付 + unpaidOrders: [ + { orderNumber: '123456789', amount: 100 }, + { orderNumber: '987654321', amount: 200 }, + ], // 待支付的订单列表,你可以通过接口获取真实数据 + paidOrders: [ + { orderNumber: '543216789', amount: 150 }, + { orderNumber: '987654312', amount: 250 }, + ], // 已支付的订单列表,你可以通过接口获取真实数据 + myTickets: [ + { orderNumber: '123456789', trainNumber: 'G1234', seatNumber: 'A12' }, + { orderNumber: '987654321', trainNumber: 'D5678', seatNumber: 'B34' }, + ], // 本人车票的订单列表,你可以通过接口获取真实数据 }; }, methods: { - payOrder() { - // 执行支付逻辑,可以调用支付接口 - uni.navigateTo({ - url: '/pages/index/Payment' - }); - // 这里可以调用支付接口进行支付操作,如调用微信支付、支付宝支付等 - }, - change(){ - uni.navigateTo({ - url: '/pages/index/Change' - }); - }, - refund(){ - uni.navigateTo({ - url: '/pages/index/refund' - }); - } + switchTab(tab) { + this.activeTab = tab; + } } }; - diff --git a/src/Mini-12306前端开发/pages/index/Payment.vue b/src/Mini-12306前端开发/pages/index/Payment.vue index c77a1d08..fead4911 100644 --- a/src/Mini-12306前端开发/pages/index/Payment.vue +++ b/src/Mini-12306前端开发/pages/index/Payment.vue @@ -24,6 +24,7 @@ export default { buyReturn() { // 购买返程票的逻辑处理 console.log("购买返程"); + alert('改签功能暂未开放,敬请期待!'); }, payNow() { const paymentSuccess = Math.random() < 0.8; // 模拟80%的成功率 diff --git a/src/Mini-12306前端开发/pages/index/Register.vue b/src/Mini-12306前端开发/pages/index/Register.vue index f825d548..bd4a2d2c 100644 --- a/src/Mini-12306前端开发/pages/index/Register.vue +++ b/src/Mini-12306前端开发/pages/index/Register.vue @@ -109,7 +109,7 @@ export default { // 验证银行卡号 if (this.Bankcard.length < 16 || this.Bankcard.length > 19) { uni.showToast({ - title: '银行卡号应为16-1911位', + title: '银行卡号应为16-19位', icon: 'none' }); return; @@ -125,7 +125,8 @@ export default { // 发送POST请求,确保将formData转换为JSON字符串 uni.request({ - url: 'http://192.168.251.7:8000/save_passenger/', + // url: 'http://192.168.251.7:8000/save_passenger/', + url: 'http://localhost:8000/save_passenger/', method: 'POST', data: JSON.stringify(formData), // 将formData转换为JSON字符串 header: { diff --git a/src/Mini-12306前端开发/pages/index/confirm-order.vue b/src/Mini-12306前端开发/pages/index/confirm-order.vue index fb37a8b8..7acd02d4 100644 --- a/src/Mini-12306前端开发/pages/index/confirm-order.vue +++ b/src/Mini-12306前端开发/pages/index/confirm-order.vue @@ -1,67 +1,180 @@ @@ -73,7 +186,8 @@ h1 { margin-bottom: 20px; } -.ticket-box { + +.ticket-info { display: flex; justify-content: space-between; align-items: center; @@ -90,15 +204,15 @@ h1 { text-align: center; } -.time { - font-size: 8px; /* 设置时间的字体大小 */ +.time .num,.price { + font-size: 12px; /* 设置时间的字体大小 */ } .station { font-size: 16px; /* 设置车站名称的字体大小 */ } -.train-no { +.train-no,{ font-size: 20px; /* 设置车次的字体大小 */ } @@ -106,36 +220,44 @@ h1 { font-size: 10px; /* 设置日期的字体大小 */ } -.seat-selection { +.container { display: flex; - justify-content: center; - margin-top: 20px; + justify-content: space-between; /* 均匀分布每个子元素 */ } -.seat-options { +.container > div { /* 选择 container 中的每一个直接子元素 */ + flex: 1; /* 每个子元素平分父容器的宽度 */ + border: 1px solid #ccc; + padding: 10px; + margin-right: 10px; display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + box-sizing: border-box; } -.seat-option { - border: 1px solid #ccc; - padding: 10px 20px; - border-radius: 8px; - cursor: pointer; - transition: background-color 0.3s, border-color 0.3s; - margin-right: 10px; +.container > div:last-child { + margin-right: 0; /* 移除最后一个子元素的右边距 */ } -.seat-option:last-child { - margin-right: 0; +.container { + display: flex; + flex-wrap: wrap; } -.seat-option input[type="radio"] { - display: none; +.seat-box { + width: 100px; + padding: 10px; + margin: 10px; + border: 1px solid #ccc; + text-align: center; + cursor: pointer; } -.seat-option.active { - border-color: #007bff; - background-color: #d0e6ff; +.seat-box.selected { + background-color: #4cd964;; /* 选中的座位框变绿 */ + color: white; } .submit-btn { diff --git a/src/Mini-12306前端开发/pages/index/index.vue b/src/Mini-12306前端开发/pages/index/index.vue index d0281863..73dfe62f 100644 --- a/src/Mini-12306前端开发/pages/index/index.vue +++ b/src/Mini-12306前端开发/pages/index/index.vue @@ -11,14 +11,6 @@ + + \ No newline at end of file diff --git a/src/Mini-12306前端开发/pages/index/passenge-list.vue b/src/Mini-12306前端开发/pages/index/passenge-list.vue new file mode 100644 index 00000000..e41cad85 --- /dev/null +++ b/src/Mini-12306前端开发/pages/index/passenge-list.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/Mini-12306前端开发/pages/index/search-results.vue b/src/Mini-12306前端开发/pages/index/search-results.vue index 5ec8a4c7..a09dd122 100644 --- a/src/Mini-12306前端开发/pages/index/search-results.vue +++ b/src/Mini-12306前端开发/pages/index/search-results.vue @@ -41,8 +41,8 @@ export default { methods: { handleBookClick(ticket) { uni.navigateTo({ - url: '/pages/index/confirm-order' - }); + url: `/pages/index/confirm-order?ticketno=${ticket.trainno}&date=${ticket.date}&departure=${ticket.departure_station}&arrival=${ticket.arrival_station}&departure_time=${ticket.departure_time}&arrival_time=${ticket.arrival_time}` + }); } } }; @@ -73,7 +73,7 @@ h1 { } .time { - font-size: 10px; /* 设置时间的字体大小 */ + font-size: 12px; /* 设置时间的字体大小 */ } .station { diff --git a/src/Mini-12306前端开发/pages/index/ticket.vue b/src/Mini-12306前端开发/pages/index/ticket.vue index 5e37c276..7e372e48 100644 --- a/src/Mini-12306前端开发/pages/index/ticket.vue +++ b/src/Mini-12306前端开发/pages/index/ticket.vue @@ -46,11 +46,15 @@ export default { }, rescheduleTicket() { // 改签车票的逻辑处理 - alert('改签功能暂未开放,敬请期待!'); + uni.navigateTo({ + url: '/pages/index/refund' + }); }, refundTicket() { // 退票的逻辑处理 - alert('退票功能暂未开放,敬请期待!'); + uni.navigateTo({ + url: '/pages/index/Change' + }); } }, mounted() { diff --git a/src/Mini-12306前端开发/pages/index/user-center.vue b/src/Mini-12306前端开发/pages/index/user-center.vue index 840c6584..7a4a3bc1 100644 --- a/src/Mini-12306前端开发/pages/index/user-center.vue +++ b/src/Mini-12306前端开发/pages/index/user-center.vue @@ -1,88 +1,89 @@