diff --git a/src/components/accountDetails/index.vue b/src/components/accountDetails/index.vue
index 3e0d275..c236098 100644
--- a/src/components/accountDetails/index.vue
+++ b/src/components/accountDetails/index.vue
@@ -2,7 +2,7 @@
   <div>
     <a-modal  v-model="newVisible" title="账户详情" :afterClose="onClose" width="870px" :bodyStyle="modeStyle">
       <!-- <p class="details_p">结算账号：--</p> -->
-      <p class="details_p">结算卡开户银行：{{data.bank_address}}</p>
+      <p class="details_p">结算卡开户银行：{{data.bank_name}}</p>
       <p class="details_p">
         结算银行卡：{{data.bank_account}}
         <!-- <span class="changeBind">更换绑定</span> -->
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index ab84db2..a8aa6d7 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -47,30 +47,31 @@
           </span>
           <div class="tab_body">
             <div class="tab_body_title">
-              <p class="tab_body_title_bg"></p>
-              <div>{{entrust_goods.goods[0].goods_type==1?'文化资源数据':'文化数字内容'}}-基本信息</div>
+              <!-- <p class="tab_body_title_bg"></p> -->
+              <div>{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}-基本信息</div>
             </div>
-            <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="item.goods_image" class="tab_content_img" v-if="item.goods_image!=''">
+            <template >
+              <div class="tab_content " >
+                <!-- <div class="tab_content_infoImg">
+                  <img :src="entrust_goods.goods_image" class="tab_content_img" v-if="entrust_goods.goods_image!=''">
                   <img src="data:image/png;base64,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" class="tab_content_img" v-else>
-                </div>
+                </div> -->
                 <div class="tab_content_right">
-                  <div class="content_right_title">标的名称：{{item.goods_name}}</div>
+                  <p class="tab_content_title">标的名称：{{entrust_goods.goods_name}}</p>
                   <div class="content_info">
-                    <div class="content_info_left">
-                      <p>标志码：{{item.goods_islicode}}</p>
+                    <div class="content_info_left content_info_left1">
+                      <p>标的标志码：{{entrust_goods.goods_islicode}}</p>
+                      <p>ISLI合约关联编码：{{entrust_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>
-                      <p>委托类型：{{item.contractual_period==1?'永久性委托':item.contractual_period==2?'一次性委托':'阶段性委托'}}</p>
-                      <p>收费类型：{{item.charges_type==1?'免费':'付费'}}</p>
+                      <p>交易品种：{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
+                      <p>交易方式：{{entrust_goods.goods_entrust==1?'转让':'授权'}}</p>
+                      <p>权利类型：{{entrust_goods.goods_ownership_str}}</p>
+                      <p>委托类型：{{entrust_goods.contractual_period==1?'永久性委托':entrust_goods.contractual_period==2?'一次性委托':'阶段性委托'}}</p>
+                      <p>收费类型：{{entrust_goods.charges_type==1?'免费':'付费'}}</p>
                       <!-- <p>交易保证金：{{item.earnest_money}}</p> -->
-                      <p>自报价：{{item.price}}</p>
-                      <p>委托开始时间：{{item.contractual_start_time}}</p>
-                      <p>委托终止时间：{{item.contractualtime_end_time}}</p>
+                      <p>自报价：{{entrust_goods.price}}</p>
+                      <p>委托开始时间：{{entrust_goods.contractual_start_time}}</p>
+                      <p>委托终止时间：{{entrust_goods.contractualtime_end_time}}</p>
                     </div>
                   </div>
                 </div>
@@ -78,20 +79,29 @@
             </template>
             <!-- <p v-else class="none_p">暂无数据</p> -->
             <div class="tab_body_title">
-              <p class="tab_body_title_bg"></p>
-              <div>{{entrust_goods.goods[0].goods_type==1?'文化资源数据':'文化数字内容'}}-关联资源</div>
-            </div>
-            <div class="tab_content">
-              <p class="tab_content_title">{{entrust_goods.goods[0].goods_type==1?'文化资源数据':'文化数字内容'}}集</p>
-            </div>
-            <div class="content_table">
-              <a-table :columns="columns1" :data-source="entrust_goods.source_gather" bordered :pagination="false">
-                <template slot="operation" >
-                  <span @click="selectDetails(entrust_goods.goods[0].goods_islicode)" class="details_span">详情</span>
-                </template>
-              </a-table>
+              <!-- <p class="tab_body_title_bg"></p> -->
+              <div>{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}-关联资源</div>
             </div>
-
+            <template v-if="gather_arr.length!=0">
+              <div class="tab_content">
+                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}数据集</p>
+              </div>
+              <div class="content_table">
+                <a-table :columns="columns1" :data-source="gather_arr" bordered :pagination="false">
+                  <template slot="identifier" slot-scope="item">
+                    <span @click="selectDetails(item.identifier)" class="details_span">详情</span>
+                  </template>
+                </a-table>
+              </div>
+            </template>
+            <template v-if="oneSource.length!=0">
+              <div class="tab_content">
+                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}资源</p>
+              </div>
+              <div class="content_table">
+                <a-table :columns="columns2" :data-source="oneSource" bordered :pagination="false"></a-table>
+              </div>
+            </template>
             <!-- <div class="tab_content">
               <p class="tab_content_title">文化资源数据</p>
             </div>
@@ -115,61 +125,61 @@
     <a-modal  v-model="newVisible1" title="标的信息" width="1172px" :bodyStyle="modeStyle">
         <div class="tab_body">
           <div class="tab_body_title">
-            <p class="tab_body_title_bg"></p>
-            <div>{{sourceDate.collectionType}}-基本信息</div>
+            <!-- <p class="tab_body_title_bg"></p> -->
+            <div>{{sourceDate.info.collectionType}}-基本信息</div>
           </div>
           <div class="tab_content ">
             <!-- <div class="tab_content_infoImg"> -->
               <!-- <img src="../../assets/img/test.png" class="tab_content_img"> -->
             <!-- </div> -->
             <div class="tab_content_right">
-              <div class="content_right_title">标的名称：{{sourceDate.source_name}}</div>
+              <div class="content_right_title">数据集名称：{{sourceDate.info.source_name}}</div>
               <div class="content_info">
                 <div class="content_info_left">
-                  <p>其他标识符：{{sourceDate.otherIdentifiers}}</p>
-                  <p>标识符：{{sourceDate.identifier}}</p>
-                  <p>类型：{{sourceDate.collectionType}}</p>
-                  <p>服务类型：{{sourceDate.serviceType}}</p>
-                  <p>分类：{{sourceDate.classification}}</p>
-                  <p>贡献者：{{sourceDate.contributors}}</p>
-                  <p>著作权人：{{sourceDate.copyrightOwner}}</p>
-                  <p>载体：{{sourceDate.carrier==1?'纸张':sourceDate.carrier==2?'感光材料':sourceDate.carrier==3?'磁带':sourceDate.carrier==4?'光盘':
-                    sourceDate.carrier==5?'移动终端':sourceDate.carrier==6?'计算机':sourceDate.carrier==7?'数字化数据':sourceDate.carrier==8?'天然载体':
-                    sourceDate.carrier==9?'器具载体':'其他载体'
+                  <p>其他标识符：{{sourceDate.info.otherIdentifiers}}</p>
+                  <p>标识符：{{sourceDate.info.identifier}}</p>
+                  <p>类型：{{sourceDate.info.collectionType}}</p>
+                  <p>服务类型：{{sourceDate.info.serviceType}}</p>
+                  <p>分类：{{sourceDate.info.classification}}</p>
+                  <p>贡献者：{{sourceDate.info.contributors}}</p>
+                  <p>著作权人：{{sourceDate.info.copyrightOwner}}</p>
+                  <p>载体：{{sourceDate.info.carrier==1?'纸张':sourceDate.info.carrier==2?'感光材料':sourceDate.info.carrier==3?'磁带':sourceDate.info.carrier==4?'光盘':
+                    sourceDate.info.carrier==5?'移动终端':sourceDate.info.carrier==6?'计算机':sourceDate.info.carrier==7?'数字化数据':sourceDate.info.carrier==8?'天然载体':
+                    sourceDate.info.carrier==9?'器具载体':'其他载体'
                     }}</p>
-                  <p>登记者：{{sourceDate.registrant}}</p>
-                  <p>登记日期：{{sourceDate.registerDate}}</p>
+                  <p>登记者：{{sourceDate.info.registrant}}</p>
+                  <p>登记日期：{{sourceDate.info.registerDate}}</p>
                 </div>
                 <div>
-                  <p>所属/收藏机构：{{sourceDate.repositoryName}}</p>
-                  <p>尺寸：{{sourceDate.dimensions}}</p>
-                  <p>组件数量：{{sourceDate.quantity}}</p>
-                  <p>标签：{{sourceDate.label}}</p>
-                  <p>描述：{{sourceDate.description}}</p>
-                  <p>哈希值：{{sourceDate.md5}}</p>
-                  <p>版本：{{sourceDate.edition==1?'真迹':sourceDate.edition==2?'抄本':sourceDate.edition==3?'拓本':sourceDate.edition==4?'临摹':
-                    sourceDate.edition==5?'复制':sourceDate.edition==6?'复原':sourceDate.edition==7?'重建':sourceDate.edition==8?'原始录音':sourceDate.edition==9?'原始视频':
-                    sourceDate.edition==10?'刻录':'原创'}}</p>
-                  <p>现况：{{sourceDate.collectionCondition==1?'完好':sourceDate.collectionCondition==2?'残破':sourceDate.collectionCondition==3?'残缺':
-                    sourceDate.collectionCondition==4?'霉变':
-                    sourceDate.collectionCondition==5?'皱褶':sourceDate.collectionCondition==6?'污渍':sourceDate.collectionCondition==7?'脱浆':sourceDate.collectionCondition==8?'脱线':
-                    sourceDate.collectionCondition==9?'生锈':sourceDate.collectionCondition==10?'褪色':'焦脆'}}</p>
-                  <p>封面：{{sourceDate.covers}}</p>
+                  <p>所属/收藏机构：{{sourceDate.info.repositoryName}}</p>
+                  <p>尺寸：{{sourceDate.info.dimensions}}</p>
+                  <p>组件数量：{{sourceDate.info.quantity}}</p>
+                  <p>标签：{{sourceDate.info.label}}</p>
+                  <p>描述：{{sourceDate.info.description}}</p>
+                  <p>哈希值：{{sourceDate.info.md5Val}}</p>
+                  <p>版本：{{sourceDate.info.edition==1?'真迹':sourceDate.info.edition==2?'抄本':sourceDate.info.edition==3?'拓本':sourceDate.info.edition==4?'临摹':
+                    sourceDate.info.edition==5?'复制':sourceDate.info.edition==6?'复原':sourceDate.info.edition==7?'重建':sourceDate.info.edition==8?'原始录音':sourceDate.info.edition==9?'原始视频':
+                    sourceDate.info.edition==10?'刻录':'原创'}}</p>
+                  <p>现况：{{sourceDate.info.collectionCondition==1?'完好':sourceDate.info.collectionCondition==2?'残破':sourceDate.info.collectionCondition==3?'残缺':
+                    sourceDate.info.collectionCondition==4?'霉变':
+                    sourceDate.info.collectionCondition==5?'皱褶':sourceDate.info.collectionCondition==6?'污渍':sourceDate.info.collectionCondition==7?'脱浆':sourceDate.info.collectionCondition==8?'脱线':
+                    sourceDate.info.collectionCondition==9?'生锈':sourceDate.info.collectionCondition==10?'褪色':'焦脆'}}</p>
+                  <p>封面：{{sourceDate.info.cover}}</p>
                 </div>
               </div>
             </div>
           </div>
 
           <div class="tab_body_title">
-            <p class="tab_body_title_bg"></p>
-            <div>{{sourceDate.collectionType}}-关联资源</div>
+            <!-- <p class="tab_body_title_bg"></p> -->
+            <div>{{sourceDate.info.collectionType}}-关联资源</div>
           </div>
-          <div v-for="(item,index) in sourceDate.entrust_goods.source" :key="index">
+          <div v-for="(item,index) in sourceDate.gather_arr" :key="index">
             <div class="tab_content">
               <p class="tab_content_title">{{item.serviceType}}</p>
             </div>
             <div class="content_table">
-              <a-table :columns="columns" :data-source="item.data" bordered :pagination="false"></a-table>
+              <a-table :columns="columns" :data-source="item.source" bordered :pagination="false"></a-table>
             </div>
           </div>
         </div>
@@ -213,89 +223,136 @@
           'height':'500px'
         },
         entrust_goods:{
-          goods:[{goods_type:''}]
+          // goods:[{goods_type:''}]
         },
         userinfo:[],
         sourceDate:{
-          entrust_goods:{}
+          info:{}
         },
         data:[],
         columns:[
           {
             title: '资源名称',
-            dataIndex: 'source_name',
+            dataIndex: 'target_name',
             width:'144px',
-            align:'center'
+
           },
           {
             title: 'ISLI标志码',
-            dataIndex: 'islicode',
+            dataIndex: 'identifier',
             width:'242px',
-            align:'center'
+
           },
           {
             title: 'ISLI关联编码',
-            dataIndex: 'relevancy_isli',
+            dataIndex: 'linkCode',
             width:'259px',
-            align:'center'
+
           },
           {
             title: '大小',
             dataIndex: 'filesize',
             width:'70px',
-            align:'center'
+
           },
           {
             title: '格式',
-            dataIndex: 'format',
+            dataIndex: 'metadataFileFormat',
             width:'70px',
-            align:'center'
+
           },
           {
             title: '时间',
             dataIndex: 'registerDate',
             width:'148px',
-            align:'center'
           },
+
         ],
         columns1:[
           {
-            title: '文化数字内容集名称',
-            dataIndex: 'source_name',
+            title: '数据集名称',
+            dataIndex: 'name',
             width:'166px',
-            align:'center'
+
           },
           {
             title: '分类',
-            dataIndex: 'source_type',
+            dataIndex: 'class',
             width:'82px',
-            align:'center'
+
           },
           {
             title: '生成时间',
-            dataIndex: 'allocationtime',
+            dataIndex: 'registerDate',
             width:'177px',
-            align:'center'
+
           },
           {
-            title: 'ISLI标志码',
-            dataIndex: 'linkCode',
+            title: '数据集标志码',
+            dataIndex: 'identifier',
             width:'310px',
-            align:'center'
+
           },
           {
             title: '关联目标数量',
-            dataIndex: 'source_count',
-            width:'110px',
-            align:'center'
+            dataIndex: 'count',
+            width:'120px',
           },
           {
             title: '查看',
-            scopedSlots: { customRender: 'operation' },
+            scopedSlots: { customRender: 'identifier' },
+            // dataIndex:'identifier',
+            align:'center',
             width:'138px',
-            align:'center'
           },
-        ]
+        ],
+        columns2:[
+          {
+            title: '资源名称',
+            dataIndex: 'name',
+            width:'166px',
+
+          },
+          {
+            title: '分类',
+            dataIndex: 'class',
+            width:'82px',
+
+          },
+          {
+            title: '生成时间',
+            dataIndex: 'registerDate',
+            width:'177px',
+
+          },
+          {
+            title: '资源标志码',
+            dataIndex: 'identifier',
+            width:'310px',
+
+          },
+          {
+            title: '大小',
+            dataIndex: 'filesize',
+            // width:'110px',
+
+          },
+          {
+            title: '格式',
+            dataIndex: 'metadataFileFormat',
+            // width:'110px',
+
+          },
+          // {
+          //   title: '查看',
+          //   scopedSlots: { customRender: 'operation' },
+          //   dataIndex:'identifier',
+          //   width:'138px',
+          //
+          // },
+        ],
+        gather_arr:[],
+        oneSource:[]
       }
     },
     created(){
@@ -315,7 +372,9 @@
             if(res.data.length!=0){
               this.userinfo=res.data.userinfo
               this.entrust_goods=res.data.entrust_goods
-              this.columns1[0].title=this.entrust_goods.goods[0].goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+              // this.columns1[0].title=this.entrust_goods.goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+              this.gather_arr=res.data.gather_arr
+              this.oneSource=res.data.oneSource
             }
           }else{
             this.$message.error(res.msg);
@@ -342,10 +401,12 @@
             // this.userinfo.push(res.data.userinfo)
             this.userinfo=res.data.userinfo
             console.info(this.userinfo)
-            let goods=[res.data.entrust_goods.goods]
+            // let goods=[res.data.entrust_goods.goods]
             this.entrust_goods=res.data.entrust_goods
-            this.entrust_goods.goods=goods
-            this.columns1[0].title=this.entrust_goods.goods[0].goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+            // this.entrust_goods.goods=goods
+            // this.columns1[0].title=this.entrust_goods.goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+            this.gather_arr=res.data.gather_arr
+            this.oneSource=res.data.oneSource
           }else{
             this.$message.error(res.msg);
           }
@@ -439,12 +500,18 @@
     display: flex;
     font-size: 14px;
   }
+  .content_info>div{
+    width: 50%;
+  }
   .content_info p{
     margin-bottom: 0px;
   }
   .content_info_left{
     margin-right: 36px;
   }
+  .content_info_left1{
+    width: 100% !important;
+  }
   .tab_content_title{
     position: relative;
     padding-left: 20px;
@@ -474,6 +541,8 @@
   }
   .details_span{
     cursor: pointer;
+    color: #1890FF;
+    text-decoration: underline;
   }
   .tab_body_content{
     margin-bottom: 20px;
diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue
index f10a3e9..cdf2d7f 100644
--- a/src/components/dateSelect/order.vue
+++ b/src/components/dateSelect/order.vue
@@ -11,6 +11,7 @@
           <p>标的信息</p>
           <div class="tab_body">
             <!-- <template v-if="userinfo"> -->
+              <div class="tab_body_title">授权方信息</div>
               <div class="tab_body_content" >
                 <p class="tab_body_p">机构名称：{{item.userinfo.name}}</p>
                 <p class="tab_body_p">认证类型：{{item.userinfo.userType}}</p>
@@ -20,20 +21,24 @@
               </div>
 
               <div class="tab_body_title">
-              <p class="tab_body_title_bg"></p>
+              <!-- <p class="tab_body_title_bg"></p> -->
               <div>{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}-基本信息</div>
             </div>
             <!-- <template v-if="entrust_goods.goods.length!=0"> -->
               <div class="tab_content " >
-                <div class="tab_content_infoImg">
+                <!-- <div class="tab_content_infoImg">
                   <img :src="item.goods.goods_image" class="tab_content_img" v-if="item.goods.goods_image!=''">
                   <img src="data:image/png;base64,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" class="tab_content_img" v-else>
-                </div>
+                </div> -->
                 <div class="tab_content_right">
-                  <div class="content_right_title">标的名称：{{item.goods.goods_name}}</div>
+                  <!-- <div class="tab_content tab_content1"> -->
+                    <p class="tab_content_title">标的名称：{{item.goods.goods_name}}</p>
+                  <!-- </div> -->
+                  <!-- <div class="content_right_title">标的名称：{{item.goods.goods_name}}</div> -->
                   <div class="content_info">
-                    <div class="content_info_left">
+                    <div class="content_info_left content_info_left1">
                       <p>标志码：{{item.goods.goods_islicode}}</p>
+                      <p>ISLI合约关联编码：{{item.goods.islicode}}</p>
                       <p>交易ISLI编码：{{item.goods.contract_code}}</p>
                       <p>交易品种：{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
                       <p>交易方式：{{item.goods.goods_entrust==1?'转让':'授权'}}</p>
@@ -44,10 +49,10 @@
                       <p>自报价：{{item.goods.price}}</p>
                       <p>委托开始时间：{{item.goods.contractual_start_time}}</p>
                       <p>委托终止时间：{{item.goods.contractualtime_end_time}}</p>
-                      <p>标的价款：¥ {{item.goods.money}}</p>
-                      <p>购买年限：{{item.goods.transaction_count}}</p>
+                      <p>标的价款：¥ {{item.goods.goods_price}}</p>
+                      <p>购买年限：{{item.goods.charges_type==1 || item.goods.goods_entrust==1?'永久':item.goods.transaction_count}}</p>
                       <p>交易佣金：¥ {{item.goods.service_charge}}</p>
-                      <p>小计：¥ {{item.goods.price}}</p>
+                      <p>小计：¥ {{item.goods.money}}</p>
                       <!-- <p>交易流水号：{{order_info.close_serial_number}}</p> -->
                     </div>
                   </div>
@@ -56,19 +61,30 @@
             <!-- </template> -->
             <!-- <p v-else class="none_p">暂无数据</p> -->
             <div class="tab_body_title">
-              <p class="tab_body_title_bg"></p>
+              <!-- <p class="tab_body_title_bg"></p> -->
               <div>{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}-关联资源</div>
             </div>
-            <div class="tab_content">
-              <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}集</p>
-            </div>
-            <div class="content_table">
-              <a-table :columns="columns1" :data-source="item.source_gather" bordered :pagination="false">
-                <template slot="operation" >
-                  <span @click="selectDetails(item.goods.goods_islicode)" class="details_span">详情</span>
-                </template>
-              </a-table>
-            </div>
+            <template v-if="item.gather_arr.length!=0">
+              <div class="tab_content">
+                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}数据集</p>
+              </div>
+              <div class="content_table">
+                <a-table :columns="columns1" :data-source="item.gather_arr" bordered :pagination="false">
+                  <template slot="operation" slot-scope="item1" >
+                    <span @click="selectDetails(item1.identifier)" class="details_span">详情</span>
+                  </template>
+                </a-table>
+              </div>
+            </template>
+            <template v-if="item.oneSource.length!=0">
+              <div class="tab_content">
+                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}资源</p>
+              </div>
+              <div class="content_table">
+                <a-table :columns="columns2" :data-source="item.oneSource" bordered :pagination="false"></a-table>
+              </div>
+            </template>
+
             <!-- </template> -->
             <!-- <span v-else>暂无数据</span> -->
           </div>
@@ -84,53 +100,67 @@
     <a-modal  v-model="newVisible1" title="标的信息" width="1172px" :bodyStyle="modeStyle">
         <div class="tab_body">
           <div class="tab_body_title">
-            <p class="tab_body_title_bg"></p>
-            <div>{{sourceDate.collectionType}}-基本信息</div>
+            <!-- <p class="tab_body_title_bg"></p> -->
+            <div>{{sourceDate.info.collectionType}}-基本信息</div>
           </div>
           <div class="tab_content ">
             <!-- <div class="tab_content_infoImg"> -->
               <!-- <img src="../../assets/img/test.png" class="tab_content_img"> -->
             <!-- </div> -->
             <div class="tab_content_right">
-              <div class="content_right_title">标的名称：{{sourceDate.source_name}}</div>
+              <div class="content_right_title">数据集名称：{{sourceDate.info.source_name}}</div>
               <div class="content_info">
                 <div class="content_info_left">
-                  <p>其他标识符：{{sourceDate.otherIdentifiers}}</p>
-                  <p>标识符：{{sourceDate.identifier}}</p>
-                  <p>类型：{{sourceDate.collectionType}}</p>
-                  <p>服务类型：{{sourceDate.serviceType}}</p>
-                  <p>分类：{{sourceDate.classification}}</p>
-                  <p>贡献者：{{sourceDate.contributors}}</p>
-                  <p>著作权人：{{sourceDate.copyrightOwner}}</p>
-                  <p>载体：{{sourceDate.carrier}}</p>
-                  <p>登记者：{{sourceDate.registrant}}</p>
-                  <p>登记日期：{{sourceDate.registerDate}}</p>
+                  <p>其他标识符：{{sourceDate.info.otherIdentifiers}}</p>
+                  <p>标识符：{{sourceDate.info.identifier}}</p>
+                  <p>类型：{{sourceDate.info.collectionType}}</p>
+                  <p>服务类型：{{sourceDate.info.serviceType}}</p>
+                  <p>分类：{{sourceDate.info.classification}}</p>
+                  <p>贡献者：{{sourceDate.info.contributors}}</p>
+                  <p>著作权人：{{sourceDate.info.copyrightOwner}}</p>
+                  <p>载体：{{sourceDate.info.carrier==1?'纸张':sourceDate.info.carrier==2?'感光材料':sourceDate.info.carrier==3?'磁带':sourceDate.info.carrier==4?'光盘':
+                    sourceDate.info.carrier==5?'移动终端':sourceDate.info.carrier==6?'计算机':sourceDate.info.carrier==7?'数字化数据':sourceDate.info.carrier==8?'天然载体':
+                    sourceDate.info.carrier==9?'器具载体':'其他载体'
+                    }}</p>
+                  <p>登记者：{{sourceDate.info.registrant}}</p>
+                  <p>登记日期：{{sourceDate.info.registerDate}}</p>
                 </div>
                 <div>
-                  <p>所属/收藏机构：{{sourceDate.repositoryName}}</p>
-                  <p>尺寸：{{sourceDate.dimensions}}</p>
-                  <p>组件数量：{{sourceDate.quantity}}</p>
-                  <p>标签：{{sourceDate.label}}</p>
-                  <p>描述：{{sourceDate.description}}</p>
-                  <p>哈希值：{{sourceDate.md5}}</p>
-                  <p>版本：{{sourceDate.edition}}</p>
-                  <p>现况：{{sourceDate.collectionCondition}}</p>
-                  <p>封面：{{sourceDate.covers}}</p>
+                  <p>所属/收藏机构：{{sourceDate.info.repositoryName}}</p>
+                  <p>尺寸：{{sourceDate.info.dimensions}}</p>
+                  <p>组件数量：{{sourceDate.info.quantity}}</p>
+                  <p>标签：{{sourceDate.info.label}}</p>
+                  <p>描述：{{sourceDate.info.description}}</p>
+                  <p>哈希值：{{sourceDate.info.md5Val}}</p>
+                  <p>版本：{{sourceDate.info.edition==1?'真迹':sourceDate.info.edition==2?'抄本':sourceDate.info.edition==3?'拓本':sourceDate.info.edition==4?'临摹':
+                    sourceDate.info.edition==5?'复制':sourceDate.info.edition==6?'复原':sourceDate.info.edition==7?'重建':sourceDate.info.edition==8?'原始录音':sourceDate.info.edition==9?'原始视频':
+                    sourceDate.info.edition==10?'刻录':'原创'}}</p>
+                  <p>现况：{{sourceDate.info.collectionCondition==1?'完好':sourceDate.info.collectionCondition==2?'残破':sourceDate.info.collectionCondition==3?'残缺':
+                    sourceDate.info.collectionCondition==4?'霉变':
+                    sourceDate.info.collectionCondition==5?'皱褶':sourceDate.info.collectionCondition==6?'污渍':sourceDate.info.collectionCondition==7?'脱浆':sourceDate.info.collectionCondition==8?'脱线':
+                    sourceDate.info.collectionCondition==9?'生锈':sourceDate.info.collectionCondition==10?'褪色':'焦脆'}}</p>
+                  <p>封面：{{sourceDate.info.cover}}</p>
                 </div>
               </div>
             </div>
           </div>
 
           <div class="tab_body_title">
-            <p class="tab_body_title_bg"></p>
+            <!-- <p class="tab_body_title_bg"></p> -->
             <div>{{sourceDate.collectionType}}-关联资源</div>
           </div>
-          <div v-for="(item,index) in sourceDate.entrust_goods.source" :key="index">
+          <div v-for="(item,index) in sourceDate.gather_arr" :key="index">
             <div class="tab_content">
               <p class="tab_content_title">{{item.serviceType}}</p>
             </div>
             <div class="content_table">
-              <a-table :columns="columns" :data-source="item.data" bordered :pagination="false"></a-table>
+              <a-table :columns="columns" :data-source="item.source" bordered :pagination="false">
+                <template  slot-scope="download_status">
+                  <span>{{download_status==1?'无资源下载':download_status==2?'获取下载地址失败':download_status==3?'获取解密资源地址失败'
+                    :download_status==4?'获取解密资源地址成功':download_status==5?'没有解密资源地址':
+                    download_status==6?'获取资源下载状态失败':download_status==7?'资源下载成功':download_status==8?'资源下载失败':'获取资源下载状态异常'}}</span>
+                </template>
+              </a-table>
             </div>
           </div>
         </div>
@@ -179,89 +209,126 @@
         orderDate:[],
         userinfo:[],
         sourceDate:{
-          entrust_goods:{}
+          info:{}
         },
         data:[],
         columns:[
           {
             title: '资源名称',
-            dataIndex: 'source_name',
+            dataIndex: 'target_name',
             width:'144px',
-            align:'center'
+
           },
           {
             title: 'ISLI标志码',
-            dataIndex: 'islicode',
+            dataIndex: 'identifier',
             // width:'242px',
-            align:'center'
+
           },
           {
             title: 'ISLI关联编码',
-            dataIndex: 'relevancy_isli',
+            dataIndex: 'linkCode',
             // width:'259px',
-            align:'center'
+
           },
           {
             title: '大小',
             dataIndex: 'filesize',
             width:'70px',
-            align:'center'
+
           },
           {
             title: '格式',
-            dataIndex: 'format',
+            dataIndex: 'metadataFileFormat',
             width:'70px',
-            align:'center'
+
           },
           {
             title: '时间',
             dataIndex: 'registerDate',
             width:'148px',
-            align:'center'
+
           },
           {
             title: '下载状态',
-            dataIndex: 'registerDate',
-            // width:'148px',
-            align:'center'
+            scopedSlots: { customRender: 'download_status' },
+            width:'90px',
           },
         ],
         columns1:[
           {
-            title: '文化数字内容集名称',
-            dataIndex: 'source_name',
+            title: '数据集名称',
+            dataIndex: 'name',
             width:'166px',
-            align:'center'
+
           },
           {
             title: '分类',
-            dataIndex: 'source_type',
+            dataIndex: 'class',
             width:'82px',
-            align:'center'
+
           },
           {
             title: '生成时间',
-            dataIndex: 'allocationtime',
+            dataIndex: 'registerDate',
             width:'177px',
-            align:'center'
+
           },
           {
-            title: 'ISLI标志码',
-            dataIndex: 'linkCode',
+            title: '数据集标志码',
+            dataIndex: 'identifier',
             width:'310px',
-            align:'center'
+
           },
           {
             title: '关联目标数量',
-            dataIndex: 'source_count',
-            width:'110px',
-            align:'center'
+            dataIndex: 'count',
+            width:'120px',
+
           },
           {
             title: '查看',
             scopedSlots: { customRender: 'operation' },
+            align:'center',
             width:'138px',
-            align:'center'
+          },
+        ],
+        columns2:[
+          {
+            title: '资源名称',
+            dataIndex: 'name',
+            width:'166px',
+
+          },
+          {
+            title: '分类',
+            dataIndex: 'class',
+            width:'82px',
+
+          },
+          {
+            title: '生成时间',
+            dataIndex: 'registerDate',
+            width:'177px',
+
+          },
+          {
+            title: '资源标志码',
+            dataIndex: 'identifier',
+            width:'310px',
+
+          },
+          {
+            title: '大小',
+            dataIndex: 'filesize',
+            // width:'110px',
+
+          },
+          {
+            title: '格式',
+            dataIndex: 'metadataFileFormat',
+            // width:'110px',
+
           },
         ]
       }
@@ -409,12 +476,18 @@
     display: flex;
     font-size: 14px;
   }
+  .content_info>div{
+    width: 50%;
+  }
   .content_info p{
     margin-bottom: 0px;
   }
   .content_info_left{
     margin-right: 36px;
   }
+  .content_info_left1{
+    width: 100% !important;
+  }
   .tab_content_title{
     position: relative;
     padding-left: 20px;
@@ -444,6 +517,8 @@
   }
   .details_span{
     cursor: pointer;
+    color: #1890FF;
+    text-decoration: underline;
   }
   .tab_body_content{
     margin-bottom: 20px;
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 4ac8589..9ba020b 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -67,7 +67,7 @@
                   {{item.calculate==1?item.ratio:item.amount}}
                 </span>
               </p>
-              <p>交易佣金金额：¥ {{order_info.total_service_charge}}</p>
+              <p>交易佣金金额：¥ {{order.total_service_charge}}</p>
               <p>订单金额：¥ {{order_info.total_money}} 元</p>
             </div>
           </div>
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index 3c0064d..88b9aab 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -9,16 +9,17 @@
       <div class="query">
         <a-row  justify="space-between" >
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>ISLI标识码：</span>
-            <a-input v-model="query.islicode"/>
+            <span>委托标的：</span>
+            <a-input v-model="query.goods" placeholder="名称/标志码"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+            <span>合约ISLI码：</span>
+            <a-input v-model="query.islicode"/>
           </a-col>
+
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>委托方/授权方：</span>
-            <a-input v-model="query.entrust_name" placeholder="身份ISLI认证码/名称"/>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
             <span>交易品种：</span>
@@ -128,6 +129,7 @@ export default {
         goods_type:'',
         data_type:'',
         createtime:[],
+        goods:''
       },
       selectedRowKeys:[],
       logDate:[],
@@ -156,6 +158,7 @@ export default {
         {
           title: '上线时间',
           dataIndex: 'createtime',
+          width:'90px',
           // align:'center'
         },
         {
@@ -171,17 +174,20 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'username',
+          width:'125px',
           // align:'center'
         },
         {
           title: '交易品种',
           dataIndex: 'goods_type',
+          width:'90px',
           scopedSlots:{customRender:'goods_type'},
           // align:'center'
         },
         {
           title: '发布状态',
           dataIndex: 'goods_status',
+          width:'90px',
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
         },
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index 0813177..754a541 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -199,7 +199,7 @@ export default {
         {
           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 501854a..83008f0 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -10,16 +10,16 @@
       <div class="query">
         <a-row  type="flex" justify="space-between">
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
-            <span>标的ISLI标识码：</span>
-            <a-input v-model="query.islicode"/>
+            <span>委托标的：</span>
+            <a-input v-model="query.goods" placeholder="名称/标志码"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+            <span>合约ISLI码:</span>
+            <a-input v-model="query.islicode"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>委托方/授权方：</span>
-            <a-input v-model="query.entrust_name" placeholder="身份ISLI认证码/名称"/>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item" >
             <span>交易品种：</span>
@@ -131,7 +131,8 @@ export default {
         data_type:'',
         createtime:[],
         entrust_status:'',
-        transaction:''
+        transaction:'',
+        goods:''
       },
       visible:false,
       //数据查看所需要的数据
@@ -154,11 +155,12 @@ export default {
         // },
         {
           title: '上线时间',
+          // width:'90px',
           dataIndex: 'createtime',
           // align:'center'
         },
         {
-          title: '标的ISLI标识码',
+          title: '标的标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },
@@ -170,18 +172,21 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'username',
+          width:'125px',
           // align:'center'
         },
         {
-          title: '标的类型',
+          title: '交易品种',
           dataIndex: 'goods_type',
           scopedSlots:{customRender:'goods_type'},
+          width:'90px',
           // align:'center'
         },
         {
           title: '发布状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
+          width:'90px',
           // align:'center'
         },
         // {
@@ -193,8 +198,8 @@ export default {
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          // width:'170px',
-          // align:'center'
+          width:'170px',
+          align:'center'
         },
       ]
     }
diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue
index f1be38f..8b12e0e 100644
--- a/src/components/page/fundSettlement/index.vue
+++ b/src/components/page/fundSettlement/index.vue
@@ -30,15 +30,15 @@
             </a-select>
           </a-col>
 
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <!-- <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>用户类型：</span>
             <a-select default-value="" v-model="query.type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="2">统一门户</a-select-option>
               <a-select-option value="1">平台注册</a-select-option>
             </a-select>
-          </a-col>
-          <a-col :lg="16" :xl="16" :xxl="24" class="query_item query_item1">
+          </a-col> -->
+          <a-col :lg="24" :xl="24" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -120,10 +120,12 @@ export default {
         {
           title: '身份ISLI认证码',
           dataIndex: 'islicode',
+          // width:'130px',
           // align:'center'
         },
         {
           title: '交易主体名称',
+          // width:'120px',
           dataIndex: 'name',
           // align:'center'
         },
@@ -139,24 +141,28 @@ export default {
         },
         {
           title: '银行名称',
+          // width:'90px',
           dataIndex: 'bankName',
           // align:'center'
         },
         {
           title: '用户类型',
           dataIndex: 'userType',
+          width:'90px',
           // align:'center'
         },
         {
           title: '结算状态',
           dataIndex: 'close_status',
+          width:'90px',
           scopedSlots: { customRender: 'close_status' },
           // align:'center'
         },
         {
           title: '操作',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          // align:'center'
+          align:'center'
         },
       ]
     }
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index 37ccf3f..264a6a7 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -224,7 +224,7 @@ export default {
         {
           title: '操作',
           scopedSlots: { customRender: 'operation' },
-          // align:'center'
+          align:'center'
         },
       ],
       userList:[],
@@ -369,6 +369,9 @@ export default {
   .rule_item1{
     margin-bottom: 22px;
     padding-bottom: 10px;
+
+  }
+  .rule_item1:first-child{
     border-bottom: 1px solid rgb(153, 153, 153);
   }
   .rule_item1 span{
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index e725ac5..9f1a095 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -235,14 +235,15 @@ export default {
         },
       ],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '创建时间',
+          // width:'90px',
           dataIndex: 'createtime',
           // align:'center'
         },
@@ -253,25 +254,29 @@ export default {
         },
         {
           title: '标的名称',
+          // width:'90px',
           dataIndex: 'goods_name',
           // align:'center'
         },
         {
           title: '委托方/授权方',
+          // width:'125px',
           dataIndex: 'username',
           // align:'center'
         },
         {
           title: '标的类型',
           dataIndex: 'goods_type',
+          // width:'90px',
           scopedSlots:{customRender:'goods_type'},
           // align:'center'
         },
         {
           title: '发布状态',
           dataIndex: 'goods_status',
+          width:'90px',
           scopedSlots:{customRender:'goods_status'},
-          // align:'center'
+          align:'center'
         },
 
       ]
@@ -359,6 +364,7 @@ export default {
           let data={
             title: '操作',
             scopedSlots: { customRender: 'operation' },
+            width:'110px',
             // align:'center'
           }
           this.columns.push(data)
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index a8ba107..fec77f7 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -139,7 +139,7 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          // width:'160px',
+          width:'120px',
           // align:'center'
         },
         {
@@ -150,6 +150,7 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
+          width:'125px',
           // align:'center'
         },
         {
@@ -160,6 +161,7 @@ export default {
         {
           title: '购买方/被授权方',
           dataIndex: 'buy_username',
+          width:'135px',
           // width:'130px',
           // align:'center'
         },
@@ -172,20 +174,20 @@ export default {
         {
           title: '交易方式',
           dataIndex: 'entrust_type',
-          // width:'90px',
+          width:'90px',
           // align:'center'
         },
         {
           title: '订单金额',
           dataIndex: 'total_money',
-          // width:'90px',
+          width:'90px',
           // align:'center'
         },
         {
           title: '操作',
-          // width:'170px',
+          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 fee2095..99061e3 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -139,7 +139,7 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          // width:'160px',
+          width:'120px',
           // align:'center'
         },
         {
@@ -150,6 +150,7 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
+          width:'125px',
           // align:'center'
         },
         {
@@ -160,6 +161,7 @@ export default {
         {
           title: '购买方/被授权方',
           dataIndex: 'buy_username',
+          width:'135px',
           // width:'130px',
           // align:'center'
         },
@@ -171,21 +173,21 @@ export default {
         // },
         {
           title: '交易方式',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'entrust_type',
           // align:'center'
         },
         {
           title: '订单金额',
           dataIndex: 'total_money',
-          // width:'90px',
+          width:'90px',
           // align:'center'
         },
         {
           title: '操作',
-          // width:'170px',
+          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 2632853..e2b3926 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -152,7 +152,7 @@ export default {
         // },
         {
           title: '订单创建时间',
-          // width:'160px',
+          width:'120px',
           dataIndex: 'createtime',
           // align:'center'
         },
@@ -164,6 +164,7 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
+          width:'125px',
           // align:'center'
         },
         {
@@ -173,6 +174,7 @@ export default {
         },
         {
           title: '购买方/被授权方',
+          width:'135px',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -192,6 +194,7 @@ export default {
         {
           title: '订单金额',
           dataIndex: 'total_money',
+          width:'90px',
           // align:'center'
         },
         {
@@ -205,7 +208,7 @@ export default {
           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 2e00de4..e42d0f2 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -133,57 +133,60 @@ export default {
         //   title: '序号',
         //   dataIndex: 'id',
         //   width:'65px',
-        //   align:'center'
+        //
         // },
         {
           title: '订单创建时间',
-          // width:'160px',
+          width:'120px',
           dataIndex: 'createtime',
-          // align:'center'
+          //
         },
         {
           title: '订单编号',
           dataIndex: 'batchcode',
-          // align:'center'
+          //
         },
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
-          align:'center'
+          width:'125px',
+
         },
         {
           title: '标的名称',
           dataIndex: 'goods_name',
-          align:'center'
+
         },
         {
           title: '购买方/被授权方',
           dataIndex: 'buy_username',
+          width:'135px',
           // width:'130px',
-          align:'center'
+
         },
         // {
         //   title: '订单类型',
         //   dataIndex: 'type',
         //   scopedSlots: { customRender: 'type' },
-        //   align:'center'
+        //
         // },
         {
           title: '交易方式',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'entrust_type',
-          align:'center'
+
         },
         {
           title: '订单金额',
           dataIndex: 'total_money',
-          align:'center'
+          width:'90px',
+
         },
         {
           title: '操作',
           width:'170px',
           scopedSlots: { customRender: 'operation' },
-          align:'center'
+          align:'center',
         },
       ]
     }
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index ca9a790..97fddee 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -139,7 +139,7 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          // width:'160px',
+          width:'120px',
           // align:'center'
         },
         {
@@ -150,6 +150,7 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
+          width:'125px',
           // align:'center'
         },
         {
@@ -160,7 +161,7 @@ export default {
         {
           title: '购买方/被授权方',
           dataIndex: 'buy_username',
-          // width:'130px',
+          width:'135px',
           // align:'center'
         },
         // {
@@ -171,21 +172,21 @@ export default {
         // },
         {
           title: '交易方式',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'entrust_type',
           // align:'center'
         },
         {
           title: '订单金额',
           dataIndex: 'total_money',
-          // width:'90px',
+          width:'90px',
           // align:'center'
         },
         {
           title: '操作',
-          // width:'170px',
+          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 99f28b3..a81f281 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -139,7 +139,7 @@ export default {
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
-          // width:'160px',
+          width:'120px',
           // align:'center'
         },
         {
@@ -150,6 +150,7 @@ export default {
         {
           title: '委托方/授权方',
           dataIndex: 'entrust_name',
+          width:'135px',
           // align:'center'
         },
         {
@@ -160,7 +161,7 @@ export default {
         {
           title: '购买方/被授权方',
           dataIndex: 'buy_username',
-          // width:'130px',
+          width:'135px',
           // align:'center'
         },
         // {
@@ -171,21 +172,21 @@ export default {
         // },
         {
           title: '交易方式',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'entrust_type',
           // align:'center'
         },
         {
           title: '订单金额',
           dataIndex: 'total_money',
-          // width:'90px',
+          width:'90px',
           // align:'center'
         },
         {
           title: '操作',
-          // width:'170px',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
-          // align:'center'
+          align:'center'
         },
       ]
     }
diff --git a/src/utils/request.js b/src/utils/request.js
index 6e029b6..c192981 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,
 });