@tarojs/taro-h5 3.5.0 → 3.5.1-aplha.0

package/dist/index.esm.js

@@ -1022,7 +1022,7 @@ const canvasToTempFilePath = ({ canvasId, fileType, quality, success, fail, comp
     const el = findDOM(inst);
     const canvas = el === null || el === void 0 ? void 0 : el.querySelector(`canvas[canvas-id="${canvasId}"]`);
     try {
-        const dataURL = canvas === null || canvas === void 0 ? void 0 : canvas.toDataURL(`image/${fileType || 'png'}`, quality);
+        const dataURL = canvas === null || canvas === void 0 ? void 0 : canvas.toDataURL(`image/${(fileType === 'jpg' ? 'jpeg' : fileType) || 'png'}`, quality);
         return handle.success({
             tempFilePath: dataURL
         });
@@ -4510,7 +4510,7 @@ const FRAME_DURATION = 17;
 /**
  * 将页面滚动到目标位置
  */
-const pageScrollTo = ({ scrollTop, selector = '', duration = 300, success, fail, complete }) => {
+const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300, success, fail, complete }) => {
     let scrollFunc;
     const handle = new MethodHandler({ name: 'pageScrollTo', success, fail, complete });
     return new Promise((resolve, reject) => {
@@ -4553,12 +4553,12 @@ const pageScrollTo = ({ scrollTop, selector = '', duration = 300, success, fail,
             }
             const from = scrollFunc();
             let to;
-            if (typeof scrollTop === 'number') {
-                to = scrollTop;
+            if (selector) {
+                const el = document.querySelector(selector);
+                to = ((el === null || el === void 0 ? void 0 : el.offsetTop) || 0) + offsetTop;
             }
             else {
-                const el = document.querySelector(selector);
-                to = (el === null || el === void 0 ? void 0 : el.offsetTop) || 0;
+                to = typeof scrollTop === 'number' ? scrollTop : 0;
             }
             const delta = to - from;
             const frameCnt = duration / FRAME_DURATION;