限售商品

liuyue
Commit 8246024fdd1dceb682dacd738fca357d1dd86bc2 1 parent 799f038e
Showing 6 changed files with 57 additions and 10 deletions
client/js/goods/brand-cooperation.js
client/js/goods/price-change.js
client/js/product/limit.js
server/interface/limit.js
server/views/pages/limit/add.html
server/views/pages/limit/index.html
--- a/client/js/goods/brand-cooperation.js
View file @8246024
+++ b/client/js/goods/brand-cooperation.js
View file @8246024
@@ -133,11 +133,11 @@ $("#all-btn").click(function() {
 //批量导入按钮点击事件
 $('#import-btn').on('click', function() {
-    /*if ($('#basicTable').css('display') == 'none') {
+    if ($('#basicTable').css('display') == 'none') {
         location.reload();
-    }*/
+    }
     $('#basicTable, .bulk-import').toggle();
-    $('.panel-default a').addClass('disabled');
+    $('.panel-default a').not('#import-btn').addClass('disabled');
     $('.panel-default input, .panel-default select').attr('disabled', true);
 });
--- a/client/js/goods/price-change.js
View file @8246024
+++ b/client/js/goods/price-change.js
View file @8246024
@@ -173,7 +173,7 @@ $('#basicTable').on('click', '.modify-btn', function() {
                 selectVal = $select.val() - 1,
                 priceArr = [];
-            priceArr.push([vipPrice * 0.95, vipPrice * 0.9, vipPrice * 0.88]);
+            priceArr.push([price * 0.95, price * 0.9, price * 0.88]);
             priceArr.push([price * 0.95, price * 0.95, price * 0.95]);
             priceArr.push([price, price, price]);
             priceArr.push([$vipPrice.val(), $vipPrice.val(), $vipPrice.val()]);
@@ -244,8 +244,11 @@ $("#all-btn").click(function() {
 //批量导入按钮点击事件
 $('#import-btn').on('click', function() {
+    if ($('#basicTable').css('display') == 'none') {
+        location.reload();
+    }
     $('#basicTable, .bulk-import').toggle();
-    $('.panel-default a').addClass('disabled');
+    $('.panel-default a').not('#import-btn').addClass('disabled');
     $('.panel-default input, .panel-default select').attr('disabled', true);
 });
--- a/client/js/product/limit.js
View file @8246024
+++ b/client/js/product/limit.js
View file @8246024
@@ -76,6 +76,9 @@ var tableGird = new common.grid({
         return obj;
     },
     columns: [{
+        display: "",
+        type: 'checkbox'
+    }, {
         display: "名称",
         name: "productName"
     }, {
@@ -193,11 +196,39 @@ var loadtab = function() {
 }
 loadtab();
+
+//筛选
 $("#filter-btn").click(function() {
     loadtab();
-    tableGird.reload();
+    tableGird.reload(1);
 });
+//导出
+$('#export-btn').on('click', function() {
+    var selectedArr = tableGird.selected,
+        len = selectedArr.length,
+        queryConf = '';
+    if (len <= 0) {
+        common.util.__tip('请选择要导出的商品', 'warning');
+        return;
+    }
+    $.each(selectedArr, function(i, value) {
+        queryConf += value['limitProductCode'];
+        if (i < len - 1) {
+            queryConf += '|';
+        }
+    });
+
+    common.util.__ajax({
+        url: '/limit/batch/export',
+        data: {
+            queryConf: queryConf,
+            type: 'limitProductReminder'
+        }
+    }, function(res) {
+        console.log(res);
+    })
+});
 //开启商品
 $('#limit-table-box').on('click', '.open-btn', function() {
--- a/server/interface/limit.js
View file @8246024
+++ b/server/interface/limit.js
View file @8246024
 exports.domain = require('../config/common.js').domain;
 //exports.domain = 'http://172.16.6.240:8088/platform';
+//exports.domain = 'http://172.16.6.182:8080/yohobuy-platform-web'; //曹燕
 //路由配置
 exports.res = [{
@@ -195,4 +196,15 @@ exports.res = [{
         name: 'id',
         type: 'Number'
     }]
+}, {
+    route: '/limit/batch/export',
+    method: 'POST',
+    url: '/batch/export',
+    params: [{
+        name: 'queryConf',
+        type: 'String'
+    }, {
+        name: 'type',
+        type: 'String'
+    }]
 }];
--- a/server/views/pages/limit/add.html
View file @8246024
+++ b/server/views/pages/limit/add.html
View file @8246024
@@ -87,13 +87,13 @@
                                 <input type="hidden" value="{{hotFlag}}" id="hotFlag" for="radio"> 
                             </div>
                             <div class="col-md-3 height60">
-                                <label>热门发售排序：</label>
-                                <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder=""></label>
+                                <label>热门发售排序<span class="red">*</span>：</label>
+                                <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="热门发售排序" placeholder="" required></label>
                                 <p>（提示：数字越大越靠前）</p>
                             </div>
                             <div class="col-md-3">
                                 <label>未发售排序：</label>
-                                <label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" type="text" class="form-control" placeholder=""></label>
+                                <label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" placeholder="未发售排序" type="text" class="form-control" placeholder=""></label>
                             </div>
                         </div>
                     </div>
--- a/server/views/pages/limit/index.html
View file @8246024
+++ b/server/views/pages/limit/index.html
View file @8246024
@@ -6,7 +6,7 @@
         <div class="media-body">
             <ul class="breadcrumb">
                 <li><a href="#"><i class="glyphicon glyphicon-home"></i></a></li>
-                <li><a href="#">限购商品管理</a></li>
+                <li><a href="#">运营管理</a></li>
                 <li>限购商品管理</li>
             </ul>
             <h4>限购商品管理</h4>
@@ -51,6 +51,7 @@
                 </div> -->
                 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
                 <a id="all-btn" href="" class="btn btn-info">全部</a>
+                <a id="export-btn" href="javascript:;" class="btn btn-info">导出</a>
             </div>
         </div>
     </div>