Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

component/public/newgame/sxy-Timeing.vue

@@ -34,7 +34,7 @@ export default {
     initTime: {
       // 初始时间
       type: Number,
-      default:3600,
+      default:185,
     },
     // isDown: {
     //   // 是否是倒计时
@@ -184,7 +184,7 @@ export default {
 .box .bottom {
   background-color: #DCDCDC;
   line-height: 0rpx;
-  border-top: 2rpx solid #fff;
+  border-top: 1rpx solid #fff;
   border-radius: 0 0 4rpx 4rpx;
 }
 

component/public/severcard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="qcobj.startTime">
+		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" >
 			<view class="fixed-card-left">
 				<image class="card-left-img" 
 					:src="qcobj?.previewFile? serverUrl + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -160,10 +160,10 @@
 			width: 6vw;
 			display: flex;
 			flex-direction: column;
-			height: 60vh;
-			padding: 4vh 0 ;
+			height: 66vh;
+			padding: 4vh 0 3vh;
 			position: relative;
-			margin-top: -5vh;
+			margin-top: -2vh;
 			
 			.iconst{
 				width: 6vw;
@@ -197,7 +197,7 @@
 			width: 6vw;
 			display: flex;
 			flex-direction: column;
-			height: 52vh;
+			height: 57vh;
 			// background-color: red;
 			.act{
 				background: RGBA(228, 229, 231, 1);
@@ -218,6 +218,7 @@
 				position: relative;
 				justify-content: space-between;
 				padding: 0.3vw 0.2vw;
+				margin-top: 0.4vw;
 				.tm{
 					width: 100%;
 					height: 100%;

pages/NursingNew/index.vue

@@ -133,7 +133,7 @@
 	const tabbrarr = ref([
 		{ name: '护理', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', type: 'kzgn_hljz' },
 		{ name: '医疗', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png', type: 'kzgn_yljz' },
-		{ name: '后勤', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_hqjz' },
+		{ name: '后勤', url: '/static/shouye/sy/q0.png', urls: '/static/shouye/sy/q1.png', type: 'kzgn_hqjz' },
 		{ name: '库房', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'kzgn_kfjz' },
 	])
 	const specialPage = ref(0)