From 8d1ae66bc5b3296d58bf99a7b00594ef429cc887 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 28 Nov 2023 09:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=90=A5=E5=95=86vi?=
 =?UTF-8?q?p=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/member/merchantVIP/index.vue    | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue
index 9eae413b9..2bc0fb4b8 100644
--- a/jsowell-ui/src/views/member/merchantVIP/index.vue
+++ b/jsowell-ui/src/views/member/merchantVIP/index.vue
@@ -67,8 +67,8 @@
                 <template slot-scope="scope">
                     <!--          <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
                     <el-image style="height: 50px;width: 50px"
-                              :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
-                              :preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' />
+                        :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
+                        :preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' />
                 </template>
             </el-table-column>
             <el-table-column label="昵称" align="center" prop="nickName">
@@ -79,31 +79,15 @@
                 </template>
             </el-table-column>
             <el-table-column label="手机号" align="center" prop="mobileNumber" />
-            <el-table-column label="本金余额" align="center" prop="principalBalance"/>
+            <el-table-column label="本金余额" align="center" prop="principalBalance" />
             <el-table-column label="赠送余额" align="center" prop="giftBalance" />
             <el-table-column label="总余额" align="center" prop="totalAccountAmount" />
             <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <!--                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['member:info:edit']"
-                    >修改
-                    </el-button>-->
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateBalance(scope.row)"
                         v-hasPermi="['member:balance:update']">充值/扣款
                     </el-button>
-                    <!--                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['member:info:remove']"
-                    >删除
-                    </el-button>-->
                 </template>
             </el-table-column>
         </el-table>
@@ -130,11 +114,11 @@
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
                     <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0"
-                                    :controls="false" :precision="2"/>
+                        :controls="false" :precision="2" />
                 </el-form-item>
                 <el-form-item label="赠送金" prop="balance">
                     <el-input-number v-model="createMerchantVip.updateGiftBalance" placeholder="请输入赠送金" :min="0"
-                                     :controls="false" :precision="2"/>
+                        :controls="false" :precision="2" />
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -156,12 +140,12 @@
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
-                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0"
-                                     :controls="false" :precision="2"/>
+                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0" :controls="false"
+                        :precision="2" />
                 </el-form-item>
                 <el-form-item label="赠送金" prop="balance">
-                    <el-input-number v-model="updateGiftBalance" placeholder="请输入赠送金" :min="0"
-                                     :controls="false" :precision="2"/>
+                    <el-input-number v-model="updateGiftBalance" placeholder="请输入赠送金" :min="0" :controls="false"
+                        :precision="2" />
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -384,6 +368,7 @@ export default {
         },
         /* 开卡确定按钮 */
         submitCreateMerchantVip() {
+            this.createMerchantVip.targetMerchantId = this.selectedValue
             console.log("submitCreateMerchantVip", this.createMerchantVip);
             createMerchantVip(this.createMerchantVip).then(response => {
                 console.log("开卡确定按钮 response:", response);