From 9ee4ff1f30c22a3b24ab00605fe8b74fd251fe51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Tue, 23 Jul 2024 09:51:48 +0800 Subject: [PATCH 01/43] message --- pages/order_detail/indexs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order_detail/indexs.vue b/pages/order_detail/indexs.vue index f13addb..739cddd 100644 --- a/pages/order_detail/indexs.vue +++ b/pages/order_detail/indexs.vue @@ -257,7 +257,7 @@ }, onHide() { this.socketTicket.Close() - uni.$off('message') + uni.$off('getMessage') }, onShow() { uni.$on('message', this.getMessage) From 4d09e97c2e110edd43aecb28c5f56f07be51fd3a Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 24 Jul 2024 14:52:56 +0800 Subject: [PATCH 02/43] =?UTF-8?q?fix::=E7=AC=AC=E4=B8=89=E7=89=88=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E8=AE=A2=E5=8D=95=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 9 +- pages/order/confirm_order.vue | 936 ++++++++++++++++++++++++++++++++++ static/order/coupon.png | Bin 0 -> 765 bytes static/order/groupOffer.png | Bin 0 -> 651 bytes static/order/img.png | Bin 0 -> 12601 bytes static/order/stored.png | Bin 0 -> 3186 bytes static/order/tab1.png | Bin 0 -> 2084 bytes static/order/tab1_active.png | Bin 0 -> 2504 bytes static/order/tab2.png | Bin 0 -> 2283 bytes static/order/tab2_active.png | Bin 0 -> 2644 bytes static/order/table.png | Bin 0 -> 1258 bytes static/order/weChat.png | Bin 0 -> 931 bytes 12 files changed, 944 insertions(+), 1 deletion(-) create mode 100644 pages/order/confirm_order.vue create mode 100644 static/order/coupon.png create mode 100644 static/order/groupOffer.png create mode 100644 static/order/img.png create mode 100644 static/order/stored.png create mode 100644 static/order/tab1.png create mode 100644 static/order/tab1_active.png create mode 100644 static/order/tab2.png create mode 100644 static/order/tab2_active.png create mode 100644 static/order/table.png create mode 100644 static/order/weChat.png diff --git a/pages.json b/pages.json index 34a854a..b45f432 100644 --- a/pages.json +++ b/pages.json @@ -85,7 +85,14 @@ "path": "pages/order/order", "style": { "navigationBarTitleText": "订单列表", - "navigationBarBackgroundColor": "#FFD158", + "navigationBarBackgroundColor": "#FFD158" + } + }, + { + "path": "pages/order/confirm_order", + "style": { + "navigationBarTitleText": "确认订单", + "navigationStyle": "custom", "navigationBarTextStyle": "white" } }, diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue new file mode 100644 index 0000000..56df763 --- /dev/null +++ b/pages/order/confirm_order.vue @@ -0,0 +1,936 @@ + + + + + diff --git a/static/order/coupon.png b/static/order/coupon.png new file mode 100644 index 0000000000000000000000000000000000000000..95df631cc414db7553eeacead4f1fc4d1dbe5717 GIT binary patch literal 765 zcmVPx%w@E}nR9Hvtm{D@tFc5}!?bmif-(0c~#eSulaccxX6*&D7c7f$vNw(AQ5$pG3_u6@8>Bn`Vv&P zKLmwlyAa|O5s#xR7D99o@hJAfdt(gS4VRkC7+tmk06am!k1r2`&i`&@dcNm*p5r(@ zMBIsa&Z1^P2yu*vY|>jqG!t@k*%|=g9ssqs4?Zo`)ML17M63Y7FCq$*Qk_XR!vU`A z^44tuKq#ern|{M00d2`8qHo5S{V)uN(H76jo@tfk?xNL2#KUDPn9N$O^{$1>0LI%L zBH|lv9MZM^ThhT-v@x& zG*L2uzVCMd;BZ=So<;M-+BE^-vy`&&F9pAIniEk|DaEjpVQq#8>#yDi{MJhuv5TA% z(NHP1I}P6CgJ^R7UtuDu2ujdv6K%GC<hu7>m#+dr7cE2#1)E_6?{;^TtKDd)S6~trLA)+&k3pIBwwZ~3;qPQ!qb>qRE v1OWKLQid^{dM7CZS(;%zzEPJ^Im`4HsKCxFRb`)k00000NkvXXu0mjf_v&Qj literal 0 HcmV?d00001 diff --git a/static/order/groupOffer.png b/static/order/groupOffer.png new file mode 100644 index 0000000000000000000000000000000000000000..9ee2c59a99c04090a2d035b2cb5cfa1b6bee1972 GIT binary patch literal 651 zcmV;60(AX}P)Px%MM*?KR9Hvtm|t$%KoG{ivHMz;yi=ezSnLCY+@L9WZ+n8m1?a*BLT^By8$^48 zkOO$*o**bh>MN+P-JNC~Ost?(iR~IA;U}-;+vwvm?C4Z>o`mh(6b%u72pb$b3 z(W|T@Ph-!_%P$;bgq*Cf266pIrGxJZSl*r;dFI&&^ zrk14E`b|>cg;J`OS0`EgBm^Gq1*RdnTLgs=E!TC=(~R_g+i0zisPqC8+e~Rz@y1cN z+6VUn)5L5k_rdr^Wly(K3f!%Iu#Bs?aDq2u`GH~T#F$l224CmjWDAZtWI|YbH~8^z z@f0d>KJHC{yGv+v5d}ss9qRtpW@b|h+pe|yACn>r6L@_l-xBczu&dD-F-!-bIyuxd z8Vw>djN8>?xz0rj6F49DBtV}5?!RsiWZWiDx7wD&xXnz*wG;V0rdXW7DAxF#fdzqw z4C)Y2u>@ft4EQu|Z-t;Ga(&ht5z+hm7~}p6#~J-Ge6@)FiGy8Qw$&sf}ok^yv*Ci_x(!%Vx2U3o@bYQy-aB*fMpN_m5sz5z%*|n z&-52%mbYb)`^4RTSXCEnux_O;lNiL(mSAjE!G7DQZrQ62fNj-h7LOK>o;eML{l0tk l!NSlyv7u{dCCdm#V-002ovPDHLkV1fiLG$Q~2 literal 0 HcmV?d00001 diff --git a/static/order/img.png b/static/order/img.png new file mode 100644 index 0000000000000000000000000000000000000000..546da3dea6f131956775efa3e51c409fbe6dc6b5 GIT binary patch literal 12601 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 bTlc>J^yWf^Gd4Ql00000NkvXXu0mjfL(2gO literal 0 HcmV?d00001 diff --git a/static/order/stored.png b/static/order/stored.png new file mode 100644 index 0000000000000000000000000000000000000000..dc04d4a7b1f49542567f92ea90538126d4db5ee3 GIT binary patch literal 3186 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 UgF0e&=>Px#07*qoM6N<$g86AjGXMYp literal 0 HcmV?d00001 diff --git a/static/order/weChat.png b/static/order/weChat.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf01068cbc3e0f22a4362151fa0faf5578fcfa0 GIT binary patch literal 931 zcmV;U16=%xP)71Q{00001b5ch_0Itp) z=>Px&T}ebiR7gv$mS1QbRT#z3na$tE3N`*|Q4s}cskSPOyKBj8H@h*gKKRtWl=|SC zAQlwsgY+R%P^4Nk(x{*!N>Ry6Q7}lI&2~3Uc2*l|TjGOlpDa|`3W{w^nz=_NX46e( zlG&xXPs9DrcYbs4eD}LUM2x;l>VD7QSy2g+k3-lppK=|-RY2!qaZ)m)Q=WHpeEay+ zN|szM*i-J_Mpy?(V06JFF$8A@>8hT`MW)4*D-e%D{=syCuK0RaZW7f6b z1^7w;C|m@ii$~Isg!f01r7;lleX`}mJz~p2in~F?s@|fWXU0vPA@FFRu3`3z9JRzF z!K&5Y5Dt4&v4KKQ;Zij>J(6x?ySL9G_W@WN+%TPn+j~IxyLI<+pGVMfA2f@G^iq!^EOak5?VQV?NM7?0yx6jT@eAn;nbGb>DGWNv;){O9!fjy}?Yml9SpcxP0jo%&;Gbndh}k3skvQ78Ccj%V7=yBA)zUW zr$BQWo>$CoAHNv2D*@os6?=yfKa|W{`Q+%AQ3j31{{uh_M2AE&Ydin|002ovPDHLk FV1j0Hz=r?; literal 0 HcmV?d00001 From 6ad7581fc7dc7c504b5c779b4c4f94fe1dab5753 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 24 Jul 2024 14:53:17 +0800 Subject: [PATCH 03/43] =?UTF-8?q?fix::=E7=AC=AC=E4=B8=89=E7=89=88=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E8=AE=A2=E5=8D=95=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/order/coupon.png | Bin 765 -> 0 bytes static/order/groupOffer.png | Bin 651 -> 0 bytes static/order/img.png | Bin 12601 -> 0 bytes static/order/stored.png | Bin 3186 -> 0 bytes static/order/tab1.png | Bin 2084 -> 0 bytes static/order/tab1_active.png | Bin 2504 -> 0 bytes static/order/tab2.png | Bin 2283 -> 0 bytes static/order/tab2_active.png | Bin 2644 -> 0 bytes static/order/table.png | Bin 1258 -> 0 bytes static/order/weChat.png | Bin 931 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/order/coupon.png delete mode 100644 static/order/groupOffer.png delete mode 100644 static/order/img.png delete mode 100644 static/order/stored.png delete mode 100644 static/order/tab1.png delete mode 100644 static/order/tab1_active.png delete mode 100644 static/order/tab2.png delete mode 100644 static/order/tab2_active.png delete mode 100644 static/order/table.png delete mode 100644 static/order/weChat.png diff --git a/static/order/coupon.png b/static/order/coupon.png deleted file mode 100644 index 95df631cc414db7553eeacead4f1fc4d1dbe5717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 765 zcmVPx%w@E}nR9Hvtm{D@tFc5}!?bmif-(0c~#eSulaccxX6*&D7c7f$vNw(AQ5$pG3_u6@8>Bn`Vv&P zKLmwlyAa|O5s#xR7D99o@hJAfdt(gS4VRkC7+tmk06am!k1r2`&i`&@dcNm*p5r(@ zMBIsa&Z1^P2yu*vY|>jqG!t@k*%|=g9ssqs4?Zo`)ML17M63Y7FCq$*Qk_XR!vU`A z^44tuKq#ern|{M00d2`8qHo5S{V)uN(H76jo@tfk?xNL2#KUDPn9N$O^{$1>0LI%L zBH|lv9MZM^ThhT-v@x& zG*L2uzVCMd;BZ=So<;M-+BE^-vy`&&F9pAIniEk|DaEjpVQq#8>#yDi{MJhuv5TA% z(NHP1I}P6CgJ^R7UtuDu2ujdv6K%GC<hu7>m#+dr7cE2#1)E_6?{;^TtKDd)S6~trLA)+&k3pIBwwZ~3;qPQ!qb>qRE v1OWKLQid^{dM7CZS(;%zzEPJ^Im`4HsKCxFRb`)k00000NkvXXu0mjf_v&Qj diff --git a/static/order/groupOffer.png b/static/order/groupOffer.png deleted file mode 100644 index 9ee2c59a99c04090a2d035b2cb5cfa1b6bee1972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)Px%MM*?KR9Hvtm|t$%KoG{ivHMz;yi=ezSnLCY+@L9WZ+n8m1?a*BLT^By8$^48 zkOO$*o**bh>MN+P-JNC~Ost?(iR~IA;U}-;+vwvm?C4Z>o`mh(6b%u72pb$b3 z(W|T@Ph-!_%P$;bgq*Cf266pIrGxJZSl*r;dFI&&^ zrk14E`b|>cg;J`OS0`EgBm^Gq1*RdnTLgs=E!TC=(~R_g+i0zisPqC8+e~Rz@y1cN z+6VUn)5L5k_rdr^Wly(K3f!%Iu#Bs?aDq2u`GH~T#F$l224CmjWDAZtWI|YbH~8^z z@f0d>KJHC{yGv+v5d}ss9qRtpW@b|h+pe|yACn>r6L@_l-xBczu&dD-F-!-bIyuxd z8Vw>djN8>?xz0rj6F49DBtV}5?!RsiWZWiDx7wD&xXnz*wG;V0rdXW7DAxF#fdzqw z4C)Y2u>@ft4EQu|Z-t;Ga(&ht5z+hm7~}p6#~J-Ge6@)FiGy8Qw$&sf}ok^yv*Ci_x(!%Vx2U3o@bYQy-aB*fMpN_m5sz5z%*|n z&-52%mbYb)`^4RTSXCEnux_O;lNiL(mSAjE!G7DQZrQ62fNj-h7LOK>o;eML{l0tk l!NSlyv7u{dCCdm#V-002ovPDHLkV1fiLG$Q~2 diff --git a/static/order/img.png b/static/order/img.png deleted file mode 100644 index 546da3dea6f131956775efa3e51c409fbe6dc6b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12601 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 bTlc>J^yWf^Gd4Ql00000NkvXXu0mjfL(2gO diff --git a/static/order/stored.png b/static/order/stored.png deleted file mode 100644 index dc04d4a7b1f49542567f92ea90538126d4db5ee3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3186 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 UgF0e&=>Px#07*qoM6N<$g86AjGXMYp diff --git a/static/order/weChat.png b/static/order/weChat.png deleted file mode 100644 index dbf01068cbc3e0f22a4362151fa0faf5578fcfa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 931 zcmV;U16=%xP)71Q{00001b5ch_0Itp) z=>Px&T}ebiR7gv$mS1QbRT#z3na$tE3N`*|Q4s}cskSPOyKBj8H@h*gKKRtWl=|SC zAQlwsgY+R%P^4Nk(x{*!N>Ry6Q7}lI&2~3Uc2*l|TjGOlpDa|`3W{w^nz=_NX46e( zlG&xXPs9DrcYbs4eD}LUM2x;l>VD7QSy2g+k3-lppK=|-RY2!qaZ)m)Q=WHpeEay+ zN|szM*i-J_Mpy?(V06JFF$8A@>8hT`MW)4*D-e%D{=syCuK0RaZW7f6b z1^7w;C|m@ii$~Isg!f01r7;lleX`}mJz~p2in~F?s@|fWXU0vPA@FFRu3`3z9JRzF z!K&5Y5Dt4&v4KKQ;Zij>J(6x?ySL9G_W@WN+%TPn+j~IxyLI<+pGVMfA2f@G^iq!^EOak5?VQV?NM7?0yx6jT@eAn;nbGb>DGWNv;){O9!fjy}?Yml9SpcxP0jo%&;Gbndh}k3skvQ78Ccj%V7=yBA)zUW zr$BQWo>$CoAHNv2D*@os6?=yfKa|W{`Q+%AQ3j31{{uh_M2AE&Ydin|002ovPDHLk FV1j0Hz=r?; From 82b3a744351d6e6dbe234bcbf89cb17afad23e85 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Fri, 26 Jul 2024 09:16:34 +0800 Subject: [PATCH 04/43] =?UTF-8?q?fix::=E6=96=B0=E7=89=88=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/confirm_order.vue | 24 +++++++++++++++++------- pages/order_food/order_food.vue | 4 ++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue index 56df763..a289dc2 100644 --- a/pages/order/confirm_order.vue +++ b/pages/order/confirm_order.vue @@ -46,7 +46,7 @@ - 后海&双屿 + {{ listinfo.name }} @@ -58,13 +58,13 @@ ￥{{ item.totalAmount}} - + 暂无可用优惠券 + 小计￥ {{listinfo.payAmount}} @@ -168,6 +168,7 @@ listinfo: { details: [], payAmount: 0, + name: "", }, tableValue: "A203", // 桌台号 totalPrice: 0, // 小计金额 @@ -186,6 +187,7 @@ }, }, onUnload() { + console.log(this) this.socketTicket.Close() uni.$off('getMessage') this.ispws = false @@ -194,6 +196,9 @@ this.socketTicket.Close() uni.$off('message') }, + onLoad(e) { + this.listinfo.name = JSON.parse(e.storeInfo).shopName; + }, onShow() { uni.$on('message', this.getMessage) if (this.listinfoid) { @@ -790,9 +795,14 @@ } } .favorable_right{ - font-size: 24rpx; - color: #999; - font-weight: 400rpx; + display: flex; + align-items: center; + .favorable_right_text{ + font-size: 24rpx; + color: #999; + font-weight: 400rpx; + } + } } .totalPrice{ diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 271b7bc..26cfe4a 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -605,6 +605,10 @@ }) return false } + uni.navigateTo({ + url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopList.storeInfo) + }); + return; uni.navigateTo({ url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists) }); From 62f0e6f25ba217756b8f6a97e13483b4ee3d5b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Fri, 26 Jul 2024 11:16:13 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chooseasong/index.vue | 7 +- pages/index/indexs.vue | 19 +- pages/order_food/goodsList_scroll.vue | 300 ++++++++++++++++++++++---- pages/order_food/order_food.vue | 1 + 4 files changed, 272 insertions(+), 55 deletions(-) diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue index 508a4ee..8531df7 100644 --- a/pages/chooseasong/index.vue +++ b/pages/chooseasong/index.vue @@ -1,8 +1,7 @@ - - \ No newline at end of file diff --git a/pages/order_food/order_food-s.vue b/pages/order_food/order_food-s.vue new file mode 100644 index 0000000..195ecde --- /dev/null +++ b/pages/order_food/order_food-s.vue @@ -0,0 +1,1404 @@ + + + + + \ No newline at end of file diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 195ecde..d9defce 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -1,135 +1,178 @@ + - \ No newline at end of file From 24bfe3763ea24f2c6df37be872ce829c9df880e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Fri, 2 Aug 2024 17:39:52 +0800 Subject: [PATCH 15/43] 11 --- pages/order_food/order_food.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index fe76320..9915fc0 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -5,7 +5,7 @@ style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;"> 加载中 - + From 8dd53c530afff2358fa6d7061cf2524a9a0f77f3 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Fri, 2 Aug 2024 17:44:29 +0800 Subject: [PATCH 16/43] 11 --- pages/order_food/order_food.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index d4e1e3d..d7a3da1 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -4,7 +4,7 @@ - 加载中 + 加载中 From e1e501e150b578497970774cb15af75e2e79ff23 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 09:19:37 +0800 Subject: [PATCH 17/43] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cwx-keyboard/cwx-keyboard.vue | 8 +- components/payPasswordtwo - 副本.vue | 224 +++++++ components/payPasswordtwo.vue | 401 +++++------ pages/order/confirm_order.vue | 24 +- pages/order_food/order_food.vue | 627 +++++++++--------- ...sword - 副本.vue => repairpasswordtwo.vue} | 0 6 files changed, 781 insertions(+), 503 deletions(-) create mode 100644 components/payPasswordtwo - 副本.vue rename pages/user/{repairpassword - 副本.vue => repairpasswordtwo.vue} (100%) diff --git a/components/cwx-keyboard/cwx-keyboard.vue b/components/cwx-keyboard/cwx-keyboard.vue index b30293d..61cb5b7 100644 --- a/components/cwx-keyboard/cwx-keyboard.vue +++ b/components/cwx-keyboard/cwx-keyboard.vue @@ -1,5 +1,5 @@ @@ -176,6 +192,7 @@ remark: "", // 备注 radiovalue: 1, // 支付方式 ispws: false, // 输入支付密码 + payPasswordShow: false, amountVIP: null, // 会员信息 listinfoid: null, paymentBtnText: "会员卡支付", @@ -392,9 +409,10 @@ }) } else { uni.hideLoading() + // this.payPasswordShow = false; this.ispws = true this.$nextTick(() => { - this.$refs.payPwd.onPayUp(); + // this.$refs.payPwd.onPayUp(); }) } } @@ -460,7 +478,7 @@ * @param {Object} pwd */ async accountPayevent(pwd) { - this.ispws = false + this.ispws = false; console.log(pwd) let res = await this.api.accountPay({ orderId: this.listinfoid, diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index d7a3da1..8248899 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -4,19 +4,16 @@ - 加载中 + 加载中 - + - - + {{ shopInfo.storeInfo.shopName }} @@ -37,9 +34,10 @@ 本店招牌菜 - + - + {{ item.name }} @@ -64,20 +62,22 @@ 「{{item.suit}}份起点」 - + 选规格 - {{item.cartNumber<99?item.cartNumber:'99+'}} + {{item.cartNumber<99?item.cartNumber:'99+'}} - - + + {{ item.cartNumber }} - + @@ -85,54 +85,64 @@ - + - {{item.name}} + @tap="leftTap">{{item.name}} - - + + {{item.name}} - - - - TOP{{index1+1}} + + + + TOP{{index1+1}} + {{ item1.name }} 本店回头客第{{index1+1}}名 {{item1.shortTitle?item1.shortTitle:''}} 月售{{item1.stockNumber}} - ￥{{ item1.lowPrice }}/份「{{item1.suit}}份起点」 - + ￥{{ item1.lowPrice }}/份「{{item1.suit}}份起点」 + - + 选规格 - {{item1.cartNumber<99?item1.cartNumber:'99+'}} + {{item1.cartNumber<99?item1.cartNumber:'99+'}} - + - - + + {{ item1.cartNumber }} - + - + @@ -142,36 +152,31 @@ - - - + - {{cartLists_count<99?cartLists_count:'99+'}} - + ￥ {{cartLists.amount||'0.00'}} - 去结算 + 结算 - + - + 已点 {{cartLists_count}} 份 @@ -189,7 +194,7 @@ {{ item.name }} {{ item.skuName }} - + ￥ @@ -197,7 +202,7 @@ - + {{ item.number }} @@ -211,10 +216,10 @@ - - + + - + @@ -227,7 +232,8 @@ 营业时间： - {{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }} + {{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }} 商家地址： @@ -245,23 +251,23 @@ {{ shopInfo.storeInfo.detail }} - + - - + - + {{specifications.name}} - 本店回头客第{{specifications.indexb+1}}名 + + 本店回头客第{{specifications.indexb+1}}名 {{specifications.shortTitle?specifications.shortTitle:''}} - + @@ -275,8 +281,8 @@ - - + + @@ -285,10 +291,10 @@ /杯 - + - + {{amountcartNumber}} {{skuidname.toString()}} - 添加到购物车 + + 添加到购物车 @@ -308,7 +316,7 @@ - - \ No newline at end of file diff --git a/components/payPasswordtwo.vue b/components/payPasswordtwo.vue index 6f4f795..8eb5a54 100644 --- a/components/payPasswordtwo.vue +++ b/components/payPasswordtwo.vue @@ -2,32 +2,31 @@ - {{form.password.length == 6?'请再次确认支付密码':"请设置新密码，用于支付验证"}} + ￥ + {{payAmount}} - {{consumeFee.slice(0,1)}} + ● - {{consumeFee.slice(1,2)}} + ● - {{consumeFee.slice(2,3)}} + ● - {{consumeFee.slice(3,4)}} + ● - {{consumeFee.slice(4,5)}} + ● - {{consumeFee.slice(5,6)}} + ● - + @@ -38,167 +37,50 @@ components: { cwxKeyboard }, + props: { + payAmount: { + default: 0, + type: Number + }, + }, data() { return { isPwd: uni.cache.get('userInfo').isPwd, - form: { - mobile: uni.cache.get('userInfo').telephone, - password: '', //密码 - payPassword: '', //二次密码 - checkCode: '' - }, - passwords: false, - payPasswords: false, - // 注册定时器 初始值 - second: 60, - showText: true, - Recapture: '发送验证码', consumeFee: '', //第一遍 - consumeFees: '', //第二遍 money: '' }; }, onLoad() { console.log(uni.cache.get('userInfo').isPwd) - if (uni.cache.get('userInfo').isPwd != 0) { - uni.setNavigationBarTitle({ - title: '忘记支付密码', // 标题文本，必须是字符串 - }); - } + }, watch: { consumeFee(newVal, oldVal) { - if (this.form.password.length == 6) { - this.form.payPassword = newVal - if (this.form.payPassword.length == 6) { - this.userInfosavePayPassword() - } - } else { - this.form.password = newVal - if (this.form.password.length == 6) { - this.$refs.keyboard._handleClearKey() //清空 - } - } + } }, methods: { - confirmEvent(e) { - console.log(e) + confirmEvent(val) { + + // uni.showModal({ + // title: '温馨提示', + // content: '输入密码是 = ' + JSON.stringify(this.passwordArr) + // }) + + // 判断是否等于6 + if (val.length === 6) { + this.$emit('accountPayevent', val) + this.money = ""; + } + this.$forceUpdate(); }, - async CodeRegister() { - const res = await this.api.phoneValidateCode({ - // post 手机验证码 - phone: this.form.mobile - }); - if (res) { - uni.showToast({ - title: '验证码获取成功', - icon: 'none' - }); - // 定时器 - this.showText = false; - this.Recapture = '重新获取'; - var interval = setInterval(() => { - let times = --this.second; - this.second = times < 10 ? '0' + times : times; //小于10秒补 0 - }, 1000); - setTimeout(() => { - clearInterval(interval); - this.second = 60; - this.showText = true; - }, 60000); - } - }, - async loginwxuserInfo() { - let res = await this.api.loginwxuserInfo({ - userId: uni.cache.get('userInfo').id - }) - if (res.code == 0) { - uni.cache.set('userInfo', res.data); - } - }, - async userInfosavePayPassword() { - if (this.form.mobile.length != 11 && this.isPwd == 0) { - uni.showToast({ - title: '手机号必须是11位', - icon: 'none' - }); - return false; - } - if (this.form.password == null || this.form.password == '') { - uni.showToast({ - title: '请输入密码', - icon: 'none' - }); - return false; - } - if (this.form.payPassword == null || this.form.payPassword == '') { - uni.showToast({ - title: '请输入确认密码', - icon: 'none' - }); - return false; - } - if (this.form.password.length != 6 || this.form.payPassword.length != 6) { - uni.showToast({ - title: '密码必须是6位', - icon: 'none' - }); - return false; - } - if (this.form.payPassword != this.form.password) { - this.$refs.keyboard._handleClearKey() //清空 - this.form.payPassword = '' - this.form.password = '' - uni.showToast({ - title: '密码和确认密码不一致', - icon: 'none' - }); - return false; - } - if (this.form.checkCode == null || this.form.checkCode == '') { - uni.showToast({ - title: '请输入验证码', - icon: 'none' - }); - return false; - } - let res = await this.api.loginresetPwd({ - pwd: this.form.password, - code: this.form.checkCode - }) - - if (res.code == 0) { - if (uni.cache.get('userInfo').isPwd != 0) { - uni.showToast({ - title: '修改成功', - icon: 'none' - }); - } else { - uni.showToast({ - title: '设置成功', - icon: 'none' - }); - } - // 获取用户信息 - this.loginwxuserInfo() - setTimeout(() => { - uni.navigateBack(); - }, 1000); - } else { - this.$refs.keyboard._handleClearKey() //清空 - this.form.payPassword = '' - this.form.password = '' - } - } + + } }; \ No newline at end of file diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 8248899..a9edb25 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -169,7 +169,7 @@ {{cartLists.amount||'0.00'}} - 结算 + 去结算 @@ -519,9 +519,22 @@ * @param {Object} b */ shopAdd(item, index, index1, a, b) { + let flag = true; + if ( this.cartLists.data.length > 0) { + this.cartLists.data.forEach((v,e)=>{ + if ( v.productId == item.id) { + flag = false; + } + console.log(v) + }) + } + console.log(a) + console.log(this.amountcartNumber) + console.log(flag) + console.log(item) if ( a == "+" ){ - if ( this.amountcartNumber <= 0) { - this.amountcartNumber = this.amountcartNumber + item.suit; + if ( this.amountcartNumber <= 0 && flag) { + this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit); }else { this.amountcartNumber++; } @@ -529,8 +542,8 @@ if ( this.amountcartNumber > 0 ) { console.log(item) - if ( this.amountcartNumber <= item.suit) { - this.amountcartNumber = this.amountcartNumber - item.suit + if ( this.amountcartNumber <= item.suit && flag) { + this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit); } else { this.amountcartNumber = this.amountcartNumber - 1; } @@ -1411,18 +1424,17 @@ .btn { width: 160rpx; height: 64rpx; - background: #FEFAF7; + background: #E7AE7B; border-radius: 36rpx 36rpx 36rpx 36rpx; border: 2rpx solid #E8AD7B; display: flex; align-items: center; - justify-content: flex-end; + justify-content: center; .t { font-weight: bold; font-size: 28rpx; - color: #E8AD7B; - margin-right: 26rpx; + color: #FFFFFF; } } } @@ -1616,6 +1628,9 @@ font-weight: 400; font-size: 24rpx; color: #333333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; &+.item { margin-top: 1px; @@ -1776,6 +1791,13 @@ color: #999999; margin-bottom: 8rpx; } + .describe,.name{ + width: 270rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .lookBack { color: #FF534B; From 3e49f319c21f0208853bc26fce982bc216859918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Sat, 3 Aug 2024 10:56:20 +0800 Subject: [PATCH 20/43] 11 --- pages/order_food/order_food.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 3fd8b7b..516d06c 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -4,7 +4,7 @@ - 加载中 + 加载中 From 0e3e975627ea93862f29547334f5896f44817e47 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 10:58:26 +0800 Subject: [PATCH 21/43] =?UTF-8?q?sku=E6=8E=A5=E5=8F=A3code=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_food/order_food.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 516d06c..4d88bed 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -733,6 +733,7 @@ async hodgepodge(item, a, c, num) { //此接口去获取商品id ！！！赋值库存 数量 价格等 try { let res = await this.api.productqueryProductSku({ + code: uni.cache.get('tableCode'), shopId: uni.cache.get('shopUser'), productId: item.id, //商品id spec_tag: this.skuidname.join(",") From f442a5a85c0d27e0eac0f98ccd38d88707c81e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Sat, 3 Aug 2024 11:18:26 +0800 Subject: [PATCH 22/43] 11 --- pages/order_food/order_food.vue | 68 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 516d06c..676b3e4 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -9,10 +9,7 @@ - - - @@ -356,22 +353,16 @@ } }, onPageScroll(e) { - try { - if (e.scrollTop <= 44) { //搜索导航栏显示影藏 - this.opacity = false - } else { - this.opacity = true - } - } catch (e) { - //TODO handle the exception + if (e.scrollTop <= 44) { //搜索导航栏显示影藏 + this.opacity = false + } else { + this.opacity = true } this.$u.debounce(() => { - console.log(e.scrollTop, this.scrollTopSize) if (e.scrollTop >= this.scrollTopSize) { //控制大图层 - // this.isFixed = false; - this.$set(this, 'isFixed', false); + this.isFixed = false; } else { - this.$set(this, 'isFixed', true); + this.isFixed = true; } }, 10) @@ -526,9 +517,9 @@ */ shopAdd(item, index, index1, a, b) { let flag = true; - if ( this.cartLists.data.length > 0) { - this.cartLists.data.forEach((v,e)=>{ - if ( v.productId == item.id) { + if (this.cartLists.data.length > 0) { + this.cartLists.data.forEach((v, e) => { + if (v.productId == item.id) { flag = false; } console.log(v) @@ -538,18 +529,18 @@ console.log(this.amountcartNumber) console.log(flag) console.log(item) - if ( a == "+" ){ - if ( this.amountcartNumber <= 0 && flag) { - this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit); - }else { + if (a == "+") { + if (this.amountcartNumber <= 0 && flag) { + this.amountcartNumber = this.amountcartNumber + (item.suit == 0 ? 1 : item.suit); + } else { this.amountcartNumber++; } } else { if (this.amountcartNumber > 0) { console.log(item) - if ( this.amountcartNumber <= item.suit && flag) { - this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit); + if (this.amountcartNumber <= item.suit && flag) { + this.amountcartNumber = this.amountcartNumber - (item.suit == 0 ? 1 : item.suit); } else { this.amountcartNumber = this.amountcartNumber - 1; } @@ -878,7 +869,7 @@ /* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */ let last = res[res.length - 1].height; if (last - 20 < this.scrollHeight) { - this.fillHeight = this.scrollHeight - last + 20;//这是吸到顶部的距离 + this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离 // this.fillHeight = 200; } }); @@ -908,15 +899,18 @@ }, /* 左侧导航点击 */ leftTap(e) { - console.log(this.scrollTopSize + this.HeighT,11) + let HeighTdata = null + if (this.opacity) { + HeighTdata = this.HeighT + } else { + HeighTdata = this.HeighT * 2 + } + console.log(this.scrollTopSize + HeighTdata, 11) try { - if (this.isFixed) { - uni.pageScrollTo({ - scrollTop: this.scrollTopSize + this.HeighT, //滑动需要的距离 nav+列表距离的高度 - duration: 100 - }); - this.isFixed = false - } + uni.pageScrollTo({ + scrollTop: this.scrollTopSize + HeighTdata, //滑动需要的距离 nav+列表距离的高度 + duration: 0 + }); } catch (e) { //TODO handle the exception } @@ -1819,13 +1813,15 @@ color: #999999; margin-bottom: 8rpx; } - .describe,.name{ + + .describe, + .name { width: 270rpx; overflow: hidden; text-overflow: ellipsis; - white-space: nowrap; + white-space: nowrap; } - + .lookBack { color: #FF534B; From 520d791326c9644fd75b76edf27255bce3cca4bf Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 11:19:44 +0800 Subject: [PATCH 23/43] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/confirm_order.vue | 7 ---- pages/order_food/order_food.vue | 66 ++++++++++++++++----------------- 2 files changed, 31 insertions(+), 42 deletions(-) diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue index 8722fea..1ee7b04 100644 --- a/pages/order/confirm_order.vue +++ b/pages/order/confirm_order.vue @@ -104,14 +104,8 @@ 去充值 - - - - - - @@ -179,7 +173,6 @@ order: { phone: "", }, - passwordArr: [], cartLists: [], listinfo: { details: [], diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 4d88bed..1f0dbaa 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -350,6 +350,7 @@ socketTicket: null, amountcartNumber: 0, skuNumber: 0, + skuSuit: 0, salePrice: '', //钱数 cartListsdatashow: false, //是否显示购物车 showCart: false, @@ -526,20 +527,22 @@ */ shopAdd(item, index, index1, a, b) { let flag = true; - if ( this.cartLists.data.length > 0) { - this.cartLists.data.forEach((v,e)=>{ - if ( v.productId == item.id) { - flag = false; - } - console.log(v) - }) - } + // if ( this.cartLists.data.length > 0) { + // this.cartLists.data.forEach((v,e)=>{ + // if ( v.productId == item.id) { + // flag = false; + // } + // console.log(v) + // }) + // } console.log(a) console.log(this.amountcartNumber) + console.log(this.skuNumber) + console.log(this.skuSuit) console.log(flag) console.log(item) if ( a == "+" ){ - if ( this.amountcartNumber <= 0 && flag) { + if ( this.skuNumber < this.skuSuit) { this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit); }else { this.amountcartNumber++; @@ -548,7 +551,7 @@ if (this.amountcartNumber > 0) { console.log(item) - if ( this.amountcartNumber <= item.suit && flag) { + if ( this.skuNumber < this.skuSuit) { this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit); } else { this.amountcartNumber = this.amountcartNumber - 1; @@ -738,33 +741,26 @@ productId: item.id, //商品id spec_tag: this.skuidname.join(",") }) - if (res.data.stockNumber == 0) { - uni.showToast({ - title: '暂无库存', - icon: "none", - }) - } else { - this.skuidsearch = res.data.id // 储存skuid 用于筛选数量 - this.salePrice = res.data.salePrice // 价格 - let data = null; - if (a == 1) { //1添加购物车 2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格) - let params = { - "skuId": res.data.id, - "num": num, //数量 - "type": c == '+' ? 1 : 0, - "productId": item.id, //商品id - "shopId": uni.cache.get('shopUser'), - "userId": uni.cache.get('userInfo').id, - "tableId": uni.cache.get('tableCode'), - } - this.addCart(params); - } else { - this.skuId = res.data.id; - this.skuNumber = res.data.number; - this.showShopsku = true //打开弹框 + this.salePrice = res.data.salePrice // 价格 + let data = null; + if (a == 1) { //1添加购物车 2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格) + let params = { + "skuId": res.data.id, + "num": num, //数量 + "type": c == '+' ? 1 : 0, + "productId": item.id, //商品id + "shopId": uni.cache.get('shopUser'), + "userId": uni.cache.get('userInfo').id, + "tableId": uni.cache.get('tableCode'), } - this.$set(this, 'amountcartNumber', 0) + this.addCart(params); + } else { + this.skuId = res.data.id; + this.skuNumber = res.data.number; + this.skuSuit = res.data.suit; + this.showShopsku = true //打开弹框 } + this.$set(this, 'amountcartNumber', 0) } catch (e) {} }, From 5d99a4c373244d349bc4e3ad8ffa338f6545e5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Sat, 3 Aug 2024 11:31:43 +0800 Subject: [PATCH 24/43] 11 --- pages/order_food/order_food.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index f75947f..4213efb 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -359,7 +359,7 @@ this.opacity = true } this.$u.debounce(() => { - if (e.scrollTop >= this.scrollTopSize) { //控制大图层 + if (e.scrollTop + 20 >= this.scrollTopSize) { //控制大图层 this.isFixed = false; } else { this.isFixed = true; From 035c63ce2bfbc88eb331b06c75077b4e6edd9f73 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 11:36:43 +0800 Subject: [PATCH 25/43] =?UTF-8?q?=E5=A4=9A=E7=94=A8=E6=88=B7=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=94=A8=E6=88=B7=E6=94=AF=E4=BB=98=20=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=B4=AD=E7=89=A9=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_food/order_food.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index a6e1c1a..8b5103f 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -798,9 +798,11 @@ case 'sku': // sku 数量 查询这个商品的价格和数量 break; case 'order': - this.skuidname = [] - this.showCart = false - this.cartLists = msg + this.cartLists_count = 0; + this.skuidname = []; + this.cartListsdatashow = false; + this.showCart = false; + this.cartLists = msg; break; case 'addCart': //初始化add this.cartLists = msg From 29af36c446bf791ab36a6f03d85cee163190788c Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 11:39:20 +0800 Subject: [PATCH 26/43] =?UTF-8?q?=E5=A4=9A=E7=94=A8=E6=88=B7=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=20=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=20=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_food/order_food.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 8b5103f..d1bd258 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -803,6 +803,7 @@ this.cartListsdatashow = false; this.showCart = false; this.cartLists = msg; + this.productqueryProduct() //list 数据 break; case 'addCart': //初始化add this.cartLists = msg From 529a43903c73fe9083a0fd3f6fdba0e97d58220d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Sat, 3 Aug 2024 14:12:59 +0800 Subject: [PATCH 27/43] 11 --- pages/order_food/order_food copy.vue | 1899 ++++++++++++++++++++++++++ pages/order_food/order_food.vue | 47 +- 2 files changed, 1932 insertions(+), 14 deletions(-) create mode 100644 pages/order_food/order_food copy.vue diff --git a/pages/order_food/order_food copy.vue b/pages/order_food/order_food copy.vue new file mode 100644 index 0000000..9d2b37c --- /dev/null +++ b/pages/order_food/order_food copy.vue @@ -0,0 +1,1899 @@ + + + + \ No newline at end of file diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index ebce2cf..9d2b37c 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -93,7 +93,7 @@ :scroll-into-view="leftIntoView" :scroll-with-animation="false"> {{item.name}} + @click="leftTap(index)">{{item.name}} @@ -517,18 +517,18 @@ * @param {Object} b */ shopAdd(item, index, index1, a, b) { - if ( a == "+" ){ - if ( this.skuNumber < this.skuSuit) { - this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit); - }else { + if (a == "+") { + if (this.skuNumber < this.skuSuit) { + this.amountcartNumber = this.amountcartNumber + (item.suit == 0 ? 1 : item.suit); + } else { this.amountcartNumber++; } } else { if (this.amountcartNumber > 0) { console.log(item) - if ( this.skuNumber < this.skuSuit) { - this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit); + if (this.skuNumber < this.skuSuit) { + this.amountcartNumber = this.amountcartNumber - (item.suit == 0 ? 1 : item.suit); } else { this.amountcartNumber = this.amountcartNumber - 1; } @@ -851,7 +851,7 @@ /* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */ let last = res[res.length - 1].height; if (last - 20 < this.scrollHeight) { - this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离 + // this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离 // this.fillHeight = 200; } }); @@ -876,18 +876,37 @@ break; } } + const calculateDeltas = (arr) => { + return arr.map((item, index, array) => { + if (index === 0) { + // 第一个元素前无下标，返回当前元素后下标与第一个元素的差 + return array[index + 1] - item; + } else if (index === array.length - 1) { + // 最后一个元素后无下标，返回当前元素前下标与最后一个元素的差 + return item - array[index - 1]; + } else { + // 计算当前元素前后下标的差 + return array[index + 1] - item || item - array[index - 1]; + } + }); + }; + // 计算前后下标差 + const deltas = calculateDeltas(this.topArr); + console.log(deltas); this.leftIndex = (index < 0 ? 0 : index); } }, + + + /* 左侧导航点击 */ - leftTap(e) { + leftTap(index) { let HeighTdata = null if (this.opacity) { - HeighTdata = this.HeighT + HeighTdata = this.HeighT //一个导航栏高度 } else { - HeighTdata = this.HeighT * 2 + HeighTdata = this.HeighT * 2 //顶部的时候两个导航栏高度 } - console.log(this.scrollTopSize + HeighTdata, 11) try { uni.pageScrollTo({ scrollTop: this.scrollTopSize + HeighTdata, //滑动需要的距离 nav+列表距离的高度 @@ -897,9 +916,9 @@ //TODO handle the exception } setTimeout(() => { - let index = e.currentTarget.dataset.index; this.scrollInto = `item-${index}`; - }, 300) + this.leftIndex = (index < 0 ? 0 : index); + }, 100) } } } From 703f53c8ac53717264aab15769835322e8fd5386 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Sat, 3 Aug 2024 15:31:42 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/confirm_order.vue | 17 +- pages/order_food/order_food - 副本.vue | 731 ++++++++++++++----------- pages/order_food/order_food.vue | 16 +- 3 files changed, 417 insertions(+), 347 deletions(-) diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue index 1ee7b04..e455202 100644 --- a/pages/order/confirm_order.vue +++ b/pages/order/confirm_order.vue @@ -52,14 +52,14 @@ {{ listinfo.name }} - + - {{item.name}} - {{ item.skuName}} - X{{ item.totalNumber}} + {{item.name || item.productName || "" }} + {{ item.skuName || item.productSkuName || ""}} + X{{ item.totalNumber || item.num}} - ￥{{ item.totalAmount}} + ￥{{ item.totalAmount || item.priceAmount || 0}} + + + + 加载中 + - - - - + - - + {{ shopInfo.storeInfo.shopName }} @@ -32,9 +31,10 @@ 本店招牌菜 - + - + {{ item.name }} @@ -59,20 +59,22 @@ 「{{item.suit}}份起点」 - + 选规格 - {{item.cartNumber<99?item.cartNumber:'99+'}} + {{item.cartNumber<99?item.cartNumber:'99+'}} - - + + {{ item.cartNumber }} - + @@ -80,7 +82,7 @@ - + @@ -91,43 +93,54 @@ :scroll-into-view="leftIntoView" :scroll-with-animation="false"> {{item.name}} + @tap="leftTap">{{item.name}} + - - + + {{item.name}} - - - - TOP{{index1+1}} + + + + TOP{{index1+1}} + {{ item1.name }} 本店回头客第{{index1+1}}名 {{item1.shortTitle?item1.shortTitle:''}} 月售{{item1.stockNumber}} - ￥{{ item1.lowPrice }}/份「{{item1.suit}}份起点」 - + ￥{{ item1.lowPrice }}/份「{{item1.suit}}份起点」 + - + 选规格 - {{item1.cartNumber<99?item1.cartNumber:'99+'}} + {{item1.cartNumber<99?item1.cartNumber:'99+'}} - + - - + + {{ item1.cartNumber }} - + - + @@ -137,25 +150,19 @@ - - - + - {{cartLists_count<99?cartLists_count:'99+'}} - + ￥ {{cartLists.amount||'0.00'}} @@ -164,9 +171,10 @@ - + - + 已点 {{cartLists_count}} 份 @@ -184,7 +192,7 @@ {{ item.name }} {{ item.skuName }} - + ￥ @@ -192,7 +200,7 @@ - + {{ item.number }} @@ -206,10 +214,10 @@ - - + + - + @@ -222,7 +230,8 @@ 营业时间： - {{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }} + {{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }} 商家地址： @@ -240,23 +249,23 @@ {{ shopInfo.storeInfo.detail }} - + - - + - + {{specifications.name}} - 本店回头客第{{specifications.indexb+1}}名 + + 本店回头客第{{specifications.indexb+1}}名 {{specifications.shortTitle?specifications.shortTitle:''}} - + @@ -270,8 +279,8 @@ - - + + @@ -280,22 +289,24 @@ /杯 - + - + {{amountcartNumber}} - + {{skuidname.toString()}} - 添加到购物车 + + 添加到购物车 @@ -303,7 +314,7 @@