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: '提示',