Merge branch 'feature/yohood2018' into release/0718

@@ -167,8 +167,10 @@
                     <div class="content">
                         <span>付款方式：{{payMode}}</span>
                     <br />
+                    {{#if phone}}
                     <br />
                         <span>电话号码：{{phone}}</span>
+                    {{/if}}
                     </div>
                 </div>
                 {{/ virtualPayMode}}

@@ -128,10 +128,10 @@
                 <div class="line"></div>
 
                 {{#if virtualGoods}}
-                {{!-- 电子门票按钮 --}}
-                    {{#if isVirtualBtn}}
+                    {{!-- 电子门票按钮 --}}
+                    {{!-- {{#if isVirtualBtn}}
                         <span id="buy-ticket" class="buy-ticket buy-now item-buy{{#if dis}} dis{{/if}}" data-base="{{buyNowBase}}">立即购买</span>
-                    {{/if}}
+                    {{/if}} --}}
                 {{else}}
                 {{!-- 各颜色下所有尺码均售罄则只显示售罄按钮 --}}
                     {{#unless soldOut}}
@@ -151,9 +151,7 @@
                             <span id="buy-now" class="item-buy buy-now{{#if dis}} dis{{/if}}"
                                   data-base="{{buyNowBase}}">立即购买</span>
                         {{/ buyNow}}
-
                     {{/unless}}
-
                 {{/if}}
 
                 <span id="sold-out" class="buy-btn dis{{#unless soldOut}} hide{{/unless}}">
@@ -163,10 +161,11 @@
                 <span id="enable-notify" class="buy-btn hide"> <i class="iconfont">
                     &#xe6e2;</i> <span>到货通知</span></span>
 
-
-                <span id="collect-product" class="{{#if isCollect}}coled {{/if}}collect-product">
-                     <i class="iconfont">&#xe641;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}}
-                </span>
+                {{#unless isVirtualBtn}}
+                    <span id="collect-product" class="{{#if isCollect}}coled {{/if}}collect-product">
+                         <i class="iconfont">&#xe641;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}}
+                    </span>
+                {{/unless}}
 
                 <span id="code-buy" class="code-buy" skn="{{skn}}">
                      <div class="code-box">