diff --git a/src/components/billDetails/index.vue b/src/components/billDetails/index.vue
index 530937d..6314466 100644
--- a/src/components/billDetails/index.vue
+++ b/src/components/billDetails/index.vue
@@ -82,13 +82,13 @@
             // // align:'center'
           },
           {
-            title: '用户编码',
+            title: '身份ISLI认证码',
             dataIndex: 'user_isli',
             width:'120px',
             // // align:'center'
           },
           {
-            title: '客户名称',
+            title: '交易主体名称',
             dataIndex: 'order_user.name',
             width:'120px',
             // // align:'center'
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 7cc68ec..ab84db2 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -133,7 +133,10 @@
                   <p>分类：{{sourceDate.classification}}</p>
                   <p>贡献者：{{sourceDate.contributors}}</p>
                   <p>著作权人：{{sourceDate.copyrightOwner}}</p>
-                  <p>载体：{{sourceDate.carrier}}</p>
+                  <p>载体：{{sourceDate.carrier==1?'纸张':sourceDate.carrier==2?'感光材料':sourceDate.carrier==3?'磁带':sourceDate.carrier==4?'光盘':
+                    sourceDate.carrier==5?'移动终端':sourceDate.carrier==6?'计算机':sourceDate.carrier==7?'数字化数据':sourceDate.carrier==8?'天然载体':
+                    sourceDate.carrier==9?'器具载体':'其他载体'
+                    }}</p>
                   <p>登记者：{{sourceDate.registrant}}</p>
                   <p>登记日期：{{sourceDate.registerDate}}</p>
                 </div>
@@ -144,8 +147,13 @@
                   <p>标签：{{sourceDate.label}}</p>
                   <p>描述：{{sourceDate.description}}</p>
                   <p>哈希值：{{sourceDate.md5}}</p>
-                  <p>版本：{{sourceDate.edition}}</p>
-                  <p>现况：{{sourceDate.collectionCondition}}</p>
+                  <p>版本：{{sourceDate.edition==1?'真迹':sourceDate.edition==2?'抄本':sourceDate.edition==3?'拓本':sourceDate.edition==4?'临摹':
+                    sourceDate.edition==5?'复制':sourceDate.edition==6?'复原':sourceDate.edition==7?'重建':sourceDate.edition==8?'原始录音':sourceDate.edition==9?'原始视频':
+                    sourceDate.edition==10?'刻录':'原创'}}</p>
+                  <p>现况：{{sourceDate.collectionCondition==1?'完好':sourceDate.collectionCondition==2?'残破':sourceDate.collectionCondition==3?'残缺':
+                    sourceDate.collectionCondition==4?'霉变':
+                    sourceDate.collectionCondition==5?'皱褶':sourceDate.collectionCondition==6?'污渍':sourceDate.collectionCondition==7?'脱浆':sourceDate.collectionCondition==8?'脱线':
+                    sourceDate.collectionCondition==9?'生锈':sourceDate.collectionCondition==10?'褪色':'焦脆'}}</p>
                   <p>封面：{{sourceDate.covers}}</p>
                 </div>
               </div>
diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue
index b791cfc..f10a3e9 100644
--- a/src/components/dateSelect/order.vue
+++ b/src/components/dateSelect/order.vue
@@ -42,12 +42,12 @@
                       <p>收费类型：{{item.goods.charges_type==1?'免费':'付费'}}</p>
                       <!-- <p>交易保证金：{{item.earnest_money}}</p> -->
                       <p>自报价：{{item.goods.price}}</p>
-                      <p>交易佣金：{{item.goods.price}}</p>
                       <p>委托开始时间：{{item.goods.contractual_start_time}}</p>
                       <p>委托终止时间：{{item.goods.contractualtime_end_time}}</p>
                       <p>标的价款：¥ {{item.goods.money}}</p>
                       <p>购买年限：{{item.goods.transaction_count}}</p>
                       <p>交易佣金：¥ {{item.goods.service_charge}}</p>
+                      <p>小计：¥ {{item.goods.price}}</p>
                       <!-- <p>交易流水号：{{order_info.close_serial_number}}</p> -->
                     </div>
                   </div>
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 5e5fd24..744c036 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -67,6 +67,7 @@
                   {{item.calculate==1?item.ratio:item.amount}}
                 </span>
               </p>
+              <p>交易佣金金额：¥ {{order_info.total_service_charge}}</p>
               <p>订单金额：¥ {{order_info.total_money}} 元</p>
             </div>
           </div>
@@ -75,11 +76,12 @@
             <p class="oreder_content_title">资金结算表</p>
             <a-table :columns="columns" :data-source="data" bordered :pagination="false">
               <template slot="close_status" slot-scope="close_status">
-                <span v-if="close_status==1">无结算信息</span>
+                <span v-if="close_status==0">已支付</span>
+                <!-- <span v-if="close_status==1">无结算信息</span>
                 <span v-else-if="close_status==2">结算中</span>
                 <span v-else-if="close_status==3">用户名和收款人不一致</span>
-                <span v-else-if="close_status==4">收款信息错误</span>
-                <span v-else-if="close_status==5">结算成功</span>
+                <span v-else-if="close_status==4">收款信息错误</span> -->
+                <span v-else-if="close_status==5">已结算</span>
               </template>
             </a-table>
           </div>
@@ -179,7 +181,7 @@
           //   // align:'center'
           // },
           {
-            title: '税额',
+            title: '税额（含税）',
             dataIndex: 'tax_rate_money',
             width:'120px',
             // align:'center'
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index d1db15f..f8b06e8 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -174,7 +174,7 @@ export default {
           // align:'center'
         },
         {
-          title: '标的类型',
+          title: '交易品种',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
           // align:'center'
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index ba5dd9f..501854a 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -9,19 +9,19 @@
     <div class="body">
       <div class="query">
         <a-row  type="flex" justify="space-between">
-          <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
+          <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>标的ISLI标识码：</span>
             <a-input v-model="query.islicode"/>
           </a-col>
-          <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
+          <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
-          <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
+          <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>委托方/授权方：</span>
             <a-input v-model="query.entrust_name" placeholder="身份ISLI认证码/名称"/>
           </a-col>
-          <a-col  :lg="8" :xl="7" :xxl="5" class="query_item" >
+          <a-col  :lg="8" :xl="7" :xxl="6" class="query_item" >
             <span>交易品种：</span>
             <a-select    v-model="query.goods_type">
               <a-select-option value="">全部</a-select-option>
@@ -29,7 +29,7 @@
               <a-select-option value="2">文化数字内容</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="7" :xxl="4" class="query_item" >
+          <a-col :lg="8" :xl="7" :xxl="6" class="query_item" >
             <span>发布状态：</span>
             <a-select   v-model="query.data_type">
               <a-select-option value="">全部文化数据</a-select-option>
@@ -40,7 +40,7 @@
               <a-select-option value="4">委托期满文化数据</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="7" :xxl="5" class="query_item">
+          <a-col :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select   v-model="query.transaction" >
               <a-select-option value="">全部</a-select-option>
@@ -48,7 +48,7 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="7" :xxl="5" class="query_item">
+          <!-- <a-col :lg="8" :xl="7" :xxl="5" class="query_item">
             <span>委托状态：</span>
             <a-select  v-model="query.entrust_status"  >
               <a-select-option value="">全部</a-select-option>
@@ -58,12 +58,12 @@
               <a-select-option value="4">撤销中</a-select-option>
               <a-select-option value="5">撤销失败</a-select-option>
             </a-select>
-          </a-col>
-          <a-col :lg="8" :xl="7" :xxl="5" class="query_item query_item2">
+          </a-col> -->
+          <a-col :lg="8" :xl="7" :xxl="6" class="query_item query_item2">
             <span>上线时间：</span>
             <a-range-picker  v-model="query.createtime"  valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="8" :xl="7" :xxl="9" class="query_item query_item1">
+          <a-col :lg="8" :xl="7" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getAllDate(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -184,12 +184,12 @@ export default {
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
         },
-        {
-          title: '委托状态',
-          dataIndex: 'entrust_status',
-          scopedSlots:{customRender:'entrust_status'},
-          // align:'center'
-        },
+        // {
+        //   title: '委托状态',
+        //   dataIndex: 'entrust_status',
+        //   scopedSlots:{customRender:'entrust_status'},
+        //   // align:'center'
+        // },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue
index 42b251e..f1be38f 100644
--- a/src/components/page/fundSettlement/index.vue
+++ b/src/components/page/fundSettlement/index.vue
@@ -10,7 +10,7 @@
       <div class="query">
         <a-row  justify="space-between" >
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>客户名称：</span>
+            <span>交易主体名称：</span>
             <a-input v-model="query.user_name"/>
           </a-col>
           <!-- <a-col :span="5" class="query_item">
@@ -54,7 +54,7 @@
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
           <template slot="close_status" slot-scope="close_status">
             <span v-if="close_status==1">待结算</span>
-            <span v-else-if="close_status==2">已结算</span>
+            <span v-else>已结算</span>
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
@@ -118,13 +118,13 @@ export default {
         //   // align:'center'
         // },
         {
-          title: '用户编码',
+          title: '身份ISLI认证码',
           dataIndex: 'islicode',
           // align:'center'
         },
         {
-          title: '客户名称',
-          dataIndex: 'userinfo.name',
+          title: '交易主体名称',
+          dataIndex: 'name',
           // align:'center'
         },
         // {
@@ -134,17 +134,17 @@ export default {
         // },
         {
           title: '银行账号',
-          dataIndex: 'userinfo.publicAccount',
+          dataIndex: 'publicAccount',
           // align:'center'
         },
         {
           title: '银行名称',
-          dataIndex: 'userinfo.bankName',
+          dataIndex: 'bankName',
           // align:'center'
         },
         {
           title: '用户类型',
-          dataIndex: 'userinfo.userType',
+          dataIndex: 'userType',
           // align:'center'
         },
         {