diff --git a/src/Coldairarrow.Api/Filters/参数校验/ValidFilterAttribute.cs b/src/Coldairarrow.Api/Filters/参数校验/ValidFilterAttribute.cs index ea29f93..af514ed 100644 --- a/src/Coldairarrow.Api/Filters/参数校验/ValidFilterAttribute.cs +++ b/src/Coldairarrow.Api/Filters/参数校验/ValidFilterAttribute.cs @@ -11,8 +11,13 @@ namespace Coldairarrow.Api if (!context.ModelState.IsValid) { var msgList = context.ModelState.Values.SelectMany(x => x.Errors).Select(x => x.ErrorMessage); - + if (string.Join(",", msgList).Contains("NaN")) + { + context.Result = Error("操作失败,必要数据未填!"); + } + else { context.Result = Error(string.Join(",", msgList)); + } } await Task.CompletedTask; diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs index a8b2222..b6c71b1 100644 --- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs @@ -251,26 +251,26 @@ namespace Coldairarrow.Business.HuiYan } public AjaxResult SetItem(TeamitemDto model) { - //if (!string.IsNullOrEmpty(model.RivalGoodsId)) - //{ - // if (model.RivalGoodsId.Contains(".")) - // { - // model.RivalGoodsId = Regex.Match(model.RivalGoodsId + "&", "id=(.*?)&").Groups[1].Value; - // } - //} - int row = Db.Update(c => c.Id == model.Id, (item) => + try { - item.ExtensionJson = Newtonsoft.Json.JsonConvert.SerializeObject(model.Extensions); - item.RivalGoodsId = model.RivalGoodsId; - item.RivalPLCount = model.RivalPLCount; - item.RivalPrice = model.RivalPrice; - item.RivalTitle = model.RivalTitle; - item.RivalImg = model.RivalImg; - }); + int row = Db.Update(c => c.Id == model.Id, (item) => + { + item.ExtensionJson = Newtonsoft.Json.JsonConvert.SerializeObject(model.Extensions); + item.RivalGoodsId = model.RivalGoodsId; + item.RivalPLCount = model.RivalPLCount; + item.RivalPrice = model.RivalPrice; + item.RivalTitle = model.RivalTitle; + item.RivalImg = model.RivalImg; + }); - if (row > 0) - return Success(); - return Error("操作失败!"); + if (row > 0) + return Success(); + return Error("操作失败!"); + } + catch (Exception ex) + { + return Error("操作失败,缺少必填数据!"); + } } public bool UpdateTaskSuccess(List logs) diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js index bdb27c9..ddff31d 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js @@ -21,6 +21,7 @@ let ipAddress = axios.defaults.baseURL; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; //axios.defaults.baseURL = 'http://111.230.132.27:8033/'; +// axios.defaults.baseURL = 'http://localhost:5000/'; axios.interceptors.request.use((config) => { //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken(); diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue index c35620d..8c312da 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue @@ -774,7 +774,11 @@ export default { }, //获取利润率 initProfits(item,ext){ - ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2); + if(item.RivalPrice==undefined) + { + item.RivalPrice=0 + } + ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2); //var taxp=parseFloat(item.RivalPrice * 0.03).toFixed(2) if(ext.TaxPrice==undefined||ext.TaxPrice==null)