合并打包

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "local",
+            "customPlaygroundType" : "device",
             "playground" : "custom",
             "type" : "uni-app:app-android"
         }

pages/NursingNew/component/equipment.vue

@@ -655,7 +655,7 @@
 	}
 	function rollTo(target) {
 		let current = 0
-		const duration = 1000 // 滚动总时长：1秒
+		const duration = 500 // 滚动总时长：1秒
 		const steps = 60 // 每秒大约 60 帧
 		const interval = duration / steps
 		const step = target / steps

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

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

unpackage/dist/dev/app-plus/app-service.js

@@ -16264,7 +16264,7 @@ if (uni.restoreGlobal) {
       }
       function rollTo(target) {
         let current = 0;
-        const duration = 1e3;
+        const duration = 500;
         const steps = 60;
         const interval = duration / steps;
         const step = target / steps;

unpackage/dist/dev/app-plus/pages/camera.js

@@ -63,11 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
     }
   });
 
-<<<<<<< HEAD
   // ../../../../hldy_app/unpackage/dist/dev/.nvue/_plugin-vue_export-helper.js
-=======
-  // ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
->>>>>>> cf031622d443095c94b8a2081244ea84d77917d9
   var import_vue = __toESM(require_vue());
   function requireNativePlugin(name) {
     return weex.requireModule(name);
@@ -664,7 +660,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
       )
     ]);
   }
-  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
+  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
 
   // <stdin>
   var webview = plus.webview.currentWebview();