From a9ae1f4f8137f9fad392f4b550f97870b07c0704 Mon Sep 17 00:00:00 2001
From: Eyoyoo <eyoyoo@126.com>
Date: Tue, 7 Dec 2021 21:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/components/Navbar.vue     |   6 +-
 .../src/views/carpool/blacklist/index.vue     | 162 ++++-------
 ruoyi-ui/src/views/carpool/driver/index.vue   | 273 ++++++------------
 ruoyi-ui/src/views/carpool/order/index.vue    | 200 ++++---------
 .../src/views/carpool/passenger/index.vue     | 265 ++++++-----------
 ruoyi-ui/src/views/login.vue                  |   2 +-
 ruoyi-ui/vue.config.js                        |   3 +-
 7 files changed, 299 insertions(+), 612 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 67a53ab67..7b2840f68 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,15 +7,15 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
         
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/ruoyi-ui/src/views/carpool/blacklist/index.vue b/ruoyi-ui/src/views/carpool/blacklist/index.vue
index 7e5824a45..f9f8c94af 100644
--- a/ruoyi-ui/src/views/carpool/blacklist/index.vue
+++ b/ruoyi-ui/src/views/carpool/blacklist/index.vue
@@ -1,50 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入平台唯一ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <!-- <el-form-item label="用户ID" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入平台唯一ID" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="用户名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入用户名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入用户名" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.phone" placeholder="请输入电话" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="所在城市" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          placeholder="请输入所在城市"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-input v-model="queryParams.city" placeholder="请输入所在城市" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <el-form-item label="类型：" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择用户类型：" clearable size="small">
-          <el-option
-            v-for="dict in dict.type.carpool_user_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.carpool_user_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -55,63 +26,36 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['carpool:blacklist:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['carpool:blacklist:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['carpool:blacklist:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['carpool:blacklist:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="blacklistList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="autoID" align="center" prop="id" />-->
+      <!--      <el-table-column label="autoID" align="center" prop="id" />-->
       <el-table-column label="平台唯一ID" align="center" prop="userId" />
       <el-table-column label="用户名" align="center" prop="name" />
-      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="所在城市" align="center" prop="city" />
-      <el-table-column label="用户类型" align="center" prop="type" >
+      <!-- <el-table-column label="所在城市" align="center" prop="city" /> -->
+      <el-table-column label="用户类型" align="center" prop="type">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.carpool_user_type" :value="scope.row.type"/>
+          <dict-tag :options="dict.type.carpool_user_type" :value="scope.row.type" />
         </template>
       </el-table-column>
-<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+      <!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['carpool:blacklist:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['carpool:blacklist:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改黑名单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -130,12 +74,7 @@
         </el-form-item>
         <el-form-item label="用户类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择用户类型：">
-            <el-option
-              v-for="dict in dict.type.carpool_user_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.carpool_user_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -148,11 +87,17 @@
 </template>
 
 <script>
-import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist } from "@/api/carpool/blacklist";
+import {
+  listBlacklist,
+  getBlacklist,
+  delBlacklist,
+  addBlacklist,
+  updateBlacklist,
+} from "@/api/carpool/blacklist";
 
 export default {
   name: "Blacklist",
-  dicts: ['carpool_user_type', 'sys_user_sex'],
+  dicts: ["carpool_user_type", "sys_user_sex"],
   data() {
     return {
       // 遮罩层
@@ -187,8 +132,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -198,7 +142,7 @@ export default {
     /** 查询黑名单列表 */
     getList() {
       this.loading = true;
-      listBlacklist(this.queryParams).then(response => {
+      listBlacklist(this.queryParams).then((response) => {
         this.blacklistList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -221,7 +165,7 @@ export default {
         type: null,
         remark: null,
         createTime: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -237,9 +181,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.userId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -250,8 +194,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getBlacklist(id).then(response => {
+      const id = row.id || this.ids;
+      getBlacklist(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改黑名单";
@@ -259,16 +203,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBlacklist(this.form).then(response => {
+            updateBlacklist(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBlacklist(this.form).then(response => {
+            addBlacklist(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -279,20 +223,28 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.userId || this.ids ;
-      this.$modal.confirm('是否确认删除黑名单编号为"' + ids + '"的数据项？').then(function() {
-        return delBlacklist(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      const ids = row.userId || this.ids;
+      this.$modal
+        .confirm('是否确认删除黑名单编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delBlacklist(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('carpool/blacklist/export', {
-        ...this.queryParams
-      }, `blacklist_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "carpool/blacklist/export",
+        {
+          ...this.queryParams,
+        },
+        `blacklist_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/ruoyi-ui/src/views/carpool/driver/index.vue b/ruoyi-ui/src/views/carpool/driver/index.vue
index 81cffabf2..9589d369d 100644
--- a/ruoyi-ui/src/views/carpool/driver/index.vue
+++ b/ruoyi-ui/src/views/carpool/driver/index.vue
@@ -1,88 +1,35 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="平台ID" prop="driverId">
-        <el-input
-          v-model="queryParams.driverId"
-          placeholder="平台ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <!-- <el-form-item label="平台ID" prop="driverId">
+        <el-input v-model="queryParams.driverId" placeholder="平台ID" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <el-form-item label="司机姓名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入司机姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入司机姓名" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="性别：" prop="sex">
+      <!-- <el-form-item label="性别：" prop="sex">
         <el-select v-model="queryParams.sex" placeholder="请选择性别：" clearable size="small">
-          <el-option
-            v-for="dict in dict.type.sys_user_sex"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="身份证号" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号码" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="年龄" prop="age">
-        <el-input
-          v-model="queryParams.age"
-          placeholder="请输入年龄"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-input v-model="queryParams.age" placeholder="请输入年龄" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <el-form-item label="手机号码" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入手机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="所在城市" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          placeholder="请输入所在城市"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <!-- <el-form-item label="所在城市" prop="city">
+        <el-input v-model="queryParams.city" placeholder="请输入所在城市" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="所在省份" prop="province">
-        <el-input
-          v-model="queryParams.province"
-          placeholder="请输入所在省份"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.province" placeholder="请输入所在省份" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="所在国家" prop="country">
-        <el-input
-          v-model="queryParams.country"
-          placeholder="请输入所在国家"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-input v-model="queryParams.country" placeholder="请输入所在国家" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,46 +38,16 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['carpool:driver:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['carpool:driver:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['carpool:driver:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['carpool:driver:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['carpool:driver:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['carpool:driver:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['carpool:driver:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['carpool:driver:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -141,54 +58,30 @@
       <el-table-column label="司机姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
         </template>
       </el-table-column>
-      <el-table-column label="身份证号码" align="center" prop="idCard" />
+      <!-- <el-table-column label="身份证号码" align="center" prop="idCard" /> -->
       <el-table-column label="年龄" align="center" prop="age" />
       <el-table-column label="手机号码" align="center" prop="phone" />
-      <el-table-column label="所在城市" align="center" prop="city" />
-      <el-table-column label="所在省份" align="center" prop="province" />
-      <el-table-column label="所在国家" align="center" prop="country" />
-      <el-table-column label="是否黑名单用户" align="center" prop="isBlacklist" >
+      <!-- <el-table-column label="所在城市" align="center" prop="city" /> -->
+      <!-- <el-table-column label="所在省份" align="center" prop="province" /> -->
+      <!-- <el-table-column label="所在国家" align="center" prop="country" /> -->
+      <el-table-column label="是否黑名单用户" align="center" prop="isBlacklist">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist"/>
+          <dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['carpool:driver:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['carpool:driver:remove']"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-s-release"
-            @click="handleBlackLIst(scope.row)"
-            v-hasPermi="['carpool:driver:edit']"
-          >添加黑名单</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['carpool:driver:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['carpool:driver:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-release" @click="handleBlackLIst(scope.row)" v-hasPermi="['carpool:driver:edit']">添加黑名单</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改司机信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -198,24 +91,19 @@
         </el-form-item>
         <el-form-item label="性别" prop="sex">
           <el-select v-model="form.sex" placeholder="请选择性别" size="small">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
+        <!-- <el-form-item label="身份证号" prop="idCard">
           <el-input v-model="form.idCard" placeholder="请输入身份证号码" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="年龄" prop="age">
           <el-input v-model="form.age" placeholder="请输入年龄" />
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号码" />
         </el-form-item>
-        <el-form-item label="所在城市" prop="city">
+        <!-- <el-form-item label="所在城市" prop="city">
           <el-input v-model="form.city" placeholder="请输入所在城市" />
         </el-form-item>
         <el-form-item label="所在省份" prop="province">
@@ -223,15 +111,10 @@
         </el-form-item>
         <el-form-item label="所在国家" prop="country">
           <el-input v-model="form.country" placeholder="请输入所在国家" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否黑名单用户" prop="isBlacklist">
           <el-select v-model="form.isBlacklist" placeholder="请选择是否黑名单用户" size="small">
-          <el-option
-            v-for="dict in dict.type.carpool_isblacklist"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
+            <el-option v-for="dict in dict.type.carpool_isblacklist" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -244,11 +127,18 @@
 </template>
 
 <script>
-import { listDriver, getDriver, delDriver, addDriver, updateDriver , setBlacklist } from "@/api/carpool/driver";
+import {
+  listDriver,
+  getDriver,
+  delDriver,
+  addDriver,
+  updateDriver,
+  setBlacklist,
+} from "@/api/carpool/driver";
 
 export default {
   name: "Driver",
-  dicts: ['sys_user_sex' , 'carpool_isblacklist'],
+  dicts: ["sys_user_sex", "carpool_isblacklist"],
   data() {
     return {
       // 遮罩层
@@ -287,8 +177,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -298,7 +187,7 @@ export default {
     /** 查询司机信息列表 */
     getList() {
       this.loading = true;
-      listDriver(this.queryParams).then(response => {
+      listDriver(this.queryParams).then((response) => {
         this.driverList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -324,7 +213,7 @@ export default {
         country: null,
         isBlacklist: null,
         createTime: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -340,9 +229,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -353,8 +242,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getDriver(id).then(response => {
+      const id = row.id || this.ids;
+      getDriver(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改司机信息";
@@ -362,28 +251,32 @@ export default {
     },
     /** 添加黑名单 */
     handleBlackLIst(row) {
-      const id = row.driverId
-      const type = row.type
+      const id = row.driverId;
+      const type = row.type;
       const name = row.name || this.driverId;
-      this.$modal.confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单？').then(function() {
-        return setBlacklist({"userId":id ,"type" : type});
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("添加黑名单成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单？')
+        .then(function () {
+          return setBlacklist({ userId: id, type: type });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("添加黑名单成功");
+        })
+        .catch(() => {});
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateDriver(this.form).then(response => {
+            updateDriver(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addDriver(this.form).then(response => {
+            addDriver(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -396,19 +289,27 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.driverId;
       const name = row.name || this.driverId;
-      this.$modal.confirm('是否确认删除司机姓名为"' + name + '"的数据项？').then(function() {
-        return delDriver(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除司机姓名为"' + name + '"的数据项？')
+        .then(function () {
+          return delDriver(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('carpool/driver/export', {
-        ...this.queryParams
-      }, `driver_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "carpool/driver/export",
+        {
+          ...this.queryParams,
+        },
+        `driver_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/ruoyi-ui/src/views/carpool/order/index.vue b/ruoyi-ui/src/views/carpool/order/index.vue
index 292b1fbe2..c216d0cf5 100644
--- a/ruoyi-ui/src/views/carpool/order/index.vue
+++ b/ruoyi-ui/src/views/carpool/order/index.vue
@@ -2,68 +2,30 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="订单号" prop="orderNum">
-        <el-input
-          v-model="queryParams.orderNum"
-          placeholder="请输入订单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orderNum" placeholder="请输入订单号" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="出发地" prop="departure">
-        <el-input
-          v-model="queryParams.departure"
-          placeholder="请输入出发地"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.departure" placeholder="请输入出发地" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="目的地" prop="destination">
-        <el-input
-          v-model="queryParams.destination"
-          placeholder="请输入目的地"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.destination" placeholder="请输入目的地" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="出发时间" prop="departureTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.departureTime"
-          type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择出发时间">
+        <el-date-picker clearable size="small" v-model="queryParams.departureTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择出发时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="订单状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="请选择订单状态">
-          <el-option
-            v-for="dict in dict.type.carpool_order_state"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.carpool_order_state" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否接单" prop="isTake">
         <el-select v-model="queryParams.isTake" placeholder="请选择接单状态">
-          <el-option
-            v-for="dict in dict.type.carpool_is_take"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.carpool_is_take" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="司机姓名" prop="driverName">
-        <el-input
-          v-model="queryParams.driverName"
-          placeholder="请输入司机姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.driverName" placeholder="请输入司机姓名" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -73,53 +35,23 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['carpool:order:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['carpool:order:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['carpool:order:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['carpool:order:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['carpool:order:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['carpool:order:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['carpool:order:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['carpool:order:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="autoID" align="center" prop="id" />-->
+      <!--      <el-table-column label="autoID" align="center" prop="id" />-->
       <el-table-column label="订单号" align="center" prop="orderNum" />
       <el-table-column label="出发地" align="center" prop="departure" />
       <el-table-column label="目的地" align="center" prop="destination" />
@@ -129,44 +61,26 @@
         </template>
       </el-table-column>
       <el-table-column label="当前人数" align="center" prop="member" />
-      <el-table-column label="是否接单" align="center" prop="isTake" >
+      <el-table-column label="是否接单" align="center" prop="isTake">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.carpool_is_take" :value="scope.row.isTake"/>
+          <dict-tag :options="dict.type.carpool_is_take" :value="scope.row.isTake" />
         </template>
       </el-table-column>
       <el-table-column label="接单司机" align="center" prop="driverName" />
-      <el-table-column label="订单当前的状态" align="center" prop="state" >
+      <el-table-column label="订单当前的状态" align="center" prop="state">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.carpool_order_state" :value="scope.row.state"/>
+          <dict-tag :options="dict.type.carpool_order_state" :value="scope.row.state" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['carpool:order:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['carpool:order:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['carpool:order:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['carpool:order:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改订单信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -178,11 +92,7 @@
           <el-input v-model="form.destination" placeholder="请输入目的地" />
         </el-form-item>
         <el-form-item label="出发时间" prop="departureTime">
-          <el-date-picker clearable size="small"
-            v-model="form.departureTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择出发时间">
+          <el-date-picker clearable size="small" v-model="form.departureTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择出发时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="当前人数" prop="member">
@@ -190,12 +100,7 @@
         </el-form-item>
         <el-form-item label="订单状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择订单状态">
-            <el-option
-              v-for="dict in dict.type.carpool_order_state"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.carpool_order_state" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -208,11 +113,17 @@
 </template>
 
 <script>
-import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/carpool/order";
+import {
+  listOrder,
+  getOrder,
+  delOrder,
+  addOrder,
+  updateOrder,
+} from "@/api/carpool/order";
 
 export default {
   name: "Order",
-  dicts: ['sys_user_sex' , 'carpool_order_state', 'carpool_is_take'],
+  dicts: ["sys_user_sex", "carpool_order_state", "carpool_is_take"],
   data() {
     return {
       // 遮罩层
@@ -252,8 +163,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -263,7 +173,7 @@ export default {
     /** 查询订单信息列表 */
     getList() {
       this.loading = true;
-      listOrder(this.queryParams).then(response => {
+      listOrder(this.queryParams).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -288,7 +198,7 @@ export default {
         createUser: null,
         createTime: null,
         updateUser: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -304,9 +214,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -317,8 +227,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getOrder(id).then(response => {
+      const id = row.id || this.ids;
+      getOrder(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改订单信息";
@@ -326,16 +236,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateOrder(this.form).then(response => {
+            updateOrder(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addOrder(this.form).then(response => {
+            addOrder(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -347,19 +257,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除订单信息编号为"' + ids + '"的数据项？').then(function() {
-        return delOrder(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除订单信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delOrder(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('carpool/order/export', {
-        ...this.queryParams
-      }, `order_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "carpool/order/export",
+        {
+          ...this.queryParams,
+        },
+        `order_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/ruoyi-ui/src/views/carpool/passenger/index.vue b/ruoyi-ui/src/views/carpool/passenger/index.vue
index e541b50cf..b8ddc7caf 100644
--- a/ruoyi-ui/src/views/carpool/passenger/index.vue
+++ b/ruoyi-ui/src/views/carpool/passenger/index.vue
@@ -2,60 +2,25 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="平台ID" prop="custId">
-        <el-input
-          v-model="queryParams.custId"
-          placeholder="请输入用户平台ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.custId" placeholder="请输入用户平台ID" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="用户名" prop="custName">
-        <el-input
-          v-model="queryParams.custName"
-          placeholder="请输入用户名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.custName" placeholder="请输入用户名" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="手机号码" prop="custPhone">
-        <el-input
-          v-model="queryParams.custPhone"
-          placeholder="请输入用户手机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.custPhone" placeholder="请输入用户手机号码" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="性别" prop="sex">
+      <!-- <el-form-item label="性别" prop="sex">
         <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+          <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
-      <el-form-item label="所在城市" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          placeholder="请输入所在城市"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      </el-form-item> -->
+      <!-- <el-form-item label="所在城市" prop="city">
+        <el-input v-model="queryParams.city" placeholder="请输入所在城市" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="所在省份" prop="province">
-        <el-input
-          v-model="queryParams.province"
-          placeholder="请输入所在省份"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-input v-model="queryParams.province" placeholder="请输入所在省份" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -63,46 +28,16 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['carpool:passenger:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['carpool:passenger:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['carpool:passenger:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['carpool:passenger:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['carpool:passenger:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['carpool:passenger:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['carpool:passenger:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['carpool:passenger:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -112,59 +47,35 @@
       <el-table-column label="用户平台ID" align="center" prop="custId" />
       <el-table-column label="用户名" align="center" prop="custName" />
       <el-table-column label="微信昵称" align="center" prop="nickName" />
-      <el-table-column label="微信用户唯一标识" align="center" prop="openId" />
-      <el-table-column label="用户手机号码" align="center" prop="custPhone" />
-      <el-table-column label="性别" align="center" prop="sex" >
+      <el-table-column label="微信唯一标识" align="center" prop="openId" />
+      <el-table-column label="手机号" align="center" prop="custPhone" />
+      <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
         </template>
       </el-table-column>
-      <el-table-column label="生日" align="center" prop="birthday" width="180">
+      <!-- <el-table-column label="生日" align="center" prop="birthday" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="所在城市" align="center" prop="city" />
-      <el-table-column label="所在省份" align="center" prop="province" />
-      <el-table-column label="是否黑名单用户" align="center" prop="isBlacklist" >
+      </el-table-column> -->
+      <!-- <el-table-column label="所在城市" align="center" prop="city" /> -->
+      <!-- <el-table-column label="所在省份" align="center" prop="province" /> -->
+      <el-table-column label="黑名单" align="center" prop="isBlacklist">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist"/>
+          <dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['carpool:passenger:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['carpool:passenger:remove']"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-s-release"
-            @click="handleBlackLIst(scope.row)"
-            v-hasPermi="['carpool:passenger:edit']"
-          >添加黑名单</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['carpool:passenger:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['carpool:passenger:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-release" @click="handleBlackLIst(scope.row)" v-hasPermi="['carpool:passenger:edit']">添加黑名单</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改乘客信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -175,28 +86,19 @@
         <el-form-item label="微信昵称" prop="nickName">
           <el-input v-model="form.nickName" placeholder="请输入微信昵称" />
         </el-form-item>
-        <el-form-item label="微信用户唯一标识" prop="openId">
+        <el-form-item label="微信标识" prop="openId">
           <el-input v-model="form.openId" placeholder="请输入微信用户唯一标识" />
         </el-form-item>
-        <el-form-item label="用户手机号码" prop="custPhone">
+        <el-form-item label="手机号" prop="custPhone">
           <el-input v-model="form.custPhone" placeholder="请输入用户手机号码" />
         </el-form-item>
         <el-form-item label="性别" prop="sex">
-            <el-select v-model="form.sex" placeholder="请选择性别">
-              <el-option
-                v-for="dict in dict.type.sys_user_sex"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-select v-model="form.sex" style="width:100%" placeholder="请选择性别">
+            <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="生日" prop="birthday">
-          <el-date-picker clearable size="small"
-            v-model="form.birthday"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择生日">
+        <!-- <el-form-item label="生日" prop="birthday">
+          <el-date-picker clearable size="small" v-model="form.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择生日">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="所在城市" prop="city">
@@ -204,15 +106,10 @@
         </el-form-item>
         <el-form-item label="所在省份" prop="province">
           <el-input v-model="form.province" placeholder="请输入所在省份" />
-        </el-form-item>
-        <el-form-item label="是否黑名单用户" prop="isBlacklist">
-          <el-select v-model="form.isBlacklist" placeholder="请选择是否黑名单用户" size="small">
-            <el-option
-              v-for="dict in dict.type.carpool_isblacklist"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+        </el-form-item> -->
+        <el-form-item label="黑名单" prop="isBlacklist">
+          <el-select v-model="form.isBlacklist" style="width:100%" placeholder="请选择是否黑名单用户" size="small">
+            <el-option v-for="dict in dict.type.carpool_isblacklist" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -225,11 +122,18 @@
 </template>
 
 <script>
-import { listPassenger, getPassenger, delPassenger, addPassenger, updatePassenger , setBlacklist } from "@/api/carpool/passenger";
+import {
+  listPassenger,
+  getPassenger,
+  delPassenger,
+  addPassenger,
+  updatePassenger,
+  setBlacklist,
+} from "@/api/carpool/passenger";
 
 export default {
   name: "Passenger",
-  dicts: ['sys_user_sex','carpool_isblacklist'],
+  dicts: ["sys_user_sex", "carpool_isblacklist"],
   data() {
     return {
       // 遮罩层
@@ -268,8 +172,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -279,7 +182,7 @@ export default {
     /** 查询乘客信息列表 */
     getList() {
       this.loading = true;
-      listPassenger(this.queryParams).then(response => {
+      listPassenger(this.queryParams).then((response) => {
         this.passengerList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -305,7 +208,7 @@ export default {
         province: null,
         isBlacklist: null,
         createTime: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -321,9 +224,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -334,8 +237,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getPassenger(id).then(response => {
+      const id = row.id || this.ids;
+      getPassenger(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改乘客信息";
@@ -343,16 +246,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePassenger(this.form).then(response => {
+            updatePassenger(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPassenger(this.form).then(response => {
+            addPassenger(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -363,33 +266,45 @@ export default {
     },
     /** 添加黑名单 */
     handleBlackLIst(row) {
-      const id = row.custId ;
-      const type = row.type ;
-      const name = row.custName ;
-      this.$modal.confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单？').then(function() {
-        return setBlacklist({"userId":id ,"type" : type});
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("添加黑名单成功");
-      }).catch(() => {});
+      const id = row.custId;
+      const type = row.type;
+      const name = row.custName;
+      this.$modal
+        .confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单？')
+        .then(function () {
+          return setBlacklist({ userId: id, type: type });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("添加黑名单成功");
+        })
+        .catch(() => {});
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除乘客信息编号为"' + ids + '"的数据项？').then(function() {
-        return delPassenger(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除乘客信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delPassenger(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('carpool/passenger/export', {
-        ...this.queryParams
-      }, `passenger_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "carpool/passenger/export",
+        {
+          ...this.queryParams,
+        },
+        `passenger_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index a2796e81e..5a26c2bb5 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -69,7 +69,7 @@ export default {
       cookiePassword: "",
       loginForm: {
         username: "admin",
-        password: "",
+        password: "qwerasdf",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index e565dfb2e..e4d500aa0 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -33,7 +33,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:16009`,
+        target: `http://121.199.20.209/prod-api`,
+        // target: `http://localhost:16009`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''