From 544fb327623c2bc367ef8f2abd90b66438eeeb2d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 16 Nov 2024 09:16:26 +0800 Subject: [PATCH] 111 --- src/pages/boxes/apply-list.vue | 55 +++++++++++++++++- src/pages/merchant/components/product-row.vue | 9 ++- src/pages/merchant/detail.vue | 14 ++++- src/pages/tabbar/my.vue | 1 + src/pages/tabbar/order.vue | 2 +- src/static/icon/service_4.png | Bin 0 -> 2867 bytes 6 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 src/static/icon/service_4.png diff --git a/src/pages/boxes/apply-list.vue b/src/pages/boxes/apply-list.vue index be1056c..52eb4e2 100644 --- a/src/pages/boxes/apply-list.vue +++ b/src/pages/boxes/apply-list.vue @@ -46,11 +46,34 @@ const doCard = (v: any) => { router.jump('/pages/boxes/detail', { id: v.id }) } +const doCancelApply = async (v: any) => { + uni.showModal({ + title: '提示', + content: '是否确定取消预约', + confirmColor: '#0094ff', + success: async (res) => { + if (!res.confirm) return + try { + uni.showLoading({ title: '取消预约中...', mask: true }); + const _pa = { id: v.id } + const { data, code }: any = await boxesApi.cancel(_pa) + if (code != 0) throw new Error() + pageRef.value.reload(true) + uni.hideLoading() + uni.showToast({ title: '取消预约成功', icon: "none" }); + } catch (error) { + console.error(error); + uni.hideLoading() + } + } + }) +} + - - + + + + {{ v.boxesName }} + + 预约成功 + 预约失败 + 取消预约 + + + + 预约时间 + + {{ v.bookingDate }} {{ hooks.useTime(v.startTime, "{h}:{i}") }} ~ {{ + hooks.useTime(v.endTime, "{h}:{i}") + }} + + + + 提交时间 + + {{ hooks.useTime(v.createTime, "") }} + + + + + 取消预约 + diff --git a/src/pages/merchant/components/product-row.vue b/src/pages/merchant/components/product-row.vue index 23630a5..32eaef0 100644 --- a/src/pages/merchant/components/product-row.vue +++ b/src/pages/merchant/components/product-row.vue @@ -65,7 +65,8 @@ const remove = () => { - \ No newline at end of file + \ No newline at end of file diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue index d5bbf3d..41e5422 100644 --- a/src/pages/merchant/detail.vue +++ b/src/pages/merchant/detail.vue @@ -148,7 +148,7 @@ const doVisibleCar = async () => { state.showCarDialog = true } -const doPay = async () => { +const submitPay = async () => { try { if (isEmpty(state.carList)) { uni.showToast({ title: '请至少购买一件商品', icon: "none" }) @@ -170,6 +170,18 @@ const doPay = async () => { } } +const doPay = async () => { + uni.showModal({ + title: '提示', + content: '是否确定购买', + confirmColor: '#0094ff', + success: async (res) => { + if (!res.confirm) return + submitPay() + } + }) +} + const getHeight = () => { const rpx = 480 return `calc(100vh - ${uni.upx2px(rpx)}px)` diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index d7b1b6a..2206265 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -9,6 +9,7 @@ import { merchantApi, userApi, walletApi } from "@@/api" const data = { serviceList: [ { text: '钱包管理', icon: '/static/icon/service_3.png', router: '/pages/wallet/list' }, + { text: '包厢预定', icon: '/static/icon/service_4.png', router: '/pages/boxes/apply-list' }, // { text: '车牌管理', icon: '/static/icon/service_2.png', router: '/pages/user/diff-price' }, { text: '外来人员就餐', icon: '/static/icon/service_1.png', router: '/pages/apply/foreign-list' }, { text: '跨单位就餐', icon: '/static/icon/service_1.png', router: '/pages/apply/stride-list' }, diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index aa25474..bdd91f1 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -70,7 +70,7 @@ const doRefund = (v: any) => { uni.hideLoading() } } - }); + }) } diff --git a/src/static/icon/service_4.png b/src/static/icon/service_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6c56e397c35f02904a5ca749e61bd34c8afa78c6 GIT binary patch literal 2867 zcmcIm`#Y4|7nfeAcR2E5axX8&H7U1TO2@0A8O*pQ;}pk)nB%A>N-p6|H3l_=L{XEN zA>@+EEk`cnmit8Mj$FE75W<#A45q9HH27%JqPaNXavmNf8n8&qO@p9`615CW($U!^YNVV=o?| zpFaVVH@W+o+YbdK3{$Hz{i{ZG!a3!XiyACt*49k*eqB;ctCjJp26x^hV(NIIifdI~ z#=gny#k?_BFk$=aZ58F zb6SEHuNVuaETE1xXZ$I(yRDM89BC3mk}BnIjK5Z-vAdtrVSlaP*93G?7PdIet+oiZ?D10Eq;n=0)(6eVuFp}KhTsXKL?0qU}bT>@) zk>zhwp||I<@lvm@lD@ve2y9cx2xHrqSnlmy>qFRK+4zauF>J*+)wmMbVk@EL+zD>_ z#<*44;vGW8!qMnxrp+H_Oqhqw8t7s*oW>5z#0&JEE(H*t0WY%Wli|H()14{e*JT0= zC=bzZiLZ@rhFlyYzun#S0;ESRucAJ<&zDn`EMz9I@!e6Q=7ULXSFEoF6l;L3HRm91 z`pykN+nEqWiil`e1!Wp+T+-1<_5Bl3o+FjMwiY2)}s z-!@5`ou~QfHq737om5Y!xHCwF%T9~GXUEOFW?Da z29e7daNKYULx~|1-WQRzpA~!K=mAL_#{6s@DZL{#67EM-jc9PYU}^gJ21Kiuq)CI@ z@`6-2N$_hwwb|e@?k8$FDsnL=WdkqYa5d*YAm#3u5j}wiQ z5r)zlwUd%c0c{3AjaC)gHZNg4hZ~M-5vzoE{l+pAb%rrE0}SmJ65Dg>_y{H?gW&`PR)|iqxK5JpJTSq1e*G zT8iCx#q?a=G1bA#lwue!W%cJXJS0mrsdpDgRhBcd`0f&jpx89simznrF5dWh|6Pp> zEp-e_gispV?i*2T*yXCtTXc#sU%%j4=b%@b^QU74gex`86a+%JM#24ch6v@G%!>uJ zDRmG9OJ0K{4F>EtN0F-7^zQDp*sA2}LJ)-`ntPUm<{9vluzd?q|yfvO&@g$TH%60<~fY@Ex_;dfC zVfRLFS~Sn|=h#^OGb14C+2XdgkMM4};N7P-zUJerU+g*BObL!TZcbc0%xyPe<4o5+;A5X$sxYz&=5!S|SF`AX=Jvwh94DELh3f2)mM z6UV=*VtnGpH8CTR3ohkLZ~rQa@a#?6hM=W!97%P?t}hDR5*R7ps;<`XByE$!Vbbx@ zgb7Wkv~G`7j{LYozXW2^l`&gSdwENFWC}36snyjN#H?Dqic`uee^MVEQ-xdNJH3W4P$xv3{=bNj-1PwKBY8_WmJSULd(}^GoHnqHb%JK@{Wt zLk`^`w?((popo|oTCBB8n*U67)Q{QadxgwHB5@)>6$S>ki;8XpXoz=|6}P=vEDsim zD-k~AJqa*WMyF`7zwgKBcR@8O4Z!zFZ>N56YNc`A*%utmfqclCr7PfMTg1`NhMjvT zEb*zXs1n5-;|-_KFk!oJPcA;W+Spoelq7=8=J?o|rNj=$WNPu(xlZLn949~f`CxEh zMG9yOuu&usL`e}3G{F@XixK1?WH|qA_Vemk1{{{vEV;i+*5S=lC~!e_D|%lFb3W6f zQuzNJibPofK{q{?w=x@U!8ZafG&=6_!c_Jb)q&J{1lw!*KoF@H_iCb77tEgLW^zl@ z8$tvVTjGyZRFVx>7c_geSVf4bF~3vub38`zR3Xy1fAG!v_3jbTKElfZSladD@B)*+WQO zmbn!Z4ICc(CKG>khukeY(S7uA2^6PvjTf~NT%-0?-LH=LwXm}#x;~NI%Iol_tS(kB zMLl-P)y6cAzuIIGMuonSxTja-@Q`bXg4;9GPoU!!rO(rVYagTMX+O?+EynrRQ@ zj<#DRL5``ApH6#ajEBTPEn}~moOSK)spcodBT2w`Is=SWS=%IGP{$cED=rdt!6HOk KGQPy-5A+{<(GubS literal 0 HcmV?d00001