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

manifest.json

@@ -143,3 +143,7 @@
     },
     "vueVersion" : "3"
 }
+/* 5+App特有相关 */// "portrait-primary", // 竖屏
+// 横屏（home 键在右侧）
+// 横屏（home 键在左侧）
+

pages/NursingNew/index.vue

@@ -40,8 +40,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(222, 227, 240, 0.8)`}:{}" v-if="!startmoveit&&whoisit">
-			<image class="delete-img" src="/static/index/trash.png" />
+		<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}" v-if="!startmoveit&&whoisit">
+			<image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" />
 		</view>
 		<!-- 左侧菜单 -->
 		<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
@@ -382,7 +382,7 @@
 
 	function handsend(look : any) {
 		isblue.value = 0;
-		console.log("look",look)
+		// console.log("look",look)
 		if (look.levle) {
 			whoisit.value = 0;
 			movelook.value.url = uni.getStorageSync('imagebase') + look.immediateFileFocus;
@@ -495,12 +495,13 @@
 	}
 	const getxy = throttle(getxyrel, 40);
 	const cleanall = (event) => {
-		if (whoisit.value) {
-			detectorEnd(); // ← 替换原来的 handmove([a,b])
-		}
-		handmove([-200, -200])
-		startmoveit.value = true;
-		// isblue.value = 0
+		setTimeout(()=>{
+			if (whoisit.value) {
+				detectorEnd(); // ← 替换原来的 handmove([a,b])
+			}
+			handmove([-200, -200])
+			startmoveit.value = true;
+		},100)
 	}
 	// 切割bigArray
 	function splitString(str) {
@@ -779,7 +780,7 @@
 		height: 1100rpx;
 		border-radius: 50%;
 		background-color: rgba(238, 240, 248, 0.4);
-		z-index: 200;
+		z-index: 150;
 
 		.delete-img {
 			position: absolute;

pages/login/newanimationpage.vue

@@ -42,7 +42,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="fontroom-font" @click="ceshiopen=true">
+		<view class="fontroom-font" @click="ceshiopen=true;ceshijump()">
 			服务大厅
 			<view class="font-ball">
 				<view class="ball-ball">
@@ -129,9 +129,9 @@
 	onBackPress(() => {
 		return true; // 禁止返回手势返回
 	})
-	
+
 	const ceshiopen = ref(false);
-	
+
 	const playall = ref(false);
 	const zyupgrade = ref(null);
 	const leftMenuArray = ref([])
@@ -377,6 +377,24 @@
 			return `${base}/${prefix}${idx}.${ext}`
 		})
 	}
+
+	const ceshijump = () => {
+		// try {
+		// 	const Intent = plus.android.importClass('android.content.Intent')
+		// 	const Uri = plus.android.importClass('android.net.Uri')
+		// 	const main = plus.android.runtimeMainActivity()
+
+		// 	const intent = new Intent(Intent.ACTION_VIEW)
+		// 	intent.setData(Uri.parse('mimarket://details?id=com.android.hldy'))
+		// 	// 强制使用小米应用商店
+		// 	intent.setPackage('com.xiaomi.market')
+
+		// 	main.startActivity(intent)
+		// } catch (e) {
+		// 	// 小米商店不存在 or 被禁用
+		// 	console.log('打开小米应用商店失败', e)
+		// }
+	}
 </script>
 
 <style scoped lang="less">

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.029",
-    "code": 10029
+    "name": "1.0.030",
+    "code": 10030
   },
   "description": "护理单元",
   "developer": {

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

@@ -570,7 +570,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

@@ -578,7 +578,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
 };

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.029","code":10029},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.030","code":10030},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}