Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -154,7 +154,12 @@ define(['app/app'], function (app) {
             return $scope.validOffer.unitPrice && $scope.validOffer.minDay && $scope.validOffer.maxDay;
           }
 
-          $scope.seekCurrency = 'RMB';
+          $scope.seekCurrency = [];
+          $scope.currencyChange = function (cc) {
+            for (var i = 0; i < $scope.seekCurrency.length; i++) {
+              $scope.seekCurrency[i] = cc;
+            }
+          }
           // 保存报价
           $scope.saveOfferBtn = false;
           $scope.saveOffer = function () {
@@ -163,7 +168,7 @@ define(['app/app'], function (app) {
               $scope.inquiryItem.vendUserUU = $scope.userInfo.userUU;
               $scope.inquiryItem.qutoApp = "MALL";
               if (!$scope.inquiryItem.currency) {
-                $scope.inquiryItem.currency = $scope.seekCurrency;
+                $scope.inquiryItem.currency = $scope.seekCurrency[0];
               }
               seekPurchase.saveOffer($scope.inquiryItem, function (data) {
                 toaster.pop('success', '报价成功');

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

@@ -480,7 +480,7 @@
         top: 0;
         width: 32px;
         height: 28px;
-        background: url(/images/applyPurchase/arrow-down.png) no-repeat right center;
+        background: url('static/img/seekPurchase/arrow-down.png') no-repeat right center;
         border: none;
         border-right: 1px solid #bfbfbf;
         border-bottom-left-radius: 4px;
@@ -747,7 +747,7 @@
                     </div>
                     <div class="form-item form-right">
                         <span><i>*</i>单价<span ng-if="inquiryItem.currency" ng-bind="inquiryItem.currency == 'USD' ? '$' : '¥'"></span>：</span>
-                        <select ng-if="!inquiryItem.currency" ng-model="seekCurrency">
+                        <select ng-if="!inquiryItem.currency" ng-model="seekCurrency[$index]" ng-init="seekCurrency[$index] = 'RMB'" ng-change="currencyChange(seekCurrency[$index])">
                             <option value="RMB">¥</option>
                             <option value="USD">$</option>
                         </select>