diff --git a/App.vue b/App.vue index e55f7fb..3da5f57 100644 --- a/App.vue +++ b/App.vue @@ -41,9 +41,12 @@ }) let _this = this + console.log('this.user.WeChat_MiniProToken',this.user.WeChat_MiniProToken) if (this.user.WeChat_MiniProToken) { + console.log('1') this.memberLogin() } else { + console.log('2') this.getLoginCode() } diff --git a/pages.json b/pages.json index c85d005..3aa43e1 100644 --- a/pages.json +++ b/pages.json @@ -91,6 +91,13 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "moreList", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue index 3bd93cb..3c87fa8 100644 --- a/pages/everdayRenven/AnhuiIndex.vue +++ b/pages/everdayRenven/AnhuiIndex.vue @@ -454,7 +454,9 @@ export default { }, async initData() { // 初始化营收数据 let _this = this - console.log('this.theRequest',this.theRequest) + console.log('this.theRequest1',this.theRequest) + this.theRequest.GroupType = 1000 + this.theRequest.ServerpartIds = '' const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] = await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据 diff --git a/pages/everdayRenven/index.vue b/pages/everdayRenven/index.vue index 7a1700e..f169359 100644 --- a/pages/everdayRenven/index.vue +++ b/pages/everdayRenven/index.vue @@ -1188,6 +1188,7 @@ this.opacity = (options.scrollTop - 30) / 68 }, onLoad(option) { + console.log('option',option) uni.showLoading({ title: '正在加载...' }) diff --git a/pages/index/index.vue b/pages/index/index.vue index c3e1369..fe096ee 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -379,18 +379,23 @@ {{item.name}} - +
- -
- -
- 欢度国庆 - +
+ +
+ +
+ 欢度国庆 + +
+
+ {{lastDay}} +
@@ -773,8 +778,8 @@ export default { popupShow:false, popup:true, nationalDayList:[ - {title:'当日营收',unit:'/万元',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueBg.svg'}, - {title:'当日车流',unit:'/辆',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/carIcon.svg'}, + {title:'营收',unit:'/万元',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueBg.svg'}, + {title:'车流',unit:'/万辆',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/carIcon.svg'}, {title:'车流增幅Top1',unit:'',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/add.png'}, ], tabTypeList:[ @@ -872,8 +877,11 @@ export default { user:{ // 新用户刚进来的时候可能onLoad会执行不了 监听他的user变化确保能请求 handler:function (value){ + console.log('watch',value) let userInfo = uni.getStorageSync('vuex') userInfo = JSON.parse(userInfo) + console.log('userInfo',userInfo) + console.log('this.isReturn',this.isReturn) if (this.isReturn===true){ // 无权限就会跳转到无数据的页面 if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ @@ -889,24 +897,45 @@ export default { } // 拿到用户当前的经纬度位置 this.seat = uni.getStorageSync('seatInfo') + console.log('this.seat',this.seat) if (!this.seat){ //获取用户的经纬度位置存在stroge里面 - wx.getFuzzyLocation({ - type:'gcj02', - altitude:true, - success: (res) =>{ - let seatInfo = { + console.log('1111') + if (wx.getPrivacySetting){ + wx.getPrivacySetting({ + success: res=>{ + console.log('res123123',res) + if (res.needAuthorization){ + this.$util.toNextRoute('redirectTo', '/pages/register/register') + }else{ + wx.getFuzzyLocation({ + type:'gcj02', + altitude:true, + success: (res) =>{ + console.log('res',res) + let seatInfo = { latitude:res.latitude, longitude:res.longitude + } + uni.setStorageSync('seatInfo', seatInfo); + this.seat = seatInfo } - uni.setStorageSync('seatInfo', seatInfo); - this.seat = seatInfo + }) } + } }) + }else{ + uni.showModal({ + title: '提示', + content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。' + }) + return + } }else{ //拿到最近服务区的数据 this.nearestService() } + console.log('this.isReturn',this.isReturn) if (!this.isReturn){ this.getData(this.option) this.handleNoticeMonth() @@ -1059,7 +1088,7 @@ export default { ShowGrowthRate:true } const data = await request.$webGet('CommercialApi/BigData/GetBayonetGrowthAnalysis',req) - this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.noDecimal(data.Result_Data.sumEntryCount):'' + this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.fmoney(Number((data.Result_Data.sumEntryCount / 10000).toFixed(2))):'' this.nationalDayList[2].value = data.Result_Data.GrowthList[0].Entry_GrowthRate>0?'+' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%':'-' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%' console.log('拿到国庆数据data',data) }, @@ -1105,6 +1134,7 @@ export default { ProvinceCode:'340000' } const data = await request.$webGet('CommercialApi/Suggestion/GetMemberUnreadData',req) + console.log('getSuggestion',data) if (data.Result_Data.data){ if (data.Result_Data.data !== '0'){ this.isShow = true @@ -1770,6 +1800,7 @@ export default { } time = `${y}${m}` } + console.log('time',time) const req = { Province_Code:this.useInfo.userData.ProvinceCode || '340000', Statistics_Date:time @@ -3575,39 +3606,53 @@ $iphoneHeight: env(safe-area-inset-bottom); width: 100%; display: flex; align-items: center; - .lanternImg{ - width: 104rpx; - height: 126rpx; - margin-left: 8rpx; - } - .titleBox{ - width: 300rpx; - height: 60rpx; - background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"); - background-repeat: no-repeat; - background-size: contain; - padding-left: 36rpx; - box-sizing: border-box; + justify-content: space-between; + .nationalTopLeft{ display: flex; - transform: translateX(-30px); align-items: center; - .title{ + .lanternImg{ + width: 104rpx; + height: 126rpx; + margin-left: 8rpx; + } + .titleBox{ + width: 300rpx; + height: 60rpx; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"); + background-repeat: no-repeat; + background-size: contain; + padding-left: 36rpx; + box-sizing: border-box; display: flex; + transform: translateX(-30px); align-items: center; - .text{ - font-size: 32rpx; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 600; - color: #E93113; - line-height: 44rpx; - } - .rightIcon{ - width: 32rpx; - height: 32rpx; - margin-left: 16rpx; + .title{ + display: flex; + align-items: center; + .text{ + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 600; + color: #E93113; + line-height: 44rpx; + } + .rightIcon{ + width: 32rpx; + height: 32rpx; + margin-left: 16rpx; + } } } } + .nationalTopRight{ + .timeText{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #E93113; + line-height: 34rpx; + } + } } .nationalContent{ width: 100%; diff --git a/pages/nationalPage/index.vue b/pages/nationalPage/index.vue index 036ce27..16d9363 100644 --- a/pages/nationalPage/index.vue +++ b/pages/nationalPage/index.vue @@ -2,8 +2,8 @@
-
- +
+

欢度国庆

@@ -15,7 +15,13 @@
-

服务区当日营收 Top5

+
+

{{ dayName }}营收 Top5

+
+ 查看更多 + +
+
@@ -28,8 +34,9 @@
- - {{item.Serverpart_Name.split('服务区')[0]}}{{item.ShopRegionName}} + + + {{item.Serverpart_Name.split('服务区')[0]}}
{{$util.fmoney(item.CashPay,2)}}/元 @@ -46,7 +53,13 @@
-

当日入区车流量 Top5

+
+

{{dayName}}入区车流量 Top5

+
+ 查看更多 + +
+
@@ -59,8 +72,8 @@
- - {{item.Serverpart_Name.split('服务区')[0]}}{{item.Serverpart_Region}} + + {{item.Serverpart_Name.split('服务区')[0]}}{{item.Serverpart_Region || ''}}
{{$util.noDecimal(item.Vehicle_Count) }}/辆 @@ -77,13 +90,19 @@
-

当日入区车流量增幅 Top5

+
+

{{dayName}}入区车流量增幅 Top5

+
+ 查看更多 + +
+
- - {{item.Serverpart_Name.split('服务区')[0]}}{{item.Serverpart_Region}} + + {{item.Serverpart_Name.split('服务区')[0]}}{{item.Serverpart_Region || ''}}
@@ -112,6 +131,8 @@ export default { entryCarList:[],//入区排行 entrySum:0,// 入区总计 addList:[],// 增幅排行 + time:'', + dayName:'' } }, onLoad(query){ @@ -126,12 +147,24 @@ export default { uni.showLoading({ title: '正在加载...' }) + this.time = query.time + const date = new Date(query.time) + let y = date.getFullYear() + let m = date.getMonth() + 1 + let d = date.getDate() + // ${y}年 + this.dayName = `${m}月${d}日` // 拿到营收排行 this.handleGetRevenue(query.time) // 车流排行 this.handleGetCar(query.time) }, methods:{ + handleGoMore(type){ + uni.navigateTo({ + url:`/pages/nationalPage/moreList?type=${type}&time=${this.time}&dayName=${this.dayName}` + }) + }, handleBack(){ uni.navigateBack({ delta: 1 @@ -164,7 +197,13 @@ export default { console.log('车流排行',data) this.entrySum = data.Result_Data.sumEntryCount this.entryCarList = data.Result_Data.EntryList.slice(0,5) - this.addList = data.Result_Data.GrowthList.slice(0,5) + let list = [] + data.Result_Data.GrowthList.forEach(item=>{ + if (item.Entry_GrowthRate>100){ + list.push(item) + } + }) + this.addList = list.slice(0,5) if (this.entrySum && this.entryCarList && this.entryCarList.length>0 && this.addList && this.addList.length>0 && this.revenueSum && this.revenueList && this.revenueList.length>0){ uni.hideLoading() @@ -191,7 +230,11 @@ export default { z-index: 1; } .header{ - position: absolute; + position: fixed; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/pageBg.png"); + background-repeat: no-repeat; + background-position: 0 0; + background-size: cover; width: 100%; padding: 0 16px; box-sizing: border-box; @@ -202,6 +245,7 @@ export default { width: 24px; height: 24px; margin-right: 16px; + position: absolute; } } .topContent{ @@ -251,13 +295,36 @@ export default { position: absolute; width: calc(100% - 48rpx); z-index: 2; - .title{ - font-size: 36rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - color: #F95222; - line-height: 44rpx; + .listTop{ + display: flex; + align-items: center; + justify-content: space-between; + .title{ + font-size: 36rpx; + font-family: Alimama ShuHeiTi; + font-weight: bold; + color: #F95222; + line-height: 44rpx; + } + .moreBox{ + display: flex; + align-items: center; + justify-content: space-between; + .text{ + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 36rpx; + } + .moreIcon{ + width: 20rpx; + height: 40rpx; + margin-left: 4rpx; + } + } } + .listBox{ width: 100%; background: #fff; @@ -320,6 +387,7 @@ export default { width: 40rpx; height: 40rpx; } + .name{ margin-left: 20rpx; font-size: 28rpx; @@ -388,12 +456,34 @@ export default { position: absolute; width: calc(100% - 48rpx); z-index: 2; - .title{ - font-size: 36rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - color: #096EF7; - line-height: 44rpx; + .listTop{ + display: flex; + align-items: center; + justify-content: space-between; + .title{ + font-size: 36rpx; + font-family: Alimama ShuHeiTi; + font-weight: bold; + color: #096EF7; + line-height: 44rpx; + } + .moreBox{ + display: flex; + align-items: center; + justify-content: space-between; + .text{ + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 36rpx; + } + .moreIcon{ + width: 20rpx; + height: 40rpx; + margin-left: 4rpx; + } + } } .listBox{ width: 100%; @@ -524,12 +614,34 @@ export default { position: absolute; width: calc(100% - 48rpx); z-index: 2; - .title{ - font-size: 36rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - color: #018ABD; - line-height: 44rpx; + .listTop{ + display: flex; + align-items: center; + justify-content: space-between; + .title{ + font-size: 36rpx; + font-family: Alimama ShuHeiTi; + font-weight: bold; + color: #018ABD; + line-height: 44rpx; + } + .moreBox{ + display: flex; + align-items: center; + justify-content: space-between; + .text{ + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 36rpx; + } + .moreIcon{ + width: 20rpx; + height: 40rpx; + margin-left: 4rpx; + } + } } .listBox{ width: 100%; diff --git a/pages/nationalPage/moreList.vue b/pages/nationalPage/moreList.vue new file mode 100644 index 0000000..c2b50b1 --- /dev/null +++ b/pages/nationalPage/moreList.vue @@ -0,0 +1,737 @@ + + + + + + diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue index 02bf575..ce761c9 100644 --- a/pages/projectWarning/detail.vue +++ b/pages/projectWarning/detail.vue @@ -55,8 +55,8 @@ 本项目驿达累计分润已达￥{{ dataDetail.ROYALTY_PRICE|| '-' }},
其中已扣减水电物业费 - ￥{{$util.fmoney(dataDetail.EXPENSE_AMOUNT)}} - ,
+ ￥{{$util.fmoney(dataDetail.EXPENSE_AMOUNT)}}, +
预计{{ dataDetail.EXPIREDAYS|| '-' }}后完成 已完成保底！ diff --git a/store/store.js b/store/store.js index 0397809..b4df23a 100644 --- a/store/store.js +++ b/store/store.js @@ -70,6 +70,7 @@ const actions = { }, getTodoList({ dispatch, state,commit}){ // 获取用户待办事项 let _user = state.userData + console.log('getTodoList') request.$get("ToDoList", { userId: _user.UserId, userName: _user.UserName || ''