zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,885 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

734 Commits (master)

Author SHA1 Message Date
perry ad38894bf3 商户id 2023-05-26 10:41:30 +08:00
TianYu f2047883c0 fix: 修复bug 2023-05-26 09:33:30 +08:00
TianYu 56c8e53fa0 fix: 会员管理取消操作按钮 2023-05-25 17:00:11 +08:00
Jruome 149ea95d48 uniapp 会员购买申请退款 2023-05-25 14:33:27 +08:00
Jruome b11b71be2e uniapp 手机号正则修改 2023-05-25 11:08:25 +08:00
Jruome 6fadb15d27 uniapp 话费返回详情 2023-05-24 19:59:44 +08:00
Jruome cd68bf0be8 uniapp 会员权益 2023-05-24 17:51:37 +08:00
Jruome b18ed2551c uniapp 会员权益 2023-05-24 17:00:39 +08:00
TianYu 4afe43b327 fix: 修改bug 2023-05-24 10:34:35 +08:00
Jruome f9c4d2b102 uniapp 会员权益判断 2023-05-23 18:08:01 +08:00
Jruome 2d459bd679 uniapp 为他人支付 2023-05-23 12:03:27 +08:00
TianYu 1f3d68faf0 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-23 09:47:36 +08:00
TianYu bb12efb278 feat: 新增功能 2023-05-23 09:47:23 +08:00
perry 57084b320c 修改测试环境地址 2023-05-23 09:19:03 +08:00
perry 071c2bf863 正式环境 2023-05-22 23:26:27 +08:00
TianYu e2f85963ca fix: 修改商户生成码推广链接 2023-05-22 14:00:59 +08:00
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
TianYu 33dba0e315 fix: 修复bug 2023-05-19 19:25:50 +08:00
TianYu d8f9dd9479 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 19:03:40 +08:00
TianYu 87a50fa476 fix: 修复bug 2023-05-19 19:03:24 +08:00
perry 04e0f33ad3 微信支付 2023-05-19 17:49:39 +08:00
TianYu 2925d35df8 fix: 修复bug 2023-05-19 16:10:03 +08:00
perry 21a020f430 微信支付 2023-05-19 10:24:44 +08:00
perry 18909d4c2c 微信支付 2023-05-18 18:49:43 +08:00
TianYu 2b5c66acf2 feat: 微信支付联调 2023-05-18 18:07:27 +08:00
TianYu 9f47ce9dda Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:56 +08:00
TianYu abbe8ea262 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:37 +08:00
perry adacc2b6fe 打包测试 2023-05-18 14:56:40 +08:00
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
perry 6fac2affcc 测试环境 2023-05-18 13:25:44 +08:00
perry a0c0fc8437 打包 2023-05-17 23:09:32 +08:00
perry d4bb390916 打包 2023-05-17 23:02:34 +08:00
perry e05e28ce02 打包 2023-05-17 22:44:59 +08:00
perry 452dd6b983 打包 2023-05-17 21:55:05 +08:00
perry d9b6b286f5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 
# Conflicts:
#	yudao-ui-admin/.env.dev
 2023-05-17 21:50:55 +08:00
perry 7870f79674 打包 2023-05-17 21:50:20 +08:00
TianYu 983f098870 feat: 新增推广员功能 2023-05-17 17:58:09 +08:00
TianYu 9617169e6f feat: 增加支付宝支付 2023-05-17 16:28:31 +08:00
Jruome 04fbb93fa6 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-17 15:27:44 +08:00
perry 42091eedca Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 15:09:09 +08:00
perry da28864ded 测试地址 2023-05-17 15:08:10 +08:00
axzsd efd9296275 构建文件 2023-05-17 14:49:13 +08:00
axzsd df3f811ddf 构建文件 2023-05-17 14:42:10 +08:00
axzsd fec78bc6d8 构建文件 2023-05-17 14:41:11 +08:00
axzsd 79e5fafbfe 构建文件 2023-05-17 14:41:02 +08:00
axzsd 1c26c9142b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 14:39:30 +08:00
axzsd b7241ecd09 构建文件 2023-05-17 14:39:25 +08:00
TianYu d1c0e148bd Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 14:37:30 +08:00
TianYu 907b2b7582 feat: 轮播图功能开发 2023-05-17 14:37:27 +08:00
perry 9fbee20579 推广员 2023-05-17 14:17:20 +08:00
perry 06a36c6668 环境地址 2023-05-17 09:55:53 +08:00
TianYu fd0627c470 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 09:53:55 +08:00
TianYu 405e61876a feat: 修改生产环境服务器地址 2023-05-17 09:53:43 +08:00
perry 8798b872e6 推广员导入 2023-05-17 09:32:13 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
Jruome b71fff7e00 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-16 18:15:01 +08:00
TianYu 24b4be91d0 feat: 功能开发 2023-05-16 18:00:52 +08:00
Jruome 88980480cb Merge remote-tracking branch 'origin/feature/mall_product' 
# Conflicts:
#	yudao-ui-admin/yarn.lock
 2023-05-16 09:53:40 +08:00
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
perry 39e87b3701 充值记录 2023-05-15 18:28:49 +08:00
Jruome 00d7d6528d Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-15 10:39:07 +08:00
TianYu 927568c0d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server 2023-05-15 10:36:04 +08:00
Jruome f96369d3e4 物流模板 2023-05-15 10:25:36 +08:00
Jruome 89c09d32b4 物流模板 2023-05-15 10:19:45 +08:00
perry 69da62ea38 商品管理 2023-05-14 18:08:19 +08:00
perry b7e1341962 商品管理 2023-05-14 17:36:50 +08:00
perry dece26fce7 商品管理 2023-05-12 19:04:02 +08:00
TianYu 609821a5c7 feat: 新增订单模块 2023-05-12 15:24:57 +08:00
Jruome 153a26612d 商品页面初始化 2023-05-12 10:11:30 +08:00
TianYu 54ad77ad37 feat: 拷贝商品功能 2023-05-12 09:36:43 +08:00
perry 1a198a5ef0 会员管理 2023-05-10 15:38:22 +08:00
perry f32a82379b 请求方法修改 2023-05-08 16:29:31 +08:00
YunaiV 4b2855232a !458 【Fix Bug】”占位“文件影响改包工具运行 2023-04-22 19:25:59 +08:00
YunaiV 8c65afc56a !462 fix: 代码生成：Vue3标准模板问题修复。 2023-04-22 19:01:11 +08:00
YunaiV 535413804b 1.7.2 版本发布 2023-04-19 20:44:19 +08:00
芋道源码 f62bf6c21c
!432 将业务表单做为动态组件，直接显示到审批页面，不再需要点击查看 
Merge pull request !432 from 疯狂的世界/flowable
 2023-04-15 02:26:14 +00:00
lizs c67a7f7b7d fix 新建租户页面无校验用户名密码 2023-04-14 16:04:30 +08:00
YunaiV d500332a18 代码生成，支持配置前端 UI 类型 2023-04-13 07:53:41 +08:00
YunaiV caeb23a3dc Merge remote-tracking branch 'origin/feature/codegen-front' into feature/codegen-front 2023-04-09 10:05:29 +08:00
YunaiV 1737fd3af9 修改公众号的 mpuser 的包名 2023-04-09 10:05:23 +08:00
YunaiV f46c0e24fe 所有菜单的 name 都加上模块的前缀，避免冲突 2023-04-08 17:40:45 +00:00
YunaiV 00a2818c01 增加 swagger、druid、skywalking、admin 的自定义路径 2023-04-08 17:40:45 +00:00
YunaiV 79eb90d653 1. 优化代码生成模版 
2. 优化 Vue2 所在目录
 2023-04-08 17:40:45 +00:00
YunaiV adb8b58967 所有菜单的 name 都加上模块的前缀，避免冲突 2023-04-08 11:49:28 +08:00
YunaiV 04c3cdf372 增加 swagger、druid、skywalking、admin 的自定义路径 2023-04-07 23:25:43 +08:00
YunaiV 28da6b0c24 1. 优化代码生成模版 
2. 优化 Vue2 所在目录
 2023-04-02 18:58:01 +08:00
打听幸福的下落 c2748585b1 fix: 短信验证码登录不显示获取验证码按钮问题 2023-03-16 21:23:43 +08:00
owen 8245f8a369 将业务表单做为动态组件，直接显示到审批页面，不再需要点击查看 2023-03-09 00:23:27 +08:00
YunaiV 47d3f0bc9a 1.7.1 版本发布 2023-03-05 19:46:03 +08:00
YunaiV a6896203ca 新增 vue2、uniapp 的演示环境启动方式，方便前端同学 2023-03-05 12:33:49 +08:00
YunaiV 6115a1ee34 admin-ui 演示环境，迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址 2023-03-05 02:10:16 +08:00
YunaiV cec47d0283 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-03-04 21:53:22 +08:00
YunaiV 4390e28eea pay: 新增支付宝 App 支付的接入 2023-02-19 23:37:29 +08:00
YunaiV 2093c3bdb5 pay: 重构支付客户端，移除 PayCommonResult 累 2023-02-19 22:16:15 +08:00
YunaiV 8e1be01451 pay: 增加支付宝的条形码支付的配置 2023-02-18 23:59:11 +08:00
YunaiV e6f414b918 pay: 接入支付宝 Wap 支付 2023-02-18 22:40:56 +08:00
YunaiV ce8571e313 pay: 接入支付宝 PC 支付的表单 2023-02-18 21:39:09 +08:00
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 2023-02-18 20:59:18 +08:00
YunaiV df702e8d24 pay: 临时性的提交，准备 client 部分的重构 2023-02-18 10:39:48 +08:00
YunaiV 44b0346e5e pay：示例订单，接入退款回调逻辑 2023-02-16 00:42:54 +08:00