diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java index 28845d3..119a605 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java @@ -84,7 +84,7 @@ public class DistributionLogController { @Operation(summary = "获得分销记录分页") @PreAuthorize("@ss.hasPermission('member:distribution-log:query')") public CommonResult<PageResult<DistributionLogRespVO>> getDistributionLogPage(@Valid DistributionLogPageReqVO pageReqVO) { - pageReqVO.setGameStatus("0"); +// pageReqVO.setGameStatus("0"); PageResult<DistributionLogDO> pageResult = distributionLogService.getDistributionLogPage(pageReqVO); // 拼接结果返回 List<MemberUserDO> users = memberUserService.getUserList( diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java index b193be4..35688ec 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java @@ -43,7 +43,7 @@ public class AppMemberUserController { MemberLevelDO level = levelService.getLevel(user.getLevelId()); AppMemberUserInfoRespVO convert = MemberUserConvert.INSTANCE.convert(user, level); convert.setId(getLoginUserId()+""); - convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); +// convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); return success(convert); } diff --git a/yudao-ui-admin-vue3-master/.env b/yudao-ui-admin-vue3-master/.env index 4b0f5bf..fc5eee0 100644 --- a/yudao-ui-admin-vue3-master/.env +++ b/yudao-ui-admin-vue3-master/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=芋道管理系统 +VITE_APP_TITLE=郑大钒水管理系统 # 项目本地运行端口号 VITE_PORT=80 @@ -20,6 +20,6 @@ VITE_APP_DOCALERT_ENABLE=true VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 -VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 +VITE_APP_DEFAULT_LOGIN_TENANT = 郑大钒水 VITE_APP_DEFAULT_LOGIN_USERNAME = admin VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 diff --git a/yudao-ui-admin-vue3-master/.env.dev b/yudao-ui-admin-vue3-master/.env.dev index bbbcd06..9ec935f 100644 --- a/yudao-ui-admin-vue3-master/.env.dev +++ b/yudao-ui-admin-vue3-master/.env.dev @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://zda.huamar.com' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://zda.huamar.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/yudao-ui-admin-vue3-master/.env.prod b/yudao-ui-admin-vue3-master/.env.prod index 842ba61..9ec935f 100644 --- a/yudao-ui-admin-vue3-master/.env.prod +++ b/yudao-ui-admin-vue3-master/.env.prod @@ -1,33 +1,36 @@ -# 生产环境:只在打包时使用 +# 开发环境:本地只启动前端项目,依赖开发环境(后端、APP) NODE_ENV=production -VITE_DEV=false +VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://zda.huamar.com' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://zda.huamar.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api # 是否删除debugger -VITE_DROP_DEBUGGER=true +VITE_DROP_DEBUGGER=false # 是否删除console.log -VITE_DROP_CONSOLE=true +VITE_DROP_CONSOLE=false # 是否sourcemap -VITE_SOURCEMAP=false +VITE_SOURCEMAP=true # 打包路径 VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=dist-prod +VITE_OUT_DIR=dist # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=true diff --git a/yudao-ui-admin-vue3-master/README.md b/yudao-ui-admin-vue3-master/README.md index f69861f..3564047 100644 --- a/yudao-ui-admin-vue3-master/README.md +++ b/yudao-ui-admin-vue3-master/README.md @@ -18,7 +18,7 @@ ## 🐯 平台简介 -**芋道**,以开发者为中心,打造中国第一流的快速开发平台,全部开源,个人与企业可 100% 免费使用。 +**郑大钒水**,以开发者为中心,打造中国第一流的快速开发平台,全部开源,个人与企业可 100% 免费使用。 * 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) 实现 * 改换 saas,自动引入等功能 @@ -195,7 +195,7 @@ ps:核心功能已经实现,正在对接微信小程序中...  -_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_ +_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入郑大钒水快速开发平台_ 演示地址:<https://doc.iocoder.cn/mall-preview/> diff --git a/yudao-ui-admin-vue3-master/index.html b/yudao-ui-admin-vue3-master/index.html index 8cfcbef..5deaae0 100644 --- a/yudao-ui-admin-vue3-master/index.html +++ b/yudao-ui-admin-vue3-master/index.html @@ -7,11 +7,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="keywords" - content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!" + content="郑大钒水管理系统" /> <meta name="description" - content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!" + content="郑大钒水管理系统" /> <title>%VITE_APP_TITLE%</title> </head> diff --git a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue index 14b447c..fb2896d 100644 --- a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue +++ b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue @@ -5,7 +5,7 @@ <el-avatar :size="60"> <Icon icon="ep:avatar" :size="60" /> </el-avatar> - <span class="text-18px font-bold">芋道源码</span> + <span class="text-18px font-bold">郑大钒水源码</span> </div> <Icon icon="tdesign:qrcode" :size="20" /> </div> diff --git a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue index 6cbe11f..4c78ffa 100644 --- a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue +++ b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue @@ -664,7 +664,7 @@ const previewProcessJson = () => { previewModelVisible.value = true }) } -/* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */ +/* ------------------------------------------------ 郑大钒水源码 methods ------------------------------------------------------ */ const processSave = async () => { // console.log(bpmnModeler, 'bpmnModelerbpmnModelerbpmnModelerbpmnModeler') const { err, xml } = await bpmnModeler.saveXML() diff --git a/yudao-ui-admin-vue3-master/src/utils/constants.ts b/yudao-ui-admin-vue3-master/src/utils/constants.ts index cfa785b..cee1744 100644 --- a/yudao-ui-admin-vue3-master/src/utils/constants.ts +++ b/yudao-ui-admin-vue3-master/src/utils/constants.ts @@ -1,5 +1,5 @@ /** - * Created by 芋道源码 + * Created by 郑大钒水源码 * * 枚举类 */ diff --git a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue index eff59ba..40246f1 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue @@ -196,7 +196,7 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', + tenantName: '郑大钒水', username: 'admin', password: 'admin123', captchaVerification: '', diff --git a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue index 7f5d994..74a3f0a 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue @@ -133,7 +133,7 @@ const loginData = reactive({ }, loginForm: { uuid: '', - tenantName: '芋道源码', + tenantName: '郑大钒水', mobileNumber: '', code: '' } diff --git a/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index.vue b/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index.vue index 3876145..5a773f2 100644 --- a/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index.vue +++ b/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index.vue @@ -38,7 +38,11 @@ <!-- 列表 --> <ContentWrap> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> - <el-table-column label="序号" align="center" prop="id" /> + <el-table-column label="序号" align="center"> + <template #default="scope"> + <span>{{ scope.$index + 1 }}</span> + </template> + </el-table-column> <el-table-column label="用户昵称" align="center" prop="nickname" /> <el-table-column label="真实姓名" align="center" prop="userName" /> <el-table-column label="手机号" align="center" prop="phone" /> @@ -114,7 +118,7 @@ const queryParams = reactive({ mebId: undefined, brokerage: undefined, status: undefined, - gameStatus: undefined, + gameStatus: '0', convertStatus: undefined, levelId: undefined, createTime: [], diff --git a/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index1.vue b/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index1.vue new file mode 100644 index 0000000..6454fda --- /dev/null +++ b/yudao-ui-admin-vue3-master/src/views/member/distributionlog/index1.vue @@ -0,0 +1,191 @@ +<template> + <ContentWrap> + <!-- 搜索工作栏 --> + <el-form + class="-mb-15px" + :model="queryParams" + ref="queryFormRef" + :inline="true" + label-width="68px" + > + <el-form-item label="兑换状态" prop="convertStatus"> + <el-select + v-model="queryParams.convertStatus" + placeholder="请选择兑换状态" + clearable + class="!w-240px" + > + <el-option label="已兑换" value="0" /> + <el-option label="未兑换" value="1" /> + </el-select> + </el-form-item> + <el-form-item> + <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> + <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> + <el-button + type="success" + plain + @click="handleExport" + :loading="exportLoading" + v-hasPermi="['member:distribution-log:export']" + > + <Icon icon="ep:download" class="mr-5px" /> 导出 + </el-button> + </el-form-item> + </el-form> + </ContentWrap> + + <!-- 列表 --> + <ContentWrap> + <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> + <el-table-column label="序号" align="center" > + <template #default="scope"> + <span>{{ scope.$index + 1 }}</span> + </template> + </el-table-column> + <el-table-column label="用户昵称" align="center" prop="nickname" /> + <el-table-column label="真实姓名" align="center" prop="userName" /> + <el-table-column label="手机号" align="center" prop="phone" /> + <!-- <el-table-column label="佣金" align="center" prop="brokerage" /> --> + <!-- <el-table-column label="分佣结算核销状态" align="center" prop="status" /> --> + <!-- <el-table-column label="游戏状态" align="center" prop="gameStatus" /> --> + <el-table-column label="兑换状态" align="center" prop="convertStatus" > + <template #default="scope"> + {{ scope.row.status==0?"已兑换":"未兑换" }} + </template> + </el-table-column> + <el-table-column + label="创建时间" + align="center" + prop="createTime" + :formatter="dateFormatter" + width="180px" + /> + <el-table-column label="操作" align="center"> + <template #default="scope"> + <el-button + link + type="primary" + @click="openForm('update', scope.row.id)" + v-hasPermi="['member:distribution-log:update']" + > + 编辑 + </el-button> + <el-button + link + type="danger" + @click="handleDelete(scope.row.id)" + v-hasPermi="['member:distribution-log:delete']" + > + 删除 + </el-button> + </template> + </el-table-column> + </el-table> + <!-- 分页 --> + <Pagination + :total="total" + v-model:page="queryParams.pageNo" + v-model:limit="queryParams.pageSize" + @pagination="getList" + /> + </ContentWrap> + + <!-- 表单弹窗:添加/修改 --> + <DistributionLogForm ref="formRef" @success="getList" /> +</template> + +<script setup lang="ts"> +import { dateFormatter } from '@/utils/formatTime' +import download from '@/utils/download' +import { DistributionLogApi, DistributionLogVO } from '@/api/member/distributionlog' +import DistributionLogForm from './DistributionLogForm.vue' + +/** 分销记录 列表 */ +defineOptions({ name: 'DistributionLog' }) + +const message = useMessage() // 消息弹窗 +const { t } = useI18n() // 国际化 + +const loading = ref(true) // 列表的加载中 +const list = ref<DistributionLogVO[]>([]) // 列表的数据 +const total = ref(0) // 列表的总页数 +const queryParams = reactive({ + pageNo: 1, + pageSize: 10, + referrerId: undefined, + oldReferrerId: undefined, + mebId: undefined, + brokerage: undefined, + status: undefined, + gameStatus: '1', + convertStatus: undefined, + levelId: undefined, + createTime: [], +}) +const queryFormRef = ref() // 搜索的表单 +const exportLoading = ref(false) // 导出的加载中 + +/** 查询列表 */ +const getList = async () => { + loading.value = true + try { + const data = await DistributionLogApi.getDistributionLogPage(queryParams) + list.value = data.list + total.value = data.total + } finally { + loading.value = false + } +} + +/** 搜索按钮操作 */ +const handleQuery = () => { + queryParams.pageNo = 1 + getList() +} + +/** 重置按钮操作 */ +const resetQuery = () => { + queryFormRef.value.resetFields() + handleQuery() +} + +/** 添加/修改操作 */ +const formRef = ref() +const openForm = (type: string, id?: number) => { + formRef.value.open(type, id) +} + +/** 删除按钮操作 */ +const handleDelete = async (id: number) => { + try { + // 删除的二次确认 + await message.delConfirm() + // 发起删除 + await DistributionLogApi.deleteDistributionLog(id) + message.success(t('common.delSuccess')) + // 刷新列表 + await getList() + } catch {} +} + +/** 导出按钮操作 */ +const handleExport = async () => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出 + exportLoading.value = true + const data = await DistributionLogApi.exportDistributionLog(queryParams) + download.excel(data, '分销记录.xls') + } catch { + } finally { + exportLoading.value = false + } +} + +/** 初始化 **/ +onMounted(() => { + getList() +}) +</script> \ No newline at end of file diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue index aad25ea..53d021b 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除 avue 组件,使用 ElementUI 原生组件 --> <template> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue index 8b7cc3a..b25ef3c 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除暂时用不到的 websocket ② 代码优化,补充注释,提升阅读性 --> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue index 154291b..8ef570e 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 图文】 - 芋道源码: + 郑大钒水源码: ① 代码优化,补充注释,提升阅读性 --> <template> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue index 2c9d5f2..d29990a 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除多余的 rep 为前缀的变量,让 message 消息更简单 ② 代码优化,补充注释,提升阅读性 ③ 优化消息的临时缓存策略,发送消息时,只清理被发送消息的 tab,不会强制切回到 text 输入 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue index d544bbe..39c0143 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 视频】 - 芋道源码: + 郑大钒水源码: ① bug 修复: 1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容; 存在的问题:mediaId 有效期是 3 天,超过时间后无法播放 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue index fe7f0ca..b4ce4ce 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 语音】 - 芋道源码: + 郑大钒水源码: ① bug 修复: 1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容; 存在的问题:mediaId 有效期是 3 天,超过时间后无法播放 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue b/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue index 52c608f..49c1b34 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue @@ -63,7 +63,7 @@ const emit = defineEmits<{ column-count: 5; margin-top: 10px; - /* 芋道源码:增加 10px,避免顶着上面 */ + /* 郑大钒水源码:增加 10px,避免顶着上面 */ } .waterfall-item {