Просмотр исходного кода

pc端已报价拒绝原因展示

hangb 7 лет назад
Родитель
Сommit
fdb2923b10

+ 1 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -543,6 +543,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       toaster.pop('refuse', '已拒绝报价');
                       $scope.setShowCurrentRefuseOffer(false);
                       $scope.currentRefuseOffer.agreed = 0;
+                      $scope.refusedreason =  choice
                       // $scope.seekPurchaseTableParams.reload();
                   }).error(function (response) {
                       toaster.pop('error', response ? response.message : '该单据可能已被操作,请刷新后重试');

+ 7 - 10
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -382,25 +382,19 @@
         position: absolute;
         top: 17px;
         right: -15px;
-        line-height: normal;
         width: 110px;
-        height: 0;
+        height: 24px;
+        line-height: 24px;
         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;
@@ -733,6 +727,9 @@
         border-radius: 2px;
         color: #fff;
     }
+    .seek-purchase .link-saler-box .content div a:first-child {
+        background: #b4b5b9 !important;
+    }
     .seek-purchase .link-saler-box .select-adder {
         display: inline-block;
         width: 127px;
@@ -1245,7 +1242,7 @@
                                                 </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>
+                                                <a class="say-price-history" ng-bind="refusedreason"></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">
@@ -1393,8 +1390,8 @@
                 </select>
             </p>
             <div>
-                <a ng-click="refuse(choice)">确定</a>
                 <a ng-click="setShowCurrentRefuseOffer(false)">关闭</a>
+                <a ng-click="refuse(choice)">确定</a>
             </div>
         </div>
     </div>

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

@@ -291,14 +291,14 @@
         right: 11px;
         line-height: normal;
         width: 198px;
-        height: 0;
+        height: 210px;
         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;
     }
@@ -373,7 +373,6 @@
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price:hover .say-price-history {
         opacity: 1;
-        height: 210px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate >img {
         position: absolute;