Authored by weiqingting

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

... ... @@ -21,6 +21,7 @@ var urlObj = {
// 'getsort':'/goods/query/querySortBySmallSort',
'sortlist': '/product/class/queryAllProductSortList',
'sortSubList': '/product/class/queryProductSortList',
'productPool': '/runManage/subjectManage/queryBaseProductPoolListByName',
'firstCategory': '/operations/helpcategory/getCategoryListByPid',
'getByCategoryId': '/operations/helpcontent/getSecondCategoryList',
... ... @@ -28,21 +29,21 @@ var urlObj = {
'getHelpCategory': '/operations/helpcontent/getHelpCategory',
'queryAll4Select': '/goods/brandSeries/queryAll4Select', //品牌款型系列
'getSelectItems': '/meterManage/brand/getSelectItems',//品牌获取选择选项的枚举
'getSelectItems': '/meterManage/brand/getSelectItems', //品牌获取选择选项的枚举
// 逛
'guangGetAuthorList':'/guang/article/getAuthorList', // 逛-获取作者
'guangGetSortList':'/ajax/guang/article/getSortList', // 逛-获取作者
'guangGetTagCategoryByStatus':'/guang/tagSort/getTagItems',
'guangCommentGetFilterItems':'/guang/comment/getItems', // 逛-评论列表-获取筛选条件
'guangPlusSatrChannel':'/guang/plustarcategory/getCategoryNames', // 逛-plus star 频道
'guangGetAuthorList': '/guang/article/getAuthorList', // 逛-获取作者
'guangGetSortList': '/ajax/guang/article/getSortList', // 逛-获取作者
'guangGetTagCategoryByStatus': '/guang/tagSort/getTagItems',
'guangCommentGetFilterItems': '/guang/comment/getItems', // 逛-评论列表-获取筛选条件
'guangPlusSatrChannel': '/guang/plustarcategory/getCategoryNames', // 逛-plus star 频道
'queryBrandByShopId': '/query/brandByshopId', //查询店铺下关联品牌
'querySupplierByShopId': '/query/supplierByshopId', //查询店铺下关联供应商
'guangGetSort':'/guang/article/getSortList'//逛-分类
'guangGetSort': '/guang/article/getSortList' //逛-分类
};
var minimumResultsForSearch = ["sortbybrand", "getjitSup", "sortsize2","querySupplier"];
var minimumResultsForSearch = ["sortbybrand", "getjitSup", "sortsize2", "querySupplier"];
var dropDown = function(option) {
new dropDown.prototype.init(option);
... ... @@ -64,42 +65,42 @@ dropDown.prototype = {
option.minimumResultsForSearch = Infinity
}
if (option.ajax) {
var defaultName="请选择";
if($(option.el).val()==-1){
defaultName=$(option.el).find("option[value='-1']").text()
var defaultName = "请选择";
if ($(option.el).val() == -1) {
defaultName = $(option.el).find("option[value='-1']").text()
}
if(option.hash){
if($(option.el).val()==null){
var name=option.el.replace(/\.|#/g,'');
var arr=location.hash.replace(/^#/,'').split("&&");
var map={};
arr.forEach(function(item){
var _a=item.split('=');
if(_a&&_a[0]){
map[_a[0]]=_a[1];
if (option.hash) {
if ($(option.el).val() == null) {
var name = option.el.replace(/\.|#/g, '');
var arr = location.hash.replace(/^#/, '').split("&&");
var map = {};
arr.forEach(function(item) {
var _a = item.split('=');
if (_a && _a[0]) {
map[_a[0]] = _a[1];
}
});
var id=map[name];
var text=map[name+"Name"];
var id = map[name];
var text = map[name + "Name"];
$(option.el).html('');
$(option.el).append("<option value="+id+" >"+text+"</option>");
$(option.el).append("<option value=" + id + " >" + text + "</option>");
}
$(document).on("change",option.el,function(){
var name=option.el.replace(/\.|#/g,'');
var id=$(option.el).val();
var text=$(option.el).find("option[value='"+id+"']").text();
var arr=location.hash.replace(/^#/,'').split("&&");
var map={};
arr.forEach(function(item){
var _a=item.split('=');
if(_a&&_a[0]){
map[_a[0]]=_a[1];
$(document).on("change", option.el, function() {
var name = option.el.replace(/\.|#/g, '');
var id = $(option.el).val();
var text = $(option.el).find("option[value='" + id + "']").text();
var arr = location.hash.replace(/^#/, '').split("&&");
var map = {};
arr.forEach(function(item) {
var _a = item.split('=');
if (_a && _a[0]) {
map[_a[0]] = _a[1];
}
});
map[name]=id;
map[name+"Name"]=text;
map[name] = id;
map[name + "Name"] = text;
var urlHash = '';
$.each(map, function(key, value) {
if (value || value == '0') {
... ... @@ -143,7 +144,7 @@ dropDown.prototype = {
cache: true
}
});
} else {
$(option.el).select2();
... ...
... ... @@ -101,22 +101,22 @@ grid.prototype = {
param.page = p.page;
} else {
if(location.hash.search(/page=(\d+)/g)>-1){
if (location.hash.search(/page=(\d+)/g) > -1) {
param.page = /page=(\d+)/g.exec(location.hash)[1];
}
}
if(param.page&&p.hash){
if(location.hash.search(/page=(\d+)/g)>-1){
location.hash=location.hash.replace(/page=(\d+)/g,function(source,$1){
return "page="+param.page;
if (param.page && p.hash) {
if (location.hash.search(/page=(\d+)/g) > -1) {
location.hash = location.hash.replace(/page=(\d+)/g, function(source, $1) {
return "page=" + param.page;
})
}else{
location.hash+="page="+param.page;
} else {
location.hash += "page=" + param.page;
}
}
if (param.productStatusStr == 'all') {
param.productStatusStr = '';
}
... ... @@ -130,20 +130,24 @@ grid.prototype = {
__pagination: function(pagination) {
var g = this,
p = this.options;
g.pagination.pagination({
items: pagination.total,
itemsOnPage: 5,
pages: pagination.total,
currentPage: pagination.page,
edges: 1,
hrefTextPrefix: '#page=',
ellipsePageSet: false,
onPageClick: function(pageNumber, event) {
p.page = pageNumber;
g.renderBody();
return false;
}
});
if (pagination.total > 1) {
g.pagination.pagination({
items: pagination.total,
itemsOnPage: 5,
pages: pagination.total,
currentPage: pagination.page,
edges: 1,
hrefTextPrefix: '#page=',
ellipsePageSet: false,
onPageClick: function(pageNumber, event) {
p.page = pageNumber;
g.renderBody();
return false;
}
});
}
},
renderHead: function() {
var g = this,
... ...
... ... @@ -330,63 +330,76 @@ $(document).on("click", ".edit", function() {
Bll.toast(index, Bll.module);
});
/*添加商品*/
/*选择商品表格*/
var goodsgird = new common.grid({
el: '#goodsgird',
parms: function() {
parms: function () {
var beginPrice = 0, endPrice = 1000000;
if (common.util.__input('beginPrice')) {
beginPrice = common.util.__input('beginPrice');
}
if (common.util.__input('endPrice')) {
endPrice = common.util.__input('endPrice')
}
return {
query:common.util.__input('skns')
query: common.util.__input('skns'),
price: beginPrice + "," + endPrice
};
},
columns: [{
display: "选择",
type: "checkbox"
},{
display: "产品图片",
render: function(item) {
if(item.default_images){
item.default_images=common.util.__joinImg("goodsimg",item.default_images);
}
else{
item.default_images="";
columns: [
{
display: "选择",
type: "checkbox"
}, {
display: "产品图片",
render: function (item) {
console.log(item);
if (item.images_url) {
item.images_url = common.util.__joinImg("goodsimg", item.images_url);
}
else {
item.images_url = "";
}
return "<img width=120 height=60 src='" + item.images_url + "'/>";
}
return "<img width=120 height=60 src='"+item.default_images+"'/>";
}
}, {
display: "产品名称",
name: "product_name"
}, {
display: "品牌",
name: "brand_name"
}, {
display: "现价",
name: "sales_price"
}, {
display: "牌价",
name: "market_price"
}, {
display: "预售",
name: "stock_number"
}, {
display: "库存",
name: "storage_num"
}]
}, {
display: "产品名称",
name: "product_name"
}, {
display: "品牌",
name: "brand_name"
}, {
display: "现价",
name: "sales_price"
}, {
display: "牌价",
name: "market_price"
}, {
display: "预售",
name: "stock_number"
}, {
display: "库存",
name: "storage_num"
}]
});
//搜索按钮
$(document).on("click", "#search", function() {
goodsgird.reload();
});
$(document).on("click", "#goodsSelectBtn", function() {
//点击“选择标签”按钮(添加商品)
$(document).on("click", "#goodsSelectBtn", function () {
new common.dialog({
title: "选择商品",
content: $("#template_dialog_goodsgird").html(),
width: '80%',
button: [{
value: "确定",
callback: function() {
Bll.module.data = goodsgird.selected.map(function(item, index) {
callback: function () {
Bll.module.data = goodsgird.selected.map(function (item, index) {
return {
src: item.default_images,
id: item.product_id
src: item.images_url,
id: item.product_skn,
product_skc: item.product_skc
}
});
// Bll.module.data=goodsgird.selected;
... ... @@ -399,21 +412,14 @@ $(document).on("click", "#goodsSelectBtn", function() {
});
goodsgird.init('/yohosearch/search');
});
$(document).on("click", ".removepic", function() {
Bll.module.data.splice($(this).data("index"), 1);
$("#goodspic").html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
datas: Bll.module.data
}));
});
/*添加商品组*/
$(document).on("click", "#goodsaddBtn", function() {
//点击“添加组”按钮(添加商品组)
$(document).on("click", "#goodsaddBtn", function () {
Bll.module.data.push(Button[4].data[0]);
console.log(Bll.module.data);
Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
});
$(document).on("click", ".goodsSelectBtn", function() {
//点击“选择标签”按钮(添加商品组)
$(document).on("click", ".goodsSelectBtn", function () {
var index = $(this).data("index");
new common.dialog({
title: "选择商品",
... ... @@ -421,17 +427,18 @@ $(document).on("click", ".goodsSelectBtn", function() {
width: '80%',
button: [{
value: "确定",
callback: function() {
goodsgird.selected.forEach(function(item, i) {
callback: function () {
goodsgird.selected.forEach(function (item, i) {
Bll.module.data[index].list[i] = {
src: item.default_images,
id: item.product_id,
maxSortId: 1
}
src: item.images_url,
id: item.product_skn,
product_skc: item.product_skc,
maxSortId: item.max_sort_id
};
if (!i) {
Bll.module.data[index].cover = {
cover: item.default_images,
maxSortId: 1
cover: item.images_url,
maxSortId: item.max_sort_id
};
}
});
... ... @@ -442,7 +449,13 @@ $(document).on("click", ".goodsSelectBtn", function() {
});
goodsgird.init('/yohosearch/search');
});
//删除图片按钮
$(document).on("click", ".removepic", function() {
Bll.module.data.splice($(this).data("index"), 1);
$("#goodspic").html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
datas: Bll.module.data
}));
});
/********************************/
... ...
'use strict';
var $ = require('jquery'),
common = require('../common/common');
var e = new common.edit('#basicForm', {
bucket: 'taobaocms'
});
e.init();
/*new common.dropDown({
el: '#maxsort',
ajax: 'sortlist'
});
new common.dropDown({
el: '#middlesort',
ajax: 'sortSubList',
params: function() {
return {param: $('#maxsort').val()}//common.util.__input('maxsort')
}
});*/
var tabTree = new common.tabTree(".sortTree");
tabTree.init();
var tabTreeArr = [];
tabTreeArr.push(tabTree);
//添加物理类目
$(document).on('click', '.add-sort-btn',function() {
var $sortGroup = $($('#sortWrap').html());
$('.sort-wrap').find('.row:last').find('.add-sort-btn').hide().end().find('.del-sort-btn').show();
$sortGroup.appendTo($('.sort-wrap'));
tabTree = new common.tabTree(".sortTree:last");
tabTreeArr.push(tabTree);
tabTree.init();
});
//删除物理类目
$(document).on('click', '.del-sort-btn', function() {
$(this).parents('.row').remove();
$('.sort-wrap').find('.row:last').find('.add-sort-btn').show().end().find('.del-sort-btn').show();
if ($('.sort-wrap').find('.row').size() == 1) {
$('.sort-wrap').find('.row:last').find('.add-sort-btn').show().end().find('.del-sort-btn').hide();
}
});
$('#save_brand').on('click', function() {
e.submit($('#basicForm').attr('action'), function(option) {
console.log(option.data);
option.success = function(res) {
res = res.data;
if (res.code == '200') {
e.$tip(res.message, function() {
history.go(-1);
}, 'growl-success');
} else {
e.$tip(res.message);
}
return false;
}
});
})
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@ var g = new common.grid({
el: "#basicTable",
parms: function() {
return {
state: $('input[name="state"]').val()
state: $('.state-select').find('.current').find('input').val()
}
},
columns: [{
... ...
... ... @@ -14,7 +14,7 @@ var g = new common.grid({
parms: function() {
return {
categoryId: $('#categoryId').val(),
state: $('.state-select').find('.current').find('input').val()
status: $('.state-select').find('.current').find('input').val()
}
},
columns: [{
... ... @@ -31,9 +31,9 @@ var g = new common.grid({
name: '',
render: function(item) {
if (item.status == 1) {
return '<a class="btn btn-xs btn-danger close-btn" data-title="' + item.labelName + '" href="javascript:;">关闭</a>';
return '<a class="btn btn-xs btn-danger close-btn" data-title="' + item.labelName + '" data-label="' + item.labelId + '" href="javascript:;">关闭</a>';
} else {
return '<a class="btn btn-xs btn-warning open-btn" data-title="' + item.labelName + '" href="javascript:;">开启</a>';
return '<a class="btn btn-xs btn-warning open-btn" data-title="' + item.labelName + '" data-label="' + item.labelId + '" href="javascript:;">开启</a>';
}
}
}]
... ... @@ -49,12 +49,37 @@ $('input[name="state"]').on('change', function() {
$(document).on('click', '.close-btn', function() {
var labelId = $(this).data('label');
common.dialog.confirm("温馨提示", "确定关闭(" + $(this).data('title') + ")标签吗", function() {
common.util.__ajax({
url: '/sale/salesCategoryLabel/updateSCLabel',
data: {
labelId: labelId,
status: 0
}
}, function(res){
if (res.code == 200) {
g.reload();
}
})
});
console.log(g.rows);
});
$(document).on('click', '.open-btn', function() {
var labelId = $(this).data('label');
common.dialog.confirm("温馨提示", "确定开启(" + $(this).data('title') + ")标签吗", function() {
common.util.__ajax({
url: '/sale/salesCategoryLabel/updateSCLabel',
data: {
labelId: labelId,
status: 1
}
}, function(res){
if (res.code == 200) {
g.reload();
}
})
});
});
\ No newline at end of file
});
... ...
... ... @@ -388,7 +388,7 @@ ul {
.citySelect {
position: relative;
z-index: 99;
-z-index: 99;
height: 30px;
line-height: 30px
}
... ... @@ -419,7 +419,7 @@ ul {
border-radius:3px;
padding: 0 38px 0 10px;
color: #333;
z-index: 99;
-z-index: 99;
width: 100%;
overflow: hidden;
white-space: nowrap;
... ...
... ... @@ -18,11 +18,12 @@ var config = {
// domain: 'http://172.16.6.214:8088/platform',//陈超
//http://172.16.6.124:8088/platform/product/queryAllProductAttr
//domain: 'http://172.16.6.146:8088/platform', //玛丽
// domain: 'http://192.168.102.202:8088/platform',
domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超
domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超
//domain: 'http://172.16.6.239:8080', //孙杰翔
//domain:'http://172.16.6.189:8088/platform', //李健1
//domain:'http://192.168.102.216:8180/platform', //李健2
//domain: 'http://172.16.6.243:8088/platform', //谭玲
yohoSearch:'http://192.168.10.64:8080/yohosearch',
loggers: {
api: {
... ...
//exports.domain = require('../config/common.js').domain;
exports.domain = 'http://localhost:30012';
exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://localhost:30012';
//销售类目路由
exports.res = [{
//列表页渲染
'route': '/sale/category/index',
'method': 'GET',
'src': '/salecategory/index',
'view': 'pages/salecategory/index',
'data': {
gridurl: '/salesCategory/queryAllSalesCategoryList'
gridurl: '/sale/salesCategory/querySCList'
}
}, {
route: '/salesCategory/queryAllSalesCategoryList',
//列表数据接口
route: '/sale/salesCategory/querySCList',
method: 'POST',
url: '/salesCategory/queryAllSalesCategoryList',
params: []
url: '/salesCategory/querySCList',
params: [{
name: 'state',
type: 'string'
}]
}, {
'route': '/sale/category/add',
'method': 'GET',
'src': '/salecategory/edit',
'view': 'pages/salecategory/edit',
'data': {
//新增分类页面渲染
route: '/sale/category/add',
method: 'GET',
src: '/salecategory/edit',
view: 'pages/salecategory/edit',
data: {
action: '/sale/salesCategory/addSC',
data: {}
}
}, {
'route': '/sale/category/edit/:categoryId',
'method': 'GET',
'src': '/salecategory/edit',
'url': '/salesCategory/querySCById',
'view': 'pages/salecategory/edit',
'data': {
//编辑分类页面渲染
route: '/sale/category/edit/:categoryId',
method: 'GET',
src: '/salecategory/edit',
url: '/salesCategory/querySCById',
view: 'pages/salecategory/edit',
data: {
action: '/sale/salesCategory/updateSC'
},
params: [{
name: 'categoryId',
type: 'number'
}]
}, {
//标签管理页面渲染
route: '/sale/category/tag/:categoryId',
method: 'GET',
src: '/salecategory/tag-mgmt',
... ... @@ -46,17 +55,127 @@ exports.res = [{
data: {},
params: [{
name: 'categoryId',
type: 'number'
type: 'string'
}, {
name: 'status',
type: 'string'
}]
}, {
//标签管理列表数据接口
route: '/sale/salesCategoryLabel/querySCLabelList',
method: 'POST',
url: '/salesCategoryLabel/querySCLabelList',
params: [{
name: 'categoryId',
type: 'number'
type: 'string'
}, {
name: 'state',
type: 'number'
name: 'status',
type: 'string'
}]
}, {
//更新标签接口
route: '/sale/salesCategoryLabel/updateSCLabel',
method: 'POST',
url: '/salesCategoryLabel/updateSCLabel',
params: [{
name: 'labelId',
type: 'string'
}, {
name: 'labelName',
type: 'string'
}, {
name: 'categoryId',
type: 'string'
}, {
name: 'parentId',
type: 'string'
}, {
name: 'orderBy',
type: 'string'
}, {
name: 'labelLevel',
type: 'string'
}, {
name: 'status',
type: 'string'
}]
}, {
//添加销售类目接口
route: '/sale/salesCategory/addSC',
method: 'POST',
url: '/salesCategory/addSC',
params: [{
name: 'categoryName',
type: 'string'
}, {
name: 'relationParameter',
type: 'string'
}, {
name: 'relationUrl',
type: 'string'
}, {
name: 'parentId',
type: 'string'
}, {
name: 'orderBy',
type: 'string'
}, {
name: 'icon',
type: 'string'
}]
}, {
//更新销售类目接口
route: '/sale/salesCategory/updateSC',
method: 'POST',
url: '/salesCategory/updateSC',
params: [{
name: 'categoryId',
type: 'string'
}, {
name: 'categoryName',
type: 'string'
}, {
name: 'relationParameter',
type: 'string'
}, {
name: 'relationUrl',
type: 'string'
}, {
name: 'parentId',
type: 'string'
}, {
name: 'orderBy',
type: 'string'
}, {
name: 'icon',
type: 'string'
}, {
name: 'status',
type: 'string'
}]
}, {
//批量添加标签接口
route: '/sale/salesCategoryLabel/addSCLabel',
method: 'POST',
url: '/salesCategoryLabel/addSCLabel',
params: [{
name: 'labelName',
type: 'string'
}, {
name: 'categoryId',
type: 'string'
}, {
name: 'parentId',
type: 'string'
}, {
name: 'orderBy',
type: 'string'
}, {
name: 'labelLevel',
type: 'string'
}, {
name: 'status',
type: 'string'
}]
}]
\ No newline at end of file
... ...
... ... @@ -10,10 +10,12 @@ exports.brandlist = function (req, res) {
exports.search = function (req, res) {
var size = 10;//每页数据量
var page = 1;
var price=req.body.price;
if (req.body.page) {
page = req.body.page;
}
var url = "http://x.yohobuy.com/yohosearch/search.json?viewNum=" + size + "&query=" + req.body.query + "&page=" + page;
var url = "http://x.yohobuy.com//yohosearch/search.json?viewNum=" + size + "&query=" + req.body.query + "&page=" + page+"&price="+price;
console.log(url);
request({url: url}, function (error, response, body) {
var data = {};
data.list = [];
... ...
... ... @@ -391,15 +391,22 @@
[[/each]]
</script>
<!--添加商品/商品组--选择标签界面模板-->
<script type="text/template" id="template_dialog_goodsgird">
<div class="rows">
<div class="form-group">
<div class="col-sm-6">
<div class="panel-col2">
<input class="form-control" id="skns" placeholder="输入SKN(多个skn以逗号分隔)" />
</div>
<!--<div class="col-sm-4">-->
<!--<input class="form-control" placeholder="输入标签" />-->
<!--</div>-->
<div class="panel-col">
<input type="number" id="beginPrice" name="begin_price" class="form-control"
placeholder="起始价" value="" >
</div>
<div class="panel-col">
<input type="number" id="endPrice" name="end_price" class="form-control"
placeholder="结束价" value="" >
</div>
<div class="col-sm-1">
<input type="button" id="search" class="btn btn-primary mr5" value="搜索" />
</div>
... ...
... ... @@ -20,30 +20,33 @@
</div>
<div class="panel-body">
<form id="basicForm" role="form" class="form-horizontal form-bordered">
<form id="basicForm" role="form" action="{{action}}" class="form-horizontal form-bordered">
{{# data}}
<div class="form-group">
<label class="col-sm-2 control-label">父分类</label>
<div class="col-sm-8"></div>
<div class="col-sm-8 height40">{{# parentSC}}{{categoryName}}{{# items}}-{{categoryName}}{{/ items}}{{/ parentSC}}</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">分类名称</label>
<div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="{{categoryName}}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">分类图标</label>
<div class="col-sm-8"><input type="file" id="" name="" value="{{icon}}" required="" placeholder="分别图标"></div>
<div class="col-sm-8"><input type="file" id="icon" name="icon" value="{{icon}}" required="" placeholder="分别图标"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">物理类目关联</label>
<div class="col-sm-8">
<select name="请选择一级类目" id="">
{{# relationProductSort}}
<option value=""></option>
{{/ relationProductSort}}
</select>
<div class="col-sm-8 sort-wrap">
<div class="row">
<div class="col-sm-4">
<div class="sortTree"></div>
</div>
<div class="col-sm-2 height40">
<a class="btn btn-danger btn-xs del-sort-btn" style="display: none;" href="javascript:;">-</a>
<a class="btn btn-info btn-xs add-sort-btn" href="javascript:;">+</a>
</div>
</div>
</div>
</div>
{{/ data}}
... ... @@ -52,7 +55,7 @@
<div class="panel-footer">
<div class="col-sm-8 col-sm-offset-2">
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn btn-primary">保存</button>
<a id="save_brand" data-loading-text="保存中..." class="btn btn-primary" href="javascript:;">保存</a>
<a href="javascript:;" onclick="history.go(-1);" class="btn btn-danger">取消</a>
</div>
... ... @@ -61,3 +64,14 @@
</div>
<script type="text/template" id="sortWrap">
<div class="row">
<div class="col-sm-4">
<div class="sortTree"></div>
</div>
<div class="col-sm-2 height40">
<a class="btn btn-danger btn-xs del-sort-btn" href="javascript:;">-</a>
<a class="btn btn-info btn-xs add-sort-btn" href="javascript:;">+</a>
</div>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -34,7 +34,7 @@
</div>
</div>
<a href="/erpproduct/brands/add" class="btn btn-success" style="margin:10px 0;"><i class="fa fa-plus"></i> 添加根分类</a>
<a href="/sale/category/add" class="btn btn-success" style="margin:10px 0;"><i class="fa fa-plus"></i> 添加根分类</a>
<div class="panel">
<div class="panel-body nopadding">
... ... @@ -71,21 +71,21 @@
<span><img src="[[icon]]" alt=""></span>
<span class="orderby">[[orderBy]]</span>
<span class="status">
[[if status=="1"]]
[[if state=="1"]]
开启
[[/if]]
[[if status=="0"]]
[[if state=="0"]]
关闭
[[/if]]
</span>
<span class="operate">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[categoryId]]">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>
<a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
[[if status=="1"]]
[[if state=="1"]]
<a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
[[/if]]
[[if status=="0"]]
[[if state=="0"]]
<a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
[[/if]]
</span>
... ... @@ -100,21 +100,21 @@
<span><img src="[[a.icon]]" alt=""></span>
<span class="orderby">[[a.orderBy]]</span>
<span class="status">
[[if a.status=="1"]]
[[if a.state=="1"]]
开启
[[/if]]
[[if a.status=="0"]]
[[if a.state=="0"]]
关闭
[[/if]]
</span>
<span class="operate">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="javascript:;">标签管理</a>
<a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[a.categoryId]]">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a>
<a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
[[if a.status=="1"]]
[[if a.state=="1"]]
<a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
[[/if]]
[[if a.status=="0"]]
[[if a.state=="0"]]
<a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
[[/if]]
</span>
... ... @@ -129,21 +129,21 @@
<span><img src="[[b.icon]]" alt=""></span>
<span class="orderby">[[b.orderBy]]</span>
<span class="status">
[[if b.status=="1"]]
[[if b.state=="1"]]
开启
[[/if]]
[[if b.status=="0"]]
[[if b.state=="0"]]
关闭
[[/if]]
</span>
<span class="operate">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="javascript:;">标签管理</a>
<a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[b.categoryId]]">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a>
<a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
[[if b.status=="1"]]
[[if b.state=="1"]]
<a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
[[/if]]
[[if b.status=="0"]]
[[if b.state=="0"]]
<a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
[[/if]]
</span>
... ...