diff --git a/App.vue b/App.vue
index 9871e57..916825d 100644
--- a/App.vue
+++ b/App.vue
@@ -42,10 +42,8 @@
let _this = this
if (this.user.WeChat_MiniProToken) {
- console.log('有')
this.memberLogin()
} else {
- console.log('无')
this.getLoginCode()
}
diff --git a/pages/examine/index.vue b/pages/examine/index.vue
index a3298c0..f726750 100644
--- a/pages/examine/index.vue
+++ b/pages/examine/index.vue
@@ -249,7 +249,7 @@
({{subItem.DEDUCTION_SCORE}}分;
备注: {{subItem.EXAMINEDETAIL_DESC}})
-
+
@@ -409,11 +409,12 @@ export default {
console.log('subItem',subItem)
subItem.showChild = !subItem.showChild
},
- previewImage(event){
+ previewImage(event,subItem){
console.log('event',event)
+ console.log('subItem',subItem)
wx.previewImage({
current: event.currentTarget.dataset.src, // 当前显示图片的http链接
- urls: [event.currentTarget.dataset.src] // 需要预览的图片http链接列表
+ urls: subItem.imgList // 需要预览的图片http链接列表
})
},
// 弹出框点击蒙层关闭
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4ffc2fa..df94b55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1072,10 +1072,8 @@ export default {
Province_Code: '340000',
GroupType: 1
}
- console.log('requestParams',requestParams)
const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParams)
let res = bayonetCount.Result_Data.List
- console.log('res',res)
res.forEach((item=>{
if (item.Vehicle_Count===null || item.SectionFlow_Count===null || item.Entry_Rate===null || item.Entry_Rate>100){
item.Vehicle_Count = 0
@@ -1127,8 +1125,7 @@ export default {
allList.push(list3.slice(0,20))
this.allTrafficList = allList
this.showTrafficList = this.allTrafficList[this.selectSmallTab - 1]
- console.log('this.allTrafficList',this.allTrafficList)
- uni.hideLoading()
+ // uni.hideLoading()
},
handleChangeLoadMore(){
this.loadMore = !this.loadMore
@@ -1143,7 +1140,6 @@ export default {
this.$util.toNextRoute('navigateTo', `/pages/commercialBI/specialCase`)
},
handleChangeSmallSelect(val){
- console.log('val',val)
this.selectSmallTab = val
this.showTrafficList = this.allTrafficList[val-1]
},
@@ -1315,7 +1311,7 @@ export default {
this.getUnUpLoadList()
// 拿到车流数据
this.handleGetTrafficList()
- // 是否显示预警信息
+ // 预警信息 有值会显示车流预警
this.handleGetWarningList()
} else if (this.user.Membership_Id){ // 默认
// 不是从推送进来 走正常的请求方法
@@ -1354,8 +1350,8 @@ export default {
}
},
handleGetWarningList(){
- console.log('single',this.single)
const date = new Date()
+ // 拿到当前小时的前一小时
let h = date.getHours() - 1
const req= {
// this.single
@@ -1464,6 +1460,50 @@ export default {
let flag2 = false
let flag3 = false
let _this = this
+
+ // 获取营收推送汇总数据
+ const allPriceData = {
+ pushProvinceCode:'340000',
+ Statistics_Date:this.lastDay,
+ ShowCompareRate: true,
+ ShowYearRevenue: true
+ }
+ uni.showLoading({
+ title: '正在加载...'
+ })
+ console.log(22222)
+ const lastData = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData)
+ flag3 = true
+ let result = lastData.Result_Data
+ for(let key in result){
+ if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){
+ let all = 0
+ // 先算出全部的总额数量 用来计算百分比
+ result[key].forEach(item=>{
+ all += Number(item.value)
+ })
+ // 把百分比计算出来加到每一项中
+ result[key].map(item=>{
+ item.percentage = ((Number(item.value)/all)*100).toFixed(2)
+ })
+ // 格式化掉处理的数据
+ result[key].forEach(item=>{
+ item.value = _this.$util.fmoney(item.value)
+ })
+ }
+ }
+ this.monthAmountAdd = this.$util.fmoney(result.MonthRevenueAmount)
+ this.yearAmountAdd = result.YearRevenueAmount?this.$util.fmoney(result.YearRevenueAmount):'-'
+ this.modelProgress = result.BusinessTypeList
+ this.regionProgress = result.BusinessTradeList
+ this.areaProgress = result.SPRegionList
+ this.showTableData = result.RevenuePushModel
+ this.showTableData.compared = result.GrowthRate
+ // 只有接口全面通了 才可以处理数据显示
+ console.log('flag2',flag2)
+ console.log('flag3',flag3)
+
+
// 传入最近的有效日期就可以拿到当前有效日期的前一天的日期
let yesterday = handleYesterday(this.lastDay)
if ((yesterday.substr(yesterday.length-1,1)) === '0'){
@@ -1520,7 +1560,9 @@ export default {
Statistics_Date: this.lastDay,
ShowCompareRate:true
}
+ console.log(11111)
const data = await request.$webGet('CommercialApi/Revenue/GetMallDeliver',todayData)
+ console.log(4444)
this.lastDayBillCount = data.Result_Data
this.detailTypeList[2].value = this.lastDayBillCount.DeliverBill_Count
this.detailTypeList[2].add = this.lastDayBillCount.DeliverBillGrowth_Count
@@ -1566,48 +1608,48 @@ export default {
// // 赋值给data中的这个对象 在请求完之后会进行统一f的数据处理
// this.buyPriceMonth = res.Result_Data.Deliver_Price
// })
- // 获取营收推送汇总数据
- const allPriceData = {
- pushProvinceCode:'340000',
- Statistics_Date:this.lastDay,
- ShowCompareRate: true,
- ShowYearRevenue: true
- }
- request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData).then(res=>{
- flag3 = true
- // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
- let result = res.Result_Data
- for(let key in result){
- if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){
- let all = 0
- // 先算出全部的总额数量 用来计算百分比
- result[key].forEach(item=>{
- all += Number(item.value)
- })
- // 把百分比计算出来加到每一项中
- result[key].map(item=>{
- item.percentage = ((Number(item.value)/all)*100).toFixed(2)
- })
- // 格式化掉处理的数据
- result[key].forEach(item=>{
- item.value = _this.$util.fmoney(item.value)
- })
- }
- }
- this.monthAmountAdd = this.$util.fmoney(result.MonthRevenueAmount)
- this.yearAmountAdd = result.YearRevenueAmount?this.$util.fmoney(result.YearRevenueAmount):'-'
- this.modelProgress = result.BusinessTypeList
- this.regionProgress = result.BusinessTradeList
- this.areaProgress = result.SPRegionList
- this.showTableData = result.RevenuePushModel
- this.showTableData.compared = result.GrowthRate
- // 只有接口全面通了 才可以处理数据显示
- console.log('flag2',flag2)
- console.log('flag3',flag3)
- if (flag2 && flag3 ){
- this.todayAmount()
- }
- })
+
+
+ // request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData).then(res=>{
+ // console.log(33333)
+ // flag3 = true
+ // // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
+ // let result = res.Result_Data
+ // for(let key in result){
+ // if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){
+ // let all = 0
+ // // 先算出全部的总额数量 用来计算百分比
+ // result[key].forEach(item=>{
+ // all += Number(item.value)
+ // })
+ // // 把百分比计算出来加到每一项中
+ // result[key].map(item=>{
+ // item.percentage = ((Number(item.value)/all)*100).toFixed(2)
+ // })
+ // // 格式化掉处理的数据
+ // result[key].forEach(item=>{
+ // item.value = _this.$util.fmoney(item.value)
+ // })
+ // }
+ // }
+ // this.monthAmountAdd = this.$util.fmoney(result.MonthRevenueAmount)
+ // this.yearAmountAdd = result.YearRevenueAmount?this.$util.fmoney(result.YearRevenueAmount):'-'
+ // this.modelProgress = result.BusinessTypeList
+ // this.regionProgress = result.BusinessTradeList
+ // this.areaProgress = result.SPRegionList
+ // this.showTableData = result.RevenuePushModel
+ // this.showTableData.compared = result.GrowthRate
+ // // 只有接口全面通了 才可以处理数据显示
+ // console.log('flag2',flag2)
+ // console.log('flag3',flag3)
+ //
+ //
+ // })
+ console.log(55555)
+ if (flag2 && flag3 ){
+ // uni.hideLoading()
+ this.todayAmount()
+ }
},
defaultMsg() {
let option = null
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 5b98c84..3684574 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -5,7 +5,7 @@
-
+
@@ -48,6 +48,7 @@