diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index 3ef64aa81..cb3a9e6f5 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/jsowell-ui/src/views/financial/merchant.vue
@@ -1,106 +1,36 @@
 <template>
     <div class="app-container">
-        <el-form
+        <!-- <el-form
             :model="queryParams"
             ref="queryForm"
             size="small"
             :inline="true"
-            label-width="168px"
-            @submit.native.prevent
+            label-width="110px"
         >
-            <el-form-item label="订单编号" prop="orderCode">
+            <el-form-item label="运营商名称" prop="merchantName">
                 <el-input
-                    v-model="queryParams.orderCode"
-                    placeholder="请输入订单编号"
+                    v-model="queryParams.merchantName"
+                    placeholder="请输入运营商名称"
                     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-form-item>
-            <div v-if="buttonBoolean">
-                <el-form-item label="订单编号" prop="orderCode">
-                    <el-input
-                        v-model="queryParams.orderCode"
-                        placeholder="请输入订单编号"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-
-                <el-form-item label="订单编号" prop="orderCode">
-                    <el-input
-                        v-model="queryParams.orderCode"
-                        placeholder="请输入订单编号"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-
-                <el-form-item label="订单编号" prop="orderCode">
-                    <el-input
-                        v-model="queryParams.orderCode"
-                        placeholder="请输入订单编号"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-            </div>
-            <el-button
-                @click="showOrHide()"
-                style="
-                    border-color: white;
-                    background-color: white;
-                    font-size: x-small;
-                    color: #50bfff;
-                    padding: 1px 2px;
-                    margin-left: 40%;
-                    margin-top: 0px;
-                    margin-bottom: 15px;
-                "
-                :icon="icon"
-            >{{ showOrHideText }}
-            </el-button>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+            <el-form-item>
                 <el-button
                     type="primary"
                     icon="el-icon-search"
                     size="mini"
                     @click="handleQuery"
-                >搜索
-                </el-button
+                    >搜索</el-button
                 >
-            </el-col>
-            <el-col :span="1.5">
                 <el-button
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
-                >重置
-                </el-button
+                    >重置</el-button
                 >
-            </el-col>
-            <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="['order:order:export']"
-            >导出
-            </el-button
-            >
-        </el-row>
+            </el-form-item>
+        </el-form> -->
         <el-table
             :data="merchantList"
             stripe
@@ -153,7 +83,7 @@
                 <template slot-scope="scope">
                     <!--  :to="'/merchant/detail/index/' + scope.row.id" -->
                     <router-link
-                        to="/financial/merchant/merchantVirtual"
+                        :to="'/financial/merchant/merchantVirtual/'+scope.row.id"
                         class="link-type"
                     >
                         <span>虚拟财务</span>
@@ -172,7 +102,7 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getFinancialMerchantList"
+            @pagination="getList"
         />
     </div>
 
@@ -207,27 +137,10 @@ export default {
                 servicePhone: null,
                 logoUrl: null,
             },
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
         };
     },
     created() {
-        this.getFinancialMerchantList();
+        this.getList();
     },
     methods: {
         showOrHide() {
@@ -242,11 +155,16 @@ export default {
             }
         },
         // 获取运营商列表
-        getFinancialMerchantList() {
-            getFinancialMerchantList().then((response) => {
-                console.log("response", response)
+        getList() {
+            const params = {
+                pageNum:1,
+                pageSize:2
+            }
+            getFinancialMerchantList(params).then((response) => {
+                // console.log("response", response)
                 this.merchantList = response.rows;
-                console.log("response.total", response.total)
+                console.log('this.merchantList',this.merchantList)
+                // console.log("response.total", response.total)
                 this.total = response.total;
             })
         },
@@ -255,18 +173,17 @@ export default {
             this.open = false;
             this.reset();
         },
-        /** 搜索按钮操作 */
+
+         /** 搜索按钮操作 */
         handleQuery() {
+            console.log('搜索事件');
             this.queryParams.pageNum = 1;
-            // 获取订单列表
-            // this.getList();
-            // 获取订单总金额
-            // this.getOrderTotalData();
+            this.getList();
         },
         /** 重置按钮操作 */
         resetQuery() {
             this.resetForm("queryForm");
-            // this.handleQuery();
+            this.handleQuery();
         },
         /** 导出按钮操作 */
         handleExport() {
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 1608f0ce4..ba1c38622 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -179,27 +179,62 @@
             <el-button  type="primary" v-if="adapayCorpMember.auditState != 'E'" @click="dialog=true">新建</el-button>
             </div>
             </div>
-            <div v-if="adapayCorpMember.auditState == 'E'">
-                <div>企业名称：{{adapayCorpMember.name}}</div>
-                <div class="margin-10">统一社会信用码：{{adapayCorpMember.socialCreditCode}}</div>
-                <div>统一社会信用证有效期：{{adapayCorpMember.socialCreditCodeExpires}}</div>
-                <div class="margin-10">法人姓名：{{adapayCorpMember.legalPerson}}</div>
-                <div>法人身份证号码：{{adapayCorpMember.legalCertId}}</div>
-                <div class="margin-10">法人身份证有效期：{{adapayCorpMember.legalCertIdExpires}}</div>
-                <div>法人手机号：{{adapayCorpMember.legalMp}}</div>
-                <div class="margin-10">企业地址：{{adapayCorpMember.address}}</div>
-                <div>邮编：{{adapayCorpMember.zipCode}}</div>
-                <div class="margin-10">企业电话：{{adapayCorpMember.telphone}}</div>
-                <div>企业邮箱：{{adapayCorpMember.email}}</div>
-                <div class="margin-10">银行代码：{{adapayCorpMember.bankCode}}</div>
-                <div>银行卡号：{{adapayCorpMember.cardNo}}</div>
-                <div class="margin-10">银行卡对应的户名：{{adapayCorpMember.cardName}}</div>
-                <div>银行账户开户银行所在省份编码：{{provCode(adapayCorpMember.provCode)}}/ {{areaCode(adapayCorpMember.areaCode)}}</div>
-                <div class="margin-10">经营范围：{{adapayCorpMember.businessScope}}</div>
-            </div>
-            <hr>
-            <div>
-                <el-button type="primary" v-if="adapayCorpMember.auditState == 'E'" @click="updateDialog=true">更改</el-button>
+            <div v-if="adapayCorpMember.auditState != 'E'">
+                <el-form :model="adapayCorpMember" class="adapayStyle" label-position="left" label-width="200px">
+                    <el-form-item label="企业名称：">
+                        <div class="color">{{adapayCorpMember.name}}</div>
+                    </el-form-item>
+                    <el-form-item label="统一社会信用码：">
+                        <div class="color">{{adapayCorpMember.socialCreditCode}}</div>
+                    </el-form-item>
+                    <el-form-item label="统一社会信用证有效期：">
+                        <div class="color">{{adapayCorpMember.socialCreditCodeExpires}}</div>
+                    </el-form-item>
+                    <el-form-item label="法人姓名：">
+                        <div class="color">{{adapayCorpMember.legalPerson}}</div>
+                    </el-form-item>
+                    <el-form-item label="法人身份证号码：">
+                        <div class="color">{{adapayCorpMember.legalCertId}}</div>
+                    </el-form-item>
+                    <el-form-item label="法人身份证有效期：">
+                        <div class="color">{{adapayCorpMember.legalCertIdExpires}}</div>
+                    </el-form-item>
+                    <el-form-item label="法人手机号：">
+                        <div class="color">{{adapayCorpMember.legalMp}}</div>
+                    </el-form-item>
+                    <el-form-item label="企业地址：">
+                        <div class="color">{{adapayCorpMember.address}}</div>
+                    </el-form-item>
+                    <el-form-item label="邮编：">
+                        <div class="color">{{adapayCorpMember.zipCode === ''? '一':adapayCorpMember.zipCode}}</div>
+                    </el-form-item>
+                    <el-form-item label="企业电话：">
+                        <div class="color">{{adapayCorpMember.telphone === ''? '一':adapayCorpMember.telphone}}</div>
+                    </el-form-item>
+                    <el-form-item label="企业邮箱：">
+                        <div class="color">{{adapayCorpMember.email === ''? '一':adapayCorpMember.telphone}}</div>
+                    </el-form-item>
+                    <el-form-item label="银行代码：">
+                        <div class="color">{{adapayCorpMember.bankCode === null? '一':adapayCorpMember.telphone}}</div>
+                    </el-form-item>
+                    <el-form-item label="银行卡号：">
+                        <div class="color">{{adapayCorpMember.cardNo === null? '一':adapayCorpMember.telphone}}</div>
+                    </el-form-item>
+                    <el-form-item label="银行卡对应的户名：">
+                        <div class="color">{{adapayCorpMember.cardName === null? '一':adapayCorpMember.telphone}}</div>
+                    </el-form-item>
+                    <el-form-item label="开户银行所在省份编码：">
+                        <div class="color">{{provCode(adapayCorpMember.provCode)}} / {{areaCode(adapayCorpMember.areaCode)}}</div>
+                    </el-form-item>
+                    <el-form-item label="经营范围：">
+                        <div class="color">{{adapayCorpMember.businessScope}}</div>
+                    </el-form-item>
+                </el-form>
+                <hr>
+                <div>
+                    企业信息有变更请点击修改按钮，进行修改企业信息
+                    <el-button type="primary" @click="updateDialog=true">修改</el-button>
+                </div>
             </div>
         </el-card>
         <el-dialog title="修改信息" :visible.sync="updateDialog" width="50%">
@@ -707,4 +742,17 @@ export default {
 .margin-10{
     margin: 10px 0;
 }
+.adapayStyle {
+    .el-form-item{
+        margin-bottom: 0;
+    }
+    .el-form-item__label{
+        color: gray;
+    }
+}
+
+.color{
+    color: #000;
+    font-weight: bolder;
+}
 </style>