From 875e9117279d714d3c89cc047c78bc0193af17ca Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 3 Feb 2026 15:54:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/merchant/merchant-activity.vue |  3 ++-
 src/sheep/components/modify-user.vue     | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue
index 8907c12..826afa8 100644
--- a/src/pages/merchant/merchant-activity.vue
+++ b/src/pages/merchant/merchant-activity.vue
@@ -28,7 +28,8 @@
 					<view class="ribbon">{{ actCouponTypeEnum[state.actDetail.type] }}</view>
 				</view>
 			</view>
-			<view v-else class="card relative rounded-lb-0! rounded-rb-0! w-full activity-card overflow-hidden">
+			<view v-else-if="state.actType == 'COUPON_ACT'"
+				class="card relative rounded-lb-0! rounded-rb-0! w-full activity-card overflow-hidden">
 				<view class="ribbon">{{ actCouponTypeEnum[state.actDetail.type] }}</view>
 				<view class="px-8 pt-5 flex justify-between items-center font-bold">
 					<text class="text-32 c-#FF4F3F">{{ state.actDetail.name }}</text>
diff --git a/src/sheep/components/modify-user.vue b/src/sheep/components/modify-user.vue
index d657736..58a4641 100644
--- a/src/sheep/components/modify-user.vue
+++ b/src/sheep/components/modify-user.vue
@@ -19,6 +19,8 @@ const formRef = ref<any>(null)
 
 const showQrCodeDialog = ref(false)
 const form = reactive({
+    name: "",
+    phone: "",
     birthday: ""
 })
 
@@ -54,6 +56,8 @@ const doFormSubmit = async () => {
 const open = () => {
     const user = uni.getStorageSync(storageConstant.USERINFO)
     if (user && user.sysUser) {
+        form.name = user.sysUser.name
+        form.phone = user.sysUser.phone
         form.birthday = user.sysUser.birthday
     }
     showQrCodeDialog.value = true
@@ -66,13 +70,21 @@ defineExpose({
 
 <template>
     <tm-drawer z-index="100" v-model:show="showQrCodeDialog" title="编辑个人资料" :show-close="true" position="bottom"
-        size="50%" @close="emit('close')">
+        size="70%" @close="emit('close')">
         <view v-if="warnText" class="py-20rpx">
             <tm-alert status="warn" :showClose="false" :margin="[]">{{ warnText }}</tm-alert>
         </view>
         <view class="card p-x-30rpx p-y-40rpx">
             <view class="h-30rpx" />
             <tm-form ref="formRef" v-model="form" :rules="rules">
+                <tm-form-item name="name" label="姓名">
+                    <tm-input v-model="form.name" disabled>
+                    </tm-input>
+                </tm-form-item>
+                <tm-form-item name="phone" label="手机号">
+                    <tm-input v-model="form.phone" disabled>
+                    </tm-input>
+                </tm-form-item>
                 <tm-form-item name="birthday" label="出生日期" :show-bottom="false">
                     <tm-picker-date v-model="form.birthday" v-model:model-str="form.birthday" format="YYYY-MM-DD"
                         start="1950-1-1" end="2030-12-31">