feat: 订单bug

pages/statistics/index.vue

@@ -76,7 +76,7 @@
 				单位：元
 			</view>
 			<view class="line_charts_one">
-				<qiun-data-charts type="area" :opts="revenueOptsone" :chartData="revenueChartDataOne" />
+				<qiun-data-charts :ontouch="true" type="line" :opts="revenueOptsone" :chartData="revenueChartDataOne" />
 			</view>
 		</view>
 		<view class="echarts-three">
@@ -90,7 +90,7 @@
 				</view>
 			</view>
 			<view class="line_charts_two">
-				<qiun-data-charts type="area" :opts="revenueOptstwo" :chartData="revenueChartDataTwo" />
+				<qiun-data-charts type="line" :ontouch="true" :opts="revenueOptstwo" :chartData="revenueChartDataTwo" />
 			</view>
 		</view>
 		<Tabbar :tabbarIndex="2"></Tabbar>
@@ -161,36 +161,29 @@
 					color: ["#4B98FE"],
 					padding: [15, 15],
 					dataLabel: false,
+					enableScroll: true,
 					xAxis: {
 						disableGrid: true,
-					},
-					yAxis: {
-						// gridColor: "rgba(230,230,230,0.6)",
-						gridColor: "rgba(200,200,200,0.6)",
-						disabled: false,
-						disableGrid: false,
-						gridType: 'dash',
-						dashLength: '4',
-						data: [{
-							axisLineColor: "#FFFFFF",
-							min: 0,
-							// max: 20000
-						}],
+						gridType: "solid",
+						itemCount: 6,
+						scrollShow: true,
+						axisLineColor: "#EFEFEF",
 					},
 					legend: {
-						show: false,
-						position: "top",
-						float: "right",
+						show: false
+					},
+					yAxis: {
+						gridType: "solid",
+						gridColor: "#EFEFEF",
+						dashLength: 2
 					},
 					extra: {
-						area: {
+						line: {
 							type: "curve",
-							opacity: 0.8,
-							addLine: true,
-							width: 1,
-							gradient: true,
-						},
-					},
+							width: 2,
+							activeType: "hollow"
+						}
+					}
 				},
 				dataListOne: [],
 				// 入住率
@@ -199,36 +192,29 @@
 					color: ["#4B98FE"],
 					padding: [15, 15],
 					dataLabel: false,
+					enableScroll: true,
 					xAxis: {
 						disableGrid: true,
-					},
-					yAxis: {
-						// gridColor: "rgba(230,230,230,0.6)",
-						gridColor: "rgba(200,200,200,0.6)",
-						disabled: false,
-						disableGrid: false,
-						gridType: 'dash',
-						dashLength: '4',
-						data: [{
-							axisLineColor: "#FFFFFF",
-							min: 0,
-							max: 1
-						}],
+						gridType: "solid",
+						itemCount: 6,
+						scrollShow: true,
+						axisLineColor: "#EFEFEF",
 					},
 					legend: {
-						show: false,
-						position: "top",
-						float: "right",
+						show: false
+					},
+					yAxis: {
+						gridType: "solid",
+						gridColor: "#EFEFEF",
+						dashLength: 2
 					},
 					extra: {
-						area: {
+						line: {
 							type: "curve",
-							opacity: 0.8,
-							addLine: true,
-							width: 1,
-							gradient: true,
-						},
-					},
+							width: 2,
+							activeType: "hollow"
+						}
+					}
 				},
 				dataListTwo: [],
 
@@ -295,10 +281,30 @@
 					this.dataListTwo = []
 					//  营业概况
 					this.getServerData();
-					//  交易趋势
-					this.drawRevenueChartsOne()
 					//  入住率
-					this.drawRevenueChartstwo()
+					let x = [],
+						y = [],
+						//  交易趋势
+						x1 = [],
+						y1 = [];
+					console.log(res.data)
+					if (res.data.code === 0) {
+						this.list = res.data.data;
+						for (let i = 0; i < res.data.data.checkedInChant.length; i++) {
+							x.push(res.data.data.checkedInChant[i].dateDay);
+							y.push(res.data.data.checkedInChant[i].checkedInRatio);
+						}
+						for (let i = 0; i < res.data.data.dealLineChant.length; i++) {
+							x1.push(res.data.data.dealLineChant[i].dateDay);
+							y1.push(res.data.data.dealLineChant[i].orderAmount);
+						}
+					} else {
+						this.list = []
+					}
+					setTimeout(() => {
+						this.drawRevenueChartstwo(x, y);
+						this.drawRevenueChartsOne(x1, y1)
+					}, 500)
 				})
 			},
 
@@ -335,26 +341,12 @@
 			},
 
 			// 交易趋势
-			drawRevenueChartsOne() {
-				// this.list = this.objList
-				// if (this.list.dealLineChant == null) {
-				// 	this.dataListOne.push('0')
-				// } else {
-				// }
-				this.list.dealLineChant.forEach(item => {
-					this.dataListOne.push(item.orderAmount)
-				})
+			drawRevenueChartsOne(x, y) {
 				let list1 = {
-					categories: [
-						"01-01", "", "", "", "", "", "",
-						"01-08", "", "", "", "", "", "",
-						"01-15", "", "", "", "", "", "",
-						"01-22", "", "", "", "", "", "",
-						"01-29", "", ""
-					],
+					categories: x,
 					series: [{
 						name: "收入",
-						data: this.dataListOne,
+						data: y,
 						legendShape: "circle",
 						color: "#4088FE",
 						pointShape: "none",
@@ -364,23 +356,14 @@
 			},
 
 			// 入住率
-			drawRevenueChartstwo() {
-				// this.list = this.objList
-				// if (this.list.checkedInChant == null) {
-				// 	this.dataListOne.push('0')
-				// } else {
-				// }
-				this.list.checkedInChant.forEach(item => {
-					this.dataListTwo.push(item.checkedInRatio)
-				})
-
+			drawRevenueChartstwo(x, y) {
+				console.log(x);
+				console.log(y)
 				let list2 = {
-					categories: ["01-01", "", "", "", "", "", "", "01-08", "", "", "", "", "", "", "01-15",
-						"", "", "", "", "", "", "01-22", "", "", "", "", "", "", "01-29", "", "",
-					],
+					categories: x,
 					series: [{
 						name: "入住率",
-						data: this.dataListTwo,
+						data: y,
 						legendShape: "circle",
 						color: "#600EFF",
 						pointShape: "none",

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -18,7 +18,8 @@
 				</view>
 				<!-- <u--input v-model="realName" border="none" pl ></u--input> -->
 				<view class="right">
-					<input type="text" v-model="dto.name" border="none" placeholder="请输入昵称" />
+					<!-- <input type="text" v-model="dto.name" border="none" placeholder="请输入昵称" /> -->
+					{{dto.name}}
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -35,6 +36,7 @@
 				</view>
 				<view class="right">
 					{{dto.address}}
+					{{dto.address}}
 				</view>
 
 			</view>
@@ -201,12 +203,13 @@
 			display: flex;
 			align-items: center;
 			height: 120rpx;
-			line-height: 120rpx;
+
 			border-bottom: 1rpx solid #EFEFEF;
 
 			.realName {
 				width: 188rpx;
 				height: 120rpx;
+				line-height: 120rpx;
 				font-size: 30rpx;
 				color: #333333;
 				font-weight: Regular;
@@ -228,7 +231,7 @@
 			width: 100%;
 			align-items: center;
 			height: 120rpx;
-			line-height: 120rpx;
+
 			border-bottom: 1rpx solid #EFEFEF;
 
 			.right {
@@ -242,6 +245,7 @@
 			.mobile {
 				width: 188rpx;
 				height: 120rpx;
+				line-height: 120rpx;
 				font-size: 30rpx;
 				color: #333333;
 				font-weight: Regular;