首页

src/utils/request.js

@@ -14,7 +14,7 @@ let loading ;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 10000, // request timeout
+  timeout: 100000, // request timeout
   isLoading:true
 })
 

src/views/dashboard/index.vue

@@ -1,14 +1,31 @@
 <template>
   <div>
 
-    <div class="statistics">
+   <!-- <div class="statistics">
       <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
         <el-date-picker v-model="dateMonth" value-format="yyyy-MM" type="month" @change="loadData" placeholder="选择月份">
         </el-date-picker>
       </div>
-<!--      <panel-group :totaldata="list" />-->
+     <panel-group :totaldata="list" />
+    </div> -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="待处理订单" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+
+        </LxHeader>
+      </div>
     </div>
 
+    <xy-table
+      :table-item="table"
+      :list="data"
+      :total="total"
+      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageIndexChange="e => {select.page = e;getList()}">
+      <template v-slot:btns><div></div></template>
+    </xy-table>
+
 <!--    <div class="chart">-->
 <!--      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">-->
 <!--        <el-date-picker v-model="year" value-format="yyyy" type="year" @change="getCharData" placeholder="选择年份">-->
@@ -78,15 +95,75 @@
     getChartsData,
     getCounts
   } from "../../api/dashboard.js"
+  import LxHeader from '@/components/LxHeader/index.vue'
+  import {getList} from '@/api/order'
 
   export default {
     components: {
       PanelGroup,
       LineChart,
-      YbarChart
+      YbarChart,
+      LxHeader
     },
     data() {
       return {
+        select:{
+          page:1,
+          rows:10,
+          show_history:0,
+          state:'pending',
+          keyword:''
+        },
+        total:0,
+        data:[],
+        table:[
+          {
+            label:'客户姓名',
+            sortable:false,
+            prop:'member_name',
+            width:140
+          },
+          {
+            label:'客户电话',
+            sortable:false,
+            prop:'member_phone',
+            width: 180
+          },
+          {
+            label:'预产期',
+            sortable:false,
+            prop:'member_due_date',
+            width: 160
+          },
+          {
+            label:'产品类型',
+            sortable:false,
+            prop:'product_type.name',
+            width: 140
+          },
+          {
+            prop:'order.serial',
+            label:'订单编号',
+            width:180,
+            sortable:false,
+          },
+          {
+            prop:'order.created_at',
+            label:'订单创建时间',
+            // width:180,
+            sortable:false,
+          },
+          {
+            label:'状态',
+            sortable:false,
+            prop:'state_name',
+            width:120
+          }],
+
+
+
+
+
         dateMonth: "",
         year: "",
         col: '',
@@ -127,6 +204,12 @@
     },
     watch: {},
     methods: {
+      async getList(){
+        let res = await getList(this.select)
+        console.log(res)
+        this.data = res.data
+        this.total = res.total
+      },
       async loadData() {
         await getCounts({
           date: this.dateMonth
@@ -235,7 +318,7 @@
       //this.getCharData();
     },
     mounted() {
-
+    this.getList()
 
     },
     destroyed() {