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 @@
生成时间：
-
+
+ 发票号码：
+
+
+
查 询
重 置
@@ -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..347586e 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -51,11 +51,27 @@
授权
-
+
创建时间：
-
+
+ 标的金额：
+
+
+ -
+
+
+
+
+ 订单金额：
+
+
+ -
+
+
+
+
查 询
重 置
@@ -117,6 +133,10 @@ export default {
createtime:[],
goods_isli:'',
charges_type:'',
+ biaodi_start:'',
+ biaodi_end:'',
+ dingdan_start:'',
+ dingdan_end:'',
},
visible:false,
visible2:false,
@@ -165,6 +185,7 @@ export default {
// width:'130px',
// align:'center'
},
+
// {
// title: '订单类型',
// dataIndex: 'type',
@@ -177,6 +198,18 @@ export default {
width:'90px',
// align:'center'
},
+ {
+ title: '标的金额',
+ dataIndex: 'goods_price',
+ width:'90px',
+ // align:'center'
+ },
+ {
+ title: '交易佣金',
+ dataIndex: 'total_service_charge',
+ 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..7579a79 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -51,11 +51,27 @@
授权
-
+
创建时间：
-
+
+ 标的金额：
+
+
+ -
+
+
+
+
+ 订单金额：
+
+
+ -
+
+
+
+
查 询
重 置
@@ -117,6 +133,10 @@ export default {
createtime:[],
goods_isli:'',
charges_type:'',
+ biaodi_start:'',
+ biaodi_end:'',
+ dingdan_start:'',
+ dingdan_end:'',
},
visible:false,
visible2:false,
@@ -177,6 +197,18 @@ export default {
dataIndex: 'entrust_type',
// align:'center'
},
+ {
+ title: '标的金额',
+ dataIndex: 'goods_price',
+ width:'90px',
+ // align:'center'
+ },
+ {
+ title: '交易佣金',
+ dataIndex: 'total_service_charge',
+ 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 0632ba8..dfab547 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -69,19 +69,19 @@
标的金额：
-
+
-
-
+
订单金额：
-
+
-
-
+
@@ -144,10 +144,14 @@ export default {
goods_name:'',
order_type:'',
entrust_type:'',
- transaction_status:[""],
+ transaction_status:[''],
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 8f902d5..38d6455 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -51,11 +51,27 @@
授权
-
+
订单创建时间：
-
+
+ 标的金额：
+
+
+ -
+
+
+
+
+ 订单金额：
+
+
+ -
+
+
+
+
查 询
重 置
@@ -116,6 +132,10 @@ export default {
createtime:'',
goods_isli:'',
charges_type:'',
+ biaodi_start:'',
+ biaodi_end:'',
+ dingdan_start:'',
+ dingdan_end:'',
},
batchcode:'',
visible:false,
@@ -176,11 +196,23 @@ export default {
dataIndex: 'entrust_type',
},
+ {
+ title: '标的金额',
+ dataIndex: 'goods_price',
+ width:'90px',
+ // align:'center'
+ },
+ {
+ title: '交易佣金',
+ dataIndex: 'total_service_charge',
+ width:'90px',
+ // align:'center'
+ },
{
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 76d9f55..8baf3d7 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -51,11 +51,27 @@
授权
-
+
订单创建时间：
-
+
+ 标的金额：
+
+
+ -
+
+
+
+
+ 订单金额：
+
+
+ -
+
+
+
+
查 询
重 置
@@ -117,6 +133,10 @@ export default {
createtime:[],
goods_isli:'',
charges_type:'',
+ biaodi_start:'',
+ biaodi_end:'',
+ dingdan_start:'',
+ dingdan_end:'',
},
visible:false,
visible2:false,
@@ -176,6 +196,18 @@ export default {
dataIndex: 'entrust_type',
// align:'center'
},
+ {
+ title: '标的金额',
+ dataIndex: 'goods_price',
+ width:'90px',
+ // align:'center'
+ },
+ {
+ title: '交易佣金',
+ dataIndex: 'total_service_charge',
+ 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..ecaf7ba 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -51,11 +51,27 @@
授权
-
+
创建时间：
-
+
+ 标的金额：
+
+
+ -
+
+
+
+
+ 订单金额：
+
+
+ -
+
+
+
+
查 询
重 置
@@ -117,6 +133,10 @@ export default {
createtime:[],
goods_isli:'',
charges_type:'',
+ biaodi_start:'',
+ biaodi_end:'',
+ dingdan_start:'',
+ dingdan_end:'',
},
visible:false,
visible2:false,
@@ -176,6 +196,18 @@ export default {
dataIndex: 'entrust_type',
// align:'center'
},
+ {
+ title: '标的金额',
+ dataIndex: 'goods_price',
+ width:'90px',
+ // align:'center'
+ },
+ {
+ title: '交易佣金',
+ dataIndex: 'total_service_charge',
+ 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',