From 75f8513f4b904d2f1b7d5378381dd275f67b9f3c Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 7 Jan 2026 17:14:33 +0800
Subject: [PATCH] tj

---
 manifest.json                                 | 281 +++++++++---------
 pages/NursingNew/component/index.vue          |  48 ++-
 .../component/leftcontent/leftcontent.vue     |   5 +-
 pages/Warehouse/index/component/index.vue     | 194 +++++++++++-
 pages/watch/settings/api.js                   |  10 +-
 pages/watch/settings/settings.vue             | 156 +++++++++-
 static/index/card/zanw.png                    | Bin 0 -> 3814 bytes
 7 files changed, 529 insertions(+), 165 deletions(-)
 create mode 100644 static/index/card/zanw.png

diff --git a/manifest.json b/manifest.json
index f46461b..98ef1f7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,143 +1,142 @@
 {
-	"name": "护理单元",
-	"appid": "__UNI__FB2D473",
-	"description": "护理单元",
-	"versionName": "1.0.021",
-	"versionCode": 10021,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		
-		"screenOrientation": [
-			// "portrait-primary", // 竖屏
-			"landscape-primary", // 横屏（home 键在右侧）
-			"landscape-secondary" // 横屏（home 键在左侧）
-		],
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Share": {},
-			"VideoPlayer": {},
-			"Camera": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"minSdkVersion": 22
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"share": {
-					"weixin": {
-						"appid": "wxda748470da82886e",
-						"UniversalLinks": ""
-					}
-				},
-				"allowOldSDK": true
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		},
-		"nativePlugins": {
-			"MonitorModule": {
-				"__plugin_info__": {
-					"name": "MonitorModule",
-					"description": "bugly升级",
-					"platforms": "Android",
-					"url": "",
-					"android_package_name": "",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx8fc3e4305d2fbf0b",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "3"
+    "name" : "护理单元",
+    "appid" : "__UNI__FB2D473",
+    "description" : "护理单元",
+    "versionName" : "1.0.022",
+    "versionCode" : 10022,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "screenOrientation" : [
+            // "portrait-primary", // 竖屏
+            "landscape-primary", // 横屏（home 键在右侧）
+            "landscape-secondary" // 横屏（home 键在左侧）
+        ],
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Share" : {},
+            "VideoPlayer" : {},
+            "Camera" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "minSdkVersion" : 22
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxda748470da82886e",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "allowOldSDK" : true
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "MonitorModule" : {
+                "__plugin_info__" : {
+                    "name" : "MonitorModule",
+                    "description" : "bugly升级",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx8fc3e4305d2fbf0b",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3"
 }
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index c031f1b..ac51c3c 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -291,6 +291,7 @@
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
+								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="emotionTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 						<view class="carfd" v-if="zzbqshow">
@@ -303,6 +304,7 @@
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
+								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="bodyTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 					</view>
@@ -483,19 +485,30 @@
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
 		nuId:uni.getStorageSync('nuId')
+		
 	})
 	const plsbuy = ref([])
-	const firstgetqueryCgdList = () => {
+	const firstgetqueryCgdList = (nuId) => {
+		form.nuId = nuId;
+		console.log(form)
 		queryOrderList(form).then(res => {
-			plsbuy.value.push(...res.result.records);
-			if(form.pageNo==1){
-				clickLeftMenu(0,plsbuy.value[0])
+			console.log(res)
+			// plsbuy.value.push(...res.result.records);
+			if(res.result.records.length>0){
+				clickLeftMenu(0,res.result.records[0])
+			}else{
+				indexmessage.value = [];
 			}
 		})
 	}
 	const clickLeftMenu = (index : any, item : object) => {
 		queryOrderInfoList({ mainId: item.id }).then(res => {
-			indexmessage.value = res.result[0]
+			console.log(res)
+			if(res.result.length>0){
+				indexmessage.value = res.result[0]
+			}else{
+				indexmessage.value = [];
+			}
 		})
 	}
 	const open = ref(0)
@@ -704,7 +717,8 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
-		getgif();
+		console.log(data.nuId)
+		firstgetqueryCgdList(data.nuId);
 		emit('swip')
 	}
 	const tagarray = ["市医保", "半失能", "正常计费"]
@@ -737,15 +751,17 @@
 		})
 	}
 	const end = (v)=>{
-		if(v.izStart!='Y'&& v.izFinish!='N'){return}
-		endOrder({id:v.directiveId}).then(res=>{
+		console.log(v)
+		if(v.izStart=='Y'&& v.izFinish=='N'){
+			endOrder({id:v.id}).then(res=>{
+				console.log(res)
 			if(res.success){
-				v.izStart = "N";
-				v.izFinish = "Y";
+				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			}else{
 				
 			}
-		})
+		})}
+		
 	}
 	// 通用的生成函数
 	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
@@ -898,11 +914,11 @@
 			workType: 5
 		}
 		console.log("看看图",data)
-		queryWorkOrderList(data).then((res : any) => {
-			console.log("看看图",res)
-			indexmessage.value = res.result.records[0]; 
-			console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
-		})
+		// queryWorkOrderList(data).then((res : any) => {
+		// 	console.log("看看图",res)
+		// 	indexmessage.value = res.result.records[0]; 
+		// 	console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
+		// })
 	}
 	const lanjie = ref(false);
 	const gotolook = () => {
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index db4bab5..b745d12 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -15,7 +15,7 @@
 			</scroll-view>
 			<view class="logo">
 				<view class="tp">
-					<image src="/static/shouye/xd.png" mode="aspectFill"></image>
+					<image :src="userInfo.avatar?serverUrl+'/sys/common/static/'+userInfo.avatar:'/static/shouye/xd.png'" mode="aspectFill"></image>
 				</view>
 				<text>{{uni.getStorageSync('realname')}}</text>
 			</view>
@@ -33,6 +33,8 @@
 			type:String
 		}
 	});
+	const serverUrl = ref(uni.getStorageSync('serverUrl'))
+	const userInfo = uni.getStorageSync('userInfo');
 	const emit = defineEmits(['navurl'])
 	const dexleft = ref(0);
 	
@@ -129,6 +131,7 @@
 	.tp image{
 		width: 100%;
 		height: 100%;
+		border-radius: 50%;
 	}
 	.guodu {
 		transition: .4s;
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index b4f1793..ec6bffe 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -26,7 +26,7 @@
 				</view>
 			</view>
 
-			<view class="title-card-right">
+			<view class="title-card-right"  @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
 						65
@@ -42,7 +42,36 @@
 						即时
 					</view>
 				</view>
+				<view class="bianj" v-if="jszlshow">
+					<image src="/static/index/card/bj.png" mode="aspectFill"></image>
+				</view>
+				<view class="jszl guodu" @click.stop  :class="jszlshow?'':'jsh0'" >
+					<view class="tittop">
+						<view></view>
+						即时服务指令
+					</view>
+					<view class="spiw">
+						<view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view> 
+					</view>
+					<scroll-view class="scrol" scroll-y="true">
+						<view v-for="(v,i) in 1" :key='i' :class="i==2?'act':''" class="cdk">
+							<image src="/static/qr.png" mode="aspectFill"></image>
+							<text>{{v}}</text>
+						</view>
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
+							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
+								暂无服务指令
+							</view>
+						</view>
+					</scroll-view>
+					<view class="submit" >
+						<view @click.stop="jszlshow = false">取消</view>
+						<view @click="subitshowing">确定</view>
+					</view>
+				</view>
 			</view>
+			<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
 		</view>
 		<view class="photo-father">
 			<!--  :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}" -->
@@ -248,7 +277,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-
+	const jszlshow = ref(false)
 	const props = defineProps({
 		isShow: {
 			type: Boolean,
@@ -718,6 +747,7 @@
 		padding: 1.6vw;
 		margin-right: 1.5vw;
 		border: 2rpx solid #D2DFF0;
+		z-index: 99;
 	}
 	.pao-father {
 		position: absolute;
@@ -911,7 +941,6 @@
 			display: flex;
 			justify-content: space-between;
 			position: relative;
-
 			.card-top-left {
 				font-size: 1.8vw;
 				font-weight: 600;
@@ -1161,4 +1190,163 @@
 		height: 500rpx;
 		z-index: 10;
 	}
+	
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+	.jsh0{
+		height: 0vw !important;
+		padding: 0 2vw !important;
+		top: 9.4vw !important;
+	}
+	.jszl{
+		width: 64.5vw;
+		height: 44vw;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		border-radius: 2.2vw;
+		position: absolute;
+		top: 11vw;
+		right: 0;
+		z-index: 200;
+		padding: 2vw;
+		overflow: hidden;
+		.submit{
+			width: 100%;
+			height: 3.2vw;
+			margin-top: 0.4vw;
+			padding-right: 2vw;
+			display: flex;
+			justify-content: flex-end;
+			view{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&:nth-child(1){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: #F8F8F8;
+					border-radius: 1.6vw;
+					border: 1px solid #E5E5E5;
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #555555;
+				}
+				&:nth-child(2){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+					border-radius: 1.6vw;
+					border: 1px solid rgba(3,133,250,0.34);
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #1083F8;
+					margin-left: 0.7vw;
+				}
+			}
+		}
+		.scrol{
+			width: 110%;
+			height: 30vw;
+			display: flex;
+			flex-wrap: wrap;
+			
+			.cdk{
+				width: 6.1vw;
+				height: 6.1vw;
+				background: #F8F8F8;
+				border-radius: 1.6vw;
+				margin: 1.5vw 1.5vw 0 0vw;
+				display: inline-block;
+				border: 1px solid #F8F8F8;
+				text-align: center;
+				image{
+					width: 2vw;
+					height: 2vw;
+					margin: 1.4vw auto 0vw;
+				}
+				text{
+					display: block;
+					text-align: center;
+					font-weight: 400;
+					font-size: 1.1vw;
+					color: #333333;
+					width: 100%;
+				}
+			}
+			.act{
+				background: #F2F8FF;
+				border: 1px solid rgba(1,125,233,0.43);
+				text{
+					color: #017DE9;
+				}
+			}
+		}
+		.spiw{
+			width: 14vw;
+			height: 2vw;
+			display: flex;
+			margin-top: 2.5vw;
+			padding-left: 1.5vw;
+			view{
+				font-weight: 400;
+				font-size: 1.3vw;
+				color: #555555;
+				position: relative;
+				line-height: 1.5vw;
+			}
+			.act{
+				color: #222222 !important;
+				font-weight: 500;
+			}
+			.act::after{
+				width: 50%;
+				height: 0.2vw;
+				background: #0089FE;
+				border-radius: 0.1vw;
+				content: '';
+				position: absolute;
+				bottom: 0;
+				left: 25%;
+			}
+		}
+		.tittop{
+			height: 2vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			view{
+				width: 0.4vw;
+				height: 1.2vw;
+				background: #017DE9;
+				border-radius: 0.2vw;
+				margin-right: 0.8vw;
+			}
+		}
+	}
+	.bianj{
+		position: absolute;
+		width: 2.2vw;
+		height: 1.1vw;
+		top: 9.68vw;
+		right: 2.5vw;
+		z-index: 220;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+		background: RGBA(239, 240, 244, 0.55);
+	}
 </style>
\ No newline at end of file
diff --git a/pages/watch/settings/api.js b/pages/watch/settings/api.js
index a9094d2..7c82f37 100644
--- a/pages/watch/settings/api.js
+++ b/pages/watch/settings/api.js
@@ -23,4 +23,12 @@ export const updateBaseInfo = (params) => {
 		method: 'post',
 		data: params,
 	})
-}
\ No newline at end of file
+}
+// 改头像
+export const userEdit = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/userEdit`,
+		method: 'post',
+		data: params,
+	})
+}
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index c8df7aa..93dae26 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -30,6 +30,17 @@
 					<image class="right-icon" :src="`/static/index/settings/00.png`" />
 				</view>
 			</view>
+			<view  class="item" @click="jumpToTarget(8)">
+				<view class="left-item">
+					<image class="left-icon" :src="`/static/index/settings/6.png`" />
+					<view class="left-font">
+						修改头像
+					</view>
+				</view>
+				<view class="right-item">
+					<image class="right-icon" :src="`/static/index/settings/00.png`" />
+				</view>
+			</view>
 		</view>
 		<view class="array-father">
 			<view v-for="(item,index) in iconsArray.slice(5,8)" :key="index" class="item"
@@ -69,7 +80,17 @@
 				<oneseven v-if="opentype" />
 			</view>
 		</view>
-
+		
+		<view class="avator guodu" :style="avator?'opacity: 1':'opacity: 0;z-index: -1'">
+			<text>点击头像更换</text>
+			<view class="avatorimg" @click="uplod" >
+				<image :src="userInfo.avatar?(userInfo.flag?userInfo.avatar : serverUrl+'/sys/common/static/'+userInfo.avatar):'/static/shouye/xd.png'" mode="aspectFill"></image>
+			</view>
+			<view class="butft" @click="sxdupld(userInfo.avatar)">
+				确定
+			</view>
+		</view>
+		<view class="mengban" v-if="avator" @click="huanyuan"></view>
 	</view>
 	<view class="bg-mask" v-if="selectserve">
 		<view @click.stop class="white-select">
@@ -96,7 +117,7 @@
 	import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
 	import oneseven from '@/pages/login/oneseven.vue'
 	import twoseven from '@/pages/login/twoseven.vue'
-
+	import {userEdit} from './api.js'
 	const zyupgrade = ref(null);
 	const issay = ref(false)
 	const openany = ref(false);
@@ -111,7 +132,70 @@
 	const uuid = ref("")
 	const selectserve = ref(false)
 	const allserve = ref(uni.getStorageSync('orgList'))
-
+	const userInfo = ref(uni.getStorageSync('userInfo'));
+	const avator = ref(false); 
+	const uplod = ()=>{
+		uni.chooseImage({
+			count: 1, //默认9
+			sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['camera','album'], //从相册选择
+			success: (e) => {
+				let ar = JSON.stringify(e.tempFilePaths)
+				uni.compressImage({
+					src: JSON.parse(ar)[0],
+					quality: 80,
+					success: res => {
+						// sxdupld(res.tempFilePath)
+						userInfo.value.flag = true;
+						userInfo.value.avatar = res.tempFilePath;
+						// v.picPatharr.push(res.tempFilePath);
+						// console.log(v.picPatharr)
+					}
+				})
+			}
+		});
+	}
+	const sxdupld = (e) => { 
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			fileType: 'image',
+			formData: {
+				biz: '/touxiangPath'
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data);
+				console.log(data)
+				userInfo.value.avatar = data.message;
+				userInfo.value.flag = false;
+				avaxg();
+			},
+			fail: () => {
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	const huanyuan = ()=>{
+		avator.value = false;
+		userInfo.value = uni.getStorageSync('userInfo');
+	}
+	const avaxg = () =>{
+		userEdit({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
+			console.log(res)
+			if(res.success){
+				uni.setStorageSync('userInfo', userInfo.value);
+				uni.showToast({
+					icon:'success',
+					title:"更新成功！"
+				})
+				avator.value = false;
+			}
+		})
+	}
 	const changeServe = (item:any) => {
 		uni.setStorageSync('serverUrl', item.serverUrl);
 		uni.setStorageSync('orgListName', item.departName);
@@ -195,6 +279,12 @@
 					animation.value = true;
 				}, 50)
 				break
+			case 8:
+			userInfo.value.flag = false;
+			serverUrl.value = uni.getStorageSync('serverUrl')
+			avator.value = true;
+			console.log(userInfo.value)
+			break
 		}
 	}
 
@@ -214,6 +304,66 @@
 </script>
 
 <style scoped lang="less">
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+	.avator{
+		position: fixed;
+		width: 750rpx;
+		height: 700rpx;
+		border-radius: 30rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		z-index: 1;
+		padding: 0 10%;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		margin: auto;
+		z-index: 20;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		text{
+			margin-top: 100rpx;
+		}
+		.butft {
+			width: 8.5vw;
+			height: 3.3vw;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 1.2vw;
+			border: 1rpx solid #5AAEFF;
+			color: #249BFA;
+			margin-left: 1vw;
+			background: linear-gradient(to bottom, #fff, #D1EAFF);
+			margin-top: 45rpx;
+		}
+		.avatorimg{
+			width: 300rpx;
+			height: 300rpx;
+			margin: 30rpx auto 0;
+			border-radius: 50%;
+			overflow: hidden;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.mengban{
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+	}
 	.index-content-other {
 		width: 100%;
 		// height: 100%;
diff --git a/static/index/card/zanw.png b/static/index/card/zanw.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c8eb8091d78f7b3d1bb6794924953dd909c3488
GIT binary patch
literal 3814
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

literal 0
HcmV?d00001