diff --git a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs index 852b503..23e7ca7 100644 --- a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs @@ -212,6 +212,11 @@ namespace Coldairarrow.Business.HuiYan return Error("任务不存在!"); } + if (teamItem.RivalPrice==null||string.IsNullOrEmpty(teamItem.RivalImg)) + { + return Error("对标商品信息不能为空!"); + } + var result = Db.RunTransaction(() => { int row = Db.Update(c => c.Id == teamItem.Id, (item) => diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js index 0991e34..bdb27c9 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js @@ -20,7 +20,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://111.230.132.27:8033/'; axios.interceptors.request.use((config) => { //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken(); diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue index a6739a8..84f9722 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue @@ -58,7 +58,12 @@ export default { methods: { changeDate(day){ //.format('YYYY-MM-DD'), + if(day==1) + { + this.endDate=moment().add(day*-1,'days') + }else{ this.endDate=moment() + } this.startDate=moment().add(day*-1,'days') }, getInfoData(){ diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue index dd410b2..c40ce00 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue @@ -354,7 +354,7 @@