diff --git a/src/pages.json b/src/pages.json index 9e3fbab..0a838d9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -12,7 +12,8 @@ "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, - "navigationStyle": "custom" + "navigationStyle": "custom", + "disableScroll": true } }, diff --git a/src/pages/IMB/IMB.vue b/src/pages/IMB/IMB.vue index 4de20ac..e92d1eb 100644 --- a/src/pages/IMB/IMB.vue +++ b/src/pages/IMB/IMB.vue @@ -1,82 +1,464 @@ - + \ No newline at end of file diff --git a/src/pages/IMB/hook/userData.ts b/src/pages/IMB/hook/userData.ts new file mode 100644 index 0000000..9d1cd1c --- /dev/null +++ b/src/pages/IMB/hook/userData.ts @@ -0,0 +1,26 @@ +import { ref, onMounted, shallowRef, watchEffect, watch } from 'vue'; + + +export function userData() { + const popup = ref(null) + const carPosition = ref({ + longitude: 116.307503, + latitude: 39.984104 + }) + const maker = ref([{ + id: 0, + longitude: 116.307503, + latitude: 39.984104, + iconPath: 'https://rzyx-tycm.bj.bcebos.com/moto/map_pic.png', + width: 122, + height: 122 + }]) + function openPopup(el : any) { + el.open('center') + } + return { + openPopup, + carPosition, + maker + } +} \ No newline at end of file diff --git a/src/pages/circle/components/discover.vue b/src/pages/circle/components/discover.vue index 2e0e3b1..21ee42c 100644 --- a/src/pages/circle/components/discover.vue +++ b/src/pages/circle/components/discover.vue @@ -10,7 +10,7 @@ + refresher-background="#F8F8FA"> @@ -119,7 +119,8 @@ const { handPreviewImage, eventsItem, - goBack + goBack, + selectNav } = userData() interface Props { resource : string[] diff --git a/src/static/common/giveGifts.png b/src/static/common/giveGifts.png deleted file mode 100644 index 0534256..0000000 Binary files a/src/static/common/giveGifts.png and /dev/null differ diff --git a/src/static/common/home_che_icon_more.png b/src/static/common/home_che_icon_more.png new file mode 100644 index 0000000..5c20fd0 Binary files /dev/null and b/src/static/common/home_che_icon_more.png differ diff --git a/src/static/common/home_top_pic.png b/src/static/common/home_top_pic.png new file mode 100644 index 0000000..c7b1b2b Binary files /dev/null and b/src/static/common/home_top_pic.png differ diff --git a/src/static/common/icon_tool_09.png b/src/static/common/icon_tool_09.png new file mode 100644 index 0000000..0a1c1c0 Binary files /dev/null and b/src/static/common/icon_tool_09.png differ diff --git a/src/static/common/review.png b/src/static/common/review.png deleted file mode 100644 index 42ac5c2..0000000 Binary files a/src/static/common/review.png and /dev/null differ diff --git a/src/static/imb/carFind.png b/src/static/imb/carFind.png new file mode 100644 index 0000000..45ca23b Binary files /dev/null and b/src/static/imb/carFind.png differ diff --git a/src/static/imb/share.png b/src/static/imb/share.png new file mode 100644 index 0000000..f04c58d Binary files /dev/null and b/src/static/imb/share.png differ diff --git a/src/static/imb/vip-popup-bg.png b/src/static/imb/vip-popup-bg.png new file mode 100644 index 0000000..961c44e Binary files /dev/null and b/src/static/imb/vip-popup-bg.png differ diff --git a/src/static/imb/vip1.png b/src/static/imb/vip1.png new file mode 100644 index 0000000..3e49972 Binary files /dev/null and b/src/static/imb/vip1.png differ diff --git a/src/static/imb/vip2.png b/src/static/imb/vip2.png new file mode 100644 index 0000000..dab4b91 Binary files /dev/null and b/src/static/imb/vip2.png differ diff --git a/src/static/imb/vip3.png b/src/static/imb/vip3.png new file mode 100644 index 0000000..d338051 Binary files /dev/null and b/src/static/imb/vip3.png differ diff --git a/src/static/imb/vip4.png b/src/static/imb/vip4.png new file mode 100644 index 0000000..8a6b49d Binary files /dev/null and b/src/static/imb/vip4.png differ diff --git a/src/static/imb/vip5.png b/src/static/imb/vip5.png new file mode 100644 index 0000000..3438888 Binary files /dev/null and b/src/static/imb/vip5.png differ diff --git a/src/static/imb/vip6.png b/src/static/imb/vip6.png new file mode 100644 index 0000000..22bd590 Binary files /dev/null and b/src/static/imb/vip6.png differ diff --git a/src/static/imb/vip7.png b/src/static/imb/vip7.png new file mode 100644 index 0000000..a56310a Binary files /dev/null and b/src/static/imb/vip7.png differ diff --git a/src/static/imb/vip8.png b/src/static/imb/vip8.png new file mode 100644 index 0000000..217a8b7 Binary files /dev/null and b/src/static/imb/vip8.png differ diff --git a/src/uni_modules/ww-bottom-drawer/changelog.md b/src/uni_modules/ww-bottom-drawer/changelog.md new file mode 100644 index 0000000..b61a960 --- /dev/null +++ b/src/uni_modules/ww-bottom-drawer/changelog.md @@ -0,0 +1,26 @@ +## 1.7.1(2022-07-01) +新加个属性 :proportionMiniShow 不能再下滑的内容比例,默认是0,使用见demo,满足用户反馈需求 +## 1.7(2022-05-27) +用户反馈nvue的动画时间无效问题修复 +## 1.6.3(2022-05-25) +修订版本:预设高度的时候提前,上个反馈中不同环境渲染速度不同,速度逻辑优化。提供menuHeight 单位px 见:demo ,主要是针对用户的闪的优化提供新的字段 +## 1.6.2(2022-05-24) +提供外层解决初始收缩时的看到展-收的过程。修订版本:1.开放initTop方法,组件300ms调用,外层可以根据自己的渲染速度提前调用;2.或者给菜单根节点固定高度,外层不用处理,见demo。 用户反馈的需求,建议用第2种,自己根据内容计算好菜单高度预设下。见demo的app-expand.vue +## 1.6.1(2022-05-18) +专门针对支付宝小程序:添加canDrag,其他的小程序使用同样有效果。底部抽屉是否能够滑动,默认true 。见demo的使用 +## 1.6(2022-05-18) +支付宝支持。之前提供的app-expand.vue页面的长抽屉的滑动思路,我用新版的hbuilder测试了下发现scroll-y="false" scroll-y="true"都是无效的,在等hbuilder官方回应。针对菜单里面有scroll-view的我得到通知后回复 +## 1.5(2022-05-18) +兼容支付宝小程序的map滑动不顺畅的问题 +## 1.4(2022-05-16) +1.transitionShow换成transitionTime,完成剩下的展开收缩时间,单位s +2.dragLength 手指滑动,收缩或者展开需要滑动的最短距离px +3.isExpand 外部可以修改值对菜单收缩或者展开 +## 1.3(2022-05-13) +根据使用反馈情况,添加收缩展开菜单的时间属性 : transitionShow。见demo +## 1.2(2022-05-09) +1.ww-bottom-drawerapp添加isExpand的属性,可以控制初始的时候不收缩。 +2.针对反馈的内容过长怎么使用菜单,demo提供个app-expand.vue可以参考思路。 +## 1.1(2022-04-19) +1.新增一个app插件,专门给原生app使用,解决uni的原生map遮挡。见demo +2.vue开发的话可以使用原始组件,通用。 diff --git a/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawer/ww-bottom-drawer.vue b/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawer/ww-bottom-drawer.vue new file mode 100644 index 0000000..e63f4f2 --- /dev/null +++ b/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawer/ww-bottom-drawer.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawerapp/ww-bottom-drawerapp.vue b/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawerapp/ww-bottom-drawerapp.vue new file mode 100644 index 0000000..1f52ac1 --- /dev/null +++ b/src/uni_modules/ww-bottom-drawer/components/ww-bottom-drawerapp/ww-bottom-drawerapp.vue @@ -0,0 +1,453 @@ + + + + + \ No newline at end of file diff --git a/src/uni_modules/ww-bottom-drawer/package.json b/src/uni_modules/ww-bottom-drawer/package.json new file mode 100644 index 0000000..16737d2 --- /dev/null +++ b/src/uni_modules/ww-bottom-drawer/package.json @@ -0,0 +1,79 @@ +{ + "id": "ww-bottom-drawer", + "name": "底部抽屉", + "version": "1.7.1", + "description": "地图底部,底部抽屉,自适应", + "keywords": [ + "地图底部,底部抽屉,仿地图底部拉起,一句代码,使用简单" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + } + }, + "displayName": "简洁-可拖动底部抽屉", + "repository": "", + "engines": { + "HBuilderX": "^3.3.0" + }, + "uni_modules": { + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "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" + }, + "快应用": { + "华为": "y", + "联盟": "y" + } + } + } + } +} \ No newline at end of file