驾校订单新增部分字段和对驾校隐藏部分栏目

src/utils/permission.js

@@ -8,8 +8,11 @@ import store from '@/store'
 export function checkPermi(value) {
   if (value && value instanceof Array && value.length > 0) {
     const permissions = store.getters && store.getters.permissions
+    console.log(permissions)
+    if (permissions.includes("*:*:*")) {
+      return true
+    }
     const permissionDatas = value
-
     const hasPermission = permissions.some(permission => {
       return permissionDatas.includes(permission)
     })

src/views/schoolOrder/index.vue

@@ -2,7 +2,11 @@
   <div class="app-container">
     <!--搜索模块-->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
-      <el-form-item label="选择驾校" prop="issueValue">
+      <el-form-item
+        v-hasPermi="['schoolOrder:index:search']"
+        label="选择驾校"
+        prop="issueValue"
+      >
         <el-select v-model="queryParams.schoolName" placeholder="请选择分类">
           <el-option
             v-for="item in schoolList"
@@ -12,6 +16,19 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="queryParams.startTime"
+          placeholder="开始时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="queryParams.endTime"
+          placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="订单总金额">{{otherData.totalPay/100}}元</el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
@@ -29,9 +46,20 @@
     <!--列表数据模块-->
     <div class="table-box">
       <el-table v-loading="loading" :data="list" height="100%">
-        <el-table-column label="ID" align="center" prop="id" />
-        <el-table-column label="商户订单号" align="center" prop="outTradeNo" />
-        <el-table-column label="用户唯一标识" align="center" prop="openid" />
+        <!-- <el-table-column label="ID" align="center" prop="id" /> -->
+        <el-table-column label="昵称" align="center" prop="nickName" />
+        <el-table-column label="头像" align="center" prop="headImage">
+          <template slot-scope="scope">
+            <img style="width: 36px" :src="scope.row.headImage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="订单号" align="center" prop="outTradeNo" />
+        <el-table-column label="创建时间" align="center" prop="successTime" />
+        <el-table-column label="交易金额" align="center" prop="total">
+          <template slot-scope="scope">
+            {{ scope.row.total / 100 }}元
+          </template>
+        </el-table-column>
       </el-table>
     </div>
 
@@ -48,7 +76,7 @@
 
 <script>
 import schoolOrderApi from "@/api/schoolOrder";
-
+import { checkPermi } from "@/utils/permission";
 export default {
   name: "Subject",
   data() {
@@ -64,16 +92,24 @@ export default {
         pageNum: 1,
         pageSize: 10,
         schoolName: null,
+        startTime: undefined,
+        endTime: undefined,
+      },
+      otherData:{
+
       },
       //具体分类列表
       issueTypeList: null,
       //驾校列表
       schoolList: null,
+      //
     };
   },
   created() {
     this.getList();
-    this.getSchoolList();
+    if (checkPermi(["schoolOrder:index:search"])) {
+      this.getSchoolList();
+    }
   },
   methods: {
     /**查询列表 */
@@ -83,6 +119,7 @@ export default {
       this.list = res.rows;
       this.total = res.total;
       this.loading = false;
+      this.otherData = res.otherData
     },
     async getSchoolList() {
       const res = await schoolOrderApi.getSchoolList();
@@ -99,6 +136,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         schoolName: null,
+        startTime: undefined,
+        endTime: undefined,
       };
       this.handleQuery();
     },

src/views/system/user/index.vue

@@ -427,22 +427,22 @@ export default {
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" }
         ],
-        email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+        // email: [
+        //   { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+        //   {
+        //     type: "email",
+        //     message: "'请输入正确的邮箱地址",
+        //     trigger: ["blur", "change"]
+        //   }
+        // ],
+        // phonenumber: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur"
+        //   }
+        // ]
       }
     };
   },

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: process.env.NODE_ENV === "development"?"https://jpcj-admin1.zzxcx.net/twzd-admin":"https://jpcj-admin.zzxcx.net/twzd-admin",
+        target: process.env.NODE_ENV === "development"?"https://jpcj-admin1.zzxcx.net/stage-api/":"https://jpcj-admin.zzxcx.net/twzd-admin",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",