一些小修改

src/components/orderDetails/index.vue

@@ -162,6 +162,12 @@
         step:0,
         data:[],
         columns:[
+          {
+            title: '交易主体',
+            dataIndex: 'transaction_subject',
+            width:'120px',
+            // align:'center'
+          },
           {
             title: '结算方',
             dataIndex: 'close_side',

src/components/page/fundSettlement/splitProportion.vue

@@ -88,8 +88,8 @@
           <a-col :span="5" class="query_item rule_item">
             <span>角色名称：</span>
             <a-select    v-model="item.role_type" >
-              <a-select-option value="1" v-if="index==1">授权方</a-select-option>
-              <a-select-option value="2" v-if="index==0">被授权方</a-select-option>
+              <a-select-option value="1" v-if="index==1">授权方/购买方</a-select-option>
+              <a-select-option value="2" v-if="index==0">被授权方/委托方</a-select-option>
               <a-select-option value="3" v-if="index==2">平台方</a-select-option>
               <!-- <a-select-option value="4">区域中心</a-select-option>
               <a-select-option value="5">第三方服务机构</a-select-option> -->
@@ -143,7 +143,7 @@
     <!-- 查看规则 -->
     <a-modal  v-model="visible" title="查看规则" width="570px" :bodyStyle="{'height':'300px'}">
       <div class="rule_item1" v-for="(item,i) in ruleList" :key="i">
-        <span>{{item.role_type==1?'授权方':item.role_type==2?'被授权方':'平台方'}}：</span>
+        <span>{{item.role_type==1?'授权方/购买方':item.role_type==2?'被授权方/委托方':'平台方'}}：</span>
         <span class="rule_item1_span">{{item.role_type==2?'交易佣金':'交易结算'}}（{{item.calculate==1?'比例':'固定'}}）</span>
         <span v-if="item.calculate==1">{{item.ratio}}%</span>
         <span v-if="item.calculate==2">{{item.amount}}%</span>

src/components/page/order/index.vue

@@ -54,7 +54,7 @@
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item" >
             <span>订单状态：</span>
             <a-select default-value=""  v-model="query.transaction_status">
-              <a-select-option value="">全部</a-select-option>
+              <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>
               <a-select-option value="3">待结算</a-select-option>
@@ -62,10 +62,27 @@
               <a-select-option value="5">已关闭</a-select-option>
             </a-select>
           </a-col>
+
           <a-col :lg="12" :xl="8" :xxl="6" 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="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="24" :xl="8" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
@@ -191,6 +208,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',

src/main.js

@@ -19,8 +19,16 @@ Vue.config.productionTip = false
 Vue.prototype.$echarts = echarts;
 
 // Vue.prototype.$host = 'http://58.30.231.138:8899'
+
  // 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://10.24.4.156' //正式服
+// Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest
+
+
+
 
 // Vue.prototype.$host = 'http://127.0.0.1'
 

src/utils/request.js

@@ -3,12 +3,13 @@ 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://10.24.4.156', //正式服
 
      // baseURL:'10.14.1.197:9090', //新服
     // baseURL:'http://192.168.66.254:8080',
+    // baseURL:'http://10.14.1.197:9090', //java测试
     timeout: 5000,
 });