fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 363891314b1bf903302ffc347f87f11390a426eb 2 parents aa870c19 ef2fe40d

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

Inline Side-by-side
Showing 4 changed files with 92 additions and 80 deletions
... ... @@ -30,6 +30,8 @@ tab.prototype = {
}
g.index = index;
this.render(data);
g.active = index;
p._init && p._init(g.active);
this.bind(p.click);
return this;
},
... ... @@ -43,8 +45,12 @@ tab.prototype = {
g.active = $(this).find("a").attr("columnname");
g.key = $(this).find("a").attr("key");
g.value = $(this).find("a").attr("value");
this._init = p._init;
callback && callback.call(this);
});
},
render: function(data) {
var g = this,
... ...
... ... @@ -208,14 +208,17 @@ if (location.hash) {
}
// alert(location.hash.replace(/^#/,'').split(',')[0]);
try{
$(".sub-floatnav li").each(function(){
var name=$.trim($(this).text());
if(name==location.hash.replace(/^#/,'')){
$(this).click();
try {
$(".floatnav li").each(function() {
var name = $.trim($(this).data('pos')),
that = this;
console.log(name);
if (name == location.hash.replace(/^#/, '')) {
setTimeout(function() {
$(that).click();
}, 500);
}
});
}
catch(e){
} catch (e) {
}
}
\ No newline at end of file
... ...
... ... @@ -27,7 +27,7 @@ var ENUM = {
attribute: {
1: '普通',
2: '赠品',
3:'虚拟商品'
3: '虚拟商品'
},
tab: {
'1': 0,
... ... @@ -60,68 +60,6 @@ new common.dropDown({
hash: true
});
var editPostion = '';
var t = new common.tab({
el: "#basicTab",
click: function() {
g.options.columns[11].hidden = true;
g.options.columns[8].hidden = true;
g.options.page = 1;
var columnname = $(this).find('a').attr('columnname');
if (columnname == 3) {
g.options.columns[11].hidden = false;
} else if (columnname == 2) {
g.options.columns[8].hidden = false;
};
if (columnname == 1 || columnname == 2) {
editPostion = '#position9';
} else {
editPostion = '';
}
g.init($("#gridurl").val());
},
columns: [{
name: "0",
value: '8,3,2',
display: "上架前({1})"
}, {
name: "1",
value: '4,1,0,5,6',
display: "上架后({2})"
}, {
name: "2",
value: '1',
display: "搜索/标签({3})"
}, {
name: "3",
value: '1',
display: "上架后信息缺失({4})"
}, {
name: "all",
value: 'all',
display: "全部商品({all})"
}]
}).init(ENUM.tab);
//tab
var loadtab = function() {
t.active = undefined;
setTimeout(function() {
common.util.__ajax({
url: '/goods/product/queryTabProductNum',
data: g.options.parms()
}, function(res) {
var __dt = $.extend({}, ENUM.tab, res.data);
t.init(__dt);
}, true);
}, 400);
}
loadtab();
var g = new common.grid({
el: "#basicTable",
parms: function() {
... ... @@ -274,13 +212,13 @@ var g = new common.grid({
display: '缺失信息',
hidden: true,
render: function(item) {
var html=[];
var html = [];
html.push('<p style="color: red;">');
var arr=item.missInfo.split(',');
for(var i in arr){
var item1=$.trim(arr[i]);
if(item){
html.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#'+item1+'">'+item1+'</a>');
var arr = item.missInfo.split(',');
for (var i in arr) {
var item1 = $.trim(arr[i]);
if (item) {
html.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#' + item1 + '">' + item1 + '</a>');
}
}
html.push('</p>');
... ... @@ -303,6 +241,71 @@ var g = new common.grid({
}
}]
});
var editPostion = '';
var t = new common.tab({
el: "#basicTab",
_init: function(active) {
g.options.columns[11].hidden = true;
g.options.columns[8].hidden = true;
g.options.page = 1;
if (active == 3) {
g.options.columns[11].hidden = false;
} else if (active == 2) {
g.options.columns[8].hidden = false;
};
if (active == 1 || active == 2) {
editPostion = '#position9';
} else {
editPostion = '';
}
},
click: function() {
this._init(t.active);
g.init($("#gridurl").val());
},
columns: [{
name: "0",
value: '8,3,2',
display: "上架前({1})"
}, {
name: "1",
value: '4,1,0,5,6',
display: "上架后({2})"
}, {
name: "2",
value: '1',
display: "搜索/标签({3})"
}, {
name: "3",
value: '1',
display: "上架后信息缺失({4})"
}, {
name: "all",
value: 'all',
display: "全部商品({all})"
}]
}).init(ENUM.tab);
//tab
var loadtab = function() {
t.active = undefined;
setTimeout(function() {
common.util.__ajax({
url: '/goods/product/queryTabProductNum',
data: g.options.parms()
}, function(res) {
var __dt = $.extend({}, ENUM.tab, res.data);
t.init(__dt);
}, true);
}, 400);
}
loadtab();
g.init($("#gridurl").val());
//筛选
... ...
... ... @@ -76,15 +76,15 @@
<li name="position1">
<a href="javascript:;"><i class="required-icon"></i>上架前必填</a>
<ul class="sub-floatnav">
<li name="position2"><a href="javascript:;"><i class="required-icon"></i>基本信息</a></li>
<li name="position2" data-pos="基本信息"><a href="javascript:;"><i class="required-icon"></i>基本信息</a></li>
<li name="position3"><a href="javascript:;"><i class="required-icon"></i>封面设置</a></li>
<li name="position4"><a href="javascript:;"><i class="required-icon"></i>商品描述</a></li>
<li name="position5"><a href="javascript:;"><i class="required-icon"></i>尺码信息</a></li>
<li name="position5" data-pos="尺码信息"><a href="javascript:;"><i class="required-icon"></i>尺码信息</a></li>
<li name="position6"><a href="javascript:;"><i class="required-icon"></i>商品参数</a></li>
<li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li>
</ul>
</li>
<li name="position8">
<li name="position8" data-pos="搜索/标签">
<a href="javascript:;">搜索关键词</a>
</li>
<li name="position9">
... ...