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

component/public/donghua.vue

@@ -1,3 +1,24 @@
+<!-- 使用示例 已经全局暴露直接用就行 注意！这个组件的性能不如用AE写的动画-->
+<!-- <donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true" :interval="120" /> -->
+<!-- 注意看参数是什么意思 -->
+<!-- 通用的生成函数 这个方法可以快速让你写出图片数组
+	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 leftArray = ref(genPaths(
+		'/static/index/newindex/leftmenu',地址
+		'',图片前缀
+		3,     // 一共加一起多少张图片
+		'png',	类型
+		0,     // 起始索引
+		false  // 不补零
+	)) -->
 <template>
 	<view>
 		<image :src="isError ? defaultImage : links[currentIndex]" :style="{ width: width, height: height }"
@@ -17,10 +38,12 @@
 
 	// 定义组件的 props
 	const props = defineProps({
+		// links是图片地址所组成的数组
 		links: {
 			type: Array,
 			default: () => []
 		},
+		// 长宽的值可以传任何类型
 		width: {
 			type: String,
 			default: '65rpx'
@@ -29,26 +52,32 @@
 			type: String,
 			default: '65rpx'
 		},
+		// 展示的动画中每一帧的图片类型
 		objectFit: {
 			type: String,
 			default: 'aspectFill'
 		},
+		// 动画如果加载失败，展示的图片
 		defaultImage: {
 			type: String,
 			default: ''
 		},
+		// 注意这是每一帧图片的间隔，这个值越小加载的越快
 		interval: {
 			type: Number,
 			default: 80
 		},
+		// 注意，因为这是监听的机制，所以默认转态必须是false，然后在mounted这类钩子或按钮变成true来播放
 		playing: {
 			type: Boolean,
 			default: false
 		},
+		// 展示是否停止、开启动画的按钮
 		showButton: {
 			type: Boolean,
 			default: false
 		},
+		// 重要：动画时候会不停的循环
 		loop: {
 			type: Boolean,
 			default: false

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -236,7 +236,7 @@
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				transition.value = false;
-				// console.log("????",transition.value)
+				firstgetqueryCgdList();
 				setTimeout(() => {
 					transition.value = true;
 				}, 50)
@@ -332,10 +332,12 @@
 	const firstgetqueryCgdList = () => {
 		queryQld(plzinfo).then((res : any) => {
 			transition.value = true;
+			console.log("kankan",plzinfo,res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
 			}
+			
 			cannomessage.value = false
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
@@ -422,7 +424,7 @@
 	const serverUrl = ref("")
 	onLoad(() => {
 		// console.log("查看",uni.getStorageSync('NUall'))
-		firstgetqueryCgdList();
+		
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
 		// getSelectList();
 	})

pages/procurement/purchaseorder.vue

@@ -72,7 +72,7 @@
 									{{   v?.cgdType=='9' ?v.zfTime?.slice(0,10).replace(/-/g, '.'):Number(v.status)<1?``:v.jhTime?.slice(0,10).replace(/-/g, '.') }}
 								</view>
 								<view class="middle-heng-father">
-									<image class="middle-ball-img" v-if="v?.cgdType=='9'" src="/static/index/requestform/iserror.png" />
+									<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;" v-if="v?.cgdType=='9'" src="/static/index/requestform/iserror.png" />
 									<view class="middle-ball" style="background-color: #1083F8;"
 										:style=" v?.cgdType=='9' ?{backgroundColor:`#FF5757`}:{}"
 										v-else-if="Number(v.status)<2"></view>

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

@@ -574,7 +574,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_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

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

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