From 65b57875700bf42ebd17eafa01a265e5690ce271 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期四, 10 九月 2026 09:17:56 +0800
Subject: [PATCH] 又又更新
---
rencaika/pages/merchant/merchant.uvue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rencaika/pages/merchant/merchant.uvue b/rencaika/pages/merchant/merchant.uvue
index 424f00f..6886604 100644
--- a/rencaika/pages/merchant/merchant.uvue
+++ b/rencaika/pages/merchant/merchant.uvue
@@ -443,7 +443,7 @@
const session = getSession()
if (session != null && session.talentId != null) talentId.value = session.talentId as string
if (talentId.value == '' && apiEnvironment == 'development') talentId.value = '2'
- if (isParkingMerchant.value && talentId.value != '') {
+ if ((isFuelMerchant.value || isParkingMerchant.value) && talentId.value != '') {
getTalentCardProfile(talentId.value, (data: any) => {
const card = data != null ? data.card : null
talentCardId.value = card != null && card.id != null ? '' + card.id : ''
@@ -482,7 +482,7 @@
listLoading.value = true
listLoaded.value = false
listError.value = false
- getFuelMerchantDetail(merchantId.value, (data: any) => {
+ getFuelMerchantDetail(merchantId.value, talentCardId.value, (data: any) => {
merchantName.value = data != null && data.merchantName != null ? data.merchantName as string : ''
merchantAddress.value = data != null && data.address != null ? data.address as string : ''
merchantPhone.value = data != null && data.contactMobile != null ? data.contactMobile as string : ''
@@ -979,12 +979,12 @@
.rights-panel { margin: 16rpx 25rpx 0; padding: 28rpx 26rpx; border-radius: 15rpx; background-color: #FFFFFF; }
.rights-text { display: block; margin-top: 0; color: #777F8B; font-size: 27rpx; line-height: 43rpx; }
.store-panel { margin: 16rpx 25rpx 0; overflow: hidden; border-width: 2rpx; border-style: solid; border-color: #DCE7FA; border-radius: 16rpx; background-color: #FFFFFF; }
- .store-table-header { display: flex; min-height: 67rpx; background-color: #EEF4FF; flex-direction: row; align-items: center; }
- .store-head-name, .store-head-address { display: flex; height: 67rpx; box-sizing: border-box; padding: 0 13rpx; justify-content: flex-start; align-items: center; }
+ .store-table-header { display: flex; height: 67rpx; background-color: #EEF4FF; flex-direction: row; align-items: center; }
+ .store-head-name, .store-head-address { display: flex; height: 67rpx; position: relative; box-sizing: border-box; padding: 0; justify-content: flex-start; align-items: center; }
.store-head-name { width: 250rpx; }
.store-head-address { min-width: 0; flex: 1; }
.store-head-action { width: 72rpx; height: 67rpx; flex-shrink: 0; }
- .store-head-name text, .store-head-address text { width: 100%; color: #26374F; font-size: 23rpx; font-weight: 700; text-align: left; }
+ .store-head-name text, .store-head-address text { display: block; position: absolute; left: 13rpx; top: 0; right: 0; height: 67rpx; color: #26374F; font-size: 23rpx; font-weight: 700; line-height: 67rpx; text-align: left; }
.store-row { display: flex; min-height: 92rpx; border-top-width: 1rpx; border-top-style: solid; border-top-color: #E7ECF4; flex-direction: row; align-items: stretch; }
.store-name-cell { display: flex; width: 250rpx; min-height: 92rpx; box-sizing: border-box; border-right-width: 1rpx; border-right-style: solid; border-right-color: #E7ECF4; align-items: stretch; justify-content: flex-start; }
.store-address-cell { display: flex; min-width: 0; min-height: 92rpx; flex: 1; box-sizing: border-box; align-items: stretch; justify-content: flex-start; }
@@ -1008,7 +1008,7 @@
.medical-open-value { min-width: 0; flex: 1; margin-left: 14rpx; color: #FF7C2B; font-size: 26rpx; font-weight: 600; }
.medical-view-button { display: flex; width: 132rpx; height: 57rpx; border-radius: 29rpx; background-image: linear-gradient(90deg, #FF5733 0%, #FF8A20 100%); flex-shrink: 0; justify-content: center; align-items: center; }
.medical-view-button text { color: #FFFFFF; font-size: 27rpx; }
- .medical-usage-panel { min-height: 548rpx; margin: 16rpx 25rpx 0; box-sizing: border-box; padding: 31rpx 27rpx; border-radius: 15rpx; background-color: #EFF1F4; }
+ .medical-usage-panel { margin: 16rpx 25rpx 0; box-sizing: border-box; padding: 28rpx 26rpx; border-radius: 15rpx; background-color: #FFFFFF; }
.medical-usage-panel text { color: #777F8B; font-size: 27rpx; line-height: 43rpx; white-space: pre-wrap; }
.action-bar { display: flex; height: 150rpx; height: calc(150rpx + env(safe-area-inset-bottom)); box-sizing: border-box; padding: 20rpx 34rpx 2rpx; padding-bottom: calc(2rpx + env(safe-area-inset-bottom)); background-color: #FFFFFF; box-shadow: 0 -5rpx 15rpx rgba(0,0,0,.06); flex-direction: column; justify-content: flex-end; }
.talent-code-button { display: flex; width: 100%; height: 90rpx; flex-shrink: 0; border-radius: 46rpx; background-image: linear-gradient(90deg, #FF4D32 0%, #FF8A20 100%); flex-direction: row; justify-content: center; align-items: center; }
--
Gitblit v1.7.1