订单类别的搜索

src/router/index.js

@@ -1,11 +1,18 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 /* Layout */
 
-import Layout from '@/layout'
+import Layout from "@/layout";
+
+
+
+//  引入总览中的子页面
+
+import chidRoutes from "@/views/dashboard/data/childRoute.js"
+
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -724,33 +731,42 @@ import Layout from '@/layout'
 
 export const mainRoutes = [
   {
-    path: '/login',
-    component: () => import('@/views/login/index'),
-    hidden: true
+    path: "/login",
+    component: () => import("@/views/login/index"),
+    hidden: true,
   },
   {
-    path: '/404',
-    component: () => import('@/views/404'),
-    hidden: true
+    path: "/404",
+    component: () => import("@/views/404"),
+    hidden: true,
   },
   {
-    path: '/',
+    path: "/",
     component: Layout,
-    redirect: '/dashboard',
+    redirect: "/dashboard",
     meta: {
-      title: '总览',
-      icon: 'el-icon-monitor'
+      title: "总览",
+      icon: "el-icon-monitor",
     },
-    children: [ {
-      path: 'dashboard',
-      name: 'dashboard',
-      component: () => import('@/views/dashboard/index.vue'),
-      meta: {
-        title: '总览',
-        icon: 'el-icon-monitor'
-      }
-    } ]
-  }
+    children: [
+      {
+        path: "dashboard",
+        name: "dashboard",
+        component: () => import("@/views/dashboard/index.vue"),
+        meta: {
+          title: "总览",
+          icon: "el-icon-monitor",
+        }
+      },
+      ...chidRoutes
+      // {
+      //   path: "/marketingManagement",
+      //   hidden:true,
+      //   name: "marketingManagement",
+      //   component: () => import("@/views/account/index.vue"),
+      // },
+    ],
+  },
   // {
   //   path: '/marketingManagement',
   //   component: Layout,
@@ -771,23 +787,24 @@ export const mainRoutes = [
   //     }
   //   } ]
   // }
-]
+];
 
-const createRouter = () => new Router({
-  // mode: 'history', // require service support
-  scrollBehavior: () => ({
-    y: 0
-  }),
-  // routes: constantRoutes
-  routes: mainRoutes
-})
+const createRouter = () =>
+  new Router({
+    // mode: 'history', // require service support
+    scrollBehavior: () => ({
+      y: 0,
+    }),
+    // routes: constantRoutes
+    routes: mainRoutes,
+  });
 
-const router = createRouter()
+const router = createRouter();
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-  const newRouter = createRouter()
-  router.matcher = newRouter.matcher // reset router
+  const newRouter = createRouter();
+  router.matcher = newRouter.matcher; // reset router
 }
 
-export default router
+export default router;

src/views/dashboard/chidRoutes/consumerManagement/index.scss

@@ -0,0 +1,66 @@
+ //  混入使用弹性布局
+ @mixin flex($justify, $flexDir: flase, $gap: 0rpx) {
+    display: flex;
+    align-items: center;
+    @if $justify {
+      justify-content: $justify;
+    }
+    @if $flexDir {
+      flex-direction: $flexDir;
+    }
+    gap: $gap;
+  }
+
+  .consumerManagement{
+    padding: 24px;
+    height: calc(100vh - 50px);
+    box-sizing: border-box;
+    @include flex(center,column,null);
+    .top-all{
+        background-color: #ffffff;
+        width: 100%;
+        height: 130px;
+        padding: 0 24px;
+        @include flex(space-between,null,null);
+        .top-item{
+            width: 383px;
+            height: 98px;
+            background-color: #EFF4FF;
+            padding: 12px 0 12px 24px;
+            p{
+                margin-top: 4px;
+                &:first-of-type{
+                    color: #3A68F2;
+                    font-size: 32px;
+                     font-weight: 600;
+                }
+                &:last-of-type{
+                    color: #424E66;
+                    font-size: 14px;
+                }
+            }
+        }
+    }
+    .bottom-list{
+        flex: 1;
+        width: 100%;
+        background-color: #ffffff;
+        margin-top: 16px;
+        padding: 10px 24px;
+        box-sizing: border-box;
+    }
+  }
+
+
+  ::v-deep .el-tabs__active-bar{
+    height: 3px;
+    background-color: #3A68F2;
+  }
+  ::v-deep .el-tabs__item.is-active{
+    color: #3A68F2;
+  }
+  ::v-deep .el-tabs__item {
+    &:hover{
+        color: #3A68F2;
+    }
+  }

src/views/dashboard/chidRoutes/consumerManagement/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="consumerManagement">
+    <div class="top-all">
+      <div class="top-item" v-for="item in 4" :key="item">
+        <p>4432</p>
+        <p>今日总支付消费金</p>
+      </div>
+    </div>
+    <div class="bottom-list">
+      <div class="tab-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="商圈" name="first">商圈</el-tab-pane>
+          <el-tab-pane label="商城" name="second">商城</el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    data () {
+        return {
+            activeName: 'first'
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./index.scss";
+</style>

src/views/dashboard/data/childRoute.js

@@ -0,0 +1,17 @@
+
+
+// 统计页面的子路由在这里填写
+const chidRoutes = [
+    {
+        name:"consumerManagement",
+        path:"/dashboard/consumerManagement",
+        hidden:true,
+        component:() => import("@/views/dashboard/chidRoutes/consumerManagement/index.vue"),
+        meta:{
+            title:"支付查询"
+        }
+    }
+]
+
+
+export default chidRoutes

src/views/order/pending/index.vue

@@ -41,6 +41,7 @@
             <el-option label="收件人手机号" value="4" />
             <!-- <el-option label="商品ID" value="5" /> -->
             <el-option label="下单号码" value="6" />
+            <el-option label="订单编号" value="7" />
           </el-select>
         </template>
       </el-input>

src/views/relationshipChainManagement/commissionLog/index.vue

@@ -10,6 +10,10 @@
         v-model="listQuery.superiorPhone" clearable size="mini" class="filter-item"
         style="width: 200px;margin-left: 10px;" placeholder="请输入绑定上级手机号码"
       />
+      <el-input
+        v-model="listQuery.orderFormid" clearable size="mini" class="filter-item"
+        style="width: 200px;margin-left: 10px;" placeholder="请输入关联订单编号"
+      />
       <el-button
         size="mini" class="filter-item" type="primary" icon="el-icon-search"
         style="margin-left:10px;"
@@ -101,7 +105,8 @@ export default {
         page: 1,
         pageSize: 20,
         phone: '',
-        superiorPhone: ''
+        superiorPhone: '',
+        orderFormid:""
       }
     }
   },