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

broadcast_cloud / web-live

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 2
  • Pipelines
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Closed
Merge request !87 opened Feb 04, 2021 by 王含泽@wanghanze 
  • Report abuse
Report abuse

Publisher 自动合并请求 [tADgfgjlCQ3-GRh1dmRpG]

feature

  1. 增加商城btn

Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 橱窗、新商品顶置 接口dms对接
  2. 优化 橱窗ui

Merge branch 'test' into feature/feature_showcase_v1.1.0


Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 对接顶置商品、正在讲解中的dms

Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 优化loading界面
  2. 优化广告走马灯
  3. 优化橱窗

feature

  1. 去除测试橱窗数据

feature

  1. 橱窗修复bug

fix

  1. 修复商品置顶去看看跳转

faeture

  1. 增加postMessage与商城通信
  2. 修复商品置顶和商城置顶冲突的情况
  3. 修复竖屏直播下打开商品的问题

合并分支 'feature/feature_showcase_v1.1.0' 到 'test'

Feature/feature showcase v1.1.0

查看合并请求 !81 (merged)


feature

  1. 修复外链商品弹出框会触发两次的问题
  2. 对接postMessage与商城通信

fix

  1. 修复支付postMessage无法调起的问题

fix

  1. 修复竖屏直播下点击商城按钮打开商品详情的问题

合并分支 'test' 到 'dev'

Publisher 自动合并请求 [tGRsSZwR-ivAQcBhQHQh0]

feature

  1. 增加商城btn

Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 橱窗、新商品顶置 接口dms对接
  2. 优化 橱窗ui

Merge branch 'test' into feature/feature_showcase_v1.1.0


Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 对接顶置商品、正在讲解中的dms

Merge branch 'test' into feature/feature_showcase_v1.1.0


feature

  1. 优化loading界面
  2. 优化广告走马灯
  3. 优化橱窗

feature

  1. 去除测试橱窗数据

feature

  1. 橱窗修复bug

fix

  1. 修复商品置顶去看看跳转

faeture

  1. 增加postMessage与商城通信
  2. 修复商品置顶和商城置顶冲突的情况
  3. 修复竖屏直播下打开商品的问题

合并分支 'feature/feature_showcase_v1.1.0' 到 'test'

Feature/feature showcase v1.1.0

查看合并请求 !81 (merged)


feature

  1. 修复外链商品弹出框会触发两次的问题
  2. 对接postMessage与商城通信

fix

  1. 修复支付postMessage无法调起的问题

fix

  1. 修复竖屏直播下点击商城按钮打开商品详情的问题

查看合并请求 !84 (merged)


fix

  1. 修复dms在关闭橱窗时候的未生效问题
  2. 竖屏直播下购物车和橱窗兼容
  3. 优化橱窗动画

合并分支 'test' 到 'dev'

Publisher 自动合并请求 [WR4VEmwzl0NUx-lFAzks0]

fix

  1. 修复dms在关闭橱窗时候的未生效问题
  2. 竖屏直播下购物车和橱窗兼容
  3. 优化橱窗动画

查看合并请求 !86 (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 36
  • Changes 71
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陈英杰 @chenyingjie

    Added 2 commits:

    • 579d9c7f - fix
    • 3682ccf3 - 合并分支 'test' 到 'dev'
    Feb 04, 2021

    Added 2 commits:

    • 579d9c7f - fix
    • 3682ccf3 - 合并分支 'test' 到 'dev'
    Added 2 commits: * 579d9c7f - fix * 3682ccf3 - 合并分支 'test' 到 'dev'
    Toggle commit list
  • 陈英杰 @chenyingjie

    Added 15 commits:

    • f92a1862 - feature
    • 23fa9511 - Merge branch 'test' into feature/feature_redPacketRain_v1.2.0
    • 76403b7d - feature
    • b6a34ec2 - Merge branch 'test' into feature/feature_redPacketRain_v1.2.0
    • c697b895 - faeture
    • 9cfda971 - feature<redPacketRain>
    • d72ffecc - fix
    • 0ee45318 - private
    • 8a82d349 - fix
    • 39308bd3 - feature
    • 649aeedc - feature
    • 699a852d - fix
    • f89463a6 - fix
    • 6355f541 - 合并分支 'feature/feature_redPacketRain_v1.2.0' 到 'test'
    • a72063fd - 合并分支 'test' 到 'dev'
    Feb 22, 2021

    Added 15 commits:

    • f92a1862 - feature
    • 23fa9511 - Merge branch 'test' into feature/feature_redPacketRain_v1.2.0
    • 76403b7d - feature
    • b6a34ec2 - Merge branch 'test' into feature/feature_redPacketRain_v1.2.0
    • c697b895 - faeture
    • 9cfda971 - feature<redPacketRain>
    • d72ffecc - fix
    • 0ee45318 - private
    • 8a82d349 - fix
    • 39308bd3 - feature
    • 649aeedc - feature
    • 699a852d - fix
    • f89463a6 - fix
    • 6355f541 - 合并分支 'feature/feature_redPacketRain_v1.2.0' 到 'test'
    • a72063fd - 合并分支 'test' 到 'dev'
    Added 15 commits: * f92a1862 - feature * 23fa9511 - Merge branch &#x27;test&#x27; into feature&#x2F;feature_redPacketRain_v1.2.0 * 76403b7d - feature * b6a34ec2 - Merge branch &#x27;test&#x27; into feature&#x2F;feature_redPacketRain_v1.2.0 * c697b895 - faeture * 9cfda971 - feature&lt;redPacketRain&gt; * d72ffecc - fix * 0ee45318 - private * 8a82d349 - fix * 39308bd3 - feature * 649aeedc - feature * 699a852d - fix * f89463a6 - fix * 6355f541 - 合并分支 &#x27;feature&#x2F;feature_redPacketRain_v1.2.0&#x27; 到 &#x27;test&#x27; * a72063fd - 合并分支 &#x27;test&#x27; 到 &#x27;dev&#x27;
    Toggle commit list
  • 陈英杰 @chenyingjie

    Status changed to closed

    Feb 23, 2021

    Status changed to closed

    Status changed to closed
    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: broadcast_cloud/web-live!87