修改

01afafff · ‘巴博尔’ · 4f01ef78 · 01afafff · 01afafff · 01afafff
Commit 01afafff authored Sep 11, 2023 by ‘巴博尔’
24 changed files
--- a/src/api/mallManagement/apply.js
+++ b/src/api/mallManagement/apply.js
+import request from '@/utils/request'
+// 查询商城商户申请列表
+export function listApply(query) {
+  return request({
+    url: '/system/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询商城商户申请详细
+export function getApply(id) {
+  return request({
+    url: '/system/apply/' + id,
+    method: 'get'
+  })
+}
+// 新增商城商户申请
+export function addApply(data) {
+  return request({
+    url: '/system/apply',
+    method: 'post',
+    data: data
+  })
+}
+// 修改商城商户申请
+export function updateApply(data) {
+  return request({
+    url: '/system/apply',
+    method: 'put',
+    data: data
+  })
+}
+// 删除商城商户申请
+export function delApply(id) {
+  return request({
+    url: '/system/apply/' + id,
+    method: 'delete'
+  })
+}
--- a/src/api/mallManagement/income.js
+++ b/src/api/mallManagement/income.js
+import request from '@/utils/request'
+// 查询商城提现审批列表
+export function listIncome(query) {
+  return request({
+    url: '/system/income/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询商城提现审批详细
+export function getIncome(id) {
+  return request({
+    url: '/system/income/' + id,
+    method: 'get'
+  })
+}
+// 新增商城提现审批
+export function addIncome(data) {
+  return request({
+    url: '/system/income',
+    method: 'post',
+    data: data
+  })
+}
+// 修改商城提现审批
+export function updateIncome(data) {
+  return request({
+    url: '/system/income',
+    method: 'put',
+    data: data
+  })
+}
+// 删除商城提现审批
+export function delIncome(id) {
+  return request({
+    url: '/system/income/' + id,
+    method: 'delete'
+  })
+}
--- a/src/api/mallManagement/order.js
+++ b/src/api/mallManagement/order.js
+/*
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-09-11 10:51:38
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-09-11 11:43:47
+ * @FilePath: \peizhen-vue\src\api\mallManagement\order.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import request from '@/utils/request'
+// 查询商城订单列表
+export function listOrder(query) {
+  return request({
+    url: '/system/storeOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询商城订单详细
+export function getOrder(id) {
+  return request({
+    url: '/system/order/' + id,
+    method: 'get'
+  })
+}
+// 新增商城订单
+export function addOrder(data) {
+  return request({
+    url: '/system/order',
+    method: 'post',
+    data: data
+  })
+}
+// 修改商城订单
+export function updateOrder(data) {
+  return request({
+    url: '/system/order',
+    method: 'put',
+    data: data
+  })
+}
+// 删除商城订单
+export function delOrder(id) {
+  return request({
+    url: '/system/order/' + id,
+    method: 'delete'
+  })
+}
--- a/src/api/orderManagement/order.js
+++ b/src/api/orderManagement/order.js
+import request from '@/utils/request'
+// 查询预约陪诊订单列表
+export function listOrder(query) {
+  return request({
+    url: '/system/yypzOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询预约陪诊订单详细
+export function getOrder(id) {
+  return request({
+    url: '/system/yypzOrder/' + id,
+    method: 'get'
+  })
+}
+// 新增预约陪诊订单
+export function addOrder(data) {
+  return request({
+    url: '/system/yypzOrder',
+    method: 'post',
+    data: data
+  })
+}
+// 修改预约陪诊订单
+export function updateOrder(data) {
+  return request({
+    url: '/system/yypzOrder',
+    method: 'put',
+    data: data
+  })
+}
+// 删除预约陪诊订单
+export function delOrder(id) {
+  return request({
+    url: '/system/yypzOrder/' + id,
+    method: 'delete'
+  })
+}
--- a/src/api/user/companion/index.js
+++ b/src/api/user/companion/index.js
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/employees/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/employees',
+    method: 'put',
+    data: data
+  })
+}
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/user/deptTree',
+    method: 'get'
+  })
+}
--- a/src/api/user/merchant/index.js
+++ b/src/api/user/merchant/index.js
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/merchant/company/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/merchant/company',
+    method: 'put',
+    data: data
+  })
+}
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/user/deptTree',
+    method: 'get'
+  })
+}
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -16,6 +16,7 @@
      :file-list="fileList"
      :on-preview="handlePictureCardPreview"
      :class="{hide: this.fileList.length >= this.limit}"
+      :disabled="disabled"
    >
      <i class="el-icon-plus"></i>
    </el-upload>
@@ -68,6 +69,10 @@ export default {
    isShowTip: {
      type: Boolean,
      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
    }
  },
  data() {

--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -122,6 +122,7 @@ export function filterDynamicRoutes(routes) {
 }
 export const loadView = (view) => {
+  console.log(view,"=======loadView")
  if (process.env.NODE_ENV === 'development') {
    return (resolve) => require([`@/views/${view}`], resolve)
  } else {

--- a/src/views/hispotalManage/doctor/index.vue
+++ b/src/views/hispotalManage/doctor/index.vue
@@ -227,7 +227,7 @@ export default {
  data() {
    return {
      // 部门树选项
-      deptOptions: undefined,
+      deptOptions: [],
      // 按钮loading
      buttonLoading: false,
      // 遮罩层
@@ -262,6 +262,7 @@ export default {
      form: {},
      // 表单校验
      rules: {},
+      hidList: [],
    };
  },
  created() {

--- a/src/views/hispotalManage/hospital/index.vue
+++ b/src/views/hispotalManage/hospital/index.vue
@@ -2,7 +2,7 @@
 * @Author: ‘巴博尔’ 2164119982@qq.com
 * @Date: 2023-09-07 16:09:29
 * @LastEditors: ‘巴博尔’ 2164119982@qq.com
- * @LastEditTime: 2023-09-08 11:51:43
+ * @LastEditTime: 2023-09-11 13:56:36
 * @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -163,7 +163,17 @@
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="ID" align="center" prop="id" />
      <el-table-column label="医院名称" align="center" prop="name" />
-      <el-table-column label="Logo" align="center" prop="logo" />
+      <el-table-column label="Logo" align="center" prop="logo">
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.logo"
+            v-model="row.logo"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
      <el-table-column label="等级" align="center" prop="levelName" />
      <el-table-column label="类别" align="center" prop="categoryName" />
      <el-table-column label="城市" align="center" prop="cityId" />

--- a/src/views/mallManagement/apply/index.vue
+++ b/src/views/mallManagement/apply/index.vue
--- a/src/views/mallManagement/income/index.vue
+++ b/src/views/mallManagement/income/index.vue
--- a/src/views/mallManagement/order/index.vue
+++ b/src/views/mallManagement/order/index.vue
--- a/src/views/operation/article/index.vue
+++ b/src/views/operation/article/index.vue
@@ -87,17 +87,23 @@
      <el-table-column label="文章标题" align="center" prop="title" />
      <el-table-column label="封面图" align="center" prop="cover">
        <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
            style="width: 30px; height: 30px"
            :src="row.cover"
            :preview-src-list="[row.cover]"
          >
-          </el-image>
+          </el-image> -->
+          <span>{{ row.cover ? "已设置" : "未设置" }}</span>
        </template>
      </el-table-column>
      <el-table-column label="城市" align="center" prop="cityName" />
-      <el-table-column label="内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="内容"
+        align="center"
+        prop="content"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="收藏数" align="center" prop="appreciateNum" />
      <el-table-column label="点赞数" align="center" prop="collectNum" />
      <el-table-column label="评论数" align="center" prop="" />
@@ -234,7 +240,6 @@ export default {
  created() {
    this.getList();
    this.cityVoListAxios();
  },
  methods: {
    /** 查询文章列表 */
@@ -370,4 +375,3 @@ export default {
  },
 };
 </script>
--- a/src/views/operation/banner/index.vue
+++ b/src/views/operation/banner/index.vue
@@ -9,7 +9,11 @@
      label-width="68px"
    >
      <el-form-item label="位置" prop="site">
-        <el-select v-model="queryParams.site" placeholder="请选择">
+        <el-select
+          v-model="queryParams.site"
+          placeholder="请选择"
+          @change="handleQuery"
+        >
          <el-option
            v-for="item in placeOptions"
            :key="item.value"
@@ -49,7 +53,7 @@
          >新增</el-button
        >
      </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -60,13 +64,18 @@
          v-hasPermi="['accompany:carousel:remove']"
          >删除</el-button
        >
-      </el-col>
+      </el-col> -->
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
+    <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="首页" name="1"></el-tab-pane>
+      <el-tab-pane label="商场首页" name="2"></el-tab-pane>
+    </el-tabs> -->
    <el-table
      v-loading="loading"
      :data="carouselList"
@@ -84,12 +93,19 @@
      <el-table-column label="城市" align="center" prop="cityName" />
      <el-table-column label="图片" align="center" prop="imgUrl">
        <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
            style="width: 30px; height: 30px"
            :src="row.imgUrl"
            :preview-src-list="[row.imgUrl]"
          >
-          </el-image>
+          </el-image> -->
+          <imageUpload
+            v-if="row.imgUrl"
+            v-model="row.imgUrl"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
        </template>
      </el-table-column>
      <el-table-column label="链接" align="center" prop="linkUrl" />
@@ -140,13 +156,22 @@
    />
    <!-- 添加或修改轮播图对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="位置" prop="site">
          <!-- <el-input v-model="form.site" placeholder="请输入位置" /> -->
          <el-select clearable v-model="form.site" placeholder="请选择">
            <el-option
-              v-for="item in placeOptions"
+              v-for="item in [
+                {
+                  value: 1,
+                  label: '首页',
+                },
+                {
+                  value: 2,
+                  label: '商城首页',
+                },
+              ]"
              :key="item.value"
              :label="item.label"
              :value="item.value"
@@ -229,6 +254,7 @@ export default {
  name: "Carousel",
  data() {
    return {
+      activeName: "1",
      // 按钮loading
      buttonLoading: false,
      // 遮罩层
@@ -253,12 +279,13 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        cityId: undefined,
+        // cityId: undefined,
+        // site: undefined,
+        // descr: undefined,
+        // imgUrl: undefined,
+        // linkUrl: undefined,
+        // status: undefined,
        site: undefined,
-        descr: undefined,
-        imgUrl: undefined,
-        linkUrl: undefined,
-        status: undefined,
      },
      // 表单参数
      form: {},
@@ -294,6 +321,13 @@ export default {
    this.cityVoListAxios();
  },
  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+      this.activeName = tab.name;
+      this.$set(this.queryParams, "site", parseInt(this.activeName));
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
    /** 查询轮播图列表 */
    getList() {
      this.loading = true;
@@ -338,8 +372,7 @@ export default {
        cityId: undefined,
        site: undefined,
        descr: undefined,
-        imgUrl:
+        imgUrl: undefined,
-          "https://img1.baidu.com/it/u=1747836562,3788666482&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
        linkUrl: undefined,
        status: undefined,
        createBy: undefined,

--- a/src/views/operation/business/index.vue
+++ b/src/views/operation/business/index.vue
--- a/src/views/operation/news/index.vue
+++ b/src/views/operation/news/index.vue
 <template>
  <div class="app-container">
-    <el-form
+    <!-- <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
@@ -16,9 +16,9 @@
          @click="handleQuery"
          >刷新</el-button
        >
-        <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
-    </el-form>
+    </el-form> -->
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -43,7 +43,7 @@
            v-hasPermi="['system:information:edit']"
          >修改</el-button>
        </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -54,7 +54,7 @@
          v-hasPermi="['system:information:remove']"
          >删除</el-button
        >
-      </el-col>
+      </el-col> -->
      <!-- <el-col :span="1.5">
          <el-button
            type="warning"
@@ -65,7 +65,7 @@
            v-hasPermi="['system:information:export']"
          >导出</el-button>
        </el-col> -->
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table
@@ -79,12 +79,19 @@
      <el-table-column label="城市" align="center" prop="cityName" />
      <el-table-column label="封面" align="center" prop="cover">
        <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
            style="width: 30px; height: 30px"
            :src="row.cover"
            :preview-src-list="[row.cover]"
          >
-          </el-image>
+          </el-image> -->
+          <imageUpload
+            v-if="row.cover"
+            v-model="row.cover"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
        </template>
      </el-table-column>
      <el-table-column label="内容" align="center" prop="info">
@@ -92,6 +99,8 @@
          <el-button type="text" @click="handleLook(row)">点击查看</el-button>
        </template>
      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
      <el-table-column
        label="操作"
        align="center"

--- a/src/views/operation/notice/index.vue
+++ b/src/views/operation/notice/index.vue
@@ -9,7 +9,7 @@
      label-width="68px"
    >
      <el-form-item label="位置" prop="site">
-        <el-select v-model="queryParams.site" placeholder="请选择">
+        <el-select v-model="queryParams.site" placeholder="请选择" @change="handleQuery">
          <el-option
            v-for="item in placeOptions"
            :key="item.value"
@@ -57,7 +57,7 @@
          >修改</el-button
        >
      </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -68,7 +68,7 @@
          v-hasPermi="['system:notice:remove']"
          >删除</el-button
        >
-      </el-col>
+      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="warning"

--- a/src/views/orderManagement/order/index.vue
+++ b/src/views/orderManagement/order/index.vue
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -150,11 +150,11 @@
              v-hasPermi="['system:user:export']"
            >导出</el-button>
          </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
            :showSearch.sync="showSearch"
            @queryTable="getList"
            :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
        </el-row>
        <el-table
@@ -206,21 +206,13 @@
            align="center"
            prop="createTime"
            width="160"
-          >
+          />
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
          <el-table-column
            label="更新时间"
            align="center"
-            prop="createTime"
+            prop="updateTime"
            width="160"
-          >
+          />
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
          <el-table-column
            label="操作"
            align="center"
@@ -327,9 +319,9 @@
            </el-form-item>
          </el-col>
          <el-col :span="24">
-            <el-form-item label="确认密码" prop="password">
+            <el-form-item label="确认密码" prop="passwordT">
              <el-input
-                v-model="form.password"
+                v-model="form.passwordT"
                placeholder="请输入确认密码"
                type="password"
                maxlength="20"
@@ -356,13 +348,13 @@
          </el-col>
          <template v-if="title === '修改'">
            <el-col :span="24">
-              <el-form-item label="创建时间" prop="">
+              <el-form-item label="创建时间" prop="createTime">
-                <el-input disabled />
+                <el-input v-model="form.createTime" disabled />
              </el-form-item>
            </el-col>
            <el-col :span="24">
-              <el-form-item label="更新时间" prop="">
+              <el-form-item label="更新时间" prop="updateTime">
-                <el-input disabled />
+                <el-input v-model="form.updateTime" disabled />
              </el-form-item>
            </el-col>
          </template>
@@ -555,6 +547,13 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+const equalToPassword = (rule, value, callback) => {
+  if (this.form.password !== value) {
+    callback(new Error("两次输入的密码不一致"));
+  } else {
+    callback();
+  }
+};
 export default {
  name: "User",
  dicts: ["sys_normal_disable", "sys_user_sex"],
@@ -620,7 +619,7 @@ export default {
        // phonenumber: undefined,
        // status: undefined,
        // deptId: undefined
-        userType: 'sys_user'
+        userType: "sys_user",
      },
      // 列信息
      columns: [
@@ -655,6 +654,10 @@ export default {
            trigger: "blur",
          },
        ],
+        passwordT: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" },
+        ],
        email: [
          {
            type: "email",
@@ -748,6 +751,9 @@ export default {
        remark: undefined,
        postIds: [],
        roleIds: [],
+        createTime: undefined,
+        updateTime: undefined,
+        passwordT: undefined,
      };
      this.resetForm("form");
    },
@@ -808,7 +814,8 @@ export default {
        this.open = true;
        // this.title = "修改用户";
        this.title = "修改";
-        this.form.password = "";
+        this.$set(this.form, "password", '');
+        this.$set(this.form, "passwordT", '');
      });
    },
    /** 重置密码按钮操作 */

--- a/src/views/user/companion/index.vue
+++ b/src/views/user/companion/index.vue
@@ -37,9 +37,9 @@
          v-show="showSearch"
          label-width="100px"
        >
-          <el-form-item label="陪诊员名称" prop="userName">
+          <el-form-item label="陪诊员名称" prop="name">
            <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.name"
              placeholder="请输入陪诊员名称"
              clearable
              style="width: 240px"
@@ -150,11 +150,11 @@
                v-hasPermi="['system:user:export']"
              >导出</el-button>
            </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
            :showSearch.sync="showSearch"
            @queryTable="getList"
            :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
        </el-row>
        <el-table
@@ -163,96 +163,151 @@
          @selection-change="handleSelectionChange"
        >
          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
+          <el-table-column label="ID" align="center" key="id" prop="id" />
-            label="ID"
-            align="center"
-            key="userId"
-            prop="userId"
-          />
          <el-table-column
            label="陪诊员"
            align="center"
-            key="userName"
+            key="name"
-            prop="userName"
+            prop="name"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="职业开始年份"
            align="center"
-            key="nickName"
+            key="startYear"
-            prop="nickName"
+            prop="startYear"
            :show-overflow-tooltip="true"
+            width="100"
          />
          <el-table-column
            label="用户"
            align="center"
-            key="deptName"
+            key="userName"
-            prop="dept.deptName"
+            prop="userName"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="所属商户"
            align="center"
-            key="deptName"
+            key="companyName"
-            prop="dept.deptName"
+            prop="companyName"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="身份证正面照"
            align="center"
-            key="deptName"
+            key="cardFront"
-            prop="dept.deptName"
+            prop="cardFront"
-          />
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.cardFront"
+                v-model="row.cardFront"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
          <el-table-column
            label="身份证反面照"
            align="center"
-            key="deptName"
+            key="cardReverse"
-            prop="dept.deptName"
+            prop="cardReverse"
-          />
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.cardReverse"
+                v-model="row.cardReverse"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
          <el-table-column
            label="健康证"
            align="center"
-            key="deptName"
+            key="healthCertificate"
-            prop="dept.deptName"
+            prop="healthCertificate"
-          />
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.healthCertificate"
+                v-model="row.healthCertificate"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
          <el-table-column
            label="当前身份"
            align="center"
-            key="deptName"
+            key="nowType"
-            prop="dept.deptName"
+            prop="nowType"
-          />
+          >
+            <template slot-scope="{ row }">
+              <span v-if="row.nowType == 1">陪诊员</span>
+              <span v-if="row.nowType == 2">陪护员</span>
+            </template>
+          </el-table-column>
          <el-table-column
            label="总收益"
            align="center"
-            key="phonenumber"
+            key="totalRevenue"
-            prop="phonenumber"
+            prop="totalRevenue"
          />
          <el-table-column
            label="当前余额"
            align="center"
-            key="phonenumber"
+            key="balance"
-            prop="phonenumber"
+            prop="balance"
          />
          <el-table-column
            label="城市"
            align="center"
-            key="phonenumber"
+            key="cityName"
-            prop="phonenumber"
+            prop="cityName"
          />
          <!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
-          <el-table-column
+          <el-table-column label="状态" align="center" key="status">
-            label="状态"
+            <template slot-scope="{ row }">
-            align="center"
+              <!-- <el-switch
-            key="status"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="scope">
-              <el-switch
                v-model="scope.row.status"
                active-value="0"
                inactive-value="1"
                @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              ></el-switch> -->
+              <el-select
+                v-model="row.status"
+                placeholder="请选择状态"
+                @change="changeStatus($event, row)"
+              >
+                <el-option
+                  v-for="item in [
+                    {
+                      label: '待审核',
+                      value: 0,
+                    },
+                    {
+                      label: '正常',
+                      value: 1,
+                    },
+                    {
+                      label: '禁用',
+                      value: 2,
+                    },
+                  ]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
            </template>
          </el-table-column>
          <el-table-column
@@ -260,11 +315,7 @@
            align="center"
            prop="createTime"
            width="160"
-          >
+          />
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
          <!-- <el-table-column
              label="更新时间"
              align="center"
@@ -604,14 +655,14 @@ import {
  resetUserPwd,
  changeUserStatus,
  deptTreeSelect,
-} from "@/api/system/user";
+} from "@/api/user/companion/index.js";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
  name: "UserCompanion",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  // dicts: ["sys_normal_disable", "sys_user_sex"],
  components: { Treeselect },
  data() {
    return {
@@ -670,11 +721,11 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        userName: undefined,
+        name: undefined,
        // phonenumber: undefined,
        // status: undefined,
        // deptId: undefined
-        userType: 'app_user'
+        // userType: 'app_user'
      },
      // 列信息
      columns: [
@@ -740,6 +791,17 @@ export default {
    });
  },
  methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateUser({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
    /** 查询用户列表 */
    getList() {
      this.loading = true;

--- a/src/views/user/merchant/index.vue
+++ b/src/views/user/merchant/index.vue
@@ -37,9 +37,9 @@
          v-show="showSearch"
          label-width="68px"
        >
-          <el-form-item label="商户名称" prop="userName">
+          <el-form-item label="商户名称" prop="name">
            <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.name"
              placeholder="请输入商户名称"
              clearable
              style="width: 240px"
@@ -150,11 +150,11 @@
                v-hasPermi="['system:user:export']"
              >导出</el-button>
            </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
            :showSearch.sync="showSearch"
            @queryTable="getList"
            :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
        </el-row>
        <el-table
@@ -163,99 +163,122 @@
          @selection-change="handleSelectionChange"
        >
          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
+          <el-table-column label="ID" align="center" key="id" prop="id" />
-            label="ID"
-            align="center"
-            key="userId"
-            prop="userId"
-          />
          <el-table-column
            label="商户名称"
            align="center"
-            key="userName"
+            key="name"
-            prop="userName"
+            prop="name"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="创建人"
            align="center"
-            key="nickName"
+            key="createBy"
-            prop="nickName"
+            prop="createBy"
            :show-overflow-tooltip="true"
          />
          <el-table-column
-            label="商户电话"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            width="120"
-          />
-          <el-table-column
            label="商户手机"
            align="center"
-            key="phonenumber"
+            key="phone"
-            prop="phonenumber"
+            prop="phone"
            width="120"
          />
          <el-table-column
            label="商户地址"
            align="center"
-            key="deptName"
+            key="address"
-            prop="dept.deptName"
+            prop="address"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="城市"
            align="center"
-            key="phonenumber"
+            key="cityName"
-            prop="phonenumber"
+            prop="cityName"
            width="120"
          />
          <el-table-column
            label="营业执照"
            align="center"
-            key="phonenumber"
+            key="businessLicense"
-            prop="phonenumber"
+            prop="businessLicense"
-          />
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.businessLicense"
+                v-model="row.businessLicense"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
          <el-table-column
            label="是否缴纳保证金"
            align="center"
-            key="phonenumber"
+            key="isCashDeposit"
-            prop="phonenumber"
+            prop="isCashDeposit"
-            width="120"
+          >
-          />
+            <template slot-scope="{ row }">
+              <span v-if="row.isCashDeposit == 0">否</span>
+              <span v-if="row.isCashDeposit == 1">是</span>
+            </template>
+          </el-table-column>
          <el-table-column
            label="保证金金额"
            align="center"
-            key="phonenumber"
+            key="cashDeposit"
-            prop="phonenumber"
+            prop="cashDeposit"
          />
          <el-table-column
            label="总收益"
            align="center"
-            key="phonenumber"
+            key="totalRevenue"
-            prop="phonenumber"
+            prop="totalRevenue"
          />
          <el-table-column
            label="当前余额"
            align="center"
-            key="phonenumber"
+            key="balance"
-            prop="phonenumber"
+            prop="balance"
          />
-          <!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
+          <el-table-column label="状态" align="center" key="status">
-          <el-table-column
+            <template slot-scope="{ row }">
-            label="状态"
+              <!-- <el-switch
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="scope">
-              <el-switch
                v-model="scope.row.status"
                active-value="0"
                inactive-value="1"
                @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              ></el-switch> -->
+              <el-select
+                v-model="row.status"
+                placeholder="请选择状态"
+                @change="changeStatus($event, row)"
+              >
+                <el-option
+                  v-for="item in [
+                    {
+                      label: '待审核',
+                      value: 0,
+                    },
+                    {
+                      label: '正常',
+                      value: 1,
+                    },
+                    {
+                      label: '禁用',
+                      value: 2,
+                    },
+                  ]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
            </template>
          </el-table-column>
          <el-table-column
@@ -263,11 +286,7 @@
            align="center"
            prop="createTime"
            width="160"
-          >
+          />
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
          <!-- <el-table-column
              label="更新时间"
              align="center"
@@ -607,14 +626,14 @@ import {
  resetUserPwd,
  changeUserStatus,
  deptTreeSelect,
-} from "@/api/system/user";
+} from "@/api/user/merchant/index.js";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
  name: "UserMerchant",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  // dicts: ["sys_normal_disable", "sys_user_sex"],
  components: { Treeselect },
  data() {
    return {
@@ -673,11 +692,11 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        userName: undefined,
+        name: undefined,
        // phonenumber: undefined,
        // status: undefined,
        // deptId: undefined
-        userType: 'merchant_user'
+        // userType: "merchant_user",
      },
      // 列信息
      columns: [
@@ -743,6 +762,17 @@ export default {
    });
  },
  methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateUser({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
    /** 查询用户列表 */
    getList() {
      this.loading = true;

--- a/src/views/user/whole/index.vue
+++ b/src/views/user/whole/index.vue
@@ -150,11 +150,11 @@
                v-hasPermi="['system:user:export']"
              >导出</el-button>
            </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
            :showSearch.sync="showSearch"
            @queryTable="getList"
            :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
        </el-row>
        <el-table
@@ -179,15 +179,25 @@
          <el-table-column
            label="头像"
            align="center"
-            key="nickName"
+            key="avatar"
-            prop="nickName"
+            prop="avatar"
-            :show-overflow-tooltip="true"
+          >
-          />
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.avatar"
+                v-model="row.avatar"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
+          <!-- TODO 用户类型 无字段 -->
          <el-table-column
            label="用户类型"
            align="center"
            key="deptName"
-            prop="dept.deptName"
+            prop=""
            :show-overflow-tooltip="true"
          />
          <el-table-column
@@ -626,7 +636,7 @@ export default {
        // phonenumber: undefined,
        // status: undefined,
        // deptId: undefined
-        userType: ''
+        userType: "",
      },
      // 列信息
      columns: [

--- a/vue.config.js
+++ b/vue.config.js
@@ -37,7 +37,7 @@ module.exports = {
      [process.env.VUE_APP_BASE_API]: {
        // target: `http://localhost:8080`,
        target: `http://192.168.0.169:8089`,
-        // target: `http://192.168.0.124:8089`,
+        // target: `http://192.168.0.170:8089`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''