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> getDistributionLogPage(@Valid DistributionLogPageReqVO pageReqVO) { - pageReqVO.setGameStatus("0"); +// pageReqVO.setGameStatus("0"); PageResult pageResult = distributionLogService.getDistributionLogPage(pageReqVO); // 拼接结果返回 List 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:核心功能已经实现,正在对接微信小程序中... ![功能图](/.image/common/mall-preview.png) -_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_ +_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入郑大钒水快速开发平台_ 演示地址: 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 @@ %VITE_APP_TITLE% 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 @@ - 芋道源码 + 郑大钒水源码 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 @@ - + + + @@ -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 @@ + + + \ 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 @@