spec

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

@@ -966,4 +966,69 @@ input[type="number"]{
 }
 select {
 	-moz-appearance: none;
+}
+
+
+/*买卖家求购*/
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
+	height: 100%;
+	padding-top: 15px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	width: 100%;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .date-bottom-item {
+	margin-top: 33px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content {
+	text-align: left;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box {
+	display: inline-block;
+	float: left;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large {
+	width: 520px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
+	width: 183px;
+	line-height: 19px;
+	word-break: break-all;
+	white-space: pre-line;
+	margin-right: 75px;
+}
+.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;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl .content {
+	display: inline-block;
+	width: 119px;
+	overflow: hidden;
+	vertical-align: middle;
+	height: 38px;
+}
+.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-small {
+	width: 128px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item {
+	color: #020202;
+	width: 128px;
+	margin-bottom: 16px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item span {
+	color: #666;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item:first-child span {
+	color: #999;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .remain {
+	margin-top: 24px;
+}
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row .operate-seek .row-wrap >span {
+	color: #4290f7;
+	cursor: pointer;
 }

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

@@ -232,6 +232,9 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row {
         border-bottom: 1px solid #dae5fd;
     }
+    .seek-purchase .seek-purchase-content >table >tbody.active {
+        border: 2px solid #f7a986;
+    }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row:hover {
         background: #f1f5ff;
     }
@@ -240,14 +243,6 @@
         text-align: center;
         height: 117px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
-        height: 100%;
-        padding-top: 15px;
-    }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
-        color: #4290f7;
-        cursor: pointer;
-    }
     .seek-purchase .red-text {
         color: #f62d37;
     }
@@ -803,26 +798,26 @@
                 <th width="96">操作</th>
             </tr>
             </thead>
-            <tbody ng-repeat="seek in seekListData.content">
+            <tbody ng-repeat="seek in seekListData.content" ng-class="{'active': seek.$status && (seek.$status == 1 || seek.$status == 2)}">
             <tr class="default-row">
                 <td>
                     <div class="row-wrap">
                         <div ng-bind="seek.date | date:'yyyy-MM-dd'"></div>
-                        <div ng-bind="seek.date | date:'HH:ss'"></div>
+                        <div class="date-bottom-item" ng-bind="seek.date | date:'HH:mm:ss'"></div>
                     </div>
                 </td>
                 <td>
-                    <div class="row-wrap">
+                    <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="seek.inbrand" class="fl item"><span>类目：</span><div class="content">{{seek.inbrand || '-'}}</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.cmpCode" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目：</span><div class="content">{{seek.prodTitle || '-'}}</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.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
                         </div>
                         <div class="il-box-small il-box">
-                            <div title="seek.cmpCode" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
-                            <div title="seek.cmpCode" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
-                            <div title="seek.cmpCode" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>
                     </div>
                 </td>
@@ -831,15 +826,15 @@
                         <span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>
                         <span ng-if="seek.agreed == 0 && seek.offerAmount > 0">已报价</span>
                         <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
-                        <div ng-if="seek.remainingTime && seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></div>
-                        <div ng-if="seek.remainingTime && seek.remainingTime <= 0"><span style="color: red;">已截止</span></div>
-                        <div ng-if="seek.remainingTime == null"><span>-</span></div>
+                        <div class="remain" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></div>
+                        <div class="remain" ng-if="seek.remainingTime <= 0"><span>已截止</span></div>
+                        <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>
                     </div>
                 </td>
                 <td class="operate-seek">
                     <div class="row-wrap">
                         <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
-                        <span ng-if="seek.goodsAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                        <span ng-if="seek.goodsAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">商城现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
                         <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                     </div>
                 </td>

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

@@ -156,7 +156,16 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td {
         font-size: 14px;
         text-align: center;
-        height: 80px;
+        height: 136px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
+        padding-top: 33px;
+    }
+    .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: 440px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -268,21 +277,19 @@
         border-radius: 2px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price {
-        margin: 17px 0 0 0;
         color: #39ae05;
         background: transparent;
         width: 100%;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price .say-price-history {
         position: absolute;
-        top: 64px;
+        top: 91px;
         right: 11px;
         line-height: normal;
         width: 198px;
         height: 0;
         background: #fff;
         border: 1px solid #fab89a;
-        z-index: 2;
         overflow: hidden;
         transition: height 1s;
         -moz-transition: height 1s; /* Firefox 4 */
@@ -628,38 +635,37 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
-                <th width="212">买家 / 发布时间</th>
-                <th width="211">型号 / 品牌</th>
-                <th width="84">封装</th>
-                <th width="95">生产日期</th>
-                <th width="86">采购数量</th>
-                <th width="94">单价预算</th>
-                <th width="115">剩余时间</th>
-                <th width="92">操作</th>
+                <th width="178">买家/发布时间</th>
+                <th width="658">产品信息</th>
+                <th width="134">剩余时间</th>
+                <th width="88">操作</th>
             </tr>
             </thead>
             <tbody ng-repeat="seek in $data track by $index" ng-class="{'active': seek.$active, 'hover': seek.$hover && (seek.status == 201 || seek.status == 202)}">
             <tr class="default-row" ng-mouseenter="seek.$hover = true;" ng-mouseleave="seek.$hover = false;" >
                 <td class="user-name">
-                    <p>
-                        <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
-                        <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
-                    </p>
-                    <p class="text-light">
-                        <span ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></span>
-                    </p>
-                </td>
-                <td style="text-align: left;">
-                    <p title="{{seek.cmpCode}}" class="text-bold" style="width: 205px;">
-                        <span ng-bind="seek.cmpCode || '-'"></span>
-                    </p>
-                    <p title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'" style="width: 205px;"></p>
+                    <div class="row-wrap">
+                        <div>
+                            <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
+                            <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
+                        </div>
+                        <div class="date-bottom-item" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></div>
+                    </div>
                 </td>
-                <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
-                <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
-                <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '--'"></div></td>
-                <td class="unit-price">
-                    <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
+                <td>
+                    <div class="row-wrap il-content">
+                        <div class="il-box-large il-box">
+                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目：</span><div class="content">{{seek.prodTitle || '-'}}</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.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                        </div>
+                        <div class="il-box-small il-box">
+                            <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                        </div>
+                    </div>
                 </td>
                 <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>

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

@@ -110,7 +110,16 @@
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td {
         font-size: 14px;
         text-align: center;
-        height: 80px;
+        height: 136px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap {
+        padding-top: 33px;
+    }
+    .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: 440px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time {
         position: relative;
@@ -211,7 +220,6 @@
         background: #cccbcb;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate span {
-        margin: 17px 0 0 0;
         color: #39ae05;
         display: block;
     }
@@ -652,42 +660,41 @@
         <table ng-table="seekPurchaseTableParams">
             <thead>
                 <tr>
-                    <th width="212">买家 / 发布时间</th>
-                    <th width="211">型号 / 品牌</th>
-                    <th width="84">封装</th>
-                    <th width="95">生产日期</th>
-                    <th width="86">采购数量</th>
-                    <th width="94">单价预算</th>
-                    <th width="115">剩余时间</th>
-                    <th width="92">操作</th>
+                    <th width="178">买家/发布时间</th>
+                    <th width="658">产品信息</th>
+                    <th width="134">剩余时间</th>
+                    <th width="88">操作</th>
                 </tr>
             </thead>
             <tbody ng-repeat="seek in seekListData track by $index" ng-class="{'active': seek.$active}">
                 <tr class="default-row">
                     <td class="user-name">
-                        <p>
-                            <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
-                            <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
-                        </p>
-                        <p class="text-light">
-                            <span ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></span>
-                        </p>
-                    </td>
-                    <td style="text-align: left;">
-                        <p title="{{seek.cmpCode}}" class="text-bold" style="width: 205px;">
-                            <span ng-bind="seek.cmpCode || '-'"></span>
-                        </p>
-                        <p title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'" style="width: 205px;"></p>
+                        <div class="row-wrap">
+                            <div>
+                                <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
+                                <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
+                            </div>
+                            <div class="date-bottom-item" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></div>
+                        </div>
                     </td>
-                    <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '-'"></div></td>
-                    <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '-'"></div></td>
-                    <td><div title="{{seek.needquantity}}" ng-bind="seek.needquantity || '-'"></div></td>
-                    <td class="unit-price">
-                        <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
+                    <td>
+                        <div class="row-wrap il-content">
+                            <div class="il-box-large il-box">
+                                <div title="{{seek.prodTitle}}" class="fl item"><span>类目：</span><div class="content">{{seek.prodTitle || '-'}}</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.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                            </div>
+                            <div class="il-box-small il-box">
+                                <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
+                                <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                                <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
+                            </div>
+                        </div>
                     </td>
                     <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
-                    <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
+                    <td class="left-time" ng-if="seek.remainingTime == null"><span>-</span></td>
                     <td class="operate">
                         <!--<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>