fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 919423d378d7ecd98d55db6ebd49f5a9c367a50e 2 parents f18e11f1 1b50a49f

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

Inline Side-by-side
Showing 3 changed files with 108 additions and 83 deletions
... ... @@ -7,92 +7,114 @@ var $ = require('jquery'),
require('../util/datepicker');
//下拉框
new common.dropDown({el: "#status"});
new common.dropDown({el: "#brand-level"});
new common.dropDown({
el:'#brand-id',
ajax:'brand'
});
//日期插件
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
//下拉框
new common.dropDown({
el: "#status"
});
new common.dropDown({
el: "#brand-level"
});
new common.dropDown({
el: '#brand-id',
ajax: 'brand'
});
var btnAuthority=JSON.parse($("#btnAuthority").val());
//日期插件
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
var g = new common.grid({
el: '#basicTable',
size: 10,
parms: function() {
var btnAuthority = JSON.parse($("#btnAuthority").val());
return {
brandId:common.util.__input('brand-id'),// $.trim($('#brand-id').val()) || '',
status: common.util.__input('status'),//$.trim($('#status').val()) || '',
brandLevel: common.util.__input('brand-level'),//$.trim($('#brand-level').val()) || '',
startTime: common.util.__input('starttime'),//$.trim($('#starttime').val()) || '',
endTime: common.util.__input('endtime')//$.trim($('#endtime').val()) || ''
};
},
columns: [
{display: "LOGO", name: "brandIco",render:function(item){
return '<img src="'+item.brandIco+'" width="100" height="60"/>'
}},
{display: '品牌名称', name: "brandName"},
{display: '英文名称', name: "brandNameEn"},
{display: '品牌级别', name: "brandLevel"},
{display: '调性分', name: "brandTonality"},
{display: '创建时间', name: "createTime", render: function(item) {
var date = new Date(item.createTime * 1000);
return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' '
+ date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
}},
{display: '操作', name:"status", render: function(items) {
var HtmArr = [];
if (btnAuthority.edit) {
HtmArr.push('<a href="/erpproduct/brands/edit/'+ items.id+'"" class="btn btn-info btn-xs">编辑</a>');
}
if (items.status === 0) {
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-warning btn-xs open-brand">开启品牌</a>');
}
if (items.status === 1) {
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs close-brand">关闭品牌</a>');
}
return HtmArr.join('');
}}
]
})
g.init($("#gridurl").val());
var g = new common.grid({
el: '#basicTable',
size: 10,
parms: function() {
$("#filter-btn").click(function(){
g.reload(1);
});
return {
brandId: common.util.__input('brand-id'), // $.trim($('#brand-id').val()) || '',
status: common.util.__input('status'), //$.trim($('#status').val()) || '',
brandLevel: common.util.__input('brand-level'), //$.trim($('#brand-level').val()) || '',
startTime: common.util.__input('starttime'), //$.trim($('#starttime').val()) || '',
endTime: common.util.__input('endtime') //$.trim($('#endtime').val()) || ''
};
},
columns: [{
display: "LOGO",
name: "brandIco",
render: function(item) {
return '<img src="' + item.brandIco + '" width="100" height="60"/>'
}
}, {
display: '品牌名称',
name: "brandName"
}, {
display: '英文名称',
name: "brandNameEn"
}, {
display: '品牌级别',
name: "brandLevel"
}, {
display: '调性分',
name: "brandTonality"
}, {
display: '创建时间',
name: "createTime",
render: function(item) {
var date = new Date(item.createTime * 1000);
return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
}
}, {
display: '操作',
name: "status",
render: function(items) {
var HtmArr = [];
//关闭品牌操作
$('tbody').on('click', '.close-brand', function() {
var item=g.rows[$(this).data("index")];
common.util.__ajax({
url:'/brand/edit',
data:{id:item.id,status:0}
},function(){
g.reload();
});
});
//开启品牌操作
$('tbody').on('click', '.open-brand', function() {
var item=g.rows[$(this).data("index")];
common.util.__ajax({
url:'/brand/edit',
data:{id:item.id,status:1}
},function(){
g.reload();
});
});
if (btnAuthority.edit) {
HtmArr.push('<a href="/erpproduct/brands/edit/' + items.id + '"" class="btn btn-info btn-xs">编辑</a>');
}
if (items.status === 0) {
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-warning btn-xs open-brand">开启品牌</a>');
}
if (items.status === 1) {
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs close-brand">关闭品牌</a>');
}
return HtmArr.join('');
}
}]
})
g.init($("#gridurl").val());
$("#filter-btn").click(function() {
g.reload(1);
});
//关闭品牌操作
$('tbody').on('click', '.close-brand', function() {
var item = g.rows[$(this).data("index")];
common.util.__ajax({
url: '/brand/edit',
data: {
id: item.id,
status: 0
}
}, function(res) {
g.reload();
});
});
//开启品牌操作
$('tbody').on('click', '.open-brand', function() {
var item = g.rows[$(this).data("index")];
common.util.__ajax({
url: '/brand/edit',
data: {
id: item.id,
status: 1
}
}, function() {
g.reload();
});
});
\ No newline at end of file
... ...
... ... @@ -118,8 +118,10 @@ $(document).on("click", "#saveAllInfo", function() {
option.success = function(res) {
res = res.data;
if (res.code == '200') {
e.$tip(res.message, function() {}, 'growl-success');
location.href = '/goods/netsale/index';
e.$tip(res.message, function() {
location.href = '/goods/netsale/index';
}, 'growl-success');
} else {
e.$tip(res.message);
}
... ...
... ... @@ -3,6 +3,7 @@ exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.236:8080/platform'; //钱军
//exports.domain = 'http://172.16.6.162:8088/platform'; //李建
//exports.domain = 'http://172.16.6.197:8080/yohobuy-platform-web'; //耿超
//exports.domain = 'http://172.16.6.252:9080/platform';
//商品管理路由配置
exports.res = [{
... ...