Merge branch 'Teng' of http://47.115.223.229:8888/yangjun/hldy_app into Teng

pages/Warehouse/Warehouse.vue

@@ -26,8 +26,9 @@
 			</view>
 			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','结账','拣货','护理单元','中控室']"
 				:key='i'>
-				<view>{{v}}</view>
+				<view> </view>
 				<view class="tp">
+					<text>{{v}}</text>
 					<image src="/static/index/warehouse/y1.png" mode="aspectFill"></image>
 				</view>
 				<view class="tp">
@@ -38,7 +39,10 @@
 			<arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" />
 			<view class="operationbtn">
 				<view v-for="(v,i) in ['请领出库','退货入库','库存盘点','实时监控']" @tap="onTap(i)"
-					:class="beblue === i ? 'click-box-target grad-text' : 'click-box'">{{v}}</view>
+					:class="beblue === i ? 'click-box-target' : 'click-box'">
+						<image :src="beblue === i?'/static/index/warehouse/ku/rq'+i+'.png':'/static/index/warehouse/ku/rs'+i+'.png'" mode="aspectFill"></image>
+						{{v}}
+					</view>
 			</view>
 		</view>
 	</view>
@@ -197,7 +201,7 @@
 		}
 
 		.operationbtn {
-			width: 20vw;
+			width: 22vw;
 			height: 10vw;
 			position: absolute;
 			right: 1.5vw;
@@ -207,7 +211,7 @@
 			flex-wrap: wrap;
 
 			>view {
-				width: 9vw;
+				width: 10vw;
 				height: 4vw;
 				border-radius: 1vw;
 				border: 2rpx solid #D9DADC;
@@ -220,6 +224,11 @@
 				margin: 0 0.3vw;
 				transition: transform 0.18s ease, box-shadow 0.18s ease, background 0.25s ease;
 				-webkit-tap-highlight-color: transparent;
+				image{
+					width: 1.6vw;
+					height: 1.6vw;
+					margin-right: .2vw;
+				}
 			}
 
 			.click-box {
@@ -228,7 +237,10 @@
 			}
 
 			.click-box-target {
-				color: transparent;
+				background: #FFFFFF;
+				box-shadow: 0px 0px 3vw 0px rgba(12,102,209,0.33) inset; 
+				// box-shadow: 0rpx 0rpx 3vw 0rpx rgba(38,137,255,0.44) inset;
+				color: rgba(108, 132, 160, 1) !important;
 				animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
 				transform-origin: center center;
 			}
@@ -387,8 +399,8 @@
 		}
 
 		.annotation1 {
-			top: 20.5vw;
+			top: 21.5vw;
-			left: 19vw;
+			left: 19.5vw;
 		}
 
 		.annotation2 {
@@ -397,22 +409,22 @@
 		}
 
 		.annotation3 {
-			top: 23vw;
+			top: 24vw;
-			left: 50vw;
+			left: 49.3vw;
 		}
 
 		.annotation4 {
-			top: 17vw;
+			top: 18vw;
-			left: 68vw;
+			left: 70vw;
 		}
 
 		.annotation5 {
-			top: 32vw;
+			top: 34vw;
 			left: 74vw;
 		}
 
 		.annotation6 {
-			top: 23vw;
+			top: 24vw;
 			right: 6vw;
 		}
 
@@ -426,28 +438,29 @@
 
 			>view {
 				position: relative;
-
+ 
-				&:nth-child(1) {
-					width: 7vw;
-					height: 2vw;
-					background: #F2F3F7;
-					box-shadow: 0rpx 0rpx 0rpx 0rpx rgba(182, 186, 196, 0.35);
-					border: 2rpx solid #FFFFFF;
-					font-weight: 400;
-					font-size: 1.3vw;
-					color: #333333;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					z-index: 3;
-				}
-
 				&:nth-child(2) {
-					width: 4vw;
+					width: 6.5vw;
-					height: 2vw;
+					height: 3.2vw;
 					z-index: 2;
 					margin: -2rpx auto 0;
 					z-index: 2;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					image{
+						position: absolute;
+						top: 0;
+						left: 0;
+					}
+					text{
+						position: relative;
+						font-weight: 400;
+						font-size: 1.1vw;
+						color: #fff;
+						z-index: 3;
+						margin-top: -0.5vw;
+					}
 				}
 
 				&:nth-child(3) {

pages/Warehouse/procurement.vue

@@ -3,67 +3,649 @@
 		<!-- 采购 -->
 		<view class="box">
 			<view class="lefts">
-				<scroll-view   scroll-y="true" class="scroll-Y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
+				<scroll-view   scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
-						<view class="boxitem" v-for="(v,i) in 66" :key='i'></view>
+						<view class="boxitem" v-for="(v,i) in 66" :key='i' :class="{'yujing':i==1,'active':i==0}">
+							<view>纸尿裤-拉拉裤纸尿裤-拉拉裤</view>
+							<view>规格型号:  800mm*680mm</view>
+							<view>采购单位： 片</view>
+							<view>
+								<view class="carditem" :class="{'hl':i==0,'yl':i==1,'bj':i>=2}">
+									<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill" v-if="i==0"></image>
+									<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill" v-if="i==1"></image>
+									<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill" v-if="i>=2"></image>
+									保洁
+								</view>
+								<view class="znk">
+									<image src="/static/index/warehouse/procurement/znk.png" mode="aspectFill"></image>
+								</view>
+								<view class="num">
+									<view>500</view>
+									<view>库存数量</view>
+								</view>
+							</view>
+						</view>
+						<view style="height: 23vw;"></view>
 				</scroll-view>
+				<view class="mblbg"> </view>
+				<view class="fxj">
+					<arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" rightbuttonname="扫描"/>
+				</view>
 			</view>
 			<view class="rights">
 				<view class="shitem">
+					<view class="shypk">
+						<view>生活用品库</view>
+						<view>
+							 
+							 <view class="swsh guodu" :class="shyp?'act':''" @click="switchshyp">
+							 	<view class="guodu"></view>
+							 </view>
+							 <text>
+								 {{shyp?'启用':'停用'}}
+							 </text>
+						</view>
+					</view>
+					<view class="jqry">
+						<view class="left tp">
+							<image src="/static/index/warehouse/procurement/jqr.png" mode="aspectFill"></image>
+						</view>
+						<view class="rigname">
+							<view>李树奎</view>
+							<view>
+								<text>男</text>
+								<text>50岁</text>
+								<text>13358863266</text>
+							</view>
+						</view>
+					</view>
 					
 				</view>
+				<view class="typeitem">
+					<view class="toptype">
+						<view v-for="v in ['三','二','一']">{{v+'级分类'}}</view>
+					</view>
+					<view class="scroltype">
+						<scroll-view   scroll-y="true" scroll-with-animation 
+						:scroll-top="scroll.scrolltop3" class="scroll-Y"  >
+							<view :class="scroll.act3==i?'act':''" v-for="(v,i) in ['活血化瘀止痛类','通络止痛类']"   @click="typescroll(3,i)">
+								{{v}}
+							</view>
+						</scroll-view>
+						
+						<scroll-view   scroll-y="true" scroll-with-animation
+						:scroll-top="scroll.scrolltop2" class="scroll-Y"  >
+							<view :class="scroll.act2==i?'act':''" v-for="(v,i) in ['液体制剂','中药制剂','中医辩证']"   @click="typescroll(2,i)">
+								{{v}}
+							</view>
+						</scroll-view>
+						
+						<scroll-view   scroll-y="true" scroll-with-animation
+						:scroll-top="scroll.scrolltop1" class="scroll-Y">
+							<view :class="scroll.act1==i?'act':''" 
+							v-for="(v,i) in
+							 ['中医中药','生活用品','医疗用品','医疗器械','耗材用品','食材用品','生活用品',
+							 '中医中药','生活用品','医疗用品','医疗器械','耗材用品','食材用品','生活用品']"
+								@click="typescroll(1,i)">
+								<image src="/static/index/warehouse/procurement/Purchase/Purchase09.png" mode="aspectFill" v-if="scroll.act1==i"></image>
+								<image src="/static/index/warehouse/procurement/Purchase/Purchase01.png" mode="aspectFill" v-else></image>
+								<text>
+									{{v}}
+								</text>
+							</view>
+						</scroll-view>
+					</view>
+					
+					<view class="anmikc">
+						<view v-for="(v,i) in animArray" :key="i" @click="admiclick(i)">
+							<view>
+								<image :src="v.imgurl" mode="aspectFill" v-if="anmidex!=i"></image>
+								<donghua width="1.5vw" height="1.5vw" :links="v.url" :playing="i === anmidex"
+									v-show="i === anmidex" class="donghua"/>
+							</view>
+							
+								<text>
+									{{v.name}}
+								</text>
+						</view>
+					</view>
+					<view class="serchs">
+						<input type="text" placeholder="物料名称/物料编码/物料简拼" />
+						<view>
+							检索
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
+	import { ref, onMounted, reactive,onBeforeUnmount, computed, nextTick,defineProps } from 'vue';
+	 const navurl = ref('');
+	 const scrolltop = ref(0)
+	 const getblue = ref(false);
+	 const shyp = ref(false);
+	 const scroll = reactive({scrolltop1:0,scrolltop2:0,scrolltop3:0,act1:0,act2:0,act3:0});
 	 
+	 const switchshyp = ( )=>{
+		 shyp.value = shyp.value?false:true;
+	 }
+	const typescroll = (e: number,i: number)=>{
+		 scroll['act'+e] = i;
+		 scroll['scrolltop'+e] = (i -2) * 50;
+		 
+		 console.log(scroll['scrolltop'+e]);
+		 console.log(scroll['act'+e])
+	 }
+	 const movecard = (type : number) => {
+	   console.log(type)
+	   switch (type){
+	   	case 0:
+	 		// 上
+	   		break;
+	   	case 1:
+	 		// →
+	   		break;
+	   	case 2:
+	 		// 下
+	   		break;
+	   	case 3:
+	 		// ←
+	   		break;
+	   	case 4:
+	 		// 扫描
+	 		 
+	   		break;
+	   	case 5:
+	 		// 返回
+	 		uni.navigateBack()
+	   		break;
+	   		
+	   	default:
+	   		break;
+	   }
+	 }
+	 // 通用的生成函数
+	 function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
+	 	return Array.from({ length: count }, (_, i) => {
+	 		const idx = pad
+	 			? String(i + startIndex).padStart(2, '0')
+	 			: i + startIndex
+	 		return `${base}/${prefix}${idx}.${ext}`
+	 	})
+	 }
+	 const anmidex = ref(-1)
+	 const admiclick = (i:number)=>{
+		 anmidex.value = i;
+	 }
+	 const animArray = ref([
+	 	{
+	 		url: genPaths(
+	 			'/static/index/warehouse/procurement/store',
+	 			'store0',
+	 			8,    // 张数
+	 			'png',
+	 			1,     // 起始索引为 1
+	 			false  // 不补零
+	 		),
+	 		name:'库存预警',
+			imgurl:'/static/index/warehouse/procurement/store/store01.png'
+	 	},
+	 	{
+	 		url: genPaths(
+	 			'/static/index/warehouse/procurement/procure',
+	 			'procure0',
+	 			7,    // 张数
+	 			'png',
+	 			1,     // 起始索引为 1
+	 			false  // 不补零
+	 		),
+	 		name:'采 购',
+			imgurl:'/static/index/warehouse/procurement/procure/procure01.png'
+	 	},
+	 	{
+	 		url: genPaths(
+	 			'/static/index/warehouse/procurement/Purchase',
+	 			'Purchase0',
+	 			9,    // 张数
+	 			'png',
+	 			1,     // 起始索引为 1
+	 			false  // 不补零
+	 		),
+	 		name:'采购单',
+			imgurl:'/static/index/warehouse/procurement/Purchase/Purchase01.png'
+	 	},
+	 	{
+	 		url: genPaths(
+	 			'/static/index/warehouse/procurement/details',
+	 			'details0',
+	 			7,    // 张数
+	 			'png',
+	 			1,     // 起始索引为 1
+	 			false  // 不补零
+	 		),
+	 		name:'物料详情',
+			imgurl:'/static/index/warehouse/procurement/details/details01.png'
+	 	},
+		{
+			url: genPaths(
+				'/static/index/warehouse/procurement/bound',
+				'bound0',
+				11,    // 张数
+				'png',
+				1,     // 起始索引为 1
+				false  // 不补零
+			),
+			name:'出入库',
+			imgurl:'/static/index/warehouse/procurement/bound/bound01.png'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/procurement/Cart',
+				'Cart0',
+				10,    // 张数
+				'png',
+				1,     // 起始索引为 1
+				false  // 不补零
+			),
+			name:'购物车',
+			imgurl:'/static/index/warehouse/procurement/Cart/Cart01.png'
+		}
+	 ])
 </script>
 
 <style lang="less">
+	.tp{
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
 .box{
 	width: 100vw;
 	height: 100vh;
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
-	padding: 4vw 2vw 0;
+	padding: 0vw 2vw 0;
-	overflow: hidden;
-	.lefts{
-		width: 70vw;
-		height: 100%;
-		margin-left: 1vw;
-		.scroll-Y{
-			width: 100%;
-			height: 100%;
-			display: flex;
-			flex-wrap: wrap;
-		}
-		.boxitem{
-			width: 22vw;
-			height: 18vw;
-			background: rgba(255,255,255,.7);
-			border-radius: 1.6vw;
-			margin: 0 1.3vw 1.2vw 0;
-			border: 2px dashed #fff;
-			display: inline-block;
-		}
-		.active{
-			border: 2px dashed #017DE9 !important;
-		}
-	}
 	.rights{
 		width: 25vw;
-		height: 100%;
+		height:calc(100% - 4vw);
+		margin-top: 4vw;
+		.serchs{
+			width: 23.2vw;
+			height: 3.2vw;
+			background: rgba(255,255,255,.5);
+			border-radius: 1.6vw;
+			display: flex;
+			justify-content: space-between;
+			padding: 0.5vw;
+			align-items: center;
+			input{
+				width: 18vw;
+				height: 2.4vw;
+				font-size: 0.9vw;
+				padding-left: 1.6vw;
+			}
+			view{
+				width: 4.2vw;
+				height: 2.4vw;
+				background: url('/static/index/warehouse/procurement/sh.png')no-repeat;
+				background-size: 100% 100%;
+				border-radius: 1.2vw;
+				border: 1px solid rgba(0, 155, 252, 1); 
+				font-weight: 400;
+				font-size: 1vw;
+				color: #1083F8;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		.anmikc{
+			width: 100%;
+			height: 9vw;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			
+			>view{
+				width: 8vw;
+				height: 3.2vw;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-weight: 400;
+				font-size: .9vw;
+				color: #212327;
+				background: #FFFFFF;
+				margin: .7vw 0;
+				border-radius: 1.6vw;
+				view{
+					margin-right: .4vw;
+					image{
+						width: 1.5vw;
+						height: 1.5vw;
+					}
+					.donghua{
+						margin: 0;
+					}
+				}
+				
+				text{
+					margin-top: 0.1vw;
+					white-space: nowrap;
+				}
+				
+			}
+		}
+		.typeitem{
+			width: 100%;
+			height: 54vh;
+			.scroltype{
+				width: 100%;
+				height:calc(54vh - 2vw);
+				display: flex;
+				justify-content: space-around;
+				.scroll-Y{
+					width: 7vw;
+					height:calc(54vh - 2vw);
+					view{
+						width: 7vw;
+						height: 3.8vw;
+						background: rgba(255,255,255,.5);
+						border-radius: 1.9vw;
+						font-weight: 400;
+						font-size: .9vw;
+						color: #212327;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						padding: 0 0.4vw;
+						margin-bottom: .8vw;
+						text-align: center;
+						text{
+							white-space: nowrap;
+						}
+						>image{
+							width: 1.8vw;
+							height: 1.8vw;
+						}
+					}
+					.act{
+						background: rgba(255,255,255,1) !important;
+						color: #0385FA !important;
+					}
+				}
+			}
+			.toptype{
+				width: 100%;
+				height: 2vw;
+				display: flex;
+				justify-content: space-around;
+				margin: .4vw 0 .4vw 0;
+				>view{
+					width: 7vw;
+					height: 1.9vw;
+					background: rgba(255,255,255,.5);
+					border-radius: .9vw;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-weight: 400;
+					font-size: .9vw;
+					color: #333333;
+				}
+			}
+		}
 		.shitem{
 			width: 24.0vw;
 			height: 10.3vw;
 			background: #E8E9ED;
 			border-radius: 1.6vw;
 			padding: 1.8vw;
-			
+			.jqry{
+				width: 100%;
+				display: flex;
+				align-items: center;
+				.left{
+					width: 5vw;
+					height: 5vw;
+				}
+				.rigname{
+					height: 3vw;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-around;
+					&:nth-child(1){
+						font-weight: bold;
+						font-size: 1.4vw;
+						color: #212327;
+					}
+					&:nth-child(2){
+						width: 11vw;
+						font-weight: 400;
+						font-size: 1vw;
+						color: #212327;
+						display: flex;
+						justify-content: space-between;
+					}
+				}
+			}
+			.shypk{
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				view{
+					&:nth-child(1){
+						font-weight: bold;
+						font-size: 1.0vw;
+						color: #333333;
+					}
+					&:nth-child(2){
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						text{
+							font-weight: 400;
+							font-size: .8vw;
+							color: #666666;
+						}
+						.guodu{
+							transition: .4s;
+							-webkit-transform-style: preserve-3d;
+							-webkit-overflow-scrolling: touch;
+						}
+						.swsh{
+							width: 2.7vw;
+							height: 1.5vw;
+							background: #D6D8DC;
+							border-radius: .75vw;
+							border: 1px solid #D6D8DC;
+							padding: 0.2vw;
+							box-sizing: border-box;
+							display: flex;
+							align-items: center;
+							>view{
+								width: 1.1vw;
+								height: 1.1vw;
+								background: #FCFCFD;
+								border-radius: 50%;
+							}
+						}
+						.act{
+							background: linear-gradient(-69deg, #E1EFFC, #CAE0F9, #D2E9FF) !important;
+							border: 1px solid rgba(0, 130, 251, 0.34) !important;
+							padding-left: 1.3vw;
+							
+							view{
+								background: #0385FA;
+								position: absolute;
+							}
+						}
+						
+					}
+				}
+			}
 		}
 	}
+	.lefts{
+		width: 70vw;
+		margin-left: 1vw;
+		height:calc(100%);
+		position: relative;
+		.fxj{
+			width: 23vw;
+			height: 22vw;
+			position: absolute;
+			left: 0;
+			bottom: 2vw;
+			z-index: 11;
+			border-radius: 1.6vw;
+		}
+		.mblbg{
+			width: 24.5vw;
+			height: 21vw;
+			position: absolute;
+			left: -1vw;
+			bottom: 0.5vw;
+			border-radius: 1.6vw;
+			  filter: blur(15rpx);
+			background: RGBA(239, 240, 244, 1);
+			z-index: 10;
+		}
+		.scroll-Y{
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			.boxitem{
+				&:nth-child(1),&:nth-child(2),&:nth-child(3){
+					margin-top: 4vw;
+				}
+			}
+		}
+		.boxitem{
+			width: 22vw;
+			height: 19.3vw;
+			background: rgba(255,255,255,.7);
+			border-radius: 1.6vw;
+			margin: 0 1.3vw 1.2vw 0;
+			border: 2px dashed #fff;
+			display: inline-block;
+			padding: 2.3vw;
+			position: relative;
+			>view{
+				.hl{
+					color: #0385FA;
+					background: #E7F0FB;
+				}
+				.yl{
+					background:#DCF6F3;
+					color: #00C6A9;
+				}
+				.bj{
+					background: #E9EBFC;
+					color: #727BFF;
+				}
+				
+				
+				>&:nth-child(1){
+					font-weight: bold;
+					font-size: 1.3vw;
+					color: #212327;
+				}
+				>&:nth-child(2){
+					font-weight: 400;
+					font-size: 10rpx;
+					color: #555555;
+					margin-top: .9vw;
+				}
+				>&:nth-child(3){
+					font-weight: 400;
+					font-size: 10rpx;
+					color: #666666;
+					margin-top: .6vw;
+				}
+				>&:nth-child(4){
+					width: 100%;
+					height: 10vw;
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					
+				}
+				.num{
+					position: absolute;
+					bottom: 2vw;
+					left: 2.5vw;
+					display: flex;
+					flex-direction: column;
+					view{
+						&:nth-child(1){
+							font-weight: bold;
+							font-size: 2.2vw;
+							color: #333333;
+							margin-bottom: .6vw;
+						}
+						&:nth-child(2){
+							font-weight: 400;
+							font-size: .9vw;
+							color: #999999;
+						}
+					}
+					
+				}
+				.znk{
+					width: 12vw;
+					height: 11.5vw;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.carditem{
+					width: 5.8vw;
+					height: 2.1vw;
+					border-radius: 1.0vw;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-weight: 400;
+					font-size: .9vw;
+					margin-top: .8vw;
+					image{
+						width: 1.4vw;
+						height: 1.4vw;
+					}
+				}
+			}
+		}
+		.yujing{
+			background:rgba(255, 87, 87, 0.095);
+			border: 2px solid rgba(255, 102, 107, 0.51) !important;
+			box-shadow: 0 0 8px rgba(255, 102, 107, 0.51);
+			view{
+				.num{
+					view{
+						&:nth-child(1){
+							color: #FF5757 !important;
+						}
+					}
+					
+				}
+			}
+		}
+		.active{
+			border: 2px dashed #017DE9 !important;
+		}
+	}
+	
 }
 </style>
 <style>

unpackage/dist/dev/.nvue/pages/camera.js

@@ -591,7 +591,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/app-plus/pages/Warehouse/procurement.css

@@ -1,38 +1,71 @@
+.tp uni-image {
+  width: 100%;
+  height: 100%;
+}
 .box {
   width: 100vw;
   height: 100vh;
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
-  padding: 4vw 2vw 0;
+  padding: 0vw 2vw 0;
-  overflow: hidden;
-}
-.box .lefts {
-  width: 70vw;
-  height: 100%;
-  margin-left: 1vw;
-}
-.box .lefts .scroll-Y {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-wrap: wrap;
-}
-.box .lefts .boxitem {
-  width: 22vw;
-  height: 18vw;
-  background: rgba(255, 255, 255, 0.7);
-  border-radius: 1.6vw;
-  margin: 0 1.3vw 1.2vw 0;
-  border: 2px dashed #fff;
-  display: inline-block;
-}
-.box .lefts .active {
-  border: 2px dashed #017DE9 !important;
 }
 .box .rights {
   width: 25vw;
-  height: 100%;
+  height: calc(100% - 4vw);
+  margin-top: 4vw;
+}
+.box .rights .typeitem {
+  width: 100%;
+  height: 54vh;
+}
+.box .rights .typeitem .scroltype {
+  width: 100%;
+  height: calc(54vh - 2vw);
+  display: flex;
+  justify-content: space-around;
+}
+.box .rights .typeitem .scroltype .scroll-Y {
+  width: 7vw;
+  height: calc(54vh - 2vw);
+}
+.box .rights .typeitem .scroltype .scroll-Y uni-view {
+  width: 7vw;
+  height: 3.8vw;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 1.9vw;
+  font-weight: 400;
+  font-size: 0.9vw;
+  color: #212327;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 1.4vw;
+  margin-bottom: 0.8vw;
+  text-align: center;
+}
+.box .rights .typeitem .scroltype .scroll-Y .act {
+  background: #ffffff !important;
+  color: #0385FA !important;
+}
+.box .rights .typeitem .toptype {
+  width: 100%;
+  height: 2vw;
+  display: flex;
+  justify-content: space-around;
+  margin: 0.4vw 0 0.4vw 0;
+}
+.box .rights .typeitem .toptype > uni-view {
+  width: 7vw;
+  height: 1.9vw;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 0.9vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 400;
+  font-size: 0.9vw;
+  color: #333333;
 }
 .box .rights .shitem {
   width: 24vw;
@@ -41,6 +74,225 @@
   border-radius: 1.6vw;
   padding: 1.8vw;
 }
+.box .rights .shitem .jqry {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+.box .rights .shitem .jqry .left {
+  width: 5vw;
+  height: 5vw;
+}
+.box .rights .shitem .jqry .rigname {
+  height: 3vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.box .rights .shitem .jqry .rigname:nth-child(1) {
+  font-weight: bold;
+  font-size: 1.4vw;
+  color: #212327;
+}
+.box .rights .shitem .jqry .rigname:nth-child(2) {
+  width: 11vw;
+  font-weight: 400;
+  font-size: 1vw;
+  color: #212327;
+  display: flex;
+  justify-content: space-between;
+}
+.box .rights .shitem .shypk {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.box .rights .shitem .shypk uni-view:nth-child(1) {
+  font-weight: bold;
+  font-size: 1vw;
+  color: #333333;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) uni-text {
+  font-weight: 400;
+  font-size: 0.8vw;
+  color: #666666;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) .guodu {
+  transition: 0.4s;
+  -webkit-transform-style: preserve-3d;
+  -webkit-overflow-scrolling: touch;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) .swsh {
+  width: 2.7vw;
+  height: 1.5vw;
+  background: #D6D8DC;
+  border-radius: 0.75vw;
+  border: 1px solid #D6D8DC;
+  padding: 0.2vw;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) .swsh > uni-view {
+  width: 1.1vw;
+  height: 1.1vw;
+  background: #FCFCFD;
+  border-radius: 50%;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) .act {
+  background: linear-gradient(-69deg, #E1EFFC, #CAE0F9, #D2E9FF) !important;
+  border: 1px solid rgba(0, 130, 251, 0.34) !important;
+  padding-left: 1.3vw;
+}
+.box .rights .shitem .shypk uni-view:nth-child(2) .act uni-view {
+  background: #0385FA;
+  position: absolute;
+}
+.box .lefts {
+  width: 70vw;
+  margin-left: 1vw;
+  height: calc(100%);
+  position: relative;
+}
+.box .lefts .fxj {
+  width: 23vw;
+  height: 22vw;
+  position: absolute;
+  left: 0;
+  bottom: 2vw;
+  z-index: 11;
+  border-radius: 1.6vw;
+}
+.box .lefts .mblbg {
+  width: 23vw;
+  height: 21vw;
+  position: absolute;
+  left: -0.2vw;
+  bottom: 0.5vw;
+  border-radius: 1.6vw;
+  filter: blur(0.46875rem);
+  background: #eff0f4;
+  z-index: 10;
+}
+.box .lefts .scroll-Y {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+}
+.box .lefts .scroll-Y .boxitem:nth-child(1),
+.box .lefts .scroll-Y .boxitem:nth-child(2),
+.box .lefts .scroll-Y .boxitem:nth-child(3) {
+  margin-top: 4vw;
+}
+.box .lefts .boxitem {
+  width: 22vw;
+  height: 19.3vw;
+  background: rgba(255, 255, 255, 0.7);
+  border-radius: 1.6vw;
+  margin: 0 1.3vw 1.2vw 0;
+  border: 2px dashed #fff;
+  display: inline-block;
+  padding: 2.3vw;
+  position: relative;
+}
+.box .lefts .boxitem > uni-view .hl {
+  color: #0385FA;
+  background: #E7F0FB;
+}
+.box .lefts .boxitem > uni-view .yl {
+  background: #DCF6F3;
+  color: #00C6A9;
+}
+.box .lefts .boxitem > uni-view .bj {
+  background: #E9EBFC;
+  color: #727BFF;
+}
+> .box .lefts .boxitem > uni-view:nth-child(1) {
+  font-weight: bold;
+  font-size: 1.3vw;
+  color: #212327;
+}
+> .box .lefts .boxitem > uni-view:nth-child(2) {
+  font-weight: 400;
+  font-size: 0.3125rem;
+  color: #555555;
+  margin-top: 0.9vw;
+}
+> .box .lefts .boxitem > uni-view:nth-child(3) {
+  font-weight: 400;
+  font-size: 0.3125rem;
+  color: #666666;
+  margin-top: 0.6vw;
+}
+> .box .lefts .boxitem > uni-view:nth-child(4) {
+  width: 100%;
+  height: 10vw;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+.box .lefts .boxitem > uni-view .num {
+  position: absolute;
+  bottom: 2vw;
+  left: 2.5vw;
+  display: flex;
+  flex-direction: column;
+}
+.box .lefts .boxitem > uni-view .num uni-view:nth-child(1) {
+  font-weight: bold;
+  font-size: 2.2vw;
+  color: #333333;
+  margin-bottom: 0.6vw;
+}
+.box .lefts .boxitem > uni-view .num uni-view:nth-child(2) {
+  font-weight: 400;
+  font-size: 0.9vw;
+  color: #999999;
+}
+.box .lefts .boxitem > uni-view .znk {
+  width: 12vw;
+  height: 11.5vw;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+.box .lefts .boxitem > uni-view .znk uni-image {
+  width: 100%;
+  height: 100%;
+}
+.box .lefts .boxitem > uni-view .carditem {
+  width: 5.8vw;
+  height: 2.1vw;
+  border-radius: 1vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 400;
+  font-size: 0.9vw;
+  margin-top: 0.8vw;
+}
+.box .lefts .boxitem > uni-view .carditem uni-image {
+  width: 1.4vw;
+  height: 1.4vw;
+}
+.box .lefts .yujing {
+  background: rgba(255, 87, 87, 0.095);
+  border: 2px solid rgba(255, 102, 107, 0.51) !important;
+  box-shadow: 0 0 8px rgba(255, 102, 107, 0.51);
+}
+.box .lefts .yujing uni-view .num uni-view:nth-child(1) {
+  color: #FF5757 !important;
+}
+.box .lefts .active {
+  border: 2px dashed #017DE9 !important;
+}
 
 
 body{

unpackage/dist/dev/app-plus/pages/camera.js

@@ -63,7 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
     }
   });
 
-  // ../../../../hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
+  // ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
   var import_vue = __toESM(require_vue());
   function requireNativePlugin(name) {
     return weex.requireModule(name);
@@ -657,7 +657,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
       )
     ]);
   }
-  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
+  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
 
   // <stdin>
   var webview = plus.webview.currentWebview();