-
-
+
+
+
+
{{item.label}}
@@ -59,7 +73,6 @@
-
@@ -126,22 +139,19 @@
-
-
-
- {{item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00'}}
-
-
-
-
- {{item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00'}}
-
-
-
-
- {{item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00'}}
-
-
+
+
+ 车流增幅
+
+ {{item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'+':''}}
+
+
+ {{item.BayonetINC.increaseRate?item.BayonetINC.increaseRate>1000?'-':item.BayonetINC.increaseRate:'-'}}%
+
+
+
+

+
@@ -201,10 +211,19 @@ export default {
compareYear:'',
ServerpartIds:'',
sortType: 1,// 正序降序 0正序 1降序
- sortName: 4,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
+ sortName: 3,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
+ statusBarHeight:0,
+ menu:'',
+ pageType:1,// 选择的类型
+ serverPartList:[],// 服务区列表
}
},
onLoad(query){
+ // 获取手机参数对页面进行适配
+ let systemInfo = uni.getSystemInfoSync()
+ this.statusBarHeight = Number(systemInfo.statusBarHeight)
+ this.menu = uni.getMenuButtonBoundingClientRect()
+
if (query.type){
this.type = Number(query.type)
}
@@ -234,7 +253,7 @@ export default {
if (lastMonth === 1){
dayNumber = lastDays - 26 + 1
}else{
- dayNumber = 6 + lastDays + 1
+ dayNumber = 6 + lastDays
}
this.howDayNumber = dayNumber
let dateList = []
@@ -275,9 +294,12 @@ export default {
uni.showLoading({
title: '正在加载...'
})
- let time = date?date==='all'?this.lastDay:this.currentScroll.split('item')[1]:this.currentScroll.split('item')[1]
+ let time = date?
+ date==='all'?this.lastDay:
+ this.currentScroll.split('item')[1]:
+ this.currentScroll.split('item')[1]
const req = {
- calcType:this.currentScroll==='all'?1:2,
+ calcType:this.pageType,
pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
curYear: this.curYear,
compareYear: this.compareYear,
@@ -290,6 +312,13 @@ export default {
const data = await request.$webGet('CommercialApi/Revenue/GetServerpartINCAnalysis',req)
console.log('data',data)
this.dataList = this.handleGetSort(data.Result_Data.List)
+ let list = []
+ if (data.Result_Data.List && data.Result_Data.List.length>0){
+ data.Result_Data.List.forEach(item=>{
+ list.push({name:item.ServerpartName,value:item.ServerpartId})
+ })
+ }
+ this.serverPartList = list
uni.hideLoading()
},
// 修改排序字段
@@ -309,9 +338,24 @@ export default {
}
let list = this.handleGetSort(this.dataList)
this.dataList = list
+ console.log('this.dataList',this.dataList)
this.$forceUpdate()
uni.hideLoading()
},
+ // 切换模块
+ handleChangeType(value){
+ this.pageType = value
+ if (value===2){
+ this.handleGetData('all')
+ }else{
+ this.handleGetData()
+ }
+ },
+ handleBack(){
+ uni.navigateBack({
+ delta: 1
+ });
+ },
// 排序方法
handleGetSort(list){
var len = list.length;
@@ -519,6 +563,18 @@ export default {
}
}
return list;
+ },
+ // 跳转去看服务区排名
+ handleGoServerPartDetail(obj){
+ console.log('obj',obj)
+ let springObj = {
+ SERVERPART_NAME: obj.ServerpartName,
+ SPREGIONTYPE_NAME: obj.SPRegionTypeName,
+ SPRegionType_ID: obj.SPRegionTypeId,
+ Serverpart_ID: obj.ServerpartId,
+ }
+ uni.setStorageSync('springService',springObj) //当前选中服务区信息
+ this.$util.toNextRoute('navigateTo', `/pages/nationalPage/merchantRevenue?ServerpartId=${obj.ServerpartId}&type=${this.type}&serverPartList=${JSON.stringify(this.serverPartList)}`)
}
}
}
@@ -528,10 +584,38 @@ export default {
diff --git a/static/images/newIndex/leftRed.png b/static/images/newIndex/leftRed.png
deleted file mode 100644
index af831cf..0000000
Binary files a/static/images/newIndex/leftRed.png and /dev/null differ
diff --git a/static/images/newIndex/noticeIcon2.svg b/static/images/newIndex/noticeIcon2.svg
deleted file mode 100644
index da4f4c6..0000000
--- a/static/images/newIndex/noticeIcon2.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/static/images/newIndex/rightPink.png b/static/images/newIndex/rightPink.png
deleted file mode 100644
index 06f8f3b..0000000
Binary files a/static/images/newIndex/rightPink.png and /dev/null differ