From 74fd3de9335bb482e17c85a2a6ca91ffdea85f28 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Tue, 19 Apr 2022 22:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E2=80=9C4?=
 =?UTF-8?q?=E6=9C=8818-1=E6=9C=8819=E6=80=BB=E7=BB=93=20=E2=80=9D=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/assets/css/main.css                       | 14 ++-
 src/components/Home.vue                       |  5 +-
 src/components/Sidebar.vue                    | 87 ++++++++++++-------
 src/components/billDetails/index.vue          | 42 ++++-----
 src/components/dateSelect/index.vue           | 18 ++--
 src/components/orderDetails/index.vue         | 16 ++--
 src/components/page/admission/index.vue       | 25 +++---
 .../page/classification/Category.vue          | 26 +++---
 .../page/classification/DataQuery.vue         | 23 ++---
 src/components/page/fundSettlement/index.vue  | 16 ++--
 .../page/fundSettlement/splitProportion.vue   | 10 +--
 src/components/page/layout/index.vue          | 48 ++++++----
 src/components/page/order/closed.vue          | 37 ++++----
 src/components/page/order/completed.vue       | 37 ++++----
 src/components/page/order/index.vue           | 43 +++++----
 src/components/page/order/pendingPayment.vue  | 24 ++---
 src/components/page/order/toBeDelivered.vue   | 37 ++++----
 src/components/page/order/toBeSettled.vue     | 37 ++++----
 src/utils/request.js                          |  4 +-
 19 files changed, 316 insertions(+), 233 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 4895868..199bb30 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -35,6 +35,7 @@ body {
   background-color: white;
   padding-left: 36px;
   padding-right: 30px;
+  min-width: 1460px;
 }
 .f_title{
   font-size:16px
@@ -44,16 +45,19 @@ body {
   align-items: center;
   margin-top: 14px;
 }
-.query_item .ant-input,.query_item .ant-select{
+.query_item .ant-select{
   width: 160px;
 }
+.query_item .ant-input{
+  max-width: 160px;
+}
 .query_item2 .ant-input{
-  width: 213px;
+  max-width: 213px ;
 }
 .query_item >span{
   display: inline-block;
   /* min-width: 96px; */
-  min-width: 85px;
+  min-width: 100px;
   /* padding: 10px; */
 }
 
@@ -74,6 +78,7 @@ body {
   padding-right: 30px;
   box-sizing: border-box;
   overflow-y: auto;
+  min-width: 1460px;
 }
 .table_title{
   display: flex;
@@ -96,8 +101,9 @@ body {
   margin-top: 21px;
 }
 .ant-table-tbody > tr > td {
-  padding: 11px 16px;
+  padding: 11px 14px;
 }
 .ant-table-thead > tr > th {
   padding: 11px 16px;
+  text-align: center;
 }
diff --git a/src/components/Home.vue b/src/components/Home.vue
index f2dd9da..9e34447 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -21,7 +21,10 @@ import {getUserData} from '../api/index'
 export default {
   data () {
     return {
-      data:{}
+      data:{
+        accountName:'',
+        auth:[]
+      },
     }
   },
   components: {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 7509d82..0a76663 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sidebar_body">
     <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange">
-      <template v-for="item in items">
+      <template v-for="item in items1">
         <a-menu-item v-if="!item.children " :key="item.key" :disabled="item.isShow">
           <router-link :to="item.url">
             <!-- <a-icon :type="item.icon" /> -->
@@ -56,7 +56,8 @@ export default {
           key:'/admission',
           title:'文化数据入场管理',
           auth:'CulturalDataAdmissionManagement',
-          isShow:true
+          isShow:true,
+          children:[]
         },
         {
           icon:'',
@@ -98,18 +99,19 @@ export default {
           key:'/layout',
           title:'数据展示布局管理',
           auth:'DataDisplayLayoutManagement',
-          isShow:true
+          isShow:true,
+          children:[]
         },
-      ]
+      ],
+      items1:[]
     }
   },
   created(){
     this.key=this.$route.path
-    this.showMenu()
+    // this.showMenu()
   },
   methods:{
     onOpenChange(openKeys) {
-
       const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1);
       // console.info(latestOpenKey)
       // console.info(openKeys)
@@ -120,40 +122,67 @@ export default {
       }
     },
     showMenu(){
-      for(let i3 in this.items){
-        let item=this.items[i3]
-      // this.items.map(item=>{
-        if(item.children){
-          for(let i in item.children){
-            let item1=item.children[i]
-            if(item1.key==this.key){
-              this.openKey=item.key
-              this.openKeys.push(item.key)
+      console.info(this.auth1)
+      if(this.auth1.length==0){
+        this.items=[]
+      }else{
+        let List=[]
+        for(let i3 in this.items){
+          let item=this.items[i3]
+        // this.items.map(item=>{
+          if(item.children.length!=0){
+            let data={
+              url:item.url,
+              key:item.key,
+              title:item.title,
+              children:[]
+            }
+            for(let i in item.children){
+              let item1=item.children[i]
+              if(item1.key==this.key){
+                this.openKey=item.key
+                this.openKeys.push(item.key)
+              }
+              for(let i1 in this.auth1){
+                let item2=this.auth1[i1]
+                if(item2==item1.auth){
+                  let children={
+                    url:item1.url,
+                    key:item1.key,
+                    title:item1.title,
+                  }
+                  data.children.push(children)
+                  // this.items[i3].children[i].isShow=false
+                  // item1.isShow=true
+                }
+              }
             }
+            console.info(data)
+            List.push(data)
+          }else{
             for(let i1 in this.auth1){
               let item2=this.auth1[i1]
-              if(item2==item1.auth){
-                this.items[i3].children[i].isShow=false
-                // item1.isShow=true
+              if(item2==item.auth){
+                let data={
+                  url:item.url,
+                  key:item.key,
+                  title:item.title,
+                }
+                List.push(data)
+                // this.items[i3].isShow=false
+                // item.isShow=true
               }
             }
           }
-        }else{
-          for(let i1 in this.auth1){
-            let item2=this.auth1[i1]
-            if(item2==item.auth){
-              this.items[i3].isShow=false
-              // item.isShow=true
-            }
-          }
         }
+        this.items1=List
       }
-      console.info(this.items)
+
     },
   },
   watch:{
-    auth(val){
-      this.auth1=this.auth
+    auth(val,oldVal){
+      this.auth1=val
       this.showMenu()
     },
     $route(to,form){
diff --git a/src/components/billDetails/index.vue b/src/components/billDetails/index.vue
index 6741e09..e1fa2f3 100644
--- a/src/components/billDetails/index.vue
+++ b/src/components/billDetails/index.vue
@@ -79,128 +79,128 @@
             title: '结算时间',
             dataIndex: '',
             width:'120px',
-            align:'center'
+            // // align:'center'
           },
           {
             title: '用户编码',
             dataIndex: 'user_isli',
             width:'120px',
-            align:'center'
+            // // align:'center'
           },
           {
             title: '客户名称',
             dataIndex: 'order_user.name',
             width:'120px',
-            align:'center'
+            // // align:'center'
           },
           {
             title: '订单编号',
             dataIndex: 'batchcode',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '分中心编号',
             dataIndex: 'center_number',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '分中心名称',
             dataIndex: 'center_name',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '服务机构编号',
             dataIndex: 'service_number',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '服务机构名称',
             dataIndex: 'service_name',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '银行卡号',
             dataIndex: 'order_user.publicAccount',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '银行名称',
             dataIndex: 'order_user.bankName',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '期初资金',
             dataIndex: 'preliminary_capital',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '可用资金',
             dataIndex: 'available_capital',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '可出资金',
             dataIndex: 'disburse_capital',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '佣金/服务费（含税）',
             dataIndex: 'service_charge',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '委托费',
             dataIndex: 'entrust_cost',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '当日买入金额',
             dataIndex: 'thatday_buy_money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '当日卖出金额',
             dataIndex: 'thatday_sale_money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '服务费分配',
             dataIndex: 'service_charge_allot',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '资金余额',
             dataIndex: 'capital_remaining',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '冻结保证金',
             dataIndex: 'freeze_earnest_money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '结算状态',
             dataIndex: 'close_status',
             scopedSlots: { customRender: 'close_status' },
             width:'120px',
-            align:'center'
+            // align:'center'
           },
         ],
       }
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 4661999..f0dfb52 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -9,13 +9,13 @@
           </span>
           <p>授权方信息</p>
           <div class="tab_body">
-            <template v-if="userinfo.length!=0">
-              <div class="tab_body_content" v-for="(item,index) in userinfo" :key="index">
-                <p class="tab_body_p">认证类型：{{item.userType}}</p>
-                <p class="tab_body_p">认证状态：{{item.state==0?'认证中':item.state==1?'认证成功':'认证失败'}}</p>
-                <p class="tab_body_p">基本信息：{{item.name}}</p>
-                <p class="tab_body_p">统一社会信用代码：{{item.uscc}}</p>
-                <p class="tab_body_p">账户ISLI标识码：{{item.islicode}}</p>
+            <template v-if="userinfo">
+              <div class="tab_body_content" >
+                <p class="tab_body_p">认证类型：{{userinfo.userType}}</p>
+                <p class="tab_body_p">认证状态：{{userinfo.state==0?'认证中':userinfo.state==1?'认证成功':'认证失败'}}</p>
+                <p class="tab_body_p">基本信息：{{userinfo.name}}</p>
+                <p class="tab_body_p">统一社会信用代码：{{userinfo.uscc}}</p>
+                <p class="tab_body_p">账户ISLI标识码：{{userinfo.islicode}}</p>
                 <!-- <p class="tab_body_p">机构类型：{{item.userType}}</p>
 
                 <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
@@ -53,13 +53,15 @@
             <template v-if="entrust_goods.goods.length!=0">
               <div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index">
                 <div class="tab_content_infoImg">
-                  <img src="../../assets/img/test.png" class="tab_content_img">
+                  <img :src="item.goods_image" class="tab_content_img" v-if="item.goods_image!=''">
+                  <img src="../../assets/img/test.png" class="tab_content_img" v-else>
                 </div>
                 <div class="tab_content_right">
                   <div class="content_right_title">标的名称：{{item.goods_name}}</div>
                   <div class="content_info">
                     <div class="content_info_left">
                       <p>标志码：{{item.goods_islicode}}</p>
+                      <p>交易关联标识符：{{item.contract_code}}</p>
                       <p>标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
                       <p>交易方式：{{item.goods_entrust==1?'转让':'许可'}}</p>
                       <p>权益：{{item.goods_ownership_str}}</p>
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 93b1471..d7197b7 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -146,50 +146,50 @@
             title: '结算方',
             dataIndex: 'close_side',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '结算内容',
             dataIndex: 'close_message',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '金额',
             dataIndex: 'money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           // {
           //   title: '税率',
           //   dataIndex: 'tax_rate',
           //   width:'120px',
-          //   align:'center'
+          //   // align:'center'
           // },
           {
             title: '税额',
             dataIndex: 'tax_rate_money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '结算金额',
             dataIndex: 'close_money',
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '结算状态',
             dataIndex: 'close_status',
             scopedSlots: { customRender: 'close_status' },
             width:'120px',
-            align:'center'
+            // align:'center'
           },
           {
             title: '结算流水号',
             dataIndex: 'close_number',
             width:'220px',
-            align:'center'
+            // align:'center'
           },
         ]
       }
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index 70a2ffc..d2b7ece 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -129,47 +129,48 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: 'ISLI标识码',
           dataIndex: 'goods_islicode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方',
           dataIndex: 'username',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的类型',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '数据状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
+          width:'250px',
           align:'center'
         },
       ]
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index 4c1bd92..46891ce 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -8,8 +8,8 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>一级分类：</span>
             <a-select default-value=""  @change="handleChange" v-model="query.top_class">
               <a-select-option :value="item" v-for="(item,index) in oneList" :key="index">
@@ -17,7 +17,7 @@
               </a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>二级分类：</span>
             <a-select default-value=""  v-model="query.son_class">
               <a-select-option :value="item" v-for="(item,index) in twoList" :key="index">
@@ -25,7 +25,7 @@
               </a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>创建人员：</span>
             <a-select default-value=""  v-model="query.user_id">
               <a-select-option :value="item.id" v-for="(item,index) in userList" :key="index">
@@ -33,7 +33,7 @@
               </a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item" >
+          <a-col :span="6" class="query_item" >
             <span>使用状态：</span>
             <a-select default-value=""  v-model="query.usestatus">
               <a-select-option value="">全部</a-select-option>
@@ -41,11 +41,11 @@
               <a-select-option value="1">禁用</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="12" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
           </a-col>
-          <a-col :span="19" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -173,33 +173,33 @@ export default {
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: '一级分类名称',
           dataIndex: 'top_class',
-          align:'center'
+          // align:'center'
         },
         {
           title: '二级分类名称',
           dataIndex: 'son_class',
-          align:'center'
+          // align:'center'
         },
         {
           title: '使用状态',
           dataIndex: 'status',
           scopedSlots:{customRender:'status'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '创建人员',
           dataIndex: 'account_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ],
       oneList:[],
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index d4dd172..cb65998 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -8,7 +8,7 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
+        <a-row  type="flex" justify="space-between" >
           <a-col :span="5" class="query_item">
             <span>ISLI标识码：</span>
             <a-input v-model="query.islicode"/>
@@ -154,45 +154,46 @@ export default {
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: 'ISLI标识码',
           dataIndex: 'goods_islicode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方',
           dataIndex: 'username',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的类型',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '数据状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '委托状态',
           dataIndex: 'entrust_status',
           scopedSlots:{customRender:'entrust_status'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          width:'170px',
+          // align:'center'
         },
       ]
     }
@@ -270,5 +271,7 @@ export default {
 }
 </script>
 <style scoped>
-
+  .query_item >span{
+    min-width: 85px !important;
+  }
 </style>
diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue
index b574706..27712fd 100644
--- a/src/components/page/fundSettlement/index.vue
+++ b/src/components/page/fundSettlement/index.vue
@@ -115,17 +115,17 @@ export default {
           title: '序号',
           dataIndex: 'id',
           width:'65px',
-          align:'center'
+          // align:'center'
         },
         {
           title: '用户编码',
           dataIndex: 'islicode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '客户名称',
           dataIndex: 'userinfo.name',
-          align:'center'
+          // align:'center'
         },
         // {
         //   title: '结算账户',
@@ -135,28 +135,28 @@ export default {
         {
           title: '银行账号',
           dataIndex: 'userinfo.publicAccount',
-          align:'center'
+          // align:'center'
         },
         {
           title: '银行名称',
           dataIndex: 'userinfo.bankName',
-          align:'center'
+          // align:'center'
         },
         {
           title: '用户类型',
           dataIndex: 'userinfo.userType',
-          align:'center'
+          // align:'center'
         },
         {
           title: '结算状态',
           dataIndex: 'close_status',
           scopedSlots: { customRender: 'close_status' },
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index b992ab2..115c51f 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -203,28 +203,28 @@ export default {
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: '规则名称',
           dataIndex: 'rule_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '使用状态',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' },
-          align:'center'
+          // align:'center'
         },
         {
           title: '创建人员',
           dataIndex: 'username',
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ],
       userList:[],
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index b9ef59c..e9b9020 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -28,7 +28,7 @@
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
           </template>
-          <template slot="operation" slot-scope="item" v-if="active==2">
+          <template slot="operation" slot-scope="item" v-if="active==2" >
             <a-space :size="24">
               <span class="table_operation" @click="rankingSort(item.goods_islicode,1)">上移</span>
               <span class="table_operation" @click="rankingSort(item.goods_islicode,2)">下移</span>
@@ -197,40 +197,40 @@ export default {
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: 'ISLI标识码',
           dataIndex: 'goods_islicode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方',
           dataIndex: 'username',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的类型',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '数据状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '是否展示',
           dataIndex: 'is_recommend',
           scopedSlots: { customRender: 'is_recommend' },
-          align:'center'
+          // align:'center'
         },
       ],
       columns:[
@@ -243,40 +243,36 @@ export default {
         {
           title: '创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: 'ISLI标识码',
           dataIndex: 'goods_islicode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方',
           dataIndex: 'username',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的类型',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
-          align:'center'
+          // align:'center'
         },
         {
           title: '数据状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
-          align:'center'
-        },
-        {
-          title: '操作',
-          scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
+
       ]
     }
   },
@@ -357,6 +353,20 @@ export default {
       this.query.type=val
       this.active=val-1
       this.selectedRowKeys1=[]
+      if(this.active==2){
+        let data={
+          title: '操作',
+          scopedSlots: { customRender: 'operation' },
+          // align:'center'
+        }
+        this.columns.push(data)
+      }else{
+        for (let i=0; i<this.columns.length; i++){
+          if (this.columns[i].title == '操作'){
+            this.columns.splice(i, 1)
+          }
+        }
+      }
       this.getList()
     },
     getList(){
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 49f5899..32d0d8a 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +44,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="14" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -131,27 +131,29 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          width:'160px',
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
           dataIndex: 'entrust_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
-          align:'center'
+          width:'130px',
+          // align:'center'
         },
         // {
         //   title: '订单类型',
@@ -162,17 +164,20 @@ export default {
         {
           title: '交易方式',
           dataIndex: 'entrust_type',
-          align:'center'
+          width:'90px',
+          // align:'center'
         },
         {
           title: '交易总额',
           dataIndex: 'total_money',
-          align:'center'
+          width:'90px',
+          // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 33a9067..494f44b 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row  type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +44,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="14" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -131,27 +131,29 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          width:'160px',
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
           dataIndex: 'entrust_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
-          align:'center'
+          width:'130px',
+          // align:'center'
         },
         // {
         //   title: '订单类型',
@@ -161,18 +163,21 @@ export default {
         // },
         {
           title: '交易方式',
+          width:'90px',
           dataIndex: 'entrust_type',
-          align:'center'
+          // align:'center'
         },
         {
           title: '交易总额',
           dataIndex: 'total_money',
-          align:'center'
+          width:'90px',
+          // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index c8ce09e..58ca806 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
-            <a-input v-model="query.batchcode"/>
+            <a-input v-model="query.batchcode" />
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,7 +44,7 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item" >
+          <a-col :span="6" class="query_item" >
             <span>交易状态：</span>
             <a-select default-value=""  v-model="query.transaction_status">
               <a-select-option value="">全部</a-select-option>
@@ -55,11 +55,11 @@
               <a-select-option value="5">已关闭</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="9" class="query_item query_item1">
+          <a-col :span="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -144,28 +144,30 @@ export default {
         },
         {
           title: '订单创建时间',
+          width:'160px',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
           dataIndex: 'entrust_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
-          align:'center'
+          width:'130px',
+          // align:'center'
         },
         // {
         //   title: '订单类型',
@@ -175,24 +177,27 @@ export default {
         // },
         {
           title: '交易方式',
+          width:'90px',
           dataIndex: 'entrust_type',
-          align:'center'
+          // align:'center'
         },
         {
           title: '交易总额',
           dataIndex: 'total_money',
-          align:'center'
+          // align:'center'
         },
         {
           title: '交易状态',
+          width:'90px',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' },
-          align:'center'
+          // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index 6b5bd73..001fff5 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row  type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +44,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="14" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -129,13 +129,14 @@ export default {
         },
         {
           title: '订单创建时间',
+          width:'160px',
           dataIndex: 'createtime',
-          align:'center'
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
@@ -150,6 +151,7 @@ export default {
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
+          width:'130px',
           align:'center'
         },
         // {
@@ -160,6 +162,7 @@ export default {
         // },
         {
           title: '交易方式',
+          width:'90px',
           dataIndex: 'entrust_type',
           align:'center'
         },
@@ -170,6 +173,7 @@ export default {
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
           align:'center'
         },
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 5dab655..249e0c7 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row  type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +44,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="14" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -131,27 +131,29 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          width:'160px',
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
           dataIndex: 'entrust_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
-          align:'center'
+          width:'130px',
+          // align:'center'
         },
         // {
         //   title: '订单类型',
@@ -161,18 +163,21 @@ export default {
         // },
         {
           title: '交易方式',
+          width:'90px',
           dataIndex: 'entrust_type',
-          align:'center'
+          // align:'center'
         },
         {
           title: '交易总额',
           dataIndex: 'total_money',
-          align:'center'
+          width:'90px',
+          // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index 18c8ede..73d945f 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -8,20 +8,20 @@
     </div>
     <div class="body">
       <div class="query">
-        <a-row  justify="space-between" >
-          <a-col :span="5" class="query_item">
+        <a-row type="flex" justify="space-between" >
+          <a-col :span="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>被授权方：</span>
             <a-input v-model="query.buy_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>标的名称:</span>
             <a-input v-model="query.goods_name"/>
           </a-col>
@@ -36,7 +36,7 @@
             </a-select>
           </a-col> -->
 
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +44,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item query_item2">
+          <a-col :span="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :span="14" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -131,27 +131,29 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          align:'center'
+          width:'160px',
+          // align:'center'
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          align:'center'
+          // align:'center'
         },
         {
           title: '授权方/卖方',
           dataIndex: 'entrust_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+          // align:'center'
         },
         {
           title: '被授权方/买方',
           dataIndex: 'buy_username',
-          align:'center'
+          width:'130px',
+          // align:'center'
         },
         // {
         //   title: '订单类型',
@@ -161,18 +163,21 @@ export default {
         // },
         {
           title: '交易方式',
+          width:'90px',
           dataIndex: 'entrust_type',
-          align:'center'
+          // align:'center'
         },
         {
           title: '交易总额',
           dataIndex: 'total_money',
-          align:'center'
+          width:'90px',
+          // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          // align:'center'
         },
       ]
     }
diff --git a/src/utils/request.js b/src/utils/request.js
index c192981..6e029b6 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://58.30.231.138:8899',
+    baseURL:'http://jiao.api.alpha.xingtongworld.com',
+    // baseURL:'http://58.30.231.138:8899',
     // baseURL:'http://192.168.66.254:8080',
     timeout: 5000,
 });