Authored by 陈峰

Merge branch 'master' into 'gray'

Master



See merge request !347
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 {{/ is_solded}} 43 {{/ is_solded}}
44 </div> 44 </div>
45 <div class="good-detail-text {{#for_stu}} stu-good-detail {{/for_stu}}"> 45 <div class="good-detail-text {{#for_stu}} stu-good-detail {{/for_stu}}">
46 - <a href="{{url}}" target="_blank" title="{{#if productTitle}}{{productTitle}}{{^}}{{product_name}}{{/if}}" {{#if noFollow}} rel="nofollow"{{/if}}>{{{product_name}}}111</a> 46 + <a href="{{url}}" target="_blank" title="{{#if productTitle}}{{productTitle}}{{^}}{{product_name}}{{/if}}" {{#if noFollow}} rel="nofollow"{{/if}}>{{{product_name}}}</a>
47 <p class="brand"> 47 <p class="brand">
48 {{#if brand_name}} 48 {{#if brand_name}}
49 <a href="{{brandUrl}}" title="{{#if productTitle}}{{productTitle}}{{^}}{{product_name}}{{/if}}" {{#if @root.pageNoFollow}} rel="nofollow"{{/if}}>{{brand_name}}</a> 49 <a href="{{brandUrl}}" title="{{#if productTitle}}{{productTitle}}{{^}}{{product_name}}{{/if}}" {{#if @root.pageNoFollow}} rel="nofollow"{{/if}}>{{brand_name}}</a>