yangc 8 years ago
parent
commit
ea642ee455

+ 11 - 11
src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -7,23 +7,23 @@ define([ 'ngResource' ], function() {
         method: 'GET'
       },
       getSeekPushGoodsPageInfo: {
-        url: 'http://192.168.253.192:8080/inquiry/public',
+        url: 'http://10.1.51.88:8080/inquiry/public',
         method: 'GET',
       },
       saveOneSeekPurchase: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/save',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/save',
         method: 'POST'
       },
       saveOffer: {
-        url: 'http://192.168.253.192:8080/inquiry/sale/item/save',
+        url: 'http://10.1.51.88:8080/inquiry/sale/item/save',
         method: 'POST'
       },
       getUserSeekPageInfo: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/list',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/list',
         method: 'GET'
       },
       getUserSeekPageInfoByStatus: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/quotations',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/quotations',
         method: 'GET'
       },
       getMallGoodsList: {
@@ -32,23 +32,23 @@ define([ 'ngResource' ], function() {
         isArray: true
       },
       getSeekPurchaseOfferPageInfo: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/product/detail',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/product/detail',
         method: 'GET'
       },
       getMyOfferPageInfo: {
-        url: 'http://192.168.253.192:8080/inquiry/public/quotation/list',
+        url: 'http://10.1.51.88:8080/inquiry/public/quotation/list',
         method: 'GET'
       },
       updateSeekPurchaseStatus: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/decide',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/decide',
         method: 'POST'
       },
       getSeekPurchaseBomListPage: {
-        url: 'http://192.168.253.192:8080/inquiry/buyer/inquiryList',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/inquiryList',
         method: 'GET'
       },
       findOneBom: {
-          url: 'http://192.168.253.192:8080/inquiry/public/findInquiryById',
+          url: 'http://10.1.51.88:8080/inquiry/public/findInquiryById',
           method: 'GET'
       },
       saveBomName: {
@@ -56,7 +56,7 @@ define([ 'ngResource' ], function() {
           method: 'PUT'
       },
       getBomDetail: {
-          url: 'http://192.168.253.192:8080/inquiry/sale/publicInquiry/detail',
+          url: 'http://10.1.51.88:8080/inquiry/sale/publicInquiry/detail',
           method: 'GET'
       }
 		});

+ 1 - 1
src/main/webapp/resources/js/usercenter/app.js

@@ -736,7 +736,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 	// 币别filter
 	app.filter('currencyStr', function () {
 		return function (str) {
-      return typeof str == 'string' && str != 'RMB' && str != 'USD' ? str.startsWith('RMB') ? '' + str.substring(3, str.length) : '$' + str.substring(3, str.length) : '-';
+      return typeof str == 'string' && str != 'RMB' && str != 'USD' ? str.startsWith('RMB') ? '¥' + str.substring(3, str.length) : '$' + str.substring(3, str.length) : '-';
 		}
 	});
 

+ 1 - 1
src/main/webapp/resources/js/vendor/app.js

@@ -1046,7 +1046,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 
 	app.filter('currencyStr', function () {
 		return function (str) {
-			return typeof str == 'string' && str != 'RMB' && str != 'USD' ? str.startsWith('RMB') ? '' + str.substring(3, str.length) : '$' + str.substring(3, str.length) : '-';
+			return typeof str == 'string' && str != 'RMB' && str != 'USD' ? str.startsWith('RMB') ? '¥' + str.substring(3, str.length) : '$' + str.substring(3, str.length) : '-';
 		}
 	});
 

+ 33 - 3
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -389,6 +389,32 @@
         overflow-y: auto;
         overflow-x: hidden;
     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td .seek-list table tbody tr td.seek-replies {
+        position: relative;
+        overflow: unset;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td .seek-list table tbody tr td.seek-replies .red-text span {
+        display: inline-block;
+        width: 49%;
+        text-align: center;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td .seek-list table tbody tr td.seek-replies ul {
+        /*position: absolute;*/
+        margin: 0 auto;
+       /* border-radius: 2px;
+        background: #fff;
+        top: 0;
+        left: 33px;*/
+        width: 135px;
+       /* border: 1px solid #fce8df;*/
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row td .seek-list table tbody tr td.seek-replies ul li {
+        line-height: normal;
+        font-size: 14px;
+    }
     /*提示框样式 start*/
     /*.seek-purchase .com-del-box {
         display: none;
@@ -436,7 +462,7 @@
         table-layout: fixed;
     }
     .seek-purchase table tbody tr td {
-        overflow: hidden;
+        overflow-x: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
@@ -870,9 +896,13 @@
                                     <tr ng-repeat="of in offer">
                                         <td width="173" ng-bind="of.userName"></td>
                                         <td width="186" class="red-text" ng-bind="of.leadtime">4-6</td>
-                                        <td width="186">
+                                        <td width="186" class="seek-replies">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
-                                            <ul>
+                                            <div class="red-text">
+                                                <!--<span>{{of.replies[0].lapQty}}</span>
+                                                <span>{{of.currency + of.replies[0].price | currencyStr}}</span>-->
+                                            </div>
+                                            <ul class="red-text">
                                               <li ng-repeat="re in of.replies">
                                                   <span ng-bind="re.lapQty">1+</span>
                                                   <span title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>