样式优化；修改视力测试结果bug

pages.json

@@ -3,7 +3,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBar":"custom",
+				"navigationBarTitleText":"",
+				"navigationStyle":"custom"
 			}
 		},
 		{

pages/index/index.vue

@@ -181,59 +181,73 @@
 </script>
 <template>
 	<view class="content page-box">
+		<!-- 背景图 -->
+		<view class="bg-imgs-card">
+			<image src="../../static/style/bg.png" mode="aspectFill"></image>
+		</view>
 		<!-- 轮播图 -->
 		<mySwiper :indicatorDots="true" :isRadius="true" height="160"  class="index-siwper margin-b-card" :lbt_list="lbt_list" style="width: 100%;" />
-		<view class="main-cards" @tap="toExam">
+		<!-- <view class="main-cards" @tap="toExam">
 			<view class="mc-row">
 				<view>视力测试</view>
 				<uni-icons type="forward" color="#9bc027" size="20"></uni-icons>
 			</view>
-		</view>
+		</view> -->
 		<view class="attention-card">
-			<view class="part-title">
+			<!-- <view class="part-title">
 				测试记录
-			</view>
+			</view> -->
-			<view class="ac-parts">
+			<!-- <view class="ac-parts">
 				<view @tap="toVisionList" class="ac-part" style="color: gray;" >
 					视力测试记录
 					<uni-icons type="forward" color="gray" size="20"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 		</view>
-		<view class="attention-card">
+		<!-- <view class="attention-card">
 			<view class="part-title">
 				事务处理
 			</view>
-		</view>
+		</view> -->
 		<view class="main-cards">
 			<view @tap="todoFunc(0)" class="mc-part" style="margin-left: 0;">
+				<image class="mc-bg-card" src="../../static/style/done.png" mode=""></image>
 				<view class="mc-part-text">已完成事项</view>
-				<image src="../../static/done.png" mode="widthFix"></image>
+				<!-- <image src="../../static/done.png" mode="widthFix"></image> -->
 			</view>
 			<view @tap="todoFunc(1)" class="mc-part mc-part2" style="margin-right: 0;">
+				<image class="mc-bg-card" src="../../static/style/undone.png" mode=""></image>
 				<view class="mc-part-text">待完成事项</view>
-				<image style="transform: rotate(0deg);" src="../../static/undone.png" mode="widthFix"></image>
+				<!-- <image style="transform: rotate(0deg);" src="../../static/undone.png" mode="widthFix"></image> -->
 			</view>
 		</view>
 		<view class="attention-card">
-			<view class="part-title">
+			<!-- <view class="part-title">
 				注意事项
-			</view>
+			</view> -->
 			<view class="ac-parts">
-				<view @tap="toNote(0)" class="ac-part" style="background: linear-gradient(45deg, #ffa2a2,#ffd3d3, #ffffff00);">
+				<!-- <view @tap="toNote(0)" class="ac-part" style="background: linear-gradient(45deg, #ffa2a2,#ffd3d3, #ffffff00);">
 					术前注意事项
 					<uni-icons type="forward" color="#ffa2a2" size="20"></uni-icons>
+				</view> -->
+				<view @tap="toNote(0)" class="ac-part" >
+					<view class="note-text">术前注意事项</view>
+					<image class="note-bg" src="../../static/style/note1.png" mode=""></image>
 				</view>
-				<view @tap="toNote(1)" class="ac-part" style="background: linear-gradient(45deg, #f9b275,#fff3e9, #ffffff00);">
+				<view @tap="toNote(1)" class="ac-part" >
-					术中注意事项
+					<view class="note-text">术中注意事项</view>
-					<uni-icons type="forward" color="#f9b275" size="20"></uni-icons>
+					<image class="note-bg" src="../../static/style/note3.png" mode=""></image>
 				</view>
-				<view @tap="toNote(2)" class="ac-part" style="background: linear-gradient(45deg, #8fdc8a,#fdfdfd, #ffffff00);">
+				<view @tap="toNote(2)" class="ac-part" >
-					术后注意事项
+					<view class="note-text">术后注意事项</view>
-					<uni-icons type="forward" color="#8fdc8a" size="20"></uni-icons>
+					<image class="note-bg" src="../../static/style/note2.png" mode=""></image>
 				</view>
 			</view>
 		</view>
+		<view class="test-card" @tap="toExam">
+			<view class="test-text">视力自测小助手</view>
+			<image class="test-img" src="../../static/style/test.png" mode=""></image>
+		</view>
 		<uni-popup ref="inputDialog" @tap="toBlur" :is-mask-click='false'>
 			<view class="pop-box">
 				<view class="pb-title">完善手术信息</view>
@@ -282,6 +296,37 @@
 	</view>
 </template>
 <style scoped lang="scss">
+	.test-card{
+		padding: 30rpx 20rpx;
+		margin: 20rpx 0;
+		margin-top: 60rpx;
+		position: relative;
+		width: 50%;
+		.test-text{
+			position: relative;
+			z-index: 2;
+		}
+		.test-img{
+			position: absolute;
+			top: 0px;
+			left: 0px;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+	}
+	.bg-imgs-card{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0px;
+		left: 0px;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+		z-index: -1;
+	}
 	.pb-item-btn{
 		padding: 20rpx 0;
 		text-align: center;
@@ -354,17 +399,31 @@
 		font-weight: 900;
 	}
 	.attention-card{
-		margin-top: 20rpx;
+		// margin-top: 20rpx;
 		width: 100%;
 		.ac-parts{
 			margin-top: 20rpx;
 			.ac-part{
-				display: flex;
+				// display: flex;
-				align-items: center;
+				// align-items: center;
-				justify-content: space-between;
+				// justify-content: space-between;
 				padding:30rpx 20rpx;
-				color: white;
+				// color: white;
 				margin: 20rpx 0;
+				position: relative;
+				.note-text{
+					position: relative;
+					z-index: 2;
+				}
+				.note-bg{
+					position: absolute;
+					/* z-index: 1; */
+					height: 100%;
+					width: 100%;
+					right: 0px;
+					top: 0px;
+					z-index: 1;
+				}
 			}
 		}
 	}
@@ -373,13 +432,17 @@
 			.mc-part-text{
 				position: relative;
 				z-index: 10;
-				font-size: 36rpx;
+				font-size: 28rpx;
 				font-weight: 900;
+				display: flex;
+				align-items: center;
+				height: 100%;
 			}
 			width: 50%;
 			/* text-align: center; */
-			background: linear-gradient(200deg, #82d8f2, #ddecf0);
+			background: linear-gradient(220deg, #9cd2bc, #fff);
-			color: white;
+			// color: white;
+			color: #484848;
 			padding: 40rpx 20rpx;
 			margin: 0 20rpx;
 			border-radius: 20rpx;
@@ -388,16 +451,20 @@
 			overflow: hidden;
 			image{
 				position: absolute;
-				width: 66%;
+				left: 0;
-				right: 0;
+				top: 0px;
-				bottom: -20%;
+				width: 100%;
-				z-index: 1;
+				height: 100%;
-				// transform: rotate(315deg);
+				// position: absolute;
-				transform: rotate(45deg);
+				// width: 66%;
+				// right: 0;
+				// bottom: -20%;
+				// z-index: 1;
+				// transform: rotate(45deg);
 			}
 		}
 		.mc-part2{
-			background: linear-gradient(200deg,#bbf4d5, #50c053);
+			background: linear-gradient(220deg, #9cd2bc, #fff);
 			// text-align: right;
 		}
 		display: flex;
@@ -423,14 +490,16 @@
 		margin-top: 20rpx;
 	}
 	.page-box{
-		padding: 20rpx;
+		padding: 0 20rpx;
 		min-height: unset;
 	}
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
+		// align-items: center;
 		justify-content: center;
+		position: relative;
+		height: 100%;
 	}
 
 	.logo {
@@ -451,6 +520,7 @@
 		font-size: 36rpx;
 		color: #8f8f94;
 	}
+	image{will-change: transform}
 </style>
 
 

pages/index/note_list.vue

@@ -99,7 +99,10 @@
 		uni.showLoading({
 			mask:true
 		})
-		let operation_info = JSON.parse(uni.getStorageSync('operation_info'))
+		let operation_info = null
+		if(uni.getStorageSync('operation_info')) {
+			operation_info = JSON.parse(uni.getStorageSync('operation_info'))
+		}
 		if(operation_info && operation_info.hospitalId) {
 			const res = await api.getHospitalInfo2({
 				hospitalId:operation_info.hospitalId,

pages/index/result.vue

@@ -21,9 +21,9 @@
 	const res_ = ref(null)
 	const userInfo = ref(null)
 	const bg_imgs = ref([
-		{url:'/static/result1.jpg'},
+		// {url:'/static/result1.jpg'},
-		{url:'/static/result2.jpg'},
+		// {url:'/static/result2.jpg'},
-		{url:'/static/result3.jpg'},
+		// {url:'/static/result3.jpg'},
 	]) 
 	const bg_index = ref(0)
 	const avatarUrl = ref(null)
@@ -31,7 +31,7 @@
 	const show_ = ref(false)
 	// 函数
 	function randomFunc() {
-		bg_index.value = parseInt((Math.random()*3))
+		bg_index.value = parseInt((Math.random()*store.bgList.length))
 		uni.getImageInfo({
 			// src:bg_imgs.value[bg_index.value],
 			src:bg_imgs.value[bg_index.value].url,

pages/index/visionTest.vue

@@ -149,7 +149,7 @@
 		const params = {
 			leftEyeVision:vision_info.value.left+'',
 			rightEyeVision:vision_info.value.right+'',
-			userId:userInfo.value.userId
+			userId:userInfo.value?.userId  || 0
 		}
 		const res = await api.saveVision(params)
 		uni.hideLoading()