Authored by weiqingting

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

... ... @@ -53,9 +53,13 @@ var $ = require('jquery'),
__type: "batch-import"
},
onComplete:function(res){
util.__tip("上传成功",'success');
$("#sknVal").val(JSON.stringify(res.data.productSkn));
$("#path").val($("#productSkn").val());
if(res.code == 200) {
util.__tip(res.message, 'success');
$("#sknVal").val(JSON.stringify(res.data.productSkn));
$("#path").val($("#productSkn").val());
} else {
util.__tip(res.message);
}
}
});
... ...
... ... @@ -74,9 +74,9 @@
<div class="col-sm-6">
<input id="path" class="form-control" type="text" disabled="disabled" style="cursor:default">
</div>
<div class="col-sm-4">
<input id="productSkn" name="productSkn" class="btn btn-default excel-upload" type="file">
<div class="file-name btn btn-default">请选择文件</div>
<div class="col-sm-4" style="position: relative">
<input id="productSkn" name="productSkn" class="btn btn-default excel-upload" type="file" style="position: absolute; top: 0;left: 0;">
<div class="file-name btn btn-default">请选择文件</div>
<input type="hidden" id="sknVal" />
</div>
</div>
... ...