- 03 Nov, 2022 6 commits
- 02 Nov, 2022 1 commit
-
-
Lays-lzq committed
-
- 27 Oct, 2022 5 commits
- 26 Oct, 2022 4 commits
- 25 Oct, 2022 1 commit
-
-
Lays-lzq committed
-
- 07 Oct, 2022 3 commits
- 04 Aug, 2022 2 commits
- 03 Aug, 2022 6 commits
- 05 Jul, 2022 4 commits
- 04 Jul, 2022 4 commits
- 01 Jul, 2022 2 commits
- 26 Apr, 2022 2 commits
-
-
赖慧粮 committed
-
Publisher 自动合并请求 [ICubsLYSxwcLtSLTU0Qtu] ## chore(release): 1.2.1 ------ ## feat(optimization): 冗余代码删除 & 代码优化 & bug修复 ------ ## feat(records): 完善抽奖记录列表及详情 & 改变留言抽奖转跳抽奖记录的方式:由直播间转跳变更为当前页转跳 ------ ## refactor: 优化活动介绍组件样式逻辑 ------ ## Merge branch 'feature/lottery_20220419' into feature/lottery_20220322 # Conflicts: # components/Lottery/Instant/Main.vue ------ ## Merge branch 'feature/lottery_20220322' into test ------ ## Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test ------ ## feat(cert): remove local cert ------ ## feature: 刮刮乐等三种抽奖修改开奖及详情逻辑 ------ ## 合并分支 'feature/lottery_20220322' 到 'test' Feature/lottery 20220322 查看合并请求 !30 ------ ## feature: 优化开奖框样式 ------ ## 合并分支 'feature/lottery_20220322' 到 'test' feature: 优化开奖框样式 查看合并请求 !31 ------ ## feat(timing): 定时抽奖增加中奖弹窗,引导进入中奖详情 ------ ## Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test ------ ## feat(timing): 即时抽奖修复取值报错 ------ ## feat(timing): 修复中奖弹窗 ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [53xJv8aCdmkV5EZBMoml0] ## 合并分支 'dev' 到 'master' Publisher 自动合并请求 [znM9lZ_8UMcDYV4Blh7nh] ## feat(cbnclouds): private config ------ ## Merge branch 'private/cbnclouds' into test ------ ## feat(config): pm2 ------ ## Merge branch 'private/cbnclouds' into test ------ ## fix(source): 修复因nuxt进程重启导致time取当前值最终导致资源引入地址错误的问题,更换为版本号替代时间 ------ ## chore(release): 1.1.1 ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [JmgfUaPvxgur5RcwC3Cx1] ## 合并分支 'dev' 到 'master' Publisher 自动合并请求 [47JL_FalRs9CwYzv24cWm] ## chore(release): 1.1.0 ------ ## feat(report): 集成一键举报功能 ------ ## Merge branch 'feature/report_1018' into test ------ ## feat(style): 更新icon样式 ------ ## feat(style): 图标适配 ------ ## auto deploy ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [HJDQHsPXi3VwAdGrxUSy_] ## 合并分支 'dev' 到 'master' Publisher 自动合并请求 [pmZFqzhC8u_KMGzkHNxd3] ## feat(mini): 抽奖工具封装 & ui更新 & mini版本 ------ ## Merge branch 'feature/lottery_0826' into test ------ ## feat(lottery): 补充跳转通信 & 补充转盘谢谢参与图片 ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [lRya5NC5IAXXhIY5uLcsq] ## Merge branch 'dev' ------ ## feat(mini): 抽奖工具封装 & ui更新 & mini版本 ------ ## Merge branch 'feature/lottery_0826' into test ------ 查看合并请求 !4 ------ 查看合并请求 !5 ------ ## chore(release): 1.1.0 ------ ## feat(report): 集成一键举报功能 ------ ## Merge branch 'feature/report_1018' into test ------ 查看合并请求 !6 ------ 查看合并请求 !7 ------ ## 合并分支 'dev' 到 'master' Publisher 自动合并请求 [-rYVfuSqDLSXUWnUwpZyj] ## fix(main): 修复抽奖mini版九宫格组件实例取值错误的问题 ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [8wkDL14v9huVvOa-feUGe] ## fix(main): 修复抽奖mini版九宫格组件实例取值错误的问题 ------ 查看合并请求 !8 ------ 查看合并请求 !9 ------ ## feat(cbnclouds): private config ------ ## Merge branch 'private/cbnclouds' into test ------ ## feat(config): pm2 ------ ## Merge branch 'private/cbnclouds' into test ------ ## fix(source): 修复因nuxt进程重启导致time取当前值最终导致资源引入地址错误的问题,更换为版本号替代时间 ------ 查看合并请求 !10 ------ ## 合并分支 'test' 到 'dev' chore(release): 1.1.1 查看合并请求 !11 ------ 查看合并请求 !12 ------ ## 合并分支 'dev' 到 'master' Dev 查看合并请求 !23 ------ ## chore(release): 1.2.1 ------ ## 合并分支 'dev' 到 'master' Publisher 自动合并请求 [HjcKzHJTOsI8kSKRDfaQY] ## fix(api): 网关地址修复 ------ ## Merge branch 'private/cbnclouds' into test ------ ## Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test ------ ## feat(sentry): 增加sentry,记录开奖接口日志 ------ ## chore(release): 1.2.1 ------ ## auto deploy ------ ## 合并分支 'test' 到 'dev' Publisher 自动合并请求 [H_yixw8lchnJUkOM_QFnY] ## fix(api): 网关地址修复 ------ ## Merge branch 'private/cbnclouds' into test ------ ## Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test ------ ## feat(sentry): 增加sentry,记录开奖接口日志 ------ 查看合并请求 !24 ------ 查看合并请求 !25 ------ ## chore(release): 1.2.1 ------ ## feat(optimization): 冗余代码删除 & 代码优化 & bug修复 ------ ## feat(records): 完善抽奖记录列表及详情 & 改变留言抽奖转跳抽奖记录的方式:由直播间转跳变更为当前页转跳 ------ ## Merge branch 'feature/lottery_20220322' into test ------ ## Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test ------ 查看合并请求 !29 ------ 查看合并请求 !32
赖慧粮 committed
-
