Browse Source

Merge remote-tracking branch 'origin/feature-wangcz-201814' into feature-wangcz-201814

shenjj 7 years ago
parent
commit
904a74c209

BIN
src/main/resources/jxls-tpl/trade/releaseByBatch-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releasebyBatch-usd.xls


+ 6 - 5
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -291,14 +291,14 @@
         right: 11px;
         line-height: normal;
         width: 198px;
-        height: 210px;
+        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 *!*/
+        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;
     }
@@ -372,6 +372,7 @@
         color: #4290f7;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price:hover .say-price-history {
+        height: 210px;
         opacity: 1;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate >img {