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 @@
{{ actCouponTypeEnum[state.actDetail.type] }}
-
+
{{ actCouponTypeEnum[state.actDetail.type] }}
{{ state.actDetail.name }}
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(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({
+ size="70%" @close="emit('close')">
{{ warnText }}
+
+
+
+
+
+
+
+