Merge branch 'yc-spec-0408' into dev-mysql

src/main/webapp/resources/css/common.css

@@ -1014,6 +1014,12 @@ select {
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl span {
 	float: left;
 }
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.size-middle {
+	width: 136px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.size-middle .content {
+	width: 86px;
+}
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small {
 	width: 128px;
 }
@@ -1026,10 +1032,11 @@ select {
 	margin-top: 24px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .en-name {
-	width: 190px;
+	width: 226px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+	padding: 0 10px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row .operate-seek .row-wrap >span {
 	color: #4290f7;

src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -422,6 +422,13 @@
     .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-edit a:last-child {
         background: #fd7748;
     }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
+        margin-right: 37px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
+        width: 414px;
+        margin-left: 50px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -541,9 +548,9 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
                         <div class="il-box-small il-box">

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

@@ -666,6 +666,13 @@
         margin: 18px 0 13px 0;
         border-radius: 2px;
     }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
+        margin-right: 37px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
+        width: 414px;
+        margin-left: 50px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -823,9 +830,9 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
                         <div class="il-box-small il-box">

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

@@ -169,7 +169,7 @@
         margin-right: 37px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 440px;
+        width: 400px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -659,9 +659,9 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目：</span><div class="content">{{(seek.prodTitle || '-')  | nullStrFilter}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-')  | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
                         <div class="il-box-small il-box">

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

@@ -123,7 +123,7 @@
         margin-right: 37px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
-        width: 440px;
+        width: 400px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -684,9 +684,9 @@
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                                <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                                 <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                                <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                                <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                                 <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                             </div>
                             <div class="il-box-small il-box">