From e4880cc768cd3b7142fcc242a172d18bdf217f95 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 19 Jan 2022 12:56:00 +0800
Subject: [PATCH] 1

---
 src/components/page/Hoster/Listing.vue        | 18 ++++++++--------
 src/components/page/Hoster/myAssets.vue       |  5 +++--
 src/components/page/Order/orderPendingPay.vue |  6 +++---
 .../page/Order/sellOrderPendingPay.vue        |  6 +++---
 .../page/Purchaser/wkTrusteeship.vue          |  4 ++--
 src/components/page/examine.vue               | 17 ++++++++-------
 src/components/page/index.vue                 |  2 +-
 src/main.js                                   | 21 +++++++++++++++++--
 src/utils/request.js                          |  8 +++++--
 9 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/components/page/Hoster/Listing.vue b/src/components/page/Hoster/Listing.vue
index 7fb4b65..d60a059 100644
--- a/src/components/page/Hoster/Listing.vue
+++ b/src/components/page/Hoster/Listing.vue
@@ -149,7 +149,7 @@
           <div class="listing_tips1" v-if="ruleForm.asset_file">
             已上传文件：
             <div class="table_right_item" >
-              <span >{{file_name.asset_file}}</span>
+              <span >标的基本情况</span>
               <i class="el-icon-close" @click="deleteUrl('asset_file')"></i>
             </div>
           </div>
@@ -199,8 +199,8 @@
         <div class="upload_file" v-if="ruleForm.else_serial_file.length!=0">
           <div class="listing_tips1" style="display:block">
             已上传文件：
-            <div class="table_right_item" v-for="(item,index) in  file_name.else_serial_file " :key="index">
-              <span >{{item.name}}</span>
+            <div class="table_right_item" v-for="(item,index) in  ruleForm.else_serial_file " :key="index">
+              <span>其他标的材料{{index+1}}</span>
               <i class="el-icon-close" @click="deleteUrl('else_serial_file',index)"></i>
             </div>
           </div>
@@ -308,7 +308,7 @@
           <div class="listing_tips1">
             已上传文件：
             <div class="table_right_item" >
-              <span >{{file_name.promise_file}}</span>
+              <span >申请承诺文件</span>
               <i class="el-icon-close" @click="deleteUrl('promise_file')"></i>
             </div>
           </div>
@@ -340,7 +340,7 @@
           <div class="listing_tips1">
             已上传文件：
             <div class="table_right_item" >
-              <span >{{file_name.accessory}}</span>
+              <span >附件</span>
               <i class="el-icon-close" @click="deleteUrl('accessory')"></i>
             </div>
           </div>
@@ -387,9 +387,9 @@ import {get_asset_type,getProvince,getCity,getArea,cartellino,getPrice,assetInfo
 export default {
   data(){
     return{
-      host:'http://wenhua.xingtongworld.com',
-      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
-      action1:'http://wenhua.xingtongworld.com/api/Index/uploadFile',
+      host:'http://rccqapi.szcaee.cn',
+      action:'http://rccqapi.szcaee.cn/api/Index/uploadimg',
+      action1:'http://rccqapi.szcaee.cn/api/Index/uploadFile',
       query:{
         id:'',
         type:1
@@ -722,7 +722,7 @@ export default {
             // if (this.ruleForm.payment_document=='') {
             //   this.editVisible=true
             // }else{
-              // this.loading=true
+              this.loading=true
               if(this.query.type==2){
                 this.update_cartellino()
               }else{
diff --git a/src/components/page/Hoster/myAssets.vue b/src/components/page/Hoster/myAssets.vue
index 71d6638..fd8a005 100644
--- a/src/components/page/Hoster/myAssets.vue
+++ b/src/components/page/Hoster/myAssets.vue
@@ -89,6 +89,7 @@
             </template>
             <template v-else-if="scope.row.asset_status==1">
               <p  class="table_p2" @click="goDetails(scope.row.id,2)">编辑资产</p>
+              <p  class="table_p2" @click="goDetails1(scope.row.id)">审核情况</p>
             </template>
             <template v-else-if="scope.row.asset_status==2">
               <p  class="table_p2" @click="goDetails(scope.row.id,0)">查看资产</p>
@@ -239,8 +240,8 @@ export default {
         serial_name:''
       },
       dialogType:0,
-      host:'http://wenhua.xingtongworld.com',
-      action1:'http://wenhua.xingtongworld.com/api/Index/uploadFile',
+      host:'http://rccqapi.szcaee.cn',
+      action1:'http://rccqapi.szcaee.cn/api/Index/uploadFile',
       assetLists:[],
       pageTotal:0,
       headerList:[
diff --git a/src/components/page/Order/orderPendingPay.vue b/src/components/page/Order/orderPendingPay.vue
index 0c03698..b2a7995 100644
--- a/src/components/page/Order/orderPendingPay.vue
+++ b/src/components/page/Order/orderPendingPay.vue
@@ -207,9 +207,9 @@ export default {
       orderInfos:{
         serial_img:[]
       },
-      host:'http://wenhua.xingtongworld.com',
-      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
-      action1:'http://wenhua.xingtongworld.com/api/Index/uploadFile',
+      host:'http://rccqapi.szcaee.cn',
+      action:'http://rccqapi.szcaee.cn/api/Index/uploadimg',
+      action1:'http://rccqapi.szcaee.cn/api/Index/uploadFile',
     }
   },
   components: {
diff --git a/src/components/page/Order/sellOrderPendingPay.vue b/src/components/page/Order/sellOrderPendingPay.vue
index 041b78c..344c60e 100644
--- a/src/components/page/Order/sellOrderPendingPay.vue
+++ b/src/components/page/Order/sellOrderPendingPay.vue
@@ -214,9 +214,9 @@ export default {
       orderInfos:{
         serial_img:[]
       },
-      host:'http://wenhua.xingtongworld.com',
-      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
-      action1:'http://wenhua.xingtongworld.com/api/Index/uploadFile',
+      host:'http://rccqapi.szcaee.cn',
+      action:'http://rccqapi.szcaee.cn/api/Index/uploadimg',
+      action1:'http://rccqapi.szcaee.cn/api/Index/uploadFile',
     }
   },
   components: {
diff --git a/src/components/page/Purchaser/wkTrusteeship.vue b/src/components/page/Purchaser/wkTrusteeship.vue
index f6b0c71..e542804 100644
--- a/src/components/page/Purchaser/wkTrusteeship.vue
+++ b/src/components/page/Purchaser/wkTrusteeship.vue
@@ -189,8 +189,8 @@ export default {
       disabled:false,
       check_status:-1,
       showViewer:false,
-      host:'http://wenhua.xingtongworld.com',
-      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      host:'http://rccqapi.szcaee.cn',
+      action:'http://rccqapi.szcaee.cn/api/Index/uploadimg',
       upList:[
           {name:'营业执照（复印件）',type:0,url:'',key:'business_license',required:true,upType:0},
           {name:'法人代表证明书',type:0,url:'',key:'legal_certificate',required:true,upType:1,file:''},
diff --git a/src/components/page/examine.vue b/src/components/page/examine.vue
index 1eda211..ffde00e 100644
--- a/src/components/page/examine.vue
+++ b/src/components/page/examine.vue
@@ -3,13 +3,13 @@
       <p class="title">标的挂牌</p>
       <!-- <p class="title_info">第三方服务机构开户用于服务平台中标的托管时的标的价格评估或标的价值评估，需有相关资质机构方能注册成功。</p> -->
       <div class="examine_content">
-        <img src="../../assets/img/examine_img.png" alt="" class="examine_img" v-if="assetLists.asset_check_status==0 ||check_status==0">
-        <img src="../../assets/img/examine_img1.png" alt="" class="examine_img" v-else-if="assetLists.asset_check_status==2 ">
+        <img src="../../assets/img/examine_img.png" alt="" class="examine_img" v-if="assetLists.asset_status==5&& assetLists.asset_check_status==0 ||check_status==0 || assetLists.asset_status==0">
+        <img src="../../assets/img/examine_img1.png" alt="" class="examine_img" v-else-if="assetLists.asset_check_status==2 || assetLists.asset_status==1">
         <p class="examine_tips">
-          <template v-if="check_status==0 ">
+          <template v-if="check_status==0 || assetLists.asset_status==0">
             <span >挂牌资料已经提交，请耐心等待审核</span>
           </template>
-          <template v-else-if="assetLists.asset_check_status==0 && assetLists.payment_document=='' ||assetLists.asset_check_status==2" >
+          <template v-else-if="assetLists.asset_check_status==0 && assetLists.payment_document=='' &&assetLists.asset_status==5 ||assetLists.asset_check_status==2" >
             <span v-if="assetLists.asset_check_status==0">
               挂牌资料审核已通过,您需要支付挂牌费用
               <span style="color:red">（{{assetLists.cartellino_money}}元）</span>
@@ -31,8 +31,11 @@
           <template v-else-if="assetLists.asset_check_status==0 && assetLists.payment_document!='' ">
             <span >挂牌费的支付凭证用已经提交，请耐心等待审核</span>
           </template>
+          <template v-else-if="assetLists.asset_status==1 ">
+            <span >资产审核不通过，请查看原因，重新提交</span>
+          </template>
         </p>
-        <div class="error_msg" v-if="assetLists.asset_check_status==2 ">
+        <div class="error_msg" v-if="assetLists.asset_check_status==2  || assetLists.asset_status==1 ">
           <p>失败原因：</p>
           <p >{{assetLists.message}}</p>
         </div>
@@ -51,8 +54,8 @@ export default {
         payment_document:''
       },
       assetLists:{},
-      host:'http://wenhua.xingtongworld.com',
-      action:'http://wenhua.xingtongworld.com/api/Index/uploadimg',
+      host:'http://rccqapi.szcaee.cn',
+      action:'http://rccqapi.szcaee.cn/api/Index/uploadimg',
 
     }
   },
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index 880ff5e..bb69af5 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -171,7 +171,7 @@
               <span>摘牌公告</span>
               <span @click="goPage('/DelistingNotice')">更多 ></span>
             </p>
-            <div class="notice_item_info"  v-for="(item,index) in indexList.asset_notice_list" :key="index" @click="goDetails(item.id,'/NoticeDetails',1)">
+            <div class="notice_item_info"  v-for="(item,index) in indexList.end_list" :key="index" @click="goDetails(item.id,'/NoticeDetails',1)">
               <div class="notice_item_info_div">{{item.serial_name}}</div>
               <p class="notice_item_info_time">{{item.remove_time}} </p>
             </div>
diff --git a/src/main.js b/src/main.js
index 2b44be6..534b1f5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,25 @@ Vue.filter('formatDate',function (input,fmtstring) {//当input为时间戳，需
 }else{
     return "";
 }
-});
-
+});//使用钩子函数对路由进行权限跳转
+// router.beforeEach((to, from, next) => {
+//     const role = localStorage.getItem('login_info');
+//     if (!role && to.path !== '/index') {
+//         next('/index');
+//     } else if (to.meta.permission) {
+//         // 如果是管理员权限则可进入，这里只是简单的模拟管理员权限而已
+//         role === 'admin' ? next() : next('/403');
+//     } else {
+//         // 简单的判断IE10及以下不进入富文本编辑器，该组件不兼容
+//         if (navigator.userAgent.indexOf('MSIE') > -1 && to.path === '/editor') {
+//             Vue.prototype.$alert('vue-quill-editor组件不兼容IE10及以下浏览器，请使用更高版本的浏览器查看', '浏览器不兼容通知', {
+//                 confirmButtonText: '确定'
+//             });
+//         } else {
+//             next();
+//         }
+//     }
+// });
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
diff --git a/src/utils/request.js b/src/utils/request.js
index 248cc71..535a86f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,8 +1,10 @@
 import axios from 'axios';
+import router from '../router/index'
 const service = axios.create({
     // process.env.NODE_ENV === 'development' 来判断是否开发环境
     // easy-mock服务挂了，暂时不使用了
-    baseURL: 'http://wenhua.xingtongworld.com/',
+    // baseURL: 'http://wenhua.xingtongworld.com/',
+    baseURL: 'http://rccqapi.szcaee.cn/',
     timeout: 5000
 });
 
@@ -28,13 +30,15 @@ service.interceptors.response.use(
     response => {
       if (response.data.code === 303) {
         localStorage.removeItem('login_info')
+        location.reload()
+        router.push('/index')
+        // location.reload()
         // MessageBox.confirm('登录已超时，请重新登录', '退出', {
         //     confirmButtonText: '登录',
         //     cancelButtonText: '取消',
         //     type: 'warning'
         // }).then(() => {
         //     storage.remove('seller_token')
-        //     location.reload()
 
         // })
       }