页面细化优化

components/u-charts/u-charts.js

@@ -43,7 +43,7 @@
 
 var config = {
     yAxisWidth: 15,
-    yAxisSplit: 5,
+    yAxisSplit: 5,//Y轴多少个数值
     xAxisHeight: 15,
     xAxisLineHeight: 15,
     legendHeight: 15,

pages.json

@@ -59,9 +59,9 @@
 		}
     ],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#206DC3",
 		"backgroundColor": "#F8F8F8",
 		"animationType":"slide-in-right",
 		"animationDuration":200

pages/Charts/equipmentStatistics.vue

@@ -8,7 +8,7 @@
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">今日销售排行</view>
+				<view class="qiun-title-dot-light"><view class="dis">今日销售排行</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate1}}</span>
@@ -23,7 +23,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本周销售排行</view>
+				<view class="qiun-title-dot-light"><view class="dis">本周销售排行</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('week')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate2}} 至 {{endDate2}}</span>
@@ -38,7 +38,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本月销售排行</view>
+				<view class="qiun-title-dot-light"><view class="dis">本月销售排行</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('month')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate3}} 至 {{endDate3}}</span>
@@ -53,7 +53,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本年销售排行</view>
+				<view class="qiun-title-dot-light"><view class="dis">本年销售排行</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('year')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate4}} 至 {{endDate4}}</span>
@@ -109,7 +109,9 @@
 		// 	this.init();
 		// },
 		mounted() {
-			console.log("mounted");
+			// this.init();
+		},
+		onShow() {
 			this.init();
 		},
 		methods: {
@@ -289,7 +291,7 @@
 					extra: {
 						column: {
 							// width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
-							width: 30
+							width: 15
 						}
 					}
 				});
@@ -394,7 +396,7 @@
 		flex-direction: row;
 		background: #206DC3;
 		width: 750upx;
-		height: 180upx;
+		height: 120upx;
 	}
 	.title{
 		/* border-left: 10upx solid #0ea391; */
@@ -406,7 +408,7 @@
 	}
 	.ri {
 		width: 690upx;
-		height: 180upx;
+		height: 210upx;
 		background: #FFFFFF;
 		border-radius: 15upx;
 		/* 上移 */
@@ -502,17 +504,22 @@
 	.qiun-title-dot-light {
 		width: 92%;
 		border-left: 20upx;
-		border-left: 10upx solid #0ea391;
+		border-left: 10upx solid #206DC3;
 		padding-left: 10upx;
 		height: 32upx;
-		padding-bottom: 40upx;
+		
 		font-family: "PingFang-SC-Bold";
 		font-weight: bold;
 		margin: auto;
 		font-size: 32upx;
 		color: #363D44;
 	}
-	
+	.dis{
+		transform: translateY(-13upx);
+		font-size: 32upx;
+		font-family: "PingFang-SC-Bold";
+		color: #363D44;
+	}
 	.shijian {
 		padding-top: 30upx;
 		height: 80upx;
@@ -541,15 +548,15 @@
 	
 	.preImg {
 		position: absolute;
-		left: 40upx;
-		width: 27upx;
-		height: 45upx;
+		right: 30upx;
+		width: 71upx;
+		height: 57upx;
 	}
 	
 	.nextImg {
 		position: absolute;
-		right: 40upx;
-		width: 27upx;
-		height: 45upx;
+		right: 30upx;
+		width: 71upx;
+		height: 57upx;
 	}
 </style>

pages/Charts/mainStatistics.vue

@@ -5,7 +5,7 @@
 				<image class="userFlagimg" src="../../static/img/userFlag.png" mode=""></image>
 			</view>
 			<view class="pname">
-				<font class="wenzi" style="color: #BDD6F3;font-size:28upx">用户：{{pnameData}}</font>
+				<font class="wenzi" style="color: #BDD6F3;font-size:28upx"> 用户: {{pnameData}}</font>
 			</view>
 			<view class="company">
 				<font style="color: #BDD6F3;font-size:28upx">申泽智能物联</font>
@@ -19,11 +19,11 @@
 				<view class="riTitle">
 					<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
 						<font class="fontLeft" style="color: #596D83;">今日收入总额:</font>
-						<font style="color: #ED341F;"> {{dayTotalMoney}}</font>
+						<font style="color: #ED341F;">{{dayTotalMoney}}</font>
 					</view>
 					<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
 						<font class="fontLeft" style="color: #596D83;">今日销售数量:</font>
-						<font style="color: #ED341F;"> {{dayTotalNum}}</font>
+						<font style="color: #ED341F;">{{dayTotalNum}}</font>
 					</view>
 				</view>
 			</view>
@@ -44,11 +44,11 @@
 				<view class="fourShell">
 					<view class="one">
 						<font class="fontLeft" style="color: #596D83;">本周收入总额:</font>
-						<font style="color: #ED341F;"> {{dayTotalMoney}}</font>
+						<font style="color: #ED341F;">{{weekTotalMoney}}</font>
 					</view>
 					<view class="two">
 						<font class="fontLeft" style="color: #596D83;">本周销售数量:</font>
-						<font style="color: #ED341F;"> {{dayTotalNum}}</font>
+						<font style="color: #ED341F;">{{weekTotalNum}}</font>
 					</view>
 				</view>
 			</view>
@@ -60,11 +60,11 @@
 				<view class="fourShell">
 					<view class="one">
 						<font class="fontLeft" style="color: #596D83;">本月收入总额:</font>
-						<font style="color: #ED341F;"> {{monthTotalMoney}}</font>
+						<font style="color: #ED341F;">{{monthTotalMoney}}</font>
 					</view>
 					<view class="two">
 						<font class="fontLeft" style="color: #596D83;">本月销售数量:</font>
-						<font style="color: #ED341F;"> {{monthTotalNum}}</font>
+						<font style="color: #ED341F;">{{monthTotalNum}}</font>
 					</view>
 				</view>
 			</view>
@@ -76,11 +76,11 @@
 				<view class="fourShell">
 					<view class="one">
 						<font class="fontLeft" style="color: #596D83;">本年收入总额:</font>
-						<font style="color: #ED341F;"> {{yearTotalMoney}}</font>
+						<font style="color: #ED341F;">{{yearTotalMoney}}</font>
 					</view>
 					<view class="two">
 						<font class="fontLeft" style="color: #596D83;">本年销售数量:</font>
-						<font style="color: #ED341F;"> {{yearTotalNum}}</font>
+						<font style="color: #ED341F;">{{yearTotalNum}}</font>
 					</view>
 				</view>
 			</view>
@@ -92,18 +92,18 @@
 				<view class="fourShell">
 					<view class="one">
 						<font class="fontLeft" style="color: #596D83;">投放机器数量:</font>
-						<font style="color: #ED341F;"> {{machineTotalNum}}</font>
+						<font style="color: #ED341F;">{{machineTotalNum}}</font>
 					</view>
 					<view class="two">
 						<font class="fontLeft" style="color: #596D83;">运营机器数量:</font>
-						<font style="color: #ED341F;"> {{machineUseNum}}</font>
+						<font style="color: #ED341F;">{{machineUseNum}}</font>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">今日销售情况</view>
+				<view class="qiun-title-dot-light"><view class="dis">今日销售情况</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate1}}</span>
@@ -118,7 +118,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本周销售情况</view>
+				<view class="qiun-title-dot-light"><view class="dis">本周销售情况</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('week')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate2}} 至 {{endDate2}}</span>
@@ -133,7 +133,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本月销售情况</view>
+				<view class="qiun-title-dot-light"><view class="dis">本月销售情况</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('month')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate3}} 至 {{endDate3}}</span>
@@ -148,7 +148,7 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light">本年销售情况</view>
+				<view class="qiun-title-dot-light"><view class="dis">本年销售情况</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('year')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate4}} 至 {{endDate4}}</span>
@@ -225,15 +225,15 @@
 		// 	console.log("onLoad")
 		// 	this.init();
 		// },
-		// onShow() {
-		// 	console.log("onShow");
-		// 	var test = uni.getStorageSync('test');
-		// 	//判断是不是初次登陆
-		// 	if (test == 2) {
-		// 		this.init();
-		// 	}
-		// 	this.day();
-		// },
+		onShow() {
+			console.log("onShow");
+			var test = uni.getStorageSync('test');
+			//判断是不是初次登陆
+			if (test == 2) {
+				this.init();
+			}
+			this.day();
+		},
 		mounted() {
 			console.log("mounted");
 			this.init();
@@ -437,10 +437,13 @@
 						scrollAlign: 'left', //滚动条初始位置
 						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF  滚动条颜色底色
 						scrollColor: '#DEE7F7', //默认为 #A6A6A6  滚动条颜色
-						// disableGrid:true,
+						disableGrid:true,
 					},
 					yAxis: {
-						//disabled:true
+						type: 'grid',
+						gridType: 'soild',
+						// disabled:true
+						// disableGrid:true,
 					},
 					dataLabel: true,
 					width: _self.cWidth * _self.pixelRatio,
@@ -448,7 +451,7 @@
 					extra: {
 						column: {
 							// width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
-							width: 30
+							width: 15
 						}
 					}
 				});
@@ -619,14 +622,14 @@
 	}
 
 	.userFlagimg {
-		padding-left: 10upx;
+		padding-left: 30upx;
 		padding-top: 10upx;
 		width: 26upx;
 		height: 28upx;
 	}
 
 	.wenzi {
-		padding-right: 0upx;
+		padding-left: 5upx;
 		/* text-align:right; */
 		white-space: nowrap;
 		overflow: hidden;
@@ -731,18 +734,25 @@
 	.qiun-title-dot-light {
 		width: 92%;
 		border-left: 20upx;
-		border-left: 10upx solid #0ea391;
+		border-left: 10upx solid #206DC3;
 		padding-left: 10upx;
 		height: 32upx;
-		padding-bottom: 40upx;
+		/* padding-bottom: 40upx; */
 		font-family: "PingFang-SC-Bold";
 		font-weight: bold;
 		margin: auto;
 		font-size: 32upx;
 		color: #363D44;
+		transform: translateY(20upx);
+	}
+	.dis{
+		transform: translateY(-13upx);
+		font-size: 32upx;
+		font-family: "PingFang-SC-Bold";
+		color: #363D44;
 	}
-
 	.shijian {
+		transform: translateY(40upx);
 		padding-top: 30upx;
 		height: 80upx;
 		width: 690upx;
@@ -770,19 +780,19 @@
 
 	.preImg {
 		position: absolute;
-		left: 40upx;
-		width: 27upx;
-		height: 45upx;
+		left: 30upx;
+		width: 71upx;
+		height: 57upx;
 	}
 
 	.nextImg {
 		position: absolute;
-		right: 40upx;
-		width: 27upx;
-		height: 45upx;
+		right: 30upx;
+		width: 71upx;
+		height: 57upx;
 	}
 
 	.fontLeft {
-		margin-right: 20upx;
+		margin-right: 6upx;
 	}
 </style>

pages/User/user.vue

@@ -148,7 +148,7 @@
 		background: #FFFFFF;
 	}
 	.headimg{
-		height: 148upx;
+		height: 120upx;
 		background: #206DC3;
 		width: 750upx;
 	}
@@ -160,7 +160,7 @@
 		padding-top: 50upx;
 		box-shadow:0upx -1upx   20upx #D3D3D3;
 		border-radius: 15upx;
-		transform: translateY(-80upx);
+		transform: translateY(-90upx);
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
@@ -238,8 +238,8 @@
 		transform:translateY(-50%);
 	}
 	.button2{
-		padding-right: 50upx;
-		padding-top: 3upx;
+		padding-right: 60upx;
+		padding-top: 2upx;
 	}
 	.button {
 		/* padding: 5upx 10upx 10upx 0upx; */
@@ -277,7 +277,7 @@
 	.xiugai{
 		width: 92%;
 		border-left: 20upx;
-		border-left: 10upx solid #0ea391;
+		border-left: 10upx solid #206DC3;
 		padding-left: 10upx;
 		height: 38upx;
 		padding-bottom: 20upx;