@@ -5598,7 +5598,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
// 顶部滚动消息
$http({
method: 'get',
- url: url + '/inquiry/public/messageList',
+ url: $scope.url + '/inquiry/public/messageList',
params: {enuu: $scope.currentEn.uu, size: 10},
dataType: 'json'
}).success(function(data) {
@@ -766,6 +766,6 @@ input[type="radio"], input[type="checkbox"] {
</tbody>
</table>
<div class="footer">
- <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || !isOverDue(inquiryItem.inquiry.endDate) || inquiryItem.overdue == 1" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期,将无法进入报价">我要报价</button>
+ <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || inquiryItem.remainingTime < 0 || inquiryItem.overdue == 1" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期,将无法进入报价">我要报价</button>
</div>
@@ -408,7 +408,7 @@
<td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| datespan"></td>
<td>
<a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.quoted != 1 && inquiryItem.overdue != 1">我要报价</a>
- <a class="offer" ng-if="inquiryItem.remainingTime <= 0 && inquiryItem.quoted != 1) || inquiryItem.overdue == 1" ng-click="">已结束</a>
+ <a class="offer" ng-if="(inquiryItem.remainingTime <= 0 && inquiryItem.quoted != 1) || inquiryItem.overdue == 1" ng-click="">已结束</a>
<a class="offer" ng-if="inquiryItem.quoted == 1" ng-click="">已报价</a>
</td>
</tr>