From c46c3776a5c86300718b08088a94e43f1869c517 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 1 Sep 2021 17:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |  10 +-
 src/assets/css/sidebar.css                    |  52 ++++++-
 .../common/dialog/DataReview/IDCard.vue       |  23 +++-
 .../common/dialog/DataReview/application.vue  |  18 ++-
 .../common/dialog/DataReview/assets.vue       |  21 ++-
 .../common/dialog/DataReview/assetsInfo.vue   |  58 ++++++++
 .../common/dialog/DataReview/bankProve.vue    |  90 ++++++++++++
 .../common/dialog/DataReview/basics.vue       |   5 +
 .../common/dialog/DataReview/businessInfo.vue |  20 +++
 .../common/dialog/DataReview/certificate.vue  |  90 ++++++++++++
 .../common/dialog/DataReview/dataNumber.vue   |  35 +++++
 .../common/dialog/DataReview/elseFile.vue     | 130 ++++++++++++++++++
 .../common/dialog/DataReview/entrust.vue      |  90 ++++++++++++
 .../common/dialog/DataReview/license.vue      |  70 +++++++++-
 .../dialog/DataReview/operatorIDCard.vue      | 100 ++++++++++++++
 .../common/dialog/DataReview/promise.vue      |  90 ++++++++++++
 src/components/common/dialog/content.vue      |  20 ++-
 src/components/common/dialog/insex.vue        |  22 ++-
 .../AccountManagement/blacklistManagement.vue |   8 +-
 .../page/AccountManagement/platformSelect.vue |  23 ++--
 .../transactionQuery.vue                      |  10 +-
 21 files changed, 951 insertions(+), 34 deletions(-)
 create mode 100644 src/components/common/dialog/DataReview/assetsInfo.vue
 create mode 100644 src/components/common/dialog/DataReview/bankProve.vue
 create mode 100644 src/components/common/dialog/DataReview/certificate.vue
 create mode 100644 src/components/common/dialog/DataReview/dataNumber.vue
 create mode 100644 src/components/common/dialog/DataReview/elseFile.vue
 create mode 100644 src/components/common/dialog/DataReview/entrust.vue
 create mode 100644 src/components/common/dialog/DataReview/operatorIDCard.vue
 create mode 100644 src/components/common/dialog/DataReview/promise.vue

diff --git a/src/api/index.js b/src/api/index.js
index 48128cc..f4e2d1b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -4,7 +4,7 @@ import request from '../utils/request';
 // 平台账号列表查询
 export const platformAccountList = query => {
     return request({
-        url: 'api/admin.Task/platform_account_list',
+        url: 'api/admin.Account/platform_account_list',
         method: 'get',
         params: query
     });
@@ -20,7 +20,7 @@ export const operationRecord = query => {
 // 查询账号黑名单
 export const getBlack = query => {
     return request({
-        url: 'api/admin.Task/getBlack',
+        url: 'api/admin.Account/getBlack',
         method: 'get',
         params: query
     });
@@ -44,7 +44,7 @@ export const getAccountData = query => {
 // 修改黑名单
 export const updateBlackList = query => {
     return request({
-        url: 'api/admin.Task/updateBlackList',
+        url: 'api/admin.Account/updateBlackList',
         method: 'post',
         data: query
     });
@@ -63,7 +63,7 @@ export const accountCheck = query => {
 // 审核列表
 export const applyList = query => {
     return request({
-        url: 'api/admin.Task/applyList',
+        url: 'api/admin.Account/applyList',
         method: 'get',
         params: query
     });
@@ -129,7 +129,7 @@ export const sendList = query => {
 //交易订单查询列表
 export const orderList = query => {
     return request({
-        url: 'api/admin.Task/orderList',
+        url: 'api/admin.Order/list',
         method: 'get',
         params: query
     });
diff --git a/src/assets/css/sidebar.css b/src/assets/css/sidebar.css
index 0897e39..934b5fa 100644
--- a/src/assets/css/sidebar.css
+++ b/src/assets/css/sidebar.css
@@ -1,6 +1,7 @@
 .body1{
   margin-left: 20px;
-  width: 950px;
+  width: 1050px;
+  height: 500px;
 }
 .body2{
   display: flex;
@@ -33,6 +34,16 @@
   margin-bottom: 15px;
   text-decoration: underline;
 }
+.span_blue{
+  font-size: 14px;
+  color: #4E73E4;
+  cursor: pointer;
+  text-decoration: underline;
+}
+.span_left{
+  display: inline-block;
+  margin-left: 15px;
+}
 .upload_span{
   color: #4E73E4;
   text-decoration: underline;
@@ -71,7 +82,44 @@
   color: #555555;
   margin-top: 10px;
 }
-
+.else_file{
+  display: flex;
+}
+.else_file_right{
+  margin-left: 50px;
+  height: 400px;
+  width: 350px;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.else_files{
+  display: flex;
+  width: 300px;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+}
+.else_files .img_span{
+  margin-top: 0;
+}
+.dataNumber{
+  display: flex;
+  align-items: center;
+}
+.dataNumber_input{
+  width: 160px;
+  margin-left: 15px;
+}
+.dataNumber_input1{
+  width: 30px;
+  margin-left: 15px;
+}
+.dataNumber_input1 .el-input__inner{
+  padding-left: 10px;
+}
+.margin_right{
+  margin-right: 15px;
+}
 
 
 
diff --git a/src/components/common/dialog/DataReview/IDCard.vue b/src/components/common/dialog/DataReview/IDCard.vue
index d2577df..4b2dba9 100644
--- a/src/components/common/dialog/DataReview/IDCard.vue
+++ b/src/components/common/dialog/DataReview/IDCard.vue
@@ -4,7 +4,7 @@
       <p class="title">{{contentDatas.account_type==1?'法人身份证正面(照片面)' :'身份证正面(照片面)'}}</p>
       <img :src="contentDatas.account_type==2 ? contentDatas.user_card_front :contentDatas.legal_card"  class="file_img1">
       <div class="img_span">
-        <span>查看原图</span>
+        <span @click="onPreview(contentDatas.account_type==2 ? [contentDatas.user_card_backfacade] :[contentDatas.legal_card])">查看原图</span>
         <el-upload
           class="upload-demo"
           :action="action"
@@ -22,10 +22,16 @@
       <p class="title">{{contentDatas.account_type==1?'法人身份证反面(发证机构面)' :'身份证反面(发证机构面)'}}</p>
       <img :src="contentDatas.account_type==2 ? contentDatas.user_card_backfacade :contentDatas.legal_card"  class="file_img1">
       <div class="img_span">
-        <span>查看原图</span>
+        <span @click="onPreview(contentDatas.account_type==2 ? [contentDatas.user_card_backfacade] :[contentDatas.legal_card])">查看原图</span>
         <span>重新上传</span>
       </div>
     </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
   </div>
 </template>
 <script>
@@ -36,13 +42,26 @@ export default {
       require: true
     }
   },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
   data() {
     return{
       host:'http://wenhua.xingtongworld.com',
       action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer : false,
+      img_url:[]
     }
   },
   methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
     handleAvatarError(){
       this.$message.error('文件上传失败！');
     },
diff --git a/src/components/common/dialog/DataReview/application.vue b/src/components/common/dialog/DataReview/application.vue
index a679d8f..5780b9f 100644
--- a/src/components/common/dialog/DataReview/application.vue
+++ b/src/components/common/dialog/DataReview/application.vue
@@ -3,7 +3,7 @@
     <p class="title">数字证书申请表</p>
     <img :src="contentDatas.number_certificate"  class="file_img">
     <div class="img_span">
-      <span>查看原图</span>
+      <span @click="onPreview([contentDatas.number_certificate])">查看原图</span>
       <el-upload
         class="upload-demo"
         :action="action"
@@ -16,6 +16,12 @@
         <span class="upload_span">重新上传</span>
       </el-upload>
     </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
   </div>
 </template>
 <script>
@@ -30,9 +36,19 @@ export default {
     return{
       host:'http://wenhua.xingtongworld.com',
       action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
     }
   },
   methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
     handleAvatarError(){
       this.$message.error('文件上传失败！');
     },
diff --git a/src/components/common/dialog/DataReview/assets.vue b/src/components/common/dialog/DataReview/assets.vue
index f169f21..f0c7f5c 100644
--- a/src/components/common/dialog/DataReview/assets.vue
+++ b/src/components/common/dialog/DataReview/assets.vue
@@ -3,7 +3,7 @@
     <p class="title">营业执照（复印件）</p>
     <img :src="contentDatas.asset_certificate"  class="file_img">
     <div class="img_span">
-      <span>查看原图</span>
+      <span @click="onPreview([contentDatas.asset_certificate])">查看原图</span>
       <el-upload
         class="upload-demo"
         :action="action"
@@ -16,6 +16,12 @@
         <span class="upload_span">重新上传</span>
       </el-upload>
     </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
   </div>
 </template>
 <script>
@@ -26,13 +32,26 @@ export default {
       require: true
     }
   },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
   data() {
     return{
       host:'http://wenhua.xingtongworld.com',
       action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
     }
   },
   methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
     handleAvatarError(){
       this.$message.error('文件上传失败！');
     },
diff --git a/src/components/common/dialog/DataReview/assetsInfo.vue b/src/components/common/dialog/DataReview/assetsInfo.vue
new file mode 100644
index 0000000..0a429c4
--- /dev/null
+++ b/src/components/common/dialog/DataReview/assetsInfo.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="body1">
+    <p class="title">资产概况</p>
+    <div class="img_span1">
+      <span v-for="(item,index) in img_data " :key="index"  @click="onPreview(item.url)">{{item.name}}（{{item.url.length}}）</span>
+      <el-image-viewer
+        v-if="showViewer"
+        :on-close="closeViewer"
+        :url-list="img_url"
+        :z-index="9999"
+      />
+    </div>
+    <p class="p_info">资产名称：{{contentDatas.asset_data.serial_name}}</p>
+    <p class="p_info">资产类型：{{contentDatas.asset_data.asset_type_id}}</p>
+    <p class="p_info">转让价格：￥{{contentDatas.asset_data.price}}元/{{contentDatas.asset_data.asset_unit}}</p>
+    <p class="p_info">涉及数量：{{contentDatas.asset_data.count}}</p>
+    <p class="p_info">资产转让有效期：{{contentDatas.asset_data.reg_money}}</p>
+    <p class="p_info">基本回报：{{contentDatas.asset_data.legal_name}}</p>
+    <p class="p_info">额外回报：{{contentDatas.asset_data.domicile}}</p>
+    <p class="p_info">其他：{{contentDatas.asset_data.establish_time }}</p>
+  </div>
+</template>
+<script>
+export default {
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  data() {
+    return{
+      img_data:[],
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+  },
+  created(){
+    this.img_data=[{name:'资产图片',url:[this.contentDatas.asset_data.serial_img]}
+    ]
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/bankProve.vue b/src/components/common/dialog/DataReview/bankProve.vue
new file mode 100644
index 0000000..4065ea7
--- /dev/null
+++ b/src/components/common/dialog/DataReview/bankProve.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="body1">
+    <p class="title">营业执照（复印件）</p>
+    <img :src="contentDatas.bank_account_certificate"  class="file_img">
+    <div class="img_span">
+      <span @click="onPreview([contentDatas.bank_account_certificate])">查看原图</span>
+      <el-upload
+        class="upload-demo"
+        :action="action"
+        :on-change="fileChange"
+        :show-file-list="false"
+        :on-error="handleAvatarError"
+        list-type="picture"
+        :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+        >
+        <span class="upload_span">重新上传</span>
+      </el-upload>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'bank_account_certificate'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/basics.vue b/src/components/common/dialog/DataReview/basics.vue
index 29bf056..65d0eeb 100644
--- a/src/components/common/dialog/DataReview/basics.vue
+++ b/src/components/common/dialog/DataReview/basics.vue
@@ -113,6 +113,11 @@ export default {
       this.oldDates=JSON.parse(JSON.stringify(this.contentDatas))
     }
   },
+  watch:{
+    contentDatas(val,oldVal){
+      this.oldDates=JSON.parse(JSON.stringify(val))
+    }
+  }
 }
 </script>
 <style scoped>
diff --git a/src/components/common/dialog/DataReview/businessInfo.vue b/src/components/common/dialog/DataReview/businessInfo.vue
index 4e65863..7320151 100644
--- a/src/components/common/dialog/DataReview/businessInfo.vue
+++ b/src/components/common/dialog/DataReview/businessInfo.vue
@@ -11,6 +11,22 @@
       />
     </div>
     <p class="p_info">托管方类型：机构托管</p>
+    <p class="p_info">机构名称：{{contentDatas.shop_data.firm_name}}</p>
+    <p class="p_info">统一社会信用代码：{{contentDatas.shop_data.credit_code}}</p>
+    <p class="p_info">主体类型：{{contentDatas.shop_data.main_type}}</p>
+    <p class="p_info">注册资本：{{contentDatas.shop_data.reg_money}}</p>
+    <p class="p_info">法定代表人：{{contentDatas.shop_data.legal_name}}</p>
+    <p class="p_info">住所：{{contentDatas.shop_data.domicile}}</p>
+    <p class="p_info">成立日期：{{contentDatas.shop_data.establish_time | formatDate}}</p>
+    <p class="p_info">
+      内部决策情况：
+      <el-radio v-model="contentDatas.asset_data.decision" :label="1">个人同意</el-radio>
+      <el-radio v-model="contentDatas.asset_data.decision" :label="2">股东会决议</el-radio>
+      <el-radio v-model="contentDatas.asset_data.decision" :label="3">董事会决议</el-radio>
+      <el-radio v-model="contentDatas.asset_data.decision" :label="4">总经理办公会决议</el-radio>
+      <el-radio v-model="contentDatas.asset_data.decision" :label="5">其他</el-radio>
+      <el-input v-model="contentDatas.asset_data.decision_case" v-if="contentDatas.shop_data.decision==5" placeholder="请输入其他情况" class="listing_input"></el-input>
+    </p>
   </div>
 </template>
 <script>
@@ -39,6 +55,10 @@ export default {
     closeViewer() {
       this.showViewer = false
     },
+    //时间戳转换时间
+    formatDate(row,colnum){
+        return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
+    },
   },
   created(){
     this.img_data=[{name:'营业执照',url:[this.contentDatas.shop_data.business_license]},{name:'法人代表证明书',url:[this.contentDatas.shop_data.legal_certificate]},
diff --git a/src/components/common/dialog/DataReview/certificate.vue b/src/components/common/dialog/DataReview/certificate.vue
new file mode 100644
index 0000000..72eaa1b
--- /dev/null
+++ b/src/components/common/dialog/DataReview/certificate.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="body1">
+    <p class="title">营业执照（复印件）</p>
+    <img :src="contentDatas.legal_certificate"  class="file_img">
+    <div class="img_span">
+      <span @click="onPreview([contentDatas.legal_certificate])">查看原图</span>
+      <el-upload
+        class="upload-demo"
+        :action="action"
+        :on-change="fileChange"
+        :show-file-list="false"
+        :on-error="handleAvatarError"
+        list-type="picture"
+        :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+        >
+        <span class="upload_span">重新上传</span>
+      </el-upload>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'legal_certificate'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/dataNumber.vue b/src/components/common/dialog/DataReview/dataNumber.vue
new file mode 100644
index 0000000..802f760
--- /dev/null
+++ b/src/components/common/dialog/DataReview/dataNumber.vue
@@ -0,0 +1,35 @@
+<template>
+  <div class="body1">
+    <p class="title">文化大数据标准编号</p>
+    <p class="p_info dataNumber">
+      <span>标准编号规则：T/CPRA + </span>
+      <el-input v-model="input" placeholder="字标准体系代码缩写" class="dataNumber_input"></el-input>
+      <el-input v-model="input" placeholder="标准分配序号" class="dataNumber_input"></el-input>
+      <el-input v-model="input" placeholder="." class="dataNumber_input1"></el-input>
+      <el-input v-model="input" placeholder="部分编号" class="dataNumber_input margin_right"></el-input>
+      <span>建议编号：T/CPRA3100.01</span>
+      <span class="span_blue span_left">生成标准编号</span>
+    </p>
+  </div>
+</template>
+<script>
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  data() {
+    return{
+      input:''
+    }
+  },
+  methods:{
+  },
+  created(){
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/elseFile.vue b/src/components/common/dialog/DataReview/elseFile.vue
new file mode 100644
index 0000000..00e6c5c
--- /dev/null
+++ b/src/components/common/dialog/DataReview/elseFile.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="body1">
+    <p class="title">其他要求文件</p>
+    <div class="else_file">
+      <div>
+        <img :src="contentDatas.else_file[0]"  class="file_img">
+        <div class="img_span">
+          <span @click="onPreview([contentDatas.else_file[0]])">查看原图</span>
+          <el-upload
+            class="upload-demo"
+            :action="action"
+            :on-change="fileChange"
+            :show-file-list="false"
+            :on-error="handleAvatarError"
+            list-type="picture"
+            :on-success="(res)=>{handleAvatarSuccess(res,0,0)}"
+            >
+            <span class="upload_span">重新上传</span>
+          </el-upload>
+        </div>
+      </div>
+      <div class="else_file_right" v-if="contentDatas.else_file.length>1">
+        <div class="img_span else_files" v-for="(item,index) in contentDatas.else_file" :key="index">
+          <template v-if="index!=0">
+            <span>资质证明文件{{index}}</span>
+            <div class="img_span">
+              <span @click="onPreview([item])">查看原图</span>
+              <el-upload
+                class="upload-demo"
+                :action="action"
+                :on-change="fileChange"
+                :show-file-list="false"
+                :on-error="handleAvatarError"
+                list-type="picture"
+                :on-success="(res)=>{handleAvatarSuccess(res,0,index)}"
+                >
+                <span class="upload_span">重新上传</span>
+              </el-upload>
+            </div>
+          </template>
+        </div>
+        <div class="img_span">
+          <el-upload
+            class="upload-demo"
+            :action="action"
+            :on-change="fileChange"
+            :show-file-list="false"
+            :on-error="handleAvatarError"
+            list-type="picture"
+            :on-success="(res)=>{handleAvatarSuccess(res,1)}"
+            >
+            <span class="upload_span">+上传更多文件</span>
+          </el-upload>
+        </div>
+      </div>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true,
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type,index){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'else_file',
+          index:index,
+          type:type
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/entrust.vue b/src/components/common/dialog/DataReview/entrust.vue
new file mode 100644
index 0000000..5285aa7
--- /dev/null
+++ b/src/components/common/dialog/DataReview/entrust.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="body1">
+    <p class="title">营业执照（复印件）</p>
+    <img :src="contentDatas.legal_authorization"  class="file_img">
+    <div class="img_span">
+      <span @click="onPreview([contentDatas.legal_authorization])">查看原图</span>
+      <el-upload
+        class="upload-demo"
+        :action="action"
+        :on-change="fileChange"
+        :show-file-list="false"
+        :on-error="handleAvatarError"
+        list-type="picture"
+        :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+        >
+        <span class="upload_span">重新上传</span>
+      </el-upload>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'legal_authorization'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/license.vue b/src/components/common/dialog/DataReview/license.vue
index 526b413..5022eab 100644
--- a/src/components/common/dialog/DataReview/license.vue
+++ b/src/components/common/dialog/DataReview/license.vue
@@ -2,21 +2,87 @@
   <div class="body1">
     <p class="title">营业执照（复印件）</p>
     <img :src="contentDatas.business_license"  class="file_img">
+    <div class="img_span">
+      <span @click="onPreview([contentDatas.business_license])">查看原图</span>
+      <el-upload
+        class="upload-demo"
+        :action="action"
+        :on-change="fileChange"
+        :show-file-list="false"
+        :on-error="handleAvatarError"
+        list-type="picture"
+        :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+        >
+        <span class="upload_span">重新上传</span>
+      </el-upload>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
   </div>
 </template>
 <script>
-
+import bus from '../../bus'
 export default {
   props:{
     contentDatas:{
       require: true
     }
   },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
   data() {
     return{
-
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
     }
   },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'business_license'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
 }
 </script>
 <style scoped>
diff --git a/src/components/common/dialog/DataReview/operatorIDCard.vue b/src/components/common/dialog/DataReview/operatorIDCard.vue
new file mode 100644
index 0000000..e9a6522
--- /dev/null
+++ b/src/components/common/dialog/DataReview/operatorIDCard.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="body1 body2">
+    <div class="idcard">
+      <p class="title">身份证正面(照片面)</p>
+      <img :src="contentDatas.operator_card"  class="file_img1">
+      <div class="img_span">
+        <span @click="onPreview([contentDatas.operator_card] )">查看原图</span>
+        <el-upload
+          class="upload-demo"
+          :action="action"
+          :on-change="fileChange"
+          :show-file-list="false"
+          :on-error="handleAvatarError"
+          list-type="picture"
+          :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+          >
+          <span class="upload_span">重新上传</span>
+        </el-upload>
+      </div>
+    </div>
+    <div class="idcard">
+      <p class="title">身份证反面(发证机构面)</p>
+      <img :src=" contentDatas.operator_card "  class="file_img1">
+      <div class="img_span">
+        <span @click="onPreview([contentDatas.operator_card] )">查看原图</span>
+        <span>重新上传</span>
+      </div>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer : false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'operator_card'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/DataReview/promise.vue b/src/components/common/dialog/DataReview/promise.vue
new file mode 100644
index 0000000..f0c7f5c
--- /dev/null
+++ b/src/components/common/dialog/DataReview/promise.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="body1">
+    <p class="title">营业执照（复印件）</p>
+    <img :src="contentDatas.asset_certificate"  class="file_img">
+    <div class="img_span">
+      <span @click="onPreview([contentDatas.asset_certificate])">查看原图</span>
+      <el-upload
+        class="upload-demo"
+        :action="action"
+        :on-change="fileChange"
+        :show-file-list="false"
+        :on-error="handleAvatarError"
+        list-type="picture"
+        :on-success="(res)=>{handleAvatarSuccess(res,0)}"
+        >
+        <span class="upload_span">重新上传</span>
+      </el-upload>
+    </div>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="img_url"
+      :z-index="9999"
+    />
+  </div>
+</template>
+<script>
+import bus from '../../bus'
+export default {
+  props:{
+    contentDatas:{
+      require: true
+    }
+  },
+  components: {
+    ElImageViewer: () => import('element-ui/packages/image/src/image-viewer')
+  },
+  data() {
+    return{
+      host:'http://wenhua.xingtongworld.com',
+      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      showViewer:false,
+      img_url:[]
+    }
+  },
+  methods:{
+    onPreview(img) {
+      this.img_url = img
+      this.showViewer = true
+    },
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false
+    },
+    handleAvatarError(){
+      this.$message.error('文件上传失败！');
+    },
+    handleAvatarSuccess(res,type){
+      console.info(res)
+      if(res.code==1){
+        let upDate={
+          url:this.host+res.data.img_url,
+          key:'asset_certificate'
+        }
+        bus.$emit('img', upDate);
+        this.$message.success('文件上传成功！');
+      }
+    },
+    fileChange(file){
+      const typeArr = ['image/png', 'image/gif', 'image/jpeg', 'image/jpg'];
+      const isJPG = typeArr.indexOf(file.raw.type) !== -1;
+      const isLt3M = file.size / 1024 / 1024 < 3;
+      if (!isJPG) {
+          this.$message.error('只能是图片!');
+          this.$refs.upload.clearFiles();
+          return;
+      }
+      if (!isLt3M) {
+          this.$message.error('上传图片大小不能超过 3MB!');
+          this.$refs.upload.clearFiles();
+          // this.$set(this.query, 'goods_img', '');
+          return;
+      }
+    },
+  }
+}
+</script>
+<style scoped>
+  @import url('../../../../assets/css/sidebar.css');
+</style>
diff --git a/src/components/common/dialog/content.vue b/src/components/common/dialog/content.vue
index 24821b5..017b7a0 100644
--- a/src/components/common/dialog/content.vue
+++ b/src/components/common/dialog/content.vue
@@ -7,14 +7,30 @@
       <IDCard v-if="sidebarId== 'IDCard'" :contentDatas="contentDatas"></IDCard>
       <application v-if="sidebarId== 'application'" :contentDatas="contentDatas"></application>
       <assets v-if="sidebarId== 'assets'" :contentDatas="contentDatas"></assets>
+      <certificate v-if="sidebarId== 'certificate'" :contentDatas="contentDatas"></certificate>
+      <bankProve v-if="sidebarId== 'bankProve'" :contentDatas="contentDatas"></bankProve>
+      <entrust v-if="sidebarId== 'entrust'" :contentDatas="contentDatas"></entrust>
+      <promise v-if="sidebarId== 'promise'" :contentDatas="contentDatas"></promise>
+      <operatorIDCard v-if="sidebarId== 'operatorIDCard'" :contentDatas="contentDatas"></operatorIDCard>
+      <elseFile v-if="sidebarId== 'elseFile'" :contentDatas="contentDatas"></elseFile>
     </template>
     <template v-else-if="dialogType==2">
       <businessInfo v-if="sidebarId== 'businessInfo'" :contentDatas="contentDatas"></businessInfo>
+      <assetsInfo v-if="sidebarId== 'assetsInfo'" :contentDatas="contentDatas"></assetsInfo>
+      <dataNumber v-if="sidebarId== 'dataNumber'" :contentDatas="contentDatas"></dataNumber>
     </template>
   </div>
 </template>
 <script>
 import assets from '../dialog/DataReview/assets.vue'
+import certificate from '../dialog/DataReview/certificate.vue'
+import bankProve from '../dialog/DataReview/bankProve.vue'
+import entrust from '../dialog/DataReview/entrust.vue'
+import promise from '../dialog/DataReview/promise.vue'
+import operatorIDCard from '../dialog/DataReview/operatorIDCard.vue'
+import elseFile from '../dialog/DataReview/elseFile.vue'
+import dataNumber from '../dialog/DataReview/dataNumber.vue'
+import assetsInfo from '../dialog/DataReview/assetsInfo.vue'
 import businessInfo from '../dialog/DataReview/businessInfo.vue'
 import assessment from '../dialog/DataReview/assessment.vue'
 import application from '../dialog/DataReview/application.vue'
@@ -38,7 +54,9 @@ export default ({
     }
   },
   components:{
-    assessment,basics,license,IDCard,application,assets,businessInfo
+    assessment,basics,license,IDCard,application,assets,
+    businessInfo,assetsInfo,dataNumber,elseFile,certificate,
+    bankProve,entrust,promise,operatorIDCard
   },
 })
 </script>
diff --git a/src/components/common/dialog/insex.vue b/src/components/common/dialog/insex.vue
index cca45bb..04a8f01 100644
--- a/src/components/common/dialog/insex.vue
+++ b/src/components/common/dialog/insex.vue
@@ -64,6 +64,7 @@ export default {
       default:false,
       require: true
     },
+    // 判断是个人还是机构，1位机构，2位个人
     account_type:{
       type:String,
       default:'buyer',
@@ -115,7 +116,15 @@ export default {
     })
     bus.$on('img',(e)=>{
       console.info(e)
-      this.contentDatas[e.key]=e.url;
+      if (e.key=='else_file') {
+        if (e.type==1) {
+          this.contentDatas.else_file.push(e.url)
+        }else{
+          this.contentDatas.else_file[e.index]=e.url
+        }
+      }else{
+        this.contentDatas[e.key]=e.url;
+      }
     })
   },
   methods:{
@@ -162,21 +171,24 @@ export default {
         if (this.contentDatas.account_type==2) {
           this.dialogData.sidebar=[
             {title:'企业风险评估',type:0,id:'assessment'},{title:'基础信息',type:1,id:'basics'},{title:'身份证(复印件)',type:1,id:'IDCard'},
-            {title:'数字证书申请表',type:1,id:'application'},{title:'资产证明文件',type:2,id:'assets'},{title:'其他要求文件',type:0,id:'else'}
+            {title:'数字证书申请表',type:1,id:'application'},{title:'资产证明文件',type:2,id:'assets'},{title:'其他要求文件',type:0,id:'elseFile'}
           ]
         }else{
           this.dialogData.sidebar=[
             {title:'企业风险评估',type:0,id:'assessment'},{title:'基础信息',type:1,id:'basics'},{title:'营业执照(复印件)',type:1,id:'license'},
             {title:'法人代表证明书',type:1,id:'certificate'},{title:'法人身份证(复印件)',type:1,id:'IDCard'},{title:'数字证书申请表',type:1,id:'application'},
             {title:'银行开户证明',type:1,id:'bankProve'},{title:'开户申请书与承诺书',type:1,id:'promise'},{title:'法人授权委托书',type:0,id:'entrust'},
-            {title:'经办人身份证(复印件)',type:0,id:'IDCard1'},{title:'资产证明文件',type:2,id:'assets'},{title:'其他要求文件',type:0,id:'else'}
+            {title:'经办人身份证(复印件)',type:0,id:'operatorIDCard'},{title:'资产证明文件',type:2,id:'assets'},{title:'其他要求文件',type:0,id:'elseFile'}
           ]
         }
       }else if(this.dialogType==2){
         this.dialogData.sidebar=[
-          {title:'商家概况',type:1,id:'businessInfo'},{title:'资产概况',type:1,id:'assets_info'},{title:'资产评估/资产评价报告',type:1,id:'asset_valuation'},
-          {title:'文化大数据标准编号',type:1,id:'data_number'}
+          {title:'商家概况',type:1,id:'businessInfo'},{title:'资产概况',type:1,id:'assetsInfo'},
+          {title:'文化大数据标准编号',type:1,id:'dataNumber'}
         ]
+        if (this.contentDatas.asset_data.else_serial_file.length>0) {
+          this.dialogData.sidebar.splice(2, 0, {title:'资产评估/资产评价报告',type:1,id:'asset_valuation'});
+        }
         if (this.assets_type==1) {
           this.dialogData.title='资产信息';
         }else if(this.assets_type==2){
diff --git a/src/components/page/AccountManagement/blacklistManagement.vue b/src/components/page/AccountManagement/blacklistManagement.vue
index 792db20..955151e 100644
--- a/src/components/page/AccountManagement/blacklistManagement.vue
+++ b/src/components/page/AccountManagement/blacklistManagement.vue
@@ -192,11 +192,11 @@ export default {
                 console.log(res);
                 if (res.code==100) {
                     this.query1.uid=row.id
-                    this.query1.buyer_account_type=res.data.is_buyer_black
-                    this.query1.enter_shop_type=res.data.is_enter_shop_black
-                    this.query1.third_party_type=res.data.is_third_party_black
+                    this.query1.buyer_account_type=res.data.buyer_black
+                    this.query1.enter_shop_type=res.data.enter_shop_black
+                    this.query1.third_party_type=res.data.third_party_black
+                    this.editVisible2=true;
                 }
-                this.editVisible2=true;
             });
         },
         // 操作记录
diff --git a/src/components/page/AccountManagement/platformSelect.vue b/src/components/page/AccountManagement/platformSelect.vue
index 3d41c22..d789e68 100644
--- a/src/components/page/AccountManagement/platformSelect.vue
+++ b/src/components/page/AccountManagement/platformSelect.vue
@@ -52,6 +52,11 @@
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
                 <el-table-column :formatter="formatDate" prop="create_time" label="申请时间"></el-table-column>
+                <el-table-column label="类型" >
+                    <template slot-scope="scope">
+                        <span>{{scope.row.account_type==1 ? "机构": "个人"}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="机构名称" prop="firm_name"></el-table-column>
                 <el-table-column label="账户号码" prop="phone"></el-table-column>
                 <el-table-column prop="apply_name" label="申请人名称"></el-table-column>
@@ -67,7 +72,7 @@
                 </el-table-column>
                 <el-table-column prop="is_third_party" label="是否第三方机构">
                     <template slot-scope="scope">
-                        <span>{{scope.row.is_third_party==1 ? '是':'否'}}</span>
+                        <span v-if="scope.row.account_type==1">{{scope.row.is_third_party==1 ? '是':'否'}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="check_name" label="审核人员"></el-table-column>
@@ -117,9 +122,9 @@
         <el-dialog title="提示" :visible.sync="editVisible2" width="30%">
             <p class="recordTips">请确认是否需要添加黑名单？</p>
             <div class="record_select">
-                <el-checkbox v-model="query1.buyer_account_type" :true-label="1" :false-label="0">购买方</el-checkbox>
-                <el-checkbox v-model="query1.enter_shop_type" :true-label="1" :false-label="0">托管方</el-checkbox>
-                <el-checkbox v-model="query1.third_party_type" :true-label="1" :false-label="0">第三方机构</el-checkbox>
+                <el-checkbox v-model="query1.buyer_account_type"   :true-label=1 :false-label=0 >购买方</el-checkbox>
+                <el-checkbox v-model="query1.enter_shop_type"  :true-label=1 :false-label=0 >托管方</el-checkbox>
+                <el-checkbox v-model="query1.third_party_type"  :true-label=1 :false-label=0 >第三方机构</el-checkbox>
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editVisible2 = false">取 消</el-button>
@@ -209,6 +214,7 @@ export default {
     created() {
         this.getData();
         this.getAuditList();
+        // console.info(this.query1)
     },
     methods: {
         // 重置方法
@@ -231,6 +237,7 @@ export default {
         },
         //添加黑名单
         addBlacklist(){
+            console.info(this.query1)
             updateBlackList(this.query1).then(res => {
                 console.log(res);
                 if (res.code==100) {
@@ -248,11 +255,11 @@ export default {
                 console.log(res);
                 if (res.code==100) {
                     this.query1.uid=row.id
-                    this.query1.buyer_account_type=res.data.is_buyer_black
-                    this.query1.enter_shop_type=res.data.is_enter_shop_black
-                    this.query1.third_party_type=res.data.is_third_party_black
+                    this.query1.buyer_account_type=res.data.buyer_black
+                    this.query1.enter_shop_type=res.data.enter_shop_black
+                    this.query1.third_party_type=res.data.third_party_black
+                    this.editVisible2=true;
                 }
-                this.editVisible2=true;
             });
         },
         // 操作记录
diff --git a/src/components/page/TransactionManagement/transactionQuery.vue b/src/components/page/TransactionManagement/transactionQuery.vue
index c05be38..b587346 100644
--- a/src/components/page/TransactionManagement/transactionQuery.vue
+++ b/src/components/page/TransactionManagement/transactionQuery.vue
@@ -38,7 +38,8 @@
                 >
                 </el-date-picker>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
-                <el-button type="primary" plain  @click="reset">重置</el-button>
+                <br/>
+                <el-button type="primary" plain  @click="reset" class="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -175,9 +176,9 @@ export default {
         // 获取 easy-mock 的模拟数据
         getData() {
             orderList(this.query).then(res => {
-                // console.log(res);
+                console.log(res);
                 this.tableData = res.list;
-                this.pageTotal = res.pageTotal || 50;
+                this.pageTotal = res.count;
             });
         },
         // 触发搜索按钮
@@ -251,4 +252,7 @@ export default {
     width: 40px;
     height: 40px;
 }
+.reset{
+    margin-top: 10px;
+}
 </style>