Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

activities / web-lottery

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 1
  • Pipelines
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !32 opened Apr 21, 2022 by 赖慧粮@laihuiliang 
  • Report abuse
Report abuse

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 (merged)


feature: 优化开奖框样式


合并分支 'feature/lottery_20220322' 到 'test'

feature: 优化开奖框样式

查看合并请求 !31 (merged)


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 (merged)


查看合并请求 !5 (merged)


chore(release): 1.1.0


feat(report): 集成一键举报功能


Merge branch 'feature/report_1018' into test


查看合并请求 !6 (merged)


查看合并请求 !7 (merged)


合并分支 'dev' 到 'master'

Publisher 自动合并请求 [-rYVfuSqDLSXUWnUwpZyj]

fix(main): 修复抽奖mini版九宫格组件实例取值错误的问题


合并分支 'test' 到 'dev'

Publisher 自动合并请求 [8wkDL14v9huVvOa-feUGe]

fix(main): 修复抽奖mini版九宫格组件实例取值错误的问题


查看合并请求 !8 (merged)


查看合并请求 !9 (merged)


feat(cbnclouds): private config


Merge branch 'private/cbnclouds' into test


feat(config): pm2


Merge branch 'private/cbnclouds' into test


fix(source): 修复因nuxt进程重启导致time取当前值最终导致资源引入地址错误的问题,更换为版本号替代时间


查看合并请求 !10 (merged)


合并分支 'test' 到 'dev'

chore(release): 1.1.1

查看合并请求 !11 (merged)


查看合并请求 !12 (merged)


合并分支 'dev' 到 'master'

Dev

查看合并请求 !23 (merged)


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 (merged)


查看合并请求 !25 (merged)


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 (merged)


×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b dev origin/dev

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff dev

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 23
  • Changes 39
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 施嘉伟 @shijiawei

    Added 4 commits:

    • f2fc0efc - refactor(winpupop): 重构开奖框和倒计时样式
    • 172c0a47 - refactor(records): 优化records组件
    • de9f657b - 合并分支 'feature/lottery_20220421' 到 'test'
    • c8a5ce07 - 合并分支 'test' 到 'dev'
    Apr 22, 2022

    Added 4 commits:

    • f2fc0efc - refactor(winpupop): 重构开奖框和倒计时样式
    • 172c0a47 - refactor(records): 优化records组件
    • de9f657b - 合并分支 'feature/lottery_20220421' 到 'test'
    • c8a5ce07 - 合并分支 'test' 到 'dev'
    Added 4 commits: * f2fc0efc - refactor(winpupop): 重构开奖框和倒计时样式 * 172c0a47 - refactor(records): 优化records组件 * de9f657b - 合并分支 'feature/lottery_20220421' 到 'test' * c8a5ce07 - 合并分支 'test' 到 'dev'
    Toggle commit list
  • 赖慧粮 @laihuiliang

    Added 2 commits:

    • 1cd201b0 - feat(recorddetail): 抽奖记录详情增加物流公司 & 增加底部安全距离
    • 30907f37 - Merge branch 'test' into dev
    Apr 22, 2022

    Added 2 commits:

    • 1cd201b0 - feat(recorddetail): 抽奖记录详情增加物流公司 & 增加底部安全距离
    • 30907f37 - Merge branch 'test' into dev
    Added 2 commits: * 1cd201b0 - feat(recorddetail): 抽奖记录详情增加物流公司 & 增加底部安全距离 * 30907f37 - Merge branch 'test' into dev
    Toggle commit list
  • 赖慧粮 @laihuiliang

    Status changed to merged

    Apr 26, 2022

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in commit 6635d7bb

    Apr 26, 2022

    mentioned in commit 6635d7bb

    mentioned in commit 6635d7bbec816f0f04b034599fed20d70494963f
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in merge request !37 (merged)

    Aug 03, 2022

    mentioned in merge request !37 (merged)

    mentioned in merge request !37
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: activities/web-lottery!32
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.