Merge branch 'dev-mysql' into feature_release-tomysql

# Conflicts:
#	src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

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

@@ -994,7 +994,7 @@ select {
 }
 
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl {
-	width: 183px;
+	width: 260px;
 	line-height: 19px;
 	word-break: break-all;
 	white-space: pre-line;
@@ -1012,6 +1012,8 @@ 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;
+	width:110px;
+	text-align: right;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-large .fl.size-middle {
 	width: 200px;
@@ -1024,7 +1026,7 @@ select {
 }*/
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item {
 	color: #f71026;
-	width: 200px;
+	width: 110px;
 	line-height: 100px;
 	text-align: center;
 }

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

@@ -631,9 +631,9 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="220">类目/品牌</th>
-                <th width="220">型号/规格</th>
-                <th width="200">采购数量(PCS)</th>
+                <th width="260">类目/品牌</th>
+                <th width="260">型号/规格</th>
+                <th width="110">采购数量(PCS)</th>
                 <th width="120">截止时间</th>
                 <th width="136">状态</th>
                     <!--
@@ -662,7 +662,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.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                         </div>
                     </div>

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

@@ -11,7 +11,7 @@
     .seek-purchase .seek-purchase-content .publish-purchase .fl {
         width: 1000px;
         height: 198px;
-        padding: 0 40px 0 0;
+        padding: 0 30px;
         border: 2px dashed #fd7748;
         margin: 0 auto;
         float: none;
@@ -994,9 +994,9 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="220">类目/品牌</th>
-                <th width="220">型号/规格</th>
-                <th width="200">采购数量(PCS)</th>
+                <th width="260">类目/品牌</th>
+                <th width="260">型号/规格</th>
+                <th width="110">采购数量(PCS)</th>
                 <th width="120">状态/截止时间</th>
                 <th width="136">操作</th>
             </tr>
@@ -1012,7 +1012,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.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                         </div>
                     </div>
@@ -1070,7 +1070,7 @@
                 </td>
             </tr>
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2">
-                <td colspan="4">
+                <td colspan="6">
                     <div>
                         <div class="switch-line">
                             <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount"></span>）</a>

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

@@ -663,10 +663,10 @@
             <thead>
             <tr>
                 <th width="178">买家/发布时间</th>
-                <th width="200">类目/品牌</th>
-                <th width="200">型号/规格</th>
-                <th width="200">采购数量(PCS)</th>
-                <th width="134">剩余时间</th>
+                <th width="245">类目/品牌</th>
+                <th width="245">型号/规格</th>
+                <th width="110">采购数量(PCS)</th>
+                <th width="124">剩余时间</th>
                 <th width="88">操作</th>
             </tr>
             </thead>
@@ -684,7 +684,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.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                         </div>
                     </div>

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

@@ -83,6 +83,9 @@
     .seek-purchase .seek-purchase-content .screen .sreach .date input.form-control{
         padding: 6px 6px;
     }
+    .seek-purchase .seek-purchase-content >table {
+        width: 1000px;
+    }
     /*搜索时间筛选 end*/
     .seek-purchase .seek-purchase-content >table thead {
         background: #89aefa;
@@ -697,10 +700,10 @@
             <thead>
                 <tr>
                     <th width="178">买家/发布时间</th>
-                    <th width="200">类目/品牌</th>
-                    <th width="200">型号/规格</th>
-                    <th width="200">采购数量(PCS)</th>
-                    <th width="134">剩余时间</th>
+                    <th width="245">类目/品牌</th>
+                    <th width="245">型号/规格</th>
+                    <th width="110">采购数量(PCS)</th>
+                    <th width="124">剩余时间</th>
                     <th width="88">操作</th>
                 </tr>
             </thead>
@@ -718,7 +721,7 @@
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.title || seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目：</span><div class="content">{{(seek.title || 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.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             </div>
                         </div>