Merge remote-tracking branch 'origin/dev_店铺vip设置' into dev_店铺vip设置

Conflicts:
	code/apps/vip/controllers/index.js

@@ -18,6 +18,13 @@ module.exports = function (app) {
     //获取商品VIP列表
     //获取商品VIP列表
     app.post("/vip/queryProductVipList", "vip_queryProductVipList");
     app.post("/vip/queryProductVipList", "vip_queryProductVipList");
 
 
+    app.get("/vip/ProductVip", "vip.ProductVip", function(req, res) {
+        this.$extend={
+            moduleName:"VIP设置",
+            pageName:"商品VIP设置"
+        }
+    });
+
     //店铺VIP开关
     //店铺VIP开关
     app.post("/vip/shop/trigger", "vip_shopVipTrigger");
     app.post("/vip/shop/trigger", "vip_shopVipTrigger");
 };
 };

@@ -11,14 +11,10 @@ module.exports = {
             title: "获取商品VIP列表",
             title: "获取商品VIP列表",
             url: '/vip/queryProductVipList',
             url: '/vip/queryProductVipList',
             params: {
             params: {
-                type: {type: Number},
-                channelIds: {type: String},
-                startTime: {type: String},
-                endTime: {type: String},
-                content: {type: String},
-                status: {type: Number},
-                page: {type: Number},
-                size: {type: Number}
+                productSkn: {type: Number},
+                shopId: {type: Number},
+                brandId: {type: Number},
+                productVipStatus: {type: Number}
             }
             }
         },
         },
         shopVipTrigger: {
         shopVipTrigger: {

-<%include '../../../common/views/__ui/header'%>
-<%include '../../../common/views/__partail/ListHeader'%>
+<%include '../../common/views/__ui/header'%>
+<%include '../../common/views/__partail/ListHeader'%>
 
 
 <div class="contentpanel">
 <div class="contentpanel">
     <div class="panel panel-default" style="margin-bottom:10px;">
     <div class="panel panel-default" style="margin-bottom:10px;">
@@ -12,8 +12,7 @@
                 </div>
                 </div>
 
 
                 <div class="panel-col">
                 <div class="panel-col">
-                    <select name="shop-name" id="shop-name" style="width: 280px;" tabindex="-1" title=""
-                            class="form-control">
+                    <select id="shop-name" class="form-control">
                         <option value="-1">请选择店铺</option>
                         <option value="-1">请选择店铺</option>
                     </select>
                     </select>
                 </div>
                 </div>
@@ -25,7 +24,7 @@
                 </div>
                 </div>
 
 
                 <div class="panel-col">
                 <div class="panel-col">
-                    <select id="isPayDelivery" class="form-control">
+                    <select id="productVipStatus" class="form-control">
                         <option value="-1">VIP设置</option>
                         <option value="-1">VIP设置</option>
                         <option value="0">跟随店铺</option>
                         <option value="0">跟随店铺</option>
                         <option value="1">开启</option>
                         <option value="1">开启</option>
@@ -45,12 +44,4 @@
     </div>
     </div>
 </div>
 </div>
 
 
-<script type="text/template" id="template">
-    <div class="rows" style="height: 100px;">
-        <div class="form-group">
-            <p>您确定要更改VIP设置吗？</p>
-        </div>
-    </div>
-    </div>
-</script>
-<%include '../../../common/views/__ui/footer'%>
+<%include '../../common/views/__ui/footer'%>

@@ -2,5 +2,9 @@
  * Created by wangqianjun on 16/2/23.
  * Created by wangqianjun on 16/2/23.
  */
  */
 var $ = require('jquery'),
 var $ = require('jquery'),
-    common = require('../../../common/common');
+    common = require('../../common/common');
+
+
+
+
 
 

+/**
+ * Created by wangqianjun on 16/2/23.
+ */
+var $ = require('jquery'),
+    common=require('../../common/common');
+
+// 初始化筛选框
+new common.dropDown({el: "#shop-name", ajax: "shopsRest"});
+new common.dropDown({el: "#brandId", ajax: "brand"});
+/**
+ * 列表
+ * @type {common.grid}
+ */
+var g = new common.grid({
+    el: '#basicTable',
+    parms: function () {
+        return {
+            productSkn: common.util.__input('productSkn'),
+            shopId: common.util.__input('shop-name'),
+            brandId: common.util.__input('brandId'),
+            productVipStatus: common.util.__input('productVipStatus')
+        };
+    },
+    columns: [
+        {
+            display: "SKN",
+            name: "productSKN"
+        }, {
+            display: "店铺",
+            name: "shopName"
+        }, {
+            display: "品牌",
+            name: "brandName"
+        }, {
+            display: '操作',
+            render: function (item) {
+                var HtmArr = [];
+                HtmArr.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn btn-info btn-xs update">修改</a>');
+                HtmArr.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs delete">删除</a>');
+                return HtmArr.join('');
+            }
+        }]
+});
+g.init('/vip/queryProductVipList');