pc端已报价拒绝原因展示以及买卖家侧边栏顺序调整

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

@@ -299,8 +299,11 @@
         font-weight: normal;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td {
-        height: 48px;
-        line-height: 48px;
+        height: 68px;
+        line-height: 68px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate {
+        overflow: visible;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr {
         border: 1px solid #fce8df;
@@ -364,6 +367,41 @@
         font-size: 12px;
         border-radius: 2px;
     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > b.refused-show{
+        position: relative;
+        margin-left: 30px;
+        font-size: 12px;
+        color: #323232;
+        cursor: pointer;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > b.refused-show img{
+        margin-top: -2px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > b.refused-show .say-price-history{
+        display: inline-block;
+        position: absolute;
+        top: 17px;
+        right: -15px;
+        line-height: normal;
+        width: 110px;
+        height: 0;
+        background: #fff;
+        border: 1px solid #fab89a;
+        text-align: center;
+        font-size: 12px;
+        color: #000;
+        transition: height 1s;
+        -moz-transition: height 1s;
+        -webkit-transition: height 1s;
+        -o-transition: height 1s;
+        opacity: 0;
+        z-index: 1000;
+     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > b.refused-show:hover .say-price-history{
+        opacity: 1;
+        height: 24px;
+        line-height: 24px;
+    }
     td.operate .seek-btn {
         margin-left: 13px;
     }
@@ -1206,7 +1244,9 @@
                                                     </div>
                                                 </div>
                                             </div>
-
+                                            <b class="refused-show" ng-if="of.agreed == 0">拒绝原因 <img src="static/img/seekPurchase/refu.png" alt="">
+                                                <a class="say-price-history" ng-bind="of.refusereason"></a>
+                                            </b>
                                             <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
                                             <img ng-if="of.agreed == 0" src="static/img/seekPurchase/refused.png" alt="" class="ng-scope">
                                             <span class="seek-btn" ng-if="of.agreed != 0 && of.agreed != 1" ng-click="adopt(of)">采纳</span>
@@ -1347,7 +1387,7 @@
                 <select class="select-adder" ng-model="choice">
                     <option value="采购需求变更">采购需求变更</option>
                     <option value="价格过高">价格过高</option>
-                    <option value="需进一步了解原因">需进一步了解原因</option>
+                    <option value="需进一步了解信息">需进一步了解信息</option>
                     <option value="已选定合适供应商">已选定合适供应商</option>
                     <option value="交期过长">交期过长</option>
                 </select>

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -35,10 +35,10 @@
         <div class="user_left fl">
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
-                <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
+                <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
                 <div>
-                    <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>
-                    <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
+                    <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
+                    <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_invoice">发票管理</a></li>
                 </div>

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

@@ -316,6 +316,17 @@
         margin: 6px 0;
         text-align: left;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history p.refused-reason{
+        margin-top: 15px;
+        text-align: left;
+        font-size: 12px;
+        font-weight: normal;
+        color: #333;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history p.refused-reason span{
+        font-size: 12px;
+        color: #f62d37;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history > div {
         padding: 9px 12px;
     }
@@ -732,6 +743,7 @@
                                         <span title="{{seek.currency + re.price | currencyStr}}">{{seek.currency + re.price | currencyStr}}</span>
                                     </li>
                                 </ul>
+                                <p class="refused-reason" ng-if="seek.agreed == 0">拒绝原因：<span ng-bind="seek.refusereason"></span></p>
                             </div>
                         </div>
                     </div>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -44,10 +44,14 @@
 	<span  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></span>
 	<ul>
 		<div>
-		<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">订单中心</span></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
-			<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="!isPcbStore"><span  ui-sref="vendor_upload">产品导入</span></li>
-			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material" ng-bind="isPcbStore ? 'PCB产品管理' : '产品管理'">产品管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">商机管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">销售订单</span></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}">
+				<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
+				<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
+			</li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
+			<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">财务对账</span></li>
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
 				<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>
@@ -60,15 +64,11 @@
 				<!-- 我的店铺申述 store -->
 				<span  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 			</li>
-			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">商机管理</span></li>
-		<li ng-class="{'active' : active == 'vendor_logistics'}">
-			<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
-			<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
-		</li>
+			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material" ng-bind="isPcbStore ? 'PCB产品管理' : '产品管理'">产品管理</span></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
+			<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="!isPcbStore"><span  ui-sref="vendor_upload">产品导入</span></li>
 
-		<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
-		<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">结算中心</span></li>
 		<li ng-class="{'active' : active == 'vendor_brand_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
 		<li ng-class="{'active' : active == 'vendor_component_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_component_apply">器件申请</span></li>