From 9c5b9fd1ca21c9f1aa9c1f93cbb535e9631c57df Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Wed, 9 Apr 2025 07:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/model/AppUsers/bcsindex.vue          | 593 ++++++++++++++++++++
 .../src/views/model/AppUsers/hhindex.vue           | 593 ++++++++++++++++++++
 .../src/views/model/AppUsers/index.vue             |  72 ++-
 .../src/views/model/AppletConfig/confindex.vue     | 100 ++--
 .../src/views/model/AppletConfig/hhindex.vue       | 366 +++++++++++++
 .../src/views/model/AppletPet/openindex.vue        | 603 +++++++++++++++++++++
 .../views/model/AppletUsersTeacher/allindex.vue    | 475 ++++++++++++++++
 .../src/views/model/AppletUsersTeacher/index.vue   |  28 +-
 .../views/model/AppletUsersTeacher/openindex.vue   | 475 ++++++++++++++++
 .../applet/contoller/ApiAppletOrderController.java | 242 +++++++--
 .../contoller/ApiAppletOrderItemController.java    | 196 +++++++
 .../applet/service/impl/IMallOrderServiceImpl.java |   7 +-
 .../controller/AppletUsersTeacherController.java   |  14 +-
 .../main/java/com/ruoyi/model/domain/AppUsers.java |   5 +
 .../java/com/ruoyi/model/domain/AppletConfig.java  | 233 +++++---
 .../com/ruoyi/model/mapper/AppletConfigMapper.java |   3 +
 .../ruoyi/model/service/IAppletConfigService.java  |   2 +-
 .../service/impl/AppletConfigServiceImpl.java      |   6 +
 .../main/resources/mapper/model/AppUsersMapper.xml |  13 +-
 .../mapper/model/AppletAmountLogMapper.xml         |   1 +
 .../resources/mapper/model/AppletConfigMapper.xml  |  23 +-
 .../mapper/model/AppletUsersTeacherMapper.xml      |   1 +
 22 files changed, 3842 insertions(+), 209 deletions(-)
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppUsers/bcsindex.vue
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppUsers/hhindex.vue
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppletConfig/hhindex.vue
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppletPet/openindex.vue
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/allindex.vue
 create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
 create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemController.java

diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppUsers/bcsindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/bcsindex.vue
new file mode 100644
index 0000000..c43df00
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/bcsindex.vue
@@ -0,0 +1,593 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+<!--      <el-form-item label="修改人" prop="updatorBy">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.updatorBy"-->
+<!--          placeholder="请输入修改人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="用户昵称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="是否合伙人" prop="userHh">-->
+<!--        <el-select v-model="queryParams.userHh" placeholder="请选择是否合伙人" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_yes_no"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="合伙人角色" prop="userBcsRole">-->
+<!--        <el-select v-model="queryParams.userHhRole" placeholder="请选择合伙人角色" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_hh_role"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否伴宠师" prop="userBcs">-->
+<!--        <el-select v-model="queryParams.userBcs" placeholder="请选择是否伴宠师" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_yes_no"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="伴宠师角色" prop="userBcsRole">
+        <el-select v-model="queryParams.userBcsRole" placeholder="请选择伴宠师角色" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_bcs_role"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="用户状态" prop="userState">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userState"-->
+<!--          placeholder="请输入用户状态"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="用户电话" prop="userTelephone">
+        <el-input
+          v-model="queryParams.userTelephone"
+          placeholder="请输入用户电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unionid"-->
+<!--          placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.openid"-->
+<!--          placeholder="请输入用户的标识，对当前公众号唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="过期时间" prop="expiresIn">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.expiresIn"-->
+<!--          placeholder="请输入过期时间"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="过期时间" prop="expireTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            v-model="queryParams.expireTime"-->
+<!--            type="datetime"-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="选择过期时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否合伙人" prop="userHh">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userHh"-->
+<!--          placeholder="请输入是否合伙人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否伴宠师" prop="userBcs">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userBcs"-->
+<!--          placeholder="请输入是否伴宠师"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="钱包金额" prop="price">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.price"-->
+<!--          placeholder="请输入钱包金额"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="邀请码" prop="invitationCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.invitationCode"-->
+<!--          placeholder="请输入邀请码"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppUsers: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="['model:AppUsers: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="['model:AppUsers:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppUsers:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppUsersList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="注册时间" align="center" prop="createTime" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+<!--      <el-table-column label="备注" align="center" prop="remark" v-if="columns[0].visible"/>-->
+<!--      <el-table-column label="修改人" align="center" prop="updatorBy" v-if="columns[1].visible"/>-->
+<!--      <el-table-column label="用户头像" align="center" prop="userImage" />-->
+      <el-table-column label="用户头像" align="center" prop="userImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.userImage" :src="row.userImage" :preview-src-list="[row.userImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" align="center" prop="userName" />
+<!--      <el-table-column label="用户状态" align="center" prop="userState" v-if="columns[4].visible"/>-->
+      <el-table-column label="用户电话" align="center" prop="userTelephone" />
+<!--      <el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" v-if="columns[6].visible"/>-->
+      <el-table-column label="用户微信标识" align="center" prop="openid" />
+<!--      <el-table-column label="token" align="center" prop="accessToken" v-if="columns[8].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expiresIn" v-if="columns[9].visible"/>-->
+<!--      <el-table-column label="刷新token" align="center" prop="refreshToken" v-if="columns[10].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" v-if="columns[11].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--            <span>{{ parseTime(scope.row.expireTime, '')}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否合伙人" align="center" prop="userHh" />-->
+<!--      <el-table-column label="是否伴宠师" align="center" prop="userBcs" />-->
+<!--      <el-table-column label="是否合伙人" align="center" prop="userHh" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userHh"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="合伙人角色" align="center" prop="userHhRole">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.applet_hh_role" :value="scope.row.userHhRole"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="是否伴宠师" align="center" prop="userBcs" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userBcs"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="伴宠师角色" align="center" prop="userBcsRole">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_bcs_role" :value="scope.row.userBcsRole"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="钱包金额" align="center" prop="price"/>
+      <el-table-column label="保证金" align="center" prop="baoPrice" />
+      <el-table-column label="邀请码" align="center" prop="invitationCode" />
+      <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="['model:AppUsers:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['model:AppUsers: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"
+    />
+
+    <!-- 添加或修改用户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+<!--        <el-form-item label="逻辑删除" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修改人" prop="updatorBy">-->
+<!--          <el-input v-model="form.updatorBy" placeholder="请输入修改人" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户头像">
+<!--          <imageUpload v-model="form.userImage"/>-->
+          <oss-image-upload v-model="form.userImage" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="用户昵称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户昵称" />
+        </el-form-item>
+<!--        <el-form-item label="用户状态" prop="userState">-->
+<!--          <el-input v-model="form.userState" placeholder="请输入用户状态" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户电话" prop="userTelephone">
+          <el-input v-model="form.userTelephone" placeholder="请输入用户电话" />
+        </el-form-item>
+<!--        <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--          <el-input v-model="form.unionid" placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户微信标识" prop="openid">
+          <el-input v-model="form.openid" placeholder="请输入用户的标识，对当前公众号唯一" />
+        </el-form-item>
+<!--        <el-form-item label="token" prop="accessToken">-->
+<!--          <el-input v-model="form.accessToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expiresIn">-->
+<!--          <el-input v-model="form.expiresIn" placeholder="请输入过期时间" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="刷新token" prop="refreshToken">-->
+<!--          <el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expireTime">-->
+<!--          <el-date-picker clearable size="small"-->
+<!--                        v-model="form.expireTime"-->
+<!--                        type="datetime"-->
+<!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        placeholder="选择过期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="是否合伙人" prop="userHh">
+          <el-select v-model="form.userHh" placeholder="请选择是否合伙人">
+            <el-option
+              v-for="dict in dict.type.applet_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="合伙人角色" prop="userHhRole">
+          <el-select v-model="form.userHhRole" placeholder="请选择合伙人角色">
+            <el-option
+              v-for="dict in dict.type.applet_hh_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否伴宠师" prop="userBcs">
+          <el-select v-model="form.userBcs" placeholder="请选择是否伴宠师">
+            <el-option
+              v-for="dict in dict.type.applet_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="伴宠师角色" prop="userBcsRole">
+          <el-select v-model="form.userBcsRole" placeholder="请选择伴宠师角色">
+            <el-option
+              v-for="dict in dict.type.applet_bcs_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="钱包金额" prop="price">
+          <el-input v-model="form.price" placeholder="请输入钱包金额" />
+        </el-form-item>
+        <el-form-item label="保证金" prop="baoPrice">
+          <el-input v-model="form.baoPrice" placeholder="请输入保证金" />
+        </el-form-item>
+        <el-form-item label="邀请码" prop="invitationCode">
+          <el-input v-model="form.invitationCode" placeholder="请输入邀请码" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppUsers, getAppUsers, delAppUsers, addAppUsers, updateAppUsers, exportAppUsers } from "@/api/model/AppUsers";
+
+export default {
+  name: "AppUsers",
+  dicts: ['applet_yes_no', 'applet_yes_no', 'applet_bcs_role','applet_hh_role'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      AppUsersList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        updatorBy: null,
+        userImage: null,
+        userName: null,
+        userState: null,
+        userTelephone: null,
+        unionid: null,
+        openid: null,
+        accessToken: null,
+        expiresIn: null,
+        refreshToken: null,
+        expireTime: null,
+        userHh: null,
+        userBcs: 1,
+        userBcsRole: null,
+        price: null,
+        baoPrice: null,
+        invitationCode: null,
+        userHhRole:null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+        { key: 2, label: "创建时间", visible:  true  },
+        { key: 4, label: "备注", visible:  true  },
+        { key: 6, label: "修改人", visible:  false  },
+        { key: 7, label: "用户头像", visible:  false  },
+        { key: 8, label: "用户名称", visible:  true  },
+        { key: 9, label: "用户状态, 0==为注册, 1==已注册为认证", visible:  true  },
+        { key: 10, label: "用户电话", visible:  false  },
+        { key: 11, label: "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段", visible:  false  },
+        { key: 12, label: "用户的标识，对当前公众号唯一", visible:  false  },
+        { key: 13, label: "token", visible:  false  },
+        { key: 14, label: "过期时间", visible:  false  },
+        { key: 15, label: "刷新token", visible:  false  },
+        { key: 16, label: "过期时间", visible:  false  },
+        { key: 17, label: "是否合伙人", visible:  false  },
+        { key: 18, label: "是否伴宠师", visible:  false  },
+        { key: 19, label: "伴宠师角色", visible:  false  },
+        { key: 20, label: "钱包金额", visible:  false  },
+        { key: 21, label: "保证金", visible:  false  },
+        { key: 22, label: "邀请码", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listAppUsers(this.queryParams).then(response => {
+        this.AppUsersList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        createBy: null,
+        createTime: null,
+        delFlag: null,
+        remark: null,
+        updateTime: null,
+        updatorBy: null,
+        userImage: null,
+        userName: null,
+        userState: null,
+        userTelephone: null,
+        unionid: null,
+        openid: null,
+        accessToken: null,
+        expiresIn: null,
+        refreshToken: null,
+        expireTime: null,
+        userHh: null,
+        userBcs: 1,
+        userBcsRole: null,
+        price: null,
+        baoPrice: null,
+        invitationCode: null,
+        userHhRole:null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getAppUsers(userId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != null) {
+            updateAppUsers(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppUsers(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delAppUsers(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppUsers(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppUsers/hhindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/hhindex.vue
new file mode 100644
index 0000000..b728936
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/hhindex.vue
@@ -0,0 +1,593 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+<!--      <el-form-item label="修改人" prop="updatorBy">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.updatorBy"-->
+<!--          placeholder="请输入修改人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="用户昵称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="是否合伙人" prop="userHh">-->
+<!--        <el-select v-model="queryParams.userHh" placeholder="请选择是否合伙人" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_yes_no"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="合伙人角色" prop="userBcsRole">
+        <el-select v-model="queryParams.userHhRole" placeholder="请选择合伙人角色" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_hh_role"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="是否伴宠师" prop="userBcs">-->
+<!--        <el-select v-model="queryParams.userBcs" placeholder="请选择是否伴宠师" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_yes_no"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="伴宠师角色" prop="userBcsRole">-->
+<!--        <el-select v-model="queryParams.userBcsRole" placeholder="请选择伴宠师角色" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_bcs_role"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用户状态" prop="userState">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userState"-->
+<!--          placeholder="请输入用户状态"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="用户电话" prop="userTelephone">
+        <el-input
+          v-model="queryParams.userTelephone"
+          placeholder="请输入用户电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unionid"-->
+<!--          placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.openid"-->
+<!--          placeholder="请输入用户的标识，对当前公众号唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="过期时间" prop="expiresIn">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.expiresIn"-->
+<!--          placeholder="请输入过期时间"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="过期时间" prop="expireTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            v-model="queryParams.expireTime"-->
+<!--            type="datetime"-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="选择过期时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否合伙人" prop="userHh">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userHh"-->
+<!--          placeholder="请输入是否合伙人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否伴宠师" prop="userBcs">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userBcs"-->
+<!--          placeholder="请输入是否伴宠师"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="钱包金额" prop="price">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.price"-->
+<!--          placeholder="请输入钱包金额"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="邀请码" prop="invitationCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.invitationCode"-->
+<!--          placeholder="请输入邀请码"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppUsers: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="['model:AppUsers: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="['model:AppUsers:remove']"
+        >删除</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppUsers:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppUsersList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="注册时间" align="center" prop="createTime" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+<!--      <el-table-column label="备注" align="center" prop="remark" v-if="columns[0].visible"/>-->
+<!--      <el-table-column label="修改人" align="center" prop="updatorBy" v-if="columns[1].visible"/>-->
+<!--      <el-table-column label="用户头像" align="center" prop="userImage" />-->
+      <el-table-column label="用户头像" align="center" prop="userImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.userImage" :src="row.userImage" :preview-src-list="[row.userImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" align="center" prop="userName" />
+<!--      <el-table-column label="用户状态" align="center" prop="userState" v-if="columns[4].visible"/>-->
+      <el-table-column label="用户电话" align="center" prop="userTelephone" />
+<!--      <el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" v-if="columns[6].visible"/>-->
+      <el-table-column label="用户微信标识" align="center" prop="openid" />
+<!--      <el-table-column label="token" align="center" prop="accessToken" v-if="columns[8].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expiresIn" v-if="columns[9].visible"/>-->
+<!--      <el-table-column label="刷新token" align="center" prop="refreshToken" v-if="columns[10].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" v-if="columns[11].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--            <span>{{ parseTime(scope.row.expireTime, '')}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否合伙人" align="center" prop="userHh" />-->
+<!--      <el-table-column label="是否伴宠师" align="center" prop="userBcs" />-->
+      <el-table-column label="是否合伙人" align="center" prop="userHh" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userHh"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="合伙人角色" align="center" prop="userHhRole">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_hh_role" :value="scope.row.userHhRole"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="是否伴宠师" align="center" prop="userBcs" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userBcs"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="伴宠师角色" align="center" prop="userBcsRole">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.applet_bcs_role" :value="scope.row.userBcsRole"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="钱包金额" align="center" prop="price"/>
+      <el-table-column label="保证金" align="center" prop="baoPrice" />
+      <el-table-column label="邀请码" align="center" prop="invitationCode" />
+      <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="['model:AppUsers:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['model:AppUsers: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"
+    />
+
+    <!-- 添加或修改用户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+<!--        <el-form-item label="逻辑删除" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修改人" prop="updatorBy">-->
+<!--          <el-input v-model="form.updatorBy" placeholder="请输入修改人" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户头像">
+<!--          <imageUpload v-model="form.userImage"/>-->
+          <oss-image-upload v-model="form.userImage" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="用户昵称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户昵称" />
+        </el-form-item>
+<!--        <el-form-item label="用户状态" prop="userState">-->
+<!--          <el-input v-model="form.userState" placeholder="请输入用户状态" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户电话" prop="userTelephone">
+          <el-input v-model="form.userTelephone" placeholder="请输入用户电话" />
+        </el-form-item>
+<!--        <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--          <el-input v-model="form.unionid" placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户微信标识" prop="openid">
+          <el-input v-model="form.openid" placeholder="请输入用户的标识，对当前公众号唯一" />
+        </el-form-item>
+<!--        <el-form-item label="token" prop="accessToken">-->
+<!--          <el-input v-model="form.accessToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expiresIn">-->
+<!--          <el-input v-model="form.expiresIn" placeholder="请输入过期时间" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="刷新token" prop="refreshToken">-->
+<!--          <el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expireTime">-->
+<!--          <el-date-picker clearable size="small"-->
+<!--                        v-model="form.expireTime"-->
+<!--                        type="datetime"-->
+<!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        placeholder="选择过期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="是否合伙人" prop="userHh">
+          <el-select v-model="form.userHh" placeholder="请选择是否合伙人">
+            <el-option
+              v-for="dict in dict.type.applet_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="合伙人角色" prop="userHhRole">
+          <el-select v-model="form.userHhRole" placeholder="请选择合伙人角色">
+            <el-option
+              v-for="dict in dict.type.applet_hh_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否伴宠师" prop="userBcs">
+          <el-select v-model="form.userBcs" placeholder="请选择是否伴宠师">
+            <el-option
+              v-for="dict in dict.type.applet_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="伴宠师角色" prop="userBcsRole">
+          <el-select v-model="form.userBcsRole" placeholder="请选择伴宠师角色">
+            <el-option
+              v-for="dict in dict.type.applet_bcs_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="钱包金额" prop="price">
+          <el-input v-model="form.price" placeholder="请输入钱包金额" />
+        </el-form-item>
+        <el-form-item label="保证金" prop="baoPrice">
+          <el-input v-model="form.baoPrice" placeholder="请输入保证金" />
+        </el-form-item>
+        <el-form-item label="邀请码" prop="invitationCode">
+          <el-input v-model="form.invitationCode" placeholder="请输入邀请码" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppUsers, getAppUsers, delAppUsers, addAppUsers, updateAppUsers, exportAppUsers } from "@/api/model/AppUsers";
+
+export default {
+  name: "AppUsers",
+  dicts: ['applet_yes_no', 'applet_yes_no', 'applet_bcs_role','applet_hh_role'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      AppUsersList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        updatorBy: null,
+        userImage: null,
+        userName: null,
+        userState: null,
+        userTelephone: null,
+        unionid: null,
+        openid: null,
+        accessToken: null,
+        expiresIn: null,
+        refreshToken: null,
+        expireTime: null,
+        userHh: 1,
+        userBcs: null,
+        userBcsRole: null,
+        price: null,
+        baoPrice: null,
+        invitationCode: null,
+        userHhRole:null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+        { key: 2, label: "创建时间", visible:  true  },
+        { key: 4, label: "备注", visible:  true  },
+        { key: 6, label: "修改人", visible:  false  },
+        { key: 7, label: "用户头像", visible:  false  },
+        { key: 8, label: "用户名称", visible:  true  },
+        { key: 9, label: "用户状态, 0==为注册, 1==已注册为认证", visible:  true  },
+        { key: 10, label: "用户电话", visible:  false  },
+        { key: 11, label: "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段", visible:  false  },
+        { key: 12, label: "用户的标识，对当前公众号唯一", visible:  false  },
+        { key: 13, label: "token", visible:  false  },
+        { key: 14, label: "过期时间", visible:  false  },
+        { key: 15, label: "刷新token", visible:  false  },
+        { key: 16, label: "过期时间", visible:  false  },
+        { key: 17, label: "是否合伙人", visible:  false  },
+        { key: 18, label: "是否伴宠师", visible:  false  },
+        { key: 19, label: "伴宠师角色", visible:  false  },
+        { key: 20, label: "钱包金额", visible:  false  },
+        { key: 21, label: "保证金", visible:  false  },
+        { key: 22, label: "邀请码", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listAppUsers(this.queryParams).then(response => {
+        this.AppUsersList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        createBy: null,
+        createTime: null,
+        delFlag: null,
+        remark: null,
+        updateTime: null,
+        updatorBy: null,
+        userImage: null,
+        userName: null,
+        userState: null,
+        userTelephone: null,
+        unionid: null,
+        openid: null,
+        accessToken: null,
+        expiresIn: null,
+        refreshToken: null,
+        expireTime: null,
+        userHh: 1,
+        userBcs: null,
+        userBcsRole: null,
+        price: null,
+        baoPrice: null,
+        invitationCode: null,
+        userHhRole:null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getAppUsers(userId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != null) {
+            updateAppUsers(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppUsers(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delAppUsers(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppUsers(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue
index e244d2b..ffd3dd3 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue
@@ -29,6 +29,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="合伙人角色" prop="userBcsRole">
+        <el-select v-model="queryParams.userHhRole" placeholder="请选择合伙人角色" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_hh_role"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否伴宠师" prop="userBcs">
         <el-select v-model="queryParams.userBcs" placeholder="请选择是否伴宠师" clearable size="small">
           <el-option
@@ -104,24 +114,24 @@
 <!--            placeholder="选择过期时间">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-      <el-form-item label="是否合伙人" prop="userHh">
-        <el-input
-          v-model="queryParams.userHh"
-          placeholder="请输入是否合伙人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否伴宠师" prop="userBcs">
-        <el-input
-          v-model="queryParams.userBcs"
-          placeholder="请输入是否伴宠师"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="是否合伙人" prop="userHh">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userHh"-->
+<!--          placeholder="请输入是否合伙人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否伴宠师" prop="userBcs">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userBcs"-->
+<!--          placeholder="请输入是否伴宠师"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="钱包金额" prop="price">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.price"-->
@@ -195,6 +205,7 @@
 
     <el-table v-loading="loading" :data="AppUsersList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="注册时间" align="center" prop="createTime" />
       <el-table-column label="用户编号" align="center" prop="userId" />
 <!--      <el-table-column label="备注" align="center" prop="remark" v-if="columns[0].visible"/>-->
 <!--      <el-table-column label="修改人" align="center" prop="updatorBy" v-if="columns[1].visible"/>-->
@@ -224,6 +235,11 @@
           <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userHh"/>
         </template>
       </el-table-column>
+      <el-table-column label="合伙人角色" align="center" prop="userHhRole">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_hh_role" :value="scope.row.userHhRole"/>
+        </template>
+      </el-table-column>
       <el-table-column label="是否伴宠师" align="center" prop="userBcs" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.userBcs"/>
@@ -267,7 +283,7 @@
 
     <!-- 添加或修改用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
 <!--        <el-form-item label="逻辑删除" prop="delFlag">-->
 <!--          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />-->
 <!--        </el-form-item>-->
@@ -322,6 +338,15 @@
               :value="parseInt(dict.value)"            ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="合伙人角色" prop="userHhRole">
+          <el-select v-model="form.userHhRole" placeholder="请选择合伙人角色">
+            <el-option
+              v-for="dict in dict.type.applet_hh_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否伴宠师" prop="userBcs">
           <el-select v-model="form.userBcs" placeholder="请选择是否伴宠师">
             <el-option
@@ -363,7 +388,7 @@ import { listAppUsers, getAppUsers, delAppUsers, addAppUsers, updateAppUsers, ex
 
 export default {
   name: "AppUsers",
-  dicts: ['applet_yes_no', 'applet_yes_no', 'applet_bcs_role'],
+  dicts: ['applet_yes_no', 'applet_yes_no', 'applet_bcs_role','applet_hh_role'],
   data() {
     return {
       // 遮罩层
@@ -406,7 +431,8 @@ export default {
         userBcsRole: null,
         price: null,
         baoPrice: null,
-        invitationCode: null
+        invitationCode: null,
+        userHhRole:null,
 
       },
       // 表单参数
@@ -484,8 +510,8 @@ export default {
         userBcsRole: null,
         price: null,
         baoPrice: null,
-        invitationCode: null
-
+        invitationCode: null,
+        userHhRole:null,
       };
       this.resetForm("form");
     },
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/confindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/confindex.vue
index 3f61b5e..a9c3a9f 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/confindex.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/confindex.vue
@@ -19,15 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="文本" prop="paramValueText">
-        <el-input
-          v-model="queryParams.paramValueText"
-          placeholder="请输入参数值-普通文本"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="文本" prop="paramValueText">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueText"-->
+<!--          placeholder="请输入参数值-普通文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="参数值-富文本" prop="paramValueArea">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.paramValueArea"-->
@@ -45,14 +45,14 @@
 
     <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="['model:AppletConfig:add']"
-        >新增</el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['model:AppletConfig:add']"-->
+<!--        >新增</el-button>-->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,15 +66,15 @@
         >修改</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="['model:AppletConfig:remove']"
-        >删除</el-button>
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['model:AppletConfig:remove']"-->
+<!--        >删除</el-button>-->
       </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
@@ -93,17 +93,20 @@
     <el-table v-loading="loading" :data="AppletConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+<!--      <el-table-column label="创建时间" align="center" prop="createTime" />-->
+<!--      <el-table-column label="分类" align="center" prop="paramClass"/>-->
       <el-table-column label="说明" align="center" prop="paramValue" />
       <el-table-column label="编码" align="center" prop="paramCode" />
-      <el-table-column label="文本" align="center" prop="paramValueText" />
+      <el-table-column label="数值" align="center" prop="paramValueNum" />
+      <el-table-column label="比例(计算使用)" align="center" prop="paramValueNo" />
+      <el-table-column label="百分比" align="center" prop="paramValueText" />
 <!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>-->
 
-      <el-table-column label="图片" align="center" prop="paramValueImage">
-        <template slot-scope="{ row }">
-          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="图片" align="center" prop="paramValueImage">-->
+<!--        <template slot-scope="{ row }">-->
+<!--          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
       <!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -136,7 +139,10 @@
 
     <!-- 添加或修改配置信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+        <el-form-item label="分类" prop="paramClass">
+          <el-input v-model="form.paramClass" placeholder="请输入分类" />
+        </el-form-item>
         <el-form-item label="说明" prop="paramValue">
           <el-input v-model="form.paramValue" placeholder="请输入说明" />
         </el-form-item>
@@ -146,14 +152,20 @@
         <el-form-item label="文本" prop="paramValueText">
           <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
         </el-form-item>
-        <el-form-item label="图片">
-<!--          <imageUpload v-model="form.paramValueImage"/>-->
-          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
+        <el-form-item label="数值" prop="paramValueNum">
+          <el-input v-model="form.paramValueNum" placeholder="请输入参数值-数值" />
         </el-form-item>
-        <el-form-item label="富文本" prop="paramValueArea">
-<!--          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />-->
-          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>
+        <el-form-item label="比例" prop="paramValueNo">
+          <el-input v-model="form.paramValueNo" placeholder="请输入参数值-百分比" />
         </el-form-item>
+
+<!--        <el-form-item label="图片">-->
+<!--          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="富文本" prop="paramValueArea">-->
+<!--          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>-->
+<!--        </el-form-item>-->
+
 <!--        <el-form-item label="删除标识" prop="delFlag">-->
 <!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
 <!--        </el-form-item>-->
@@ -206,7 +218,9 @@ export default {
         paramValueImage: null,
 
         paramValueArea: null,
-
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: 'pet_payment_bcs'
       },
       // 表单参数
       form: {},
@@ -268,7 +282,9 @@ export default {
         updateBy: null,
 
         updateTime: null,
-
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: null
       };
       this.resetForm("form");
     },
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/hhindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/hhindex.vue
new file mode 100644
index 0000000..c8d5da8
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/hhindex.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="说明" prop="paramValue">
+        <el-input
+          v-model="queryParams.paramValue"
+          placeholder="请输入说明"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编码" prop="paramCode">
+        <el-input
+          v-model="queryParams.paramCode"
+          placeholder="请输入参数编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="文本" prop="paramValueText">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueText"-->
+<!--          placeholder="请输入参数值-普通文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="参数值-富文本" prop="paramValueArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueArea"-->
+<!--          placeholder="请输入参数值-富文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppletConfig: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="['model:AppletConfig: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="['model:AppletConfig:remove']"-->
+<!--        >删除</el-button>-->
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppletConfig:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createTime" />-->
+<!--      <el-table-column label="分类" align="center" prop="paramClass"/>-->
+      <el-table-column label="说明" align="center" prop="paramValue" />
+      <el-table-column label="编码" align="center" prop="paramCode" />
+      <el-table-column label="数值" align="center" prop="paramValueNum" />
+      <el-table-column label="比例(计算使用)" align="center" prop="paramValueNo" />
+      <el-table-column label="百分比" align="center" prop="paramValueText" />
+<!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>-->
+
+<!--      <el-table-column label="图片" align="center" prop="paramValueImage">-->
+<!--        <template slot-scope="{ row }">-->
+<!--          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+      <!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>-->
+      <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="['model:AppletConfig:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletConfig: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"
+    />
+
+    <!-- 添加或修改配置信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+        <el-form-item label="分类" prop="paramClass">
+          <el-input v-model="form.paramClass" placeholder="请输入分类" />
+        </el-form-item>
+        <el-form-item label="说明" prop="paramValue">
+          <el-input v-model="form.paramValue" placeholder="请输入说明" />
+        </el-form-item>
+        <el-form-item label="编码" prop="paramCode">
+          <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
+        </el-form-item>
+        <el-form-item label="文本" prop="paramValueText">
+          <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
+        </el-form-item>
+        <el-form-item label="数值" prop="paramValueNum">
+          <el-input v-model="form.paramValueNum" placeholder="请输入参数值-数值" />
+        </el-form-item>
+        <el-form-item label="比例" prop="paramValueNo">
+          <el-input v-model="form.paramValueNo" placeholder="请输入参数值-百分比" />
+        </el-form-item>
+
+<!--        <el-form-item label="图片">-->
+<!--          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="富文本" prop="paramValueArea">-->
+<!--          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="删除标识" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletConfig, getAppletConfig, delAppletConfig, addAppletConfig, updateAppletConfig, exportAppletConfig } from "@/api/model/AppletConfig";
+
+export default {
+  name: "AppletConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 配置信息表格数据
+      AppletConfigList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: 'pet_payment_hh'
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "说明", visible:  true  },
+    { key: 2, label: "参数编码", visible:  true  },
+    { key: 3, label: "参数值-普通文本", visible:  true  },
+    { key: 4, label: "参数值-图片", visible:  false  },
+    { key: 5, label: "参数值-富文本", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询配置信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletConfig(this.queryParams).then(response => {
+        this.AppletConfigList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加配置信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletConfig(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改配置信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除配置信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletConfig(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有配置信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletConfig(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletPet/openindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletPet/openindex.vue
new file mode 100644
index 0000000..23789c9
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletPet/openindex.vue
@@ -0,0 +1,603 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_pet_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="queryParams.birthday"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="体重" prop="weight">
+        <el-select v-model="queryParams.weight" placeholder="请选择体重" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_pet_weight"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <template v-if="showMoreCondition">
+        <el-form-item label="疫苗" prop="vaccine">
+          <el-select v-model="queryParams.vaccine" placeholder="请选择疫苗" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.applet_pet_my"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="驱虫" prop="deworm">
+          <el-select v-model="queryParams.deworm" placeholder="请选择驱虫" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.applet_pet_qc"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="绝育" prop="neutered">
+          <el-select v-model="queryParams.neutered" placeholder="请选择绝育" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.applet_pet_jy"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="petType">
+          <el-select v-model="queryParams.petType" placeholder="请选择类别" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.applet_money_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="证件" prop="petCard">
+          <el-select v-model="queryParams.petCard" placeholder="请选择证件" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.applet_pet_bl"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="其他健康说明" prop="healthOther">
+          <el-input
+            v-model="queryParams.healthOther"
+            placeholder="请输入其他健康说明"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="订单标识" prop="orderId">
+          <el-input
+            v-model="queryParams.orderId"
+            placeholder="请输入订单标识"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      </template>
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppletPet: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="['model:AppletPet: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="['model:AppletPet:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['model:AppletPet:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletPetList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识" align="center" prop="id" />
+<!--      <el-table-column label="宠物头像" align="center" prop="headImage" v-if="columns[0].visible"/>-->
+      <el-table-column label="用户头像" align="center" prop="headImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.headImage" :src="row.headImage" :preview-src-list="[row.headImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="昵称" align="center" prop="nickName" />
+      <el-table-column label="性别" align="center" prop="sex" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="品种" align="center" prop="type" />
+      <el-table-column label="出生年月" align="center" prop="birthday" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthday, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="体重" align="center" prop="weight" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_weight" :value="scope.row.weight"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="性格" align="center" prop="personality" />
+      <el-table-column label="疫苗" align="center" prop="vaccine">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_my" :value="scope.row.vaccine"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="驱虫" align="center" prop="deworm" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_qc" :value="scope.row.deworm"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="绝育" align="center" prop="neutered">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_jy" :value="scope.row.neutered"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="类别" align="center" prop="petType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_money_type" :value="scope.row.petType"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="健康状况" align="center" prop="health" v-if="columns[11].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.applet_pet_jk" :value="scope.row.health"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+      <el-table-column label="健康状况" align="center" prop="health" />
+
+      <el-table-column label="证件" align="center" prop="petCard" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_pet_bl" :value="scope.row.petCard"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="其他健康说明" align="center" prop="healthOther" />
+      <el-table-column label="删除标识" align="center" prop="delFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.delFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单标识" align="center" prop="orderId" />
+      <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="['model:AppletPet:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletPet: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"
+    />
+
+    <!-- 添加或修改宠物信息表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="宠物头像">
+<!--          <imageUpload v-model="form.headImage"/>-->
+          <oss-image-upload v-model="form.headImage" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="form.nickName" 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.applet_pet_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="品种" prop="type">
+          <el-input v-model="form.type" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="出生年月" prop="birthday">
+          <el-date-picker clearable size="small"
+                          v-model="form.birthday"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择出生年月">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="体重" prop="weight">
+          <el-select v-model="form.weight" placeholder="请选择体重">
+            <el-option
+              v-for="dict in dict.type.applet_pet_weight"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="性格" prop="personality">
+          <el-input v-model="form.personality" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="疫苗" prop="vaccine">
+          <el-select v-model="form.vaccine" placeholder="请选择疫苗">
+            <el-option
+              v-for="dict in dict.type.applet_pet_my"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="驱虫" prop="deworm">
+          <el-select v-model="form.deworm" placeholder="请选择驱虫">
+            <el-option
+              v-for="dict in dict.type.applet_pet_qc"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="绝育" prop="neutered">
+          <el-select v-model="form.neutered" placeholder="请选择绝育">
+            <el-option
+              v-for="dict in dict.type.applet_pet_jy"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="petType">
+          <el-select v-model="form.petType" placeholder="请选择类别">
+            <el-option
+              v-for="dict in dict.type.applet_money_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="健康状况">-->
+<!--          <el-checkbox-group v-model="form.health">-->
+<!--            <el-checkbox-->
+<!--              v-for="dict in dict.type.applet_pet_jk"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value">-->
+<!--              {{dict.label}}-->
+<!--            </el-checkbox>-->
+<!--          </el-checkbox-group>-->
+<!--        </el-form-item>-->
+        <el-form-item label="健康状况" prop="healthOther">
+          <el-input v-model="form.health" placeholder="请输入其他健康说明" />
+        </el-form-item>
+        <el-form-item label="证件" prop="petCard">
+          <el-select v-model="form.petCard" placeholder="请选择证件">
+            <el-option
+              v-for="dict in dict.type.applet_pet_bl"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="其他健康说明" prop="healthOther">
+          <el-input v-model="form.healthOther" placeholder="请输入其他健康说明" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-select v-model="form.delFlag" placeholder="请选择删除标识">
+            <el-option
+              v-for="dict in dict.type.applet_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户标识" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入用户标识" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletPet, getAppletPet, delAppletPet, addAppletPet, updateAppletPet, exportAppletPet } from "@/api/model/AppletPet";
+
+export default {
+  name: "AppletPet",
+  dicts: ['applet_pet_sex', 'applet_pet_weight', 'applet_pet_my', 'applet_pet_qc', 'applet_pet_jy', 'applet_money_type', 'applet_pet_bl', 'applet_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 宠物信息表格数据
+      AppletPetList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        headImage: null,
+        nickName: null,
+        sex: null,
+        type: null,
+        birthday: null,
+        weight: null,
+        personality: null,
+        vaccine: null,
+        deworm: null,
+        neutered: null,
+        petType: null,
+        health: null,
+        petCard: null,
+        healthOther: null,
+        orderId: null
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+
+        sex: [
+          { required: true, message: "性别不能为空", trigger: "change" }
+        ],
+
+        type: [
+          { required: true, message: "品种不能为空", trigger: "change" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+        { key: 1, label: "宠物头像", visible:  false  },
+        { key: 2, label: "昵称", visible:  true  },
+        { key: 3, label: "性别", visible:  true  },
+        { key: 4, label: "品种", visible:  true  },
+        { key: 5, label: "出生年月", visible:  true  },
+        { key: 6, label: "体重（kg）", visible:  true  },
+        { key: 7, label: "性格", visible:  true  },
+        { key: 8, label: "疫苗（是否已接种）", visible:  true  },
+        { key: 9, label: "驱虫（是否已处理）", visible:  true  },
+        { key: 10, label: "绝育（是否已绝育）", visible:  false  },
+        { key: 11, label: "类别", visible:  false  },
+        { key: 12, label: "健康状况", visible:  false  },
+        { key: 13, label: "证件", visible:  false  },
+        { key: 14, label: "其他健康说明", visible:  false  },
+        { key: 15, label: "删除标识", visible:  false  },
+        { key: 17, label: "创建时间", visible:  false  },
+        { key: 20, label: "用户标识", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询宠物信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletPet(this.queryParams).then(response => {
+        this.AppletPetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        headImage: null,
+        nickName: null,
+        sex: null,
+        type: null,
+        birthday: null,
+        weight: null,
+        personality: null,
+        vaccine: null,
+        deworm: null,
+        neutered: null,
+        petType: null,
+        health: [],
+        petCard: null,
+        healthOther: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        orderId: null
+
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加宠物信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletPet(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改宠物信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletPet(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletPet(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除宠物信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletPet(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有宠物信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletPet(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/allindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/allindex.vue
new file mode 100644
index 0000000..7c3ae77
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/allindex.vue
@@ -0,0 +1,475 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <!--      <el-form-item label="关联用户" prop="userId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.userId"-->
+      <!--          placeholder="请输入关联用户"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="审核状态" prop="status">-->
+      <!--        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">-->
+      <!--          <el-option-->
+      <!--            v-for="dict in dict.type.applet_state"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="性别" prop="sex">-->
+      <!--        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="养宠经验" prop="experience">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.experience"-->
+      <!--          placeholder="请输入养宠经验"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="是否有专业执照" prop="isHave">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.isHave"-->
+      <!--          placeholder="请输入是否有专业执照"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="个人宠物类型" prop="petType">-->
+      <!--        <el-select v-model="queryParams.petType" placeholder="请选择个人宠物类型" clearable size="small">-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="审核状态" prop="status">-->
+      <!--        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+
+
+
+
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppletUsersTeacher: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="['model:AppletUsersTeacher: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="['model:AppletUsersTeacher:remove']"-->
+    <!--        >删除</el-button>-->
+    <!--      </el-col>-->
+    <!--      <el-col :span="1.5">-->
+    <!--        <el-button-->
+    <!--          type="warning"-->
+    <!--          plain-->
+    <!--          icon="el-icon-download"-->
+    <!--          size="mini"-->
+    <!--          :loading="exportLoading"-->
+    <!--          @click="handleExport"-->
+    <!--          v-hasPermi="['model:AppletUsersTeacher:export']"-->
+    <!--        >导出</el-button>-->
+    <!--      </el-col>-->
+    <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
+    <!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="AppletUsersTeacherList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!--      <el-table-column label="标识" align="center" prop="id" />-->
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="审核状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_state" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联用户" align="center" prop="userId" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="身份证" align="center" prop="idCard" />
+      <!--      <el-table-column label="性别" align="center" prop="sex" />-->
+      <el-table-column label="性别" align="center" prop="sex" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="养宠经验" align="center" prop="experience" />
+      <el-table-column label="是否有专业执照" align="center" prop="isHave"/>
+      <el-table-column label="个人宠物类型" align="center" prop="petType" />
+      <!--      <el-table-column label="审核状态" align="center" prop="status" />-->
+
+      <el-table-column label="审核图片" align="center" prop="审核图片">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.images" :src="row.images" :preview-src-list="[row.images]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在地区" align="center" prop="area" />
+      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="经度" align="center" prop="longitude" />
+      <!--      <el-table-column label="创建人" align="center" prop="createBy" />-->
+      <el-table-column label="纬度" align="center" prop="latitude" />
+      <!--      <el-table-column label="修改人" align="center" prop="updateBy" />-->
+
+
+      <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="['model:AppletUsersTeacher:edit']"
+          >查看信息</el-button>
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['model:AppletUsersTeacher: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"
+    />
+
+    <!-- 添加或修改伴宠师认证表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+        <el-form-item label="审核状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择审核状态">
+            <el-option
+              v-for="dict in dict.type.applet_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联用户" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入关联用户" disabled />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" disabled />
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input v-model="form.idCard" placeholder="请输入身份证" disabled/>
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别" disabled>
+            <el-option
+              v-for="dict in dict.type.applet_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" disabled/>
+        </el-form-item>
+        <el-form-item label="养宠经验" prop="experience">
+          <el-input v-model="form.experience" placeholder="请输入养宠经验" disabled />
+        </el-form-item>
+        <el-form-item label="是否有专业执照" prop="isHave">
+          <el-input v-model="form.isHave" placeholder="请输入是否有专业执照" disabled/>
+        </el-form-item>
+        <el-form-item label="个人宠物类型" prop="petType">
+          <el-select v-model="form.petType" placeholder="请选择个人宠物类型" disabled>
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="审核图片" >
+          <!--          <imageUpload v-model="form.images"/>-->
+          <oss-image-upload v-model="form.images" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="所在地区" prop="area">
+          <el-input v-model="form.area" placeholder="请输入所在地区" disabled/>
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" disabled/>
+        </el-form-item>
+        <!--        <el-form-item label="经度" prop="longitude">-->
+        <!--          <el-input v-model="form.longitude" placeholder="请输入经度" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="创建人" prop="create by">-->
+        <!--          <el-input v-model="form.createBy" placeholder="请输入创建人" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="纬度" prop="latitude">-->
+        <!--          <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="修改人" prop="update by">-->
+        <!--          <el-input v-model="form.updateBy" placeholder="请输入修改人" />-->
+        <!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletUsersTeacher, getAppletUsersTeacher, delAppletUsersTeacher, addAppletUsersTeacher, updateAppletUsersTeacher, exportAppletUsersTeacher } from "@/api/model/AppletUsersTeacher";
+
+export default {
+  name: "AppletUsersTeacher",
+  dicts: ['applet_sex', 'applet_state'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 伴宠师认证表格数据
+      AppletUsersTeacherList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+
+        name: null,
+
+        idCard: null,
+
+        sex: null,
+
+        phone: null,
+
+        experience: null,
+
+        isHave: null,
+
+        petType: null,
+
+        status: 1,
+
+        images: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+        { key: 1, label: "关联用户", visible:  true  },
+        { key: 2, label: "姓名", visible:  true  },
+        { key: 3, label: "身份证", visible:  true  },
+        { key: 4, label: "性别", visible:  true  },
+        { key: 5, label: "手机号", visible:  true  },
+        { key: 6, label: "养宠经验", visible:  true  },
+        { key: 7, label: "是否有专业执照", visible:  true  },
+        { key: 8, label: "个人宠物类型", visible:  true  },
+        { key: 9, label: "审核状态", visible:  true  },
+        { key: 10, label: "审核图片", visible:  false  },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询伴宠师认证列表 */
+    getList() {
+      this.loading = true;
+      listAppletUsersTeacher(this.queryParams).then(response => {
+        this.AppletUsersTeacherList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        userId: null,
+
+        name: null,
+
+        idCard: null,
+
+        sex: null,
+
+        phone: null,
+
+        experience: null,
+
+        isHave: null,
+
+        petType: null,
+
+        status: 1,
+
+        images: null,
+
+        createTime: null,
+
+        updateTime: null,
+
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加伴宠师认证";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletUsersTeacher(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改伴宠师认证";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletUsersTeacher(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletUsersTeacher(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除伴宠师认证编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletUsersTeacher(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有伴宠师认证数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletUsersTeacher(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue
index 5518e63..86ed6ba 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue
@@ -10,6 +10,16 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_state"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -63,10 +73,14 @@
 <!--        <el-select v-model="queryParams.petType" placeholder="请选择个人宠物类型" clearable size="small">-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="审核状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="审核状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+
+
+
+
       <el-form-item class="flex_one tr">
         <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>
@@ -122,7 +136,7 @@
 
     <el-table v-loading="loading" :data="AppletUsersTeacherList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标识" align="center" prop="id" />
+<!--      <el-table-column label="标识" align="center" prop="id" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="审核状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -152,9 +166,9 @@
       <el-table-column label="所在地区" align="center" prop="area" />
       <el-table-column label="详细地址" align="center" prop="address" />
       <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+<!--      <el-table-column label="创建人" align="center" prop="createBy" />-->
       <el-table-column label="纬度" align="center" prop="latitude" />
-      <el-table-column label="修改人" align="center" prop="updateBy" />
+<!--      <el-table-column label="修改人" align="center" prop="updateBy" />-->
 
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
new file mode 100644
index 0000000..feab10a
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
@@ -0,0 +1,475 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+<!--      <el-form-item label="关联用户" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入关联用户"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.applet_state"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="性别" prop="sex">-->
+<!--        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="养宠经验" prop="experience">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.experience"-->
+<!--          placeholder="请输入养宠经验"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否有专业执照" prop="isHave">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.isHave"-->
+<!--          placeholder="请输入是否有专业执照"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="个人宠物类型" prop="petType">-->
+<!--        <el-select v-model="queryParams.petType" placeholder="请选择个人宠物类型" clearable size="small">-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+
+
+
+
+      <el-form-item class="flex_one tr">
+        <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>
+      </el-form-item>
+    </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="['model:AppletUsersTeacher: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="['model:AppletUsersTeacher: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="['model:AppletUsersTeacher:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppletUsersTeacher:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
+<!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="AppletUsersTeacherList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="标识" align="center" prop="id" />-->
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="审核状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_state" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联用户" align="center" prop="userId" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="身份证" align="center" prop="idCard" />
+<!--      <el-table-column label="性别" align="center" prop="sex" />-->
+      <el-table-column label="性别" align="center" prop="sex" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="养宠经验" align="center" prop="experience" />
+      <el-table-column label="是否有专业执照" align="center" prop="isHave"/>
+      <el-table-column label="个人宠物类型" align="center" prop="petType" />
+<!--      <el-table-column label="审核状态" align="center" prop="status" />-->
+
+      <el-table-column label="审核图片" align="center" prop="审核图片">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.images" :src="row.images" :preview-src-list="[row.images]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在地区" align="center" prop="area" />
+      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="经度" align="center" prop="longitude" />
+<!--      <el-table-column label="创建人" align="center" prop="createBy" />-->
+      <el-table-column label="纬度" align="center" prop="latitude" />
+<!--      <el-table-column label="修改人" align="center" prop="updateBy" />-->
+
+
+      <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="['model:AppletUsersTeacher:edit']"
+          >审核认证</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['model:AppletUsersTeacher: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"
+    />
+
+    <!-- 添加或修改伴宠师认证表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+        <el-form-item label="审核状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择审核状态">
+            <el-option
+              v-for="dict in dict.type.applet_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联用户" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入关联用户" disabled />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" disabled />
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input v-model="form.idCard" placeholder="请输入身份证" disabled/>
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别" disabled>
+            <el-option
+              v-for="dict in dict.type.applet_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" disabled/>
+        </el-form-item>
+        <el-form-item label="养宠经验" prop="experience">
+          <el-input v-model="form.experience" placeholder="请输入养宠经验" disabled />
+        </el-form-item>
+        <el-form-item label="是否有专业执照" prop="isHave">
+          <el-input v-model="form.isHave" placeholder="请输入是否有专业执照" disabled/>
+        </el-form-item>
+        <el-form-item label="个人宠物类型" prop="petType">
+          <el-select v-model="form.petType" placeholder="请选择个人宠物类型" disabled>
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="审核图片" >
+<!--          <imageUpload v-model="form.images"/>-->
+          <oss-image-upload v-model="form.images" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="所在地区" prop="area">
+          <el-input v-model="form.area" placeholder="请输入所在地区" disabled/>
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" disabled/>
+        </el-form-item>
+<!--        <el-form-item label="经度" prop="longitude">-->
+<!--          <el-input v-model="form.longitude" placeholder="请输入经度" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建人" prop="create by">-->
+<!--          <el-input v-model="form.createBy" placeholder="请输入创建人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="纬度" prop="latitude">-->
+<!--          <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修改人" prop="update by">-->
+<!--          <el-input v-model="form.updateBy" placeholder="请输入修改人" />-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletUsersTeacher, getAppletUsersTeacher, delAppletUsersTeacher, addAppletUsersTeacher, updateAppletUsersTeacher, exportAppletUsersTeacher } from "@/api/model/AppletUsersTeacher";
+
+export default {
+  name: "AppletUsersTeacher",
+  dicts: ['applet_sex', 'applet_state'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 伴宠师认证表格数据
+      AppletUsersTeacherList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+
+        name: null,
+
+        idCard: null,
+
+        sex: null,
+
+        phone: null,
+
+        experience: null,
+
+        isHave: null,
+
+        petType: null,
+
+        status: 0,
+
+        images: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+    { key: 1, label: "关联用户", visible:  true  },
+    { key: 2, label: "姓名", visible:  true  },
+    { key: 3, label: "身份证", visible:  true  },
+    { key: 4, label: "性别", visible:  true  },
+    { key: 5, label: "手机号", visible:  true  },
+    { key: 6, label: "养宠经验", visible:  true  },
+    { key: 7, label: "是否有专业执照", visible:  true  },
+    { key: 8, label: "个人宠物类型", visible:  true  },
+    { key: 9, label: "审核状态", visible:  true  },
+    { key: 10, label: "审核图片", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询伴宠师认证列表 */
+    getList() {
+      this.loading = true;
+      listAppletUsersTeacher(this.queryParams).then(response => {
+        this.AppletUsersTeacherList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        userId: null,
+
+        name: null,
+
+        idCard: null,
+
+        sex: null,
+
+        phone: null,
+
+        experience: null,
+
+        isHave: null,
+
+        petType: null,
+
+        status: 0,
+
+        images: null,
+
+        createTime: null,
+
+        updateTime: null,
+
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加伴宠师认证";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletUsersTeacher(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改伴宠师认证";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletUsersTeacher(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletUsersTeacher(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除伴宠师认证编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletUsersTeacher(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有伴宠师认证数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletUsersTeacher(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
index 0f55507..ad40c12 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
@@ -8,17 +8,18 @@ import com.ruoyi.applet.service.IMallOrderService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.domain.AppletOrder;
-import com.ruoyi.model.domain.AppletOutDate;
-import com.ruoyi.model.domain.AppletPet;
-import com.ruoyi.model.service.IAppletOrderService;
-import com.ruoyi.model.service.IAppletPetService;
+import com.ruoyi.model.domain.*;
+import com.ruoyi.model.service.*;
+import com.ruoyi.model.service.impl.AppletOrderItemServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +34,13 @@ public class ApiAppletOrderController extends BaseController {
     @Autowired
     private IAppletOrderService appletOrderService;
     @Autowired
-    private IAppletPetService appletPetService;
+    private IAppletOrderItemService appletOrderItemService;
+    @Autowired
+    private IAppUsersService appUsersService;
+    @Autowired
+    private IAppletUsersTeacherService appletUsersTeacherService;
+    @Autowired
+    private IAppletConfigService configService;
     @Autowired
     private IMallOrderService mallOrderService;
     //下单小程序：那边来的订单信息
@@ -41,9 +48,11 @@ public class ApiAppletOrderController extends BaseController {
     private H5OrderService h5OrderService;
     @Autowired
     private OrderService service;
+    @Autowired
+    private AppletOrderItemServiceImpl appletOrderItemServiceImpl;
+
 
-    //接单大厅流程
-    @ApiOperation("小程序-接单大厅流程")
+    @ApiOperation("接单大厅列表-带分页")
     @GetMapping("/list")
     public AjaxResult outDateList(AppletOrder appletOrder){
         if(appletOrder.getType()==null){
@@ -54,25 +63,44 @@ public class ApiAppletOrderController extends BaseController {
         }
         startPage();
 
-        List<AppletOrder> list = appletOrderService.selectAppletOrderList(appletOrder);
+        List<AppletOrder> list = null;
+        List<AppletOrderItem> itemList = null;
         if(appletOrder.getType().equals("0")){
             list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder);
-
-
-        }else{
+            for (AppletOrder order:list){
+                order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
+                order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+            }
+            TableDataInfo dataTable = getDataTable(list);
+            return AjaxResult.success(dataTable);
+        }
+        if (appletOrder.getType().equals("1")){
             list = appletOrderService.selectAppletOrderList(appletOrder);
-
+            for (AppletOrder order:list){
+                order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
+                order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+            }
+            TableDataInfo dataTable = getDataTable(list);
+            return AjaxResult.success(dataTable);
         }
-        for (AppletOrder order:list){
-            order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
-            order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+        if (appletOrder.getType().equals("2")){
+            AppletOrderItem appletOrderItem = new AppletOrderItem();
+            appletOrderItem.setStatus(2);
+            appletOrderItem.setUserId(appletOrder.getUserId());
+            itemList = appletOrderItemService.selectAppletOrderItemList(appletOrderItem);
+            for (AppletOrderItem orderItem:itemList){
+                orderItem.setH5OrderVO(h5OrderService.orderDetail(orderItem.getOrderId()));
+                orderItem.setManagerOrderDetailVO(service.selectById(orderItem.getOrderId()));
+            }
+            TableDataInfo dataTable = getDataTable(itemList);
+            return AjaxResult.success(dataTable);
         }
-
-        TableDataInfo dataTable = getDataTable(list);
-        return AjaxResult.success(dataTable);
+        return AjaxResult.success();
     }
 
 
+
+
     //接单大厅 - 根据订单标识查询订单详情的接口
     @ApiOperation("接单大厅 - 根据订单标识查询订单详情的接口")
     @GetMapping("/getByOrderId")
@@ -80,24 +108,18 @@ public class ApiAppletOrderController extends BaseController {
         if(appletOrder.getId() == null){
             return AjaxResult.error("订单标识不能为空");
         }
-        AppletOrder appletOrder1 = appletOrderService.selectAppletOrderById(appletOrder.getId());
-        List<AppletPet> appletPets = appletPetService.selectAppletPetListByOrderId(appletOrder1.getId());
-        PetDate petDate = new PetDate();
-        petDate.setDate("12-12");
-        petDate.setTitle("上门喂养");
-        petDate.setNum(10);
-
-        //比例
-        Map<String,Object> map = new HashMap<>();
-        map.put("order",appletOrder1);
-        map.put("petList",appletPets);
-        map.put("petDate",petDate);
-//        map.put("");
-
-
-
-
-
+//        if(appletOrder.getUserId() == null){
+//            return AjaxResult.error("用户标识不能为空");
+//        }
+        AppletOrder order = appletOrderService.selectAppletOrderById(appletOrder.getId());
+        order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
+        order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+        Map<String, Object> map = new HashMap();
+        map.put("order",order);
+        AppletConfig config = new AppletConfig();
+        config.setParamClass("pet_payment_bcs");
+        List<AppletConfig> appletConfigs = configService.selectAppletConfigList(config);
+        map.put("pet_payment_bcs",appletConfigs);
         return AjaxResult.success("接单大厅查看详情",map);
     }
 
@@ -115,7 +137,67 @@ public class ApiAppletOrderController extends BaseController {
         if(appletOrder.getReason() == null){
             return AjaxResult.error("无法接单原因不能为空");
         }
-        appletOrder.setStatus(2);
+        AppletOrder order = appletOrderService.selectAppletOrderById(appletOrder.getId());
+        //生成我的订单信息
+        AppletOrderItem appletOrderItem = new AppletOrderItem();
+        appletOrderItem.setCreateTime(order.getCreateTime());
+        appletOrderItem.setType(order.getType());
+        appletOrderItem.setStatus(2);
+        appletOrderItem.setReason(appletOrder.getReason());
+//        appletOrderItem.setStartTime(LocalDateTime.now());
+        appletOrderItem.setUserId(appletOrder.getUserId());
+        //根据用户标识查询用户认证信息
+        AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId());
+        AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appletOrder.getUserId());
+        appletOrderItem.setName(appletUsersTeacher.getName());
+        appletOrderItem.setPhone(appletUsersTeacher.getPhone());
+        appletOrderItem.setOrderStatus(3); //相当于已经取消
+
+        //得到当前用户的伴宠师等级
+        Integer userBcs = appUsers.getUserBcs();
+        //查询用户的当前分配比例
+        AppletConfig petPaymentBcs = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", userBcs);
+        //得到配置百分比
+        BigDecimal percent = petPaymentBcs.getParamValueNo();
+        //得到订单支付金额
+        BigDecimal orderPrice = order.getPrice();
+        //计算订单佣金 = 支付金额 * 百分比
+        BigDecimal orderGivePrice = orderPrice.multiply(percent);
+        appletOrderItem.setPrice(orderPrice);
+        appletOrderItem.setOrderGiveProportion(percent);
+        appletOrderItem.setOrderGivePrice(orderGivePrice);
+        appletOrderItem.setAddress(order.getAddress());
+        appletOrderItem.setOrderSn(order.getOrderSn());
+        appletOrderItem.setOrderId(order.getOrderId());
+        appletOrderItem.setIsPet(0);
+        appletOrderItem.setIsDate(0);
+        appletOrderItem.setIsAddress(0);
+
+
+        appletOrderItemService.insertAppletOrderItem(appletOrderItem);
+
+
+
+        appletOrder.setType("0");//派单归为派单中
+        appletOrder.setStatus(0);
+        appletOrder.setNum(order.getNum()+1);
+        appletOrder.setUpdateTime(LocalDateTime.now());
+        //根据系统派单规则给到所有的接单者 、、还需要修改现在给所有人
+
+        //appletUserId 用json形式储存  == 》这个地方还需要调优
+        AppUsers usersGo = new AppUsers();
+        usersGo.setUserBcs(1);
+        List<AppUsers> appUsersList = appUsersService.selectAppUsersList(usersGo);
+        //得到所有的伴宠师id
+        String appletUserId = "";
+        for (AppUsers users : appUsersList) {
+            appletUserId += users.getUserId()+",";
+        }
+        appletOrder.setUserIdJson(appletUserId);
+
+        //清空接单人字段
+        appletOrder.setUserIdJson("");
+
         appletOrderService.updateAppletOrder(appletOrder);
         return AjaxResult.success("拒单成功",appletOrder);
     }
@@ -132,6 +214,49 @@ public class ApiAppletOrderController extends BaseController {
         if(appletOrder.getUserId() == null){
             return AjaxResult.error("userId用户信息标识不能为空");
         }
+
+        AppletOrder order = appletOrderService.selectAppletOrderById(appletOrder.getId());
+        //生成我的订单信息
+        AppletOrderItem appletOrderItem = new AppletOrderItem();
+        appletOrderItem.setCreateTime(order.getCreateTime());
+        appletOrderItem.setType(order.getType());
+        appletOrderItem.setStatus(1);
+//        appletOrderItem.setReason(appletOrder.getReason());
+        appletOrderItem.setStartTime(LocalDateTime.now());
+        appletOrderItem.setUserId(appletOrder.getUserId());
+        //根据用户标识查询用户认证信息
+        AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId());
+        AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appletOrder.getUserId());
+        appletOrderItem.setName(appletUsersTeacher.getName());
+        appletOrderItem.setPhone(appletUsersTeacher.getPhone());
+        appletOrderItem.setOrderStatus(0);
+
+        //得到当前用户的伴宠师等级
+        Integer userBcs = appUsers.getUserBcs();
+        //查询用户的当前分配比例
+        AppletConfig petPaymentBcs = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", userBcs);
+        //得到配置百分比
+        BigDecimal percent = petPaymentBcs.getParamValueNo();
+        //得到订单支付金额
+        BigDecimal orderPrice = order.getPrice();
+        //计算订单佣金 = 支付金额 * 百分比
+        BigDecimal orderGivePrice = orderPrice.multiply(percent);
+        appletOrderItem.setPrice(orderPrice);
+        appletOrderItem.setOrderGiveProportion(percent);
+        appletOrderItem.setOrderGivePrice(orderGivePrice);
+        appletOrderItem.setAddress(order.getAddress());
+        appletOrderItem.setOrderSn(order.getOrderSn());
+        appletOrderItem.setOrderId(order.getOrderId());
+        appletOrderItem.setIsPet(1);
+        appletOrderItem.setIsDate(1);
+        appletOrderItem.setIsAddress(1);
+
+
+        appletOrderItemService.insertAppletOrderItem(appletOrderItem);
+
+
+
+
         appletOrder.setStatus(1);
         appletOrderService.updateAppletOrder(appletOrder);
         return AjaxResult.success("接单成功",appletOrder);
@@ -142,16 +267,46 @@ public class ApiAppletOrderController extends BaseController {
     //我的订单流程
     @ApiOperation("小程序-我的订单流程")
     @GetMapping("/myList")
-    public AjaxResult myList(AppletOrder appletOrder){
-        if(appletOrder.getType()==null){
+    public AjaxResult myList(AppletOrderItem orderItem){
+        if(orderItem.getType()==null){
             return AjaxResult.error("type状态不能为空");
         }
-        if(appletOrder.getUserId() == null){
+        if(orderItem.getUserId() == null){
             return AjaxResult.error("userId用户信息标识不能为空");
         }
-        List<AppletOrder> list = appletOrderService.selectAppletOrderList(appletOrder);
+        List<AppletOrderItem> itemList = appletOrderItemService.selectAppletOrderItemList(orderItem);
+        for (AppletOrderItem orderItem1:itemList){
+            orderItem1.setH5OrderVO(h5OrderService.orderDetail(orderItem.getOrderId()));
+            orderItem1.setManagerOrderDetailVO(service.selectById(orderItem.getOrderId()));
+        }
+        TableDataInfo dataTable = getDataTable(itemList);
+        return AjaxResult.success("我的订单数据列表",dataTable);
+    }
 
-        return AjaxResult.success("我的订单数据列表",list);
+
+
+
+
+    //我的订单流程
+    @ApiOperation("小程序-我的订单流程订单详情")
+    @GetMapping("/getOrderItemById")
+    public AjaxResult getOrderItemById(AppletOrderItem orderItem){
+        if(orderItem.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        if(orderItem.getUserId() == null){
+            return AjaxResult.error("用户标识不能为空");
+        }
+        AppletOrderItem order = appletOrderItemService.selectAppletOrderItemById(orderItem.getId());
+        order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
+        order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+        Map<String, Object> map = new HashMap();
+        map.put("order",order);
+        AppletConfig config = new AppletConfig();
+        config.setParamClass("pet_payment_bcs");
+        List<AppletConfig> appletConfigs = configService.selectAppletConfigList(config);
+        map.put("pet_payment_bcs",appletConfigs);
+        return AjaxResult.success("我的订单流程订单详情",map);
     }
 
 
@@ -160,6 +315,7 @@ public class ApiAppletOrderController extends BaseController {
 
 
 
+
     //测试派单
     @ApiOperation("派单")
     @GetMapping("/dispatch/{orderId}")
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemController.java
new file mode 100644
index 0000000..e6903bd
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemController.java
@@ -0,0 +1,196 @@
+package com.ruoyi.applet.contoller;
+
+
+import com.cyl.h5.service.H5OrderService;
+import com.cyl.manager.oms.service.OrderService;
+import com.ruoyi.applet.pojo.vo.PetDate;
+import com.ruoyi.applet.service.IMallOrderService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletPet;
+import com.ruoyi.model.service.IAppletOrderService;
+import com.ruoyi.model.service.IAppletPetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(description = "订单模块 - 接单大厅流程")
+@RestController
+@RequestMapping("/applet/orderItem")
+public class ApiAppletOrderItemController extends BaseController {
+
+    @Autowired
+    private IAppletOrderService appletOrderService;
+    @Autowired
+    private IAppletPetService appletPetService;
+    @Autowired
+    private IMallOrderService mallOrderService;
+    //下单小程序：那边来的订单信息
+    @Autowired
+    private H5OrderService h5OrderService;
+    @Autowired
+    private OrderService service;
+
+
+    //接单大厅流程
+    @ApiOperation("小程序-接单大厅流程")
+    @GetMapping("/list")
+    public AjaxResult outDateList(AppletOrder appletOrder){
+        if(appletOrder.getType()==null){
+            return AjaxResult.error("type状态不能为空");
+        }
+        if(appletOrder.getUserIdJson() == null){
+            return AjaxResult.error("userIdJson用户信息标识不能为空");
+        }
+        startPage();
+
+        List<AppletOrder> list = null;
+        if(appletOrder.getType().equals("0")){
+            list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder);
+        }else{
+            list = appletOrderService.selectAppletOrderList(appletOrder);
+        }
+        for (AppletOrder order:list){
+            order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId()));
+            order.setManagerOrderDetailVO(service.selectById(order.getOrderId()));
+        }
+        TableDataInfo dataTable = getDataTable(list);
+        return AjaxResult.success(dataTable);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //接单大厅 - 根据订单标识查询订单详情的接口
+    @ApiOperation("接单大厅 - 根据订单标识查询订单详情的接口")
+    @GetMapping("/getByOrderId")
+    public AjaxResult getByOrderId(AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        AppletOrder appletOrder1 = appletOrderService.selectAppletOrderById(appletOrder.getId());
+        List<AppletPet> appletPets = appletPetService.selectAppletPetListByOrderId(appletOrder1.getId());
+        PetDate petDate = new PetDate();
+        petDate.setDate("12-12");
+        petDate.setTitle("上门喂养");
+        petDate.setNum(10);
+
+        //比例
+        Map<String,Object> map = new HashMap<>();
+        map.put("order",appletOrder1);
+        map.put("petList",appletPets);
+        map.put("petDate",petDate);
+//        map.put("");
+
+
+
+
+
+        return AjaxResult.success("接单大厅查看详情",map);
+    }
+
+
+    //接单大厅 - 拒绝、无法接单
+    @ApiOperation("接单大厅 - 拒绝、无法接单")
+    @PostMapping("/endByOrderId")
+    public AjaxResult endByOrderId(@RequestBody AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        if(appletOrder.getReason() == null){
+            return AjaxResult.error("无法接单原因不能为空");
+        }
+        appletOrder.setStatus(2);
+        appletOrderService.updateAppletOrder(appletOrder);
+        return AjaxResult.success("拒单成功",appletOrder);
+    }
+
+
+
+    //接单大厅 - 立即接单
+    @ApiOperation("接单大厅 - 立即接单")
+    @PostMapping("/startByOrderId")
+    public AjaxResult startByOrderId(@RequestBody AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        appletOrder.setStatus(1);
+        appletOrderService.updateAppletOrder(appletOrder);
+        return AjaxResult.success("接单成功",appletOrder);
+    }
+
+
+
+    //我的订单流程
+    @ApiOperation("小程序-我的订单流程")
+    @GetMapping("/myList")
+    public AjaxResult myList(AppletOrder appletOrder){
+        if(appletOrder.getType()==null){
+            return AjaxResult.error("type状态不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        List<AppletOrder> list = appletOrderService.selectAppletOrderList(appletOrder);
+
+        return AjaxResult.success("我的订单数据列表",list);
+    }
+
+
+
+
+
+
+
+    //测试派单
+    @ApiOperation("派单")
+    @GetMapping("/dispatch/{orderId}")
+    public AjaxResult dispatch(@PathVariable("orderId")Long orderId){
+        mallOrderService.dispatch(orderId);
+        return AjaxResult.success("派单成功");
+    }
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java
index 5e7bda4..3e00e67 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java
@@ -81,6 +81,7 @@ public class IMallOrderServiceImpl implements IMallOrderService {
             appletOrder.setType("1"); //指定人接单
             //appletUserId 用json形式储存
             appletOrder.setUserIdJson(""+appletUserId);
+            appletOrder.setOrderTime(3); //设置为三分钟
             appletOrder.setNum(1);
             appletOrder.setStatus(0); //派单中
             appletOrder.setPrice(h5OrderVO.getPayAmount());//订单支付金额：这个地方用来计算订单的佣金
@@ -115,7 +116,9 @@ public class IMallOrderServiceImpl implements IMallOrderService {
 
 
         //appletUserId 用json形式储存  == 》这个地方还需要调优
-        List<AppUsers> appUsers = appUsersService.selectAppUsersList(null);
+        AppUsers usersGo = new AppUsers();
+        usersGo.setUserBcs(1);
+        List<AppUsers> appUsers = appUsersService.selectAppUsersList(usersGo);
         //得到所有的伴宠师id
         String appletUserId = "";
         for (AppUsers users : appUsers) {
@@ -123,7 +126,7 @@ public class IMallOrderServiceImpl implements IMallOrderService {
         }
 
 
-
+        appletOrder.setOrderTime(3); //设置为三分钟
         appletOrder.setUserIdJson(appletUserId);
         appletOrder.setNum(1);
         appletOrder.setStatus(0); //派单中
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
index d1b1444..32d51ea 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
@@ -3,6 +3,9 @@ package com.ruoyi.model.controller;
 import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.service.IAppUsersService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,7 +37,8 @@ public class AppletUsersTeacherController extends BaseController
 {
     @Autowired
     private IAppletUsersTeacherService appletUsersTeacherService;
-
+    @Autowired
+    private IAppUsersService appUsersService;
     /**
      * 查询伴宠师认证列表
      */
@@ -88,6 +92,14 @@ public class AppletUsersTeacherController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AppletUsersTeacher appletUsersTeacher)
     {
+        //如果审核状态为通过status = 1
+        if(appletUsersTeacher.getStatus() == 1){
+            //审核通过，修改用户表
+            AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletUsersTeacher.getUserId());
+            appUsers.setUserBcs(1);
+            appUsers.setUserBcsRole(1);
+            appUsersService.updateAppUsers(appUsers);
+        }
         return toAjax(appletUsersTeacherService.updateAppletUsersTeacher(appletUsersTeacher));
     }
 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
index 1b74655..db091ea 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
@@ -102,4 +102,9 @@ public class AppUsers {
     @Excel(name = "伴宠师角色")
     private Integer userBcsRole;
 
+    /** 合伙人角色 */
+    @Excel(name = "合伙人角色")
+    private Integer userHhRole;
+
+
 }
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
index 1611228..300fccd 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
@@ -1,27 +1,131 @@
 package com.ruoyi.model.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * 配置信息对象 applet_config
  * 
  * @author ruoyi
  * @date 2025-03-28
  */
-public class AppletConfig extends BaseEntity
+@Data
+public class AppletConfig
 {
     private static final long serialVersionUID = 1L;
 
-    /** 唯一标识 */
-    private Long id;
-
-    /** 说明 */
-    @Excel(name = "说明")
-    private String paramValue;
-
+//    /** 唯一标识 */
+//    private Long id;
+//
+//    /** 说明 */
+//    @Excel(name = "说明")
+//    private String paramValue;
+//
+//    /** 参数编码 */
+//    @Excel(name = "参数编码")
+//    private String paramCode;
+//
+//    /** 参数值-普通文本 */
+//    @Excel(name = "参数值-普通文本")
+//    private String paramValueText;
+//
+//    /** 参数值-图片 */
+//    @Excel(name = "参数值-图片")
+//    private String paramValueImage;
+//
+//    /** 参数值-富文本 */
+//    @Excel(name = "参数值-富文本")
+//    private String paramValueArea;
+//
+//    /** 删除标识 */
+//    private Integer delFlag;
+//
+//    public void setId(Long id)
+//    {
+//        this.id = id;
+//    }
+//
+//    public Long getId()
+//    {
+//        return id;
+//    }
+//    public void setParamValue(String paramValue)
+//    {
+//        this.paramValue = paramValue;
+//    }
+//
+//    public String getParamValue()
+//    {
+//        return paramValue;
+//    }
+//    public void setParamCode(String paramCode)
+//    {
+//        this.paramCode = paramCode;
+//    }
+//
+//    public String getParamCode()
+//    {
+//        return paramCode;
+//    }
+//    public void setParamValueText(String paramValueText)
+//    {
+//        this.paramValueText = paramValueText;
+//    }
+//
+//    public String getParamValueText()
+//    {
+//        return paramValueText;
+//    }
+//    public void setParamValueImage(String paramValueImage)
+//    {
+//        this.paramValueImage = paramValueImage;
+//    }
+//
+//    public String getParamValueImage()
+//    {
+//        return paramValueImage;
+//    }
+//    public void setParamValueArea(String paramValueArea)
+//    {
+//        this.paramValueArea = paramValueArea;
+//    }
+//
+//    public String getParamValueArea()
+//    {
+//        return paramValueArea;
+//    }
+//    public void setDelFlag(Integer delFlag)
+//    {
+//        this.delFlag = delFlag;
+//    }
+//
+//    public Integer getDelFlag()
+//    {
+//        return delFlag;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("id", getId())
+//            .append("paramValue", getParamValue())
+//            .append("paramCode", getParamCode())
+//            .append("paramValueText", getParamValueText())
+//            .append("paramValueImage", getParamValueImage())
+//            .append("paramValueArea", getParamValueArea())
+//            .append("delFlag", getDelFlag())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .toString();
+//    }
     /** 参数编码 */
     @Excel(name = "参数编码")
     private String paramCode;
@@ -38,87 +142,40 @@ public class AppletConfig extends BaseEntity
     @Excel(name = "参数值-富文本")
     private String paramValueArea;
 
+    /** 标识 */
+    private Long id;
+
+    /** 参数说明 */
+    @Excel(name = "参数说明")
+    private String paramValue;
+
     /** 删除标识 */
     private Integer delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setParamValue(String paramValue) 
-    {
-        this.paramValue = paramValue;
-    }
-
-    public String getParamValue() 
-    {
-        return paramValue;
-    }
-    public void setParamCode(String paramCode) 
-    {
-        this.paramCode = paramCode;
-    }
-
-    public String getParamCode() 
-    {
-        return paramCode;
-    }
-    public void setParamValueText(String paramValueText) 
-    {
-        this.paramValueText = paramValueText;
-    }
-
-    public String getParamValueText() 
-    {
-        return paramValueText;
-    }
-    public void setParamValueImage(String paramValueImage) 
-    {
-        this.paramValueImage = paramValueImage;
-    }
-
-    public String getParamValueImage() 
-    {
-        return paramValueImage;
-    }
-    public void setParamValueArea(String paramValueArea) 
-    {
-        this.paramValueArea = paramValueArea;
-    }
-
-    public String getParamValueArea() 
-    {
-        return paramValueArea;
-    }
-    public void setDelFlag(Integer delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("paramValue", getParamValue())
-            .append("paramCode", getParamCode())
-            .append("paramValueText", getParamValueText())
-            .append("paramValueImage", getParamValueImage())
-            .append("paramValueArea", getParamValueArea())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+    /** 参数值-数值 */
+    @Excel(name = "参数值-数值")
+    private Integer paramValueNum;
+
+    /** 参数值-百分比 */
+    @Excel(name = "参数值-百分比")
+    private BigDecimal paramValueNo;
+
+    /** 分类 */
+    @Excel(name = "分类")
+    private String paramClass;
+
+
+    /** 创建人 */
+    private String createBy;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+
+    /** 修改时间 */
+    private LocalDateTime updateTime;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updateBy;
 }
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java
index 649632d..d28b14f 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.model.mapper;
 
 import java.util.List;
 import com.ruoyi.model.domain.AppletConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 配置信息Mapper接口
@@ -19,6 +20,8 @@ public interface AppletConfigMapper
      */
     public AppletConfig selectAppletConfigById(Long id);
 
+    public AppletConfig selectAppletConfigByClassAndNum(@Param("paramClass") String paramClass, @Param("paramValueNum")Integer paramValueNum);
+
     /**
      * 查询配置信息列表
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java
index 5aad828..db879ff 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java
@@ -18,7 +18,7 @@ public interface IAppletConfigService
      * @return 配置信息
      */
     public AppletConfig selectAppletConfigById(Long id);
-
+    public AppletConfig selectAppletConfigByClassAndNum(String paramClass,Integer paramValueNum);
     /**
      * 查询配置信息列表
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java
index d412ea3..fee32a4 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java
@@ -32,6 +32,12 @@ public class AppletConfigServiceImpl implements IAppletConfigService
         return appletConfigMapper.selectAppletConfigById(id);
     }
 
+    @Override
+    public AppletConfig selectAppletConfigByClassAndNum(String paramClass,Integer paramValueNum){
+
+        return appletConfigMapper.selectAppletConfigByClassAndNum(paramClass,paramValueNum);
+    }
+
     /**
      * 查询配置信息列表
      * 
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
index a6340e2..e1980bc 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="invitationCode" column="invitation_code"/>
         <result property="baoPrice" column="bao_price"/>
         <result property="userBcsRole" column="user_bcs_role"/>
+        <result property="userHhRole" column="user_hh_role"/>
     </resultMap>
 
     <sql id="selectAppUsersVo">
-        select user_id, create_by, create_time, del_flag, remark, update_time, updator_by, user_image, user_name, user_state, user_telephone, unionid, openid, access_token, expires_in, refresh_token, expire_time, user_hh, user_bcs, price, invitation_code, bao_price, user_bcs_role  from app_users
+        select user_id, create_by, create_time, del_flag, remark, update_time, updator_by, user_image, user_name, user_state, user_telephone, unionid, openid, access_token, expires_in, refresh_token, expire_time, user_hh, user_bcs, price, invitation_code, bao_price, user_bcs_role,user_hh_role  from app_users
     </sql>
 
     <select id="selectAppUsersList" parameterType="AppUsers" resultMap="AppUsersResult">
@@ -54,7 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invitationCode != null  and invitationCode != ''"> and invitation_code = #{invitationCode}</if>
             <if test="baoPrice != null "> and bao_price = #{baoPrice}</if>
             <if test="userBcsRole != null "> and user_bcs_role = #{userBcsRole}</if>
+            <if test="userHhRole != null "> and user_hh_role = #{userHhRole}</if>
+
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectAppUsersByUserId" parameterType="Long" resultMap="AppUsersResult">
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invitationCode != null">invitation_code,</if>
             <if test="baoPrice != null">bao_price,</if>
             <if test="userBcsRole != null">user_bcs_role,</if>
+            <if test="userHhRole != null">user_hh_role,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -117,6 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invitationCode != null">#{invitationCode},</if>
             <if test="baoPrice != null">#{baoPrice},</if>
             <if test="userBcsRole != null">#{userBcsRole},</if>
+            <if test="userHhRole != null">#{userHhRole},</if>
+
+
         </trim>
     </insert>
 
@@ -145,6 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invitationCode != null">invitation_code = #{invitationCode},</if>
             <if test="baoPrice != null">bao_price = #{baoPrice},</if>
             <if test="userBcsRole != null">user_bcs_role = #{userBcsRole},</if>
+            <if test="userHhRole != null">user_hh_role = #{userHhRole},</if>
+
         </trim>
         where user_id = #{userId}
     </update>
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletAmountLogMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletAmountLogMapper.xml
index 63aa2e6..4d236b4 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletAmountLogMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletAmountLogMapper.xml
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="state != null "> and state = #{state}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectAppletAmountLogById" parameterType="AppletAmountLog" resultMap="AppletAmountLogResult">
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
index 9ce319d..2bd6bb3 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
@@ -16,10 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="paramValueNum" column="param_value_num"/>
+        <result property="paramValueNo" column="param_value_no"/>
+        <result property="paramClass" column="param_class"/>
     </resultMap>
 
     <sql id="selectAppletConfigVo">
-        select id, param_value, param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time from applet_config
+        select id, param_value, param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time,param_value_num, param_value_no, param_class  from applet_config
     </sql>
 
     <select id="selectAppletConfigList" parameterType="AppletConfig" resultMap="AppletConfigResult">
@@ -30,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramValueText != null  and paramValueText != ''"> and param_value_text = #{paramValueText}</if>
             <if test="paramValueImage != null  and paramValueImage != ''"> and param_value_image = #{paramValueImage}</if>
             <if test="paramValueArea != null  and paramValueArea != ''"> and param_value_area = #{paramValueArea}</if>
+            <if test="paramValueNum != null "> and param_value_num = #{paramValueNum}</if>
+            <if test="paramValueNo != null "> and param_value_no = #{paramValueNo}</if>
+            <if test="paramClass != null  and paramClass != ''"> and param_class = #{paramClass}</if>
+
         </where>
     </select>
     
@@ -38,6 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectAppletConfigByClassAndNum" parameterType="AppletConfig" resultMap="AppletConfigResult">
+        <include refid="selectAppletConfigVo"/>
+        where param_class = 'pet_payment_bcs' and param_value_num = #{paramValueNum}
+    </select>
+
     <insert id="insertAppletConfig" parameterType="AppletConfig" useGeneratedKeys="true" keyProperty="id">
         insert into applet_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="paramValueNum != null">param_value_num,</if>
+            <if test="paramValueNo != null">param_value_no,</if>
+            <if test="paramClass != null">param_class,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paramValue != null">#{paramValue},</if>
@@ -63,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="paramValueNum != null">#{paramValueNum},</if>
+            <if test="paramValueNo != null">#{paramValueNo},</if>
+            <if test="paramClass != null">#{paramClass},</if>
          </trim>
     </insert>
 
@@ -79,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="paramValueNum != null">param_value_num = #{paramValueNum},</if>
+            <if test="paramValueNo != null">param_value_no = #{paramValueNo},</if>
+            <if test="paramClass != null">param_class = #{paramClass},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml
index a6a9750..7b32a75 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="age != null "> and age = #{age}</if>
             <if test="license != null  and license != ''"> and license = #{license}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectAppletUsersTeacherById" parameterType="AppletUsersTeacher" resultMap="AppletUsersTeacherResult">