diff --git a/ahyd_DIB.zip b/ahyd_DIB.zip index 30ac418..002c63a 100644 Binary files a/ahyd_DIB.zip and b/ahyd_DIB.zip differ diff --git a/pages/authorityApproval/index.vue b/pages/authorityApproval/index.vue index 7143cab..a44047c 100644 --- a/pages/authorityApproval/index.vue +++ b/pages/authorityApproval/index.vue @@ -108,7 +108,7 @@ } ,{ name:'资料完善', - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', typeId: 8 } diff --git a/pages/commodity_temp/index.vue b/pages/commodity_temp/index.vue index e2c7197..3cd269c 100644 --- a/pages/commodity_temp/index.vue +++ b/pages/commodity_temp/index.vue @@ -136,19 +136,19 @@ typeId: 0 }, { name: '类型1', - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', typeId: 1 }, { name: '类型2', - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', typeId: 2 }, { name: '类型3', - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', typeId: 3 }, { name: '类型4', - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', typeId: 4 }], }, diff --git a/pages/expenseApproval/expenseApproval.vue b/pages/expenseApproval/expenseApproval.vue index 20bb76f..3687b22 100644 --- a/pages/expenseApproval/expenseApproval.vue +++ b/pages/expenseApproval/expenseApproval.vue @@ -144,7 +144,7 @@ },{ name: '付款审批', typeId: "401603", - src: '../../../../../static/images/expense/type/fksp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/fksp.png', },{ name:'保证金退付', typeId: "401604", diff --git a/pages/index/index.vue b/pages/index/index.vue index 647fcc3..9830a05 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1056,7 +1056,7 @@ - + @@ -1064,7 +1064,7 @@ 经营预警 - + @@ -1640,6 +1640,8 @@ export default { oldSwiperIndex: 0,// 移动swiper 等待1秒钟 如果保持一致就请求 不一致就return showAdvertisement: false,// 是否显示一开始的广告 isShowCloseAnimal: false,// 是否显示关闭动画 + businessWarning: false,// 经营预警 + projectWarning: false,// 项目预警 } }, watch:{ @@ -1661,6 +1663,15 @@ export default { if (userInfo.userData.AuthorityInfo['e2fb458b-d1bd-48fa-805e-fc93dc71efb7'] === 1 || userInfo.userData.AuthorityInfo['ea2fc404-d924-4c88-98de-1f4d96137745'] === 1){ this.getSuggestion() } + console.log('userInfo.userData.AuthorityInfo[\'03bd2dbf-a5ed-4080-b168-92c3b7412d6f\']',userInfo.userData.AuthorityInfo['03bd2dbf-a5ed-4080-b168-92c3b7412d6f']) + if (userInfo.userData.AuthorityInfo['03bd2dbf-a5ed-4080-b168-92c3b7412d6f'] === 1){ + this.businessWarning = true + } + console.log('userInfo.userData.AuthorityInfo[\'2d25dddc-e67f-4e26-b2d1-da78beed2c11\']',userInfo.userData.AuthorityInfo['2d25dddc-e67f-4e26-b2d1-da78beed2c11']) + if (userInfo.userData.AuthorityInfo['2d25dddc-e67f-4e26-b2d1-da78beed2c11'] === 1){ + this.projectWarning = true + } + // 拿到用户当前的经纬度位置 this.seat = uni.getStorageSync('seatInfo') if (!this.seat){ @@ -1828,6 +1839,12 @@ export default { if (userInfo.userData.AuthorityInfo['e2fb458b-d1bd-48fa-805e-fc93dc71efb7'] === 1 || userInfo.userData.AuthorityInfo['ea2fc404-d924-4c88-98de-1f4d96137745'] === 1){ this.getSuggestion() } + if (userInfo.userData.AuthorityInfo['03bd2dbf-a5ed-4080-b168-92c3b7412d6f'] === 1){ + this.businessWarning = true + } + if (userInfo.userData.AuthorityInfo['2d25dddc-e67f-4e26-b2d1-da78beed2c11'] === 1){ + this.projectWarning = true + } //拿到option的值 this.option = option // 获取数据的方法 diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue index 4f4af2c..3fc3734 100644 --- a/pages/nationalPage/springTravel.vue +++ b/pages/nationalPage/springTravel.vue @@ -103,9 +103,12 @@
增幅 - - {{`${revenueAdd>0?'+':''}${revenueAdd?revenueAdd:'-'}%`}} - +
+ {{revenueAdd>0?'+':revenueAdd<0?'':''}} + {{`${revenueAdd || '-'}%`}} +
+ +
@@ -489,7 +492,7 @@ 增幅
{{carEntryAdd>0?'+':carEntryAdd<0?'':''}} - {{`${carEntryAdd || '-'}%`}} + {{`${carEntryAdd || '-'}%`}}
@@ -1171,6 +1174,8 @@ export default { this.currentScroll = 'item'+ this.lastDay }else if (this.selectFestival===2){ this.currentScroll = 'item'+ this.lastDay + }else if (this.selectFestival===3){ + this.currentScroll = 'item'+ this.lastDay } console.log('currentScroll',this.currentScroll) const lastDate = new Date(this.lastDay) @@ -1406,7 +1411,7 @@ export default { console.log(112321312,data) if (data.Result_Data){ this.pageData = data.Result_Data - if (this.isFirst){ + // if (this.isFirst){ this.giveTrendObj = { curYearRevenue:this.pageData.curYearRevenue.data, lYearRevenue:this.pageData.lYearRevenue.data, @@ -1415,8 +1420,8 @@ export default { curYearBayonet:this.pageData.curYearBayonet.data, lYearBayonet:this.pageData.lYearBayonet.data, } - this.isFirst = false - } + // this.isFirst = false + // } // 对客销售金额增幅 this.revenueAdd = Number((((this.pageData.curYearRevenue.data / this.pageData.lYearRevenue.data)-1)*100).toFixed(2)) this.revenueNumber = Number(((this.pageData.curYearRevenue.data - this.pageData.lYearRevenue.data)/10000).toFixed(2)) @@ -2094,6 +2099,8 @@ export default { } } .YOYBox{ + display: flex; + align-items: center; .YOYBoxText{ font-size: 24rpx; font-family: PingFangSC, PingFang SC; @@ -2211,6 +2218,8 @@ export default { } } .YOYBox{ + display: flex; + align-items: center; .YOYBoxText{ font-size: 24rpx; font-family: PingFangSC, PingFang SC; @@ -2677,6 +2686,11 @@ export default { color: #D14702; } } + .dragonBoatNav{ + .selectItem{ + color: #226C61; + } + } .dateText{ font-size: 24rpx; font-family: PingFangSC, PingFang SC; diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue index e4fd44b..7fed062 100644 --- a/pages/nationalPage/testPage.vue +++ b/pages/nationalPage/testPage.vue @@ -190,6 +190,7 @@ export default { } }, onLoad(query){ + console.log('query',query) if (query.detailObj){ this.giveTrendObj = JSON.parse(query.detailObj) }