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

---
 src/api/index.js                              |   8 +
 src/components/page/Deal.vue                  | 170 ++++++++++-----
 src/components/page/Hoster/myAssets.vue       | 203 ++++++++++--------
 src/components/page/Hoster/myOrder.vue        | 170 ++++++++++-----
 src/components/page/Listing.vue               |   4 +-
 .../page/Purchaser/myCollection.vue           | 165 +++++++++-----
 src/components/page/Purchaser/myOrder.vue     | 155 +++++++++----
 7 files changed, 590 insertions(+), 285 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index f0550e6..dafac96 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -224,3 +224,11 @@ export const CollectList = query => {
       params: query
   });
 };
+// 获取顶级资产类型
+export const getTopAssetClass = query => {
+  return request({
+      url: '/api/user.Asset/getTopAssetClass',
+      method: 'get',
+      params: query
+  });
+};
diff --git a/src/components/page/Deal.vue b/src/components/page/Deal.vue
index f0d0ffb..8a16a23 100644
--- a/src/components/page/Deal.vue
+++ b/src/components/page/Deal.vue
@@ -1,46 +1,94 @@
 <template>
   <div>
     <div class="seach">
-      <div class="seach_item">
-        <span>挂牌代码</span>
-        <el-input v-model="query.cartellino_id" placeholder="请输入挂牌代码" class="seach_input"></el-input>
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>
+            全部资产 （
+            <span class="seach1_item_span">{{pageTotal}}</span>
+            ）
+          </span>
+        </div>
+        <div class="seach1_item">
+          <el-select  v-model="query.sort" @change="getData">
+            <el-option :key="0" label="资产价格升序" :value="1"></el-option>
+            <el-option :key="1" label="资产价格降序" :value="2"></el-option>
+            <el-option :key="2" label="挂牌时间升序" :value="3"></el-option>
+            <el-option :key="3" label="挂牌时间降序" :value="4"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <el-date-picker
+            v-model="query.create_time"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="getData">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>价格</span>
+          <el-input
+            class="seach_input"
+            v-model="query.min_price">
+            <span slot="prefix" class="el-input__icon ">￥</span>
+          </el-input>
+          <span>-</span>
+          <el-input
+            class="seach_input"
+            v-model="query.max_price">
+            <span slot="prefix" class="el-input__icon ">￥</span>
+          </el-input>
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
       </div>
-      <div class="seach_item">
-        <span>标的挂牌类型</span>
-        <el-select v-model="query.cartellino_type" placeholder="全部" class="seach_input">
-          <el-option key="1" label="全部" value="全部"></el-option>
-          <el-option key="2" label="协议" value="协议"></el-option>
-          <el-option key="3" label="拍卖" value="拍卖"></el-option>
-        </el-select>
-      </div>
-      <div class="seach_item">
-        <span>标的资产类型</span>
-        <el-input v-model="query.cartellino_type" placeholder="请输入资产类型关键字" class="seach_input"></el-input>
-      </div>
-      <div class="seach_item">
-        <span>标的名称</span>
-        <el-input v-model="query.asset_name" placeholder="请输入标的名称关键字" class="seach_input"></el-input>
+
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>挂牌类型</span>
+          <el-select      v-model="query.cartellino_type" @change="getData" class="seach1_select">
+            <el-option :key="0" label="全部" value=""></el-option>
+            <el-option :key="1" label="协议" :value="1"></el-option>
+            <el-option :key="2" label="拍卖" :value="2"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>挂牌方名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌方关键字"
+            v-model="query.sell_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>挂牌编号</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌编号"
+            v-model="query.cartellino_id">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>标的名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.asset_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
       </div>
 
-      <el-dropdown trigger="click">
-        <span class="el-dropdown-link">
-          排序<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>黄金糕</el-dropdown-item>
-          <el-dropdown-item>狮子头</el-dropdown-item>
-          <el-dropdown-item>螺蛳粉</el-dropdown-item>
-          <el-dropdown-item disabled>双皮奶</el-dropdown-item>
-          <el-dropdown-item divided>蚵仔煎</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
     </div>
 
     <div class="tabs">
       <el-table
         :data="listData"
         header-cell-class-name="theader"
-        :header-cell-style="{background:'#F8E6E6 !important',color:'#C94C4C',height:'60px',fontSize:'14px'}"
+        :header-cell-style="{background:'#F3F3F3 !important',color:'#333333',height:'60px',fontSize:'14px'}"
         style="width: 100%">
         <el-table-column
           prop="asset_id"
@@ -111,7 +159,7 @@ export default {
       query:{
         page:1,
         limit:10,
-        sort:'',
+        sort:1,
         create_time:'',
         min_price:'',
         max_price:'',
@@ -130,7 +178,7 @@ export default {
   methods:{
     //时间戳转换时间
     formatDate(row,colnum){
-      return moment(row.create_time*1000).format('YYYY-MM-DD HH:mm:ss')
+      return moment(row[colnum.property]*1000).format('YYYY-MM-DD HH:mm:ss')
     },
     getData(){
       delist(this.query).then(res => {
@@ -153,29 +201,53 @@ export default {
 </script>
 <style scoped>
   .seach{
-    display: flex;
-    background-color: #FDF8F8;
-    border: 1px solid #E9B7B7;
+    margin: 20px 0;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
+  }
+  .seach1{
+    width: 100%;
     height: 50px;
-    margin-top: 30px;
-    padding: 0 15px;
-    justify-content: space-between;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
+    display: flex;
     align-items: center;
   }
-  .seach_item{
+  .seach1:last-child{
+    border-top: none;
+  }
+  .seach1_item{
+    padding: 0 20px;
     display: flex;
     align-items: center;
-    font-size: 14px;
-
+    border-right: 1px solid #D7D7D7;
+    font-size: 12px;
+    height: 100%;
   }
-  .seach_input{
-    width: 170px;
-    border: 1px solid #E9B7B7;
-    margin-left: 15px;
+  .seach1_item_span{
+    color: #C94C4C;
+  }
+  .seach1_item:last-child{
+    border-right: none;
   }
-  .seach_input>>>.el-input__inner{
-    border: none;
-    padding-left: 5px;
+  .select_city{
+    margin: 0 15px;
   }
   .el-dropdown-link{
     color: #EAB1B1;
diff --git a/src/components/page/Hoster/myAssets.vue b/src/components/page/Hoster/myAssets.vue
index 3fb8a8c..4d16527 100644
--- a/src/components/page/Hoster/myAssets.vue
+++ b/src/components/page/Hoster/myAssets.vue
@@ -7,28 +7,51 @@
       <button class="hedaer_button" @click="goDetails('',1)">资产挂牌</button>
     </div>
     <div class="seach">
-      <div class="seach_item">
-        <el-input v-model="query.search_name" placeholder="请输入资产名称/资产编号或托管方名称" class="seach_input" suffix-icon="el-icon-search"></el-input>
-      </div>
-      <div class="seach_item">
-        <el-date-picker
-          v-model="query.time"
-          class="seach_input1"
-          type="date"
-          placeholder="选择日期">
-        </el-date-picker>
-      </div>
-      <div class="seach_item">
-        <span class="el-dropdown-link">
-          展开更多筛选条件
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>订单类型</span>
+          <el-select      v-model="query.cartellino_type" @change="assetList" class="seach1_select">
+            <el-option :key="0" label="全部" value=""></el-option>
+            <el-option :key="1" label="协议" :value="1"></el-option>
+            <el-option :key="2" label="拍卖" :value="2"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>创建时间</span>
+          <el-date-picker
+            v-model="query.date"
+            type="date"
+            placeholder="选择日期"
+            class="seach1_select1"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="assetList">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>资产分类</span>
+          <el-select  v-model="query.asset_type_id" @change="assetList" class="seach1_select">
+            <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in AssetClass"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>资产名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.serial_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="assetList" class="seach_button">确定</button>
+        </div>
       </div>
     </div>
     <div class="body">
       <el-table
         :data="assetLists"
         style="width: 100%"
+        :header-cell-style="{background:'#F3F3F3 !important',color:'#333333',height:'60px',fontSize:'14px'}"
         :row-class-name="tableRowClassName">
         <el-table-column prop="id" label="序号" width="50" align="center"></el-table-column>
         <el-table-column prop="name" label="资产" width="280" align="center">
@@ -68,37 +91,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- <div class="order_item" v-for="(item,index) in assetLists" :key="index">
-        <div class="order_item_id">{{item.id}}</div>
-        <img :src="item.serial_img" alt="" class="order_item_img">
-        <div class="order_item_info">
-          <div class="order_item_info_title">
-            <span>{{item.create_time | formatDate}}</span>
-            <span>订单编号：15852458965124</span>
-            <span>托管方：东莞市芳华沉香园林景观有限公司</span>
-            <span>资产编号：{{item.serial}}</span>
-          </div>
-          <div class="order_item_info_content">
-            <div class="order_item_info_content_left">
-              <p>{{item.serial_name}}</p>
-              <p>运费：¥ 80.00</p>
-              <p>服务费：¥ 1,000.00</p>
-            </div>
-            <div class="order_item_info_content_price">
-              <p class="order_item_info_content_price_p">¥ 30,000.00</p>
-              <p>单价：¥ 10,000.00</p>
-            </div>
-            <div class="order_item_id">数量：{{item.count}}</div>
-            <div class="order_item_info_content_all">交易总额：¥ 31,080.00</div>
-            <div>交易状态：已完成</div>
-            <div class="order_item_info_content_operation">
-              <p>订单详情</p>
-              <p>在线联系</p>
-              <p>查看评价</p>
-            </div>
-          </div>
-        </div>
-      </div> -->
     </div>
     <div class="pagination">
       <el-pagination
@@ -114,16 +106,18 @@
 </template>
 <script>
 import moment from 'moment'
-import {assetList,soldOut} from '../../../api/index'
+import {assetList,getTopAssetClass} from '../../../api/index'
 export default {
   data(){
     return{
       query:{
-        search_name:'',
-        time:'',
+        cartellino_type:'',
+        date:'',
         page:1,
         limit:10,
-        status:''
+        status:'',
+        asset_type_id:'',
+        serial_name:''
       },
       assetLists:[],
       pageTotal:0,
@@ -135,14 +129,24 @@ export default {
         {name:'已下架',url:''},
         {name:'已转让',url:''},
       ],
-      header_active:0
+      header_active:0,
+      AssetClass:[]
     }
   },
   created(){
     this.assetList()
+    this.getTopAssetClass()
   },
   methods:{
-    soldOut(){
+    getTopAssetClass(){
+      getTopAssetClass(this.query).then(res => {
+        console.info(res)
+        if(res.code==100){
+          this.AssetClass=res.data;
+        }else{
+          this.$message.error(res.msg)
+        }
+      })
     },
     goDetails(id,type){
       console.info(111)
@@ -185,6 +189,67 @@ export default {
 }
 </script>
 <style scoped>
+  .seach1_select1{
+    margin-left: 10px;
+  }
+  .body_header{
+    background: #F2F2F2;
+    width: 100%;
+    border: 1px solid #D7D7D7;
+    border-top: none;
+    font-size: 14px;
+    color: #333333;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+  .body_header span{
+    display: inline-block;
+    text-align: center;
+  }
+  .seach{
+    margin-top: 20px;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
+  }
+  .seach1{
+    width: 100%;
+    height: 50px;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+  }
+  .seach1_item{
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    height: 100%;
+  }
+  .seach1_item_span{
+    color: #C94C4C;
+  }
+  .select_city{
+    margin: 0 15px;
+  }
   .header{
     font-size: 14px;
     display: flex;
@@ -219,42 +284,10 @@ export default {
     font-size: 16px;
     font-weight: bold;
   }
-  .seach{
-    display: flex;
-    background-color: #FDF8F8;
-    border: 1px solid #E9B7B7;
-    height: 50px;
-    margin-top: 30px;
-    align-items: center;
-  }
-  .seach_item{
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    margin-left: 20px;
-
-  }
-  .seach_input{
-    width: 260px;
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1{
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1>>>.el-input__inner{
-    border: none;
-  }
-  .seach_input>>>.el-input__inner{
-    border: none;
-    padding-left: 5px;
-  }
   .el-dropdown-link{
     color: #EAB1B1;
     cursor: pointer;
   }
-  .body{
-    margin-top: 10px;
-  }
   .order_item{
     width: 100%;
     display: flex;
diff --git a/src/components/page/Hoster/myOrder.vue b/src/components/page/Hoster/myOrder.vue
index 1f14e4c..0617e46 100644
--- a/src/components/page/Hoster/myOrder.vue
+++ b/src/components/page/Hoster/myOrder.vue
@@ -4,22 +4,55 @@
       <span v-for="(item,index) in headerList" :key="index" :class="header_active==index ? 'header_active':''" @click="changeSelect(index,item.type)">{{item.name}}</span>
     </div>
     <div class="seach">
-      <div class="seach_item">
-        <el-input v-model="query.cartellino_type" placeholder="请输入资产名称/资产编号或托管方名称" class="seach_input" suffix-icon="el-icon-search"></el-input>
-      </div>
-      <div class="seach_item">
-        <el-date-picker
-          v-model="query.create_time"
-          class="seach_input1"
-          type="date"
-          placeholder="选择日期">
-        </el-date-picker>
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>订单类型</span>
+          <el-select      v-model="query.cartellino_type" @change="getData" class="seach1_select">
+            <el-option :key="0" label="全部" value=""></el-option>
+            <el-option :key="1" label="协议" :value="1"></el-option>
+            <el-option :key="2" label="拍卖" :value="2"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>摘牌方名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌方关键字"
+            v-model="query.buyer">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>下单时间</span>
+          <el-date-picker
+            v-model="query.create_time"
+            type="date"
+            placeholder="选择日期"
+            class="seach1_select1"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="getData">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>资产名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.asset_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
       </div>
-      <div class="seach_item">
-        <span class="el-dropdown-link">
-          展开更多筛选条件
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
+      <div class="body_header">
+        <span style="width:48px">序号</span>
+        <span style="width:495px">资产</span>
+        <span style="width:100px">单价</span>
+        <span style="width:170px">数量</span>
+        <span style="width:115px">交易总额</span>
+        <span style="width:170px">交易状态</span>
+        <span style="width:75px;text-align: right;">交易操作</span>
       </div>
     </div>
     <div class="body">
@@ -40,11 +73,11 @@
               <p>印花税：¥ {{item.printing_tax}}</p>
             </div>
             <div class="order_item_info_content_price">
-              <p>单价：¥ {{item.price}}</p>
+              <p>¥ {{item.price}}</p>
             </div>
-            <div class="order_item_id">数量：{{item.count}}</div>
-            <div class="order_item_info_content_all">交易总额：¥ {{item.total_price}}</div>
-            <div>交易状态：
+            <div class="order_item_id">{{item.count}}</div>
+            <div class="order_item_info_content_all">¥ {{item.total_price}}</div>
+            <div>
               <span v-if="item.status==0">待支付</span>
               <span v-else-if="item.status==1">待审核付款</span>
               <span v-else-if="item.status==2">待上传签约合同</span>
@@ -92,7 +125,7 @@ export default {
         limit:10,
         order_status:''
       },
-      pageTotal:50,
+      pageTotal:0,
 
       headerList:[
         {name:'全部订单',type:''},
@@ -157,6 +190,70 @@ export default {
 }
 </script>
 <style scoped>
+  .seach1_select1{
+    margin-left: 10px;
+  }
+  .body_header{
+    background: #F2F2F2;
+    width: 100%;
+    border: 1px solid #D7D7D7;
+    border-top: none;
+    font-size: 14px;
+    color: #333333;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+  .body_header span{
+    display: inline-block;
+    text-align: center;
+  }
+  .seach{
+    margin: 20px 0;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
+  }
+  .seach1{
+    width: 100%;
+    height: 50px;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+  }
+  .seach1:last-child{
+    border-top: none;
+  }
+  .seach1_item{
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    height: 100%;
+  }
+  .seach1_item_span{
+    color: #C94C4C;
+  }
+  .select_city{
+    margin: 0 15px;
+  }
   .header{
     font-size: 14px;
   }
@@ -176,35 +273,6 @@ export default {
     font-size: 16px;
     font-weight: bold;
   }
-  .seach{
-    display: flex;
-    background-color: #FDF8F8;
-    border: 1px solid #E9B7B7;
-    height: 50px;
-    margin-top: 30px;
-    align-items: center;
-  }
-  .seach_item{
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    margin-left: 20px;
-
-  }
-  .seach_input{
-    width: 260px;
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1{
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1>>>.el-input__inner{
-    border: none;
-  }
-  .seach_input>>>.el-input__inner{
-    border: none;
-    padding-left: 5px;
-  }
   .el-dropdown-link{
     color: #EAB1B1;
     cursor: pointer;
@@ -220,7 +288,7 @@ export default {
     padding: 15px 0;
   }
   .order_item:nth-child(2n+2){
-    background-color: #FDF8F8;
+    background-color: #F2F2F2;
   }
   .order_item_id{
     padding: 0 15px;
@@ -246,6 +314,8 @@ export default {
     justify-content: space-between;
     margin-top: 5px;
     color: #333333;
+    padding-right: 15px;
+    box-sizing: border-box;
   }
   .order_item_info_content_left p{
     width: 300px;
diff --git a/src/components/page/Listing.vue b/src/components/page/Listing.vue
index ea31c7e..dc3a429 100644
--- a/src/components/page/Listing.vue
+++ b/src/components/page/Listing.vue
@@ -10,7 +10,7 @@
           </span>
         </div>
         <div class="seach1_item">
-          <el-select  placeholder="选择具体区镇"    v-model="query.select" @change="getData">
+          <el-select  v-model="query.select" @change="getData">
             <el-option :key="0" label="资产价格升序" :value="0"></el-option>
             <el-option :key="1" label="资产价格降序" :value="1"></el-option>
             <el-option :key="2" label="挂牌时间升序" :value="2"></el-option>
@@ -23,7 +23,7 @@
             type="date"
             placeholder="选择日期"
             format="yyyy 年 MM 月 dd 日"
-            value-format="timestamp"
+            value-format="yyyy-MM-dd"
             @change="getData">
           </el-date-picker>
         </div>
diff --git a/src/components/page/Purchaser/myCollection.vue b/src/components/page/Purchaser/myCollection.vue
index 637a1c6..79e670c 100644
--- a/src/components/page/Purchaser/myCollection.vue
+++ b/src/components/page/Purchaser/myCollection.vue
@@ -1,33 +1,59 @@
 <template>
   <div>
-    <div class="seach">
-      <div class="seach_item">
-        <el-input v-model="query.input" placeholder="请输入资产名称/资产编号或托管方名称" class="seach_input" suffix-icon="el-icon-search"></el-input>
-      </div>
-      <div class="seach_item">
-        <el-date-picker
-          v-model="query.time"
-          class="seach_input1"
-          type="date"
-          placeholder="选择日期">
-        </el-date-picker>
+
+  <div class="seach">
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>订单类型</span>
+          <el-select      v-model="query.cartellino_type" @change="getData" class="seach1_select">
+            <el-option :key="0" label="全部" value=""></el-option>
+            <el-option :key="1" label="协议" :value="1"></el-option>
+            <el-option :key="2" label="拍卖" :value="2"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>挂牌方名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌方关键字"
+            v-model="query.username">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>收藏时间</span>
+          <el-date-picker
+            v-model="query.pay_time"
+            type="date"
+            placeholder="选择日期"
+            class="seach1_select1"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="getData">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>资产名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.serial_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
       </div>
-      <div class="seach_item">
-        <span class="el-dropdown-link">
-          展开更多筛选条件
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
+
+      <div class="body_header">
+        <span style="width:48px">序号</span>
+        <span style="width:495px">资产</span>
+        <span style="width:115px">单价</span>
+        <span style="width:165px">数量</span>
+        <span style="width:140px">交易总额</span>
+        <span style="width:135px"></span>
+        <span style="width:85px;text-align: right;">交易操作</span>
       </div>
     </div>
-    <div class="body_header">
-      <span style="width:48px">序号</span>
-      <span style="width:485px">资产</span>
-      <span style="width:120px">单价</span>
-      <span style="width:155px">数量</span>
-      <span style="width:130px">交易总额</span>
-      <span style="width:130px"></span>
-      <span style="width:85px;text-align: right;">交易操作</span>
-    </div>
     <div class="body">
       <div class="order_item" v-for="(item,index) in orderList" :key="index">
         <div class="order_item_id" style="width:48px">{{item.asset_id}}</div>
@@ -124,13 +150,61 @@ export default {
 }
 </script>
 <style scoped>
-.body_header{
-    background: #F8E6E6;
+  .seach1_select1{
+    margin-left: 10px;
+  }
+  .seach{
+    margin: 20px 0;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
+  }
+  .seach1{
     width: 100%;
-    border: 1px solid #E9B7B7;
+    height: 50px;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+  }
+  .seach1:last-child{
     border-top: none;
-    font-size: 14px;
+  }
+  .seach1_item{
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    height: 100%;
+  }
+  .seach1_item_span{
     color: #C94C4C;
+  }
+  .select_city{
+    margin: 0 15px;
+  }
+  .body_header{
+    background: #F2F2F2;
+    width: 100%;
+    border: 1px solid #D7D7D7;
+    border-top: none;
+    font-size: 14px;
+    color: #333333;
     height: 50px;
     display: flex;
     align-items: center;
@@ -159,35 +233,6 @@ export default {
     font-size: 16px;
     font-weight: bold;
   }
-  .seach{
-    display: flex;
-    background-color: #FDF8F8;
-    border: 1px solid #E9B7B7;
-    height: 50px;
-    margin-top: 30px;
-    align-items: center;
-  }
-  .seach_item{
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    margin-left: 20px;
-
-  }
-  .seach_input{
-    width: 260px;
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1{
-    border: 1px solid #E9B7B7;
-  }
-  .seach_input1>>>.el-input__inner{
-    border: none;
-  }
-  .seach_input>>>.el-input__inner{
-    border: none;
-    padding-left: 5px;
-  }
   .el-dropdown-link{
     color: #EAB1B1;
     cursor: pointer;
@@ -205,7 +250,7 @@ export default {
     box-sizing: border-box;
   }
   .order_item:nth-child(2n+2){
-    background-color: #FDF8F8;
+    background-color: #F2F2F2;
   }
   .order_item_id{
     padding: 0 15px;
@@ -234,6 +279,8 @@ export default {
     justify-content: space-between;
     margin-top: 5px;
     color: #333333;
+    /* padding-right: 15px;
+    box-sizing: border-box; */
   }
   .order_item_info_content_left p{
     width: 300px;
diff --git a/src/components/page/Purchaser/myOrder.vue b/src/components/page/Purchaser/myOrder.vue
index 3f72932..7f45c57 100644
--- a/src/components/page/Purchaser/myOrder.vue
+++ b/src/components/page/Purchaser/myOrder.vue
@@ -3,25 +3,60 @@
     <div class="header">
       <span v-for="(item,index) in headerList" :key="index" :class="header_active==index ? 'header_active':''" @click="changeSelect(index,item.type)">{{item.name}}</span>
     </div>
+
     <div class="seach">
-      <div class="seach_item">
-        <el-input v-model="query.cartellino_type" placeholder="请输入资产名称/资产编号或托管方名称" class="seach_input" suffix-icon="el-icon-search"></el-input>
-      </div>
-      <div class="seach_item">
-        <el-date-picker
-          v-model="query.create_time"
-          class="seach_input1"
-          type="date"
-          placeholder="选择日期">
-        </el-date-picker>
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>订单类型</span>
+          <el-select      v-model="query.cartellino_type" @change="getData" class="seach1_select">
+            <el-option :key="0" label="全部" value=""></el-option>
+            <el-option :key="1" label="资产交易" :value="1"></el-option>
+            <el-option :key="2" label="资产评估报告" :value="2"></el-option>
+          </el-select>
+        </div>
+        <div class="seach1_item">
+          <span>挂牌方名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌方关键字"
+            v-model="query.sell_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>下单时间</span>
+          <el-date-picker
+            v-model="query.create_time"
+            type="date"
+            placeholder="选择日期"
+            class="seach1_select1"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="getData">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>资产名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.asset_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
       </div>
-      <div class="seach_item">
-        <span class="el-dropdown-link">
-          展开更多筛选条件
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
+      <div class="body_header">
+        <span style="width:48px">序号</span>
+        <span style="width:485px">资产</span>
+        <span style="width:100px">单价</span>
+        <span style="width:140px">数量</span>
+        <span style="width:160px">交易总额</span>
+        <span style="width:170px">交易状态</span>
+        <span style="width:75px;text-align: right;">交易操作</span>
       </div>
     </div>
+
     <div class="body">
       <div class="order_item" v-for="(item,index) in orderList" :key="index">
         <div class="order_item_id">{{item.id}}</div>
@@ -40,11 +75,11 @@
               <p>印花税：¥ {{item.printing_tax}}</p>
             </div>
             <div class="order_item_info_content_price">
-              <p>单价：¥ {{item.price}}</p>
+              <p>¥ {{item.price}}</p>
             </div>
-            <div class="order_item_id">数量：{{item.count}}</div>
+            <div class="order_item_id">{{item.count}}</div>
             <div class="order_item_info_content_all">交易总额：¥ {{item.total_price}}</div>
-            <div>交易状态：
+            <div>
               <span v-if="item.status==0">待支付</span>
               <span v-else-if="item.status==1">待审核付款</span>
               <span v-else-if="item.status==2">待上传签约合同</span>
@@ -135,7 +170,10 @@ export default {
       this.query.order_status=type
       this.getData()
     },
-    getData(){
+    getData(type){
+      if (type==1) {
+        // this.query.create_time=this.query.create_time/1000
+      }
       buyer_order_list(this.query).then(res => {
         console.info(res)
         if(res.code==100){
@@ -155,6 +193,25 @@ export default {
 }
 </script>
 <style scoped>
+  .seach1_select1{
+    margin-left: 10px;
+  }
+  .body_header{
+    background: #F2F2F2;
+    width: 100%;
+    border: 1px solid #D7D7D7;
+    border-top: none;
+    font-size: 14px;
+    color: #333333;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+  .body_header span{
+    display: inline-block;
+    text-align: center;
+  }
   .header{
     font-size: 14px;
   }
@@ -175,33 +232,49 @@ export default {
     font-weight: bold;
   }
   .seach{
-    display: flex;
-    background-color: #FDF8F8;
-    border: 1px solid #E9B7B7;
-    height: 50px;
-    margin-top: 30px;
-    align-items: center;
+    margin: 20px 0;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
   }
-  .seach_item{
+  .seach1{
+    width: 100%;
+    height: 50px;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
     display: flex;
     align-items: center;
-    font-size: 14px;
-    margin-left: 20px;
-
   }
-  .seach_input{
-    width: 260px;
-    border: 1px solid #E9B7B7;
+  .seach1:last-child{
+    border-top: none;
   }
-  .seach_input1{
-    border: 1px solid #E9B7B7;
+  .seach1_item{
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    height: 100%;
   }
-  .seach_input1>>>.el-input__inner{
-    border: none;
+  .seach1_item_span{
+    color: #C94C4C;
   }
-  .seach_input>>>.el-input__inner{
-    border: none;
-    padding-left: 5px;
+  .select_city{
+    margin: 0 15px;
   }
   .el-dropdown-link{
     color: #EAB1B1;
@@ -218,7 +291,7 @@ export default {
     padding: 15px 0;
   }
   .order_item:nth-child(2n+2){
-    background-color: #FDF8F8;
+    background-color: #F2F2F2;
   }
   .order_item_id{
     padding: 0 15px;
@@ -244,6 +317,8 @@ export default {
     justify-content: space-between;
     margin-top: 5px;
     color: #333333;
+    padding-right: 15px;
+    box-sizing: border-box;
   }
   .order_item_info_content_left p{
     width: 300px;