diff --git a/src/lycomponents/iSaleModelChoose/index.vue b/src/lycomponents/iSaleModelChoose/index.vue new file mode 100644 index 0000000..b8ae29b --- /dev/null +++ b/src/lycomponents/iSaleModelChoose/index.vue @@ -0,0 +1,344 @@ + + + + + + diff --git a/src/lycomponents/index.js b/src/lycomponents/index.js index d159024..128cfc7 100644 --- a/src/lycomponents/index.js +++ b/src/lycomponents/index.js @@ -9,6 +9,7 @@ import iHeader from "@/lycomponents/iHeader"; import iSwitchBrand from "@/lycomponents/iSwitchBrand"; import iSwitchModel from "@/lycomponents/iSwitchModel"; +import iSaleModelChoose from "@/lycomponents/iSaleModelChoose"; import iHeaderMa from "@/lycomponents/iHeaderMa" import iHeaderBrand from "@/lycomponents/iHeaderBrand" import iHeaderMyself from "@/lycomponents/iHeaderMyself"; @@ -21,7 +22,8 @@ export default { iHeaderMa, iSwitchModel, iHeaderBrand, - iHeaderMyself + iHeaderMyself, + iSaleModelChoose } }) } diff --git a/src/views/SaleRank/AllLevel/index.vue b/src/views/SaleRank/AllLevel/index.vue index 096e112..5617560 100644 --- a/src/views/SaleRank/AllLevel/index.vue +++ b/src/views/SaleRank/AllLevel/index.vue @@ -184,7 +184,7 @@ export default { }) }, disabledDate(current) { - return (current > moment(this.dDate).add(1,'months')); + return (current > moment(this.dDate)); }, //前往详细 goInfo(index) { diff --git a/src/views/SaleRank/BrandSale/index.vue b/src/views/SaleRank/BrandSale/index.vue index 0f8d68a..98afbf9 100644 --- a/src/views/SaleRank/BrandSale/index.vue +++ b/src/views/SaleRank/BrandSale/index.vue @@ -22,6 +22,9 @@ + @@ -72,6 +75,7 @@ export default { title: "销量", dataIndex: "salescount", key: "salescount", + scopedSlots: { customRender: "sale" }, }, { title: "占品牌份额(%)", diff --git a/src/views/SaleRank/CitySale/tbEvent.js b/src/views/SaleRank/CitySale/tbEvent.js index 89d1ce5..753705a 100644 --- a/src/views/SaleRank/CitySale/tbEvent.js +++ b/src/views/SaleRank/CitySale/tbEvent.js @@ -10,7 +10,7 @@ export default { let data = res.data; this.brandTypeList = data }), - getUserBrand({token: this.getToken}).then(res => { + getUserBrand({token: this.getToken,sType: "Marketing"}).then(res => { let data = res.data; let brandList = [[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]]; let letters = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']; @@ -210,7 +210,7 @@ export default { }, drawerChooseBrand(val) { this.form.sBrand = val; - let o = {token: this.getToken, sBrandName: this.form.sBrand}; + let o = {token: this.getToken, sBrandName: this.form.sBrand,sType: "Marketing"}; getUserSeriesName(o).then(res => { let data = res.data; this.seriesList = data; diff --git a/src/views/SaleRank/SeriesInfo/index.vue b/src/views/SaleRank/SeriesInfo/index.vue index d675e29..695de6f 100644 --- a/src/views/SaleRank/SeriesInfo/index.vue +++ b/src/views/SaleRank/SeriesInfo/index.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/SaleRank/index.vue b/src/views/SaleRank/index.vue index 49573d2..c94fdb8 100644 --- a/src/views/SaleRank/index.vue +++ b/src/views/SaleRank/index.vue @@ -126,7 +126,8 @@ export default { form: { token: '', sStartTime: '', - sEndTime: '' + sEndTime: '', + sType: 'Marketing' }, brandList: [], //品牌列表 brandOption: [], diff --git a/src/views/WeiboDetails/weiboCharacters/index.vue b/src/views/WeiboDetails/weiboCharacters/index.vue index 5bbecf4..16dce28 100644 --- a/src/views/WeiboDetails/weiboCharacters/index.vue +++ b/src/views/WeiboDetails/weiboCharacters/index.vue @@ -11,7 +11,7 @@