Merge branch 'dev_524_5.8逛二期' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_524_5.8逛二期

@@ -16,7 +16,8 @@ module.exports = {
                 couponId: {type: Number},
                 department: {type: Number},
                 couponName: {type: String},
-                status: {type: Number}
+                status: {type: Number},
+                couponType:{type:Number}
             }
         },
         getCouponDetailById:{

 <%include '../../../common/views/__ui/header'%>
 
 <%include '../../../common/views/__partail/ListHeader'%>
-
 <div class="contentpanel">
     <div class="panel panel-default" style="margin-bottom:10px;">
         <div class="panel-body" style="padding-bottom: 0">
@@ -15,6 +14,18 @@
                 </div>
                  <div class="panel-col" id="departments"></div>
                 <div class="panel-col">
+                    <select id="filter-couponType" tabindex="-1" class="select2-offscreen brandBtn-group observe">
+                        <option value="-1">优惠券类型</option>
+                        <option value="1">平台券</option>
+                        <option value="2">B券</option>
+                        <option value="3">券码</option>
+                        <option value="4">生日券</option>
+                        <option value="5">免邮券</option>
+                        <option value="6">店铺券</option>
+                        <option value="7">分享券</option>
+                    </select>
+                </div>
+                <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
                     <a id="all-btn" href="/market/couponList/index" class="btn btn-info">全部</a>
                 </div>

@@ -205,8 +205,8 @@ var Bll = {
             onComplete: function (response) {
                 console.log("批量接口返回数据",response);
                 if (response.status && response.code == 200) {
-                    if(response.data.fileSize>20){
-                        common.util.__tip("视频不能超过20M", 'warning');
+                    if(response.data.fileSize>50){
+                        common.util.__tip("视频不能超过50M", 'warning');
                     }else{
                         $("#video_src").val(response.data.url);
                         $("#video_size").val(response.data.fileSize);

@@ -12,6 +12,8 @@ var artTemplate = common.artTemplate;
  * ENUM tab参数
  * @type {string[]}
  */
+//下拉框
+new common.dropDown({el: '#filter-couponType'});
 
 var couponTypes = ["平台券", "B券", "券码", "生日券", "免邮券","店铺券","分享券"];
 var useLimitTypes = ["无限制", "货物件数限制", "订单金额限制"];
@@ -110,6 +112,7 @@ var g = new common.grid({
             couponId: common.util.__input("choose-coupon"),
             couponName: common.util.__input("filter-couponName"),
             department: common.util.__input("choose-department"),
+            couponType:common.util.__input("filter-couponType"),
             status: t.active
         };
     },