diff --git a/src/api/index.js b/src/api/index.js
index 00eb26f..6412f89 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -8,11 +8,139 @@ export const getAllDate = query => {
       data: query
   });
 };
-//获取角色
-export const getRole = query => {
+//数据查看
+export const goodsDetail = query => {
   return request({
-      url: '/admin/user.user/getRole',
+      url: '/admin/goods.Goods/goodsDetail',
+      method: 'post',
+      data: query
+  });
+};
+//数据查看-资源详情
+export const sourceDetail = query => {
+  return request({
+      url: '/admin/goods.Goods/sourceDetail',
+      method: 'post',
+      data: query
+  });
+};
+//获取操作记录
+export const getLog = query => {
+  return request({
+      url: '/admin/Log/getLog',
+      method: 'post',
+      data: query
+  });
+};
+//文化数据类别列表查询
+export const ClassifyList = query => {
+  return request({
+      url: '/admin/goods.Classify/list',
+      method: 'post',
+      data: query
+  });
+};
+//获取一级分类
+export const getTop = query => {
+  return request({
+      url: '/admin/goods.Classify/getTop',
       method: 'get',
       params: query
   });
 };
+//获取二级分类
+export const getSon = query => {
+  return request({
+      url: '/admin/goods.Classify/getSon',
+      method: 'get',
+      params: query
+  });
+};
+//获取用户
+export const getUser = query => {
+  return request({
+      url: '/admin/user.User/getUser',
+      method: 'get',
+      params: query
+  });
+};
+//增加分类
+export const addClass = query => {
+  return request({
+      url: '/admin/goods.Classify/addClass',
+      method: 'post',
+      data: query
+  });
+};
+//修改分类状态
+export const updateStatus = query => {
+  return request({
+      url: '/admin/goods.Classify/updateStatus',
+      method: 'post',
+      data: query
+  });
+};
+//订单列表查询
+export const getOrderList = query => {
+  return request({
+      url: '/admin/order.Order/list',
+      method: 'post',
+      data: query
+  });
+};
+//订单数据查看
+export const orderDetail = query => {
+  return request({
+      url: '/admin/order.Order/orderDetail',
+      method: 'post',
+      data: query
+  });
+};
+//排行榜
+export const rankingList = query => {
+  return request({
+      url: '/admin/goods.Goods/rankingList',
+      method: 'post',
+      data: query
+  });
+};
+//添加到排行榜
+export const addRanking = query => {
+  return request({
+      url: '/admin/goods.Goods/addRanking',
+      method: 'post',
+      data: query
+  });
+};
+//从排行榜删除
+export const delRanking = query => {
+  return request({
+      url: '/admin/goods.Goods/delRanking',
+      method: 'post',
+      data: query
+  });
+};
+//排行榜上移下移
+export const rankingSort = query => {
+  return request({
+      url: '/admin/goods.Goods/rankingSort',
+      method: 'post',
+      data: query
+  });
+};
+//订单详情
+export const orderInfo = query => {
+  return request({
+      url: '/admin/order.Order/orderInfo',
+      method: 'post',
+      data: query
+  });
+};
+//订单关闭
+export const orderShut = query => {
+  return request({
+      url: '/admin/order.Order/orderShut',
+      method: 'post',
+      data: query
+  });
+};
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 81b47ca..6c45bef 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -9,13 +9,33 @@
           </span>
           <p>委托方信息</p>
           <div class="tab_body">
-            <p class="tab_body_p">注册时间：2021-02-16 10:00:00</p>
-            <p class="tab_body_p">认证时间：2021-02-16 10:00:00</p>
-            <p class="tab_body_p">认证类型：机构</p>
-            <p class="tab_body_p">认证状态：已认证</p>
-            <p class="tab_body_p">基本信息：新疆生产建设兵团军垦博物馆</p>
-            <p class="tab_body_p">统一社会信用代码：12990800H41793127X</p>
-            <p class="tab_body_p">账户ISLI标识码：010002-000000000090000117259999-8</p>
+
+            <div class="tab_body_content" v-for="(item,index) in userinfo" :key="index">
+              <p class="tab_body_p">认证类型：{{item.userType}}</p>
+              <p class="tab_body_p">认证状态：{{item.state}}</p>
+              <p class="tab_body_p">基本信息：{{item.name}}</p>
+              <p class="tab_body_p">统一社会信用代码：{{item.uscc}}</p>
+              <p class="tab_body_p">账户ISLI标识码：{{item.islicode}}</p>
+              <p class="tab_body_p">机构类型：{{item.userType}}</p>
+
+              <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
+              <p class="tab_body_p" v-if="item.idNumber">证件号码：{{item.idNumber}}</p>
+              <p class="tab_body_p" v-if="item.cellPhone">手机号码：{{item.cellPhone}}</p>
+
+              <p class="tab_body_p" v-if="item.legalsName">法人名称：{{item.legalsName}}</p>
+              <p class="tab_body_p" v-if="item.legalsType">法人证件类型：{{item.legalsType}}</p>
+              <p class="tab_body_p" v-if="item.legalsIdnum">法人证件号：{{item.legalsIdnum}}</p>
+              <p class="tab_body_p" v-if="item.legalsCellPhone">法人手机号：{{item.legalsCellPhone}}</p>
+
+              <p class="tab_body_p">银行账户：{{item.publicAccount}}</p>
+              <p class="tab_body_p">银行卡类型：{{item.bankCardType}}</p>
+              <p class="tab_body_p">银行行别：{{item.bankType}}</p>
+              <p class="tab_body_p">开户行名称：{{item.bankName}}</p>
+              <p class="tab_body_p">开户人姓名：{{item.bankAccountName}}</p>
+              <p class="tab_body_p">开户人身份证号码：{{item.certIdnum}}</p>
+              <p class="tab_body_p">开户行预留手机号码：{{item.bankCellPhone}}</p>
+              <p class="tab_body_p">开户行所在地：{{item.bankAddress}}</p>
+            </div>
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" force-render>
@@ -28,32 +48,22 @@
               <p class="tab_body_title_bg"></p>
               <div>文化资源数据-基本信息</div>
             </div>
-            <div class="tab_content ">
+            <div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index">
               <div class="tab_content_infoImg">
                 <img src="../../assets/img/test.png" class="tab_content_img">
               </div>
               <div class="tab_content_right">
-                <div class="content_right_title">标的名称：第一犁；塞边新乐章…</div>
+                <div class="content_right_title">标的名称：{{item.goods_name}}</div>
                 <div class="content_info">
                   <div class="content_info_left">
-                    <p>标志码：010002-000000000090000117259999-8</p>
-                    <p>文件MD5：FGHJE45GHJKJH325BNM5JHG</p>
-                    <p>标签：——</p>
-                    <p>尺寸：10*10</p>
-                    <p>文化标识：文化素材</p>
-                    <p>完成发布时间：2021-02-02</p>
-                    <p>组件数量：10个</p>
-                    <p>现状：完好</p>
-                  </div>
-                  <div>
-                    <p>字段：——</p>
-                    <p>语种：汉语</p>
-                    <p>材质：纸质</p>
-                    <p>版本：清彩绘本</p>
-                    <p>创作者：国家图书馆出版社有限公司</p>
-                    <p>所属收藏机构：国家图书馆出版社有限公司</p>
-                    <p>拥有者：国家图书馆出版社有限公司</p>
-                    <p>确权时间：——</p>
+                    <p>标志码：{{item.goods_islicode}}</p>
+                    <p>标的类型：{{item.goods_type}}</p>
+                    <p>委托类型：{{item.goods_entrust}}</p>
+                    <p>权益：{{item.goods_ownership_str}}</p>
+                    <p>委托周期：{{item.contractual_period}}</p>
+                    <p>收费类型：{{item.charges_type}}</p>
+                    <p>交易保证金：{{item.earnest_money}}</p>
+                    <p>自报价：{{item.price}}</p>
                   </div>
                 </div>
               </div>
@@ -64,31 +74,28 @@
               <div>文化资源数据-关联资源</div>
             </div>
             <div class="tab_content">
-              <p class="tab_content_title">图片</p>
-            </div>
-            <div class="content_table">
-              <a-table :columns="columns" :data-source="data" bordered :pagination="false"></a-table>
-            </div>
-
-            <div class="tab_content">
-              <p class="tab_content_title">视频</p>
+              <p class="tab_content_title">文化资源数据集</p>
             </div>
             <div class="content_table">
-              <a-table :columns="columns" :data-source="data" bordered :pagination="false"></a-table>
+              <a-table :columns="columns1" :data-source="entrust_goods.source_gather" bordered :pagination="false">
+                <template slot="operation" slot-scope="item">
+                  <span @click="selectDetails(item.id)" class="details_span">详情</span>
+                </template>
+              </a-table>
             </div>
 
             <div class="tab_content">
-              <p class="tab_content_title">音频</p>
+              <p class="tab_content_title">文化资源数据</p>
             </div>
             <div class="content_table">
-              <a-table :columns="columns" :data-source="data" bordered :pagination="false"></a-table>
+              <a-table :columns="columns" :data-source="entrust_goods.source" bordered :pagination="false"></a-table>
             </div>
 
           </div>
         </a-tab-pane>
-        <a-tab-pane key="3" tab="资产评价报告">
+        <!-- <a-tab-pane key="3" tab="资产评价报告">
           Content of Tab Pane 3
-        </a-tab-pane>
+        </a-tab-pane> -->
       </a-tabs>
       <template slot="footer">
         <div>
@@ -96,99 +103,239 @@
         </div>
       </template>
     </a-modal>
+
+    <a-modal  v-model="newVisible1" title="数据查看" width="1172px" :bodyStyle="modeStyle">
+        <div class="tab_body">
+          <div class="tab_body_title">
+            <p class="tab_body_title_bg"></p>
+            <div>文化资源数据-基本信息</div>
+          </div>
+          <div class="tab_content ">
+            <div class="tab_content_infoImg">
+              <img src="../../assets/img/test.png" class="tab_content_img">
+            </div>
+            <div class="tab_content_right">
+              <div class="content_right_title">标的名称：{{sourceDate.source_name}}</div>
+              <div class="content_info">
+                <div class="content_info_left">
+                  <p>其他标识符：{{sourceDate.otherIdentifiers}}</p>
+                  <p>标识符：{{sourceDate.identifier}}</p>
+                  <p>类型：{{sourceDate.collectionType}}</p>
+                  <p>服务类型：{{sourceDate.serviceType}}</p>
+                  <p>分类：{{sourceDate.classification}}</p>
+                  <p>贡献者：{{sourceDate.contributors}}</p>
+                  <p>著作权人：{{sourceDate.copyrightOwner}}</p>
+                  <p>载体：{{sourceDate.carrier}}</p>
+                  <p>登记者：{{sourceDate.registrant}}</p>
+                  <p>登记日期：{{sourceDate.registerDate}}</p>
+                </div>
+                <div>
+                  <p>所属/收藏机构：{{sourceDate.repositoryName}}</p>
+                  <p>尺寸：{{sourceDate.dimensions}}</p>
+                  <p>组件数量：{{sourceDate.quantity}}</p>
+                  <p>标签：{{sourceDate.label}}</p>
+                  <p>描述：{{sourceDate.description}}</p>
+                  <p>哈希值：{{sourceDate.md5}}</p>
+                  <p>版本：{{sourceDate.edition}}</p>
+                  <p>现况：{{sourceDate.collectionCondition}}</p>
+                  <p>封面：{{sourceDate.covers}}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="tab_body_title">
+            <p class="tab_body_title_bg"></p>
+            <div>文化资源数据-关联资源</div>
+          </div>
+          <div v-for="(item,index) in sourceDate.entrust_goods" :key="index">
+            <div class="tab_content">
+              <p class="tab_content_title">{{item.source_type}}</p>
+            </div>
+            <div class="content_table">
+              <a-table :columns="columns" :data-source="item.source" bordered :pagination="false"></a-table>
+            </div>
+          </div>
+        </div>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="onClose(1)">返 回</a-button>
+        </div>
+      </template>
+    </a-modal>
+
   </div>
 </template>
 
 <script>
+  import {goodsDetail,sourceDetail,orderDetail} from '../../api/index'
   export default {
     name:'dataSelect',
     props:{
       visible:{
         type:Boolean,
         require: true
+      },
+      goods_islicode:{
+        type:String,
+      },
+      batchcode:{
+        type:String,
+      },
+      type:{
+        type:Number
       }
     },
     data(){
       return{
-        newVisible:false,
+        newVisible:true,
+        newVisible1:false,
         modeStyle:{
           'height':'530px'
         },
         tabsStyle:{
           'height':'500px'
         },
-        data:[
-          {
-            key: '1',
-            name: 'John Brown',
-            money: '￥300,000.00',
-            address: 'New York No. 1 Lake Park',
-          },
-          {
-            key: '2',
-            name: 'Jim Green',
-            money: '￥1,256,000.00',
-            address: 'London No. 1 Lake Park',
-          },
-          {
-            key: '3',
-            name: 'Joe Black',
-            money: '￥120,000.00',
-            address: 'Sidney No. 1 Lake Park',
-          },
-        ],
+        entrust_goods:{
+          goods:[]
+        },
+        userinfo:[],
+        sourceDate:{},
+        data:[],
         columns:[
           {
             title: '资源名称',
-            className: 'table_column',
-            dataIndex: 'id',
+            dataIndex: 'source_name',
             width:'144px',
             align:'center'
           },
           {
             title: 'ISLI标志码',
-            dataIndex: 'money',
+            dataIndex: 'islicode',
             width:'242px',
             align:'center'
           },
           {
             title: 'ISLI关联编码',
-            dataIndex: 'name',
+            dataIndex: 'identifier',
             width:'259px',
             align:'center'
           },
           {
             title: '大小',
-            dataIndex: '',
+            dataIndex: 'filesize',
             width:'70px',
             align:'center'
           },
           {
             title: '格式',
-            dataIndex: '',
+            dataIndex: 'format',
             width:'70px',
             align:'center'
           },
           {
             title: '时间',
-            dataIndex: '',
+            dataIndex: 'registerDate',
             width:'148px',
             align:'center'
           },
+        ],
+        columns1:[
+          {
+            title: '文化数字内容集名称',
+            dataIndex: 'source_name',
+            width:'166px',
+            align:'center'
+          },
+          {
+            title: '分类',
+            dataIndex: 'source_type',
+            width:'82px',
+            align:'center'
+          },
+          {
+            title: '生成时间',
+            dataIndex: 'allocationtime',
+            width:'177px',
+            align:'center'
+          },
+          {
+            title: 'ISLI标志码',
+            dataIndex: 'linkCode',
+            width:'310px',
+            align:'center'
+          },
+          {
+            title: '资源总数',
+            dataIndex: 'source_count',
+            width:'110px',
+            align:'center'
+          },
+          {
+            title: '查看',
+            scopedSlots: { customRender: 'operation' },
+            width:'138px',
+            align:'center'
+          },
         ]
       }
     },
-    methods:{
-      onClose() {
-        this.newVisible=false
-        this.$emit('update:visible', false)
+    created(){
+      if(this.type==0){
+        this.goodsDetail()
+      }else{
+        this.orderDetail()
       }
     },
-    watch:{
-      visible(val){
-        this.newVisible=val
+    methods:{
+      //订单数据查看
+      orderDetail(){
+        let data={batchcode:this.batchcode}
+        orderDetail(data).then(res=>{
+          console.info(res)
+          if(res.code==200){
+            this.userinfo=res.data.userinfo
+            this.entrust_goods=res.data.entrust_goods
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      selectDetails(val){
+        let data={id:val}
+        sourceDetail(data).then(res=>{
+          console.info(res)
+          if(res.code==200){
+            this.sourceDate=res.data
+            this.newVisible1=true
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      goodsDetail(){
+        let data={islicode:this.goods_islicode}
+        goodsDetail(data).then(res=>{
+          console.info(res)
+          if(res.code==200){
+            this.userinfo.push(res.data.userinfo)
+            let goods=[res.data.entrust_goods.goods]
+            this.entrust_goods=res.data.entrust_goods
+            this.entrust_goods.goods=goods
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      onClose(type) {
+        if(type==1){
+          this.newVisible1=false
+        }else{
+          this.newVisible=false
+          this.$emit('update:visible', false)
+        }
       }
-    }
+    },
   }
 
 
@@ -301,4 +448,13 @@
   /deep/ .ant-table-thead > tr > th {
     padding: 5px 16px;
   }
+  .details_span{
+    cursor: pointer;
+  }
+  .tab_body_content{
+    margin-bottom: 20px;
+  }
+  .tab_body_content:last-child{
+    margin-bottom: 0;
+  }
 </style>
diff --git a/src/components/operationRecords/index.vue b/src/components/operationRecords/index.vue
index 94aa1f9..5c74c67 100644
--- a/src/components/operationRecords/index.vue
+++ b/src/components/operationRecords/index.vue
@@ -1,8 +1,10 @@
 <template>
   <div>
     <a-modal  v-model="newVisible" title="操作记录" :afterClose="onClose" width="800px" :bodyStyle="modeStyle">
-      <p>1. 2021-02-16 10:00:00 委托方申请委托</p>
-      <p>2. 2021-02-16 13:00:00 总区域中心：王甜甜 委托审核通过</p>
+      <template v-if="logDate.length!=0">
+        <p v-for="(item,index) in logDate" :key="index">{{index+1}}. {{item.message}}</p>
+      </template>
+      <p class="log_p" v-else>暂无数据</p>
       <template slot="footer">
         <div>
           <a-button type="white" @click="onClose">返 回</a-button>
@@ -18,6 +20,9 @@
       visible:{
         type:Boolean,
         require: true
+      },
+      logDate:{
+        type:Array
       }
     },
     data(){
@@ -55,4 +60,7 @@
   p{
     margin-bottom: 0;
   }
+  .log_p{
+    text-align: center;
+  }
 </style>
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 420be50..705240a 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -3,15 +3,15 @@
     <a-modal  v-model="newVisible" title="订单详情" :afterClose="onClose" width="1194px" :bodyStyle="modeStyle">
       <p>订单当前状态：等待购买方付款</p>
       <div class="steps_body">
-        <a-steps :current="step" class="steps">
+        <a-steps :current="order.status" class="steps">
           <a-step>
             <template slot="title">下单成功</template>
-            <span slot="description">2021/06/16 14:16:13</span>
+            <span slot="description">{{order.createtime}}</span>
           </a-step>
-          <a-step title="待付款订单"  description="" />
-          <a-step title="待交付订单" description="" />
-          <a-step title="待结算订单" description="" />
-          <a-step title="已完成订单" description="" />
+          <a-step title="待付款订单"  :description="order.paymenttime" />
+          <a-step title="待交付订单" :description="order.receivetime" />
+          <a-step title="待结算订单" :description="order.closetime" />
+          <a-step title="已完成订单" :description="order.completetime" />
         </a-steps>
       </div>
       <div class="order_body">
@@ -20,12 +20,12 @@
             <span @click="orederActive=0">订单信息</span>
             <span @click="orederActive=1">资金结算表</span>
             <span @click="orederActive=2">交易发票</span>
-            <span @click="orederActive=3">交易凭证</span>
-            <span @click="orederActive=4">交付内容</span>
+            <!-- <span @click="orederActive=3">交易凭证</span>
+            <span @click="orederActive=4">交付内容</span> -->
           </div>
           <div class="order_title_right">
-            <span>关闭订单</span>
-            <a-switch default-checked class="order_switch"/>
+            <span>{{order.status==5?'订单已关闭':'关闭订单'}}</span>
+            <a-switch default-checked class="order_switch"  @change="closeOrder" :loading="closeLoad" :disabled="order.status==5"/>
           </div>
         </div>
 
@@ -33,25 +33,25 @@
           <div v-show="orederActive==0">
             <p class="oreder_content_title">订单信息</p>
             <div class="oreder_info">
-              <p>委托方/收款方：新疆生产建设兵团军垦博物馆</p>
-              <p>购买方/付款方：北京玖扬博文文化发展有限公司</p>
+              <p>委托方/收款方：{{order_info.entrust_name}}</p>
+              <p>购买方/付款方：{{order_info.buy_username}}</p>
             </div>
             <div class="oreder_info">
-              <p>订单类型：委托订单</p>
-              <p>订单编号：GP2021061614121310</p>
-              <p>订单ISLI标识码：</p>
-              <p>交易流水号：</p>
+              <p>订单类型：{{order_info.type==1?'委托订单':order_info.type==2?'认证订单':'服务订单'}}</p>
+              <p>订单编号：{{order_info.batchcode}}</p>
+              <p>订单ISLI标识码：{{order_info.contract_code}}</p>
+              <p>交易流水号：{{order_info.close_serial_number}}</p>
             </div>
             <div class="oreder_info">
-              <p>标的名称：第一犁；塞边新乐章；王震将军像；屯垦戎边千秋伟业；艾青诞辰100周年铜像</p>
-              <p>标的类型：文化资源数据</p>
-              <p>委托类型：转让</p>
-              <p>权属类型：所有权</p>
-              <p>交易价额：¥ 10,000.00</p>
-              <p>交易数量：1</p>
-              <p>保证金：¥ 0.00</p>
-              <p>服务费：¥ 500.00</p>
-              <p>交易总额：¥ 10,500.00 元</p>
+              <p>标的名称：{{order_info.goods_name}}</p>
+              <p>标的类型：{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
+              <p>委托类型：{{order_info.goods_entrust==1?'转让':'授权'}}</p>
+              <p>权属类型：{{order_info.goods_ownership_str}}</p>
+              <p>交易价额：¥ {{order_info.price}}</p>
+              <p>交易数量：{{order_info.transaction_count}}</p>
+              <p>保证金：¥ {{order_info.earnest_money}}</p>
+              <p>服务费：¥ {{order_info.service_charge}}</p>
+              <p>交易总额：¥ {{order_info.total_money}} 元</p>
             </div>
           </div>
 
@@ -63,10 +63,14 @@
           <div v-show="orederActive==2">
             <p class="oreder_content_title">交易发票</p>
             <div class="order_download">
-              <span>购买方服务费发票</span>
+              <a :href="bill.buy_bill" target="_blank" rel="nofollow">购买方服务费发票</a>
+              <a :href="bill.entrust_bill" target="_blank" rel="nofollow">委托方服务费发票</a>
+              <a :href="bill.third_party" target="_blank" rel="nofollow">第三方机构服务发票</a>
+              <a :href="bill.platform" target="_blank" rel="nofollow">平台服务发票</a>
+              <!-- <span>购买方服务费发票</span>
               <span>委托方服务费发票</span>
               <span>第三方机构服务发票</span>
-              <span>平台服务发票</span>
+              <span>平台服务发票</span> -->
             </div>
           </div>
 
@@ -98,106 +102,118 @@
 </template>
 
 <script>
+  import {orderInfo,orderShut} from '../../api/index'
   export default {
     props:{
       visible:{
         type:Boolean,
         require: true
+      },
+      batchcode:{
+        type:String
       }
     },
     data(){
       return{
+        closeLoad:false,
         orederActive:0,
-        newVisible:false,
+        newVisible:true,
         modeStyle:{
           'min-height':'311px',
           'padding-top':'15px'
         },
+        order:{},
+        order_info:{},
+        bill:[],
         step:0,
-        data:[
-          {
-            key: '1',
-            name: 'John Brown',
-            money: '￥300,000.00',
-            address: 'New York No. 1 Lake Park',
-          },
-          {
-            key: '2',
-            name: 'Jim Green',
-            money: '￥1,256,000.00',
-            address: 'London No. 1 Lake Park',
-          },
-          {
-            key: '3',
-            name: 'Joe Black',
-            money: '￥120,000.00',
-            address: 'Sidney No. 1 Lake Park',
-          },
-        ],
+        data:[],
         columns:[
           {
             title: '结算方',
-            className: 'table_column',
-            dataIndex: 'id',
+            dataIndex: 'close_side',
             width:'120px',
             align:'center'
           },
           {
             title: '结算内容',
-            dataIndex: 'money',
+            dataIndex: 'close_message',
             width:'120px',
             align:'center'
           },
           {
             title: '金额',
-            dataIndex: 'name',
+            dataIndex: 'money',
             width:'120px',
             align:'center'
           },
           {
             title: '税率',
-            dataIndex: '',
+            dataIndex: 'tax_rate',
             width:'120px',
             align:'center'
           },
           {
             title: '税额',
-            dataIndex: '',
+            dataIndex: 'tax_rate_money',
             width:'120px',
             align:'center'
           },
           {
             title: '结算金额',
-            dataIndex: '',
+            dataIndex: 'close_money',
             width:'120px',
             align:'center'
           },
           {
             title: '结算状态',
-            dataIndex: '',
+            dataIndex: 'close_status',
             width:'120px',
             align:'center'
           },
           {
             title: '结算流水号',
-            dataIndex: '',
+            dataIndex: 'close_number',
             width:'220px',
             align:'center'
           },
         ]
       }
     },
+    created(){
+      this.getorderInfo()
+    },
     methods:{
+      closeOrder(){
+        let data={batchcode:this.batchcode}
+        this.closeLoad=true
+        orderShut(data).then(res=>{
+          if(res.code==200){
+            this.closeLoad=false
+            this.$message.success('订单关闭成功！');
+            this.getorderInfo()
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      getorderInfo(){
+        let data={batchcode:this.batchcode}
+        orderInfo(data).then(res=>{
+          if(res.code==200){
+            this.order=res.data.order
+            this.order_info=res.data.order_info
+            this.data=res.data.close
+            this.bill=res.data.bill
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
       onClose() {
-        this.newVisible=false
+        // this.newVisible=false
         this.$emit('update:visible', false)
       }
     },
-    watch:{
-      visible(val){
-        this.newVisible=val
-      }
-    }
   }
 
 </script>
@@ -269,7 +285,7 @@
   /deep/ .ant-table-thead > tr > th {
     padding: 15px 16px;
   }
-  .order_download span{
+  .order_download span,.order_download a{
     display: inline-block;
     cursor: pointer;
     text-decoration: underline;
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index fc880a5..a0080dd 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -10,48 +10,50 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>ISLI标识码：</span>
-            <a-input/>
+            <a-input v-model="query.islicode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>标的名称:</span>
-            <a-input/>
+            <a-input v-model="query.goods_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item" >
             <span>标的类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.goods_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">文化资源数据</a-select-option>
+              <a-select-option value="2">文化数字内容</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="4" class="query_item" >
             <span>数据状态：</span>
-            <a-select default-value="全部文化数据"  @change="handleChange">
-              <a-select-option value="全部文化数据">
-                全部文化数据
-              </a-select-option>
+            <a-select default-value=""   v-model="query.data_type">
+              <a-select-option value="">全部文化数据</a-select-option>
+              <a-select-option value="1">已上架文化数据</a-select-option>
+              <a-select-option value="2">已下架文化数据</a-select-option>
+              <a-select-option value="3">已转让文化数据</a-select-option>
+              <a-select-option value="4">已失效文化数据</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.goods_entrust">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime"  valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="14" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -62,10 +64,16 @@
           <a-button type="primary" class="query_button">获 取</a-button>
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
-            <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="selectRecords()">操作记录</span>
+          <template slot="goods_status" slot-scope="goods_status">
+            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+          </template>
+          <template slot="goods_type" slot-scope="goods_type">
+            <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
+            <a-space :size="24" >
+              <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
+              <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
               <span class="table_operation">关联订单</span>
             </a-space>
           </template>
@@ -74,11 +82,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -86,81 +95,75 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <operationRecords :visible.sync="visible1"></operationRecords>
+    <dataSelect :visible.sync="visible" v-if="visible" :goods_islicode="goods_islicode" :type="0"></dataSelect>
+    <operationRecords :visible.sync="visible1" :logDate="logDate" ></operationRecords>
   </div>
 </template>
 <script>
 import dataSelect from '../../dateSelect/index.vue'
 import operationRecords from '../../operationRecords/index.vue'
 import Operation from '../../Operation.vue'
+import {getAllDate,getLog} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        islicode:'',
+        goods_name:'',
+        entrust_name:'',
+        goods_entrust:'',
+        goods_type:'',
+        data_type:'',
+        createtime:[],
+      },
+      logDate:[],
       visible:false,
       visible1:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
-      //一页多少条
-      pageSize:10,
       total:500,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      startTotal:1,
+      endTotal:10,
+      limit:10,
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: 'ISLI标识码',
-          dataIndex: 'name',
+          dataIndex: 'goods_islicode',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '委托方',
-          dataIndex: '',
+          dataIndex: 'username',
           align:'center'
         },
         {
           title: '标的类型',
-          dataIndex: '',
+          dataIndex: 'goods_type',
+          scopedSlots:{customRender:'goods_type'},
           align:'center'
         },
         {
           title: '数据状态',
-          dataIndex: '',
+          dataIndex: 'goods_status',
+          scopedSlots:{customRender:'goods_status'},
           align:'center'
         },
         {
@@ -177,25 +180,54 @@ export default {
     operationRecords
   },
   created(){
-
+    this.getAllDate()
   },
   methods:{
-    selectRecords(){
-      this.visible1=true
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getAllDate(){
+      let data=this.query
+      data.limit=this.limit
+      data.page=this.page
+      getAllDate(data).then(res=>{
+        // console.info(res)
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    selectRecords(id){
+      let data={log_id:id,type:'goods'}
+      getLog(data).then(res=>{
+        if(res.code==200){
+          this.logDate=res.data
+          this.visible1=true
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
     },
-    SelectDate(){
+    SelectDate(val){
+      this.goods_islicode=val
       this.visible=true
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getAllDate()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.getAllDate()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index d0059f0..b3d2e2c 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -11,47 +11,44 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>一级分类：</span>
-            <a-select default-value="文化资源数据"  @change="handleChange">
-              <a-select-option value="文化资源数据">
-                文化资源数据
-              </a-select-option>
-              <a-select-option value="文化数字内容">
-                文化数字内容
+            <a-select default-value=""  @change="handleChange" v-model="query.top_class">
+              <a-select-option :value="item" v-for="(item,index) in oneList" :key="index">
+                {{item}}
               </a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>二级分类：</span>
-            <a-select default-value="图片"  @change="handleChange">
-              <a-select-option value="图片">
-                图片
+            <a-select default-value=""  v-model="query.son_class">
+              <a-select-option :value="item" v-for="(item,index) in twoList" :key="index">
+                {{item}}
               </a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>创建人员：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
+            <a-select default-value=""  v-model="query.user_id">
+              <a-select-option :value="item.id" v-for="(item,index) in userList" :key="index">
+                {{item.name}}
               </a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item" >
             <span>使用状态：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""  v-model="query.usestatus">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="0">启用</a-select-option>
+              <a-select-option value="1">禁用</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
           </a-col>
           <a-col :span="19" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -59,13 +56,16 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <a-button type="primary" class="query_button" @click="visible2=true">新 增</a-button>
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="status" slot-scope="status">
+            <span>{{status==0?'启用':'禁用'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation">禁用</span>
-              <span class="table_operation" @click="selectRecords()">操作记录</span>
+              <span class="table_operation" @click="updateStatus(item.id)">{{item.status==0?'禁用':'启用'}}</span>
+              <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
             </a-space>
           </template>
         </a-table>
@@ -73,11 +73,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} / ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -85,78 +86,114 @@
         </a-pagination>
       </div>
     </div>
-    <operationRecords :visible.sync="visible1"></operationRecords>
+    <operationRecords :visible.sync="visible1" :logDate="logDate"></operationRecords>
+    <!-- 添加分类 -->
+    <a-modal  v-model="visible2" title="新增分类" width="800px" :bodyStyle="modeStyle">
+      <div class="">
+        <a-row  justify="space-between" >
+          <a-col :span="10" class="query_item">
+            <span>一级分类：</span>
+            <a-select default-value=""  @change="handleChange(1)" v-model="query1.addtop_class">
+              <a-select-option :value="item" v-for="(item,index) in oneList" :key="index">
+                {{item}}
+              </a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="10" class="query_item">
+            <span>自定义名称：</span>
+            <a-input v-model="query1.top_class"/>
+          </a-col>
+        </a-row>
+        <a-row  justify="space-between" >
+          <a-col :span="10" class="query_item">
+            <span>二级分类：</span>
+            <a-select default-value="">
+              <a-select-option :value="item" v-for="(item,index) in twoList" :key="index">
+                {{item}}
+              </a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="10" class="query_item">
+            <span>自定义名称：</span>
+            <a-input v-model="query1.son_class"/>
+          </a-col>
+        </a-row>
+      </div>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="visible2=false">返 回</a-button>
+          <a-button type="primary" @click="addClass">确定</a-button>
+        </div>
+      </template>
+    </a-modal>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
 import operationRecords from '../../operationRecords/index.vue'
+import {ClassifyList,getLog,getTop,getSon,addClass,updateStatus,getUser} from '../../../api/index'
 export default {
   data() {
     return{
       visible1:false,
+      visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       //一页多少条
       pageSize:10,
       total:500,
+      startTotal:1,
+      endTotal:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page: 1,
+      limit:10,
+      query:{
+        top_class:'',
+        son_class:'',
+        user_id:'',
+        usestatus:'',
+        createtime:[]
+      },
+      query1:{
+        top_class:'',
+        son_class:'',
+        addtop_class:''
+      },
+      modeStyle:{
+        'height':'200px'
+      },
+      logDate:[],
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
-          title: 'ISLI标识码',
-          dataIndex: 'name',
+          title: '一级分类名称',
+          dataIndex: 'top_class',
           align:'center'
         },
         {
-          title: '标的名称',
-          dataIndex: '',
+          title: '二级分类名称',
+          dataIndex: 'son_class',
           align:'center'
         },
         {
-          title: '委托方',
-          dataIndex: '',
+          title: '使用状态',
+          dataIndex: 'status',
+          scopedSlots:{customRender:'status'},
           align:'center'
         },
         {
-          title: '标的类型',
-          dataIndex: '',
-          align:'center'
-        },
-        {
-          title: '数据状态',
-          dataIndex: '',
+          title: '创建人员',
+          dataIndex: 'account_name',
           align:'center'
         },
         {
@@ -164,7 +201,10 @@ export default {
           scopedSlots: { customRender: 'operation' },
           align:'center'
         },
-      ]
+      ],
+      oneList:[],
+      twoList:[],
+      userList:[]
     }
   },
   components:{
@@ -172,18 +212,116 @@ export default {
     operationRecords
   },
   created(){
-    console.info(this.$route)
+    this.getAllDate()
+    this.getTop()
+    this.getUser()
   },
   methods:{
-    selectRecords(){
-      this.visible1=true
+    //修改状态
+    updateStatus(id){
+      let data={id:id}
+      updateStatus(data).then(res=>{
+        if(res.code==200){
+          this.$message.success('修改分类状态成功！');
+          this.getAllDate()
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    //添加分类
+    addClass(){
+      addClass(this.query1).then(res=>{
+        if(res.code==200){
+          this.$message.success('添加成功！');
+          Object.assign(this.query1, this.$options.data().query1)
+          this.getTop()
+          this.visible2=false
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+     // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    //获取二级分类
+    getSon(type){
+      let data
+      if(type==1){
+        data={top_class:this.query1.addtop_class}
+      }else{
+        data=this.query
+      }
+      getSon(data).then(res=>{
+        if(res.code==200){
+          this.twoList=res.data
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
     },
+    // 获取一级分类
+    getTop(){
+      getTop().then(res=>{
+        if(res.code==200){
+          this.oneList=res.data
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    // 获取用户
+    getUser(){
+      getUser().then(res=>{
+        if(res.code==200){
+          this.userList=res.data
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    getAllDate(){
+      let data=this.query
+      data.limit=this.limit
+      data.page=this.page
+      ClassifyList(data).then(res=>{
+        console.info(res)
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    selectRecords(id){
+      let data={log_id:id,type:'class'}
+      getLog(data).then(res=>{
+        if(res.code==200){
+          this.logDate=res.data
+          this.visible1=true
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    // 切换一页显示多少条
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getAllDate()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.getAllDate()
+    },
+    handleChange(type){
+      this.getSon(type)
     },
     onChange(){
 
@@ -192,5 +330,11 @@ export default {
 }
 </script>
 <style scoped>
-
+  /deep/ .ant-modal-header{
+    border-bottom: none;
+  }
+  /deep/ .ant-modal-footer{
+    border-top: none;
+    padding: 20px 16px;
+  }
 </style>
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index bccbdcc..5157a23 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -11,55 +11,57 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>ISLI标识码：</span>
-            <a-input/>
+            <a-input v-model="query.islicode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>标的名称:</span>
-            <a-input/>
+            <a-input v-model="query.goods_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item" >
             <span>标的类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.goods_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">文化资源数据</a-select-option>
+              <a-select-option value="2">文化数字内容</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="4" class="query_item" >
             <span>数据状态：</span>
-            <a-select default-value="全部文化数据"  @change="handleChange">
-              <a-select-option value="全部文化数据">
-                全部文化数据
-              </a-select-option>
+            <a-select default-value=""   v-model="query.data_type">
+              <a-select-option value="">全部文化数据</a-select-option>
+              <a-select-option value="1">已上架文化数据</a-select-option>
+              <a-select-option value="2">已下架文化数据</a-select-option>
+              <a-select-option value="3">已转让文化数据</a-select-option>
+              <a-select-option value="4">已失效文化数据</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.goods_entrust">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime"  valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="14" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
       </div>
       <div class="table">
         <div class="table_title">
-          <span>查询结果</span>
+          <span >查询结果</span>
           <a-button type="primary" class="query_button">获 取</a-button>
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
@@ -69,10 +71,10 @@
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
           </template>
-          <template slot="operation">
-            <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="selectRecords()">操作记录</span>
+          <template slot="operation" slot-scope="item">
+            <a-space :size="24" >
+              <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
+              <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
             </a-space>
           </template>
         </a-table>
@@ -80,11 +82,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="query.page"
-        :page-size="query.limit"
+        v-model="page"
+        :page-size="limit"
         :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -92,15 +95,15 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <operationRecords :visible.sync="visible1"></operationRecords>
+    <dataSelect v-if="visible" :visible.sync="visible" :goods_islicode="goods_islicode" :type="0"></dataSelect>
+    <operationRecords :visible.sync="visible1" :logDate="logDate"></operationRecords>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
 import dataSelect from '../../dateSelect/index.vue'
 import operationRecords from '../../operationRecords/index.vue'
-import {getAllDate} from '../../../api/index'
+import {getAllDate,getLog} from '../../../api/index'
 export default {
   data() {
     return{
@@ -108,19 +111,22 @@ export default {
         islicode:'',
         goods_name:'',
         entrust_name:'',
-        goods_entrust:'1',
-        goods_type:'1',
+        goods_entrust:'',
+        goods_type:'',
         data_type:'',
         createtime:[],
-        limit:10,
-        page:1
       },
       visible:false,
+      //数据查看所需要的数据
+      goods_islicode:'',
       visible1:false,
+      logDate:[],
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       total:500,
       startTotal:1,
       endTotal:10,
+      limit:10,
+      page:1,
       data:[],
       columns:[
         {
@@ -176,38 +182,53 @@ export default {
   },
   created(){
     this.getAllDate()
-    console.info(this.$route)
   },
   methods:{
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
     getAllDate(){
-      getAllDate(this.query).then(res=>{
-        console.info(res)
+      let data=this.query
+      data.limit=this.limit
+      data.page=this.page
+      getAllDate(data).then(res=>{
+        // console.info(res)
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start
           this.endTotal=res.data.end
           this.total=res.data.total
         }else{
-
+          this.$message.error(res.msg);
         }
       })
     },
-    selectRecords(){
-      this.visible1=true
+    selectRecords(id){
+      let data={log_id:id,type:'goods'}
+      getLog(data).then(res=>{
+        if(res.code==200){
+          this.logDate=res.data
+          this.visible1=true
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
     },
-    SelectDate(){
+    SelectDate(val){
+      this.goods_islicode=val
       this.visible=true
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.query.limit = pageSize;
+      this.limit = pageSize;
+      this.getAllDate()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.getAllDate()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index 153f018..6455c9c 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -7,7 +7,7 @@
     </div>
     <div class="body">
       <div class="query">
-        <div class="layout_item" v-for="(item,index) in layoutList">
+        <div class="layout_item" v-for="(item,index) in layoutList" :key="index" @click="changeRank(index+1)">
           <img src="../../../assets/icons/svg/layout.svg" >
           <div :class="active==index?'active':''">{{item.text}}</div>
         </div>
@@ -16,111 +16,260 @@
         <div class="table_title">
           <span>平台推荐展示</span>
           <div class="table_title_right">
-            <a-button type="primary" class="query_button">添 加</a-button>
-            <a-button  class="query_button table_title_right_del">删 除</a-button>
+            <a-button type="primary" class="query_button" @click="showAdd">添 加</a-button>
+            <a-button  class="query_button table_title_right_del" @click="delRank">删 除</a-button>
           </div>
 
         </div>
-        <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+        <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys1,onChange: onSelectChange1 }">
+          <template slot="goods_status" slot-scope="goods_status">
+            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+          </template>
+          <template slot="goods_type" slot-scope="goods_type">
+            <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation">上移</span>
-              <span class="table_operation">下移</span>
+              <span class="table_operation" @click="rankingSort(item.goods_islicode,1)">上移</span>
+              <span class="table_operation" @click="rankingSort(item.goods_islicode,2)">下移</span>
             </a-space>
           </template>
         </a-table>
+      </div>
+    </div>
+
+    <!-- 添加排行榜 -->
+    <a-modal  v-model="visible2" title="添加" width="1400px" :bodyStyle="modeStyle">
+      <div >
+        <a-row  justify="space-between" class="modal_select">
+          <a-col :span="5" class="query_item">
+            <span>ISLI标识码：</span>
+            <a-input v-model="query1.islicode"/>
+          </a-col>
+          <a-col :span="5" class="query_item">
+            <span>标的名称：</span>
+            <a-input v-model="query1.goods_name"/>
+          </a-col>
+          <a-col :span="5" class="query_item">
+            <span>委托方：</span>
+            <a-input v-model="query1.entrust_name"/>
+          </a-col>
+          <a-col :span="5" class="query_item">
+            <span>标的类型：</span>
+            <a-select default-value=""   v-model="query1.goods_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">文化资源数据</a-select-option>
+              <a-select-option value="2">文化数字内容</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="5" class="query_item">
+            <span>数据状态：</span>
+            <a-select default-value=""   v-model="query1.data_type">
+              <a-select-option value="">全部文化数据</a-select-option>
+              <a-select-option value="1">已上架文化数据</a-select-option>
+              <a-select-option value="2">已下架文化数据</a-select-option>
+              <a-select-option value="3">已转让文化数据</a-select-option>
+              <a-select-option value="4">已失效文化数据</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="5" class="query_item">
+            <span>交易方式：</span>
+            <a-select default-value=""   v-model="query1.transaction">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">协议</a-select-option>
+              <a-select-option value="2">竞价</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="5" class="query_item" >
+            <span>是否展示：</span>
+            <a-select default-value=""   v-model="query1.show">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">是</a-select-option>
+              <a-select-option value="2">否</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="5" class="query_item" >
+            <span>排序方式：</span>
+            <a-select default-value="1"   v-model="query1.order_status">
+              <a-select-option value="1">销售数量从高到低</a-select-option>
+              <a-select-option value="2">销售单价从高到低</a-select-option>
+              <a-select-option value="3">点击次数从高到低</a-select-option>
+              <a-select-option value="4">浏览次数从高到低</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="4" class="query_item query_item1">
+            <a-space :size="21">
+              <a-button type="primary" class="query_button" @click="showAdd">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
+            </a-space>
+          </a-col>
+        </a-row>
+        <a-table :columns="columns1" :data-source="data1" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys,onChange: onSelectChange }">
+          <template slot="goods_status" slot-scope="goods_status">
+            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+          </template>
+          <template slot="goods_type" slot-scope="goods_type">
+            <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
+          </template>
+          <template slot="is_recommend" slot-scope="is_recommend">
+            <span>{{is_recommend==0?'否':'是'}}</span>
+          </template>
+        </a-table>
+
         <a-pagination
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
           </template>
         </a-pagination>
+
       </div>
-    </div>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="visible2=false">返 回</a-button>
+          <a-button type="primary" @click="addRank">确定</a-button>
+        </div>
+      </template>
+    </a-modal>
+
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {rankingList,getAllDate,addRanking,delRanking,rankingSort} from '../../../api/index'
 export default {
   data() {
     return{
+      selectedRowKeys:[],
+      selectedRowKeys1:[],
+      visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       //一页多少条
       pageSize:10,
       total:500,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
+      page:1,
+      modeStyle:{
+        'min-height':'800px'
+      },
       active:0,
       layoutList:[
-        {text:'平台推荐展示'},
-        {text:'热门推荐展示'},
-        {text:'热卖推荐展示'},
+        {text:'点击量排行榜'},
+        {text:'销售量排行榜'},
+        {text:'推荐排行榜'},
       ],
-      data:[
+      query:{
+        type:'1'
+      },
+      query1:{
+        islicode:'',
+        goods_name:'',
+        entrust_name:'',
+        goods_entrust:'',
+        goods_type:'',
+        data_type:'',
+        createtime:[],
+        transaction:'',
+        show:'',
+        order_status:'1'
+      },
+      data:[],
+      data1:[],
+      columns1:[
+        {
+          title: '序号',
+          dataIndex: 'id',
+          width:'65px',
+          align:'center'
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createtime',
+          align:'center'
+        },
+        {
+          title: 'ISLI标识码',
+          dataIndex: 'goods_islicode',
+          align:'center'
+        },
         {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
+          title: '标的名称',
+          dataIndex: 'goods_name',
+          align:'center'
         },
         {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
+          title: '委托方',
+          dataIndex: 'username',
+          align:'center'
         },
         {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
+          title: '标的类型',
+          dataIndex: 'goods_type',
+          scopedSlots:{customRender:'goods_type'},
+          align:'center'
+        },
+        {
+          title: '数据状态',
+          dataIndex: 'goods_status',
+          scopedSlots:{customRender:'goods_status'},
+          align:'center'
+        },
+        {
+          title: '是否展示',
+          dataIndex: 'is_recommend',
+          scopedSlots: { customRender: 'is_recommend' },
+          align:'center'
         },
       ],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: 'ISLI标识码',
-          dataIndex: 'name',
+          dataIndex: 'goods_islicode',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '委托方',
-          dataIndex: '',
+          dataIndex: 'username',
           align:'center'
         },
-
         {
           title: '标的类型',
-          dataIndex: '',
+          dataIndex: 'goods_type',
+          scopedSlots:{customRender:'goods_type'},
           align:'center'
         },
         {
           title: '数据状态',
-          dataIndex: '',
+          dataIndex: 'goods_status',
+          scopedSlots:{customRender:'goods_status'},
           align:'center'
         },
         {
@@ -135,19 +284,99 @@ export default {
     Operation
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
+    rankingSort(goods_isli,type){
+      let data={goods_isli:goods_isli,type:type}
+      console.info(data)
+      rankingSort(data).then(res=>{
+        if(res.code==200){
+          this.$message.success(type==1?'上移':'下移'+'成功！');
+          this.getList()
+          this.selectedRowKeys1=[]
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    delRank(){
+      let data={goods_isli:this.selectedRowKeys1}
+      delRanking(data).then(res=>{
+        if(res.code==200){
+          this.$message.success('删除成功！');
+          this.selectedRowKeys1=[]
+          this.getList()
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    addRank(){
+      let data={goods_isli:this.selectedRowKeys}
+      addRanking(data).then(res=>{
+        if(res.code==200){
+          this.$message.success('添加成功！');
+          this.selectedRowKeys=[]
+          this.resetQurey()
+          this.visible2=false
+          this.getList()
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query1, this.$options.data().query1)
+    },
+    onSelectChange(keys){
+      this.selectedRowKeys = keys;
+    },
+    onSelectChange1(keys){
+      this.selectedRowKeys1 = keys;
+    },
+    showAdd(){
+      let data=this.query1
+      data.limit=this.limit
+      data.page=this.page
+      getAllDate(data).then(res=>{
+        if(res.code==200){
+          this.data1=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+          if(!this.visible2)this.visible2=true
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    changeRank(val){
+      this.query.type=val
+      this.active=val-1
+      this.selectedRowKeys1=[]
+      this.getList()
+    },
+    getList(){
+      rankingList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.showAdd()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.showAdd()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
@@ -176,4 +405,14 @@ export default {
     color: white !important;
     background-color: #4E5969;
   }
+  /deep/ .ant-modal-header{
+    border-bottom: none;
+  }
+  /deep/ .ant-modal-footer{
+    border-top: none;
+    padding: 20px 16px;
+  }
+  .modal_select{
+    margin-bottom: 23px;
+  }
 </style>
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 4ec8fe1..1ed583b 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -11,46 +11,47 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>标的名称：</span>
-            <a-input/>
+            <span>标的名称:</span>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="9" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -58,13 +59,16 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -72,11 +76,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -84,89 +89,84 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'5',
+        createtime:'',
+        goods_isli:'',
+      },
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
+      total:0,
       //一页多少条
-      pageSize:10,
-      total:500,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
@@ -183,25 +183,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 7a4b2be..ab470c0 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -11,46 +11,47 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>标的名称：</span>
-            <a-input/>
+            <span>标的名称:</span>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="9" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -58,13 +59,16 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -72,11 +76,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -84,89 +89,84 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'4',
+        createtime:'',
+        goods_isli:'',
+      },
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
+      total:0,
       //一页多少条
-      pageSize:10,
-      total:500,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
@@ -183,25 +183,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 3014aba..22c8565 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -11,54 +11,58 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>标的名称:</span>
-            <a-input/>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item" >
             <span>交易状态：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""  v-model="query.transaction_status">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">待付款</a-select-option>
+              <a-select-option value="2">待交付</a-select-option>
+              <a-select-option value="3">待结算</a-select-option>
+              <a-select-option value="4">已完成</a-select-option>
+              <a-select-option value="5">已关闭</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="4" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -66,13 +70,19 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="status" slot-scope="status">
+            <span>{{status==1?'待付款':status==2?'待交付':status==3?'待结算':status==4?'已完成':'已关闭'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -80,11 +90,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -92,94 +103,90 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'',
+        createtime:'',
+        goods_isli:'',
+      },
+      batchcode:'',
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
-      //一页多少条
-      pageSize:10,
-      total:500,
+      total:0,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
           title: '交易状态',
-          dataIndex: '',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' },
           align:'center'
         },
         {
@@ -196,25 +203,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index 5231337..532fd3f 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -11,46 +11,47 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>标的名称:</span>
-            <a-input/>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="9" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -58,13 +59,15 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -72,11 +75,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -84,89 +88,84 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'1',
+        createtime:'',
+        goods_isli:'',
+      },
+      batchcode:'',
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
-      //一页多少条
-      pageSize:10,
-      total:500,
+      total:0,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
@@ -183,25 +182,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page, pageSize){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 947191d..14f7381 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -11,46 +11,47 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>标的名称：</span>
-            <a-input/>
+            <span>标的名称:</span>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="9" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -58,13 +59,16 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -72,11 +76,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -84,89 +89,84 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'2',
+        createtime:'',
+        goods_isli:'',
+      },
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
+      total:0,
       //一页多少条
-      pageSize:10,
-      total:500,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
@@ -183,25 +183,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index 2c6658b..e360020 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -11,46 +11,47 @@
         <a-row  justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>订单编号：</span>
-            <a-input/>
+            <a-input v-model="query.batchcode"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托方：</span>
-            <a-input/>
+            <a-input v-model="query.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>购买方：</span>
-            <a-input/>
+            <a-input v-model="query.buy_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
             <span>标的名称:</span>
-            <a-input/>
+            <a-input v-model="query.goods_name"/>
           </a-col>
 
           <a-col :span="5" class="query_item" >
             <span>订单类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.order_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">委托订单</a-select-option>
+              <a-select-option value="2">认证订单</a-select-option>
+              <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col>
 
           <a-col :span="5" class="query_item">
             <span>委托类型：</span>
-            <a-select default-value="全部"  @change="handleChange">
-              <a-select-option value="全部">
-                全部
-              </a-select-option>
+            <a-select default-value=""   v-model="query.entrust_type">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">转让</a-select-option>
+              <a-select-option value="2">许可</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :span="9" class="query_item query_item1">
             <a-space :size="21">
-              <a-button type="primary" class="query_button">查 询</a-button>
-              <a-button class="query_button">重 置</a-button>
+              <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
+              <a-button class="query_button" @click="resetQurey">重 置</a-button>
             </a-space>
           </a-col>
         </a-row>
@@ -58,13 +59,16 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
-          <template slot="operation">
+          <template slot="type" slot-scope="type">
+            <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
+          </template>
+          <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate()">数据查看</span>
-              <span class="table_operation" @click="SelectOrder()">订单详情</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
         </a-table>
@@ -72,11 +76,12 @@
         class="pagination"
         size="small"
         :total="total"
-        v-model="current"
-        :page-size="pageSize"
-        :show-total="total => `第 ${current} / ${pageSize} 条 / 总共 ${total} 条`"
+        v-model="page"
+        :page-size="limit"
+        :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
         :page-size-options="pageSizeOptions"
         @showSizeChange="onShowSizeChange"
+        @change="changePage"
         show-size-changer >
           <template slot="buildOptionText" slot-scope="props">
             <span >{{ props.value }}条/页</span>
@@ -84,89 +89,84 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible"></dataSelect>
-    <orderDetails :visible.sync="visible2"></orderDetails>
+    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
 <script>
 import Operation from '../../Operation.vue'
+import {getOrderList} from '../../../api/index'
 export default {
   data() {
     return{
+      query:{
+        batchcode:'',
+        entrust_name:'',
+        buy_name:'',
+        goods_name:'',
+        order_type:'',
+        entrust_type:'',
+        transaction_status:'3',
+        createtime:'',
+        goods_isli:'',
+      },
       visible:false,
       visible2:false,
       pageSizeOptions: ['10', '20', '30', '40', '50'],
+      total:0,
       //一页多少条
-      pageSize:10,
-      total:500,
+      startTotal:1,
+      endTotal:10,
+      limit:10,
       // 当前页数
-      current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      page:1,
+      data:[],
       columns:[
         {
           title: '序号',
-          className: 'table_column',
           dataIndex: 'id',
           width:'65px',
           align:'center'
         },
         {
           title: '创建时间',
-          dataIndex: 'money',
+          dataIndex: 'createtime',
           align:'center'
         },
         {
           title: '订单编号',
-          dataIndex: 'name',
+          dataIndex: 'batchcode',
           align:'center'
         },
         {
           title: '委托方/收款方',
-          dataIndex: '',
+          dataIndex: 'entrust_name',
           align:'center'
         },
         {
           title: '标的名称',
-          dataIndex: '',
+          dataIndex: 'goods_name',
           align:'center'
         },
         {
           title: '购买方/付款方',
-          dataIndex: '',
+          dataIndex: 'buy_username',
           align:'center'
         },
         {
           title: '订单类型',
-          dataIndex: '',
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' },
           align:'center'
         },
         {
           title: '委托类型',
-          dataIndex: '',
+          dataIndex: 'entrust_type',
           align:'center'
         },
         {
           title: '交易总额',
-          dataIndex: '',
+          dataIndex: 'total_money',
           align:'center'
         },
         {
@@ -183,25 +183,43 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
-    console.info(this.$route)
+    this.getList()
   },
   methods:{
-    SelectOrder(){
+    // 重置query
+    resetQurey(){
+      Object.assign(this.query, this.$options.data().query)
+    },
+    getList(){
+      getOrderList(this.query).then(res=>{
+        if(res.code==200){
+          this.data=res.data.data
+          this.startTotal=res.data.start
+          this.endTotal=res.data.end
+          this.total=res.data.total
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    SelectOrder(val){
+      this.batchcode=val
       this.visible2=true
     },
-    SelectDate(){
+    SelectDate(val){
       this.visible=true
+      this.batchcode=val
     },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
-      this.pageSize = pageSize;
+      this.limit = pageSize;
+      this.getList()
     },
-    handleChange(){
-
+    // 切换页数
+    changePage(page){
+      this.page=page
+      this.getList()
     },
-    onChange(){
-
-    }
   }
 }
 </script>