From f75140e13568b7a70232e88876fd8c9404feadaa Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 2 Mar 2025 23:08:12 +0800
Subject: [PATCH] sc

---
 src/views/XjApplet/Resell/index.vue                |  2 +-
 src/views/XjApplet/Vip/components/UserDiscount.vue |  2 +-
 src/views/XjApplet/Vip/components/VipDiscount.vue  | 12 +++++++++---
 src/views/XjApplet/Vip/components/VipType.vue      |  2 +-
 src/views/XjApplet/Vip/components/VipUser.vue      |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index 51510b7..d156105 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" label-width="0" inline>
+    <el-form :model="searchForm" label-width="0" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="请输入手机号" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index 1ff621e..6a544a7 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 016a7d1..9741dc5 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -63,7 +63,10 @@
               :key="item.memberId"
               :label="item.memberName"
               :value="item.memberId"
-            />
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="变量2" prop="param2">
@@ -73,7 +76,10 @@
               :key="item.memberId"
               :label="item.memberName"
               :value="item.memberId"
-            />
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="折扣价" prop="discount">
@@ -151,7 +157,7 @@ const unitOptions = [
 const discountDesc = computed(() => {
   const vipTypeObj = {}
   vipTypeOptions.value.forEach((item) => {
-    vipTypeObj[item.memberId] = item.memberName
+    vipTypeObj[item.memberId] = `${item.memberName}(${item.carName})`
   })
   const { discountType, subject, param1, param2, discount, duration, unit } = form.value
   let baseStr = discountTypeOptions.find((item) => item.value == discountType).label
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index e1e09fd..3372a2b 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.memberName" placeholder="会员名称" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index b0c84f4..c85d6d7 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>