Authored by 姜敏

逛bug修复

@@ -15,7 +15,7 @@ var ENUM = { @@ -15,7 +15,7 @@ var ENUM = {
15 }, 15 },
16 status: { 16 status: {
17 '1': "开启", 17 '1': "开启",
18 - '0': "关闭", 18 + '0': "关闭"
19 19
20 }, 20 },
21 tab: { 21 tab: {
@@ -130,10 +130,12 @@ var g = new common.grid({ @@ -130,10 +130,12 @@ var g = new common.grid({
130 hidden: true, 130 hidden: true,
131 131
132 render: function(item) { 132 render: function(item) {
133 - var html = [];  
134 - html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>");  
135 -  
136 - return html.join(''); 133 + //var html = [];
  134 + //html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>");
  135 + //return html.join('');
  136 + var t = new Date(item.createTime * 1000);
  137 + var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
  138 + return "<p>" + formatted + "</p>";
137 } 139 }
138 },{ 140 },{
139 // 4 141 // 4
@@ -14,10 +14,10 @@ var ENUM = { @@ -14,10 +14,10 @@ var ENUM = {
14 }, 14 },
15 status: { 15 status: {
16 '1': "开启", 16 '1': "开启",
17 - '0': "关闭", 17 + '0': "关闭"
18 18
19 } 19 }
20 -} 20 +};
21 21
22 var currentSelItem; 22 var currentSelItem;
23 23
@@ -41,7 +41,7 @@ new common.dropDown({ @@ -41,7 +41,7 @@ new common.dropDown({
41 41
42 var t = new common.tab({ 42 var t = new common.tab({
43 el: "#basicTab", 43 el: "#basicTab",
44 - click: function() { 44 + click: function () {
45 45
46 var columnname = $(this).find('a').attr('columnname'); 46 var columnname = $(this).find('a').attr('columnname');
47 47
@@ -53,7 +53,7 @@ var t = new common.tab({ @@ -53,7 +53,7 @@ var t = new common.tab({
53 g.options.columns[6].hidden = false; 53 g.options.columns[6].hidden = false;
54 g.options.columns[7].hidden = true; 54 g.options.columns[7].hidden = true;
55 55
56 - } else if(columnname == 100) { 56 + } else if (columnname == 100) {
57 g.options.columns[2].hidden = true; 57 g.options.columns[2].hidden = true;
58 g.options.columns[3].hidden = false; 58 g.options.columns[3].hidden = false;
59 g.options.columns[4].hidden = false; 59 g.options.columns[4].hidden = false;
@@ -88,30 +88,29 @@ var t = new common.tab({ @@ -88,30 +88,29 @@ var t = new common.tab({
88 88
89 var g = new common.grid({ 89 var g = new common.grid({
90 el: '#basicTable', 90 el: '#basicTable',
91 - parms: function() { 91 + parms: function () {
92 return { 92 return {
93 93
94 brandId: common.util.__input("brandId"), 94 brandId: common.util.__input("brandId"),
95 isPayDelivery: common.util.__input("isPayDelivery"), 95 isPayDelivery: common.util.__input("isPayDelivery"),
96 productSkn: common.util.__input("productSkn"), 96 productSkn: common.util.__input("productSkn"),
97 - status: (t.active && t.active!='all') ? t.active : 400 97 + status: (t.active && t.active != 'all') ? t.active : 400
98 98
99 }; 99 };
100 }, 100 },
101 columns: [{ 101 columns: [{
102 display: 'SKN', 102 display: 'SKN',
103 name: 'productSkn' 103 name: 'productSkn'
104 - },{ 104 + }, {
105 display: '品牌', 105 display: '品牌',
106 name: 'brandName' 106 name: 'brandName'
107 }, 107 },
108 // 审核状态(全部商品是显示) 2 108 // 审核状态(全部商品是显示) 2
109 { 109 {
110 display: "状态", 110 display: "状态",
111 - render: function(item) { 111 + render: function (item) {
112 var html = []; 112 var html = [];
113 html.push("<p>" + ENUM.status[item.isPayDelivery] + "</p>"); 113 html.push("<p>" + ENUM.status[item.isPayDelivery] + "</p>");
114 -  
115 return html.join(''); 114 return html.join('');
116 } 115 }
117 }, 116 },
@@ -119,7 +118,7 @@ var g = new common.grid({ @@ -119,7 +118,7 @@ var g = new common.grid({
119 display: "申请人", 118 display: "申请人",
120 hidden: true, 119 hidden: true,
121 120
122 - render: function(item) { 121 + render: function (item) {
123 var html = []; 122 var html = [];
124 html.push("<p>" + common.util.__filterNull(item, 'applicant') + "</p>"); 123 html.push("<p>" + common.util.__filterNull(item, 'applicant') + "</p>");
125 124
@@ -129,23 +128,22 @@ var g = new common.grid({ @@ -129,23 +128,22 @@ var g = new common.grid({
129 display: "申请时间", 128 display: "申请时间",
130 hidden: true, 129 hidden: true,
131 130
132 - render: function(item) { 131 + render: function (item) {
133 var html = []; 132 var html = [];
134 html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>"); 133 html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>");
135 -  
136 return html.join(''); 134 return html.join('');
137 } 135 }
138 - },{ 136 + }, {
139 // 5 137 // 5
140 display: '驳回理由', 138 display: '驳回理由',
141 hidden: true, 139 hidden: true,
142 name: 'rejectReason', // 8待上架,2待审核,3驳回,4通过,1已上架,0已下架,5再上架待审核,6再上架驳回,7再上架通过 140 name: 'rejectReason', // 8待上架,2待审核,3驳回,4通过,1已上架,0已下架,5再上架待审核,6再上架驳回,7再上架通过
143 - render: function(item) {  
144 - return '<p style="color:red;">' + common.util.__filterNull(item, 'rejectReason') + '</p>' ; 141 + render: function (item) {
  142 + return '<p style="color:red;">' + common.util.__filterNull(item, 'rejectReason') + '</p>';
145 } 143 }
146 }, { // 6 144 }, { // 6
147 display: "操作", 145 display: "操作",
148 - render: function(item) { 146 + render: function (item) {
149 var html = []; 147 var html = [];
150 if (item.isPayDelivery == 1) { // 待审核 148 if (item.isPayDelivery == 1) { // 待审核
151 html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-close" data-type="close">关闭</a>'); 149 html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-close" data-type="close">关闭</a>');
@@ -156,15 +154,14 @@ var g = new common.grid({ @@ -156,15 +154,14 @@ var g = new common.grid({
156 154
157 return html.join(''); 155 return html.join('');
158 } 156 }
159 - },{ // 7 157 + }, { // 7
160 display: "操作", 158 display: "操作",
161 hidden: true, 159 hidden: true,
162 - render: function(item) { 160 + render: function (item) {
163 var html = []; 161 var html = [];
164 162
165 - html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject" data-type="reject">驳回</a>');  
166 - html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass" data-type="pass">通过</a>');  
167 - 163 + html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject" data-type="reject">驳回</a>');
  164 + html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass" data-type="pass">通过</a>');
168 165
169 166
170 return html.join(''); 167 return html.join('');
@@ -175,13 +172,13 @@ var g = new common.grid({ @@ -175,13 +172,13 @@ var g = new common.grid({
175 g.init('/payDelivery/queryPayDeliveryList'); 172 g.init('/payDelivery/queryPayDeliveryList');
176 173
177 // tab初始化 174 // tab初始化
178 -var loadTab = function() { 175 +var loadTab = function () {
179 t.active = undefined; 176 t.active = undefined;
180 - setTimeout(function() { 177 + setTimeout(function () {
181 common.util.__ajax({ 178 common.util.__ajax({
182 url: "/payDelivery/queryCountProductPayDelivery", 179 url: "/payDelivery/queryCountProductPayDelivery",
183 data: g.options.parms() 180 data: g.options.parms()
184 - }, function(res) { 181 + }, function (res) {
185 var __dt = $.extend({}, ENUM.tips, res.data); 182 var __dt = $.extend({}, ENUM.tips, res.data);
186 t.init(__dt); 183 t.init(__dt);
187 }, true); 184 }, true);
@@ -190,7 +187,7 @@ var loadTab = function() { @@ -190,7 +187,7 @@ var loadTab = function() {
190 187
191 loadTab(); 188 loadTab();
192 // 筛选 189 // 筛选
193 -$(document).on('click', "#filter-btn", function() { 190 +$(document).on('click', "#filter-btn", function () {
194 loadTab(); 191 loadTab();
195 g.options.columns[2].hidden = false; 192 g.options.columns[2].hidden = false;
196 g.options.columns[3].hidden = true; 193 g.options.columns[3].hidden = true;
@@ -202,18 +199,18 @@ $(document).on('click', "#filter-btn", function() { @@ -202,18 +199,18 @@ $(document).on('click', "#filter-btn", function() {
202 }); 199 });
203 200
204 201
205 -$(document).on('click', ".edit-class-btn", function() { 202 +$(document).on('click', ".edit-class-btn", function () {
206 console.log($(this).data('type')); 203 console.log($(this).data('type'));
207 var btnType = $(this).data('type'); 204 var btnType = $(this).data('type');
208 205
209 var url = ''; 206 var url = '';
210 var alertContent; 207 var alertContent;
211 currentSelItem = g.rows[$(this).data("index")]; 208 currentSelItem = g.rows[$(this).data("index")];
212 - var data = function() { 209 + var data = function () {
213 210
214 var reason = $('#reason').val(); 211 var reason = $('#reason').val();
215 if (reason === '' || $.trim(reason) === '') { 212 if (reason === '' || $.trim(reason) === '') {
216 - if(btnType == 'reject') { 213 + if (btnType == 'reject') {
217 return "请填写驳回原因"; 214 return "请填写驳回原因";
218 } 215 }
219 } 216 }
@@ -222,7 +219,7 @@ $(document).on('click', ".edit-class-btn", function() { @@ -222,7 +219,7 @@ $(document).on('click', ".edit-class-btn", function() {
222 brandName: currentSelItem.brandName, 219 brandName: currentSelItem.brandName,
223 brandId: currentSelItem.brandId, 220 brandId: currentSelItem.brandId,
224 rejectReason: reason, 221 rejectReason: reason,
225 - id:currentSelItem.id 222 + id: currentSelItem.id
226 }; 223 };
227 } 224 }
228 225
@@ -264,17 +261,17 @@ $(document).on('click', ".edit-class-btn", function() { @@ -264,17 +261,17 @@ $(document).on('click', ".edit-class-btn", function() {
264 break; 261 break;
265 } 262 }
266 263
267 - common.dialog.confirm("温馨提示", alertContent, function() { 264 + common.dialog.confirm("温馨提示", alertContent, function () {
268 common.util.__ajax({ 265 common.util.__ajax({
269 url: url, 266 url: url,
270 data: data() 267 data: data()
271 - }, function() { 268 + }, function () {
272 g.reload(); 269 g.reload();
273 loadTab(); 270 loadTab();
274 }); 271 });
275 }); 272 });
276 }); 273 });
277 274
278 -$('#export-btn').on('click', function() { 275 +$('#export-btn').on('click', function () {
279 window.open("/ajax/down?queryConf=" + JSON.stringify(g.options.parms()) + "&type=productPayDeliveryExport"); 276 window.open("/ajax/down?queryConf=" + JSON.stringify(g.options.parms()) + "&type=productPayDeliveryExport");
280 }); 277 });
@@ -9,13 +9,13 @@ var ENUM = { @@ -9,13 +9,13 @@ var ENUM = {
9 GenderEnum: { 9 GenderEnum: {
10 '1': '男', 10 '1': '男',
11 '2': '女', 11 '2': '女',
12 - '3': '通用', 12 + '3': '通用'
13 }, 13 },
14 14
15 StatusEnum: { 15 StatusEnum: {
16 0:'关闭', 16 0:'关闭',
17 - 1:'开启',  
18 - }, 17 + 1:'开启'
  18 + }
19 19
20 } 20 }
21 21
@@ -77,15 +77,14 @@ var g = new common.grid({ @@ -77,15 +77,14 @@ var g = new common.grid({
77 return HtmArr.join(''); 77 return HtmArr.join('');
78 } 78 }
79 }] 79 }]
80 -}) 80 +});
81 g.init('/guang/article/categoryist'); 81 g.init('/guang/article/categoryist');
82 82
83 //==================== 按钮点击事件 =====================// 83 //==================== 按钮点击事件 =====================//
84 84
85 //添加 85 //添加
86 $(document).on('click', '#add', function() { 86 $(document).on('click', '#add', function() {
87 - articleCategoryOP("新增", '/guang/article/sort/add', {});  
88 - 87 + articleCategoryOP("新增", '/guang/article/sort/add', {})
89 }); 88 });
90 89
91 //编辑 90 //编辑
@@ -97,7 +96,6 @@ $(document).on('click', '.info-modify', function() { @@ -97,7 +96,6 @@ $(document).on('click', '.info-modify', function() {
97 //删除 96 //删除
98 $(document).on('click', '.info-del', function() { 97 $(document).on('click', '.info-del', function() {
99 var item = g.rows[$(this).data("index")]; 98 var item = g.rows[$(this).data("index")];
100 -  
101 common.dialog.confirm("温馨提示","确定要删除该文章分类?" , function() { 99 common.dialog.confirm("温馨提示","确定要删除该文章分类?" , function() {
102 common.util.__ajax({ 100 common.util.__ajax({
103 url: '/guang/article/sort/del', 101 url: '/guang/article/sort/del',
@@ -4,35 +4,23 @@ @@ -4,35 +4,23 @@
4 var $ = require('jquery'), 4 var $ = require('jquery'),
5 common = require('../common/common'); 5 common = require('../common/common');
6 6
7 -  
8 -/**  
9 - * Created by wangqianjun on 16/3/22.  
10 - */  
11 -  
12 -'use strict';  
13 -var $ = require('jquery'),  
14 - common = require('../common/common');  
15 -  
16 var STATUS = 0; 7 var STATUS = 0;
17 8
18 var ENUM = { 9 var ENUM = {
19 HotEnum: { 10 HotEnum: {
20 '1': '是', 11 '1': '是',
21 - '0': '否', 12 + '0': '否'
22 }, 13 },
23 -  
24 StatusEnum: { 14 StatusEnum: {
25 '-1':'屏蔽', 15 '-1':'屏蔽',
26 0:'待审核', 16 0:'待审核',
27 - 1:'通过',  
28 - },  
29 -  
30 -} 17 + 1:'通过'
  18 + }
  19 +};
31 20
32 new common.dropDown({ 21 new common.dropDown({
33 el: "#condNum", 22 el: "#condNum",
34 - ajax: 'guangCommentGetFilterItems',  
35 - 23 + ajax: 'guangCommentGetFilterItems'
36 }); 24 });
37 25
38 var g = new common.grid({ 26 var g = new common.grid({
@@ -42,11 +30,10 @@ var g = new common.grid({ @@ -42,11 +30,10 @@ var g = new common.grid({
42 return { 30 return {
43 status: STATUS, 31 status: STATUS,
44 condNum: common.util.__input('condNum'), 32 condNum: common.util.__input('condNum'),
45 - condContent: common.util.__input('condContent'), 33 + condContent: common.util.__input('condContent')
46 }; 34 };
47 }, 35 },
48 columns: [ 36 columns: [
49 -  
50 { 37 {
51 display: '', 38 display: '',
52 type: 'checkbox' 39 type: 'checkbox'
@@ -69,13 +56,12 @@ var g = new common.grid({ @@ -69,13 +56,12 @@ var g = new common.grid({
69 { 56 {
70 display: "回复内容", 57 display: "回复内容",
71 name: "content", 58 name: "content",
72 - width:'15%', 59 + width:'15%'
73 }, 60 },
74 61
75 - {display: "回复文章", name: "articleTitle", width:'15%',}, 62 + {display: "回复文章", name: "articleTitle", width:'15%'},
76 {display: "编辑", name: "editorName"}, 63 {display: "编辑", name: "editorName"},
77 64
78 -  
79 { 65 {
80 display: '状态', 66 display: '状态',
81 render: function (item) { 67 render: function (item) {
@@ -2,23 +2,23 @@ @@ -2,23 +2,23 @@
2 * Created by wangqianjun on 16/3/22. 2 * Created by wangqianjun on 16/3/22.
3 */ 3 */
4 var $ = require('jquery'); 4 var $ = require('jquery');
5 - common = require('../common/common');  
6 - datepicker = require('../util/datepicker'); 5 +common = require('../common/common');
  6 +datepicker = require('../util/datepicker');
7 7
8 var ENUM = { 8 var ENUM = {
9 GenderEnum: { 9 GenderEnum: {
10 - '1':'男',  
11 - '2':'女',  
12 - '3':'通用', 10 + '1': '男',
  11 + '2': '女',
  12 + '3': '通用'
13 }, 13 },
14 14
15 StatusEnum: { 15 StatusEnum: {
16 - '-1':'已关闭',  
17 - 0:'未发布',  
18 - 1:'开启',  
19 - }, 16 + '-1': '已关闭',
  17 + 0: '未发布',
  18 + 1: '已发布'
  19 + }
20 20
21 -} 21 +};
22 22
23 //下拉框 23 //下拉框
24 new common.dropDown({ 24 new common.dropDown({
@@ -67,7 +67,7 @@ var Timmer = { @@ -67,7 +67,7 @@ var Timmer = {
67 var g = new common.grid({ 67 var g = new common.grid({
68 el: '#basicTable', 68 el: '#basicTable',
69 size: 10, 69 size: 10,
70 - parms: function() { 70 + parms: function () {
71 71
72 return { 72 return {
73 articleTitle: common.util.__input('articleTitle'), 73 articleTitle: common.util.__input('articleTitle'),
@@ -77,7 +77,7 @@ var g = new common.grid({ @@ -77,7 +77,7 @@ var g = new common.grid({
77 status: $('#status').val(),//common.util.__input('status'), 77 status: $('#status').val(),//common.util.__input('status'),
78 orderBy: common.util.__input('orderBy'), 78 orderBy: common.util.__input('orderBy'),
79 startTime: common.util.__input('starttime'), 79 startTime: common.util.__input('starttime'),
80 - endTime: common.util.__input('endtime'), 80 + endTime: common.util.__input('endtime')
81 }; 81 };
82 }, 82 },
83 columns: [{ 83 columns: [{
@@ -85,17 +85,17 @@ var g = new common.grid({ @@ -85,17 +85,17 @@ var g = new common.grid({
85 name: "id" 85 name: "id"
86 }, { 86 }, {
87 display: "缩略图", 87 display: "缩略图",
88 - render: function(item) { 88 + render: function (item) {
89 89
90 - item.coverImage = common.util.__template(item.coverImage,{mode:2,width:100,height:100}); 90 + item.coverImage = common.util.__template(item.coverImage, {mode: 2, width: 100, height: 100});
91 return '<img src="' + item.coverImage + '" width="100" height="60"/>' 91 return '<img src="' + item.coverImage + '" width="100" height="60"/>'
92 } 92 }
93 }, { 93 }, {
94 display: '文章标题', 94 display: '文章标题',
95 //name: "articleTitle", 95 //name: "articleTitle",
96 - width:'15%',  
97 - render: function(item) {  
98 - return '<span class="text-overflow"">'+item.articleTitle+'</span>' 96 + width: '15%',
  97 + render: function (item) {
  98 + return '<span class="text-overflow"">' + item.articleTitle + '</span>'
99 } 99 }
100 }, { 100 }, {
101 display: '分类', 101 display: '分类',
@@ -103,7 +103,7 @@ var g = new common.grid({ @@ -103,7 +103,7 @@ var g = new common.grid({
103 }, { 103 }, {
104 display: '性别', 104 display: '性别',
105 render: function (item) { 105 render: function (item) {
106 - return "<p>" + ENUM.GenderEnum[item.articleGender] + "</p>"; 106 + return "<p>" + ENUM.GenderEnum[item.articleGender] + "</p>";
107 } 107 }
108 }, { 108 }, {
109 display: '作者', 109 display: '作者',
@@ -111,29 +111,39 @@ var g = new common.grid({ @@ -111,29 +111,39 @@ var g = new common.grid({
111 }, { 111 }, {
112 display: '状态', 112 display: '状态',
113 render: function (item) { 113 render: function (item) {
114 - return "<p>" + ENUM.StatusEnum[item.status] + "</p>"; 114 + return "<p>" + ENUM.StatusEnum[item.status] + "</p>";
115 } 115 }
116 }, { 116 }, {
117 display: "创建时间", 117 display: "创建时间",
118 118
119 render: function (item) { 119 render: function (item) {
120 - var t = new Date(item.createTime * 1000);  
121 - var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");  
122 - return "<p>" + formatted + "</p>"; 120 + if (item.createTime && item.createTime !== 0) {
  121 + var t = new Date(item.createTime * 1000);
  122 + var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
  123 + return "<p>" + formatted + "</p>";
  124 + }
  125 + else {
  126 + return "";
  127 + }
  128 +
123 } 129 }
124 }, { 130 }, {
125 display: "发布时间", 131 display: "发布时间",
126 -  
127 render: function (item) { 132 render: function (item) {
128 - var t = new Date(item.publishTime * 1000);  
129 - var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");  
130 - return "<p>" + formatted + "</p>"; 133 + if (item.publishTime && item.publishTime !== 0) {
  134 + var t = new Date(item.publishTime * 1000);
  135 + var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
  136 + return "<p>" + formatted + "</p>";
  137 + }
  138 + else {
  139 + return "";
  140 + }
131 } 141 }
132 - },{ 142 + }, {
133 display: '操作', 143 display: '操作',
134 //} 144 //}
135 name: "status", 145 name: "status",
136 - render: function(items) { 146 + render: function (items) {
137 var HtmArr = []; 147 var HtmArr = [];
138 148
139 if (items.status == 1) { 149 if (items.status == 1) {
@@ -150,24 +160,23 @@ var g = new common.grid({ @@ -150,24 +160,23 @@ var g = new common.grid({
150 160
151 } 161 }
152 162
153 - HtmArr.push('<a data-index="' + items.__index + '" href="/guang/article/contentEdit/'+items.id+'" class="btn btn-primary btn-xs info-modify">编辑</a>'); 163 + HtmArr.push('<a data-index="' + items.__index + '" href="/guang/article/contentEdit/' + items.id + '" class="btn btn-primary btn-xs info-modify">编辑</a>');
154 HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-del">删除</a>'); 164 HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-del">删除</a>');
155 165
156 return HtmArr.join(''); 166 return HtmArr.join('');
157 } 167 }
158 }] 168 }]
159 -}) 169 +});
160 g.init('/guang/article/list'); 170 g.init('/guang/article/list');
161 171
162 172
163 -  
164 //==================== 按钮点击事件 =====================// 173 //==================== 按钮点击事件 =====================//
165 -$("#filter-btn").click(function() { 174 +$("#filter-btn").click(function () {
166 g.reload(1); 175 g.reload(1);
167 }); 176 });
168 177
169 //关闭资讯 178 //关闭资讯
170 -$(document).on('click', '.info-close', function() { 179 +$(document).on('click', '.info-close', function () {
171 var item = g.rows[$(this).data("index")]; 180 var item = g.rows[$(this).data("index")];
172 181
173 common.util.__ajax({ 182 common.util.__ajax({
@@ -176,7 +185,7 @@ $(document).on('click', '.info-close', function() { @@ -176,7 +185,7 @@ $(document).on('click', '.info-close', function() {
176 id: item.id, 185 id: item.id,
177 status: -1 186 status: -1
178 } 187 }
179 - }, function(res) { 188 + }, function (res) {
180 189
181 if (res.code == 200) { 190 if (res.code == 200) {
182 common.util.__tip('关闭资讯成功', 'success'); 191 common.util.__tip('关闭资讯成功', 'success');
@@ -188,7 +197,7 @@ $(document).on('click', '.info-close', function() { @@ -188,7 +197,7 @@ $(document).on('click', '.info-close', function() {
188 }); 197 });
189 198
190 //打开资讯 199 //打开资讯
191 -$(document).on('click', '.info-open', function() { 200 +$(document).on('click', '.info-open', function () {
192 var item = g.rows[$(this).data("index")]; 201 var item = g.rows[$(this).data("index")];
193 202
194 common.util.__ajax({ 203 common.util.__ajax({
@@ -197,7 +206,7 @@ $(document).on('click', '.info-open', function() { @@ -197,7 +206,7 @@ $(document).on('click', '.info-open', function() {
197 id: item.id, 206 id: item.id,
198 status: 1 207 status: 1
199 } 208 }
200 - }, function(res) { 209 + }, function (res) {
201 210
202 if (res.code == 200) { 211 if (res.code == 200) {
203 common.util.__tip('开启资讯成功', 'success'); 212 common.util.__tip('开启资讯成功', 'success');
@@ -209,7 +218,7 @@ $(document).on('click', '.info-open', function() { @@ -209,7 +218,7 @@ $(document).on('click', '.info-open', function() {
209 }); 218 });
210 219
211 //推荐 220 //推荐
212 -$(document).on('click', '.info-recommend', function() { 221 +$(document).on('click', '.info-recommend', function () {
213 var item = g.rows[$(this).data("index")]; 222 var item = g.rows[$(this).data("index")];
214 223
215 common.util.__ajax({ 224 common.util.__ajax({
@@ -218,7 +227,7 @@ $(document).on('click', '.info-recommend', function() { @@ -218,7 +227,7 @@ $(document).on('click', '.info-recommend', function() {
218 id: item.id, 227 id: item.id,
219 isRecommend: 1 228 isRecommend: 1
220 } 229 }
221 - }, function(res) { 230 + }, function (res) {
222 231
223 if (res.code == 200) { 232 if (res.code == 200) {
224 common.util.__tip('成功推荐', 'success'); 233 common.util.__tip('成功推荐', 'success');
@@ -230,7 +239,7 @@ $(document).on('click', '.info-recommend', function() { @@ -230,7 +239,7 @@ $(document).on('click', '.info-recommend', function() {
230 }); 239 });
231 240
232 //取消推荐 241 //取消推荐
233 -$(document).on('click', '.info-recommend-cancel', function() { 242 +$(document).on('click', '.info-recommend-cancel', function () {
234 var item = g.rows[$(this).data("index")]; 243 var item = g.rows[$(this).data("index")];
235 244
236 common.util.__ajax({ 245 common.util.__ajax({
@@ -239,7 +248,7 @@ $(document).on('click', '.info-recommend-cancel', function() { @@ -239,7 +248,7 @@ $(document).on('click', '.info-recommend-cancel', function() {
239 id: item.id, 248 id: item.id,
240 isRecommend: 0 249 isRecommend: 0
241 } 250 }
242 - }, function(res) { 251 + }, function (res) {
243 252
244 if (res.code == 200) { 253 if (res.code == 200) {
245 common.util.__tip('成功取消推荐', 'success'); 254 common.util.__tip('成功取消推荐', 'success');
@@ -253,24 +262,20 @@ $(document).on('click', '.info-recommend-cancel', function() { @@ -253,24 +262,20 @@ $(document).on('click', '.info-recommend-cancel', function() {
253 //定时 262 //定时
254 $(document).on("click", ".info-time", function () { 263 $(document).on("click", ".info-time", function () {
255 var item = g.rows[$(this).data("index")]; 264 var item = g.rows[$(this).data("index")];
256 -  
257 - //$('#title').val("title");  
258 var data = function () { 265 var data = function () {
259 -  
260 var dateString = common.util.__input('datepicker'); 266 var dateString = common.util.__input('datepicker');
261 if (dateString === '' || $.trim(dateString) === '') { 267 if (dateString === '' || $.trim(dateString) === '') {
262 return "请填写时间"; 268 return "请填写时间";
263 } 269 }
264 -  
265 return { 270 return {
266 publishTime: dateString, 271 publishTime: dateString,
267 id: item.id 272 id: item.id
268 }; 273 };
269 - } 274 + };
270 Timmer.toast(common.util.__template2($("#template").html(), item), data); 275 Timmer.toast(common.util.__template2($("#template").html(), item), data);
271 -  
272 $('#datepicker').fdatepicker({ 276 $('#datepicker').fdatepicker({
273 - format: 'yyyy-mm-dd' 277 + format: 'yyyy-mm-dd hh:mm',
  278 + pickTime:true
274 }); 279 });
275 }); 280 });
276 281
@@ -282,7 +287,7 @@ $(document).on("click", ".info-del", function () { @@ -282,7 +287,7 @@ $(document).on("click", ".info-del", function () {
282 common.util.__ajax({ 287 common.util.__ajax({
283 url: '/guang/article/del', 288 url: '/guang/article/del',
284 data: { 289 data: {
285 - id:item.id 290 + id: item.id
286 } 291 }
287 }, function () { 292 }, function () {
288 g.reload(); 293 g.reload();
@@ -10,7 +10,7 @@ exports.res = [{ @@ -10,7 +10,7 @@ exports.res = [{
10 route: '/goods/cod/brand/index', 10 route: '/goods/cod/brand/index',
11 method: 'GET', 11 method: 'GET',
12 view: 'pages/goods/cod-brand', 12 view: 'pages/goods/cod-brand',
13 - src: '/goods/cod-brand', 13 + src: '/goods/cod-brand'
14 }, { 14 }, {
15 route: '/payDelivery/queryTotalBrandPayDelivery', 15 route: '/payDelivery/queryTotalBrandPayDelivery',
16 method: 'POST', 16 method: 'POST',
@@ -21,8 +21,8 @@ exports.res = [{ @@ -21,8 +21,8 @@ exports.res = [{
21 {name: 'isPayDelivery', type: 'Number'}, 21 {name: 'isPayDelivery', type: 'Number'},
22 {name: 'checkStatus', type: 'Number'}, 22 {name: 'checkStatus', type: 'Number'},
23 {name: 'page', type: 'Number'}, 23 {name: 'page', type: 'Number'},
24 - {name: 'size', type: 'Number'},  
25 - ], 24 + {name: 'size', type: 'Number'}
  25 + ]
26 }, { 26 }, {
27 // 开启 & 关闭 货到付款 27 // 开启 & 关闭 货到付款
28 route: '/payDelivery/addPayDeliveryCheck', 28 route: '/payDelivery/addPayDeliveryCheck',
@@ -31,8 +31,8 @@ exports.res = [{ @@ -31,8 +31,8 @@ exports.res = [{
31 params: [ 31 params: [
32 {name: 'isPayDelivery', type: 'Number'}, 32 {name: 'isPayDelivery', type: 'Number'},
33 {name: 'brandName', type: 'String'}, 33 {name: 'brandName', type: 'String'},
34 - {name: 'brandId', type: 'Number'},  
35 - ], 34 + {name: 'brandId', type: 'Number'}
  35 + ]
36 },{ 36 },{
37 // 通过 & 驳回申请 37 // 通过 & 驳回申请
38 route: '/payDelivery/reviewPayDeliveryCheck', 38 route: '/payDelivery/reviewPayDeliveryCheck',
@@ -44,9 +44,8 @@ exports.res = [{ @@ -44,9 +44,8 @@ exports.res = [{
44 {name: 'rejectReason', type: 'String'}, 44 {name: 'rejectReason', type: 'String'},
45 {name: 'isPayDelivery', type: 'Number'}, 45 {name: 'isPayDelivery', type: 'Number'},
46 {name: 'checkStatus', type: 'Number'}, 46 {name: 'checkStatus', type: 'Number'},
47 - {name: 'id', type: 'Number'},  
48 -  
49 - ], 47 + {name: 'id', type: 'Number'}
  48 + ]
50 }, 49 },
51 // 获取tab上的数量 50 // 获取tab上的数量
52 { 51 {
@@ -55,15 +54,15 @@ exports.res = [{ @@ -55,15 +54,15 @@ exports.res = [{
55 url: '/payDelivery/queryCountBrandPayDelivery', 54 url: '/payDelivery/queryCountBrandPayDelivery',
56 params: [ 55 params: [
57 {name: 'brandId', type: 'Number'}, 56 {name: 'brandId', type: 'Number'},
58 - {name: 'isPayDelivery', type: 'Number'},  
59 - ], 57 + {name: 'isPayDelivery', type: 'Number'}
  58 + ]
60 }, 59 },
61 // ====================== 单品货到付款限制页面路由 =================== 60 // ====================== 单品货到付款限制页面路由 ===================
62 { 61 {
63 route: '/goods/cod/goods/index', 62 route: '/goods/cod/goods/index',
64 method: 'GET', 63 method: 'GET',
65 view: 'pages/goods/cod-goods', 64 view: 'pages/goods/cod-goods',
66 - src: '/goods/cod-goods', 65 + src: '/goods/cod-goods'
67 }, { 66 }, {
68 route: '/payDelivery/queryPayDeliveryList', 67 route: '/payDelivery/queryPayDeliveryList',
69 method: 'POST', 68 method: 'POST',
@@ -75,8 +74,8 @@ exports.res = [{ @@ -75,8 +74,8 @@ exports.res = [{
75 {name: 'status', type:'Number'}, 74 {name: 'status', type:'Number'},
76 {name: 'productSkn', type:'Number'}, 75 {name: 'productSkn', type:'Number'},
77 {name: 'page', type: 'Number'}, 76 {name: 'page', type: 'Number'},
78 - {name: 'size', type: 'Number'},  
79 - ], 77 + {name: 'size', type: 'Number'}
  78 + ]
80 }, 79 },
81 { 80 {
82 // 开启货到付款 81 // 开启货到付款
@@ -86,8 +85,8 @@ exports.res = [{ @@ -86,8 +85,8 @@ exports.res = [{
86 params: [ 85 params: [
87 {name: 'productSkn', type: 'String'}, 86 {name: 'productSkn', type: 'String'},
88 {name: 'brandName', type: 'String'}, 87 {name: 'brandName', type: 'String'},
89 - {name: 'brandId', type: 'Number'},  
90 - ], 88 + {name: 'brandId', type: 'Number'}
  89 + ]
91 },{ 90 },{
92 // 关闭货到付款 91 // 关闭货到付款
93 route: '/payDelivery/closePayDelivery', 92 route: '/payDelivery/closePayDelivery',
@@ -96,8 +95,8 @@ exports.res = [{ @@ -96,8 +95,8 @@ exports.res = [{
96 params: [ 95 params: [
97 {name: 'productSkn', type: 'String'}, 96 {name: 'productSkn', type: 'String'},
98 {name: 'brandName', type: 'String'}, 97 {name: 'brandName', type: 'String'},
99 - {name: 'brandId', type: 'Number'},  
100 - ], 98 + {name: 'brandId', type: 'Number'}
  99 + ]
101 },{ 100 },{
102 // 通过申请 101 // 通过申请
103 route: '/payDelivery/passPayDelivery', 102 route: '/payDelivery/passPayDelivery',
@@ -107,8 +106,8 @@ exports.res = [{ @@ -107,8 +106,8 @@ exports.res = [{
107 {name: 'productSkn', type: 'String'}, 106 {name: 'productSkn', type: 'String'},
108 {name: 'brandName', type: 'String'}, 107 {name: 'brandName', type: 'String'},
109 {name: 'brandId', type: 'Number'}, 108 {name: 'brandId', type: 'Number'},
110 - {name: 'id', type: 'Number'},  
111 - ], 109 + {name: 'id', type: 'Number'}
  110 + ]
112 },{ 111 },{
113 // 驳回申请 112 // 驳回申请
114 route: '/payDelivery/rejectPayDelivery', 113 route: '/payDelivery/rejectPayDelivery',
@@ -119,8 +118,8 @@ exports.res = [{ @@ -119,8 +118,8 @@ exports.res = [{
119 {name: 'brandName', type: 'String'}, 118 {name: 'brandName', type: 'String'},
120 {name: 'rejectReason', type: 'String'}, 119 {name: 'rejectReason', type: 'String'},
121 {name: 'brandId', type: 'Number'}, 120 {name: 'brandId', type: 'Number'},
122 - {name: 'id', type: 'Number'},  
123 - ], 121 + {name: 'id', type: 'Number'}
  122 + ]
124 }, 123 },
125 // 获取skn列表 124 // 获取skn列表
126 { 125 {
@@ -129,7 +128,7 @@ exports.res = [{ @@ -129,7 +128,7 @@ exports.res = [{
129 url: '/payDelivery/queryPayDeliveryProductSkn', 128 url: '/payDelivery/queryPayDeliveryProductSkn',
130 params: [ 129 params: [
131 {name: 'idName', type: 'String'} 130 {name: 'idName', type: 'String'}
132 - ], 131 + ]
133 }, // 获取tab上的数量 132 }, // 获取tab上的数量
134 { 133 {
135 route: '/payDelivery/queryCountProductPayDelivery', 134 route: '/payDelivery/queryCountProductPayDelivery',
@@ -138,22 +137,19 @@ exports.res = [{ @@ -138,22 +137,19 @@ exports.res = [{
138 params: [ 137 params: [
139 {name: 'productSkn', type: 'String'}, 138 {name: 'productSkn', type: 'String'},
140 {name: 'brandId', type: 'Number'}, 139 {name: 'brandId', type: 'Number'},
141 - {name: 'isPayDelivery', type: 'Number'},  
142 - ], 140 + {name: 'isPayDelivery', type: 'Number'}
  141 + ]
143 }, { // 获取品牌列表 142 }, { // 获取品牌列表
144 route: '/payDelivery/queryPayDeliveryBrandName', 143 route: '/payDelivery/queryPayDeliveryBrandName',
145 method: 'POST', 144 method: 'POST',
146 url: '/payDelivery/queryPayDeliveryBrandName', 145 url: '/payDelivery/queryPayDeliveryBrandName',
147 params: [ 146 params: [
148 {name: 'idName', type: 'String'} 147 {name: 'idName', type: 'String'}
149 - ], 148 + ]
150 }, { // 批量导入 149 }, { // 批量导入
151 route: '/goods/cod/upload', 150 route: '/goods/cod/upload',
152 method: 'GET', 151 method: 'GET',
153 view: 'pages/goods/cod-upload', 152 view: 'pages/goods/cod-upload',
154 - src: '/goods/cod-upload',  
155 - 153 + src: '/goods/cod-upload'
156 } 154 }
157 -  
158 -  
159 ]; 155 ];
@@ -68,8 +68,8 @@ @@ -68,8 +68,8 @@
68 <label for="status" class="col-sm-2 control-label">是否启用:</label> 68 <label for="status" class="col-sm-2 control-label">是否启用:</label>
69 <div class="radio"> 69 <div class="radio">
70 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label> 70 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
71 - <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true">关闭</label> 71 + <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true" checked>关闭</label>
72 </div> 72 </div>
73 - <input id="status" type="hidden" value="[[status]]" for="radio" required="required" kl_vkbd_parsed="true"> 73 + <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
74 </div> 74 </div>
75 </script> 75 </script>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <label></label> 72 <label></label>
73 <input type="radio" value="2" name="articleGender"> 73 <input type="radio" value="2" name="articleGender">
74 <label></label> 74 <label></label>
75 - <input type="radio" value="3" name="articleGender"> 75 + <input type="radio" value="3" name="articleGender" checked>
76 <label>通用</label> 76 <label>通用</label>
77 <input type="hidden" value="[[articleGender]]" id="articleGender" for="radio" required/> 77 <input type="hidden" value="[[articleGender]]" id="articleGender" for="radio" required/>
78 </div> 78 </div>
@@ -105,8 +105,6 @@ @@ -105,8 +105,6 @@
105 <p id="title">[[articleTitle]]</p> 105 <p id="title">[[articleTitle]]</p>
106 </div> 106 </div>
107 </div> 107 </div>
108 -  
109 -  
110 <div class="form-group"> 108 <div class="form-group">
111 <label class="col-sm-3 control-label">定时发布时间</label> 109 <label class="col-sm-3 control-label">定时发布时间</label>
112 <div class="col-sm-9"> 110 <div class="col-sm-9">
@@ -54,8 +54,8 @@ @@ -54,8 +54,8 @@
54 <label for="status" class="col-sm-2 control-label">是否启用:</label> 54 <label for="status" class="col-sm-2 control-label">是否启用:</label>
55 <div class="radio"> 55 <div class="radio">
56 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label> 56 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
57 - <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true">关闭</label> 57 + <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true" checked="checked">关闭</label>
58 </div> 58 </div>
59 - <input id="status" type="hidden" value="[[status]]" for="radio" required="required" kl_vkbd_parsed="true"> 59 + <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
60 </div> 60 </div>
61 </script> 61 </script>
@@ -68,16 +68,12 @@ @@ -68,16 +68,12 @@
68 68
69 69
70 <script type="text/template" id="template"> 70 <script type="text/template" id="template">
71 -  
72 -  
73 <div class="form-group"> 71 <div class="form-group">
74 <label for="tagName" class="col-sm-2 control-label">标签名称:</label> 72 <label for="tagName" class="col-sm-2 control-label">标签名称:</label>
75 <div class="col-sm-10"> 73 <div class="col-sm-10">
76 <input type="text" value="[[tagName]]" name="content" id="tagName" placeholder="标签名称" required="required" class="form-control"> 74 <input type="text" value="[[tagName]]" name="content" id="tagName" placeholder="标签名称" required="required" class="form-control">
77 </div> 75 </div>
78 </div> 76 </div>
79 -  
80 -  
81 <div class="form-group" id="maxsord"> 77 <div class="form-group" id="maxsord">
82 <label for="classifyId" class="col-sm-2 control-label">标签分类:</label> 78 <label for="classifyId" class="col-sm-2 control-label">标签分类:</label>
83 <div class="col-sm-10"> 79 <div class="col-sm-10">
@@ -93,18 +89,18 @@ @@ -93,18 +89,18 @@
93 <label for="isHot" class="col-sm-2 control-label">是否热门:</label> 89 <label for="isHot" class="col-sm-2 control-label">是否热门:</label>
94 <div class="radio"> 90 <div class="radio">
95 <label><input type="radio" value="1" name="isHot" kl_vkbd_parsed="true"></label> 91 <label><input type="radio" value="1" name="isHot" kl_vkbd_parsed="true"></label>
96 - <label><input type="radio" value="0" name="isHot" kl_vkbd_parsed="true"></label> 92 + <label><input type="radio" value="0" name="isHot" kl_vkbd_parsed="true" checked></label>
97 </div> 93 </div>
98 - <input id="isHot" type="hidden" value="[[isHot]]" for="radio" required="required" kl_vkbd_parsed="true"> 94 + <input id="isHot" type="hidden" value="[[isHot]]" for="radio" kl_vkbd_parsed="true">
99 </div> 95 </div>
100 96
101 <div class="form-group"> 97 <div class="form-group">
102 <label for="status" class="col-sm-2 control-label">是否启用:</label> 98 <label for="status" class="col-sm-2 control-label">是否启用:</label>
103 <div class="radio"> 99 <div class="radio">
104 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true"></label> 100 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true"></label>
105 - <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true"></label> 101 + <label><input type="radio" value="0" name="status" kl_vkbd_parsed="true" checked></label>
106 </div> 102 </div>
107 - <input id="status" type="hidden" value="[[status]]" for="radio" required="required" kl_vkbd_parsed="true"> 103 + <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
108 </div> 104 </div>
109 105
110 </script> 106 </script>