提交 43ffe06a 编写于 作者: Q qiang

chore: Merge branch 'next-nvue' into next

# Conflicts:
#	packages/uni-cli-nvue/package.json
#	pnpm-lock.yaml
{
"name": "@dcloudio/uni-cli-nvue",
"version": "3.0.0-alpha-3040320220324002",
"description": "uni-cli-nvue",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist",
"lib"
],
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-cli-nvue"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"license": "Apache-2.0",
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@babel/core": "^7.17.2",
"@babel/preset-env": "^7.16.5",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3040320220324002",
"@dcloudio/uni-shared": "3.0.0-alpha-3040320220324002",
"@vue/shared": "3.2.31",
"acorn": "^5.2.1",
"babel-loader": "^8.2.2",
"consolidate": "^0.15.1",
"css": "~2.2.1",
"cssesc": "^3.0.0",
"de-indent": "^1.0.2",
"escodegen": "^1.8.1",
"file-loader": "^6.2.0",
"hash-sum": "^2.0.0",
"he": "^1.1.0",
"indexes-of": "^1.0.1",
"less-loader": "^10.0.1",
"loader-utils": "^1.1.0",
"lru-cache": "^4.1.2",
"merge-source-map": "^1.1.0",
"module-alias": "^2.2.2",
"postcss": "^8.4.6",
"postcss-comment": "^2.0.0",
"postcss-import": "^14.0.2",
"postcss-loader": "^6.1.1",
"postcss-selector-parser": "^6.0.6",
"prettier": "^1.18.2",
"sass-loader": "^12.1.0",
"source-map": "^0.6.1",
"stylus-loader": "^6.1.0",
"terser-webpack-plugin": "^5.1.4",
"uniq": "^1.0.1",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0",
"vue-template-es2015-compiler": "^1.9.0",
"webpack": "^5.48.0",
"webpack-sources": "^3.1.2"
},
"devDependencies": {
"@types/loader-utils": "^2.0.3",
"@types/module-alias": "^2.0.1",
"@types/terser-webpack-plugin": "^5.0.4",
"@types/webpack-sources": "^2.1.1",
"vue-template-compiler": "^2.6.14"
}
}
......@@ -85,12 +85,14 @@ export default defineComponent({
}
}
const onScrollend = (event: {
contentOffset: { x: number; y: number }
detail: {
contentOffset: { x: number; y: number }
}
}) => {
if (Date.now() - scrollToElementTime < 340) {
return
}
const y = event.contentOffset.y
const y = event.detail.contentOffset.y
const _current = Math.round(y / indicatorHeight.value)
if (y % indicatorHeight.value) {
setCurrent(_current, true, true)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册