qdintc/intc-vue3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 茅台预约，功能优化。

Browse Source
This commit is contained in:
tianyongbao
2024-12-10 02:35:27 +08:00
parent 07edb8d6ca
commit 6d45e53729
6 changed files with 338 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/invest/ishop.js
View File

@@ -49,3 +49,30 @@ export function refreshShop() {
method: 'get'
})
}
// 查询省份列表
export function listProvince(query) {
return request({
url: '/invest/ishop/provinceList',
method: 'get',
params: query
})
}
// 查询城市列表
export function listCity(query) {
return request({
url: '/invest/ishop/cityList',
method: 'get',
params: query
})
}
// 查询区域列表列表
export function listDistrict(query) {
return request({
url: '/invest/ishop/districtList',
method: 'get',
params: query
})
}

9
src/api/invest/iuser.js
View File

@@ -77,3 +77,12 @@ export function login(mobile, code, deviceId) {
params: { mobile, code, deviceId }
})
}
// 新增账号管理
export function loginIUser(data) {
return request({
url: '/invest/iuser/loginIUser',
method: 'post',
data
})
}

4
src/views/invest/iitem/index.vue
View File

@@ -29,9 +29,9 @@
<el-table-column label="预约商品Code" width="120" align="center" prop="itemCode" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="内容" align="center" prop="content" />
<el-table-column label="图片" align="center" prop="picture">
<el-table-column label="图片" align="center" prop="pictureV2">
<template v-slot="scope">
<el-image style="width: 100px" :src="scope.row.picture" fit="fit"></el-image>
<el-image style="width: 100px" :src="scope.row.pictureV2" fit="fit"></el-image>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" width="160" prop="createTime" />

20
src/views/invest/ilog/index.vue
View File

@@ -6,14 +6,19 @@
<el-form-item label="用户" prop="title">
<el-input v-model="queryParams.mobile" placeholder="请输入用户" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="日志记录内容" prop="logContent">
<el-input v-model="queryParams.logContent" placeholder="请输入日志记录内容" clearable @keyup.enter="handleQuery" />
<el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
<el-option v-for="dict in ilog_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="操作状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择操作状态" clearable>
<el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="日志记录内容" prop="logContent">
<el-input v-model="queryParams.logContent" placeholder="请输入日志记录内容" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form>
<div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -46,12 +51,17 @@
<el-table v-loading="loading" :data="ilogList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="用户" align="center" width="150" prop="mobile" />
<el-table-column label="日志记录内容" align="center" prop="logContent" />
<el-table-column label="操作状态" align="center" width="150" prop="status">
<el-table-column label="类型" align="center" width="150" prop="type">
<template #default="scope">
<dict-tag :options="ilog_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="操作状态" align="center" width="120" prop="status">
<template #default="scope">
<dict-tag :options="sys_common_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="日志记录内容" align="center" prop="logContent" />
<el-table-column label="操作时间" align="center" prop="operTime" width="160"> </el-table-column>
<el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
<template v-slot="scope">
@@ -92,7 +102,7 @@ import { listIlog, getIlog, delIlog, addIlog, updateIlog } from '@/api/invest/il
// eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require'
const { proxy } = getCurrentInstance()
const { sys_common_status } = proxy.useDict('sys_common_status')
const { sys_common_status, ilog_type } = proxy.useDict('sys_common_status', 'ilog_type')
const ilogList = ref([])
const open = ref(false)
const loading = ref(true)

92
src/views/invest/ishop/index.vue
View File

@@ -3,20 +3,26 @@
<div class="search-con">
<div class="title">查询条件</div>
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="门店id" prop="iShopId">
<!-- <el-form-item label="门店id" prop="iShopId">
<el-input v-model="queryParams.iShopId" placeholder="请输入门店id" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item> -->
<el-form-item label="省份" prop="provinceName">
<el-input v-model="queryParams.provinceName" placeholder="请输入省份" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.provinceName" placeholder="请选择省份" @change="handleProvinceChange" clearable>
<el-option v-for="district in provinceList" :key="district.provinceName" :label="district.provinceName" :value="district.provinceName" />
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityName">
<el-input v-model="queryParams.cityName" placeholder="请输入城市" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.cityName" placeholder="请选择城市" @change="handleCityChange" clearable>
<el-option v-for="district in cityList" :key="district.cityName" :label="district.cityName" :value="district.cityName" />
</el-select>
</el-form-item>
<el-form-item label="地区" prop="districtName">
<el-input v-model="queryParams.districtName" placeholder="请输入地区" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.districtName" placeholder="请选择地区" clearable>
<el-option v-for="district in districtList" :key="district.districtName" :label="district.districtName" :value="district.districtName" />
</el-select>
</el-form-item>
<el-form-item label="公司名称" prop="tenantName">
<el-input v-model="queryParams.tenantName" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
<el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form>
<div class="search-btn-con">
@@ -37,11 +43,11 @@
<el-table-column label="省份" width="150" align="center" prop="provinceName" />
<el-table-column label="城市" width="100" align="center" prop="cityName" />
<el-table-column label="地区" width="100" align="center" prop="districtName" />
<el-table-column label="完整地址" align="center" prop="fullAddress" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="地址" align="center" prop="address" />
<el-table-column label="经度" width="100" align="center" prop="lat" />
<el-table-column label="纬度" width="100" align="center" prop="lng" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="公司名称" width="220" align="center" prop="tenantName" />
<!-- <el-table-column label="公司名称" width="220" align="center" prop="tenantName" /> -->
<el-table-column label="创建时间" align="center" width="160" prop="createTime" />
</el-table>
<el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
@@ -51,7 +57,7 @@
</template>
<script setup name="Ishop">
import { listIshop, refreshShop } from '@/api/invest/ishop'
import { listIshop, refreshShop, listProvince, listCity, listDistrict } from '@/api/invest/ishop'
// eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require'
const { proxy } = getCurrentInstance()
@@ -63,6 +69,10 @@ const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const provinceList = ref([])
const cityList = ref([])
const districtList = ref([])
const data = reactive({
queryParams: {
pageNum: 1,
@@ -71,11 +81,43 @@ const data = reactive({
provinceName: null,
cityName: null,
districtName: null,
tenantName: null
province: null,
city: null,
district: null,
tenantName: null,
name: null
},
queryDistrictParams: {
pageNum: 1,
pageSize: 2000,
provinceName: null,
cityName: null,
districtName: null
}
})
const { queryParams } = toRefs(data)
const { queryParams, queryDistrictParams } = toRefs(data)
/** 查询省份列表 */
function getProvinceList() {
listProvince(queryDistrictParams.value).then((response) => {
provinceList.value = response.rows
})
}
/** 查询城市列表 */
function getCityList() {
listCity(queryDistrictParams.value).then((response) => {
cityList.value = response.rows
})
}
/** 查询区域列表 */
function getDistrictList() {
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
})
}
/** 查询门店列表列表 */
function getList() {
@@ -120,5 +162,29 @@ function handleRefresh() {
})
}
const handleProvinceChange = (provinceName) => {
queryDistrictParams.value.provinceName = provinceName
queryDistrictParams.value.cityName = null
queryParams.value.cityName = null
listCity(queryDistrictParams.value).then((response) => {
cityList.value = response.rows
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
})
})
}
const handleCityChange = (cityName) => {
queryDistrictParams.value.cityName = cityName
queryDistrictParams.value.districtName = null
queryParams.value.districtName = null
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
})
}
getList()
getProvinceList()
getCityList()
getDistrictList()
</script>

236
src/views/invest/iuser/index.vue
View File

@@ -26,7 +26,7 @@
<el-table-column label="手机号" align="center" prop="mobile" />
<!-- <el-table-column label="用户id" align="center" prop="userId" /> -->
<el-table-column label="预约项目code" align="center" prop="itemCode" />
<el-table-column label="门店id" align="center" prop="ishopId" />
<el-table-column label="默认预约门店" align="center" prop="ishopId" />
<el-table-column label="省份" align="center" prop="provinceName" />
<el-table-column label="城市" align="center" prop="cityName" />
<el-table-column label="预约类型" align="center" prop="shopType">
@@ -55,8 +55,8 @@
</div>
</div>
<!-- 添加或修改账号管理对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="iuserRef" :model="form" :rules="rules" label-width="120px">
<el-dialog :title="title" v-model="open" width="880px" append-to-body>
<el-form ref="iuserRef" :model="form" :rules="rules" label-width="120px" :inline="true">
<el-form-item label="用户id" prop="userId">
<el-input readonly v-model="form.userId" placeholder="请输入用户id" />
</el-form-item>
@@ -68,8 +68,25 @@
<el-option v-for="item in itemList" :key="item.itemCode" :label="item.title" :value="item.itemCode"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="门店id" prop="ishopId">
<el-input v-model="form.ishopId" placeholder="请输入门店id" />
<el-form-item label="省份" prop="provinceName">
<el-select v-model="form.provinceName" placeholder="请选择省份" @change="handleProvinceChange" clearable>
<el-option v-for="district in provinceList" :key="district.provinceName" :label="district.provinceName" :value="district.provinceName" />
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityName">
<el-select v-model="form.cityName" placeholder="请选择城市" @change="handleCityChange" clearable>
<el-option v-for="district in cityList" :key="district.cityName" :label="district.cityName" :value="district.cityName" />
</el-select>
</el-form-item>
<el-form-item label="区域" prop="districtName">
<el-select v-model="form.districtName" placeholder="请选择区域" @change="handleDistrictChange" clearable>
<el-option v-for="district in districtList" :key="district.districtName" :label="district.districtName" :value="district.districtName" />
</el-select>
</el-form-item>
<el-form-item label="默认预约门店" prop="ishopId">
<el-select v-model="form.ishopId" placeholder="请选择默认预约门店" clearable>
<el-option v-for="shop in ishopList" :key="shop.ishopId" :label="shop.name" :value="shop.ishopId" />
</el-select>
</el-form-item>
<el-form-item label="随机时间预约" prop="randomMinute">
<el-select v-model="form.randomMinute" placeholder="请选择随机时间预约">
@@ -84,10 +101,6 @@
<el-form-item label="预约执行分钟" prop="minute">
<el-input v-model="form.minute" placeholder="请输入预约执行分钟" />
</el-form-item>
<el-form-item label="到期时间" readonly prop="expireTime">
<el-date-picker clearable v-model="form.expireTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择到期时间">
</el-date-picker>
</el-form-item>
</el-form>
<template v-if="title !== '查看账号管理'" #footer>
<div class="dialog-footer">
@@ -96,24 +109,61 @@
</div>
</template>
</el-dialog>
<el-dialog title="添加账号" v-model="openUser" width="500px" append-to-body>
<el-form ref="formIuser" :model="form">
<el-dialog title="添加账号" v-model="openUser" width="880px" append-to-body>
<el-form ref="formIuser" :rules="addRules" label-width="120px" :inline="true" :model="form">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入I茅台用户手机号" />
<div style="margin-top: 10px">
<el-button type="primary" @click="sendMobileCode(form.mobile)"
>发送验证码<span v-if="state">({{ stateNum }})</span>
</el-button>
</div>
</el-form-item>
<el-form-item label="验证码" prop="userId">
<el-form-item label="">
<el-button type="primary" @click="sendMobileCode(form.mobile)"
>发送验证码<span v-if="state">({{ stateNum }})</span>
</el-button>
</el-form-item>
<el-form-item label="验证码" prop="code">
<el-input v-model="form.code" placeholder="请输入验证码" />
</el-form-item>
<el-form-item label="预约项目code" prop="itemCode">
<el-select v-model="itemSelect" multiple placeholder="请选择" @change="changeItem">
<el-option v-for="item in itemList" :key="item.itemCode" :label="item.title" :value="item.itemCode"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="省份" prop="provinceName">
<el-select v-model="form.provinceName" placeholder="请选择省份" @change="handleProvinceChange" clearable>
<el-option v-for="district in provinceList" :key="district.provinceName" :label="district.provinceName" :value="district.provinceName" />
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityName">
<el-select v-model="form.cityName" placeholder="请选择城市" @change="handleCityChange" clearable>
<el-option v-for="district in cityList" :key="district.cityName" :label="district.cityName" :value="district.cityName" />
</el-select>
</el-form-item>
<el-form-item label="区域" prop="districtName">
<el-select v-model="form.districtName" placeholder="请选择区域" @change="handleDistrictChange" clearable>
<el-option v-for="district in districtList" :key="district.districtName" :label="district.districtName" :value="district.districtName" />
</el-select>
</el-form-item>
<el-form-item label="默认预约门店" prop="ishopId">
<el-select v-model="form.ishopId" placeholder="请选择默认预约门店" clearable>
<el-option v-for="shop in ishopList" :key="shop.ishopId" :label="shop.name" :value="shop.ishopId" />
</el-select>
</el-form-item>
<el-form-item label="随机时间预约" prop="randomMinute">
<el-select v-model="form.randomMinute" placeholder="请选择随机时间预约">
<el-option v-for="dict in open_close" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="预约类型" prop="shopType">
<el-select v-model="form.shopType" placeholder="请选择预约类型">
<el-option v-for="dict in reservation_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="预约执行分钟" prop="minute">
<el-input v-model="form.minute" placeholder="请输入预约执行分钟" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="loginIuser(form.mobile, form.code)">登录 </el-button>
<el-button type="primary" @click="loginIuser()">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
@@ -144,8 +194,9 @@
</template>
<script setup name="Iuser">
import { listIuser, getIuser, delIuser, addIuser, updateIuser, sendCode, login, reservation, travelReward } from '@/api/invest/iuser'
import { listIuser, getIuser, delIuser, addIuser, updateIuser, sendCode, login, reservation, travelReward, loginIUser } from '@/api/invest/iuser'
import { listIitem } from '@/api/invest/iitem'
import { listIshop, listProvince, listCity, listDistrict } from '@/api/invest/ishop'
// eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require'
const { proxy } = getCurrentInstance()
@@ -170,6 +221,11 @@ const stateNum = ref(60)
const itemSelect = ref([])
const itemList = ref([])
const provinceList = ref([])
const cityList = ref([])
const districtList = ref([])
const ishopList = ref([])
const operateList = ref([
{ id: 'reservation', icon: 'View', name: '预约', title: '预约', hasPermi: ['invest:iuser:query'] },
{ id: 'travel', icon: 'View', name: '旅行', title: '旅行', hasPermi: ['invest:iuser:query'] },
@@ -202,10 +258,42 @@ const data = reactive({
createUser: null,
updateUser: null
},
queryDistrictParams: {
pageNum: 1,
pageSize: 2000,
provinceName: null,
cityName: null,
districtName: null
},
queryShopParams: {
pageNum: 1,
pageSize: 2000,
provinceName: null,
cityName: null,
districtName: null
},
rules: {
mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
ishopId: [{ required: true, message: '门店id不能为空', trigger: 'blur' }],
randomMinute: [{ required: true, message: '随机时间预约不能为空', trigger: 'blur' }],
shopType: [{ required: true, message: '预约类型不能为空', trigger: 'blur' }],
minute: [{ required: true, message: '预约执行分钟不能为空', trigger: 'blur' }],
provinceName: [{ required: true, message: '省份不能为空', trigger: 'blur' }],
cityName: [{ required: true, message: '城市不能为空', trigger: 'blur' }],
districtName: [{ required: true, message: '区域不能为空', trigger: 'blur' }],
itemCode: [{ required: true, message: '预约商品code不能为空', trigger: 'blur' }]
},
addRules: {
mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
ishopId: [{ required: true, message: '默认预约门店不能为空', trigger: 'blur' }],
code: [{ required: true, message: '验证码不能为空', trigger: 'blur' }],
randomMinute: [{ required: true, message: '随机时间预约不能为空', trigger: 'blur' }],
shopType: [{ required: true, message: '预约类型不能为空', trigger: 'blur' }],
minute: [{ required: true, message: '预约执行分钟不能为空', trigger: 'blur' }],
provinceName: [{ required: true, message: '省份不能为空', trigger: 'blur' }],
cityName: [{ required: true, message: '城市不能为空', trigger: 'blur' }],
districtName: [{ required: true, message: '区域不能为空', trigger: 'blur' }],
itemCode: [{ required: true, message: '预约商品code不能为空', trigger: 'blur' }]
}
})
@@ -232,7 +320,35 @@ const handleOperate = (operate, row) => {
}
}
const { queryParams, form, rules } = toRefs(data)
const { queryParams, queryDistrictParams, queryShopParams, form, rules, addRules } = toRefs(data)
/** 查询省份列表 */
function getProvinceList() {
listProvince(queryDistrictParams.value).then((response) => {
provinceList.value = response.rows
})
}
/** 查询城市列表 */
function getCityList() {
listCity(queryDistrictParams.value).then((response) => {
cityList.value = response.rows
})
}
/** 查询区域列表 */
function getDistrictList() {
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
})
}
/** 查询门店列表 */
function getShopList() {
listIshop(queryShopParams.value).then((response) => {
ishopList.value = response.rows
})
}
/** 查询账号管理列表 */
function getList() {
@@ -270,11 +386,13 @@ function reset() {
userId: null,
token: null,
cookie: null,
code: null,
deviceId: null,
itemCode: null,
ishopId: null,
provinceName: null,
cityName: null,
districtName: null,
address: null,
lat: null,
lng: null,
@@ -320,19 +438,17 @@ function handleSelectionChange(selection) {
multiple.value = !selection.length
}
// 查看
const handleView = (row) => {
title.value = '查看账号管理'
form.value = row
open.value = true
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
getProvinceList()
getCityList()
getDistrictList()
getShopList()
const _mobile = row.mobile || ids.value
getIuser(_mobile).then((response) => {
form.value = response.data
open.value = true
itemSelect.value = []
if (form.value.itemCode.indexOf('@') == -1 && form.value.itemCode !== '') {
@@ -406,8 +522,16 @@ function sendMobileCode(mobile, deviceId) {
})
}
//登录
function loginIuser(mobile, code) {
refresh(mobile, code, form.value.deviceId, 0)
function loginIuser() {
proxy.$refs.formIuser.validate((valid) => {
if (valid) {
loginIUser(form.value).then((response) => {
proxy.$modal.msgSuccess('新增成功')
openUser.value = false
getList()
})
}
})
}
function refresh(mobile, code, deviceId, status) {
@@ -451,7 +575,59 @@ function guid() {
}
function handleAddIUser() {
reset()
itemSelect.value = []
openUser.value = true
}
const handleProvinceChange = (provinceName) => {
queryDistrictParams.value.provinceName = provinceName
queryDistrictParams.value.cityName = null
form.value.cityName = null
form.value.districtName = null
form.value.cityName = null
form.value.ishopId = null
listCity(queryDistrictParams.value).then((response) => {
cityList.value = response.rows
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
queryShopParams.value.provinceName = provinceName
queryShopParams.value.cityName = form.value.cityName
queryShopParams.value.districtName = form.value.districtName
listIshop(queryShopParams.value).then((response) => {
ishopList.value = response.rows
})
})
})
}
const handleCityChange = (cityName) => {
queryDistrictParams.value.cityName = cityName
queryDistrictParams.value.districtName = null
form.value.districtName = null
form.value.ishopId = null
listDistrict(queryDistrictParams.value).then((response) => {
districtList.value = response.rows
queryShopParams.value.provinceName = form.value.provinceName
queryShopParams.value.cityName = cityName
queryShopParams.value.districtName = null
listIshop(queryShopParams.value).then((response) => {
ishopList.value = response.rows
})
})
}
const handleDistrictChange = (districtName) => {
queryShopParams.value.districtName = districtName
queryShopParams.value.cityName = form.value.cityName
queryShopParams.value.provinceName = form.value.provinceName
form.value.ishopId = null
listIshop(queryShopParams.value).then((response) => {
ishopList.value = response.rows
})
}
getProvinceList()
getCityList()
getDistrictList()
getShopList()
getList()
</script>