• This project
    • Loading...
  • Sign in

fe / yohobuy-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 1
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Closed
Merge Request !5 opened 2016-11-30 13:08:27 UTC bygexuhui@gexuhui

Feature/getbanner action

pc banner js

Edited 2016-12-02 05:26:18 UTC
Request to merge feature/getbannerAction into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/getbannerAction origin/feature/getbannerAction

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 feature/getbannerAction

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

Closed by 周少峰 2016-12-02 05:26:18 UTC

The changes were not merged into master.

  • Discussion 3
  • Commits 8
  • Changes 5
  • 27eb47a245cb92314a46f1139662b115?s=80&d=identicon
    周少峰
    @zhoushaofeng started a discussion on an outdated diff 2016-11-30 13:15:50 UTC
    Toggle discussion
    apps/common/models/getBanner.js 0 → 100644
    * @date: 2016/11/30
    */
    'use strict';
    const helpers = global.yoho.helpers;
    const serviceApi = global.yoho.ServiceAPI;
    const URL_OPERATIONS_RESOURCE_GET = 'operations/api/v5/resource/get';
    /**
    * 获取资源数据
    *
    * @param string $content_code
    * @param string $client_type
    * @param boolean $isOnlyUrl false
    • 周少峰
      @zhoushaofeng commented 2016-11-30 13:15:50 UTC
      Master

      这个文件删了,用公共的

      Edited 2016-11-30 13:18:42 UTC
  • 27eb47a245cb92314a46f1139662b115?s=80&d=identicon
    周少峰
    @zhoushaofeng started a discussion on an outdated diff 2016-11-30 13:19:03 UTC
    Toggle discussion
    apps/common/controllers/getBanner.js 0 → 100644
    } else {
    let banner = '';
    let md = data.data[0];
    if (md && md.data) {
    if (md.template_name === 'single_image') {
    banner = md.data[0];
    } else if (md.template_name === 'single_name_image')
    {
    banner = md.data;
    }
    if ( banner) {
    if (!width || !height) {
    width = 2600;
    • 周少峰
      @zhoushaofeng commented 2016-11-30 13:19:03 UTC
      Master

      定义的时候,加上默认宽高

  • 27eb47a245cb92314a46f1139662b115?s=80&d=identicon
    周少峰
    @zhoushaofeng started a discussion on an outdated diff 2016-11-30 13:19:31 UTC
    Toggle discussion
    apps/common/controllers/getBanner.js 0 → 100644
    * @author: gxh<xuhui.ge@yoho.cn>
    * @date: 2016/11/30
    */
    'use strict';
    const gtModel = require('../models/getBanner');
    const helpers = global.yoho.helpers;
    const index = (req, res) => {
    let contentCode = req.query.content_code || '';
    let width = req.query.width || '';
    let height = req.query.height || '';
    gtModel.getResource(contentCode).then(data=>{
    • 周少峰
      @zhoushaofeng commented 2016-11-30 13:19:31 UTC
      Master

      contentCode 做非空判断

  • gexuhui
    @gexuhui 2016-12-01 02:07:25 UTC

    Added 1 commit:

    • e99eae96 - 头部banner
  • gexuhui
    @gexuhui 2016-12-01 02:10:14 UTC

    Added 1 commit:

    • 4b2d5baf - 头部banner
  • gexuhui
    @gexuhui 2016-12-02 05:17:08 UTC

    Added 1 commit:

    • 82e58423 - 有货头部 个人中心下拉列表
  • 周少峰
    @zhoushaofeng 2016-12-02 05:26:18 UTC
    Master

    Status changed to closed

  • Please register or login to post a comment
5 of 445
Prev Next
周少峰
Assignee
周少峰 @zhoushaofeng
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: fe/yohobuy-node!5