优化统计

configs/env.js

@@ -9,8 +9,8 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	configs = Object.assign(configs, {
-		baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
-		// baseUrl: 'http://127.0.0.1:8090',
+		// baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
+		baseUrl: 'http://127.0.0.1:8090',
 	});
 }
 

pages/Charts/elseStatistics.vue

@@ -1,5 +1,6 @@
 <!-- 单一统计图表 -->
 <template>
+	<view>
 		<mainStatistics :pname="pnameData" :equipmentId="equipmentIdData" :adminId="adminIdData"></mainStatistics>
 	</view>
 </template>
@@ -46,4 +47,4 @@
 	}
 </script>
 <style>
-</style>
+</style>

pages/Charts/equipmentStatistics.vue

@@ -246,10 +246,10 @@
 		name: 'equipmentStatistics',
 		props: {
 			adminId: '',
+			pname: '',
 		},
 		data() {
 			return {
-				pname: '',
 				cWidth: '',
 				cHeight: '',
 				pixelRatio: 1,

pages/User/equipmentSratisticsList.vue

@@ -9,7 +9,7 @@
 		</uni-collapse>	
 	</view>
 	<view v-else>
-		<equipmentStatistics v-if="merchantList[0].id" :adminId="adminId" style="padding: 20upx;"></equipmentStatistics>
+		<equipmentStatistics v-if="firstMerchantAdminId" :adminId="firstMerchantAdminId" style="padding: 20upx;"></equipmentStatistics>
 		<view v-else style="text-align: center;">暂无数据</view>
 	</view>
 </template>
@@ -31,7 +31,6 @@
 		data() {
 			return {
 				globalUser:{},
-				adminId: '',
 				merchantList:[{equipmentList:[]}],
 				extraIcon: {
 					color: '#4cd964',
@@ -42,9 +41,10 @@
 		},
 		computed: {
 			...mapState(['loginUser']),
-			adminIdData:{
+			firstMerchantAdminId:{
 				get(){
-					return this.adminId;
+					console.log('firstMerchantAdminId',this.merchantList[0].id)
+					return this.merchantList[0].id;
 				}
 			},
 			merchantListSize:{
@@ -56,7 +56,6 @@
 		},
 		onShow(state){
 			this.globalUser = uni.getStorageSync("globalUser");
-			this.adminId = this.globalUser.id;
 			this.init();
 		},
 		onLoad(state){
@@ -84,8 +83,9 @@
 				// console.log('getEquipmentListData')
 				this.getEquipmentListByUser(this.globalUser)
 				.then(data => {
+					debugger
 					this.merchantList = data;
-					// console.log('merchantList2',this.merchantList.length)
+					console.log('getEquipmentListData',this.merchantList)
 					uni.stopPullDownRefresh();
 				}
 				, _ => void uni.stopPullDownRefresh());

pages/User/merchantList.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="">
 		<view v-if="id!=1">
-			<view v-if="merchantList[0].equipmentList.length>1">
+			<view v-if="merchantList[0].equipmentList.length>0">
 				<uni-collapse :accordion="true">
 					<uni-list>
 						<uni-list-item :title="$t('merchantList.total')" @click="openByAdmin(merchantList[0].name,merchantList[0].id)" />