From ea162597a1f2a9254a090856f44f30e3e7d9301a Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 27 Oct 2021 10:44:36 +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                                  |  4 ++--
 src/components/common/orderDialog/index.vue       |  8 +++++++-
 .../page/AssetManagement/assetQuery.vue           | 15 +++++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 25564b2..64ecae1 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -120,9 +120,9 @@ export const addedAsset = query => {
     });
 };
 //资产下架
-export const outAsset = query => {
+export const coerceRemove = query => {
     return request({
-        url: 'api/admin.Asset/outAsset',
+        url: 'api/admin.Asset/coerceRemove',
         method: 'post',
         data: query
     });
diff --git a/src/components/common/orderDialog/index.vue b/src/components/common/orderDialog/index.vue
index c6d16ae..e4bbc65 100644
--- a/src/components/common/orderDialog/index.vue
+++ b/src/components/common/orderDialog/index.vue
@@ -2,7 +2,13 @@
   <div>
     <el-dialog title="订单详情" :visible.sync="isshow" width="70%"  :before-close="MisShow">
       <p class="tips">
-        请在 {{orderInfos.order.pay_overdue_time | formatDate }}前完成订单支付！
+        <!-- <span v-if="orderInfos.order.status==0">请在 {{orderInfos.order.pay_overdue_time | formatDate }}前完成订单支付！</span> -->
+        <span v-if="orderInfos.order.status==1 || orderInfos.order.status==0">等待摘牌方付款</span>
+        <span v-else-if="orderInfos.order.status==2">等待双方上传签约合同</span>
+        <span v-else-if="orderInfos.order.status==3">请审核签约合同</span>
+        <span v-else-if="orderInfos.order.status==4 || orderInfos.order.status==5">等待双方确认交付</span>
+        <span v-else-if="orderInfos.order.status==6">请结算订单</span>
+        <span v-else-if="orderInfos.order.status==7">订单完成！</span>
       </p>
       <div class="steps">
         <el-steps :active="orderInfos.order.status " align-center>
diff --git a/src/components/page/AssetManagement/assetQuery.vue b/src/components/page/AssetManagement/assetQuery.vue
index a954a06..cf4e174 100644
--- a/src/components/page/AssetManagement/assetQuery.vue
+++ b/src/components/page/AssetManagement/assetQuery.vue
@@ -111,7 +111,7 @@
 </template>
 
 <script>
-import { getAccountList ,outAsset,addedAsset,updateBlackList,auditList} from '../../../api/index';
+import { getAccountList ,coerceRemove,addedAsset,updateBlackList,auditList} from '../../../api/index';
 import moment from 'moment'
 export default {
     data() {
@@ -214,7 +214,7 @@ export default {
             if (row.asset_status==3) {
                 this.addedAsset(row.id)
             }else if(row.asset_status==2){
-                this.outAsset(row.id)
+                this.coerceRemove(row.id)
             }
         },
         // 上架资产
@@ -231,13 +231,20 @@ export default {
             });
         },
         // 资产下架
-        outAsset(id){
+        coerceRemove(id){
             let data={id:id}
-            outAsset(data).then(res => {
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            coerceRemove(data).then(res => {
                 console.log(res);
                 if (res.code==100) {
                     this.$message.success('操作成功~');
                     this.getData()
+                    loading.close();
                 }else{
                     this.$message.error(res.msg);
                 }