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

androidPrivacy.json

@@ -0,0 +1,38 @@
+{
+    "version" : "1.0.023",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message": "　　进入应用前，你需先同意<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
+    },
+    "styles" : {
+        "backgroundColor" : "#eff0f4",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "black"
+        },
+        "buttonAccept" : {
+            "color" : "black"
+        },
+        "buttonRefuse" : {
+            "color" : "black"
+        },
+        "buttonVisitor" : {
+            "color" : "black"
+        }
+    }
+}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.023",
-    "versionCode" : 10023,
+    "versionName" : "1.0.024",
+    "versionCode" : 10024,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -97,6 +97,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
             }
         },
         "nativePlugins" : {

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

@@ -389,8 +389,8 @@
 		.fler{
 			width: 27vw;
 			height: 13vw;
-			margin-bottom: 0.9vw;
-			margin-left: 0.5vw;
+			margin-bottom: 0.7vw;
+			margin-left: 0.7vw;
 			// background-color: #fff;
 			.carditem{
 				width: 27vw;

pages/login/login.vue

@@ -173,7 +173,7 @@
 		return form.password && isLength11(form.username)
 	})
 
-	const showPopup = ref(false)
+	const showPopup = ref(true)
 	function closebottom() {
 		openbottom.value = false;
 		isTarget.value = true;
@@ -183,6 +183,19 @@
 	function closePopup() {
 		showPopup.value = false;
 		uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion)
+		if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
+			showPopup.value = true;
+		}
+		if (uni.getStorageSync('token') && uni.getStorageSync('token') !== 1) {
+			if (loading.value === 2) {
+				setTimeout(() => {
+					gotoindex()
+				}, 500)
+			} else {
+				loading.value++
+			}
+		}
+		init();
 	}
 	function closeapp() {
 		plus.runtime.quit()
@@ -348,26 +361,14 @@
 			}
 		})
 	}
-	// 生命周期钩子
-	onLoad(() => {
-		if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
-			showPopup.value = true;
-		}
-		if (uni.getStorageSync('token') && uni.getStorageSync('token') !== 1) {
-			if (loading.value === 2) {
-				setTimeout(() => {
-					gotoindex()
-				}, 500)
-			} else {
-				loading.value++
-			}
-		}
-		init()
-	});
-	// 生命周期钩子
-	onShow(() => {
-		zyupgrade.value?.check_update();
-	});
+	// // 生命周期钩子
+	// onLoad(() => {
+		
+	// });
+	// // 生命周期钩子
+	// onShow(() => {
+		
+	// });
 
 	function init() {
 		var monitorModule = uni.requireNativePlugin("MonitorModule")

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

@@ -0,0 +1,38 @@
+{
+    "version" : "1.0.023",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message": "　　进入应用前，你需先同意<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
+    },
+    "styles" : {
+        "backgroundColor" : "#eff0f4",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "black"
+        },
+        "buttonAccept" : {
+            "color" : "black"
+        },
+        "buttonRefuse" : {
+            "color" : "black"
+        },
+        "buttonVisitor" : {
+            "color" : "black"
+        }
+    }
+}

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

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.023",
-    "code": 10023
+    "name": "1.0.024",
+    "code": 10024
   },
   "description": "护理单元",
   "developer": {
@@ -77,6 +77,9 @@
           }
         }
       },
+      "splashscreen": {
+        "useOriginalMsgbox": true
+      },
       "google": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",

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

@@ -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/androidPrivacy.json

@@ -0,0 +1,38 @@
+{
+    "version" : "1.0.023",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message": "　　进入应用前，你需先同意<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
+    },
+    "styles" : {
+        "backgroundColor" : "#eff0f4",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "black"
+        },
+        "buttonAccept" : {
+            "color" : "black"
+        },
+        "buttonRefuse" : {
+            "color" : "black"
+        },
+        "buttonVisitor" : {
+            "color" : "black"
+        }
+    }
+}

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.023","code":10023},"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.024","code":10024},"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"}