fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 372a03c40c81e02bd0067c4a0300398109a7e844 2 parents e9983c98 e3fa29bc

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

Inline Side-by-side
Showing 2 changed files with 10 additions and 6 deletions
@@ -53,9 +53,13 @@ var $ = require('jquery'), @@ -53,9 +53,13 @@ var $ = require('jquery'),
53 __type: "batch-import" 53 __type: "batch-import"
54 }, 54 },
55 onComplete:function(res){ 55 onComplete:function(res){
56 - util.__tip("上传成功",'success');  
57 - $("#sknVal").val(JSON.stringify(res.data.productSkn));  
58 - $("#path").val($("#productSkn").val()); 56 + if(res.code == 200) {
  57 + util.__tip(res.message, 'success');
  58 + $("#sknVal").val(JSON.stringify(res.data.productSkn));
  59 + $("#path").val($("#productSkn").val());
  60 + } else {
  61 + util.__tip(res.message);
  62 + }
59 } 63 }
60 }); 64 });
61 65
@@ -74,9 +74,9 @@ @@ -74,9 +74,9 @@
74 <div class="col-sm-6"> 74 <div class="col-sm-6">
75 <input id="path" class="form-control" type="text" disabled="disabled" style="cursor:default"> 75 <input id="path" class="form-control" type="text" disabled="disabled" style="cursor:default">
76 </div> 76 </div>
77 - <div class="col-sm-4">  
78 - <input id="productSkn" name="productSkn" class="btn btn-default excel-upload" type="file">  
79 - <div class="file-name btn btn-default">请选择文件</div> 77 + <div class="col-sm-4" style="position: relative">
  78 + <input id="productSkn" name="productSkn" class="btn btn-default excel-upload" type="file" style="position: absolute; top: 0;left: 0;">
  79 + <div class="file-name btn btn-default">请选择文件</div>
80 <input type="hidden" id="sknVal" /> 80 <input type="hidden" id="sknVal" />
81 </div> 81 </div>
82 </div> 82 </div>