Merge branch 'feature/fraud' into 'release/5.6'

防诈骗提示



See merge request !478

 <div class="order-page yoho-page">
 <div class="order-page yoho-page">
     {{# order}}
     {{# order}}
+        {{> fraud}}
         <ul id="order-nav" class="order-nav clearfix">
         <ul id="order-nav" class="order-nav clearfix">
             {{#each navs}}
             {{#each navs}}
                 <li class="tap-hightlight {{#if active}}active{{/if}}" data-type="{{typeId}}">
                 <li class="tap-hightlight {{#if active}}active{{/if}}" data-type="{{typeId}}">

 <div class="order-detail-page yoho-page">
 <div class="order-detail-page yoho-page">
     {{# orderDetail}}
     {{# orderDetail}}
+
+    {{> fraud}}
+
     <div id="order-detail" data-id="{{orderCode}}">
     <div id="order-detail" data-id="{{orderCode}}">
         {{#if isVirtual}}
         {{#if isVirtual}}
             <section class="block">
             <section class="block">

+<div class="fraud-tip">
+    <a class="iconfont" href="http://activity.yoho.cn/feature/45.html?title=防诈骗提醒">&#xe614;</a>
+    <span class="tip-title">关于防诈骗的重要提醒</span>
+    <span class="tip-content">有货不会以任何理由要求您退货退款，请您提高警惕。
+    </span>
+</div>

+.fraud-tip {
+    background: #fff;
+    display: block;
+    padding: 20px 30px;
+    margin-bottom: 30px;
+    border-bottom: 1px solid #e0e0e0;
+
+    .tip-title {
+        display: block;
+        height: 26px;
+        line-height: 26px;
+        color: #444;
+        font-size: 24px;
+        background-image: resolve("home/fraud-tip.png");
+        background-repeat: no-repeat;
+        background-size: auto 97%;
+        padding-left: 36px;
+    }
+
+    .tip-content {
+        display: inline-block;
+        margin-top: 16px;
+        color: #b0b0b0;
+        font-size: 22px;
+    }
+
+    .iconfont {
+        display: block;
+        color: #b0b0b0;
+        float: right;
+        height: 70px;
+        width: 30px;
+        line-height: 70px;
+        text-align: right;
+    }
+}

@@ -220,6 +220,7 @@
 .order-nav {
 .order-nav {
     border-bottom: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
     background: #fff;
     background: #fff;
+    border-top: 1px solid #e0e0e0;
 
 
     a {
     a {
         display: block;
         display: block;

 @import "layout/swiper";
 @import "layout/swiper";
 @import "order";
 @import "order";
 @import "order-detail";
 @import "order-detail";
+@import "fraud";

 @import "order";
 @import "order";
+@import "fraud";
 @import "layout/swiper";
 @import "layout/swiper";