From 772793e90386d667f81e2488737689e121def424 Mon Sep 17 00:00:00 2001
From: ninaSun <serena_online@163.com>
Date: Tue, 28 May 2024 18:00:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/member/member-level/memberLevel.vue |  1 +
 .../views/member/member-manage/memberEdit.vue | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/manager-admin/src/views/member/member-level/memberLevel.vue b/manager-admin/src/views/member/member-level/memberLevel.vue
index 02ca641..6ae9b28 100644
--- a/manager-admin/src/views/member/member-level/memberLevel.vue
+++ b/manager-admin/src/views/member/member-level/memberLevel.vue
@@ -137,6 +137,7 @@
       changeDefault(id) {
         API_Member.updateMembersLevelStatus(id).then(res => {
           this.$message.success('设置成功！')
+          this.getMembersLevelList()
         })
       },
 
diff --git a/manager-admin/src/views/member/member-manage/memberEdit.vue b/manager-admin/src/views/member/member-manage/memberEdit.vue
index 177957f..2f4789c 100644
--- a/manager-admin/src/views/member/member-manage/memberEdit.vue
+++ b/manager-admin/src/views/member/member-manage/memberEdit.vue
@@ -22,14 +22,8 @@
             <el-input v-model="editMemberForm.mobile" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="会员等级">
-            <el-select v-model="editMemberForm.level_id" placeholder="设置等级" @change="editMemberLevel">
-              <el-option
-                v-for="item in levelList"
-                :label="item.level_name"
-                :value="item.id"
-                :key="item.id"
-              />
-            </el-select>
+            <span class="level-text">{{editMemberForm.level_name || '-'}}</span>
+            <el-button type="success" plain @click="dialogVisible = true">修改等级</el-button>
           </el-form-item>
           <el-form-item label="生日">
             <el-date-picker
@@ -82,6 +76,25 @@
         <member-list-address :member-id="member_id"/>
       </el-tab-pane>
     </el-tabs>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <p>手动修改会员等级后，会员将不再参与成长升级，请谨慎操作</p>
+
+      <el-select v-model="levelId" placeholder="设置等级">
+        <el-option
+          v-for="item in levelList"
+          :label="item.level_name"
+          :value="item.id"
+          :key="item.id"
+        />
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="editMemberLevel">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -152,7 +165,9 @@
         },
         // 锁点状态
         lockStatus: false,
-        levelList: []
+        levelList: [],
+        levelId: '',
+        dialogVisible: false
       }
     },
     mounted() {
@@ -175,8 +190,9 @@
     },
     methods: {
       editMemberLevel(id) {
-        API_Member.editMemberLevel(this.member_id, id).then(response => {
+        API_Member.editMemberLevel(this.member_id, this.levelId).then(response => {
           this.$message.success('设置成功')
+          this.dialogVisible = false
         })
       },
       /** 获取等级列表 */
@@ -261,4 +277,9 @@
   .myNumber{
     width:160px;
   }
+  .level-text {
+    color: #666;
+    font-size: 14px;
+    margin-right: 10px;
+  }
 </style>
-- 
Gitee


From f7ef751b77f1bd94fdbab542e8440b0fa45609d8 Mon Sep 17 00:00:00 2001
From: ninaSun <serena_online@163.com>
Date: Tue, 28 May 2024 18:06:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/member/member-level/memberLevel.vue    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/manager-admin/src/views/member/member-level/memberLevel.vue b/manager-admin/src/views/member/member-level/memberLevel.vue
index 6ae9b28..ea48dab 100644
--- a/manager-admin/src/views/member/member-level/memberLevel.vue
+++ b/manager-admin/src/views/member/member-level/memberLevel.vue
@@ -13,16 +13,20 @@
       </div>
 
       <template slot="table-columns">
+        <el-table-column label="等级">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="level_name" label="等级名称"/>
         <el-table-column prop="level_icon" label="等级图标">
           <template slot-scope="scope" >
             <img v-if="scope.row.level_icon" class="level-icon" :src="scope.row.level_icon" alt="">
           </template>
         </el-table-column>
-        <el-table-column prop="allocation_ratio" label="分摊比例"/>
-        <el-table-column prop="description" label="说明">
-          <template slot-scope="scope">
-            <div v-html="scope.row.description"></div>
+        <el-table-column prop="allocation_ratio" label="店铺分摊比例">
+          <template slot-scope="scope" >
+            {{scope.row.allocation_ratio}} %
           </template>
         </el-table-column>
 
-- 
Gitee