优化

src/api/index.js

@@ -144,3 +144,11 @@ export const orderShut = query => {
       data: query
   });
 };
+//订单关闭
+export const home = query => {
+  return request({
+      url: '/admin/Index/home',
+      method: 'post',
+      data: query
+  });
+};

src/assets/css/main.css

@@ -40,7 +40,7 @@ body {
   font-size:16px
 }
 .query_item{
-  display: flex;
+  display: flex !important;
   align-items: center;
   margin-top: 14px;
 }
@@ -65,6 +65,7 @@ body {
 }
 .table{
   height: 620px;
+  width: 100%;
   background-color: white;
   margin-top: 20px;
   padding-left: 20px;

src/assets/img/add.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="13px" height="13px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -120 -108 )">
+    <path d="M 12.7414772727273 4.98579545454546  C 12.9138257575758 5.15814393939394  13 5.36742424242424  13 5.61363636363636  L 13 7.38636363636364  C 13 7.63257575757576  12.9138257575758 7.84185606060606  12.7414772727273 8.01420454545454  C 12.5691287878788 8.18655303030303  12.3598484848485 8.27272727272727  12.1136363636364 8.27272727272727  L 8.27272727272727 8.27272727272727  L 8.27272727272727 12.1136363636364  C 8.27272727272727 12.3598484848485  8.18655303030303 12.5691287878788  8.01420454545454 12.7414772727273  C 7.84185606060606 12.9138257575758  7.63257575757576 13  7.38636363636364 13  L 5.61363636363636 13  C 5.36742424242424 13  5.15814393939394 12.9138257575758  4.98579545454546 12.7414772727273  C 4.81344696969697 12.5691287878788  4.72727272727273 12.3598484848485  4.72727272727273 12.1136363636364  L 4.72727272727273 8.27272727272727  L 0.886363636363636 8.27272727272727  C 0.640151515151515 8.27272727272727  0.430871212121212 8.18655303030303  0.258522727272727 8.01420454545454  C 0.0861742424242424 7.84185606060606  0 7.63257575757576  0 7.38636363636364  L 0 5.61363636363636  C 0 5.36742424242424  0.0861742424242424 5.15814393939394  0.258522727272727 4.98579545454546  C 0.430871212121212 4.81344696969697  0.640151515151515 4.72727272727273  0.886363636363636 4.72727272727273  L 4.72727272727273 4.72727272727273  L 4.72727272727273 0.886363636363637  C 4.72727272727273 0.640151515151515  4.81344696969697 0.430871212121211  4.98579545454546 0.258522727272727  C 5.15814393939394 0.086174242424242  5.36742424242424 0  5.61363636363636 0  L 7.38636363636364 0  C 7.63257575757576 0  7.84185606060606 0.086174242424242  8.01420454545454 0.258522727272727  C 8.18655303030303 0.430871212121211  8.27272727272727 0.640151515151515  8.27272727272727 0.886363636363637  L 8.27272727272727 4.72727272727273  L 12.1136363636364 4.72727272727273  C 12.3598484848485 4.72727272727273  12.5691287878788 4.81344696969697  12.7414772727273 4.98579545454546  Z " fill-rule="nonzero" fill="#6aba45" stroke="none" transform="matrix(1 0 0 1 120 108 )" />
+  </g>
+</svg>

src/assets/img/jian.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="13px" height="4px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -147 -113 )">
+    <path d="M 12.7414772727273 0.291666666666667  C 12.9138257575758 0.486111111111109  13 0.722222222222221  13 1  L 13 3  C 13 3.27777777777778  12.9138257575758 3.51388888888889  12.7414772727273 3.70833333333333  C 12.5691287878788 3.90277777777778  12.3598484848485 4  12.1136363636364 4  L 0.886363636363636 4  C 0.640151515151515 4  0.430871212121212 3.90277777777778  0.258522727272727 3.70833333333333  C 0.0861742424242424 3.51388888888889  0 3.27777777777778  0 3  L 0 1  C 0 0.722222222222221  0.0861742424242424 0.486111111111109  0.258522727272727 0.291666666666667  C 0.430871212121212 0.0972222222222214  0.640151515151515 0  0.886363636363636 0  L 12.1136363636364 0  C 12.3598484848485 0  12.5691287878788 0.0972222222222214  12.7414772727273 0.291666666666667  Z " fill-rule="nonzero" fill="#d9001b" stroke="none" transform="matrix(1 0 0 1 147 113 )" />
+  </g>
+</svg>

src/components/Home.vue

@@ -27,6 +27,30 @@ export default {
     vHead,
     vSidebar,
   },
+  created(){
+    let token=this.getQueryString('token'),
+    url=this.getQueryString('url')
+    if(token){
+      localStorage.setItem('wenhua_token',token)
+    }
+    if(url){
+      localStorage.setItem('wenhua_url',url)
+    }
+  },
+  methods:{
+    getQueryString(name){
+      var after = window.location.hash.split("?")[1];
+      if(after){
+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+        var r = after.match(reg);
+        if(r != null){
+          return  decodeURIComponent(r[2]);
+        }else{
+          return null;
+        }
+      }
+    }
+  }
 }
 </script>
 

src/components/Sidebar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sidebar_body">
-    <a-menu theme="dark" mode="inline" :default-selected-keys="['1']"  class="sidebar">
+    <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]">
       <template v-for="item in items">
         <a-menu-item v-if="!item.children" :key="item.key">
           <router-link :to="item.url">
@@ -30,6 +30,8 @@
 export default {
   data() {
     return{
+      key:'',
+      openKey:'',
       items:[
         {
           icon:'',
@@ -37,14 +39,14 @@ export default {
           key:'1',
           title:'文化数据分类管理',
           children:[
-            {icon:'',url:"DataQuery",title:"全部文化数据查询"},
-            {icon:'',url:"Category",title:"文化数据类别管理"},
+            {icon:'',url:"DataQuery",title:"全部文化数据查询",key:'/DataQuery'},
+            {icon:'',url:"Category",title:"文化数据类别管理",key:'/Category'},
           ]
         },
         {
           icon:'',
           url:'admission',
-          key:'2',
+          key:'/admission',
           title:'文化数据入场管理',
         },
         {
@@ -53,12 +55,12 @@ export default {
           key:'3',
           title:'交易订单管理',
           children:[
-            {icon:'',url:"allOrder",title:"全部交易订单"},
-            {icon:'',url:"pendingPayment",title:"待付款订单"},
-            {icon:'',url:"toBeDelivered",title:"待交付订单"},
-            {icon:'',url:"toBeSettled",title:"待结算订单"},
-            {icon:'',url:"completed",title:"已完成订单"},
-            {icon:'',url:"closed",title:"已关闭订单"},
+            {icon:'',url:"allOrder",title:"全部交易订单",key:'/allOrder'},
+            {icon:'',url:"pendingPayment",title:"待付款订单",key:'/pendingPayment'},
+            {icon:'',url:"toBeDelivered",title:"待交付订单",key:'/toBeDelivered'},
+            {icon:'',url:"toBeSettled",title:"待结算订单",key:'/toBeSettled'},
+            {icon:'',url:"completed",title:"已完成订单",key:'/completed'},
+            {icon:'',url:"closed",title:"已关闭订单",key:'/closed'},
           ]
         },
         {
@@ -67,7 +69,7 @@ export default {
           key:'4',
           title:'交易订单售后服务管理',
           children:[
-            {icon:'',url:"invoice",title:"服务发票"},
+            {icon:'',url:"invoice",title:"服务发票",key:'/invoice'},
           ]
         },
         {
@@ -76,20 +78,36 @@ export default {
           key:'5',
           title:'资金结算分账管理',
           children:[
-            {icon:'',url:"fundSettlement",title:"资金结算对账单"},
-            {icon:'',url:"splitProportion",title:"分账比例设置"},
-            {icon:'',url:"paymentMethod",title:"支付方式设置"},
+            {icon:'',url:"fundSettlement",title:"资金结算对账单",key:'/fundSettlement'},
+            {icon:'',url:"splitProportion",title:"分账比例设置",key:'/splitProportion'},
+            {icon:'',url:"paymentMethod",title:"支付方式设置",key:'/paymentMethod'},
           ]
         },
         {
           icon:'',
           url:'layout',
-          key:'6',
+          key:'/layout',
           title:'数据展示布局管理',
         },
       ]
     }
   },
+  created(){
+    this.key=this.$route.path
+    this.items.map(item=>{
+      if(item.children){
+        for(let item1 in item.children){
+          if(item1.key==this.key){
+            this.openKey=item.key
+            break
+          }else{
+            this.openKey=''
+            this.key=''
+          }
+        }
+      }
+    })
+  }
 }
 </script>
 <style scoped>

src/components/dateSelect/index.vue

@@ -9,33 +9,35 @@
           </span>
           <p>委托方信息</p>
           <div class="tab_body">
+            <template v-if="userinfo.length!=0">
+              <div class="tab_body_content" v-for="(item,index) in userinfo" :key="index">
+                <p class="tab_body_p">认证类型：{{item.userType}}</p>
+                <p class="tab_body_p">认证状态：{{item.state}}</p>
+                <p class="tab_body_p">基本信息：{{item.name}}</p>
+                <p class="tab_body_p">统一社会信用代码：{{item.uscc}}</p>
+                <p class="tab_body_p">账户ISLI标识码：{{item.islicode}}</p>
+                <!-- <p class="tab_body_p">机构类型：{{item.userType}}</p>
 
-            <div class="tab_body_content" v-for="(item,index) in userinfo" :key="index">
-              <p class="tab_body_p">认证类型：{{item.userType}}</p>
-              <p class="tab_body_p">认证状态：{{item.state}}</p>
-              <p class="tab_body_p">基本信息：{{item.name}}</p>
-              <p class="tab_body_p">统一社会信用代码：{{item.uscc}}</p>
-              <p class="tab_body_p">账户ISLI标识码：{{item.islicode}}</p>
-              <p class="tab_body_p">机构类型：{{item.userType}}</p>
+                <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
+                <p class="tab_body_p" v-if="item.idNumber">证件号码：{{item.idNumber}}</p>
+                <p class="tab_body_p" v-if="item.cellPhone">手机号码：{{item.cellPhone}}</p>
 
-              <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
-              <p class="tab_body_p" v-if="item.idNumber">证件号码：{{item.idNumber}}</p>
-              <p class="tab_body_p" v-if="item.cellPhone">手机号码：{{item.cellPhone}}</p>
+                <p class="tab_body_p" v-if="item.legalsName">法人名称：{{item.legalsName}}</p>
+                <p class="tab_body_p" v-if="item.legalsType">法人证件类型：{{item.legalsType}}</p>
+                <p class="tab_body_p" v-if="item.legalsIdnum">法人证件号：{{item.legalsIdnum}}</p>
+                <p class="tab_body_p" v-if="item.legalsCellPhone">法人手机号：{{item.legalsCellPhone}}</p>
 
-              <p class="tab_body_p" v-if="item.legalsName">法人名称：{{item.legalsName}}</p>
-              <p class="tab_body_p" v-if="item.legalsType">法人证件类型：{{item.legalsType}}</p>
-              <p class="tab_body_p" v-if="item.legalsIdnum">法人证件号：{{item.legalsIdnum}}</p>
-              <p class="tab_body_p" v-if="item.legalsCellPhone">法人手机号：{{item.legalsCellPhone}}</p>
-
-              <p class="tab_body_p">银行账户：{{item.publicAccount}}</p>
-              <p class="tab_body_p">银行卡类型：{{item.bankCardType}}</p>
-              <p class="tab_body_p">银行行别：{{item.bankType}}</p>
-              <p class="tab_body_p">开户行名称：{{item.bankName}}</p>
-              <p class="tab_body_p">开户人姓名：{{item.bankAccountName}}</p>
-              <p class="tab_body_p">开户人身份证号码：{{item.certIdnum}}</p>
-              <p class="tab_body_p">开户行预留手机号码：{{item.bankCellPhone}}</p>
-              <p class="tab_body_p">开户行所在地：{{item.bankAddress}}</p>
-            </div>
+                <p class="tab_body_p">银行账户：{{item.publicAccount}}</p>
+                <p class="tab_body_p">银行卡类型：{{item.bankCardType}}</p>
+                <p class="tab_body_p">银行行别：{{item.bankType}}</p>
+                <p class="tab_body_p">开户行名称：{{item.bankName}}</p>
+                <p class="tab_body_p">开户人姓名：{{item.bankAccountName}}</p>
+                <p class="tab_body_p">开户人身份证号码：{{item.certIdnum}}</p>
+                <p class="tab_body_p">开户行预留手机号码：{{item.bankCellPhone}}</p>
+                <p class="tab_body_p">开户行所在地：{{item.bankAddress}}</p> -->
+              </div>
+            </template>
+            <!-- <span v-else>暂无数据</span> -->
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" force-render>
@@ -48,27 +50,29 @@
               <p class="tab_body_title_bg"></p>
               <div>文化资源数据-基本信息</div>
             </div>
-            <div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index">
-              <div class="tab_content_infoImg">
-                <img src="../../assets/img/test.png" class="tab_content_img">
-              </div>
-              <div class="tab_content_right">
-                <div class="content_right_title">标的名称：{{item.goods_name}}</div>
-                <div class="content_info">
-                  <div class="content_info_left">
-                    <p>标志码：{{item.goods_islicode}}</p>
-                    <p>标的类型：{{item.goods_type}}</p>
-                    <p>委托类型：{{item.goods_entrust}}</p>
-                    <p>权益：{{item.goods_ownership_str}}</p>
-                    <p>委托周期：{{item.contractual_period}}</p>
-                    <p>收费类型：{{item.charges_type}}</p>
-                    <p>交易保证金：{{item.earnest_money}}</p>
-                    <p>自报价：{{item.price}}</p>
+            <template v-if="entrust_goods.goods.length!=0">
+              <div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index">
+                <div class="tab_content_infoImg">
+                  <img src="../../assets/img/test.png" class="tab_content_img">
+                </div>
+                <div class="tab_content_right">
+                  <div class="content_right_title">标的名称：{{item.goods_name}}</div>
+                  <div class="content_info">
+                    <div class="content_info_left">
+                      <p>标志码：{{item.goods_islicode}}</p>
+                      <p>标的类型：{{item.goods_type}}</p>
+                      <p>委托类型：{{item.goods_entrust}}</p>
+                      <p>权益：{{item.goods_ownership_str}}</p>
+                      <p>委托周期：{{item.contractual_period}}</p>
+                      <p>收费类型：{{item.charges_type}}</p>
+                      <p>交易保证金：{{item.earnest_money}}</p>
+                      <p>自报价：{{item.price}}</p>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-
+            </template>
+            <!-- <p v-else class="none_p">暂无数据</p> -->
             <div class="tab_body_title">
               <p class="tab_body_title_bg"></p>
               <div>文化资源数据-关联资源</div>
@@ -294,8 +298,10 @@
         orderDetail(data).then(res=>{
           console.info(res)
           if(res.code==200){
-            this.userinfo=res.data.userinfo
-            this.entrust_goods=res.data.entrust_goods
+            if(res.data.length!=0){
+              this.userinfo=res.data.userinfo
+              this.entrust_goods=res.data.entrust_goods
+            }
           }else{
             this.$message.error(res.msg);
           }
@@ -457,4 +463,7 @@
   .tab_body_content:last-child{
     margin-bottom: 0;
   }
+  .none_p{
+    text-align: center;
+  }
 </style>

src/components/page/Home/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="content">
     <a-row class="tab">
-      <a-col :span="4" class="tab_item" v-for="(item,index) in tabList" :key="index">
+      <a-col :span="4" class="tab_item" v-for="(item,index) in tabList" :key="index" @click="goPage(item.url)">
         <img src="../../../assets/img/accountList.png" alt="">
-        <span>{{item.name}}</span>
+        <span>{{item.name}}（{{item.num}}）</span>
       </a-col>
     </a-row>
     <div class="tab tadayWork">
@@ -13,7 +13,10 @@
       </div>
       <a-row justify="space-between">
         <a-col :span="index==0 ?4:index==1?4:index==2?4:3"  class="tadayWork_item" v-for="(item,index) in tadayWorkList" :key="index">
-          <p class="tadayWork_price">{{item.price}}</p>
+          <p class="tadayWork_price">
+            <span v-if="item.id=='deal_money' || item.id=='order_money'">¥</span>
+            {{item.price}}
+          </p>
           <span>{{item.name}}</span>
         </a-col>
       </a-row>
@@ -25,19 +28,20 @@
             <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
               <div class="extra-wrapper" slot="tabBarExtraContent">
                 <div class="extra-item">
-                  <a>今日</a>
-                  <a>本周</a>
-                  <a>本月</a>
-                  <a>全年</a>
+                  <!-- <a>今日</a>
+                  <a>本周</a> -->
+                  <a :class="active=='day'?'active':''" @click="changeTiem('day',0)">按日</a>
+                  <a :class="active=='month'?'active':''" @click="changeTiem('month',0)">按月</a>
+                  <a :class="active=='year'?'active':''" @click="changeTiem('year',0)">按年</a>
                 </div>
-                <a-range-picker  class="picker"/>
+                <!-- <a-range-picker  class="picker"/> -->
               </div>
               <a-tab-pane loading="true" tab="销售额" key="1">
                 <schart class="schart" canvasId="bar" :options="options1"></schart>
               </a-tab-pane>
-              <a-tab-pane tab="访问量" key="2">
+              <!-- <a-tab-pane tab="访问量" key="2">
                 <schart class="schart" canvasId="bar" :options="options1"></schart>
-              </a-tab-pane>
+              </a-tab-pane> -->
             </a-tabs>
           </div>
         </a-card>
@@ -48,12 +52,13 @@
             <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
               <div class="extra-wrapper" slot="tabBarExtraContent">
                 <div class="extra-item">
-                  <a>今日</a>
-                  <a>本周</a>
-                  <a>本月</a>
-                  <a>全年</a>
+                  <!-- <a>今日</a>
+                  <a>本周</a> -->
+                  <a :class="active1=='day'?'active':''" @click="changeTiem('day',1)">按日</a>
+                  <a :class="active1=='month'?'active':''" @click="changeTiem('month',1)">按月</a>
+                  <a :class="active1=='year'?'active':''" @click="changeTiem('year',1)">按年</a>
                 </div>
-                <a-range-picker :style="{width: '256px'}" />
+                <!-- <a-range-picker :style="{width: '256px'}" /> -->
               </div>
               <a-tab-pane tab="访问量" key="1">
                 <a-row>
@@ -62,8 +67,8 @@
                       <ul class="list">
                         <li :key="index" v-for="(item, index) in rankList">
                           <span :class="index < 3 ? 'active' : null">{{ index + 1 }}</span>
-                          <span>{{ item.name }}</span>
-                          <span>{{ item.total }}</span>
+                          <span>{{ item.username }}</span>
+                          <span>{{ item.count }}</span>
                         </li>
                       </ul>
                     </div>
@@ -80,41 +85,47 @@
 </template>
 <script>
 import Schart from 'vue-schart';
+import {home} from '../../../api/index'
 export default {
   data() {
     return{
       tabList:[
-        {name:'全部文化数据查询（12,1212）',url:''},
-        {name:'待付款订单（123）',url:''},
-        {name:'待交付订单（123）',url:''},
-        {name:'待结算订单（123）',url:''},
-        {name:'已完成订单（123）',url:''},
-        {name:'已关闭订单（123）',url:''},
+        {name:'全部文化数据查询',url:'/DataQuery',num:'',id:'goods_count'},
+        {name:'待付款订单',url:'/pendingPayment',num:'',id:'awaitpay_count'},
+        {name:'待交付订单',url:'/toBeDelivered',num:'',id:'awaitdelivery_count'},
+        {name:'待结算订单',url:'/toBeSettled',num:'',id:'awaitclose_count'},
+        {name:'已完成订单',url:'/completed',num:'',id:'complete_count'},
+        {name:'已关闭订单',url:'/closed',num:'',id:'close_count'},
       ],
       tadayWorkList:[
-        {name:'交易总额',price:'¥845,256,996.30'},
-        {name:'订单总额',price:'¥672,356,258.70'},
-        {name:'交易文化数据',price:'1,888'},
-        {name:'上架文化数据',price:'99'},
-        {name:'下架文化数据',price:'9'},
-        {name:'新增订单',price:'2,169'},
-        {name:'已完成订单',price:'1,169'},
+        {name:'交易总额',price:'¥845,256,996.30',id:'deal_money'},
+        {name:'订单总额',price:'¥672,356,258.70',id:'order_money'},
+        {name:'交易文化数据',price:'1,888',id:'deal_goods_count'},
+        {name:'上架文化数据',price:'99',id:'shelf_count'},
+        {name:'下架文化数据',price:'9',id:'out_count'},
+        {name:'新增订单',price:'2,169',id:'yester_order_count'},
+        {name:'已完成订单',price:'1,169',id:'yester_complete_count'},
       ],
+      query:{
+        leftDate:'year',
+        rightDate:'year'
+      },
       loading: false,
       barData:[],
       barData2:[],
       rankList:[],
+      active:'year',
+      active1:'year',
       options1: {
         type: 'bar',
-        title: {
-          text: '最近一周各品类销售图'
-        },
+        // title: {
+        //   text: '最近一周各品类销售图'
+        // },
         bgColor: '#fbfbfb',
         labels: ['周一', '周二', '周三', '周四', '周五'],
         datasets: [
           {
-            label: '家电',
-            fillColor: 'rgba(241, 49, 74, 0.5)',
+            label: '订单总额',
             data: [234, 278, 270, 190, 230]
           },
           {
@@ -133,13 +144,45 @@ export default {
     Schart
   },
   created(){
-    for (let i = 0; i < 7; i++) {
-      this.rankList.push({
-        name: '白鹭岛 ' + (i + 1) + ' 号店',
-        total: 1234.56 - i * 100
+    this.getList()
+  },
+  methods:{
+    changeTiem(time,type){
+      if(type==1){
+        this.query.rightDate=time
+        this.active1=time
+      }else{
+        this.query.leftDate=time
+        this.active=time
+      }
+      this.getList()
+    },
+    goPage(url){
+      this.$router.push(url)
+    },
+    getList(){
+      home(this.query).then(res=>{
+        if(res.code==200){
+          for(let item in res.data){
+            this.tabList.map(tabItem=>{
+              if(item==tabItem.id){
+                tabItem.num=res.data[item]
+              }
+            })
+            this.tadayWorkList.map(workItem=>{
+              if(item==workItem.id){
+                workItem.price=res.data[item]
+              }
+            })
+          }
+          this.rankList=res.data.entrust_ranking
+          this.options1.datasets=res.data.treeMap
+          this.options1.labels=res.data.label
+        }else{
+          this.$message.error(res.msg);
+        }
       })
     }
-    console.info(this.rankList)
   }
 }
 </script>
@@ -162,6 +205,7 @@ export default {
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    cursor: pointer;
   }
   .tab_item img{
     width: 50px;
@@ -203,8 +247,12 @@ export default {
     padding-right: 10px;
   }
   .extra-wrapper .extra-item a{
+    color: #3A3A3A;
     margin-left: 24px;
   }
+  .active{
+    color: #1890FF !important;
+  }
 
   .rank {
     padding: 0 32px 32px 72px;

src/components/page/admission/index.vue

@@ -74,7 +74,7 @@
             <a-space :size="24" >
               <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
               <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
-              <span class="table_operation">关联订单</span>
+              <span class="table_operation" @click="associatedOrder(item.goods_islicode)">关联订单</span>
             </a-space>
           </template>
         </a-table>
@@ -183,6 +183,10 @@ export default {
     this.getAllDate()
   },
   methods:{
+    //关联订单
+    associatedOrder(val){
+      this.$router.push({path:'/allOrder',query:{goods_islicode:val}})
+    },
     // 重置query
     resetQurey(){
       Object.assign(this.query, this.$options.data().query)

src/components/page/fundSettlement/index.vue

@@ -49,7 +49,7 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
           <template slot="operation">

src/components/page/fundSettlement/splitProportion.vue

@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="5" class="query_item" >
             <span>创建人员：</span>
-            <a-select default-value="全部"  @change="handleChange">
+            <a-select default-value="全部"  >
               <a-select-option value="全部">
                 全部
               </a-select-option>
@@ -24,7 +24,7 @@
 
           <a-col :span="5" class="query_item">
             <span>使用状态：</span>
-            <a-select default-value="全部"  @change="handleChange">
+            <a-select default-value="全部"  >
               <a-select-option value="全部">
                 全部
               </a-select-option>
@@ -32,7 +32,7 @@
           </a-col>
           <a-col :span="5" class="query_item query_item2">
             <span>创建时间：</span>
-            <a-range-picker @change="onChange" />
+            <a-range-picker />
           </a-col>
           <a-col :span="19" class="query_item ">
             <a-space :size="21">
@@ -45,7 +45,7 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <a-button type="primary" class="query_button" @click="visible2=true">创 建</a-button>
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
           <template slot="operation">
@@ -71,39 +71,84 @@
         </a-pagination>
       </div>
     </div>
+    <!-- 创建规则 -->
+    <a-modal  v-model="visible2" title="创建规则" width="1186px" :bodyStyle="modeStyle">
+      <div >
+        <a-row  justify="space-between" class="modal_select">
+          <a-col :span="5" class="query_item rule_item">
+            <span>角色名称：</span>
+            <a-select default-value="1"   v-model="query1.goods_type">
+              <a-select-option value="1">委托方</a-select-option>
+              <a-select-option value="2">购买方</a-select-option>
+              <a-select-option value="3">深圳文化产权交易所</a-select-option>
+              <a-select-option value="4">区域中心</a-select-option>
+              <a-select-option value="5">第三方服务机构</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="6" class="query_item rule_item">
+            <span>费用名称：</span>
+            <a-select default-value="1"   v-model="query1.data_type">
+              <a-select-option value="1">委托服务费用</a-select-option>
+              <a-select-option value="2">交易服务费用</a-select-option>
+              <a-select-option value="3">认证服务费用</a-select-option>
+            </a-select>
+          </a-col>
+          <a-col :span="7" class="query_item rule_item">
+            <span>计算方式：</span>
+            <a-select default-value="1"   v-model="query1.transaction">
+              <a-select-option value="1">固定</a-select-option>
+              <a-select-option value="2">比例</a-select-option>
+            </a-select>
+            <a-input v-model="query1.islicode"/>
+          </a-col>
+          <a-col :span="6" class="query_item rule_item" >
+            <span>结算周期：</span>
+            <a-select default-value="1"   v-model="query1.show">
+              <a-select-option value="1">3天</a-select-option>
+              <a-select-option value="2">5天</a-select-option>
+              <a-select-option value="3">7天</a-select-option>
+              <a-select-option value="4">10天</a-select-option>
+              <a-select-option value="5">14天</a-select-option>
+              <a-select-option value="6">15天</a-select-option>
+              <a-select-option value="7">20天</a-select-option>
+              <a-select-option value="8">30天</a-select-option>
+            </a-select>
+          </a-col>
+        </a-row>
+        <div class="caozuo">
+          <img src="../../../assets/img/add.svg" alt="">
+          <img src="../../../assets/img/jian.svg" alt="">
+        </div>
+      </div>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="visible2=false">返 回</a-button>
+          <a-button type="primary" @click="addRule">创 建</a-button>
+        </div>
+      </template>
+    </a-modal>
   </div>
+
 </template>
 <script>
 import Operation from '../../Operation.vue'
 export default {
   data() {
     return{
+      query1:{
+
+      },
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       //一页多少条
       pageSize:10,
       total:500,
       // 当前页数
       current: 1,
-      data:[
-        {
-          key: '1',
-          name: 'John Brown',
-          money: '￥300,000.00',
-          address: 'New York No. 1 Lake Park',
-        },
-        {
-          key: '2',
-          name: 'Jim Green',
-          money: '￥1,256,000.00',
-          address: 'London No. 1 Lake Park',
-        },
-        {
-          key: '3',
-          name: 'Joe Black',
-          money: '￥120,000.00',
-          address: 'Sidney No. 1 Lake Park',
-        },
-      ],
+      visible2:false,
+      modeStyle:{
+        'height':'240px'
+      },
+      data:[],
       columns:[
         {
           title: '序号',
@@ -147,19 +192,31 @@ export default {
     console.info(this.$route)
   },
   methods:{
+    addRule(){
+
+    },
     // 切换一页显示多少条
     onShowSizeChange(current, pageSize){
       this.pageSize = pageSize;
     },
-    handleChange(){
-
-    },
-    onChange(){
-
-    }
   }
 }
 </script>
 <style scoped>
-
+  .rule_item >span{
+    min-width: 80px;
+  }
+  .rule_item .ant-input{
+    width: 60px;
+    margin-left: 15px;
+  }
+  .rule_item .ant-select{
+    width: 140px;
+  }
+  .caozuo{
+    margin-top: 5px;
+  }
+  .caozuo img{
+    margin-right: 10px;
+  }
 </style>

src/components/page/order/closed.vue

@@ -191,7 +191,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/components/page/order/completed.vue

@@ -191,7 +191,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/components/page/order/index.vue

@@ -203,6 +203,9 @@ export default {
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
+    if(this.$route.query){
+      this.query.goods_isli=this.$route.query.goods_islicode
+    }
     this.getList()
   },
   methods:{
@@ -211,7 +214,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/components/page/order/pendingPayment.vue

@@ -190,7 +190,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/components/page/order/toBeDelivered.vue

@@ -191,7 +191,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/components/page/order/toBeSettled.vue

@@ -191,7 +191,10 @@ export default {
       Object.assign(this.query, this.$options.data().query)
     },
     getList(){
-      getOrderList(this.query).then(res=>{
+      let data=this.query
+      data.page=this.page
+      data.limit=this.limit
+      getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
           this.startTotal=res.data.start

src/utils/request.js

@@ -9,10 +9,12 @@ const service = axios.create({
 
 service.interceptors.request.use(
     config => {
-        // let token = localStorage.getItem('token')
-        // if(token){
-        //     config.headers['token'] = token
-        // }
+        let token = localStorage.getItem('wenhua_token'),
+        url = localStorage.getItem('wenhua_url')
+        if(token&&url){
+            // config.headers['token'] = token
+            // config.headers['url'] = url
+        }
         return config;
     },
     error => {