From e8ad2508320574122257e08ae7e93adf1a22127d Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Thu, 17 Nov 2022 16:29:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/order/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 5ba4c85..9365ed5 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -53,7 +53,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item" >
             <span>订单状态：</span>
-            <a-select default-value=""  v-model="query.transaction_status">
+            <a-select default-value=""  v-model="query.transaction_status" mode="multiple" :maxTagCount="1" :maxTagTextLength="1">
               <a-select-option value=""  @click.native='selectAll'>全部</a-select-option>
               <a-select-option value="1">待付款</a-select-option>
               <a-select-option value="2">待交付</a-select-option>
@@ -296,6 +296,10 @@ export default {
       this.page=page
       this.getList()
     },
+    //
+    selectAll(){
+
+    }
   }
 }
 </script>

From 5f340491cf2f2272d365211aa0d97091f720d7a1 Mon Sep 17 00:00:00 2001
From: torsenli <litong19@126.com>
Date: Fri, 25 Nov 2022 15:50:31 +0800
Subject: [PATCH 2/3] 111

---
 src/components/page/afterService/invoice.vue | 12 ++++++-
 src/components/page/order/closed.vue         | 33 ++++++++++++++++++--
 src/components/page/order/completed.vue      | 32 +++++++++++++++++--
 src/components/page/order/index.vue          |  2 +-
 src/components/page/order/pendingPayment.vue | 32 +++++++++++++++++--
 src/components/page/order/toBeDelivered.vue  | 32 +++++++++++++++++--
 src/components/page/order/toBeSettled.vue    | 32 +++++++++++++++++--
 src/main.js                                  |  4 +--
 src/utils/request.js                         |  4 +--
 9 files changed, 167 insertions(+), 16 deletions(-)

diff --git a/src/components/page/afterService/invoice.vue b/src/components/page/afterService/invoice.vue
index 413c65a..0c21fd2 100644
--- a/src/components/page/afterService/invoice.vue
+++ b/src/components/page/afterService/invoice.vue
@@ -57,7 +57,11 @@
             <span>生成时间：</span>
             <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+            <span>发票号码：</span>
+            <a-input v-model="query.batchcode"/>
+          </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="getAllDate(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -142,6 +146,12 @@ export default {
           width:'160px'
           // align:'center'
         },
+        {
+          title: '发票号码',
+          dataIndex: 'ticketid',
+          width:'120px'
+          // align:'center'
+        },
         {
           title: '发票编号',
           dataIndex: 'ticketid',
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index eb2a971..96ca415 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -51,11 +51,27 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>标的金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>订单金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="16" :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>
@@ -165,6 +181,7 @@ export default {
           // width:'130px',
           // align:'center'
         },
+
         // {
         //   title: '订单类型',
         //   dataIndex: 'type',
@@ -177,6 +194,18 @@ export default {
           width:'90px',
           // align:'center'
         },
+        {
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
+          width:'90px',
+          // align:'center'
+        },
+        {
+          title: '订单金额',
+          dataIndex: 'total_money',
+          width:'90px',
+          // align:'center'
+        },
         {
           title: '订单金额',
           dataIndex: 'total_money',
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index f32332a..6cddc15 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -51,11 +51,27 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>标的金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>订单金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="16" :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>
@@ -177,6 +193,18 @@ export default {
           dataIndex: 'entrust_type',
           // align:'center'
         },
+        {
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
+          width:'90px',
+          // align:'center'
+        },
+        {
+          title: '订单金额',
+          dataIndex: 'total_money',
+          width:'90px',
+          // align:'center'
+        },
         {
           title: '订单金额',
           dataIndex: 'total_money',
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 9365ed5..34b3fef 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -144,7 +144,7 @@ export default {
         goods_name:'',
         order_type:'',
         entrust_type:'',
-        transaction_status:'',
+        transaction_status:[''],
         createtime:[],
         goods_isli:'',
         charges_type:'',
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index 8f902d5..ac4d279 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -51,11 +51,27 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>标的金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>订单金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="16" :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>
@@ -176,6 +192,18 @@ export default {
           dataIndex: 'entrust_type',
 
         },
+        {
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
+          width:'90px',
+          // align:'center'
+        },
+        {
+          title: '订单金额',
+          dataIndex: 'total_money',
+          width:'90px',
+          // align:'center'
+        },
         {
           title: '订单金额',
           dataIndex: 'total_money',
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 76d9f55..cbd07d7 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -51,11 +51,27 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>标的金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>订单金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="16" :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>
@@ -176,6 +192,18 @@ export default {
           dataIndex: 'entrust_type',
           // align:'center'
         },
+        {
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
+          width:'90px',
+          // align:'center'
+        },
+        {
+          title: '订单金额',
+          dataIndex: 'total_money',
+          width:'90px',
+          // align:'center'
+        },
         {
           title: '订单金额',
           dataIndex: 'total_money',
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index a7641d5..fc41c07 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -51,11 +51,27 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>标的金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
+            <span>订单金额：</span>
+            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <el-col style="color:#d9d9d9;">-</el-col>
+            <el-col :span="10" v-html="'\u00a0'"/>
+            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+          </a-col>
+          <a-col :lg="12" :xl="16" :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>
@@ -176,6 +192,18 @@ export default {
           dataIndex: 'entrust_type',
           // align:'center'
         },
+        {
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
+          width:'90px',
+          // align:'center'
+        },
+        {
+          title: '订单金额',
+          dataIndex: 'total_money',
+          width:'90px',
+          // align:'center'
+        },
         {
           title: '订单金额',
           dataIndex: 'total_money',
diff --git a/src/main.js b/src/main.js
index 70d0901..72ac852 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,9 +22,9 @@ Vue.prototype.$echarts = echarts;
 
  // Vue.prototype.$host = 'http://10.24.4.156'
  // Vue.prototype.$host = 'http://10.14.1.197:9090'
- Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试
+ // Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试
 
-// Vue.prototype.$host = 'http://10.24.4.156' //正式服
+Vue.prototype.$host = 'http://10.24.4.156' //正式服
 // Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest
 
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 69f97c2..3b8f1f5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,9 +3,9 @@ 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://jiao.api.alpha.xingtongworld.com',
      // baseURL:'http://58.30.231.138:8899', //测试服
-    // baseURL:'http://10.24.4.156', //正式服
+    baseURL:'http://10.24.4.156', //正式服
 
      // baseURL:'10.14.1.197:9090', //新服
     // baseURL:'http://192.168.66.254:8080',

From 285dfcfa4c60983c72fb0d3b90640b24403d75dd Mon Sep 17 00:00:00 2001
From: torsenli <litong19@126.com>
Date: Mon, 28 Nov 2022 11:46:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=9A=84?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/order/closed.vue         | 20 +++++++++++-------
 src/components/page/order/completed.vue      | 20 +++++++++++-------
 src/components/page/order/index.vue          | 12 +++++++----
 src/components/page/order/pendingPayment.vue | 22 ++++++++++++--------
 src/components/page/order/toBeDelivered.vue  | 20 +++++++++++-------
 src/components/page/order/toBeSettled.vue    | 20 +++++++++++-------
 6 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 96ca415..347586e 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -57,19 +57,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="16" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -133,6 +133,10 @@ export default {
         createtime:[],
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       visible:false,
       visible2:false,
@@ -195,14 +199,14 @@ export default {
           // align:'center'
         },
         {
-          title: '交易佣金',
-          dataIndex: 'total_service_charge',
+          title: '标的金额',
+          dataIndex: 'goods_price',
           width:'90px',
           // align:'center'
         },
         {
-          title: '订单金额',
-          dataIndex: 'total_money',
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
           width:'90px',
           // align:'center'
         },
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 6cddc15..7579a79 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -57,19 +57,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="16" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -133,6 +133,10 @@ export default {
         createtime:[],
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       visible:false,
       visible2:false,
@@ -194,14 +198,14 @@ export default {
           // align:'center'
         },
         {
-          title: '交易佣金',
-          dataIndex: 'total_service_charge',
+          title: '标的金额',
+          dataIndex: 'goods_price',
           width:'90px',
           // align:'center'
         },
         {
-          title: '订单金额',
-          dataIndex: 'total_money',
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
           width:'90px',
           // align:'center'
         },
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 34b3fef..dfab547 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -69,19 +69,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -148,6 +148,10 @@ export default {
         createtime:[],
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       batchcode:'',
       visible:false,
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index ac4d279..38d6455 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -57,19 +57,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="16" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -132,6 +132,10 @@ export default {
         createtime:'',
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       batchcode:'',
       visible:false,
@@ -193,14 +197,14 @@ export default {
 
         },
         {
-          title: '交易佣金',
-          dataIndex: 'total_service_charge',
+          title: '标的金额',
+          dataIndex: 'goods_price',
           width:'90px',
           // align:'center'
         },
         {
-          title: '订单金额',
-          dataIndex: 'total_money',
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
           width:'90px',
           // align:'center'
         },
@@ -208,7 +212,7 @@ export default {
           title: '订单金额',
           dataIndex: 'total_money',
           width:'90px',
-
+          // align:'center'
         },
         {
           title: '操作',
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index cbd07d7..8baf3d7 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -57,19 +57,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="16" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -133,6 +133,10 @@ export default {
         createtime:[],
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       visible:false,
       visible2:false,
@@ -193,14 +197,14 @@ export default {
           // align:'center'
         },
         {
-          title: '交易佣金',
-          dataIndex: 'total_service_charge',
+          title: '标的金额',
+          dataIndex: 'goods_price',
           width:'90px',
           // align:'center'
         },
         {
-          title: '订单金额',
-          dataIndex: 'total_money',
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
           width:'90px',
           // align:'center'
         },
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index fc41c07..ecaf7ba 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -57,19 +57,19 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>标的金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.biaodi_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.biaodi_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
             <span>订单金额：</span>
-            <a-input v-model="query.entrust_name" placeholder="最小值"/>
+            <a-input v-model="query.dingdan_start" placeholder="最小值"/>
             <el-col :span="10" v-html="'\u00a0'"/>
             <el-col style="color:#d9d9d9;">-</el-col>
             <el-col :span="10" v-html="'\u00a0'"/>
-            <a-input v-model="query.entrust_name" placeholder="最大值"/>
+            <a-input v-model="query.dingdan_end" placeholder="最大值"/>
           </a-col>
           <a-col :lg="12" :xl="16" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
@@ -133,6 +133,10 @@ export default {
         createtime:[],
         goods_isli:'',
         charges_type:'',
+        biaodi_start:'',
+        biaodi_end:'',
+        dingdan_start:'',
+        dingdan_end:'',
       },
       visible:false,
       visible2:false,
@@ -193,14 +197,14 @@ export default {
           // align:'center'
         },
         {
-          title: '交易佣金',
-          dataIndex: 'total_service_charge',
+          title: '标的金额',
+          dataIndex: 'goods_price',
           width:'90px',
           // align:'center'
         },
         {
-          title: '订单金额',
-          dataIndex: 'total_money',
+          title: '交易佣金',
+          dataIndex: 'total_service_charge',
           width:'90px',
           // align:'center'
         },