Merge branch 'hotfix/yc-0604' into feature/201812-wangcz

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -976,7 +976,7 @@
 <style>
 	.com-out-box{
 		position: fixed;
-		z-index: 2;
+		z-index: 999;
 		height: 150px;
 		opacity: 1;
 		background-color: white;

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -201,12 +201,13 @@
         color: #f62d37;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate {
+        position: relative;
         font-size: 12px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate a{
         color: #4290f7;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate div {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate > div {
         width: 64px;
         height: 24px;
         line-height: 24px;
@@ -220,7 +221,7 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate div.disable{
         background: #cccbcb;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate span {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate > span {
         color: #39ae05;
         display: block;
     }
@@ -611,6 +612,90 @@
         border: 1px solid #4290f7;
         color: #333;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price {
+        color: #39ae05;
+        background: transparent;
+        width: 100%;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history {
+        position: absolute;
+        top: 91px;
+        right: 11px;
+        line-height: normal;
+        width: 198px;
+        height: 0;
+        background: #fff;
+        border: 1px solid #fab89a;
+        overflow: hidden;
+        transition: height 1s;
+        -moz-transition: height 1s; /* Firefox 4 */
+        -webkit-transition: height 1s; /* Safari 和 Chrome */
+        -o-transition: height 1s; /* Opera */
+        opacity: 0;
+        z-index: 10;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history p {
+        color: #020202;
+        font-weight: bold;
+        margin: 0;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history p.price-title {
+        background: #fee6db;
+        height: 28px;
+        line-height: 28px;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history p.price-level {
+        margin: 6px 0;
+        text-align: left;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div {
+        padding: 9px 12px;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div {
+        display: inline-block;
+        text-align: left;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div:nth-child(1) {
+        /*float: left;*/
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div:nth-child(2) {
+        margin-left: 32px;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div span {
+        color: #020202;
+        margin: 0;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div span.red-text {
+        color: #f62d37;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div > div.pre-line {
+        display: block;
+        padding: 13px 0;
+        border-bottom: 1px dashed #fee6db;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div ul li {
+        color: #333;
+        height: 22px;
+        line-height: 22px;
+        padding: 0 6px;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div ul li:nth-child(odd) {
+        background: #f6f5f4;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div ul li span {
+        color: #333;
+        display: inline-block;
+        text-align: left;
+        width: 50%;
+        margin: 0;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div ul li:last-child span {
+        color: #4290f7;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price:hover .say-price-history {
+        opacity: 1;
+        height: 210px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -751,7 +836,30 @@
                         <!--<a ng-click="setLinkBoxIndex($index)">联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>-->
                         <div ng-if="!seek.newId && userInfo.enterprise.uu != seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-click="setSeekActive(seek, true, index)">我要报价</div>
                         <div class="disable" ng-if="userInfo.enterprise.uu == seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" title="此为贵公司的求购" ng-disabled="true">我要报价</div>
-                        <span ng-if="seek.quoted == 1 || seek.newId">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
+                        <!--<span ng-if="seek.quoted == 1 || seek.newId">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>-->
+                        <div class="is-say-price" ng-if="seek.quoted == 1 || seek.newId">已报价 <img src="static/img/seekPurchase/check.png" alt="">
+                            <div class="say-price-history">
+                                <p class="price-title">历史报价</p>
+                                <div>
+                                    <div>
+                                        <span>交期：</span><span class="red-text" ng-bind="seek.leadtime + '天'">6 天</span>
+                                    </div>
+                                    <!--<div>-->
+                                    <!--<span>附件：</span><a href="">下载</a>-->
+                                    <!--</div>-->
+                                    <!--<div class="pre-line">-->
+                                    <!--<span>：</span>2016-05-21-->
+                                    <!--</div>-->
+                                    <p class="price-level">价格梯度</p>
+                                    <ul>
+                                        <li ng-repeat="re in seek.replies">
+                                            <span ng-bind="re.lapQty + '+'">1333+</span>
+                                            <span title="{{seek.currency + re.price | currencyStr}}">{{seek.currency + re.price | currencyStr}}</span>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
                         <!--<img ng-if="seek.quoted == 1" src="static/img/seekPurchase/recieved.png" alt="">-->
                     </td>
                 </tr>