From 3b68d48a9e7e87ba73394f06fc16c773bbfd6756 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Fri, 8 Apr 2022 17:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue                       | 13 +++++++++----
 src/components/orderDetails/index.vue           | 11 ++++++++++-
 src/components/page/classification/Category.vue |  6 +++---
 src/utils/request.js                            |  4 ++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 6363369..2061fbc 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -11,10 +11,12 @@
         <img src="../assets/icons/svg/user.svg" alt="" >
         <span class="f_title">王甜甜</span>
       </div>
-      <div class="header_right_item">
-        <img src="../assets/icons/svg/yingyong.svg" alt="" >
-        <span class="f_title">我的应用</span>
-      </div>
+      <a href="http://58.30.231.137:8035/#/cache/index">
+        <div class="header_right_item">
+            <img src="../assets/icons/svg/yingyong.svg" alt="" >
+            <span class="f_title">我的应用</span>
+        </div>
+      </a>
     </div>
   </div>
 </template>
@@ -29,6 +31,9 @@ export default {
 }
 </script>
 <style scoped>
+  a{
+    color: white;
+  }
   .header{
     width: 100%;
     height: 65px;
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 4e56b83..357206a 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -63,7 +63,15 @@
 
           <div v-show="orederActive==1">
             <p class="oreder_content_title">资金结算表</p>
-            <a-table :columns="columns" :data-source="data" bordered :pagination="false"></a-table>
+            <a-table :columns="columns" :data-source="data" bordered :pagination="false">
+              <template slot="close_status" slot-scope="close_status">
+                <span v-if="close_status==1">无结算信息</span>
+                <span v-else-if="close_status==2">结算中</span>
+                <span v-else-if="close_status==3">用户名和收款人不一致</span>
+                <span v-else-if="close_status==4">收款信息错误</span>
+                <span v-else-if="close_status==5">结算成功</span>
+              </template>
+            </a-table>
           </div>
 
           <div v-show="orederActive==2">
@@ -173,6 +181,7 @@
           {
             title: '结算状态',
             dataIndex: 'close_status',
+            scopedSlots: { customRender: 'close_status' },
             width:'120px',
             align:'center'
           },
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index ac9fef7..4c1bd92 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -93,7 +93,7 @@
         <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 default-value=""  @change="handleChange(1)" v-model="query1.pull_top_class">
               <a-select-option :value="item" v-for="(item,index) in oneList" :key="index">
                 {{item}}
               </a-select-option>
@@ -156,7 +156,7 @@ export default {
       query1:{
         top_class:'',
         son_class:'',
-        addtop_class:''
+        pull_top_class:''
       },
       modeStyle:{
         'height':'200px'
@@ -251,7 +251,7 @@ export default {
     getSon(type){
       let data
       if(type==1){
-        data={top_class:this.query1.addtop_class}
+        data={top_class:this.query1.pull_top_class}
       }else{
         data=this.query
       }
diff --git a/src/utils/request.js b/src/utils/request.js
index 0115762..e481887 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,8 @@ import axios from 'axios';
 const service = axios.create({
     // process.env.NODE_ENV === 'development' 来判断是否开发环境
     // baseURL:process.env.NODE_ENV == 'production' ? 'https://yztapi.xingtongworld.com' : '/api/',
-    // baseURL:'http://jiao.api.alpha.xingtongworld.com',
-    baseURL:'http://192.168.66.254:8080',
+    baseURL:'http://jiao.api.alpha.xingtongworld.com',
+    // baseURL:'http://192.168.66.254:8080',
     timeout: 5000,
 });