From 6a1f4f66ac70ade7030645a2f74dd4937e582a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=96=B5=E5=92=AA?= <15233722133@163.com> Date: Tue, 11 Aug 2026 14:00:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=BA=97=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E4=BB=8E=E3=80=8C=E5=81=9C?= =?UTF-8?q?=E7=94=A8/=E5=90=AF=E7=94=A8=E3=80=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E3=80=8C=E4=BC=91=E6=81=AF/=E8=90=A5=E4=B8=9A=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 4 ++++ pages/merchant/pickupList.vue | 8 ++++---- pages/merchant/storeManage.vue | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 8e451de..c4f13eb 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -296,6 +296,10 @@ const next = uni.getStorageSync(HOME_DEFAULT_TAB_STORAGE_KEY); defaultTabName.value = next ? String(next) : ''; if (next) uni.removeStorageSync(HOME_DEFAULT_TAB_STORAGE_KEY); + const userStore = sheep.$store('user'); + if (userStore?.isLogin) { + userStore.getInfo(); + } }); //跳转浏览器 const openExternal = (url) => { diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue index 1093cbf..c454aa4 100644 --- a/pages/merchant/pickupList.vue +++ b/pages/merchant/pickupList.vue @@ -628,11 +628,11 @@ flex-direction: column; align-items: center; justify-content: center; - gap: 6rpx; - min-width: 80rpx; - padding: 14rpx 24rpx; + gap: 2rpx; + min-width: 60rpx; + padding: 10rpx 20rpx; border-radius: 16rpx; - background: #f6f7fb; + background: #f1f2f5; box-sizing: border-box; } diff --git a/pages/merchant/storeManage.vue b/pages/merchant/storeManage.vue index a552fa8..5f45aba 100644 --- a/pages/merchant/storeManage.vue +++ b/pages/merchant/storeManage.vue @@ -97,7 +97,7 @@ v-if="row.toggleActionText" class="op" :class="[ - row.toggleActionText === '停用' ? 'opDanger' : 'opSuccess', + row.toggleActionText === '休息' ? 'opDanger' : 'opSuccess', { opDisabled: updatingStoreId === row.id }, ]" @tap="toggle(row)" @@ -234,7 +234,7 @@ const normalizeRow = (store) => { const status = getStoreStatus(store); const statusConfig = statusMap[status] || { text: '--', className: '' }; - const toggleActionText = status === 1 ? '停用' : status === 2 || status === 3 ? '启用' : ''; + const toggleActionText = status === 1 ? '休息' : status === 2 || status === 3 ? '营业' : ''; const progressInfo = getStoreProgressInfo(store); return { id: Number(store?.id || 0), @@ -336,7 +336,7 @@ const toggle = (row) => { const storeId = Number(row?.id || 0); const nextStatus = row?.status === 1 ? 2 : row?.status === 2 || row?.status === 3 ? 1 : 0; - const actionText = nextStatus === 1 ? '启用' : '停用'; + const actionText = nextStatus === 1 ? '营业' : '休息'; if (!(storeId > 0) || !(nextStatus === 1 || nextStatus === 2) || updatingStoreId.value === storeId) return; uni.showModal({ title: '提示',