’合并

git commit -m ’合并

src/api/form.js

@@ -68,6 +68,36 @@ export const common_api = {
   },
 }
 
+/**
+ * 用户模块
+ */
+ export const payAgentUser = {
+  // 更新密钥
+  upGoogleCaptcha: (data) => {
+    return request({
+      url: '/system/user/upGoogleCaptcha',
+      method: 'PUT',
+      data: data,
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+    })
+  },
+  // 获取用户谷歌密钥
+  getGoogleCaptcha: (query) => {
+    return request({
+      url: '/system/user/getGoogleCaptcha',
+      method: 'get',
+      params: query,
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+    })
+  },
+
+
+}
+
 
 /**
  * 商户模块

src/views/merchant/merchant/index.vue

@@ -34,12 +34,12 @@
           </el-row>
 
           <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5" style="margin-left:15px">
+            <el-col :span="1.5" style="margin-left:15px">
-          <el-button type="primary" plain icon="" size="medium" @click="handleAdd()">新增商户</el-button>
+              <el-button type="primary" plain icon="" size="medium" @click="handleAdd()">新增商户</el-button>
-        </el-col>
+            </el-col>
-      </el-row>
+          </el-row>
 
-      <!-- <el-row :gutter="10" class="mb8">
+          <!-- <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row> -->
 
@@ -48,7 +48,7 @@
     </el-form>
 
     <div class="searchTop flexBet">
-     
+
     </div>
 
 
@@ -175,9 +175,6 @@
       </div>
     </el-dialog>
 
-
-
-
     <!-- 重置ip -->
     <el-dialog title="" :visible.sync="openToIp" width="500px" append-to-body>
       <el-form ref="formIp" :model="form" :rules="rules" label-width="100px">
@@ -203,7 +200,6 @@
       </div>
     </el-dialog>
 
-
     <!-- 删除 -->
     <el-dialog title="删除商户" :visible.sync="openDelete" width="500px" append-to-body>
       <el-form ref="formDelete" :model="form" :rules="rules" label-width="100px">
@@ -270,18 +266,14 @@
           <el-input v-model="form.singleFee" placeholder="请输入单笔提款收取" style="width:300px" @input="change"
             :disabled="true" />
         </el-form-item> -->
-
         <el-form-item label="是否允许后台提现" prop="paymentManualStatus">
           <el-switch v-model="form.paymentManualStatus" active-text="是" inactive-text="否" :active-value=true
             :inactive-value=false></el-switch>
         </el-form-item>
-
         <el-form-item label="是否API代付" prop="paymentInterfaceStatus">
           <el-switch v-model="form.paymentInterfaceStatus" active-text="是" inactive-text="否" :active-value=true
             :inactive-value=false></el-switch>
         </el-form-item>
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('formWithdraw')">保 存</el-button>
@@ -289,8 +281,6 @@
       </div>
     </el-dialog>
 
-
-
     <!-- 风控 -->
     <el-dialog :title="title" :visible.sync="openControl" width="800px" append-to-body>
       <el-form ref="formControl" :model="form" :rules="rules" label-width="140px">
@@ -303,31 +293,25 @@
         <el-form-item label="代付IP" prop="payapiWhitelistIp">
           <el-input v-model="form.payapiWhitelistIp" placeholder="请输入代付IP" @input="change" />
         </el-form-item>
-
         <el-form-item label="是否允许后台提现" prop="paymentManualStatus">
           <el-switch v-model="form.paymentManualStatus" active-text="是" inactive-text="否" :active-value=true
             :inactive-value=false></el-switch>
         </el-form-item>
-
         <el-form-item label="是否API代付" prop="paymentInterfaceStatus">
           <el-switch v-model="form.paymentInterfaceStatus" active-text="是" inactive-text="否" :active-value=true
             :inactive-value=false></el-switch>
         </el-form-item>
-
         <el-form-item label="谷歌秘钥" prop="merchantNo">
           <span>{{ form.googleCaptcha }}</span>
           <el-button type="primary" @click="submitForm('googleKey')" style="margin-left: 10px">重 置</el-button>
         </el-form-item>
-
         <el-form-item label="密钥" prop="merchantNo">
           <span>{{ form.md5Key }}</span>
           <el-button type="primary" @click="submitForm('MD5')" style="margin-left: 10px">重 置</el-button>
         </el-form-item>
-
         <el-form-item label="谷歌验证码" prop="code">
           <el-input v-model="form.code" placeholder="请输入谷歌验证码" />
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('formControl')">保 存</el-button>
@@ -335,7 +319,6 @@
       </div>
     </el-dialog>
 
-
     <!-- 通道列表 -->
     <el-dialog v-dialogDrag title="通道" :visible.sync="pkCouponScopeRangeParkingStoreOpen" width="80%" append-to-body
       :close-on-click-modal="false">
@@ -831,7 +814,13 @@ export default {
                   this.getList();
                 });
               } else {
-                addMerchant(this.form).then((response) => {
+                addMerchant({
+                  email: this.form.email,
+                  phone: this.form.phone,
+                  securityDepositAmount: securityDepositAmount,
+                  username: this.form.username,
+                  password: this.form.password
+                }).then((response) => {
                   this.msgSuccess("新增成功");
                   this.open = false;
                   this.getList();

src/views/order/TransferOrder/daifuSonOrder.vue

@@ -142,6 +142,12 @@
 
                 <el-table-column label="码商" align="center" prop="carddealerName" />
 
+                <el-table-column :label="'付款人'" align="center" prop="payeeRealAmount" min-width="180">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}</span>
+                    </template>
+                </el-table-column>
+
                 <el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
                     <template slot-scope="scope">
                         <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}（{{

src/views/order/carddealerOrder/carddealerSonOrder.vue

@@ -116,9 +116,15 @@
                 <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
                 <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
                 <el-table-column label="码商" align="center" prop="carddealerName" />
+                <el-table-column :label="'付款人'" align="center" prop="payeeRealAmount" min-width="180">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
                     <template slot-scope="scope">
-                        {{ scope.row.accountName }}（{{ scope.row.bankName }}）（{{ scope.row.cardNumber }}）
+                        <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}（{{
+                            scope.row.payCarddealerCard.bankName }}）（{{ scope.row.payCarddealerCard.cardNumber }}）</span>
                     </template>
                 </el-table-column>
 

src/views/order/payOrder/csOrder.vue

@@ -119,6 +119,8 @@
         <el-table-column label="卡号" align="center" prop="carddealerCardNumber" />
         <el-table-column label="姓名" align="center" prop="carddealerCardHolder" />
         <el-table-column label="银行" align="center" prop="carddealerBankName" />
+        <el-table-column label="付款人姓名" align="center" prop="payerName" />
+
         <!-- <el-table-column label="支行" align="center" prop="carddealerCardOrganization" /> -->
         <el-table-column label="通道" align="center" prop="platformChannelName" />
         <el-table-column label="码商" align="center" prop="carddealerName" />
@@ -157,6 +159,9 @@
       <el-form label-width="142px" :label-suffix="':'">
         <div style="display: flex;justify-content: space-around;">
           <div class="card-detail">
+            <el-form-item label="付款人姓名">
+              {{ detailInfoList.payerName }}
+            </el-form-item>
             <el-form-item label="平台单号">
               {{ detailInfoList.orderNo }}
             </el-form-item>

src/views/order/payOrder/index.vue

@@ -102,10 +102,11 @@
           </template>
         </el-table-column> -->
 
-        <!-- <el-table-column label="付款人" align="center" prop="payerName" /> -->
         <el-table-column label="卡号" align="center" prop="carddealerCardNumber" />
         <el-table-column label="姓名" align="center" prop="carddealerCardHolder" />
         <el-table-column label="银行" align="center" prop="carddealerBankName" />
+        <el-table-column label="付款人姓名" align="center" prop="payerName" />
+
         <!-- <el-table-column label="支行" align="center" prop="carddealerCardOrganization" /> -->
         <el-table-column label="通道" align="center" prop="platformChannelName" />
         <el-table-column label="码商" align="center" prop="carddealerName" />
@@ -145,6 +146,9 @@
       <el-form label-width="142px" :label-suffix="':'">
         <div style="display: flex;justify-content: space-around;">
           <div class="card-detail">
+            <el-form-item label="付款人姓名">
+              {{ detailInfoList.payerName }}
+            </el-form-item>
             <el-form-item label="平台单号">
               {{ detailInfoList.orderNo }}
             </el-form-item>

src/views/order/payOrder/wwc.vue

@@ -119,6 +119,7 @@
         <el-table-column label="卡号" align="center" prop="carddealerCardNumber" />
         <el-table-column label="姓名" align="center" prop="carddealerCardHolder" />
         <el-table-column label="银行" align="center" prop="carddealerBankName" />
+        <el-table-column label="付款人姓名" align="center" prop="payerName" />
         <!-- <el-table-column label="支行" align="center" prop="carddealerCardOrganization" /> -->
         <el-table-column label="通道" align="center" prop="platformChannelName" />
         <el-table-column label="码商" align="center" prop="carddealerName" />
@@ -156,6 +157,9 @@
       <el-form label-width="142px" :label-suffix="':'">
         <div style="display: flex;justify-content: space-around;">
           <div class="card-detail">
+            <el-form-item label="付款人姓名">
+              {{ detailInfoList.payerName }}
+            </el-form-item>
             <el-form-item label="平台单号">
               {{ detailInfoList.orderNo }}
             </el-form-item>