Browse Source

需求调整

yangc 8 years ago
parent
commit
2c65bafe1f

+ 2 - 2
src/main/webapp/resources/css/common.css

@@ -999,7 +999,7 @@ select {
 	line-height: 19px;
 	word-break: break-all;
 	white-space: pre-line;
-	margin-right: 75px;
+	margin-right: 13px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.bottom {
 	margin-top: 11px;
@@ -1015,7 +1015,7 @@ select {
 	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;
+	width: 200px;
 }
 .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;

+ 2 - 5
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -149,7 +149,7 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
         cursor: pointer;
-        margin-left: 12px;
+        margin-left: 37px;
         text-align: left;
     }
     .seek-purchase .red-text {
@@ -433,9 +433,6 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
         height: 106px;
     }
-    .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;
@@ -663,7 +660,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><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 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>

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

@@ -71,7 +71,7 @@
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block ul.similar-list {
         position: absolute;
         top: 23px;
-        left: 68px;
+        left: 103px;
         background: #fff;
         border: 1px solid #b5b5b5;
         z-index: 1;
@@ -691,9 +691,9 @@
         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 {
+   /* .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;
@@ -926,7 +926,7 @@
                     <input type="text" class="form-group" ng-model="applyObj.produceDate" ng-change="onProduceDateChange()">
                 </div>-->
                 <div class="form-block">
-                    <span>类目</span>
+                    <span>类目(产品名称)</span>
                     <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-change="onProdTitleInput()">
                 </div>
                 <div class="form-block">
@@ -1010,7 +1010,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><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 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>

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

@@ -166,7 +166,7 @@
         padding-left: 30px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-        margin-right: 37px;
+        margin-right: 8px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
         width: 400px;
@@ -682,7 +682,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><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 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>

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

@@ -120,7 +120,7 @@
         padding-left: 30px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-        margin-right: 25px;
+        margin-right: 8px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
         width: 400px;
@@ -722,7 +722,7 @@
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><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 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>
@@ -742,7 +742,7 @@
                         <!--<a ng-click="setLinkBoxIndex($index)">联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>-->
                         <div ng-if="userInfo.enterprise.uu != seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-click="setSeekActive(seek, true, index)">我要报价</div>
                         <div class="disable" ng-if="userInfo.enterprise.uu == seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" title="此为贵公司的求购" ng-disabled="true">我要报价</div>
-                        <span ng-if="seek.quoted == 1">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
+                        <span ng-if="seek.quoted == 1 || seek.newId">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
                         <!--<img ng-if="seek.quoted == 1" src="static/img/seekPurchase/recieved.png" alt="">-->
                     </td>
                 </tr>