diff --git a/manifest.json b/manifest.json index caec9e2..b114458 100644 --- a/manifest.json +++ b/manifest.json @@ -88,6 +88,11 @@ "appid" : "wx432c2efe6df3b97a", "UniversalLinks" : "" } + }, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + } } }, "orientation" : [ "portrait-primary" ] @@ -127,6 +132,7 @@ "desc" : "演示定位能力" } }, + "requiredPrivateInfos" : [ "getLocation" ], "uniStatistics" : { "enable" : true } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..304f07b --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "hello-uniapp", + "version": "3.4.4", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "uview-ui": { + "version": "2.0.36", + "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz", + "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==" + } + } +} diff --git a/package.json b/package.json index 8c806f5..79a4d2e 100644 --- a/package.json +++ b/package.json @@ -9,18 +9,20 @@ }, "repository": "https://github.com/dcloudio/hello-uniapp.git", "keywords": [ - "hello-uniapp", - "uni-app", - "uni-ui", - "示例工程" - ], + "hello-uniapp", + "uni-app", + "uni-ui", + "示例工程" + ], "author": "", "license": "MIT", "bugs": { "url": "https://github.com/dcloudio/hello-uniapp/issues" }, "homepage": "https://github.com/dcloudio/hello-uniapp#readme", - "dependencies": {}, + "dependencies": { + "uview-ui": "^2.0.36" + }, "dcloudext": { "category": [ "前端页面模板", @@ -84,15 +86,14 @@ "快应用": { "华为": "y", "联盟": "y" - }, - "Vue": { - "vue2": "y", - "vue3": "y" - } + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } } } }, - "uni-app": { "scripts": { "mp-dingtalk": { diff --git a/pages.json b/pages.json index e7e1a72..0a10765 100644 --- a/pages.json +++ b/pages.json @@ -127,6 +127,22 @@ } } }, + { + "path": "pages/pages_zhentou/order/express", + "style": { + "navigationBarTitleText": "物流信息", + "app-plus": { + "titleNView": { + // "buttons": [{ + // "text": "\ue534", + // "fontSrc": "/static/uni.ttf", + // "fontSize": "22px", + // "color": "#FFFFFF" + // }] + } + } + } + }, { "path": "pages/pages_zhentou/contact/contact", "style": { @@ -143,7 +159,7 @@ } } } - ], + ], // "subPackages": [{ // "root": "pages/API", // "pages": [{ @@ -257,4 +273,4 @@ // } // ] // } -} +} \ No newline at end of file diff --git a/pages/pages_zhentou/myPage/address.vue b/pages/pages_zhentou/myPage/address.vue index c610089..2281ec3 100644 --- a/pages/pages_zhentou/myPage/address.vue +++ b/pages/pages_zhentou/myPage/address.vue @@ -29,7 +29,74 @@ -

添加新地址

+

添加新地址

+ + + + + + + 新增地址 + + + + + + + + + 收货人： + + + 张三 + + + + + 联系电话： + + + 15612345678 + + + + + 位置： + + + + + + {{province}} / {{city}} {{district ? '/' : ''}} {{district}} + + + 请选择地区 + + + + + + 详细地址： + + + 大港街道大港三路8号铁路住宅小区6号楼大港街道大港三路8号铁路住宅小区6号楼 + + + + + + + +

删除

+

保存

+ + + @@ -37,14 +104,25 @@ diff --git a/pages/pages_zhentou/order/express.vue b/pages/pages_zhentou/order/express.vue new file mode 100644 index 0000000..2e4c451 --- /dev/null +++ b/pages/pages_zhentou/order/express.vue @@ -0,0 +1,260 @@ + + + + + \ No newline at end of file diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue index 167e16f..d0ad5f9 100644 --- a/pages/pages_zhentou/order/order.vue +++ b/pages/pages_zhentou/order/order.vue @@ -85,6 +85,12 @@ this.loadMore(); }, methods: { + // 查看物流 + handleWuliu() { + uni.navigateTo({ + url: "/pages/pages_zhentou/order/express" + }) + }, loadMore() { if (this.hasMore) { this.current = this.current + 1; diff --git a/static/image/cancel.png b/static/image/cancel.png new file mode 100644 index 0000000..815a628 Binary files /dev/null and b/static/image/cancel.png differ diff --git a/static/image/position.png b/static/image/position.png new file mode 100644 index 0000000..78d31bd Binary files /dev/null and b/static/image/position.png differ diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md new file mode 100644 index 0000000..b1a824b --- /dev/null +++ b/uni_modules/uni-transition/changelog.md @@ -0,0 +1,20 @@ +## 1.3.1（2021-11-23） +- 修复 init 方法初始化问题 +## 1.3.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition) +## 1.2.1（2021-09-27） +- 修复 init 方法不生效的 Bug +## 1.2.0（2021-07-30） +- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.1（2021-05-12） +- 新增 示例地址 +- 修复 示例项目缺少组件的 Bug +## 1.1.0（2021-04-22） +- 新增 通过方法自定义动画 +- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式 +- 优化 动画触发逻辑，使动画更流畅 +- 优化 支持单独的动画类型 +- 优化 文档示例 +## 1.0.2（2021-02-05） +- 调整为 uni_modules 目录规范 diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js new file mode 100644 index 0000000..5f54365 --- /dev/null +++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js @@ -0,0 +1,128 @@ +// const defaultOption = { +// duration: 300, +// timingFunction: 'linear', +// delay: 0, +// transformOrigin: '50% 50% 0' +// } +// #ifdef APP-NVUE +const nvueAnimation = uni.requireNativePlugin('animation') +// #endif +class MPAnimation { + constructor(options, _this) { + this.options = options + this.animation = uni.createAnimation(options) + this.currentStepAnimates = {} + this.next = 0 + this.$ = _this + + } + + _nvuePushAnimates(type, args) { + let aniObj = this.currentStepAnimates[this.next] + let styles = {} + if (!aniObj) { + styles = { + styles: {}, + config: {} + } + } else { + styles = aniObj + } + if (animateTypes1.includes(type)) { + if (!styles.styles.transform) { + styles.styles.transform = '' + } + let unit = '' + if(type === 'rotate'){ + unit = 'deg' + } + styles.styles.transform += `${type}(${args+unit}) ` + } else { + styles.styles[type] = `${args}` + } + this.currentStepAnimates[this.next] = styles + } + _animateRun(styles = {}, config = {}) { + let ref = this.$.$refs['ani'].ref + if (!ref) return + return new Promise((resolve, reject) => { + nvueAnimation.transition(ref, { + styles, + ...config + }, res => { + resolve() + }) + }) + } + + _nvueNextAnimate(animates, step = 0, fn) { + let obj = animates[step] + if (obj) { + let { + styles, + config + } = obj + this._animateRun(styles, config).then(() => { + step += 1 + this._nvueNextAnimate(animates, step, fn) + }) + } else { + this.currentStepAnimates = {} + typeof fn === 'function' && fn() + this.isEnd = true + } + } + + step(config = {}) { + // #ifndef APP-NVUE + this.animation.step(config) + // #endif + // #ifdef APP-NVUE + this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config) + this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin + this.next++ + // #endif + return this + } + + run(fn) { + // #ifndef APP-NVUE + this.$.animationData = this.animation.export() + this.$.timer = setTimeout(() => { + typeof fn === 'function' && fn() + }, this.$.durationTime) + // #endif + // #ifdef APP-NVUE + this.isEnd = false + let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref + if(!ref) return + this._nvueNextAnimate(this.currentStepAnimates, 0, fn) + this.next = 0 + // #endif + } +} + + +const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d', + 'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY', + 'translateZ' +] +const animateTypes2 = ['opacity', 'backgroundColor'] +const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom'] +animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => { + MPAnimation.prototype[type] = function(...args) { + // #ifndef APP-NVUE + this.animation[type](...args) + // #endif + // #ifdef APP-NVUE + this._nvuePushAnimates(type, args) + // #endif + return this + } +}) + +export function createAnimation(option, _this) { + if(!_this) return + clearTimeout(_this.timer) + return new MPAnimation(option, _this) +} diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue new file mode 100644 index 0000000..0d739bd --- /dev/null +++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue @@ -0,0 +1,277 @@ + + + + + diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json new file mode 100644 index 0000000..d15fdf0 --- /dev/null +++ b/uni_modules/uni-transition/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-transition", + "displayName": "uni-transition 过渡动画", + "version": "1.3.1", + "description": "元素的简单过渡动画", + "keywords": [ + "uni-ui", + "uniui", + "动画", + "过渡", + "过渡动画" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md new file mode 100644 index 0000000..2f8a77e --- /dev/null +++ b/uni_modules/uni-transition/readme.md @@ -0,0 +1,11 @@ + + +## Transition 过渡动画 +> **组件名：uni-transition** +> 代码块： `uTransition` + + +元素过渡动画 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file