Authored by 陶雨

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

... ... @@ -299,7 +299,7 @@ var util = {
if(arr.length){
if(/^\d+$/.test(name)){
var objArr=$.extend(true,{},obj);
if($.isArray(obj)){
if(!$.isArray(obj)){
obj=[];
}
obj[name] = objArr[name] || {};
... ...
... ... @@ -88,6 +88,7 @@ var Bll = {
if (edit.validate()) {
//TODO
!!~index ? Bll.contentDatas[index] = module : Bll.contentDatas.push(module);
console.log("Bll.contentDatas",Bll.contentDatas);
Bll.rendContent();
console.log(Bll.contentDatas);
... ... @@ -102,9 +103,11 @@ var Bll = {
edit.init();
edit.on("callback", function(obj) {
if (/^file_onComplete/.test(obj.key)) {
//(!!~index?index:0)
var _field = obj.key.replace(/^file_onComplete_file__/, '').split('-');
// Bll.module.data[_field[1]].src = obj.data;
var names=obj.field;
Bll.module.data=common.util.__buildobj(names, '.', Bll.module.data, function(o, name) {
o[name] = obj.data;
});
console.log(Bll.module.data);
}
});
... ...