改冲突
This commit is contained in:
parent
da2301dbd9
commit
3e4b60aef7
|
|
@ -221,6 +221,7 @@
|
||||||
function onScroll(e : any) {
|
function onScroll(e : any) {
|
||||||
savescrollleft.value = e?.detail?.scrollLeft ?? 0
|
savescrollleft.value = e?.detail?.scrollLeft ?? 0
|
||||||
}
|
}
|
||||||
|
const scrollleft = ref(0)
|
||||||
const canmove = (e : any) => {
|
const canmove = (e : any) => {
|
||||||
const moveX = e.touches[0].clientX
|
const moveX = e.touches[0].clientX
|
||||||
const diff = moveX - startX.value
|
const diff = moveX - startX.value
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
export {
|
||||||
camera as default
|
camera as default
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
export {
|
||||||
fullcamera as default
|
fullcamera as default
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue