From 9da17411ba9c1300aeb05bfe0062da3fc2b6d367 Mon Sep 17 00:00:00 2001
From: cclu <lkrnchocolateaaron@gmail.com>
Date: Fri, 3 Mar 2023 09:34:47 +0800
Subject: [PATCH] update

---
 manifest.json                           |  8 ++++++--
 pages/everdayRenven/AnhuiIndex.vue      | 14 +++++++++-----
 pages/everdayRenven/AnhuiServerpart.vue |  4 +++-
 pages/index/index.vue                   |  1 +
 pages/register/register.vue             |  1 +
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7564c6e..7bb0e72 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,13 +61,17 @@
         },
         "appid" : "wxa99ef047735c031e",
         "setting" : {
-            "urlCheck" : true,
+            "urlCheck" : false,
             "es6" : true,
             "minified" : true,
             "postcss" : true
         },
         "usingComponents" : true,
-        "permission" : {},
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取位置信息用于展示"
+            }
+        },
         "uniStatistics" : {
             "enable" : false
         }
diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index a3e6501..871fa0d 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -4,7 +4,8 @@
 			<AnhHead :today="today" :headMsg="headMsg" :lastDay="lastDay"
 				:provinceCode="theRequest&&theRequest.ProvinceCode" @bindDateChange="bindDateChange" :isup="isup"
 				:nowDay="nowDay" :selectDate="theRequest&&theRequest.time" @toggle="toggleCard"></AnhHead>
-			<view style="background-color: #fff;">
+        <!--营收占比的上面组件	-->
+      <view style="background-color: #fff;">
 				<!--安徽省 昨日营收占比 -->
 				<div v-if="theRequest && theRequest.GroupType!=1010">
 					<div class="uni-inline-item modle-title">
@@ -111,6 +112,8 @@
 						</div>
 					</div>
 				</template>
+
+        <!--  第二种情况 v-if已经区分  -->
 				<template v-else-if="theRequest && theRequest.GroupType==1000">
 					<!-- <div class="region-title" :class="{'active':regionShow1}">省内区域</div> -->
 					<div v-show="regionShow1">
@@ -267,7 +270,6 @@
 				let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => {
 					return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1
 				})
-
 				this.$util.toNextRoute('navigateTo', canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath)
 
 				item.visited = true
@@ -317,6 +319,7 @@
 				const ctx = uni.createCanvasContext(obj.id, this);
 				data.series = data.series.concat(obj.data)
 				rincanvas[obj.id] = new uCharts({
+          // 小程序图表工具
 					// $this: this,
 					// canvasId: obj.id,
 					context: ctx,
@@ -437,10 +440,10 @@
 				totalData.budgetamoutShow = totalData.budgetAmount ? _this.$util.fmoney(totalData.budgetAmount) :
 					0.00 // 预算总营收
 				totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - totalData.cashPay) // 预算和实际差额
-				totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney((headMsg.diffBudgetTotal /
+				totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney(( totalData.diffBudgetTotal /
 					totalData.budgetAmount) * 100, 2) : '100' // 预算和实际增长额比例
 
-				this.headMsg = totalData
+        _this.headMsg = totalData
 				// 饼图分析及数据条形分析
 				const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
 				this.modelProgress = progressList
@@ -552,7 +555,6 @@
 			this.opacity = (options.scrollTop - 30) / 68
 		},
 		onLoad(option) {
-
 			uni.showLoading({
 				title: '正在加载...'
 			})
@@ -567,6 +569,8 @@
 
 				if (this.PushAuthority.length > 0) {
 					this.theRequest = this.defaultMsg() || {}
+          console.log('theRequest',this.theRequest)
+
 					this.theRequest.time = this.lastDay
 					this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM')
 					this.initData()
diff --git a/pages/everdayRenven/AnhuiServerpart.vue b/pages/everdayRenven/AnhuiServerpart.vue
index 99bcb85..e8a8ae3 100644
--- a/pages/everdayRenven/AnhuiServerpart.vue
+++ b/pages/everdayRenven/AnhuiServerpart.vue
@@ -222,6 +222,7 @@
 			CarAnalysis
 		},
 		onLoad(option) {
+      console.log(option)
 			_self = this
 			uni.showLoading({
 				title: '正在加载...'
@@ -543,6 +544,7 @@
 					_this.pageData = res.Result_Data
 					if (res.Result_Data.listBusinessModel) {
 						let list = JSON.parse(JSON.stringify(res.Result_Data.listBusinessModel))
+            console.log('list',list)
 						if (list.length > 0) {
 							let all = {
 								Bussiness_Name: '全部',
@@ -583,7 +585,7 @@
 				// totalData.dayOfShow = this.$util.cutDate(theRequest.time, 'MM月DD日')
 				totalData.budgetamoutShow = totalData.budgetAmount ? _this.$util.fmoney(totalData.budgetAmount) : 0.00
 				totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - totalData.cashPay)
-				totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney((headMsg.diffBudgetTotal /
+				totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney((totalData.diffBudgetTotal /
 					totalData.budgetAmount) * 100, 2) : '100'
 
 				this.sMsg = totalData
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1f39988..5d32fb6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -262,6 +262,7 @@
 					AppletMenuStatus: this.membershipType === 9999 ? '1,2' : '1'
 				})
 				this.modelMenu = res.Result_Data.List
+        console.log('modelMenu',this.modelMenu)
 			}
 		},
 		onReady() {
diff --git a/pages/register/register.vue b/pages/register/register.vue
index a796bd5..01669dd 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -42,6 +42,7 @@
 			...mapActions(['updateUser']),
 			...mapMutations(['setUser']),
 			getPhoneNumber (e) {
+        console.log(e)
 				uni.showLoading({
 					title:'正在加载...',
 					mask:true