Authored by weiqingting

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -27,6 +27,8 @@ tab.prototype={ @@ -27,6 +27,8 @@ tab.prototype={
27 $(p.el).on("click","li",function(){ 27 $(p.el).on("click","li",function(){
28 $(this).addClass('active').siblings().removeClass('active'); 28 $(this).addClass('active').siblings().removeClass('active');
29 g.active=$(this).find("a").attr("columnname"); 29 g.active=$(this).find("a").attr("columnname");
  30 + g.key = $(this).find("a").attr("key");
  31 + g.value = $(this).find("a").attr("value");
30 callback&&callback(); 32 callback&&callback();
31 }); 33 });
32 }, 34 },
@@ -36,9 +38,12 @@ tab.prototype={ @@ -36,9 +38,12 @@ tab.prototype={
36 var lis=[]; 38 var lis=[];
37 $(p.columns).each(function (i, column) { 39 $(p.columns).each(function (i, column) {
38 var li = $("<li></li>"); 40 var li = $("<li></li>");
39 - var a=$("<a href='javascript:void(0);'></a>"); 41 + var a = $("<a href='javascript:void(0);'></a>");
40 42
41 if (column.name) a.attr({ columnname: column.name }); 43 if (column.name) a.attr({ columnname: column.name });
  44 + if (column.key) a.attr({ key: column.key});
  45 + if (column.value) a.attr({ value: column.value});
  46 +
42 var h_t = column.display || ""; 47 var h_t = column.display || "";
43 a.html(h_t); 48 a.html(h_t);
44 49
@@ -26,7 +26,8 @@ var ENUM={ @@ -26,7 +26,8 @@ var ENUM={
26 {name:"3",display:"过期({3})"}, 26 {name:"3",display:"过期({3})"},
27 {name:"4",display:"作废({4})"}, 27 {name:"4",display:"作废({4})"},
28 {name:"all",display:"全部({all})"} 28 {name:"all",display:"全部({all})"}
29 - ]}).init(ENUM.tips); 29 + ]
  30 + }).init(ENUM.tips);
30 31
31 //grid 32 //grid
32 var g = new common.grid({ 33 var g = new common.grid({
@@ -204,10 +205,10 @@ var ENUM={ @@ -204,10 +205,10 @@ var ENUM={
204 var item=g.rows[$(this).data("index")]; 205 var item=g.rows[$(this).data("index")];
205 var data=function(){ 206 var data=function(){
206 return { 207 return {
207 - id:item.id,  
208 - status:1,  
209 - operations:reason  
210 - }; 208 + id:item.id,
  209 + status:1,
  210 + operations:reason
  211 + };
211 } 212 }
212 Bll.definetoast("您确定要通过该申请吗?",data,function(){ 213 Bll.definetoast("您确定要通过该申请吗?",data,function(){
213 return {auditTime:item.limitDateFrom}; 214 return {auditTime:item.limitDateFrom};
@@ -12,9 +12,11 @@ require('../common/bootstrap-wysihtml5'); @@ -12,9 +12,11 @@ require('../common/bootstrap-wysihtml5');
12 require('../util/datepicker'); 12 require('../util/datepicker');
13 require('../util/wangEditor'); 13 require('../util/wangEditor');
14 14
15 -var uploadImg = new edit('#coverImgBox');  
16 -//  
17 -uploadImg.init(); 15 +// var uploadImg = new edit('#coverImgBox');
  16 +// //
  17 +// uploadImg.init();
  18 +
  19 +
18 20
19 /*var editor = new wangEditor('editor-container'); 21 /*var editor = new wangEditor('editor-container');
20 editor.config.menus = [ 22 editor.config.menus = [
@@ -4,22 +4,48 @@ @@ -4,22 +4,48 @@
4 */ 4 */
5 5
6 6
7 -var $ = require('jquery'); 7 +var $ = require('jquery'),
  8 + common=require('../common/common');
8 var edit = require('../common/edit'); 9 var edit = require('../common/edit');
9 var grid=require('../common/grid'); 10 var grid=require('../common/grid');
10 var baseNum = 1; 11 var baseNum = 1;
11 12
  13 +var ENUM={
  14 + status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'},//全部
  15 + tips:{"salenum":0,"notsalenum":0,"hotnum":0,"nothotnum":0,"all":0}
  16 +}
  17 +var t = new common.tab({
  18 + el:"#basicTab",
  19 + click:function(){
  20 + tableGird.reload();
  21 + },
  22 + columns:[
  23 + {name:"salenum", key: "saleFlag", value: "1", display:"已发售({salenum})"},
  24 + {name:"notsalenum", key: "saleFlag", value: "0", display:"未发售({notsalenum})"},
  25 + {name:"hotnum", key: "hotFlag", value: "1", display:"热门({hotnum})"},
  26 + {name:"nothotnum", key: "hotFlag", value: "0", display:"非热门({nothotnum})"},
  27 + {name:"all",display:"全部({all})"}
  28 + ]
  29 +}).init(ENUM.tips);
  30 +
12 31
13 32
14 var tableGird = new grid({ 33 var tableGird = new grid({
15 34
16 el:"#limit-table-box", 35 el:"#limit-table-box",
17 parms:function(){ 36 parms:function(){
18 -  
19 - //todo  
20 - return {  
21 - //id: window.categoryId * baseNum  
22 - }; 37 + var obj = {
  38 + productName:common.util.__input("product-name"),
  39 + productSkn:common.util.__input("skn"),
  40 + hotFlag: $('input[name="hotFlag"]:checked').val(),
  41 + saleFlag: $('input[name="saleFlag"]:checked').val(),
  42 + showFlag: $('input[name="showFlag"]:checked').val()
  43 + }
  44 + if (t.key) {
  45 + obj[t.key] = t.value;
  46 + }
  47 +
  48 + return obj;
23 }, 49 },
24 columns:[ 50 columns:[
25 { 51 {
@@ -69,10 +95,10 @@ var tableGird = new grid({ @@ -69,10 +95,10 @@ var tableGird = new grid({
69 name:"inventory" 95 name:"inventory"
70 }, { 96 }, {
71 display:"是否发售", 97 display:"是否发售",
72 - name:"isSale", 98 + name:"saleFlag",
73 render:function(items){ 99 render:function(items){
74 100
75 - if (items.isSale) { 101 + if (items.saleFlag) {
76 return '是'; 102 return '是';
77 } else { 103 } else {
78 return '否'; 104 return '否';
@@ -80,10 +106,10 @@ var tableGird = new grid({ @@ -80,10 +106,10 @@ var tableGird = new grid({
80 } 106 }
81 }, { 107 }, {
82 display:"是否热门", 108 display:"是否热门",
83 - name:"isHot", 109 + name:"hotFlag",
84 render:function(items){ 110 render:function(items){
85 111
86 - if (items.isHot) { 112 + if (items.hotFlag) {
87 return '是'; 113 return '是';
88 } else { 114 } else {
89 return '否'; 115 return '否';
@@ -91,25 +117,133 @@ var tableGird = new grid({ @@ -91,25 +117,133 @@ var tableGird = new grid({
91 } 117 }
92 }, { 118 }, {
93 display:"是否开启", 119 display:"是否开启",
94 - name:"isOpen", 120 + name:"showFlag",
95 render:function(items){ 121 render:function(items){
96 -  
97 - if (items.isOpen) { 122 + if (items.showFlag) {
98 return '是'; 123 return '是';
  124 +
99 } else { 125 } else {
100 return '否'; 126 return '否';
101 } 127 }
102 } 128 }
103 }, { 129 }, {
104 display:"操作", 130 display:"操作",
105 - name:"skn",  
106 render:function(items){ 131 render:function(items){
107 - 132 + var HtmArr=[];
  133 + if (items.showFlag) {
  134 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs close-btn">关闭</a>');
  135 + } else {
  136 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs open-btn">开启</a>');
  137 + }
  138 +
  139 + if (items.hotFlag) {
  140 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-cancel">取消热门</a>');
  141 + } else {
  142 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-btn">设为热门</a>');
  143 + }
  144 + HtmArr.push('<a href="/limit/edit/' + items.id + '" data-id="' + items.id + '" class="btn btn-info btn-xs">编辑</a>');
  145 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-danger btn-xs delete-btn">删除</a>');
  146 + return HtmArr.join('');
108 } 147 }
109 } 148 }
110 ] 149 ]
111 }); 150 });
112 151
113 - console.log('11'); 152 +tableGird.init('/limit/product/page');
  153 +
  154 +var loadtab=function(){
  155 + t.active=undefined;
  156 + setTimeout(function(){
  157 + common.util.__ajax({
  158 + url:'/limit/ajax/getCodeCount',
  159 + data:tableGird.options.parms()
  160 +
  161 + },function(res){
  162 + for(var key in res.data){
  163 + ENUM.tips[key]=res.data[key];
  164 + }
  165 + t.init(ENUM.tips);
  166 + },true);
  167 + },400);
  168 +}
  169 +loadtab();
  170 +$("#filter-btn").click(function(){
  171 + loadtab();
  172 + tableGird.reload();
  173 +});
  174 +
  175 +
  176 +//开启商品
  177 +$('#limit-table-box').on('click', '.open-btn', function() {
  178 + var param = {
  179 + id: $(this).data('id'),
  180 + showFlag: '1'
  181 + }
  182 + common.util.__ajax({
  183 + url:'/limit/audit',
  184 + data:param
  185 +
  186 + },function(res){
  187 + tableGird.reload();
  188 + });
  189 +});
  190 +
  191 +//关闭商品
  192 +$('#limit-table-box').on('click', '.close-btn', function() {
  193 + var param = {
  194 + id: $(this).data('id'),
  195 + showFlag: '0'
  196 + }
  197 + common.util.__ajax({
  198 + url:'/limit/audit',
  199 + data:param
  200 +
  201 + },function(res){
  202 + tableGird.reload();
  203 + });
  204 +});
  205 +
  206 +//设为热门
  207 +$('#limit-table-box').on('click', '.hot-btn', function() {
  208 + var param = {
  209 + id: $(this).data('id'),
  210 + hotFlag: 1
  211 + }
  212 + common.util.__ajax({
  213 + url:'/limit/audit',
  214 + data:param
  215 +
  216 + },function(res){
  217 + tableGird.reload();
  218 + });
  219 +});
  220 +
  221 +//取消热门
  222 +$('#limit-table-box').on('click', '.hot-cancel', function() {
  223 + var param = {
  224 + id: $(this).data('id'),
  225 + hotFlag: 0
  226 + }
  227 + common.util.__ajax({
  228 + url:'/limit/audit',
  229 + data:param
  230 +
  231 + },function(res){
  232 + tableGird.reload();
  233 + });
  234 +});
  235 +
  236 +//删除商品
  237 +$('#limit-table-box').on('click', '.delete-btn', function() {
  238 + var param = {
  239 + id: $(this).data('id')
  240 + }
  241 + common.util.__ajax({
  242 + url:'/limit/delete',
  243 + data:param
  244 +
  245 + },function(res){
  246 + tableGird.reload();
  247 + });
  248 +});
114 249
115 - tableGird.init('/limit/product/page');  
1 -ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color 0.3s ease;transition:background-color 0.3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px} 1 +ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color .3s ease;transition:background-color .3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px}
@@ -16,14 +16,42 @@ exports.res = [ @@ -16,14 +16,42 @@ exports.res = [
16 route: '/limit/product/page', 16 route: '/limit/product/page',
17 method: 'POST', 17 method: 'POST',
18 url: '/limitProduct/getLimitProductList', 18 url: '/limitProduct/getLimitProductList',
19 - isJsonRaw:true 19 + isJsonRaw:true,
  20 + params: [
  21 + {
  22 + name: 'hotFlag',
  23 + type: 'Number'
  24 + },{
  25 + name: 'saleFlag',
  26 + type: 'Number'
  27 + },{
  28 + name: 'showFlag',
  29 + type: 'Number'
  30 + },{
  31 + name: 'productName',
  32 + type: 'String'
  33 + },{
  34 + name: 'productSkn',
  35 + type: 'String'
  36 + },{
  37 + name: 'page',
  38 + type: 'Number'
  39 + },{
  40 + name: 'size',
  41 + type: 'Number'
  42 + }
  43 +
  44 + ]
20 },{ 45 },{
21 // 【限购商品】添加页面渲染 46 // 【限购商品】添加页面渲染
22 route: '/limit/product/add', 47 route: '/limit/product/add',
23 method: 'GET', 48 method: 'GET',
24 view: 'pages/limit/add', 49 view: 'pages/limit/add',
25 src: '/product/limit-add', 50 src: '/product/limit-add',
26 - isJsonRaw:true 51 + noApi: true,
  52 + data: {
  53 + data: {}
  54 + }
27 },{ 55 },{
28 // 【限购商品】ajax添加 56 // 【限购商品】ajax添加
29 route: '/limit/product/new', 57 route: '/limit/product/new',
@@ -52,5 +80,98 @@ exports.res = [ @@ -52,5 +80,98 @@ exports.res = [
52 type: 'Number' 80 type: 'Number'
53 } 81 }
54 ] 82 ]
55 - } 83 + }, {
  84 + route: '/limit/edit/:id',
  85 + method: 'GET',
  86 + view: 'pages/limit/add',
  87 + url: '/limitProduct/getLimitProduct',
  88 + isJsonRaw:true,
  89 + data:{
  90 + action:"/limit/update",
  91 + type:"update"
  92 + },
  93 + src:'/product/limit-add',
  94 + params:[
  95 + {name:"id",type:"String"}
  96 + ]
  97 + }, {
  98 + route: '/limit/update',
  99 + method: 'POST',
  100 + url: '/limitProduct/updateLimitProduct',
  101 + isJsonRaw: true,
  102 + params: [
  103 + {
  104 + name: 'attachmentContent',
  105 + type: 'String'
  106 + },
  107 + {
  108 + name: 'batchNo',
  109 + type: 'Number'
  110 + },{
  111 + name: 'saleTime',
  112 + type: 'String'
  113 + },{
  114 + name: 'hotFlag',
  115 + type: 'Number'
  116 + },{
  117 + name:'orderBy',
  118 + type: 'Number'
  119 + },{
  120 + name: 'notSaleOrderBy',
  121 + type: 'Number'
  122 + }
  123 + ]
  124 + }, {
  125 + route: '/limit/ajax/getCodeCount',
  126 + method: 'POST',
  127 + url: '/limitProduct/getCountByStatus',
  128 + isJsonRaw: true,
  129 + params: [
  130 + {
  131 + name: 'hotFlag',
  132 + type: 'Number'
  133 + },{
  134 + name: 'saleFlag',
  135 + type: 'Number'
  136 + },{
  137 + name: 'showFlag',
  138 + type: 'Number'
  139 + },{
  140 + name: 'productName',
  141 + type: 'String'
  142 + },{
  143 + name: 'productSkn',
  144 + type: 'String'
  145 + }
  146 + ]
  147 + }, {
  148 + route: '/limit/audit',
  149 + method: 'POST',
  150 + url: '/limitProduct/auditLimitProduct',
  151 + isJsonRaw: true,
  152 + params: [
  153 + {
  154 + name: 'id',
  155 + type: 'Number'
  156 + },
  157 + {
  158 + name: 'showFlag',
  159 + type: 'String'
  160 + },{
  161 + name: 'hotFlag',
  162 + type: 'Number'
  163 + }
  164 + ]
  165 + }, {
  166 + route: '/limit/delete',
  167 + method: 'POST',
  168 + url: '/limitProduct/deleteLimitProduct',
  169 + isJsonRaw: true,
  170 + params: [
  171 + {
  172 + name: 'id',
  173 + type: 'Number'
  174 + }
  175 + ]
  176 + }
56 ]; 177 ];
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 <div class="contentpanel"> 18 <div class="contentpanel">
19 19
20 <form id="limit-add-form" action="/limit/product/new"> 20 <form id="limit-add-form" action="/limit/product/new">
  21 + {{# data}}
21 <div class="panel-group"> 22 <div class="panel-group">
22 <div class="pannel"> 23 <div class="pannel">
23 <div class="panel-heading"> 24 <div class="panel-heading">
@@ -28,19 +29,19 @@ @@ -28,19 +29,19 @@
28 <div class="row"> 29 <div class="row">
29 <div class="col-md-1 height40"><label>商品名称*:</label></div> 30 <div class="col-md-1 height40"><label>商品名称*:</label></div>
30 <div class="col-md-1"> 31 <div class="col-md-1">
31 - <input id="productName" type="text" class="form-control" style="width:280px;" placeholder="商品名称" required> 32 + <input id="productName" value="{{productName}}" type="text" class="form-control" style="width:280px;" placeholder="商品名称" required>
32 </div> 33 </div>
33 </div> 34 </div>
34 <div class="row"> 35 <div class="row">
35 <div class="col-md-1 height40"><label>限购码批次*:</label></div> 36 <div class="col-md-1 height40"><label>限购码批次*:</label></div>
36 <div class="col-md-1"> 37 <div class="col-md-1">
37 - <input id="batchNo" type="text" class="form-control" style="width:280px;" placeholder="限购码批次" required> 38 + <input id="batchNo" value="{{batchNo}}" type="text" class="form-control" style="width:280px;" placeholder="限购码批次" required>
38 </div> 39 </div>
39 </div> 40 </div>
40 <div class="row mt20"> 41 <div class="row mt20">
41 <div class="col-md-1 height40"><label>发售日期*:</label></div> 42 <div class="col-md-1 height40"><label>发售日期*:</label></div>
42 <div class="col-md-1"> 43 <div class="col-md-1">
43 - <input id="saleTime" type="text" class="form-control" style="width:280px;" placeholder="发售日期" readonly required> 44 + <input id="saleTime" value="{{saleTime}}" type="text" class="form-control" style="width:280px;" placeholder="发售日期" readonly required>
44 </div> 45 </div>
45 </div> 46 </div>
46 </div> 47 </div>
@@ -61,12 +62,12 @@ @@ -61,12 +62,12 @@
61 </div> 62 </div>
62 <div class="col-md-3 height40"> 63 <div class="col-md-3 height40">
63 <label>热门发售排序:</label> 64 <label>热门发售排序:</label>
64 - <label><input id="orderBy" type="text" class="form-control" placeholder=""></label> 65 + <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder=""></label>
65 <p>(提示:数字越大越靠前)</p> 66 <p>(提示:数字越大越靠前)</p>
66 </div> 67 </div>
67 <div class="col-md-3 height40"> 68 <div class="col-md-3 height40">
68 <label>未发售排序:</label> 69 <label>未发售排序:</label>
69 - <label><input id="notSaleOrderBy" type="text" class="form-control" placeholder=""></label> 70 + <label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" type="text" class="form-control" placeholder=""></label>
70 </div> 71 </div>
71 </div> 72 </div>
72 </div> 73 </div>
@@ -80,13 +81,15 @@ @@ -80,13 +81,15 @@
80 </div> 81 </div>
81 <div class="panel-collapse collapse in"> 82 <div class="panel-collapse collapse in">
82 <div class="panel-body"> 83 <div class="panel-body">
  84 +
83 <div class="row mb20"> 85 <div class="row mb20">
84 <h6><label>封面图*:</label></h6> 86 <h6><label>封面图*:</label></h6>
85 <div class="col-md-1" id="coverImgBox"> 87 <div class="col-md-1" id="coverImgBox">
86 - <input type="file" name="coverImg" id="coverImg" placeholder="封面图" required/> 88 +
  89 + <input type="file" name="coverImg" id="coverImg" placeholder="" required/>
87 </div> 90 </div>
88 </div> 91 </div>
89 - 92 +
90 <div class="row mb20"> 93 <div class="row mb20">
91 <div class="col-md-12"> 94 <div class="col-md-12">
92 <div class="quota-text"></div> 95 <div class="quota-text"></div>
@@ -113,6 +116,7 @@ @@ -113,6 +116,7 @@
113 </div> 116 </div>
114 </div> 117 </div>
115 </div> 118 </div>
  119 + {{/ data}}
116 </form> 120 </form>
117 </div> 121 </div>
118 122
@@ -22,22 +22,16 @@ @@ -22,22 +22,16 @@
22 </div> 22 </div>
23 <div class="panel-body"> 23 <div class="panel-body">
24 <div class="row"> 24 <div class="row">
25 - <div class="col-md-3">  
26 - <label class="control-label pull-left">关键词:</label>  
27 - <div class="label-leading pull-left">  
28 - <input class="form-control" type="text" />  
29 - </div>  
30 - </div>  
31 <div class="col-md-2"> 25 <div class="col-md-2">
32 <label class="control-label pull-left">名称:</label> 26 <label class="control-label pull-left">名称:</label>
33 <div class="label-leading pull-left"> 27 <div class="label-leading pull-left">
34 - <input class="form-control" type="text"/> 28 + <input id="product-name" class="form-control" type="text"/>
35 </div> 29 </div>
36 </div> 30 </div>
37 <div class="col-md-2"> 31 <div class="col-md-2">
38 <label class="control-label pull-left">SKN:</label> 32 <label class="control-label pull-left">SKN:</label>
39 <div class="label-leading pull-left"> 33 <div class="label-leading pull-left">
40 - <input class="form-control" type="text"/> 34 + <input id="skn" class="form-control" type="text"/>
41 </div> 35 </div>
42 </div> 36 </div>
43 37
@@ -46,41 +40,30 @@ @@ -46,41 +40,30 @@
46 <div class="col-md-2"> 40 <div class="col-md-2">
47 <label class="control-label pull-left">热门:</label> 41 <label class="control-label pull-left">热门:</label>
48 <div class="label-leading pull-left"> 42 <div class="label-leading pull-left">
49 - <div class="radio pull-left" style="margin: 0 10px;">  
50 - <label><input type="radio" name="hot" value="" checked=""></label>  
51 - </div>  
52 - <div class="radio pull-left" style="margin: 0 10px;">  
53 - <label><input type="radio" name="hot" value=""></label>  
54 - </div> 43 + <label class="radio-inline"><input type="radio" name="hotFlag" value="1"></label>
  44 + <label class="radio-inline"><input type="radio" name="hotFlag" value="0"></label>
  45 + <input type="hidden" id="hotFlag" value="">
55 </div> 46 </div>
56 </div> 47 </div>
57 <div class="col-md-2"> 48 <div class="col-md-2">
58 <label class="control-label pull-left">是否发售:</label> 49 <label class="control-label pull-left">是否发售:</label>
59 <div class="label-leading pull-left"> 50 <div class="label-leading pull-left">
60 - <div class="radio pull-left" style="margin: 0 10px;">  
61 - <label><input type="radio" name="isSale" value="" checked=""></label>  
62 - </div>  
63 - <div class="radio pull-left" style="margin: 0 10px;">  
64 - <label><input type="radio" name="isSale" value=""></label>  
65 - </div> 51 + <label class="radio-inline"><input type="radio" name="saleFlag" value="1"></label>
  52 + <label class="radio-inline"><input type="radio" name="saleFlag" value="0"></label>
66 </div> 53 </div>
67 </div> 54 </div>
68 <div class="col-md-2"> 55 <div class="col-md-2">
69 <label class="control-label pull-left">是否开启:</label> 56 <label class="control-label pull-left">是否开启:</label>
70 <div class="label-leading pull-left"> 57 <div class="label-leading pull-left">
71 - <div class="radio pull-left" style="margin: 0 10px;">  
72 - <label><input type="radio" name="isOpen" value="" checked=""></label>  
73 - </div>  
74 - <div class="radio pull-left" style="margin: 0 10px;">  
75 - <label><input type="radio" name="isOpen" value=""></label>  
76 - </div> 58 + <label class="radio-inline"><input type="radio" name="showFlag" value="1"></label>
  59 + <label class="radio-inline"><input type="radio" name="showFlag" value="0"></label>
77 </div> 60 </div>
78 </div> 61 </div>
79 </div> 62 </div>
80 <div class="row"> 63 <div class="row">
81 <div class="col-md-12 mt20"> 64 <div class="col-md-12 mt20">
82 - <button class="btn btn-primary pull-left mr20">筛选</button>  
83 - <button class="btn btn-primary pull-left mr20">全部</button> 65 + <button id="filter-btn" class="btn btn-primary pull-left mr20">筛选</button>
  66 + <a class="btn btn-primary pull-left mr20" href="">全部</a>
84 </div> 67 </div>
85 </div> 68 </div>
86 </div> 69 </div>
@@ -88,6 +71,7 @@ @@ -88,6 +71,7 @@
88 71
89 <div class="row"> 72 <div class="row">
90 <div class="col-md-12 mt20"> 73 <div class="col-md-12 mt20">
  74 + <div class="dataTab_wrapper" id="basicTab"></div>
91 <div id="limit-table-box" class="table-responsive"></div> 75 <div id="limit-table-box" class="table-responsive"></div>
92 </div> 76 </div>
93 </div> 77 </div>