• This project
    • Loading...
  • Sign in

fe / yohobuywap-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !640 opened 2017-06-07 07:38:47 UTC by李靖@lijing_yoho

Feature/similar

Edited 2017-06-08 01:45:57 UTC
Request to merge feature/similar into release/5.8
×

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/similar origin/feature/similar

Step 2. Review the changes locally

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

git checkout release/5.8
git merge --no-ff feature/similar

Step 4. Push the result of the merge to GitLab

git push origin release/5.8

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

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

Merged by 毕凯 2017-06-08 01:45:57 UTC

The changes were merged into release/5.8. The source branch has been removed.

  • Discussion 5
  • Commits 4
  • Changes 20
  • Avatar
    郭成尧
    @chengyao started a discussion on an outdated diff 2017-06-07 07:44:59 UTC
    Toggle discussion
    apps/product/models/similar.js 0 → 100644
    'use strict';
    const utils = '../../../utils';
    const _ = require('lodash');
    const productProcess = require(`${utils}/product-process`);
    module.exports = class extends global.yoho.BaseModel {
    • 郭成尧
      @chengyao commented 2017-06-07 07:44:59 UTC

      感觉起个类名更好些

  • Avatar
    郭成尧
    @chengyao started a discussion on an outdated diff 2017-06-07 07:47:31 UTC
    Toggle discussion
    public/js/common.js
    $('.homebuttom').toggleClass('hide');
    });
     
    // 商品列表找相似按钮
    $('*').on('touchstart', '.similar-btn', function() {
    • 郭成尧
      @chengyao commented 2017-06-07 07:47:31 UTC

      整个文档中找对象

  • Avatar
    毕凯
    @bikai started a discussion on an outdated diff 2017-06-07 07:49:28 UTC
    Toggle discussion
    apps/guang/views/partial/good.hbs
    {{# is_solded}}
    <p class="out-tag">已售罄</p>
    {{/ is_solded}}
    {{#if similar}}
    <div class="similar-c">
    <div class="bg"></div>
    <a href="//m.yohobuy.com/product/similar?skn={{id}}">找相似</a>
    • 毕凯
      @bikai commented 2017-06-07 07:49:28 UTC

      相对路径

  • Avatar
    毕凯
    @bikai started a discussion on an outdated diff 2017-06-07 07:50:31 UTC
    Toggle discussion
    apps/product/models/search.js
    const getFilterData = (params) => {
    return _searchGoods(params).then((result) => {
    if (result && result.code === 200) {
    return productProcess.processFilter(result.data.filter || []);
    return productProcess.processFilter(result.data.filter || [], {
    showSimilar: true
    • 毕凯
      @bikai commented 2017-06-07 07:50:31 UTC

      processFilter 是否需要?

  • Avatar
    毕凯
    @bikai started a discussion on an outdated diff 2017-06-07 07:51:29 UTC
    Toggle discussion
    doraemon/views/partial/product/recommend-goods.hbs
    <div class="no-storage-img"></div>
    </div>
    {{/ noStorage}} --}}
    {{#if similar}}
    <div class="similar-c">
    <div class="bg"></div>
    <a href="//m.yohobuy.com/product/similar?skn={{product_skn}}">找相似</a>
    • 毕凯
      @bikai commented 2017-06-07 07:51:29 UTC

      写成段落

  • 李靖
    @lijing_yoho 2017-06-07 09:05:03 UTC

    Added 1 commit:

    • 17cfaa9e - 模版化,按钮优化等
  • 李靖
    @lijing_yoho 2017-06-07 09:38:38 UTC

    Added 1 commit:

    • 51c8e5ef - 相对地址,模版兼容skn
  • 毕凯
    @bikai 2017-06-08 01:45:57 UTC

    mentioned in commit c6f1de17

  • 毕凯
    @bikai 2017-06-08 01:45:57 UTC

    Status changed to merged

  • Please register or login to post a comment
640 of 1800
Prev Next
毕凯
Assignee
毕凯 @bikai
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!640
×

Revert this merge request

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

Cherry-pick this merge request

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