Merge remote-tracking branch 'origin/liusw-seekpurchase-v1.0.12.12' into liusw-seekpurchase-v1.0.12.12

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -37,7 +37,7 @@ define(['app/app'], function(app) {
           seekPurchase.getUserSeekPageInfo(param, function (data) {
             params.total(data.totalElements);
             $defer.resolve(data.content);
-            console.info(data.content);
+            $scope.seekListData = data;
           }, function (response) {
             toaster.pop('error', '获取求购列表失败');
           });
@@ -49,6 +49,10 @@ define(['app/app'], function(app) {
         $scope.seekPurchaseTableParams.reload();
       }
 
+      $scope.setSeekStatus = function (seek, status) {
+          seek.$status = status;
+      }
+
       // 获取商品现货 getMallGoodsList 参数 spId
 
       // 获取报价列表 getSeekPurchaseOfferPageInfo 参数：分页参数，spId

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

@@ -183,8 +183,9 @@
         text-align: center;
         height: 80px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td >a {
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
+        cursor: pointer;
     }
     .seek-purchase .red-text {
         color: #f62d37;
@@ -318,6 +319,9 @@
         overflow-y: auto;
     }
     /*提示框样式 start*/
+    .seek-purchase .com-del-box {
+        display: none;
+    }
     .seek-purchase .com-del-box .title {
         background-color: #4290f7;
     }
@@ -352,6 +356,11 @@
         margin: 0 0 18px 0;
     }
     /*提示框样式 end*/
+    .seek-purchase .seek-purchase-content >table >tbody tr.pager-row td div {
+        text-align: right;
+        padding-right: 15px;
+        margin: 20px 0 12px 0;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -467,10 +476,9 @@
                     </select>
                 </th>
                 <th width="92">操作</th>
-                <th width="1"></th>
             </tr>
             </thead>
-            <tbody ng-repeat="seek in $data">
+            <tbody ng-repeat="seek in seekListData.content">
             <tr class="default-row">
                 <td ng-bind="seek.releaseDate | date:'yyyy-MM-dd HH:mm:ss'">2012-12-12 12:12:12</td>
                 <td ng-bind="seek.brand">asdasfasdad</td>
@@ -481,257 +489,229 @@
                 <td ng-bind="seek.produceDate">2012-12-12</td>
                 <td>剩余&nbsp;<span class="red-text">8</span>&nbsp;天</td>
                 <td>已报价</td>
-                <td><a href="javascript:void(0)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></a></td>
-            </tr>
-            </tbody>
-            <tbody>
-            <tr class="default-row">
-                <td>2012-12-12 12:12:12</td>
-                <td>asdasfasdad</td>
-                <td>asdasdad</td>
-                <td>5000</td>
-                <td><span class="red-text">$5.569</span></td>
-                <td>盘装</td>
-                <td>2012-12-12</td>
-                <td>剩余&nbsp;<span class="red-text">8</span>&nbsp;天</td>
-                <td class="green-text">已采纳</td>
-                <td><a href="javascript:void(0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></a></td>
+                <td class="operate-seek">
+                    <span ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&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>
+                </td>
             </tr>
-            <tr class="expand-row">
+            <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2">
                 <td colspan="10">
                     <div>
                         <div class="switch-line">
-                            <a class="active">商城现货（<span>60</span>）</a>
-                            <a>当前报价（<span>110</span>）</a>
+                            <a ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span>60</span>）</a>
+                            <a ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span>110</span>）</a>
                         </div>
-                        <table>
-                            <thead>
-                            <tr>
-                                <th width="68">全选</th>
-                                <th width="103">卖家</th>
-                                <th width="126">交期(天)</th>
-                                <th width="104">单价</th>
-                                <th width="137">生产日期</th>
-                                <th width="111">库存</th>
-                                <th width="164">购买数量</th>
-                                <th width="186">操作</th>
-                            </tr>
-                            </thead>
-                        </table>
-                        <div class="seek-list">
+                        <div ng-show="seek.$status == 1">
                             <table>
-                                <tbody>
+                                <thead>
                                 <tr>
-                                    <td width="68"><input type="checkbox"></td>
-                                    <td width="103">哈哈哈</td>
-                                    <td width="126" class="red-text">4-6</td>
-                                    <td width="104" class="red-text">$123</td>
-                                    <td width="137">2012-12-12</td>
-                                    <td width="111">21412</td>
-                                    <td width="164" class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td width="186" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
+                                    <th width="68">全选</th>
+                                    <th width="103">卖家</th>
+                                    <th width="126">交期(天)</th>
+                                    <th width="104">单价</th>
+                                    <th width="137">生产日期</th>
+                                    <th width="111">库存</th>
+                                    <th width="164">购买数量</th>
+                                    <th width="186">操作</th>
                                 </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>哈哈哈</td>
-                                    <td class="red-text">4-6</td>
-                                    <td class="red-text">$123</td>
-                                    <td>2012-12-12</td>
-                                    <td>21412</td>
-                                    <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                    <td class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                </tbody>
+                                </thead>
                             </table>
+                            <div class="seek-list">
+                                <table>
+                                    <tbody>
+                                    <tr>
+                                        <td width="68"><input type="checkbox"></td>
+                                        <td width="103">哈哈哈</td>
+                                        <td width="126" class="red-text">4-6</td>
+                                        <td width="104" class="red-text">$123</td>
+                                        <td width="137">2012-12-12</td>
+                                        <td width="111">21412</td>
+                                        <td width="164" class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td width="186" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="checkbox"></td>
+                                        <td>哈哈哈</td>
+                                        <td class="red-text">4-6</td>
+                                        <td class="red-text">$123</td>
+                                        <td>2012-12-12</td>
+                                        <td>21412</td>
+                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="all-buy">
+                                <span>剩余数量：8888</span>
+                                <span>已选数量：8888</span>
+                                <span>产品小计：8888123.12元</span>
+                                <a href="javascript:void(0)">立即购买</a>
+                            </div>
                         </div>
-                        <div class="all-buy">
-                            <span>剩余数量：8888</span>
-                            <span>已选数量：8888</span>
-                            <span>产品小计：8888123.12元</span>
-                            <a href="javascript:void(0)">立即购买</a>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            </tbody>
-            <tbody>
-            <tr class="default-row">
-                <td>2012-12-12 12:12:12</td>
-                <td>asdasfasdad</td>
-                <td>asdasdad</td>
-                <td>5000</td>
-                <td><span class="red-text">$5.569</span></td>
-                <td>盘装</td>
-                <td>2012-12-12</td>
-                <td>剩余&nbsp;<span class="red-text">8</span>&nbsp;天</td>
-                <td class="red-text">待报价</td>
-                <td><a href="javascript:void(0)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></a></td>
-            </tr>
-            <tr class="expand-row">
-                <td colspan="10">
-                    <div>
-                        <div class="switch-line">
-                            <a>商城现货（<span>60</span>）</a>
-                            <a class="active">当前报价（<span>110</span>）</a>
-                        </div>
-                        <table>
-                            <thead>
-                            <tr>
-                                <th width="173">卖家</th>
-                                <th width="196">交期(天)</th>
-                                <th width="196">单价</th>
-                                <th width="212">生产日期</th>
-                                <th width="221">操作</th>
-                            </tr>
-                            </thead>
-                        </table>
-                        <div class="seek-list">
+                        <div ng-show="seek.$status == 2">
                             <table>
-                                <tbody>
-                                <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
+                                <thead>
                                 <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
+                                    <th width="173">卖家</th>
+                                    <th width="196">交期(天)</th>
+                                    <th width="196">单价</th>
+                                    <th width="212">生产日期</th>
+                                    <th width="221">操作</th>
                                 </tr>
-                                <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td width="173">深圳市优软科技</td>
-                                    <td width="196" class="red-text">4-6</td>
-                                    <td width="196"><span>$</span>9.86</td>
-                                    <td width="212">2012-12-12</td>
-                                    <td width="221" class="operate">
-                                        <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                        <span>立即购买</span>
-                                    </td>
-                                </tr>
-                                </tbody>
+                                </thead>
                             </table>
-                        </div>
-                        <div class="all-buy">
-                            <span>剩余数量：8888</span>
-                            <span>已选数量：8888</span>
-                            <span>产品小计：8888123.12元</span>
-                            <a href="javascript:void(0)">立即购买</a>
+                            <div class="seek-list">
+                                <table>
+                                    <tbody>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td width="173">深圳市优软科技</td>
+                                        <td width="196" class="red-text">4-6</td>
+                                        <td width="196"><span>$</span>9.86</td>
+                                        <td width="212">2012-12-12</td>
+                                        <td width="221" class="operate">
+                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>立即购买</span>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
                     </div>
                 </td>
             </tr>
             </tbody>
+            <tbody>
+                <tr class="pager-row">
+                    <td colspan="10">
+                        <div>
+                            显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </div>
     <div class="com-del-box">