Augcl
/
pet-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-admin 

# Conflicts:
#	CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
#	ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
#	ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
master
CYF 2 months ago
parent
091292a965 d8ef741275
commit
7eab31e3ff
2 changed files with 205 additions and 192 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +152
    -146
      CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue
  2. +53
    -46
      CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue

+ 152
- 146
CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue View File

@ -1,15 +1,15 @@
<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="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"
@ -19,15 +19,15 @@
@keyup.enter.native="handleQuery"
/>
</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="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"
@ -37,43 +37,43 @@
@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="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"
@ -92,24 +92,24 @@
@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 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>
@ -117,16 +117,16 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['model:AppUsers:add']"
>新增</el-button>
</el-col>
<!-- <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"
@ -149,43 +149,48 @@
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>
<!-- <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="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" v-if="columns[2].visible"/>
<el-table-column label="用户昵称" align="center" prop="userName" v-if="columns[3].visible"/>
<el-table-column label="用户状态" align="center" prop="userState" v-if="columns[4].visible"/>
<el-table-column label="用户电话" align="center" prop="userTelephone" v-if="columns[5].visible"/>
<el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" v-if="columns[6].visible"/>
<el-table-column label="用户的标识，对当前公众号唯一" align="center" prop="openid" v-if="columns[7].visible"/>
<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>
<!-- <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="userHh" v-if="columns[12].visible"/>
<el-table-column label="是否伴宠师" align="center" prop="userBcs" v-if="columns[13].visible"/>
<el-table-column label="钱包金额" align="center" prop="price" v-if="columns[14].visible"/>
<el-table-column label="邀请码" align="center" prop="invitationCode" v-if="columns[15].visible"/>
<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="price"/>
<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
@ -217,50 +222,51 @@
<!-- 添加或修改用户对话框 -->
<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="逻辑删除" 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="逻辑删除" 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"/>
<!-- <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="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-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="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-input v-model="form.userHh" placeholder="请输入是否合伙人" />
</el-form-item>


+ 53
- 46
CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue View File

@ -1,15 +1,15 @@
<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="userId">-->
<!-- <el-input-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请输入关联用户"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.name"
@ -28,10 +28,10 @@
@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="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"
@ -41,28 +41,28 @@
@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="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>
@ -123,16 +123,22 @@
<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="userId" v-if="columns[0].visible"/>
<el-table-column label="姓名" align="center" prop="name" v-if="columns[1].visible"/>
<el-table-column label="身份证" align="center" prop="idCard" v-if="columns[2].visible"/>
<el-table-column label="性别" align="center" prop="sex" v-if="columns[3].visible"/>
<el-table-column label="手机号" align="center" prop="phone" v-if="columns[4].visible"/>
<el-table-column label="养宠经验" align="center" prop="experience" v-if="columns[5].visible"/>
<el-table-column label="是否有专业执照" align="center" prop="isHave" v-if="columns[6].visible"/>
<el-table-column label="个人宠物类型" align="center" prop="petType" v-if="columns[7].visible"/>
<el-table-column label="审核状态" align="center" prop="status" v-if="columns[8].visible"/>
<el-table-column label="审核图片" align="center" prop="images" v-if="columns[9].visible"/>
<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="age" />
<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="images" />-->
<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" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -183,7 +189,8 @@
<el-input v-model="form.isHave" placeholder="请输入是否有专业执照" />
</el-form-item>
<el-form-item label="审核图片">
<imageUpload v-model="form.images"/>
<!-- <imageUpload v-model="form.images"/>-->
<oss-image-upload v-model="form.images"></oss-image-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">


Write Preview
Loading…
Cancel
Save