Merge remote-tracking branch 'origin/liusw-seekpurchase-v1.0.12.12' into liusw-seekpurchase-v1.0.12.12

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

@@ -12,7 +12,7 @@
         width: 646px;
         height: 198px;
         padding: 0 40px 0 0;
-        margin: 0 0 59px 0;
+        margin: 0;
         background: url('static/img/seekPurchase/user-publish-bg.png') no-repeat;
     }
     .seek-purchase .seek-purchase-content .publish-purchase .fl p {
@@ -75,10 +75,23 @@
         border-radius: 3px;
         margin: 0 auto 14px;
     }
+    .seek-purchase .seek-purchase-content .empty-line {
+        height: 20px;
+        background: #f7f7f7;
+        float: left;
+        width: 1026px;
+        margin: 20px 0;
+    }
     /*搜索时间筛选 start*/
     .seek-purchase .seek-purchase-content .screen {
         font-size: 14px;
         line-height: 32px;
+        clear: both;
+        background: #f5f8fe;
+        height: 40px;
+        margin-bottom: 15px;
+        padding-top: 4px;
+        padding-right: 13px;
     }
     .seek-purchase .seek-purchase-content .screen .fl {
         margin-left: 14px;
@@ -91,6 +104,7 @@
         border-radius: 2px;
         margin-right: 11px;
         padding-left: 10px;
+         box-shadow: none;
     }
     .seek-purchase .seek-purchase-content .screen .sreach >span {
         float: left;
@@ -169,17 +183,23 @@
         font-size: 14px;
     }
     .seek-purchase .seek-purchase-content >table >thead >tr th select {
-        width: 63px;
+        color: #666;
+        padding: 0 5px;
         height: 24px;
-        color: #333;
-        padding-left: 6px;
-        font-size: 14px;
-        background: url('static/img/seekPurchase/select-arrow-down.png') no-repeat #fff 49px 10px !important;
+        width: 70px;
+        opacity: 1;
+        border: #fff 1px solid;
+        border-radius: 2px;
+        position: relative;
+        left: 10px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody {
+        border-right: 1px solid #dae5fd;
+        border-left: 1px solid #dae5fd;
+        border-bottom: 1px solid #dae5fd;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row {
         border-bottom: 1px solid #dae5fd;
-        border-left: 1px solid #dae5fd;
-        border-right: 1px solid #dae5fd;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row:hover {
         background: #f1f5ff;
@@ -187,7 +207,7 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td {
         font-size: 14px;
         text-align: center;
-        height: 80px;
+        height: 70px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
@@ -290,8 +310,8 @@
         color: #f91d06;
         font-weight: bold;
     }
-    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td {
-        padding: 0 12px;
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row > td {
+        padding: 0 12px 15px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td .switch-line {
         display: flex;
@@ -418,7 +438,7 @@
                 </div>
                 <div class="form-block single-price">
                     <span>单价预算</span>
-                    <select  ng-model="applyObj.currency">
+                    <select ng-model="applyObj.currency">
                         <option value="RMB">￥</option>
                         <option value="USD">$</option>
                     </select>
@@ -435,8 +455,9 @@
                 <a href="javascript:void(0)" ng-click="release()">发布求购</a>
             </div>
         </div>
+        <div class="empty-line"></div>
         <!--搜索时间筛选-->
-        <div class="screen" style="clear: both;background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
+        <div class="screen">
             <div class="fl">
                 <label class="com-check-box">
                     <input type="checkbox" id="1" ng-model="isMallGoods" ng-change="onSearch()">
@@ -495,9 +516,9 @@
                 <th width="78">单价预算</th>
                 <th width="70">封装</th>
                 <th width="99">生产日期</th>
-                <th width="140">截止时间</th>
+                <th width="123">截止时间</th>
                 <th width="81">
-                    <select class="select-adder" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
+                    <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
                         <option value="0">全部</option>
                         <option value="200">待报价</option>
                         <option value="201">已报价</option>
@@ -518,7 +539,7 @@
                 </td>
                 <td ng-bind="seek.encapsulation || '-'">盘装</td>
                 <td ng-bind="seek.produceDate || '-'">2012-12-12</td>
-                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)">5</span>&nbsp;小时</td>
+                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" class="red-text"></span>&nbsp;天&nbsp;<span ng-bind="getHours(seek.remainingTime)" class="red-text">5</span>&nbsp;小时</td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
                 <td ng-switch="seek.status">
                     <span ng-switch-when="200" style="color:red;">待报价</span>
@@ -548,7 +569,7 @@
                                     <th width="104">单价</th>
                                     <th width="137">生产日期</th>
                                     <th width="111">库存</th>
-                                    <th width="144">购买数量</th>
+                                    <th width="142">购买数量</th>
                                     <th width="186">操作</th>
                                 </tr>
                                 </thead>
@@ -599,7 +620,7 @@
                                     <th width="173">卖家</th>
                                     <th width="186">交期(天)</th>
                                     <th width="186">单价</th>
-                                    <th width="212">生产日期</th>
+                                    <th width="195">生产日期</th>
                                     <th width="221">操作</th>
                                 </tr>
                                 </thead>
@@ -611,7 +632,7 @@
                                         <td width="173" ng-bind="(of.enterprise).enName"></td>
                                         <td width="186" class="red-text" ng-bind="of.minDay+'-'+of.maxDay">4-6</td>
                                         <td width="186"><span>{{of.currency + of.unitPrice | currencyStr}}</span></td>
-                                        <td width="212" ng-bind="of.produceDate || '-'"></td>
+                                        <td width="195" ng-bind="of.produceDate || '-'"></td>
                                         <td width="221" class="operate">
                                             <a href = "of.user.usertTel">联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
                                             <span ng-if="seek.status != 202" ng-click="setShowUseFlag(true, of)">采纳报价</span>

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

@@ -66,10 +66,11 @@
         display: inline-block;
         border-radius: 2px;
         margin-right: 11px;
+        box-shadow: none;
     }
     .seek-purchase .seek-purchase-content .screen .fl select:last-child {
-        width: 88px;
-        padding-left: 6px;
+        width: 85px;
+        padding: 0 0 0 6px;
     }
     .seek-purchase .seek-purchase-content .screen .sreach >span {
         float: left;
@@ -279,6 +280,10 @@
         height: 50px;
         line-height: 50px;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div input,
+    .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div select {
+        border-radius: 2px;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(1) {
         width: 189px;
         background: #adcbfc;

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

@@ -20,6 +20,7 @@
         display: inline-block;
         border-radius: 2px;
         margin-right: 11px;
+        box-shadow: none;
     }
     .seek-purchase .seek-purchase-content .screen .fl select:last-child {
         width: 88px;
@@ -259,7 +260,7 @@
     }
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) div + input,
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) select + input {
-        padding-left: 34px;
+        padding: 0 0 0 34px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(3) {
         margin-right: 52px;