页面细节优化

pages/Charts/mainStatistics.vue

@@ -115,6 +115,7 @@
 				 @touchmove="moveLine1" @touchend="touchEndLine1" style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
+		<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>
@@ -129,6 +130,7 @@
 				 @touchmove="moveLine2" @touchend="touchEndLine2" style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
+		<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>
@@ -143,6 +145,7 @@
 				 @touchmove="moveLine3" @touchend="touchEndLine3" style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
+		<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>
@@ -228,6 +231,7 @@
 		mounted() {
 			console.log("mounted");
 			this.init();
+			this.day();
 		},
 		methods: {
 			...mapActions('chart', ['getStatistics', 'getMainStatistics', 'getMachineNum']),
@@ -257,11 +261,8 @@
 			},
 			day(){
 				var date = new Date();
-				var Y = date.getFullYear() + '年';
-				var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
-				var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '日';
-				var today = Y+M+D;
-				this.today = today;
+				var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
+				this.today = daystr;
 				var str= '星期'+'日一二三四五六'.charAt(date.getDay());
 				this.week = str;
 			},
@@ -711,7 +712,7 @@
 
 	.qiun-common-mt {
 		margin-top: 0upx;
-		height: 200upx;
+		height: 160upx;
 	}
 
 	.qiun-bg-white {
@@ -726,11 +727,12 @@
 	}
 
 	.qiun-title-dot-light {
-		border-left: 30upx solid #0ea391;
-		padding-top: 20upx;
-		/* border-left: 20upx; */
+		width: 92%;
+		border-left: 20upx;
+		border-left: 10upx solid #0ea391;
 		padding-left: 10upx;
-		height: 85upx;
+		height: 32upx;
+		padding-bottom: 40upx;
 		font-family: "PingFang-SC-Bold";
 		font-weight: bold;
 		margin: auto;
@@ -745,11 +747,14 @@
 		margin: auto;
 		box-shadow: 0upx 0upx 10upx #D3D3D3;
 	}
-
+	.line{
+		background:#ECECEC ;
+		height: 20upx;
+	}
 	.qiun-charts {
 		width: 690upx;
 		height: 370upx;
-		padding-top: 30upx;
+		padding-top: 50upx;
 		background-color: #FFFFFF;
 		margin: auto;
 	}

pages/User/user.vue

@@ -22,7 +22,7 @@
 					<input :id=list.id type="text" class="input" @focus="setStyle()" @blur="setStyle2()" :value=list.name @input="getValue" />
 					<p id="p2" class="p2" :style="{display:showOrNo}">如:广东省广州市xx广场301型x号机</p>
 				</view>
-				<view class="">
+				<view class="button2">
 					<button type="primary" @click="updata1()" class="button">
 						<p class="p">更改</p>
 					</button>
@@ -205,11 +205,14 @@
 	}
 
 	.button {
-		padding: 10upx 10upx 10upx 0upx;
+		padding: 5upx 10upx 10upx 0upx;
 		width: 80upx;
 		height: 60upx;
 	}
-
+	.button2{
+		padding-right: 50upx;
+		padding-top: 3upx;
+	}
 	.input {
 		/* padding: 10upx 20upx 10upx 0upx; */
 		padding-left: 20upx;
@@ -221,15 +224,16 @@
 		border-radius: 5upx;
 	}
 	.tuichu{
-		padding-top: 35upx;
+		padding-top: 30upx;
 		padding-right: 30upx;
 	}
 	.xiugai{
-		border-left: 30upx solid #0ea391;
-		padding-top: 20upx;
-		/* border-left: 20upx; */
+		width: 92%;
+		border-left: 20upx;
+		border-left: 10upx solid #0ea391;
 		padding-left: 10upx;
-		height: 85upx;
+		height: 38upx;
+		padding-bottom: 20upx;
 		font-family: "PingFang-SC-Bold";
 		font-weight: bold;
 		margin: auto;