Commit 41394071 authored by zhengke's avatar zhengke

修改

parent bc1538b2
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
methods: { methods: {
//获取所有菜单 //获取所有菜单
getList() { getList() {
this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => { this.apipost("/api/product/GetProductGoodsDialogList_V2", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
var tempArray = res.data.data.pageData; var tempArray = res.data.data.pageData;
......
...@@ -202,17 +202,22 @@ export default { ...@@ -202,17 +202,22 @@ export default {
type: mime type: mime
}); });
if(upInfo.IsDefault==1){ if(upInfo.IsDefault==1){
that.uploadStart(path, newFile, callback) if(upInfo.StoreType==1){
that.uploadStart(path, newFile, callback)
}
if(upInfo.StoreType==2){
that.uploadToAli(path, newFile, callback)
}
}else{ }else{
this.Error('请先配置上传'); this.Error('请先配置上传');
} }
}).catch(function (error) { }).catch(function (error) {
if(upInfo.IsDefault==1){ if(upInfo.IsDefault==1){
if(upInfo.StoreType==1){ if(upInfo.StoreType==1){
that.uploadStart(path, newFile, callback) that.uploadStart(path, fileObj, callback)
} }
if(upInfo.StoreType==3){ if(upInfo.StoreType==2){
that.uploadToAli(path, newFile, callback) that.uploadToAli(path, fileObj, callback)
} }
}else{ }else{
this.Error('请先配置上传'); this.Error('请先配置上传');
...@@ -225,7 +230,7 @@ export default { ...@@ -225,7 +230,7 @@ export default {
if(upInfo.StoreType==1){ if(upInfo.StoreType==1){
this.uploadStart(path, fileObj, callback) this.uploadStart(path, fileObj, callback)
} }
if(upInfo.StoreType==3){ if(upInfo.StoreType==2){
this.uploadToAli(path, fileObj, callback) this.uploadToAli(path, fileObj, callback)
} }
}else{ }else{
...@@ -279,7 +284,6 @@ export default { ...@@ -279,7 +284,6 @@ export default {
FileUrl: "http://" + data.Location FileUrl: "http://" + data.Location
} }
if (callback) { if (callback) {
console.log(uploadResult,'uploadResult');
callback(uploadResult); callback(uploadResult);
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment