From e435ae4035b5e5bf381b0c8a10ee4330b25547e3 Mon Sep 17 00:00:00 2001
From: kejingfan <jingfan_ke@bjtu.edu.cn>
Date: Fri, 14 Jun 2024 18:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BA=A7=E4=BD=8D?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E7=A9=BA=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../func/__pycache__/config.cpython-311.pyc   | Bin 357 -> 434 bytes
 .../func/__pycache__/index.cpython-311.pyc    | Bin 9467 -> 9501 bytes
 .../func/__pycache__/login.cpython-311.pyc    | Bin 2814 -> 2822 bytes
 Project/Manager/func/config.py                |   9 +++++++-
 Project/Manager/func/index.py                 |  20 ++++++++++--------
 Project/Manager/func/login.py                 |   4 ++--
 .../func/__pycache__/book.cpython-311.pyc     | Bin 5525 -> 5703 bytes
 .../func/__pycache__/modify.cpython-311.pyc   | Bin 7224 -> 7238 bytes
 .../func/__pycache__/order.cpython-311.pyc    | Bin 2553 -> 2809 bytes
 .../func/__pycache__/search.cpython-311.pyc   | Bin 3023 -> 3309 bytes
 Project/Service/func/book.py                  |   6 +++++-
 Project/Service/func/modify.py                |   2 +-
 Project/Service/func/order.py                 |   8 +++++++
 Project/Service/func/search.py                |   6 +++++-
 Project/Service/templates/index.html          |  13 ++++++++++++
 Project/Service/templates/search.html         |  13 ++++++++++++
 16 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/Project/Manager/func/__pycache__/config.cpython-311.pyc b/Project/Manager/func/__pycache__/config.cpython-311.pyc
index d7c779a737734d6f61064f0a24ff3777aa2516d7..f4742875a7bdc6864f31d7f139b8f8b410a1d507 100644
GIT binary patch
delta 221
zcmaFLw27H-IWI340}xym%Skg}oX97kqXy(nXGmd4VN794VNPM0!x9DKv4VMwDQr<p
zDeS=vnj8~dqU`v66Y~<&Q;S>@OA?b3i&Jk2diwZ>xw<%pI6657yN0+rd-!QG-{MM1
ziZ4zrD$7hx1+#M@x+ZQf2@wL?$Oy#6PC()VGb1D818%V!+>$r=Wp3~*eBfl|WBR}V
aBpSFr2r%%7W0&D$;8Sei0>L5ypfLc<T{)Hj

delta 144
zcmdnQ{FI4rIWI340}wnC$VpqsFp*C}P6EiA&XB^8!kEI8!koe~hb4+3g*A#Xg)Nvt
zlYL@Pl%$}ikAIk}i(`nRlVh-Jh^w=QpC;2Srj(?KuS%>0fZ7>>xL5;7d|+l|WPHFa
mc7t2;2EWV=euWR5tZYml7=T0r(+55VKE(zu5G>*YDh2>?QXvEY

diff --git a/Project/Manager/func/__pycache__/index.cpython-311.pyc b/Project/Manager/func/__pycache__/index.cpython-311.pyc
index acbb2fb690b3c4704c931f732bf7821d3b61f41c..8904051aed42a676c46bb97d4c12157bf7f40dc8 100644
GIT binary patch
delta 1127
zcmaKqUrbY17{JeIdwbh*?d>h}k1g~c1=6m@HshZXH^9uMDsE91LLWwuRv^K$o!i15
zU@v>HF`Bu3`xBUCJcu(}CYl?g(LL<J7=@SHqz|MCdjsWVmShhaP4pZHB4YgV-QW50
z-S6M|?tPw^K5YJd*De#Ha?vq-+F-w7wqe1PI@K$u$>>mj`WR$fcI5!}=!B?R8J$g1
zP=x{RHogo#eLemNzSr-8pRuTXtIuh$LwRP{joVIUYgo|@Nm)|T6%9gv(q}_3%6d0#
zgtGoEJ7op4yIMDHoRMHn6V#0xHVimx`UG34s}7D;2p?3XY;RZ0bk(A4{Z^$QBJC4m
zHU!2BFSc!Fw%EtTU(vK?=R`dyg(k#r#EfC%9K&PiYi$o2!#juBEAV*xe1Xm2_g>7S
zPoWbi<Wz166BrJdBc>9UCS-(=08)m{dobJ+BMl{9&h_`FWjSZ1*ID`L`pSiC%XeV)
z$H~WYb5H)BBFr7K!wWHCE^()a`{Y5Qr!K-n+_GlspeEa{99BA|3fvG;#mKCSf@)s3
zDA|5-|KOhPzSLW+X(>ppMX5EfFYCOJwNBPqY^wd^e;fr%qG(B|mc)|7JIi0?3%+R4
z7cDqqMMtb0goQx0rtF7<m0b->f}~p8Zub;~cu|O}>-uy_be56U*t7+h2-HNvGheCJ
zFx9K^g3wqL8r2>8luDVWsc=7#Z0p0w;8S_8+)A%=-_>b6ETM-&hmIce7JQUP^OEU^
zTRZP=K4RA{NF4Pn*g5K1a4XlUVp^PoDX}hkD5NRzXXrlr2GS%(OAY;x5n5mF<NP0w
zzWZxAKeIY{c_n{w`P^?OS06x?v(?{B<46kwYfknt7#TbiA&%^aGfo$7hrF{MpMW{%
zhr*kCR{nFQF-MwctdexubR3B?bJX)M#xeNZ*NmIsyzh(lcXe5Bz>@@P#=axj&G0Ej
z$=ENC_6}vf%w<bjGBQTmA?){a-SkxkKJ)i%AK|9|5%wNuxm^qa2KH}|I0GAvbi>`+
zn#v?K=|YffrYvhQ#*464yBA*8>aB~&qi$EY9&|%juu6>Ka2dVEAjrX_Wk>K*(DMp+
CLoHkY

delta 1077
zcmZvbO-vI(6vt<FDeacFTUyGt6)0`D(gu((Q4~qQ1f@_wXhkb3!F~v)fX=qo7%-Y}
z;AotfV2lYD^k6tNo2XYWhL6iM;Xs;byeYSuXhPyaXAvU>CvSf9_RZ}3&%DgM=>6$8
zywdBnfVPk+5r1pR7%Y%wqBrDYu(e3%C1&sPFa<R{qk6|YDaI>yH_M_{3^n!gZ1Fq;
ztuo|n(AS=<RMPxuQDd}p62620yrz9GW{NYj+!BwojEB|ijv{`q?Z$-hv`wenAnE$M
z6aW#Ri8(&$`4^ex3)4X`t64JBWFoFD(R+;1vO|KFI1^#QAPVOA2mC>4YjAHO4b$Kr
z8wP2}frE=Q)AjB{LHtnQY6}lren?x0Gm1bE_-t}kHwU?#dMYMK<2Pe?z);6dK8EtV
zp&r5?_^aSiZGWd_!Wq6!x4lY_j7${1GF)WzGl;{Z#&6oQG~%FLYLZ7vOQ239ytr(l
zpoXVRc36oQOwX)B)e=W)L&R}0D~xOkBjoZZ5k~VaoOe|)c?XV~`-O%6osYaV4_Iy(
z?jycst8gv)Nlh;~(w8*{HqC+62r&;4U4h{ho2VOxJ3Bjh7U=DH9ZlUCE??w`J3xf~
zEI+Wx50DE%!Uu^an7;;rrkbc7QU~4q2YXke-wRe-j#IAHz<?U8d9{6ZcCER!&%&<P
zK<cl1i)ehqqN4tWU4B#6#M)33{rjAcL5+0GsijmTLW_x-0d`vL3~Iq0*0wVz=^ScP
za7w{x1)PE^3ZDwKE51@gWTVJwqp?IR85@)CBv2R5SdYRXyk%`EsH`m5Vo;q^#S`Pw
zg#5^EDWV@Sgl3TZyy_E#-S~d>3D|=()z>@!C%>z#M!f~fXh@OgBGTQl$?4mvWR68M
zX}X0$r&ATCQwf}Mh6}fmbAEx2kdkFkf$~t0awE`r1w9JF__Mpxe3iP&i<3$z^DKmL
p3pa^nxKXswt}|_ca#CpclGtEsfFXJn_A!c|idT$>*8UQ!egnq)5%2&2

diff --git a/Project/Manager/func/__pycache__/login.cpython-311.pyc b/Project/Manager/func/__pycache__/login.cpython-311.pyc
index 0487ae47b08ba700e3dae4408fec7c42bba6130b..a5542eb4f75a0f2f7ea63b749cf3eef9b7b50ea4 100644
GIT binary patch
delta 76
zcmew-+9t-koR^o20SI1;<)ryf<lV{5m68;no0ylFo?5i=<PjzwjSJiwbEAL+5N)2x
R%*!qycYy%~P2R@k0RW${7+e4V

delta 68
zcmZn@`zOk~oR^o20SFA3bJFZ5^6q42N=e#y@dy)-!Ub-Hxj{ezh&C@|=4BTUyTE{g
JChz0&005Ud6Z8N8

diff --git a/Project/Manager/func/config.py b/Project/Manager/func/config.py
index 852dc20..4ac7b14 100644
--- a/Project/Manager/func/config.py
+++ b/Project/Manager/func/config.py
@@ -1,9 +1,16 @@
-db = {
+db_service = {
     'host':'localhost', 
     'user':'managerAgent', 
     'password':'password123', 
     'database':'ServiceDatabase'
 }
 
+db_manager = {
+    'host':'localhost', 
+    'user':'managerAgent', 
+    'password':'password123', 
+    'database':'ManagerDatabase'
+}
+
 SECRET_KEY = 'ILOVEDATABASETECH'
 
diff --git a/Project/Manager/func/index.py b/Project/Manager/func/index.py
index 3a7fb44..12f7877 100644
--- a/Project/Manager/func/index.py
+++ b/Project/Manager/func/index.py
@@ -1,5 +1,5 @@
 from flask import render_template, request, g, redirect, url_for, session, jsonify
-from .config import db
+from .config import db_service
 import pymysql
 import csv
 import io
@@ -11,7 +11,7 @@ def index():
         flightID = request.args.get('flightID')
 
         if flightID:
-            conn = pymysql.connect(**db)
+            conn = pymysql.connect(**db_service)
             cursor = conn.cursor(pymysql.cursors.DictCursor)
             
             search_sql = """SELECT * FROM Flights WHERE ID = %s"""
@@ -41,7 +41,7 @@ def modify():
 
         status = request.form.get('status', '未知')
 
-        conn = pymysql.connect(**db)
+        conn = pymysql.connect(**db_service)
         cursor = conn.cursor(pymysql.cursors.DictCursor)
 
         try:
@@ -55,7 +55,8 @@ def modify():
             
             # 检查余座数是否为负值
             if new_first_class_seats < 0 or new_business_class_seats < 0 or new_economy_class_seats < 0:
-                return jsonify({'message': '座位变化后余座数不能为负值'}), 400
+                flash('座位变化后余座数不能为负值', 'error')
+                return redirect(url_for('index'))
             
             # 更新座位数和价格
             update_sql = """
@@ -67,22 +68,23 @@ def modify():
             cursor.execute(update_sql, (new_first_class_seats, new_business_class_seats, new_economy_class_seats,
                                         first_class_price, business_class_price, economy_class_price, status, flight_id))
             conn.commit()
+            flash('座位数、价格和状态更新成功', 'success')
         except Exception as e:
             print(e)
             conn.rollback()
-            return jsonify({'message': '数据库错误，请稍后再试'}), 500
+            flash(f'数据库错误：{e}', 'error')
         finally:
             cursor.close()
             conn.close()
         
-        return jsonify({'message': '座位数、价格和状态更新成功'}), 200
+        return redirect(url_for('index'))
     
 
 def delete_flight():
     if request.method == 'DELETE':
         flight_id = request.args.get('flightID')
         
-        conn = pymysql.connect(**db)
+        conn = pymysql.connect(**db_service)
         cursor = conn.cursor()
 
         try:
@@ -103,7 +105,7 @@ from flask import flash, redirect, url_for, jsonify, request
 import pymysql
 import csv
 import io
-from .config import db
+from .config import db_service
 
 def upload_csv():
     if request.method == 'POST':
@@ -112,7 +114,7 @@ def upload_csv():
             flash('没有文件上传', 'error')
             return redirect(url_for('index'))
         
-        conn = pymysql.connect(**db)
+        conn = pymysql.connect(**db_service)
         cursor = conn.cursor()
         
         try:
diff --git a/Project/Manager/func/login.py b/Project/Manager/func/login.py
index c5936a5..e3f6507 100644
--- a/Project/Manager/func/login.py
+++ b/Project/Manager/func/login.py
@@ -1,10 +1,10 @@
 from flask import request, jsonify, session, url_for, render_template, redirect
-from .config import db
+from .config import db_manager
 import pymysql
 
 
 def connect(managerID, encrypted_password):
-    conn = pymysql.connect(**db)
+    conn = pymysql.connect(**db_manager)
     cursor = conn.cursor(pymysql.cursors.DictCursor)
     args = (managerID, encrypted_password)
     verify_sql = "SELECT COUNT(*) FROM Managers WHERE ID = %s AND `Password` = %s;"
diff --git a/Project/Service/func/__pycache__/book.cpython-311.pyc b/Project/Service/func/__pycache__/book.cpython-311.pyc
index 076970f4a499d19db2b00db79f6c62be9fe04c3f..e0746abef3bb489b26715bf36565e17633ece37d 100644
GIT binary patch
delta 799
zcmbQLeO!lcIWI340}yB_<fK*bP2_vb_-Nv%Q;bTR_cF#aGDdHfW#(WMsbMYFDbWWh
zgMbvC6yC|%9GdKW%NQ9LRx?g!WD=Xam{F2ZX|gSgJu`nT*W`z6lKfmHhA<rr3|W$s
z6IsM2?`6@Bl!A%Ya@VlBFic>K)vV>H;YbmXgh?>e@&NgQNPJ!(UkHiM2jmMQ@%d}`
z7f4TbWEB+_NfBMf1auV;L%;%=$ro9bL}oLjh|OiH6-W`U5dg9!<}%j`f}A;d2dj;s
zB$81=DN?n<U>P|!DOPDh26F%nlOd#t1*k}N@?AD#M!Cs??DmYZlLOgpx#erP*C;?7
z3l75d?4hDIFlRF`s4x^Y){50IE|3SRR-GKf!9CfNLzo{qA{4Pi#72(OjLMs9IV%_q
zOQnIPy;#5fMf>Kb8zw&6zWZs{f+sr~p6u;?vUA4Mb&GDXrWO_D7u{mb%u7kFs4C=|
ztjH^|S%CW})8r?-OISF7x+k~uc}~8{m&zzV*_wYQW6<QQ{C29rsYPX($*KBjrFqHv
zN%{HNdIgoYSU`*-FQ6VaATCbWY#>m<DEWY2@&f}Cr`}y2!3#qA8^ka2SYF|=yuf2Q
zIZ;4t^9n&BCT_hC3@n@wV)9X8y~*hU0z4OZbm3?+zla*U-VY%7z&BY?MBe^`CldpQ
z!UcBuVk4kU#|_=2{7e|mnQ#TzGoQ0_<O{H3zQDr><Xqro31nipV8sez+cN{%7n!sI
WbtcaexuqDz$Ov>8cCyG9Xe<B*oyPnC

delta 665
zcmaivO=uHA6vyZ7=Op`?WRo@@n>1AmwM~M82Sp+Uky2FlR8Wu*yD4J9=%%8=F5*Qz
zS{@#>1bPrX*o!O(9(w4h;Gs#N7jqIk=&e=o?xaD9AoMZs@&C<x^PicW*%veVTTP1+
z7MmYemVaq$`d4_m_VW`I!!4)*ltP=QfKP-mDB>2(VkM%}fQt}U4Wd|=(nfT(GB`er
z+vC_1Q<xTKuBHF%1&S|TB+uc-bU=OTYJVFfP#NnZtT8r5SZ8dGu;CjU87y*^<;L9j
z8;+27EQhg?#ck<CEYaoy)3tnaow&(1AH)WaL`ynvq(+S5?ikjjGvfG>hGP2YkxW|*
ztiyX2<rJR{l85@4d>rHQG3>}$G3P6rHtx&!;2hRz0`mA?m=u7lUchx~<14BNZr&~6
zSz#I`@CW?{li}ycLkJ%$UpS*LHaxHC^`%y$?k(NIn*JK8F)w<QeH|U60XBXxUcv%8
zX4PK4e`l$3v)NoJ-+j~<2Etola}vwesW3E|>-Bh?Qz{2Uhztupu*$jlUaqv4EA<lP
zy+paI{<Cn~nt}>`x2CFd9HA3kxzIYz40rfTnX3}nm7-3J-!<oSN98+tV9+TDjzzkv
c$aFWx543gCsp92izqkmHJ|O?E-W6v18}JF5eE<Le

diff --git a/Project/Service/func/__pycache__/modify.cpython-311.pyc b/Project/Service/func/__pycache__/modify.cpython-311.pyc
index 5e22dc5823b7ffbc103a38acb1ca12ab49a6f783..0e5ded83d1029034d94f78c87cf4d97afeba2d5d 100644
GIT binary patch
delta 600
zcmdmCam<2uIWI340}z-==A^CK$g9l6b&De)vADQAzbIw0DN`(C$mGdPcI?5aMP-@E
zsgo}-$#Tg6m9qnJam3{BOfEcGSJ)+IL|kH5y}+)z*^T)dvw%8KvPc6&Xo3i>%|7fi
z7`YWdY()^EJo!C`5~K8HAx<wwM%l@+T%Hp8AaP?Lv68XK1V|M#0ttm8>B;-Jtiej0
z<%%qTLYhoP20#j|w8#=!VKlcLnnFYD3V(BZp(!-Nu5dYzA5h^p9#d^IkOC_ZVFM!U
zK!gL3SjkW%3t~%y2zf9uIgGc14J;_X`3dhrc6m{ta48Rvc)Gsr`GUrmQ)a$czy20m
zZhlH;T4j;u<Rzj-qTpZx2N*c$v_K}gPSzIF71RbXnSsPDmb}E=)FOq+nPR4lGLz?v
ziR*wZ1ch0VIEc^%5fUH*?$TRq$@#gtnI%PblOKtxayS4bH93kDC-aMYaD(0K2U700
zIZ1pbvqKP&4bqU8mYH6}3zBdF5un(H_zkSs6~u*m`WJ@{&?BWesdhzaldYwHvVdd&
Dm;Zs7

delta 586
zcmX?RvBQFQIWI340}wpjo1M0BBd;<OYY`KWJK2gUmeFVO3?{qD_n2h3q=7>0KwKO?
znT6SfJF%s5g2yFxnG5VPn?sntF$<^x<%-lnga(Mv+#JO|gOOVv#8v<iN|XO`C^1TH
zR^aqvWR#hl&E+Yf2NE{|5-S;tjDb`!Bal!ilA3&m%Nnf2S+2+&D5S|$qz|OPN{cLz
z6=rhVp(!-Lu8@<*3r(RRc7<Dc{D2BsculoUK?*EEgf)n;1rhc@VkJY742UfSBILlt
z<P_cxHn5=F=1;r}+2uum!lgVw;_3Rf=L;HNPMP^){rX#Mx%nxXX_ZA9lQ)SLiGqU(
z9AMy}(*&91GTBm0S5OPYWCjwqSn?8cQ;Xy$my4M)N>5%ZCawdv5EN!bVjw~XM2Le3
zxJz%bCFkenW|kD$PW~XK$^mk+CP$INWLa?!Zm^quLCSqM7l_Yfb_fKrK^pSXGSiEA
nK@!d&0u<R0zkwCIfVgl^|KhL#dZaWb)vhRYvZwS<7LW`8*eZG}

diff --git a/Project/Service/func/__pycache__/order.cpython-311.pyc b/Project/Service/func/__pycache__/order.cpython-311.pyc
index 5481e7891ef02db2372872acedd3f0a470491dad..71a6408ec1d375edfde99e5daf3c1d0d56ae2e03 100644
GIT binary patch
delta 542
zcmew<{8N-~IWI340}x~?=A?DAP2}6mXf^TBDn`D|xr}odty0)h*i$%CIOj0eve&S=
zFvJSia@4TbaHMcaf;52vf&~({0gCmA)G$pBWKx^#&!jmyikXLzdvZFnvM6VXDpU)Q
zO5v$tsbQ<(oIIadT$pzmD+9x7AclZo22K9WCz<aurj&95MV>C%@_cRQi;j&D-qg0I
zT?=8n=ezr#ZS4c{G?}Zo-7<@cOB9@Q5{rwg_?$|MGxJi5i=lj8*W~=X{M<?i_ZC-h
zYGO%zGDzv<Wvoez!IL@J?AU`-i^?*SQzyHz88ezru42n%6rB8oZ89HM5jW5sw^)Ei
z<P|AQZe`bSl>i9{76VNI+h^pQk(pPVT3jRy6fXh=Niir`72u#q1SBC2BS3yF?wfpr
z{kPKxHU<gh8&aw_Bvn4Jvq-XiU;q*qSVTW?F$hb2U|?i*XM~U)Y&YZ$Hi+%uxnk&g
zMc%E0t)u25hs*^InaP(qLK(#-YjPT^$iXZq5(KftKm^F<UmP~M`6;D2sdhyMlN&fA
O6pa|mfW~4c!P)@Va*vJx

delta 291
zcmew<`cs&1IWI340}${o%TAlZI+1TPBh$n~s~9;q=Q7S=ob1RP%g8o)KC`ktdx<JY
z83d%T*Ra&E)v%Ya!9*AsvV>vmH5|)W85mXrF$4rNXmV|4WVy>Y*@-QQ(R=bzHoM8M
z*^C%<C(E&CG73!YV4uv#QN#^Ye2XPHKQFIHezGQqhPF6RphyBp6mtLx1t=&2SyLni
zBS4lE`%Iq3@q6-R&QM0t$(mfoDzY%yA^{Lf6hwfu{o=66%}*)KNwq7|o7}(^p{T`J
M#`u8&I|<eX0Ai3jx&QzG

diff --git a/Project/Service/func/__pycache__/search.cpython-311.pyc b/Project/Service/func/__pycache__/search.cpython-311.pyc
index c70dc8f6aa17b5ba97d3e77073025e1170b63f49..66bf51bc12fb6248cbb96641cc4068df4101cb5f 100644
GIT binary patch
delta 1066
zcmah{Uq};i9RK}pce}gYcIVW!t+nCOVN)UvRxZjE@-2GMARE>aZ|c@<(r>2^HK_+F
z>>*gchYE~lloc8x_78$yLh!8_1~C};ki#B=K@WjX{ciJIR@9gKetzHo_x=3tKG?rG
z#U~bv2@naomBBGKEjnOty0N}9&W2bBWJ)$DT$~T_C7V`EaUmoS8_0}e4w*}*C1jC}
z6CfnYOb_t0U$tp|HhtqTn_~u*{^W4_T?>_<7mCBMBL$E#1reR15S20{gQ``lE{n{{
z+zbW4EYY$+pw{R%05Y%I@D%MhF$B~~6vPDGnKRAMq@8G4dH@ephwcFoGwXK7f;;IN
z8%R;Iu=AA}QOn@xRIUBjPI0?a+R97a7fUf@RlRzW>}ZxPbK=gC5G1_yK;2uZY5=H~
zaNF4@&58J=!F|A2sf%s1m#tBt?yF=T!CP>gNii9lwvH314V7GMmu|=GxP!9uM!9O7
zO&K$e(&|49b<nv*qKe^2e78=?2mu+n?N<Nw{u|x@xNv_pUZamSYk$<Ji@?VG>-Fi`
z_3QTvlh+DUlZ6M5H|8G}?oWSt`zpso5E?=FINP-7Wjqx94ES9*&NkT)Pdbr71MQ3D
z=tO@!g72_hP{4Wi2yWy8(2CD-9-qcKXG%u;(ZFyxc}YRFB#_kF>vY*XjWb+3+Y>=!
z(SZoga}J@E<T<U7qi*vP-D`rg2q@+P%z9hP#v4!hT)tdB^PD9sHa|VH!Ua~jK$Z*S
zCC}aQm!XBe7k$eIKlPqn?LD8B!YfjERSIXh@Ztm?gtqsAPG6S`EV*1=LBmoTB<Pp$
zN0aYriD1q+Fp?OI4k7J2bIhn3RgxvXNc&TeTLW!VWGC>QC_pU)Ho2qm5qVUJw4+1B
kg+!A#2^0+w!q4DT_Ww`S??w2E(6(nkG#0_1fC6OrPv3;)h5!Hn

delta 772
zcma)3Jxmlq6rS1N+1>kP@3_0=KnPyU5~C7`pa_Wx#>U1-<2FiIkXv>k%q|_o<~pm(
z6voQ4Ib)<TB=#B_D{V~l8Y>GEjU;wh=$k#3Gt%&~@7p)ueDCeIGe0WtOPS~Cw2mNV
zs%tAdN;6Z&3(a$*vlzL8EBb0c91_=(uLZiJLycV7Hyk5=r<|0lG?0^a<vYk$zwt@7
z(tI@4e0NFsF24G`iY*OAInH;(BT3cL*rrr81y^kg2)%^tMoS02z-C0V^lxA6k}F!q
z(SF8Si#upOs&rd9y2RCXb@ogwj#@qTETRRB{?i$t`z#I)4EA(hHmTig9Yw<|FPS*c
zKUj{c$reIhUs8J}yDe4J)Q-BXv<e`cz{MkfS(yOWpSWc|B^e*D`oPV_WC*xUN8@Z<
zET7*dQIAF5@sI6h+7g@+WH;crb1aZ&B@Nblf8-&7eU!(f7s$5Q2pMDd$qlTtHo2Om
zA}FW<(2>>`1NMbn#yQrn4b?_Cr-#dnbZPZoxam_9h>#B)PU7$uyQ|Hyr&`J2Zu#Yf
zuQ7Y0HTE9sS8(y|<n`LTh4!t1`Dt-~3Ip01_SL98>?lhc>nrsKlwVv&-iqpe7`vcn
zfS~+tC?83S0KXs+y#R1Xt_2(JmcKklCt-;p!v?^Ch%x?zZhkoBBgZ=SBsE>Nv2uV;
J0-b=de*v<^l=uJu

diff --git a/Project/Service/func/book.py b/Project/Service/func/book.py
index ca0adca..6252349 100644
--- a/Project/Service/func/book.py
+++ b/Project/Service/func/book.py
@@ -35,6 +35,10 @@ def book():
                 passenger[key] = request.form.get(f'passengers[{i}][{key}]')
             passengers.append(passenger)
 
+        if not passengers:
+            flash("请至少添加一位乘客", "error")
+            return redirect(url_for('index'))
+
         conn = pymysql.connect(**db)
         cursor = conn.cursor()
         
@@ -85,7 +89,7 @@ def book():
             conn.rollback()
             print(e)
             flash("订票失败", "error")
-            return redirect(url_for('search'))
+            return redirect(url_for('index'))
         
         finally:
             cursor.close()
diff --git a/Project/Service/func/modify.py b/Project/Service/func/modify.py
index 51771b0..078e16f 100644
--- a/Project/Service/func/modify.py
+++ b/Project/Service/func/modify.py
@@ -12,7 +12,7 @@ def verify_user(cursor: Cursor, phone_number: str, password: str) -> str:
     record = cursor.fetchone()
     if not record:
         return "NO_USER"
-    if record[0] != password:
+    if record['Password'] != password:
         return "WRONG_PASSWORD"
     return "USER_VERIFIED"
 
diff --git a/Project/Service/func/order.py b/Project/Service/func/order.py
index 25bdd2d..7c6aeae 100644
--- a/Project/Service/func/order.py
+++ b/Project/Service/func/order.py
@@ -38,6 +38,14 @@ def order():
     """
     cursor.execute(tickets_sql, (order_id,))
     tickets = cursor.fetchall()
+    
+    seatClass2Chinses = {
+        'First Class': '头等舱',
+        'Business Class': '商务舱',
+        'Economy Class': '经济舱'
+    }
+    for ticket in tickets:
+        ticket['Seat_class'] = seatClass2Chinses[ticket['Seat_class']]
 
     cursor.close()
     conn.close()
diff --git a/Project/Service/func/search.py b/Project/Service/func/search.py
index ab35941..ff95d33 100644
--- a/Project/Service/func/search.py
+++ b/Project/Service/func/search.py
@@ -1,4 +1,4 @@
-from flask import render_template, request, g, abort, redirect, url_for
+from flask import render_template, request, g, abort, redirect, url_for, flash
 from .config import db
 from .utils import get_cities
 import pymysql
@@ -13,6 +13,10 @@ def search():
     departure_date = request.args.get('departure-date')
     passengers = int(request.args.get('passengers', 1))
 
+    if not departure_city or not destination_city or not departure_date or not passengers:
+        flash("请填写所有查询条件", "error")
+        return render_template('search.html', cities=get_cities(), flights=[], username=g.name)
+
     # Date validation
     try:
         departure_date_obj = datetime.datetime.strptime(departure_date, '%Y-%m-%d').date()
diff --git a/Project/Service/templates/index.html b/Project/Service/templates/index.html
index e82183d..366080f 100644
--- a/Project/Service/templates/index.html
+++ b/Project/Service/templates/index.html
@@ -7,6 +7,19 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/index.css') }}">
     <script src="{{ url_for('static', filename='js/index.js') }}" defer></script>
     <script src="https://cdn.bootcss.com/blueimp-md5/2.12.0/js/md5.min.js"></script>
+    <script>
+        window.onload = function() {
+            {% with messages = get_flashed_messages() %}
+            {% if messages %}
+                var message = "";
+                {% for msg in messages %}
+                    message += "{{ msg }}\n";
+                {% endfor %}
+                alert(message);
+            {% endif %}
+            {% endwith %}
+        };
+    </script>
 </head>
 <body>
     <header>
diff --git a/Project/Service/templates/search.html b/Project/Service/templates/search.html
index d847f69..37a134d 100644
--- a/Project/Service/templates/search.html
+++ b/Project/Service/templates/search.html
@@ -5,6 +5,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>航班搜索结果</title>
     <link rel="stylesheet" href="{{ url_for('static', filename='css/search.css') }}">
+    <script>
+        window.onload = function() {
+            {% with messages = get_flashed_messages() %}
+            {% if messages %}
+                var message = "";
+                {% for msg in messages %}
+                    message += "{{ msg }}\n";
+                {% endfor %}
+                alert(message);
+            {% endif %}
+            {% endwith %}
+        };
+    </script>
 </head>
 <body>
     <header>