From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期五, 22 八月 2025 11:13:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- small-program/pages/index/index.vue | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue index ed7f456..5b2c779 100644 --- a/small-program/pages/index/index.vue +++ b/small-program/pages/index/index.vue @@ -447,6 +447,16 @@ this.form.estimatedAccount = '' this.form.price = '' this.form.address = '' + this.orderFood = [] + }) + // 鍒锋柊棣栭〉鏁版嵁 + uni.$on('refresh', () => { + this.getCategoryLists() + this.getDictInfo() + + if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') { + this.form.linkPhone = this.userInfo.telephone + } }) }, onShow(options) { @@ -520,7 +530,9 @@ } }, onReachBottom() { - this.getOrderList() + if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) { + this.getOrderList() + } }, methods: { getDictInfo(){ @@ -1254,12 +1266,16 @@ padding: 30rpx 0; box-sizing: border-box; flex-direction: column; - border-bottom: 1rpx solid #E5E5E5; + // border-bottom: 1rpx solid #E5E5E5; .radio-item { width: 100%; display: flex; align-items: self-end; margin-bottom: 30rpx; + border-bottom: 1rpx solid #E5E5E5; + &:last-child { + border: none; + } &:last-child { margin: 0 !important; } @@ -1312,6 +1328,7 @@ align-items: center; justify-content: flex-end; margin-top: 42rpx; + margin-bottom: 34rpx; text { font-weight: 400; font-size: 30rpx; -- Gitblit v1.9.3