Merge branch 'gray' into 'master'

Gray



See merge request !246

@@ -210,7 +210,7 @@
                                 已成功使用<em class="red num">1</em>张优惠券，<em class="red price"></em>
                                 已成功使用<em class="red num">1</em>张优惠券，<em class="red price"></em>
                                 <b class="cancel-use-ticket">取消使用</b>
                                 <b class="cancel-use-ticket">取消使用</b>
                             </span>
                             </span>
-                            <p class="tip-box red right">说明：普通优惠券可以与运费券同时使用</p>
+                            <p class="tip-box red right"></p>
                         </div>
                         </div>
                         <div class="coupon-list-wrap"></div>
                         <div class="coupon-list-wrap"></div>
                     </dd>
                     </dd>

@@ -6,7 +6,7 @@
         {{#if waiting}}
         {{#if waiting}}
             <div class="member-progress block">
             <div class="member-progress block">
                 <h2 class="title" style="background-image: url(//img12.static.yhbimg.com/sns/2018/03/26/14/02238cd5d0ba9b5d51a68f59179b5459ba.jpg)"></h2>
                 <h2 class="title" style="background-image: url(//img12.static.yhbimg.com/sns/2018/03/26/14/02238cd5d0ba9b5d51a68f59179b5459ba.jpg)"></h2>
-                <img src="//img12.static.yhbimg.com/sns/2018/03/27/15/021c89dd21f3627872199c35c4fc6f87fe.jpg" style="width: 100%">
+                <img src="//img12.static.yhbimg.com/sns/2018/03/29/14/02b59a8bfa190cb274c20fc40c5f4ed466.jpg" style="width: 100%">
             </div><!--member-progress-->
             </div><!--member-progress-->
         {{^}}
         {{^}}
             <div class="member-progress block">
             <div class="member-progress block">