’合并

git commit -m ’合并

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 开发环境
- VUE_APP_BASE_API = 'http://192.168.31.182:8088'
+ VUE_APP_BASE_API = 'http://kaka-admin.weirui0755.com/stage-api'
 
 # 后台本地
 # VUE_APP_BASE_API = 'http://192.168.31.182:8088'

src/views/carddealer/carddealer/index.vue

@@ -315,8 +315,8 @@
         <el-form-item label="每日收款额度" prop="limitReceive">
           <el-input v-model="form.limitReceive" placeholder="每日收款额度" @input="change" />
         </el-form-item>
-        <!-- <el-form-item label="保证金" prop="margin">
+        <!-- <el-form-item label="押金" prop="margin">
-          <el-input v-model="form.margin" placeholder="保证金" @input="change" />
+          <el-input v-model="form.margin" placeholder="押金" @input="change" />
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -611,7 +611,7 @@ export default {
           { required: true, message: "当天成功收款笔数不能为空", trigger: "blur" }
         ],
         margin: [
-          { required: true, message: "保证金不能为空", trigger: "blur" }
+          { required: true, message: "押金不能为空", trigger: "blur" }
         ]
       },
       ceshi: {},

src/views/configuration/daishouConfig.vue

@@ -75,7 +75,7 @@
                             style="width: 560px;border-color: #E6F1FF;">
                         </el-input>
                         <div style="font-size: 12px;color:rgb(187, 187, 187)">
-                            默认1小时，时间范围内的总订单量超过卡商保证金，停止出卡
+                            默认1小时，时间范围内的总订单量超过卡商押金，停止出卡
                         </div>
                     </el-form-item>
                     <el-form-item label="app超时时间（秒）" prop="appTimeout">

src/views/dashboard/PanelGroup.vue

@@ -155,7 +155,7 @@
         <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
           <div class="card-panel" @click="handleSetLineChartData('messages')">
             <div class="card-panel-description">
-              <div class="card-panel-text">保证金告警</div>
+              <div class="card-panel-text">押金告警</div>
               <div class="card-panel-num">{{ data.marginStatus }}</div>
 
             </div>
@@ -422,7 +422,7 @@
         <img src="../../assets/images/8.png" alt="" srcset="" class="imgicon">
         <div class="titcon">
           <div class="t1">
-            保证金告警
+            押金告警
           </div>
           <div class="t2">
             {{ data.marginStatus }}

src/views/merchant/merchant/index.vue

@@ -57,7 +57,7 @@
         <el-table-column label="商户名称" align="center" prop="username" />
         <el-table-column label="商户ID" align="center" prop="merchantNo" />
 
-        <el-table-column :label="'保证金'" align="center" prop="securityDepositAmount">
+        <el-table-column :label="'押金'" align="center" prop="securityDepositAmount">
           <template slot-scope="scope">
             {{ parseFloat(NumberDiv(scope.row.securityDepositAmount, 100)).toFixed(2) }}
           </template>
@@ -136,8 +136,8 @@
         <el-form-item label="邮箱" prop="email">
           <el-input v-model="form.email" placeholder="请输入邮箱" />
         </el-form-item>
-        <el-form-item label="保证金" prop="securityDepositAmount">
+        <el-form-item label="押金" prop="securityDepositAmount">
-          <el-input v-model="form.securityDepositAmount" placeholder="请输入保证金" />
+          <el-input v-model="form.securityDepositAmount" placeholder="请输入押金" />
         </el-form-item>
         <el-form-item label="登录密码" prop="password" v-if="!form.id">
           <el-input type="password" v-model="form.password" placeholder="请输入登录密码" />
@@ -294,7 +294,7 @@
     <!-- 风控 -->
     <el-dialog :title="title" :visible.sync="openControl" width="800px" append-to-body>
       <el-form ref="formControl" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="IP" prop="ipWhiteList">
+        <el-form-item label="登录IP" prop="ipWhiteList">
           <el-input v-model="form.ipWhiteList" placeholder="请输入IP" @input="change" />
         </el-form-item>
         <el-form-item label="代收IP" prop="paymentWhitelistIp">
@@ -479,7 +479,7 @@ export default {
           { required: true, message: "商户名不能为空", trigger: "blur" },
         ],
         securityDepositAmount: [
-          { required: true, message: "保证金不能为空", trigger: "blur" },
+          { required: true, message: "押金不能为空", trigger: "blur" },
         ],
         password: [
           { required: true, message: "密码不能为空", trigger: "blur" },

src/views/platform/platformWaterDetail/index.vue

@@ -106,8 +106,8 @@
               scope.row.opType == 2 ? '减余额' :
                 scope.row.opType == 3 ? '加冻结金额' :
                   scope.row.opType == 4 ? '减冻结金额' :
-                    scope.row.opType == 5 ? '加保证金' :
+                    scope.row.opType == 5 ? '加押金' :
-                      '减少保证金'
+                      '减少押金'
             }}
           </template>
         </el-table-column>
@@ -203,12 +203,12 @@ export default {
         },
         {
 
-          label: '加保证金',
+          label: '加押金',
           value: 5
         },
         {
 
-          label: '减少保证金',
+          label: '减少押金',
           value: 6
         },
       ],

src/views/staticsRecord/cardTimeStatistics.vue

@@ -51,7 +51,14 @@
                         {{ parseFloat(NumberDiv(scope.row.paySuccessAmount, 100)).toFixed(2) }}
                     </template>
                 </el-table-column>
-                <el-table-column label="代收成功率" align="center" prop="paySuccessRate" />
+                <!-- <el-table-column label="代收成功率" align="center" prop="paySuccessRate" /> -->
+
+                <el-table-column :label="'代收成功率'" align="center" prop="paySuccessRate">
+                    <template slot-scope="scope">
+                        {{ scope.row.paySuccessRate }} %
+                    </template>
+                </el-table-column>
+
                 <el-table-column :label="'代收佣金'" align="center" prop="payCommissionAmount">
                     <template slot-scope="scope">
                         {{ parseFloat(NumberDiv(scope.row.payCommissionAmount, 100)).toFixed(2) }}