Преглед на файлове

买家求购页面调整

yangc преди 8 години
родител
ревизия
ff6ec17ba2

+ 4 - 0
src/main/webapp/resources/css/commonComponent.css

@@ -212,6 +212,10 @@ i.fa-minus-circle{
         <label for="1"></label>
     </label>
 **/
+.com-check-box,
+.com-check-box label {
+    margin-bottom: 0;
+}
 .com-check-box input {
     display: none!important;
 }

+ 9 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -76,11 +76,13 @@ define(['app/app'], function(app) {
           if (status == 2 && $scope.offerCount != 0) {
             seekPurchase.getSeekPurchaseOfferPageInfo({count:100,page:1,spId:seek.spId},function(data) {
                 $scope.offer = data.content;
+                clearSeekStatus();
                 seek.$status = status;
             });
           } else if (status == 1 && $scope.goodsCount != 0) {// 查看现货
             seekPurchase.getMallGoodsList({spId: seek.spId}, function(data) {
                 $scope.goods = data;
+                clearSeekStatus();
                 initFragments();
                 seek.$status = status;
             });
@@ -88,6 +90,12 @@ define(['app/app'], function(app) {
             seek.$status = status;
           }
       }
+      
+      var clearSeekStatus = function () {
+        angular.forEach($scope.seekListData.content, function (item) {
+          item.$status = 0;
+        })
+      }
 
       $scope.condition = {endDateOpen:false, startDateOpen: false, deadlineOpen: false};
       // 打开日期选择框
@@ -317,6 +325,7 @@ define(['app/app'], function(app) {
           // $scope.$message.error('请输入整数')
           $scope.fragments[index].num = $scope.goods[index].minBuyQty;
         }
+        $scope.onInput(index);
       }
 
       $scope.showUseFlag = false;

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/purchase_offer_ctrl.js

@@ -106,11 +106,11 @@ define(['app/app'], function(app) {
 
         /*获取时间戳代表的天数*/
         $scope.getDay = function (timeStamp) {
-            return Math.floor((timeStamp - new Date().getTime()) / (1000 * 60 * 60 * 24));
+            return Math.floor(timeStamp / (1000 * 60 * 60 * 24));
         }
         /*获取时间戳代表的小时*/
         $scope.getHours = function (timeStamp) {
-            return Math.floor(((timeStamp - new Date().getTime()) / (1000 * 60 * 60)) % 24);
+            return Math.floor((timeStamp / (1000 * 60 * 60)) % 24);
         }
 
         /*设置列表状态*/

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

@@ -435,7 +435,10 @@
         <!--搜索时间筛选-->
         <div class="screen" style="clear: both;background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
             <div class="fl">
-                <input type="checkbox" ng-model="isMallGoods" ng-change="onSearch()">&nbsp;有现货&nbsp;&nbsp;
+                <label class="com-check-box">
+                    <input type="checkbox" id="1" ng-model="isMallGoods" ng-change="onSearch()">
+                    <label for="1"></label>
+                </label>&nbsp;有现货&nbsp;&nbsp;
                 截止时间&nbsp;
                 <select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">
                     <option value="全部">全部</option>
@@ -550,7 +553,12 @@
                                 <table>
                                     <tbody>
                                     <tr ng-repeat="go in goods track by $index">
-                                        <td width="68"><input type="checkbox"></td>
+                                        <td width="68">
+                                            <label class="com-check-box">
+                                                <input type="checkbox" id="{{$index + 2}}" ng-model="go.$checked">
+                                                <label for="{{$index + 2}}"></label>
+                                            </label>
+                                        </td>
                                         <td width="146" ng-bind="go.enterpriseName">哈哈哈</td>
                                         <td width="83" class="red-text" ng-bind="go.minDelivery+'-'+go.maxDelivery">4-6{{fragments[i].price}}</td>
                                         <td width="104" class="red-text">{{go.currencyName + fragments[$index].price | currencyStr}}</td>
@@ -559,7 +567,7 @@
                                         <td width="142" class="input-number">
                                             <div>
                                                 <span ng-click="subNum($index)">-</span>
-                                                <input type="number" ng-model="fragments[$index].num" ng-change="inputNum($index)" ng-input="onInput($index)">
+                                                <input type="number" ng-model="fragments[$index].num" ng-change="inputNum($index)">
                                                 <span ng-click="addNum($index)">+</span>
                                             </div>
                                         </td>
@@ -572,9 +580,9 @@
                                 </table>
                             </div>
                             <div class="all-buy">
-                                <span>剩余数量:8888</span>
-                                <span>已选数量:8888</span>
-                                <span>产品小计:8888123.12元</span>
+                                <span>剩余数量:0</span>
+                                <span>已选数量:0</span>
+                                <span>产品小计:0元</span>
                                 <a href="javascript:void(0)">立即购买</a>
                             </div>
                         </div>

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

@@ -217,10 +217,13 @@
         color: #f62d37;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate {
+        position: relative;
         font-size: 12px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate a{
         color: #4290f7;
+        z-index: 1;
+        position: relative;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate div {
         width: 64px;
@@ -238,6 +241,11 @@
         color: #39ae05;
         display: block;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate >img {
+        position: absolute;
+        right: 0;
+        top: 0;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.expand-row{
         display: none;
         height: 40px;
@@ -438,7 +446,7 @@
                     <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                     <div class="seek-status">
                         <div ng-show="!seek.goodsEnuu" class="no-grounding">未上架</div>
-                        <a ng-show="!seek.goodsEnuu" ng-click="goGrounding(seek)">去上架>></a>
+                        <a ng-show="!seek.goodsEnuu" href="vendor#/vendor_material">去上架>></a>
                         <div ng-show="seek.goodsEnuu">已上架</div>
                     </div>
                 </td>