From 3a7d66807f26cc51583929769a511e1f43ee7ff6 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 10:45:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(ticket):=20=E9=97=A8=E7=A5=A8=E6=92=A4?=
 =?UTF-8?q?=E5=8D=95=E5=8F=8A=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/ticket.js          |   8 ++++
 pages/mine/index.vue      |  17 ++++++++-
 pages/ticket/index.vue    |  75 ++++++++++++++++++++++++--------------
 static/images/tickets.png | Bin 0 -> 3261 bytes
 4 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 static/images/tickets.png

diff --git a/config/ticket.js b/config/ticket.js
index 5324a92..28cee91 100644
--- a/config/ticket.js
+++ b/config/ticket.js
@@ -21,3 +21,11 @@ export const buyTicket = data => http.post('/sale/api/ticket/pay-ticket', data)
 // 获取门票详情
 export const getTicketDetail = params =>
   http.get('/sale/api/ticket/detail', { params })
+
+// 撤销门票
+export const cancelTicket = data =>
+  http.post('/sale/api/ticket/cancel-pay-ticket', data)
+
+// 更新门票
+export const updateTicket = data =>
+  http.post('/sale/api/ticket/update-ticket', data)
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index d53c689..678a371 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -328,7 +328,6 @@ export default {
           menuKey: 'incomeDetail',
           ifshow: false,
         },
-
         {
           url: '/pages/market/examineDetail/examineDetail',
           name: '考核明细',
@@ -381,6 +380,14 @@ export default {
           menuKey: 'pickGoods',
           ifshow: false,
         },
+        {
+          url: '/pages/ticket/index',
+          name: '自助购票',
+          imgurl: '../../static/images/tickets.png',
+          menuKey: 'ticket',
+          ifshow: true,
+          alwaysShow: true,
+        },
         // {
         //   url: "/pages/memberCard/index",
         //   name: '电子会员卡',
@@ -594,7 +601,13 @@ export default {
               //   menuKey: "",
               //   ifshow: false,
               // },
-
+              {
+                url: '/pages/ticket/index',
+                name: '自助购票',
+                imgurl: '../../static/images/tickets.png',
+                menuKey: 'ticket',
+                ifshow: true,
+              },
               {
                 url: '/pages/selfService/index',
                 name: '自助服务',
diff --git a/pages/ticket/index.vue b/pages/ticket/index.vue
index 57be89e..a637d41 100644
--- a/pages/ticket/index.vue
+++ b/pages/ticket/index.vue
@@ -194,9 +194,10 @@
 
     <!-- 撤销确认弹窗 -->
     <u-modal
-      v-model="showCancelModal"
+      :show="showCancelModal"
       title="确认撤销"
       :content="cancelModalContent"
+      :show-cancel-button="true"
       confirm-text="确认撤销"
       cancel-text="取消"
       @confirm="confirmCancel"
@@ -204,7 +205,7 @@
     ></u-modal>
 
     <!-- 修改信息弹窗 -->
-    <u-popup v-model="editModalVisible" mode="center" border-radius="12">
+    <u-popup :show="editModalVisible" mode="center" border-radius="12">
       <view class="edit-modal">
         <view class="modal-header">
           <text class="modal-title">修改门票信息</text>
@@ -228,7 +229,7 @@
             />
           </view>
           <view class="form-item">
-            <text class="form-label">姓名 *</text>
+            <text class="form-label">姓名</text>
             <input
               class="form-input"
               v-model="editForm.buyName"
@@ -236,7 +237,7 @@
             />
           </view>
           <view class="form-item">
-            <text class="form-label">手机号 *</text>
+            <text class="form-label">手机号</text>
             <input
               class="form-input"
               v-model="editForm.phone"
@@ -244,7 +245,7 @@
             />
           </view>
           <view class="form-item">
-            <text class="form-label">身份证号 *</text>
+            <text class="form-label">身份证号</text>
             <input
               class="form-input"
               v-model="editForm.idCard"
@@ -252,14 +253,14 @@
             />
           </view>
           <view class="form-item">
-            <text class="form-label">性别 *</text>
+            <text class="form-label">性别</text>
             <u-radio-group v-model="editForm.sex" direction="row">
-              <u-radio name="1" label="男"></u-radio>
-              <u-radio name="0" label="女"></u-radio>
+              <u-radio :name="1" label="男"></u-radio>
+              <u-radio :name="0" label="女"></u-radio>
             </u-radio-group>
           </view>
           <view class="form-item">
-            <text class="form-label">尺码 *</text>
+            <text class="form-label">尺码</text>
             <input
               class="form-input"
               v-model="editForm.clothSize"
@@ -292,7 +293,12 @@
 </template>
 
 <script>
-import { getTicketActivityList, getMyTicketList } from '@/config/ticket.js'
+import {
+  getTicketActivityList,
+  getMyTicketList,
+  cancelTicket,
+  updateTicket,
+} from '@/config/ticket.js'
 
 export default {
   data() {
@@ -454,14 +460,28 @@ export default {
       this.$set(item, 'expanded', !item.expanded)
     },
 
-    // 判断是否在24小时内
+    // 判断是否为当天购买
     isWithin24Hours(creationTime) {
       if (!creationTime) return false
       const createDate = new Date(creationTime)
       const now = new Date()
-      const timeDiff = now.getTime() - createDate.getTime()
-      const hoursDiff = timeDiff / (1000 * 3600)
-      return hoursDiff <= 24
+
+      // 获取创建日期的年月日
+      const createYear = createDate.getFullYear()
+      const createMonth = createDate.getMonth()
+      const createDay = createDate.getDate()
+
+      // 获取当前日期的年月日
+      const nowYear = now.getFullYear()
+      const nowMonth = now.getMonth()
+      const nowDay = now.getDate()
+
+      // 判断是否为同一天
+      return (
+        createYear === nowYear &&
+        createMonth === nowMonth &&
+        createDay === nowDay
+      )
     },
 
     // 显示撤销确认弹窗
@@ -476,12 +496,9 @@ export default {
 
       try {
         uni.showLoading({ title: '撤销中...' })
-        const res = await this.$http.post(
-          '/sale/api/ticket/cancel-pay-ticket',
-          {
-            orderCode: this.selectedTicket.orderCode,
-          }
-        )
+        const res = await cancelTicket({
+          orderCode: this.selectedTicket.orderCode,
+        })
 
         if (res.code === 200) {
           uni.$u.toast('撤销成功')
@@ -580,10 +597,7 @@ export default {
 
       try {
         uni.showLoading({ title: '更新中...' })
-        const res = await this.$http.post(
-          'sale/api/ticket/update-ticket',
-          this.editForm
-        )
+        const res = await updateTicket(this.editForm)
 
         if (res.code === 200) {
           uni.$u.toast('修改成功')
@@ -605,6 +619,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep(.uni-scroll-view) {
+  box-sizing: border-box;
+}
 .ticket-container {
   min-height: 100vh;
   background: #f8f8f8;
@@ -830,7 +847,7 @@ export default {
           color: #666;
 
           &.price {
-            color: #005bac;
+            color: #ff4444;
             font-weight: 600;
           }
         }
@@ -927,7 +944,7 @@ export default {
 // 修改信息弹窗样式
 .edit-modal {
   width: 640rpx;
-  max-height: 80vh;
+  max-height: 90vh;
   background: #fff;
   border-radius: 24rpx;
   overflow: hidden;
@@ -947,9 +964,11 @@ export default {
   }
 
   .modal-content {
-    max-height: 60vh;
+    max-height: 70vh;
     padding: 32rpx;
-
+    box-sizing: border-box;
+    padding-bottom: 20px;
+    overflow-y: hidden;
     .form-item {
       margin-bottom: 32rpx;
 
diff --git a/static/images/tickets.png b/static/images/tickets.png
new file mode 100644
index 0000000000000000000000000000000000000000..357a9f7760fb8b8040cf87cbe6e6f57f274745dc
GIT binary patch
literal 3261
zcmb_fdpOf=AK!k4--wLZ@|0tqusPI}GfQMP<`7B^dn_c!lpITQd<;p=<}9J;ksJz1
zYfmXTOU_BlAt{GZj26A?|M#Ewy52wT`@TNk`+Hyab$zby{r!CIG$)d+l!T%L1Okz=
z!&|!uSDtXZ2E~N)a9q&u0Q7>3treuEch5WovLn*Y`iN_k*J2Sde3z{Z?w^;^31E>(
z?6Srb&LXkjtr?t>#)a*$G2%&QYI&Gv9K&AR!Zxf%PuC6&xosZ&;5zi(pLu<w&obW2
z>*;9n*EQaIU9!gES$!~9h4<y_dl!@b<xt(oieTy!UwG5XhbNvJ7vm8j-tp|%jph6C
zhsA$x^~?%<;h~62k{a<%B%BKuyAa}a`DyGg(;9zKFMo2|BQIu#WzJPA+DK`M{AM}l
z{P31>!7{6>3SuM;FyWdCMn2|RD_C0gNI3l9x+2giYN53vN6T*dbL-(F66Y$XZ{MWk
z9)2s5|FLXspZ*n)A*-(z*8B`y9uBSI1HT0Av$pJ7Z3pv3KNX4%H>zWPmh~hudoz)P
zDe~8}^r_SkMp1Jnk`I6ro=G*Lwz1$@6^b1<Lg5%iD(3~tRi<_y?^o9xGF}H$;x;Iq
z=!D~xbK;^aZiS-~B!JWpOP{1G*S$VZY%5*+prfn+)3vfKgTomTm_~XgkRBIqpBraY
z@5tq?+LH`i0KLC9Q#i(XQ={|nncn9&3~{Qw@3Z);k742de|5-XfH^<b^n01n{Io-6
zA?ciu&TO0{d}7bDy+;$912G^u*DZfjU4}J0UM!EJ#7E%U<PbP++6_C+ZBV85S)tsD
zHB2Vz_8D2aB>*ny%~_ivps-@iyriit2q5S(MmSnSX!{9&mTstD<!pzO{@3G3nZL7S
zYkCaKUH;~Xc9f^>1f0i}iOnAI)(iUQs#v3YZ`x9nAK@9BFw%DJ`bt2#%`xuJwgI0j
zfZb{hYTt){u5rF0)e(NOueYM*z0d{l+!w0-*|^~aw7Dc!B(fSt3ci8M=D0NI0|nIw
z#NMalmR6(piUa&ka4s1qMsuN2k+RSFIXeoo$<jq75TLJws#cf_0UQg-Rt5hRPx~X3
zEUN0ao!`o#rH{MpIS3%j8ish0j`#L>{?RI-N`6Q0T|SG5+MYnZuTtL{?ED!JAg2m6
zeXLx<XkkM-Zy}76Z%iBjG3{*sKAVQ6$51<qE5mXFJLZmYch_$iq}*ApxqHl~C^>;+
z^3BEMp6;sJ`2dq2O-H%g8L4YdH@gRq5GEicCWo`yhi1rXEVJ$~HsMJx+m@AY5yP;d
zc7xRi(3@06wPh0wJFnN#>45?`k-pIUO*)6Q#cOW6^IiC&CW~S+g9xXY{aOqY<>TMr
zWUN7zp~+xI^sB}SfO!A*sEFl#tL!n>R&8-sLez`iF1^U*aN8u#<F;{SJ#9U~$91@l
zIdutxc^u;-Cauc2@`b7J+TAo{byRJTzx;SjrH=0jR|x}E`EpI6n@K90X_Kah(Q}U3
zMxW+i>XL~TCUlN!<w+A|WaD6QC!HeF9$jzoaHjnUM|*a5U;t;1ZJ{^R&jiJutE>@a
zwwz%&V`*Dq(mL_&E%GPdvH9frI_35KzN9uUQTL}8{VWTQKWAsHY1V2*kL?sFTtvr2
z0;fm$#l-xXwO9A8rj`%FTH!(A>z>5Kt=f!z`LS#JY6GH2)CR)0oG&=XDi%o6jxXJ-
zV|;gJF^7@Eflt;0v`##2|6)by5=<T!?Wbxz?fgN78_pG{US41!hxm;Lr++HJihbte
z3g5cRve?V{6>%xPdv_Lja<yiIo0V%mCBELfXm7Ok5a?@MHfMFwx56H^N?GD%2{}he
zh+KCHx`{B%^!@14lGjR}y4OST6nKb+c-@M~6*TseUtOZ!G`_}mDlEKwjP^vn@>4#Z
zOo;Ty{?nHF40?aQe*7ZPcd0{j?kJTw<s9VKGW%`9-M&kF$Q6hk;}_qIp;}H{UM~u=
zENmm5n#qHafMRT!huOOQ5h?$MM~eO3hxrmIXQ~@OvsT<8B=`K0%u^=H*t!-*@2p#t
z#w|OzgKC&A@6Q=V$qY`ZZl__#^BTM(La)jrN{p6%^~AnW>$hv{*%RK&lSJv0_iE8T
zy7%^1?L>bCkpI@;bsey9y!@q4`utQ@&8PAy19aFDQmO)8;b{(?4?TB5O;g@zUA1n`
z5FIA<xiBd_=nuf1IdCW<nKS?B`G9dz4qd&1nfv%(^)TJKpVQffC3$oO1?B)aQRh0!
zzm#P9d2pQd8_BeO&>ll9)*cV^Ca8x!bD_*nWG(h%1HFW(#058LL4MhLFG4GmvzKsN
z>|E-{uud`9L*0tNbD3TE{St|nLq$$Aimj$y6lw1iB#Cp4W<x~|?|!2kaJ7+IwQfKD
z`_f9+bGXBbz}?-}xVJ7Xca}y)ercopJ{(y+JAbT8nEe$EM1S3#Z<@%gFaS<4q?-ut
zoPt|bDIO>qTB1tK%cjY|%^K&U9F4lt<4a7d3ye|9t!PloE>BT=%FvZR`6b;*2T*^&
zI3OX&Arn|3(`3o+0gqCfgroIFl0-}im2S|@>1HR?pIsauz+g;<YvWFrTbTQ-=nKxd
z;V+Q~8hCvjIsrb}r%WD<A&O{3{vY)fHp^uozBfqxK=Ce*Q)GGI?v>6=ZPbr9Hn{YC
zJ7aq^CTcEjM8ENlxbe{bjhlOh-!7<V*JtNa1-^PqlHae>g@#BeM3iX{*xK{AdJ?F@
zI~?UqBQD2`NvEs(sj5ULw*g0Cjn_5qQqPD@lFWcm>=dX9<g=3%tZK(}fKat5h!z00
zI(WHKLS{xu*XPt_qD%$1f%cE*wE|4-yt25G)r;NflHG=H-r222!5TtO4Zjri+g-%e
z47EKVxZ_JEbKCz4C;FaZllQz_C@A*R0mPXD^L7QB_?e!r8bz81VNN4txXi<3&euJY
zbAHr$N+=r9Tbm)jKD&Dv?Fr7owSN5~>@$HeuFJW;)sDf_$2E8o8M6=Fq`F?+|H-sd
z`m9F`97j7y^f_QfVM;Hb3i~!1)q7L5yhf~ozo6~UEju$g;hl7vIW$gajWZi(bv^#j
zj%WX9Pv8g$(G!Vr+Io9W5fCStyu<7FgLg*LZI={C;gS>rrE03o`vi=>WOqG388PY>
zEE@#S)Myocf5AwvHB&cKoqmK#0fH)onw$MCS1#&Cn}cRIhn}8Rnz{cfXFBh#IxJr(
z!G4;?2-qt*9CxLA9s%@#Dq&bgAqY&vRd`XKzJoMBm`w9-0trT25$dzqg_tB9762!9
zXzWkmL;;{#v9Y<;t=&*qNXiYlBNQ_zOsTI>Nwq%%0vI0cNK?@-h5%Xqq%4`U#~`$V
z(iv+Rlp}=Jj=gIO8mM0vSX95b7Om9mp=gAFb%H|Yu@>VYWULE&|4)tU0>YTQ2;g{1
zCdoGo*MY&*#a%m-M_U|1sxR5AL@F?2DlkB#E{qhKj~n>vTfyu_d-ze_9(u(Umod_+
zXO^TM;X>tc$aQ#|@0w!r9U-O&9@)UI!BuLfXXIKg17MJ4sx?=r!KNgO(sx2q)-T}y
zzuWqM<KoJl-j*dD2!bgw;#v+6xu3SxCfM6?P4P-b7TxjZm20fPkpXAb+KXbJy)|e?
z@3v1q?<s9=7a8KYOT*kfEOrp`alLv5JQvgXpf{E<X>f+^zJA_r%NbC^*1{rw4BD&A
z2Q%8C_@3uG0b)drae79Nj<611`h9%A3Z=at)}|@Ty&e-NHOkAMtiJF?9QaN2o)_0Q
zqH{Db@p@o&H63*g1q}q+S9G%#1eCh`QmPHCTcR6NT}emLQBW#i8TWBrUj!?eKD1*m
zT21IWUwAuBNd8W^fue&@G@v{gRFB+PDR{_N3>i@9P%3KKPqF6iAGucoX0$B@jvj)D
z0G3bQ%;a(K3oR+0;t$B&n~`ZnyHIJKBX#e%ha_6p&Q5#KMle_6FLba+gY5(o<eQwV
zP{`&kJ^3wN$pYX(=7=EzLyY?4S4rbY`iAzQ+lxnpo?LT5@$GOIOq%Mb&@8Us3x|S(
z!kRX@@-XG9CKRUd(s53vQfL?>ex8+rIs+hvUec@TWDB8v-FTx2+=j`V++|sG^wu>9
iFtSp12xblcDK6_B3f<0j2oU~9Aa*t+>l!Oc!hZnHB;8>E

literal 0
HcmV?d00001