From 82f7db7f9ce21b5bdfb021fe92a3f0c104d6fbd8 Mon Sep 17 00:00:00 2001
From: xiaweibo1 <9245255+xiaweibo1@user.noreply.gitee.com>
Date: Mon, 8 Nov 2021 10:06:29 +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/DelistingNotice.vue    |  2 +-
 src/components/page/Order/orderDetails.vue |  2 +-
 src/components/page/Purchaser/myOrder.vue  |  4 +--
 src/components/page/StationNotice.vue      | 33 +++++++++++++++-------
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ebab5e0..87b6055 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -208,6 +208,14 @@ export const end_list = query => {
       params: query
   });
 };
+// // 站内通知
+export const informList = query => {
+  return request({
+      url: '/api/Index/informList',
+      method: 'get',
+      params: query
+  });
+};
 // 收藏资产
 export const collectAsset = query => {
   return request({
diff --git a/src/components/page/DelistingNotice.vue b/src/components/page/DelistingNotice.vue
index fe0d1fb..9ccb096 100644
--- a/src/components/page/DelistingNotice.vue
+++ b/src/components/page/DelistingNotice.vue
@@ -109,7 +109,7 @@
         <el-table-column
           prop="pay_mode"
           align="center"
-          label="协议">
+          label="挂牌类型">
           <template slot-scope="scope">
             <span>{{scope.row.pay_mode==1?'协议':'拍卖'}}</span>
           </template>
diff --git a/src/components/page/Order/orderDetails.vue b/src/components/page/Order/orderDetails.vue
index 43dbc9e..682f708 100644
--- a/src/components/page/Order/orderDetails.vue
+++ b/src/components/page/Order/orderDetails.vue
@@ -41,7 +41,7 @@
         <p class="order_info_right_tips" v-else-if="type==2">交易订单已关闭！详情请咨询客服人员。</p>
         <div class="order_info_right_tips" v-if="type!=2">
           <span>您可以点击</span>
-          <a class="pay_button" :href="orderInfos.asset_report">{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</a>
+          <a class="pay_button" :href="orderInfos.type==1?orderInfos.asset_report:orderInfos.transaction_doc" target="view_window">{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</a>
           <span>下载{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</span>
         </div>
       </div>
diff --git a/src/components/page/Purchaser/myOrder.vue b/src/components/page/Purchaser/myOrder.vue
index 33f3286..b11e16e 100644
--- a/src/components/page/Purchaser/myOrder.vue
+++ b/src/components/page/Purchaser/myOrder.vue
@@ -86,8 +86,8 @@
               <span v-else-if="item.status==3">待确认签约合同</span>
               <span v-else-if="item.status==4">待交付</span>
               <span v-else-if="item.status==5">待确认交付</span>
-              <span v-else-if="item.status==6">待结算</span>
-              <span v-else-if="item.status==7">已完成</span>
+              <!-- <span v-else-if="item.status==6">待结算</span> -->
+              <span v-else-if="item.status==7 ||item.status==6">已完成</span>
               <span v-else-if="item.status==8">已关闭</span>
               <span v-else-if="item.status==9">退款中</span>
               <span v-else-if="item.status==10">已退款</span>
diff --git a/src/components/page/StationNotice.vue b/src/components/page/StationNotice.vue
index ffd9c5b..1a76815 100644
--- a/src/components/page/StationNotice.vue
+++ b/src/components/page/StationNotice.vue
@@ -8,22 +8,22 @@
         :header-cell-style="{background:'#F2F2F2 !important',color:'#333333',height:'60px',fontSize:'14px'}"
         style="width: 100%">
         <el-table-column
-          prop="date"
+          prop="create_time"
           align="center"
           label="发布日期">
         </el-table-column>
-        <el-table-column
-          prop="name"
+        <!-- <el-table-column
+          prop=""
           align="center"
           label="通知类型">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-          prop="address"
+          prop="title"
           align="center"
           label="通知标题">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="content"
           align="center"
           label="通知详情">
         </el-table-column>
@@ -43,24 +43,37 @@
   </div>
 </template>
 <script>
+import {informList} from '../../api/index'
 export default {
   data(){
     return{
       query:{
         page:1,
         limit:10,
-        input:'',
-        value:''
       },
       tableData:[],
-      pageTotal:50
+      pageTotal:0
     }
   },
+  created(){
+    this.getData();
+  },
   methods:{
+    getData(){
+      informList(this.query).then(res => {
+        console.info(res)
+        if(res.code==100){
+          this.tableData=res.list;
+          this.pageTotal=res.count
+        }else{
+          this.$message.error(res.msg)
+        }
+      })
+    },
     // 分页导航
     handlePageChange(val) {
       this.$set(this.query, 'page', val);
-      // this.getData();
+      this.getData();
     }
   }
 }