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

pages/NursingNew/component/pleasetake/common/carditem.vue

@@ -130,7 +130,7 @@
 		caigouobj.value.scrollleft = caigouobj.value.zk ? 150 : 0;
 	}
 	const solleft = (v : any, i : number) => { 
-		console.log(v)
+		// console.log(v)
 		props.InvoicingList.forEach((item, k) => {
 			if (k != i&&item.zk==true) {
 				item.zk = false;

pages/NursingNew/component/pleasetake/common/tanchuang.vue

@@ -11,14 +11,11 @@
 				<view class="qd" @click="$emit('right')">确定</view>
 			</view>
 		</view>
-		 <view class="mengban" v-if="show"  @click="$emit('back')"></view>
+		<view class="mengban" v-if="show" @click="$emit('back')"></view>
 	</view>
 </template>
 
 <script>
-import { vShow } from 'vue';
-
-
 	export default {
 		props: {
 			show: {
@@ -30,24 +27,24 @@ import { vShow } from 'vue';
 				default: ''
 			},
 		},
-		data(){
-			return{
-				showbox:false
+		data() {
+			return {
+				showbox: false
 			}
 		},
-		watch:{
-			show(n,o){
-				if(n){
-					setTimeout(()=>{
+		watch: {
+			show(n, o) {
+				if (n) {
+					setTimeout(() => {
 						this.showbox = true
-					},50)
-				}else{
+					}, 50)
+				} else {
 					this.showbox = false
 				}
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
@@ -124,14 +121,17 @@ import { vShow } from 'vue';
 			}
 		}
 	}
+
 	.unclass {
 		opacity: 0 !important;
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+
 	.mengban {
 		width: 100vw;
 		height: 100vh;

pages/NursingNew/component/pleasetake/common/tijiao.vue

@@ -0,0 +1,106 @@
+<template>
+	<view>
+		<view class="addall guodu" :class="{ unclass: !show }" :style="{ zIndex: showbox ? 220 : -2 }">
+			<view class="title">
+				请领详情
+			</view>
+		</view>
+
+		<view class="mengban" v-if="show" @click="() => emit('back')"></view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		watch,
+		onMounted
+	} from 'vue'
+
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		font: {
+			type: String,
+			default: ''
+		},
+		plsbuy: {
+			type: Object,
+			// default: () => ({})
+		}
+	})
+
+	// 暴露给模板的 emit
+	const emit = defineEmits(['back'])
+
+	const showbox = ref(false)
+
+	// 监听 show，保留你原来的逻辑：show 为 true 时延迟 50ms 再把 showbox 设为 true，false 时立即关掉
+	watch(
+		() => props.show,
+		(n) => {
+			if (n) {
+				setTimeout(() => {
+					showbox.value = true;
+					console.log('plsbuy =>', props.plsbuy)
+				}, 50)
+				
+			} else {
+				showbox.value = false
+			}
+		}
+	)
+
+	// mounted 中打印 plsbuy（你要的行为）
+	onMounted(() => {
+		
+	})
+</script>
+
+<style scoped lang="less">
+	.addall {
+		width: 55vw;
+		height: 50vw;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
+		border-radius: 1.6vw;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin: auto;
+		padding: 1.5vw 2.2vw;
+		z-index: 9120;
+	}
+
+	.unclass {
+		opacity: 0 !important;
+	}
+
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background: RGBA(239, 240, 244, 0.55);
+	}
+	.title{
+		height: 6vh;
+		width: 100%;
+		// background-color: red;
+		font-size: 38rpx;
+		font-weight: 600;
+		border-bottom: 2rpx solid #E5E5E5;
+	}
+</style>

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -28,7 +28,7 @@
 					作废
 				</view>
 			</view>
-			<view class="right-button" style="width: 11vw;" @click="badshow=true">
+			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true">
 				<image src="/static/index/warehouse/procurement/picking/caigou.png" />
 				<view>
 					提交请购单
@@ -40,7 +40,7 @@
 
 	</view>
 	<tanchuang :show="badshow" font="确定要作废这个回退单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
-	<tanchuang :show="shouhuoshow" font="这个请领单确定要收货吗" @back="shouhuoshow=false;" @right="shouhuo"> </tanchuang>
+	<tijiao :show="tijiaoshow" :plsbuy="plsbuy[lefttarget]"  @back="tijiaoshow=false;"> </tijiao>
 
 	<view class="other-contain" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow && !nomessageshow">
 		<view class="other-contain-left">
@@ -234,6 +234,8 @@
 	import { queryQld, queryQldWlInfo, transRead, cancellation, confirmReceipt } from '../api/api.js'
 	import nomessage from '../common/nomessage.vue'
 	import defaultr from '../common/default.vue'
+	import tijiao from '../common/tijiao.vue'
+	
 	const props = defineProps({
 		isShow: {
 			type: Boolean,
@@ -468,38 +470,38 @@
 
 		})
 	}
-	const shouhuoshow = ref(false)
-	const shouhuo = () => {
-		let param = {
-			qldNo: plsbuy.value[lefttarget.value].qldNo,
-			elderId: uni.getStorageSync('NUall').elderId,
-			nuId: uni.getStorageSync('nuId')
-		}
-		confirmReceipt(param).then((res : any) => {
-			shouhuoshow.value = false
-			if (res.success) {
+	const tijiaoshow = ref(false)
+	// const tijiao = () => {
+	// 	let param = {
+	// 		qldNo: plsbuy.value[lefttarget.value].qldNo,
+	// 		elderId: uni.getStorageSync('NUall').elderId,
+	// 		nuId: uni.getStorageSync('nuId')
+	// 	}
+	// 	confirmReceipt(param).then((res : any) => {
+	// 		tijiaoshow.value = false
+	// 		if (res.success) {
 
-			} else {
-				plzinfo.pageNo = 1;
-				leftscrolltop.value = 1
-				setTimeout(() => {
-					leftscrolltop.value = 0
-				}, 50)
-				lefttarget.value = 0
-				plzinfo.canpull = true;
-				firstgetqueryCgdList();
-			}
+	// 		} else {
+	// 			plzinfo.pageNo = 1;
+	// 			leftscrolltop.value = 1
+	// 			setTimeout(() => {
+	// 				leftscrolltop.value = 0
+	// 			}, 50)
+	// 			lefttarget.value = 0
+	// 			plzinfo.canpull = true;
+	// 			firstgetqueryCgdList();
+	// 		}
 
-			setTimeout(() => {
-				uni.showToast({
-					title: res.message,
-					icon: 'none', // 'none' 表示不带图标
-					duration: 3000
-				})
-			}, 300)
+	// 		setTimeout(() => {
+	// 			uni.showToast({
+	// 				title: res.message,
+	// 				icon: 'none', // 'none' 表示不带图标
+	// 				duration: 3000
+	// 			})
+	// 		}, 300)
 
-		})
-	}
+	// 	})
+	// }
 </script>
 
 <style scoped lang="less">

pages/Warehouse/picking.vue

@@ -920,11 +920,11 @@
 					</view>
 				</view>
 				<view class="right-bottom" v-show="typechange==1" style="padding: 0 50rpx;flex-direction: column;">
-					<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 20rpx;">
+					<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 30rpx;margin-bottom: 10rpx;">
 						<view style="font-size: 35rpx;font-weight: 600;margin-left: 20rpx;color: #222222;">
 							{{showvalue.wlName}}
 						</view>
-						<view style="color: black;">
+						<view style="color: black;margin-top: 5rpx;">
 							<text style="color: #888888;">
 								采购数量：
 							</text>
@@ -987,7 +987,7 @@
 								</view>
 							</view>
 						</view>
-						<view
+						<!-- <view
 							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;"
 							v-if="lhjlarr.length">
 							<image v-if="statustory=='loading'"
@@ -996,9 +996,19 @@
 							<text v-if="statustory=='loading'">上划加载更多</text>
 							<text v-if="statustory=='nomore'">已加载全部~</text>
 							<text v-if="statustory=='loadmore'">加载中~</text>
-						</view>
+						</view> -->
 
 					</scroll-view>
+					<view
+						style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 40rpx;"
+						v-if="lhjlarr.length">
+						<image v-if="statustory=='loading'"
+							style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
+							src="/static/index/warehouse/procurement/picking/loading.png" />
+						<text v-if="statustory=='loading'">上划加载更多</text>
+						<text v-if="statustory=='nomore'">已加载全部~</text>
+						<text v-if="statustory=='loadmore'">加载中~</text>
+					</view>
 					<view class="nomessage-samll" v-if="!lhjlarr.length">
 						<image style="width: 300rpx;height: 300rpx;margin-top: -200rpx;"
 							src="/static/index/warehouse/procurement/picking/nomessage.png" />

pages/Warehouse/留档.vue

@@ -0,0 +1,694 @@
+<template>
+	<view>
+		<view class="home">
+			<image class="all-home" src="/static/index/warehouse/newhome/setting.png" mode="aspectFit"></image>
+		</view>
+		<view class="paizi tp" @click="ceshi">
+			<donghua width="18vw" height="18vw" :interval="300" :links="paiziarray" :playing="playall" :loop="true" />
+		</view>
+		<view class="jiankong tp" @click="back">
+			<donghua width="17vw" height="17vw" :interval="300" :links="jiankongarray" :playing="playall"
+				:loop="true" />
+		</view>
+		<view class="wanjie tp">
+			<donghua width="18vw" height="18vw" :interval="300" :links="wanjiearray" :playing="playall" :loop="true" />
+		</view>
+		<view class="caigou tp">
+			<donghua width="18vw" height="18vw" :interval="300" :links="caigouarray" :playing="playall" :loop="true" />
+		</view>
+		<view class="ruku tp">
+			<donghua width="11vw" height="11vw" :interval="300" :links="rukuarray" :playing="playall" :loop="true" />
+		</view>
+		<view class="chuku tp">
+			<donghua width="11vw" height="11vw" :interval="300" :links="rukuarray" :playing="playall" :loop="true" />
+		</view>
+		<view class="jianhuo tp">
+			<donghua width="40vw" height="40vw" :interval="300" :links="jianhuoarray" :playing="playall" :loop="true" />
+		</view>
+		<view class="pandan tp">
+			<image src="/static/index/warehouse/newhome/count.png" mode="widthFix"></image>
+		</view>
+		<view class="return tp">
+			<image src="/static/index/warehouse/newhome/return.png" mode="widthFix"></image>
+		</view>
+		<view class="lead tp">
+			<image src="/static/index/warehouse/newhome/lead.png" mode="widthFix"></image>
+		</view>
+		<view class="picking tp">
+			<image src="/static/index/warehouse/newhome/picking.png" mode="widthFix"></image>
+		</view>
+		<view :style="moverStyle" >
+			<image style="width: 100%;height: 100%;" src="/static/index/warehouse/newhome/train9.png" mode="widthFix"></image>
+		</view>
+		<!-- 	<view class="contitem tp">
+			<image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image>
+		</view>
+		<view class="hldy tp">
+			<donghua width="16vw" height="8.6vw" :links="logoval.url" :playing="true" />
+		</view>
+		<view class="route tp">
+			<image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image>
+		</view>
+		<view class="pulu1 tp">
+			<image src="/static/index/warehouse/home/pu3.gif" mode="aspectFill"></image>
+		</view>
+		<view class="pulu2 tp">
+			<image src="/static/index/warehouse/home/pu2.gif" mode="aspectFill"></image>
+		</view>
+		<view class="clikurlbox">
+			<view class="tp" :class="'itemact'+(index+1)" v-for="(item,index) in animArray" :key='index'
+				@click="housactive(index)">
+				<donghua :width="item.width" :height="item.height" :links="item.url" :playing="index == housedex" />
+			</view>
+		</view>
+		<view class="cardtm">
+			<view class="b" :class="{ 'actve':housedex == i}" v-for="(v,i) in ['采购','盘点','拣货','后勤','退货','监控室']"
+				@click="housactive(i)">
+				<text></text>{{v}}
+				<view class="tp">
+					<image src="/static/index/warehouse/home/z.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="contain-right-button" @click="goback()">
+			<image class="buttont-img" style="margin-top: 4rpx;" src="/static/index/purchaseorder/back.png" />
+			<view class="button-font">
+				返回
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue';
+
+	const paiziarray =
+		genPaths(
+			'/static/index/warehouse/newhome/',
+			'logo',
+			3,    // 张数
+			'png',
+			1,     // 起始索引为 1
+			false  // 不补零
+		)
+	const jiankongarray =
+		genPaths(
+			'/static/index/warehouse/newhome/',
+			'monitor',
+			4,    // 张数
+			'png',
+			0,     // 起始索引为 1
+			false  // 不补零
+		)
+	const wanjiearray =
+		genPaths(
+			'/static/index/warehouse/newhome/',
+			'end',
+			6,    // 张数
+			'png',
+			0,     // 起始索引为 1
+			false  // 不补零
+		)
+	const caigouarray = genPaths(
+			'/static/index/warehouse/newhome/',
+			'purchase',
+			4,    // 张数
+			'png',
+			0,     // 起始索引为 1
+			false  // 不补零
+		)	
+	const rukuarray = 	genPaths(
+			'/static/index/warehouse/newhome/',
+			'unit1-',
+			5,    // 张数
+			'png',
+			0,     // 起始索引为 1
+			false  // 不补零
+		)	
+	const jianhuoarray = genPaths(
+			'/static/index/warehouse/newhome/',
+			'Warehouse',
+			4,    // 张数
+			'png',
+			1,     // 起始索引为 1
+			false  // 不补零
+		)	
+	const playall = ref(false);
+	onMounted(() => {
+		playall.value = true
+	})
+
+	const housedex = ref(0);
+	const lastTap = ref(0)
+	const DOUBLE_TAP_DELAY = 300;
+	const setout = ref(null)
+	const navurl = ref('')
+	const housactive = (index : number) => {
+		console.log(index)
+		housedex.value = index;
+		const now = Date.now()
+		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
+			// 双击成立
+			clearTimeout(setout.value)
+			if (index == 1) {
+				navurl.value = 'pages/Warehouse/paymoney'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 0) {
+				navurl.value = 'pages/procurement/material'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 2) {
+				navurl.value = 'pages/Warehouse/picking'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+
+			if (index === 3) {
+				uni.navigateTo({
+					url: "/pages/watch/full"
+				})
+			}
+			if (index === 5) {
+				uni.navigateTo({
+					url: "/pages/watch/full"
+				})
+			}
+			if (index == 7) {
+				navurl.value = 'pages/procurement/outbound?code=0'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 8) {
+				navurl.value = 'pages/procurement/outbound?code=1'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			// 重置，避免多次触发
+			lastTap.value = 0
+		} else {
+			setout.value = setTimeout(() => {
+				// console.log("点击哪个了", index)
+			}, DOUBLE_TAP_DELAY)
+			// 记录本次时间，等待下次点击
+			lastTap.value = now
+		}
+
+	}
+
+
+	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 animArray = ref([
+		{
+			url: genPaths(
+				'/static/index/warehouse/home/',
+				'Procurement',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '22.3vw',
+			height: '13.6vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'inventory',
+				4,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '11vw',
+			height: '10vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'pick',
+				4,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '11vw',
+			height: '9vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit1-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit1-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit11-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+	])
+	const logoval = reactive({
+		url: genPaths(
+			'/static/index/warehouse/home',
+			'logo',
+			3,    // 张数
+			'png',
+			1,     // 起始索引为 1
+			false  // 不补零
+		)
+
+	})
+	const goback = () => {
+		console.log("?/////")
+		uni.navigateBack()
+	}
+	// 当前坐标（px）
+	const x = ref(50)
+	const y = ref(54)
+	// const x = ref(25)
+	// const y = ref(44)
+	// 默认过渡时长（s）
+	const duration = ref(0.7)
+	const easing = 'cubic-bezier(.22,.9,.32,1)' // 柔和的 easing
+	
+	// 样式绑定：translate3d + transition（GPU 加速）
+	const moverStyle = computed(() => {
+	  return {
+	    position: 'fixed',
+	    left: '0',
+	    top: '0',
+	    width: '7vw',       // 图片宽高按需改
+	    height: '7vw',
+	    transform: `translate3d(${x.value}vw, ${y.value}vw, 0)`,
+	    transition: `transform ${duration.value}s ${easing}`,
+	    willChange: 'transform'
+	  }
+	})
+	
+	// 调用函数：moveTo(pxX, pxY, seconds)
+	function moveTo(pxX, pxY, seconds = 0.6) {
+	  // 设置时长（秒），然后直接改坐标
+	  duration.value = seconds
+	  x.value = pxX
+	  y.value = pxY
+	}
+	const ceshi = () => {
+		moveTo(25,45,6)
+	}
+	const back = () => {
+		moveTo(50,54,1)
+	}
+</script>
+
+<style scoped lang="less">
+	// .clikurlbox {
+	// 	position: fixed;
+	// 	width: 100vw;
+	// 	height: 100vw;
+	// 	top: 0;
+	// 	left: 0;
+	// 	overflow: hidden;
+	// 	z-index: 61;
+
+	// 	.itemact1 {
+	// 		width: 22.3vw;
+	// 		height: 13.6vw;
+	// 		bottom: 9.8vw;
+	// 		left: 12.6vw;
+	// 		z-index: 31;
+	// 	}
+
+	// 	.itemact2 {
+	// 		width: 9vw;
+	// 		height: 9vw;
+	// 		top: 22.5vw;
+	// 		left: 16.5vw;
+	// 		z-index: 57;
+	// 	}
+
+	// 	.itemact3 {
+	// 		width: 11vw;
+	// 		height: 9vw;
+	// 		top: 37vw;
+	// 		left: 48vw;
+	// 		z-index: 55;
+	// 	}
+
+	// 	.itemact4 {
+	// 		width: 14.4vw;
+	// 		height: 13vw;
+	// 		top: 35vw;
+	// 		right: 4.4vw;
+	// 		z-index: 65;
+	// 	}
+
+	// 	.itemact5 {
+	// 		width: 14.4vw;
+	// 		height: 10vw;
+	// 		bottom: 3vw;
+	// 		right: 21vw;
+	// 		z-index: 65;
+	// 	}
+
+	// 	.itemact6 {
+	// 		width: 18.2vw;
+	// 		height: 12vw;
+	// 		top: 8vw;
+	// 		left: 12vw;
+	// 		z-index: 65;
+	// 	}
+
+	// 	view {
+	// 		position: fixed;
+	// 		z-index: 10;
+	// 	}
+	// }
+
+	// .cardtm {
+	// 	position: relative;
+	// 	z-index: 66;
+
+	// 	>view {
+	// 		position: fixed;
+	// 		min-width: 5vw;
+	// 		height: 2.7vw;
+	// 		border-radius: 1.35vw;
+	// 		box-shadow: 0rpx 0rpx 0.3vw 0rpx rgba(174, 174, 188, 0.4);
+	// 		z-index: 66;
+	// 		display: flex;
+	// 		align-items: center;
+	// 		padding: 0 1vw;
+	// 		white-space: nowrap;
+	// 		z-index: 70;
+
+	// 		&:nth-child(1) {
+	// 			bottom: 33.5vh;
+	// 			left: 20.5vw;
+	// 		}
+
+	// 		&:nth-child(2) {
+	// 			top: 28vw;
+	// 			left: 26.5vw;
+	// 		}
+
+	// 		&:nth-child(3) {
+	// 			bottom: 21vw;
+	// 			left: 55vw;
+	// 		}
+
+	// 		&:nth-child(4) {
+	// 			top: 35vw;
+	// 			right: 6.5vw;
+	// 		}
+
+	// 		&:nth-child(5) {
+	// 			bottom: 11.5vw;
+	// 			right: 23.5vw;
+	// 		}
+
+	// 		&:nth-child(6) {
+	// 			top: 6vw;
+	// 			left: 17vw;
+	// 		}
+
+	// 		text {
+	// 			width: 1vw;
+	// 			height: 1vw;
+	// 			border-radius: 50%;
+	// 			border: 1px solid rgba(0, 137, 254, 1);
+	// 			margin: 0 0.4vw 0 0;
+	// 		}
+
+	// 		view {
+	// 			width: 2.8vw;
+	// 			height: 4.4vw;
+	// 			position: absolute;
+	// 			top: 2vw;
+	// 			left: 30%;
+	// 		}
+	// 	}
+
+	// 	.actve {
+	// 		background: linear-gradient(-45deg, #0089FE, #97C1FF) !important;
+	// 		color: #fff !important;
+
+	// 		text {
+	// 			border: 1px solid #fff;
+	// 		}
+	// 	}
+
+	// 	.b {
+	// 		background: #EFF2F6;
+	// 	}
+	// }
+
+	// .pulu1 {
+	// 	width: 28.2vw;
+	// 	height: 9.8vw;
+	// 	position: fixed;
+	// 	top: 30vw;
+	// 	right: 9.2vw;
+	// 	z-index: 60;
+	// 	overflow: auto;
+
+	// 	image {
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 	}
+	// }
+
+	// .pulu2 {
+	// 	width: 16.8vw;
+	// 	height: 24vw;
+	// 	position: fixed;
+	// 	top: 30.7vw;
+	// 	right: 21.1vw;
+	// 	z-index: 60;
+
+	// 	image {
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 	}
+	// }
+
+	// .route {
+	// 	width: 99.5vw;
+	// 	height: 51.2vw;
+	// 	position: fixed;
+	// 	top: 4.5vw;
+	// 	left: 0.3vw;
+	// 	z-index: 2;
+
+	// 	image {
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 	}
+	// }
+
+	// .contitem {
+	// 	width: 48vw;
+	// 	height: 36vw;
+	// 	position: fixed;
+	// 	top: 5.3vw;
+	// 	left: 28.2vw;
+	// 	z-index: 50;
+	// }
+
+	// .hldy {
+	// 	position: fixed;
+	// 	left: 6.7vw;
+	// 	bottom: 3.7vw;
+
+	// }
+
+
+
+	// .tp {
+	// 	image {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 	}
+	// }
+
+	// .contain-right-button {
+	// 	position: fixed;
+	// 	top: 5vh;
+	// 	right: 2vw;
+	// 	width: 7.3vw;
+	// 	height: 3.3vw;
+	// 	background: #FFFFFF;
+	// 	border-radius: 1.65vw;
+	// 	border: 1px solid #D9DADC;
+	// 	font-weight: 400;
+	// 	font-size: 1.4vw;
+	// 	color: #222;
+	// 	display: flex;
+	// 	justify-content: center;
+	// 	align-items: center;
+	// 	margin: 0 0 0 0.7vw;
+	// 	color: #555555;
+	// 	z-index: 99;
+
+	// 	image {
+	// 		width: 1.5vw;
+	// 		height: 1.3vw;
+	// 		margin: 0 0.5vw 0 0;
+	// 	}
+
+	// }
+	.home {
+		// margin-top: 40rpx;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		position: fixed;
+		z-index: 0;
+		// background-color: red;
+
+		.all-home {
+			width: 100%;
+			height: 100% ;
+			
+		}
+	}
+
+	.tp {
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.paizi {
+		width: 18vw;
+		height: 18vw;
+		position: fixed;
+		bottom: 0.3vw;
+		left: 10vw;
+		// z-index: 50;
+	}
+
+	.jiankong {
+		width: 17vw;
+		height: 17vw;
+		position: fixed;
+		top: 1.5vw;
+		left: 12vw;
+		z-index: 50;
+	}
+
+	.wanjie {
+		width: 18vw;
+		height: 18vw;
+		position: fixed;
+		top: 19vw;
+		left: 12vw;
+		z-index: 50;
+	}
+	.pandan{
+		width: 9.3vw;
+		height: 9.3vw;
+		position: fixed;
+		top: 23vw;
+		left: 29vw;
+		z-index: 50;
+	}
+	.caigou{
+		width: 18vw;
+		height: 18vw;
+		position: fixed;
+		top: 34vw;
+		left: 37vw;
+		z-index: 50;
+	}
+	.ruku{
+		width: 11vw;
+		height: 11vw;
+		position: fixed;
+		bottom: 9vw;
+		right: 17vw;
+		z-index: 50;
+	}
+	.chuku{
+		width: 11vw;
+		height: 11vw;
+		position: fixed;
+		bottom: 20.5vw;
+		right: 2.5vw;
+		z-index: 50;
+	}
+	.return{
+		width: 7vw;
+		height: 7vw;
+		position: fixed;
+		bottom: 8.8vw;
+		right: 25vw;
+		z-index: 50;
+	}
+	.lead{
+		width: 7vw;
+		height: 7vw;
+		position: fixed;
+		bottom: 20vw;
+		right: 10vw;
+		z-index: 50;
+	}
+	.jianhuo{
+		width: 40vw;
+		height: 40vw;
+		position: fixed;
+		top: 0vw;
+		right:23vw;
+		z-index: 50;
+	}
+	.picking{
+		width: 12vw;
+		height: 12vw;
+		position: fixed;
+		top: 24vw;
+		right:27vw;
+		z-index: 50;
+	}
+</style>

pages/login/login.vue

@@ -191,7 +191,7 @@
 		return typeof str === 'string' && str.length === 11;
 	}
 	const jumpTo = (url : string) => {
-		uni.navigateTo({
+		uni.redirectTo({
 			url: url
 		});
 	}

pages/procurement/components/purorder.vue

@@ -4,7 +4,7 @@
 			<view class="lfitem">
 				<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop">
 					<view class="pls-card" v-for="(v,i) in generatedOrder" :key='i' @click="clickLeftMenu(i)"
-						:style="{borderColor: i==lefttarget? ``:`#fff`,marginTop:i==0?'2vw':'' }">
+						:style="{borderColor: i==lefttarget? ``:`#fff` }">
 						<view class="pls-card-title">
 							<view class="title-left">
 								{{v.cgdNo}}
@@ -97,12 +97,16 @@
 							</view> -->
 						</view>
 					</view>
+					<!-- 解决margin重叠的问题 -->
+					<view class="nomargin">
+						
+					</view>
 				</scroll-view>
 			</view>
 			<view class="rigitem">
 				<scroll-view scroll-y="true" class="crdcroll" scroll-with-animation enable-back-to-top @scroll="scroll"
 					:scroll-top="scrolltoplist">
-					<view style="height:2vw;"></view>
+					<!-- <view style="height:2vw;"></view> -->
 					<view class="fler" v-for="(v,index) in generatedOrder[lefttarget]?.cgdInfoList" :key="index">
 						<view class="speitem guodu">
 							<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
@@ -303,7 +307,8 @@
 
 			.crdcroll {
 				width: 100%;
-				height: calc(90vh - 7vw);
+				height: calc(90vh - 9.5vw);
+				margin-top: 1.5vw;
 			}
 
 			.actve {
@@ -487,12 +492,11 @@
 			}
 		}
 	}
-
-
-
 	.left-menu-scroll {
-		height: 100%;
+		height: 97%;
+		margin-top: 3%;
 		width: 100%;
+		// background-color: red;
 
 		.pls-card {
 			width: 30vw;
@@ -500,7 +504,10 @@
 			border: #0f9fff 3rpx solid;
 			background-color: #fff;
 			border-radius: 40rpx;
-			margin: 0 auto 1.2vw;
+			// margin: 0 auto 1.2vw auto;
+			margin: 0.6vw auto;
+			// margin-bottom: 1.2vw;
+			
 			padding: 0 30rpx;
 			position: relative;
 
@@ -589,8 +596,8 @@
 						}
 
 						.middle-ball {
-							width: 30rpx;
-							height: 30rpx;
+							width: 20rpx;
+							height: 20rpx;
 							background-color: #EEEEEE;
 							position: absolute;
 							top: 50%;
@@ -681,4 +688,7 @@
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+	.nomargin{
+		height: 0.6vw;
+	}
 </style>

pages/watch/index.vue

@@ -240,7 +240,11 @@
 	const cameraArray = ref([])
 	onLoad(() => {
 		cameraArray.value = cameraSmall;
-
+		// const info = uni.getSystemInfoSync()
+		// console.log('屏幕宽度：', info.screenWidth)
+		// console.log('屏幕高度：', info.screenHeight)
+		// console.log('可用窗口宽度：', info.windowWidth)
+		// console.log('可用窗口高度：', info.windowHeight)
 	})
 	const zyupgrade = ref(null);
 	const menuIndex = ref(-1);
@@ -706,7 +710,7 @@
 		uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
 		uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
 		uni.setStorageSync('NUall', filteredMenu.value[savetypeNow.value]);
-		console.log("??????1111", filteredMenu.value[savetypeNow.value])
+		// console.log("??????1111", filteredMenu.value[savetypeNow.value])
 		if (!typeNow.value) {
 			uni.navigateTo({
 				url: '/pages/NursingNew/index'