Browse Source

Merge remote-tracking branch 'origin/release-201824-wangcz' into release-201824-wangcz

wangdy 7 years ago
parent
commit
addbe0272c

+ 0 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -16,7 +16,6 @@ define(['app/app'], function(app) {
         $scope.param = {};
 
         $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
-        console.log($stateParams, '$stateParams')
 
         document.title = $stateParams.tab == 'accountTab' ? '收款账户' : '应收对账' + '-优软商城';
 

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

@@ -720,12 +720,12 @@
                 <label class="com-check-radio">
                     <input type="radio" id="forSeller" name="method" ng-click="setFilters('vendorType', 'all')" ng-checked="vendorType == 'all'">
                     <label for="forSeller"></label>
-                    公司商机
+                    公司报价
                 </label>
                 <label class="com-check-radio">
                     <input type="radio" id="forPlatform" name="method" ng-click="setFilters('vendorType', 'self')" ng-checked="vendorType == 'self'">
                     <label for="forPlatform"></label>
-                    我的商机
+                    我的报价
                 </label>
             </div>
             <div>