Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/financial/components/virtualFinance.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
+    <!-- <el-row :gutter="10">
         <el-col :span="24">
     <div class="public">
       <div class="bgc headTitle">虚拟充值用户充电收入</div>
@@ -15,8 +15,8 @@
       </div>
     </div>
   </el-col>
-        <!-- 右侧充电收入汇总 -->
-        <!-- <el-col :span="12">
+       
+        <el-col :span="12">
     <div class="public">
       <div class="bgc1 headTitle">充电收入汇总</div>
        <div class="headBox">
@@ -28,8 +28,8 @@
          </div>
       </div>
     </div>
-        </el-col> -->
-    </el-row>
+        </el-col>
+    </el-row> -->
    <div class="search">
       <el-form :inline="true" :model="queryParams" class="demo-form-inline">
          <el-form-item label="日期" prop="tradeDate">

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -114,7 +114,7 @@
                             <div slot="tip" class="el-upload__tip">上传法人身份证正面照，法人身份证反面照，开户银行许可证</div>
                         </el-upload>
                     </el-form-item>
-                    <el-form-item label="银行代码" prop="bankCode">
+                    <el-form-item label="银行类型" prop="bankCode">
                          <el-select v-model="dialogForm.bankCode" filterable placeholder="请选择">
     <el-option
       v-for="item in cityList"
@@ -221,7 +221,7 @@
                     <el-form-item label="企业邮箱：">
                         <div class="color">{{adapayCorpMember.email === ''? '一':adapayCorpMember.telphone}}</div>
                     </el-form-item>
-                    <el-form-item label="银行代码：">
+                    <el-form-item label="银行类型：">
                         <div class="color">{{adapayCorpMember.bankCode === null? '一':adapayCorpMember.telphone}}</div>
                     </el-form-item>
                     <el-form-item label="银行卡号：">
@@ -496,7 +496,7 @@ export default {
                 bankCode: [
                     {
                         required: true,
-                        message: "请填写银行编码",
+                        message: "请填写银行类型",
                         trigger: "blur",
                     }
                 ],