From f2971fd2ae3cbe9863e30c6371b354f4c41616a7 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 4 May 2023 09:27:05 +0800 Subject: [PATCH] update --- pages.json | 6 + pages/commercialBI/noData.vue | 14 +- pages/commercialBI/specialCase.vue | 297 +++++++++++++++++++++++++++++ pages/index/index.vue | 105 +++++++--- pages/map/detail.vue | 15 +- pages/userCenter/userCenter.vue | 7 +- store/store.js | 36 ++-- 7 files changed, 419 insertions(+), 61 deletions(-) create mode 100644 pages/commercialBI/specialCase.vue diff --git a/pages.json b/pages.json index d042f1a..7b30f00 100644 --- a/pages.json +++ b/pages.json @@ -143,6 +143,12 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "specialCase", + "style": { + "navigationBarTitleText": "" + } } ] }, diff --git a/pages/commercialBI/noData.vue b/pages/commercialBI/noData.vue index 17d76e6..ece09e8 100644 --- a/pages/commercialBI/noData.vue +++ b/pages/commercialBI/noData.vue @@ -1,7 +1,8 @@ @@ -14,16 +15,11 @@ export default { type:'' } }, - props:{ - type:{ - type:String, - default:'' - } - }, onLoad(query){ if (query.type){ - this.type = 'index' + this.type = query.type } + console.log('this.type',this.type) let userInfo = uni.getStorageSync('vuex') userInfo = JSON.parse(userInfo) console.log('userInfo',userInfo) diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue new file mode 100644 index 0000000..6aed5ed --- /dev/null +++ b/pages/commercialBI/specialCase.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index d1cb6bd..ca8f115 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -15,7 +15,7 @@ - +

对客营收

@@ -59,7 +59,7 @@
- +

长款金额/元 @@ -126,7 +126,14 @@ - +

+ +
+ + +
@@ -172,7 +179,7 @@ - +
@@ -340,16 +347,28 @@
-
+ +
- + -

{{isShowTitle}}个投诉建议

+

五一流量预警

- 去查看 + 去查看
+ +
+ + + +

{{isShowTitle}}个投诉建议

+ +
+
+ 去查看 +
未上传门店:
@@ -462,6 +481,8 @@ export default { isSuccess:false,//首页这些接口是否全部调用成功 isReturn : true, isSuggestion:false,//可不可以看意见 + loadMore:true,// 是否收缩 + special:true } }, watch:{ @@ -470,15 +491,18 @@ export default { handler:function (value){ let userInfo = uni.getStorageSync('vuex') userInfo = JSON.parse(userInfo) + console.log('userInfo11',userInfo) + // 无权限就会跳转到无数据的页面 if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ this.isReturn = false + }else{ + uni.redirectTo({ + url:`/pages/commercialBI/noData?type=noAuthor` + }) } + if (userInfo.userData.AuthorityInfo['e2fb458b-d1bd-48fa-805e-fc93dc71efb7'] === 1 || userInfo.userData.AuthorityInfo['ea2fc404-d924-4c88-98de-1f4d96137745'] === 1){ this.getSuggestion() - }else{ - uni.navigateTo({ - url:`/pages/commercialBI/noData?type=index` - }) } // 拿到用户当前的经纬度位置 this.seat = uni.getStorageSync('seatInfo') @@ -580,6 +604,10 @@ export default { //判断权限 if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ this.isReturn = false + }else{ + uni.redirectTo({ + url:`/pages/commercialBI/noData?type=noAuthor` + }) } if (!this.isReturn){ let userInfo = uni.getStorageSync('vuex') @@ -650,6 +678,9 @@ export default { }, methods:{ ...mapActions(['memberLogin','getLoginCode']), + handleChangeLoadMore(){ + this.loadMore = !this.loadMore + }, //门店上传后面感叹号的点击事件 handleStoreUpload(){ this.popupShow = true @@ -837,13 +868,21 @@ export default { handleReg(){ this.$util.toNextRoute('redirectTo', '/pages/register/register') }, - handleSearch(){ - let req = { - SuggestionIds:this.isShowId - } - request.$webGet('CommercialApi/Suggestion/RecordReadingLog',req).then(()=>{ - this.$util.toNextRoute('navigateTo', '/pages/suggestion/suggestion') - }) + handleSearch(type){ + if (type ==='special'){ + if(!this.isReturn){ + this.special=false + this.$util.toNextRoute('navigateTo', '/pages/commercialBI/specialCase') + } + }else{ + let req = { + SuggestionIds:this.isShowId + } + request.$webGet('CommercialApi/Suggestion/RecordReadingLog',req).then(()=>{ + this.$util.toNextRoute('navigateTo', '/pages/suggestion/suggestion') + }) + } + }, // 改变时间触发的方法 ,改变页面的内容数据 onRefresh(){ @@ -1202,9 +1241,9 @@ export default {