From af84ba0317c39c68c0312b27ea34f9ebf3489fd3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 25 Jul 2024 09:35:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(store):=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=AF=9B=E5=88=A9?=
 =?UTF-8?q?=E7=8E=87=E8=BE=93=E5=85=A5=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=AF=9B=E5=88=A9=E7=8E=87=E5=88=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/store/store_product/edit.vue  | 17 ++++++++++++-----
 src/views/store/store_product/index.vue |  6 ++++++
 src/views/user/indexList.vue            |  6 ++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/store/store_product/edit.vue b/src/views/store/store_product/edit.vue
index c7ab41047..3a522a65a 100644
--- a/src/views/store/store_product/edit.vue
+++ b/src/views/store/store_product/edit.vue
@@ -142,11 +142,18 @@
                         :readonly="false"
                     />
                 </el-form-item>
-                <!-- <el-form-item label="上浮比例" prop="rose">
-                <el-input v-model="formData.rose" type="number" class="w-[500px]" clearable placeholder="请输入上浮比例" :readonly="false" >
-                    <template #suffix>%</template>
-                </el-input>
-            </el-form-item> -->
+                <el-form-item label="毛利率" prop="rose">
+                    <el-input-number
+                        v-model="formData.rose"
+                        type="number"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入毛利率"
+                        :readonly="false"
+                    >
+                        <template #suffix>%</template>
+                    </el-input-number>
+                </el-form-item>
                 <el-form-item label="退货" prop="is_return">
                     <el-radio-group v-model="formData.is_return">
                         <el-radio :label="1">支持</el-radio>
diff --git a/src/views/store/store_product/index.vue b/src/views/store/store_product/index.vue
index ced359fce..4ca20f15c 100644
--- a/src/views/store/store_product/index.vue
+++ b/src/views/store/store_product/index.vue
@@ -117,6 +117,12 @@
                         min-width="100"
                         show-overflow-tooltip
                     />
+                    <el-table-column
+                        label="毛利率"
+                        prop="rose"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
                     <el-table-column
                         label="售卖库存"
                         prop="stock"
diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue
index 93387970a..31cba9427 100644
--- a/src/views/user/indexList.vue
+++ b/src/views/user/indexList.vue
@@ -64,11 +64,11 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="55" /> -->
                     <el-table-column label="ID" prop="id" min-width="55" />
-                    <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
+                    <!-- <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
                         <template #default="{ row }">
                             <el-avatar :src="row.avatar" />
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="真实姓名" prop="real_name" />
                     <el-table-column label="用户昵称" prop="nickname" min-width="100" />
                     <el-table-column label="用户账号" prop="account" min-width="100" />
@@ -81,6 +81,8 @@
                     </el-table-column>
                     <el-table-column label="注册渠道" prop="channel" /> -->
                     <el-table-column label="用户类型" prop="vip_name" />
+                    <el-table-column label="会员开通时间" prop="vip_time" />
+
                     <!-- <el-table-column label="用户标签" prop="label_name" /> -->
                     <el-table-column label="礼品券" prop="integral" />
                     <el-table-column label="返还金" prop="return_money">