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
The changes were merged into release/5.8. The source branch has been removed.
'use strict'; | ||
const utils = '../../../utils'; | ||
const _ = require('lodash'); | ||
const productProcess = require(`${utils}/product-process`); | ||
module.exports = class extends global.yoho.BaseModel { | ||
|
$('.homebuttom').toggleClass('hide'); | ||
}); | ||
// 商品列表找相似按钮 | ||
$('*').on('touchstart', '.similar-btn', function() { | ||
|
{{# 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> | ||
|
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 | ||
|
<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> | ||
|
Status changed to merged