From 6531cd29e4c400ce5fbdf71489f8140c1ee4612c Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Mon, 27 Nov 2023 14:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=90=A5=E5=95=86vi?=
 =?UTF-8?q?p=E4=B8=8B=E6=8B=89=E6=A1=86=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    | 132 ++++++------------
 1 file changed, 46 insertions(+), 86 deletions(-)

diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue
index 0dde4767d..a40424c27 100644
--- a/jsowell-ui/src/views/member/merchantVIP/index.vue
+++ b/jsowell-ui/src/views/member/merchantVIP/index.vue
@@ -1,24 +1,15 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
             <el-form-item label="会员ID" prop="memberId">
-                <el-input
-                    v-model="queryParams.memberId"
-                    placeholder="请输入会员ID"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.memberId" placeholder="请输入会员ID" clearable
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
 
             <el-form-item label="手机号" prop="mobileNumber">
-                <el-input
-                    v-model="queryParams.mobileNumber"
-                    placeholder="请输入手机号"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号" clearable
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
 
             <el-form-item>
@@ -29,17 +20,11 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['member:info:add']"
-              >开卡</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['member:info:add']">开卡</el-button>
             </el-col>
             <!--<el-col :span="1.5">
-              <el-button
+            <el-button
                 type="success"
                 plain
                 icon="el-icon-edit"
@@ -47,10 +32,10 @@
                 :disabled="single"
                 @click="handleUpdate"
                 v-hasPermi="['member:info:edit']"
-              >修改</el-button>
+            >修改</el-button>
             </el-col>-->
             <!--<el-col :span="1.5">
-              <el-button
+            <el-button
                 type="danger"
                 plain
                 icon="el-icon-delete"
@@ -74,23 +59,20 @@
         </el-row>
 
         <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center"/>
-            <el-table-column label="卡号" align="center" prop="walletCode"/>
-            <el-table-column label="运营商" align="center" prop="merchantName"/>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="卡号" align="center" prop="walletCode" />
+            <el-table-column label="运营商" align="center" prop="merchantName" />
             <!--<el-table-column label="" align="center" prop="id" />-->
-<!--            <el-table-column label="运营商" align="center" prop="merchantName"/>-->
-            <el-table-column label="会员id" align="center" prop="memberId"/>
+            <!--            <el-table-column label="运营商" align="center" prop="merchantName"/>-->
+            <el-table-column label="会员id" align="center" prop="memberId" />
             <el-table-column label="昵称" align="center" prop="nickName">
                 <template slot-scope="scope">
-                    <router-link
-                        :to="'/member/detail/index/'+scope.row.memberId"
-                        class="link-type"
-                    >
+                    <router-link :to="'/member/detail/index/' + scope.row.memberId" class="link-type">
                         <span>{{ scope.row.nickName }}</span>
                     </router-link>
                 </template>
             </el-table-column>
-<!--            <el-table-column label="状态" align="center" prop="status">
+            <!--            <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag
                         :options="dict.type.member_status"
@@ -103,18 +85,18 @@
                 <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="principalBalance"/>
-            <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="mobileNumber" />
+            <!--            <el-table-column label="本金余额" align="center" prop="principalBalance"/>-->
             <!--      <el-table-column label="赠送余额" align="center" prop="giftBalance" />-->
-            <el-table-column label="备注" align="center" prop="remark"/>
+            <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
+                    <!--                    <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
@@ -122,15 +104,10 @@
                         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 size="mini" type="text" icon="el-icon-edit" @click="handleUpdateBalance(scope.row)"
+                        v-hasPermi="['member:balance:update']">充值/扣款
                     </el-button>
-<!--                    <el-button
+                    <!--                    <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
@@ -142,40 +119,29 @@
             </el-table-column>
         </el-table>
 
-        <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
 
         <!-- 添加或修改会员基础信息对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="createMerchantVip" :rules="rules" label-width="100px">
                 <el-form-item label="选择运营商">
-                    <el-select
-                        v-model="createMerchantVip.targetMerchantId"
-                        clearable placeholder="请选择运营商"
-                    >
-                        <el-option
-                            v-for="item in merchantList"
-                            :key="item.merchantName"
-                            :label="item.merchantName"
+                    <el-select v-model="selectedValue" clearable placeholder="请选择运营商">
+                        <el-option v-for="item in merchantList" :key="item.merchantName" :label="item.merchantName"
                             :value="item.merchantId">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="手机号码">
-                    <el-input v-model="createMerchantVip.mobileNumber" placeholder="请输入手机号码"/>
+                    <el-input v-model="createMerchantVip.mobileNumber" placeholder="请输入手机号码" />
                 </el-form-item>
                 <el-form-item label="操作类型">
                     <el-radio v-model="createMerchantVip.type" label="1" border>充值</el-radio>
                     <el-radio v-model="createMerchantVip.type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
-                    <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0" :controls="false"
-                                     :precision="2"></el-input-number>
+                    <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0"
+                        :controls="false" :precision="2"></el-input-number>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -186,21 +152,11 @@
 
         <!-- 添加或修改会员余额对话框 -->
         <el-dialog title="会员充值/扣款" @close="closeUpdateBalance" :visible.sync="openUpdateBalance" width="500px"
-                   append-to-body>
+            append-to-body>
             <p>线下充值本金，客户直接在线下付款给商家</p>
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-form-item label="选择运营商">
-                    <el-select
-                        v-model="targetMerchantId"
-                        clearable placeholder="请选择运营商"
-                    >
-                        <el-option
-                            v-for="item in merchantList"
-                            :key="item.merchantName"
-                            :label="item.merchantName"
-                            :value="item.merchantId">
-                        </el-option>
-                    </el-select>
+                    <el-select v-model="forbid" clearable disabled placeholder="请选择运营商"></el-select>
                 </el-form-item>
                 <el-form-item label="操作类型">
                     <el-radio v-model="type" label="1" border>充值</el-radio>
@@ -208,7 +164,7 @@
                 </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>
+                        :precision="2"></el-input-number>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -235,7 +191,7 @@ export default {
     dicts: ['member_status'],
     data() {
         return {
-            defaultImg: [{img: require('../../../assets/images/headPort.png')}],
+            defaultImg: [{ img: require('../../../assets/images/headPort.png') }],
             // 遮罩层
             loading: true,
             // 选中数组
@@ -283,6 +239,8 @@ export default {
             createMerchantVip: {},
             // 充值/扣款
             updateMerchantVip: {},
+            forbid: '', //充值/扣款参数
+            selectedValue: null, // 设置默认选中第一条数据 
         };
     },
     computed: {
@@ -293,7 +251,6 @@ export default {
     },
     created() {
         this.getList();
-
         this.getMerchantList();
     },
     methods: {
@@ -316,9 +273,10 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            getMerchantList().then((response) =>{
-              console.log("response", response)
-              this.merchantList = response.obj;
+            getMerchantList().then((response) => {
+                console.log("response", response)
+                this.merchantList = response.obj;
+                this.selectedValue = this.merchantList[0].merchantId
             })
         },
         // 取消按钮
@@ -401,6 +359,8 @@ export default {
         },
         // 点击充值按钮
         handleUpdateBalance(row) {
+            console.log(row);
+            this.forbid = row.merchantName
             this.openUpdateBalance = true;
             this.updateBalanceMemberId = row.memberId;
         },