From d6af7dca6c3ba4174acc1ff8e0ba10fdfc601426 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Mon, 27 Sep 2021 11:45:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 13 +- pages/login/guide.vue | 263 ++++++++++++++++++ pages/login/login.vue | 2 +- pages/news/detail.vue | 2 +- pages/wallet/add.vue | 65 ----- pages/wallet/code.vue | 136 --------- pages/wallet/create.vue | 138 --------- pages/wallet/guide.vue | 125 --------- pages/wallet/index.vue | 144 ---------- pages/wallet/mnemonic.vue | 108 ------- pages/wallet/privatekey.vue | 108 ------- pages/wallet/resetPassword.vue | 150 ---------- pages/wallet/results.vue | 77 ----- pages/wallet/transfer.vue | 216 -------------- pages/wallet/validation.vue | 169 ----------- static/imgs/news_1.png | Bin 2780 -> 11154 bytes static/imgs/news_2.png | Bin 2855 -> 11407 bytes static/imgs/news_2_1.png | Bin 569 -> 2164 bytes static/imgs/news_3.png | Bin 3448 -> 11261 bytes static/imgs/record-icon.png | Bin 3404 -> 3609 bytes uni_modules/uni-badge/changelog.md | 22 ++ .../components/uni-badge/uni-badge.vue | 253 +++++++++++++++++ uni_modules/uni-badge/package.json | 88 ++++++ uni_modules/uni-badge/readme.md | 58 ++++ 24 files changed, 688 insertions(+), 1449 deletions(-) create mode 100644 pages/login/guide.vue delete mode 100644 pages/wallet/add.vue delete mode 100644 pages/wallet/code.vue delete mode 100644 pages/wallet/create.vue delete mode 100644 pages/wallet/guide.vue delete mode 100644 pages/wallet/index.vue delete mode 100644 pages/wallet/mnemonic.vue delete mode 100644 pages/wallet/privatekey.vue delete mode 100644 pages/wallet/resetPassword.vue delete mode 100644 pages/wallet/results.vue delete mode 100644 pages/wallet/transfer.vue delete mode 100644 pages/wallet/validation.vue create mode 100644 uni_modules/uni-badge/changelog.md create mode 100644 uni_modules/uni-badge/components/uni-badge/uni-badge.vue create mode 100644 uni_modules/uni-badge/package.json create mode 100644 uni_modules/uni-badge/readme.md diff --git a/pages.json b/pages.json index 44b1411..20e808f 100644 --- a/pages.json +++ b/pages.json @@ -173,22 +173,13 @@ } }, { "path": "pages/wallet/extract", + "name": "Extract", "style": { "navigationBarTitleText": "提现能量", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" - }, - "name": "Extract" - }, { - "path": "pages/wallet/resetPassword", - "style": { - "navigationBarTitleText": "重置密码", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#774ffd", - "navigationBarTextStyle": "white" - }, - "name": "ResetPassword" + } },{ "path": "pages/verification/index", "name": "verificationIndex", diff --git a/pages/login/guide.vue b/pages/login/guide.vue new file mode 100644 index 0000000..8a7cc01 --- /dev/null +++ b/pages/login/guide.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index a32c0ad..8a7cc01 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -249,7 +249,7 @@ } .agreement { - padding-top: $padding * 4; + padding-top: $padding * 2; font-size: $title-size-sm; color: $text-gray; diff --git a/pages/news/detail.vue b/pages/news/detail.vue index 7687a4e..a7da768 100644 --- a/pages/news/detail.vue +++ b/pages/news/detail.vue @@ -3,7 +3,7 @@ - + {{item.title}} diff --git a/pages/wallet/add.vue b/pages/wallet/add.vue deleted file mode 100644 index d0522c7..0000000 --- a/pages/wallet/add.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - diff --git a/pages/wallet/code.vue b/pages/wallet/code.vue deleted file mode 100644 index 3adee0c..0000000 --- a/pages/wallet/code.vue +++ /dev/null @@ -1,136 +0,0 @@ - - - - - diff --git a/pages/wallet/create.vue b/pages/wallet/create.vue deleted file mode 100644 index 2d7a1ad..0000000 --- a/pages/wallet/create.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - diff --git a/pages/wallet/guide.vue b/pages/wallet/guide.vue deleted file mode 100644 index 04170d9..0000000 --- a/pages/wallet/guide.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/pages/wallet/index.vue b/pages/wallet/index.vue deleted file mode 100644 index dee4676..0000000 --- a/pages/wallet/index.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - diff --git a/pages/wallet/mnemonic.vue b/pages/wallet/mnemonic.vue deleted file mode 100644 index 41e18a9..0000000 --- a/pages/wallet/mnemonic.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/pages/wallet/privatekey.vue b/pages/wallet/privatekey.vue deleted file mode 100644 index 0cd040c..0000000 --- a/pages/wallet/privatekey.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/pages/wallet/resetPassword.vue b/pages/wallet/resetPassword.vue deleted file mode 100644 index c054f91..0000000 --- a/pages/wallet/resetPassword.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - - diff --git a/pages/wallet/results.vue b/pages/wallet/results.vue deleted file mode 100644 index 2e2718c..0000000 --- a/pages/wallet/results.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/pages/wallet/transfer.vue b/pages/wallet/transfer.vue deleted file mode 100644 index e66843c..0000000 --- a/pages/wallet/transfer.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - - diff --git a/pages/wallet/validation.vue b/pages/wallet/validation.vue deleted file mode 100644 index e28cb42..0000000 --- a/pages/wallet/validation.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/static/imgs/news_1.png b/static/imgs/news_1.png index 4838c92a5dae95b8d0834f6fd24ee70ba7d28a04..00fd460b3fae248e9651dd728d680e3ccbcce151 100644 GIT binary patch literal 11154 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 G;{O0K(fsTH literal 2780 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 Fe*juo9mD_t diff --git a/static/imgs/news_2.png b/static/imgs/news_2.png index dd19454736476f3ad603b23da0b5f41a7756a86c..1c94d1f13a9ac3541fb6f56c1bc2693c7608ed88 100644 GIT binary patch literal 11407 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 literal 2855 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 literal 3448 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 NXcTwnTC#ug{{iTzP8t9J diff --git a/static/imgs/record-icon.png b/static/imgs/record-icon.png index 9464afb71164f441cb6e2406608c9c998a557a3a..9aaa99292bb1af7cce77c09ce162e8b6efd8d11d 100644 GIT binary patch delta 177 zcmX>jHB)AS1rytbjaFSuT;?H$hE_%FACMBg<>Y7@Zq#2qRS(q4`n{J-LY``@6H;b7oF{+gmic4I}O03E=QuAz;j0}tn dbqy?ajgXwNo5g1GCf0nGUFLk9n^oD=*#T6>F-HIZ delta 52 zcmbO!b4F@{1rzJzjaFSulXF;wCSPNc2Gh*Ug_8|g)i%#!)?=DHl`WFx(Hrj8&7auR F*#Xqo5wZXP diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md new file mode 100644 index 0000000..4ca8c5b --- /dev/null +++ b/uni_modules/uni-badge/changelog.md @@ -0,0 +1,22 @@ +## 1.1.6(2021-09-22) +- 修复 在字节小程序上样式不生效的 bug +## 1.1.5(2021-07-30) +- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.4(2021-07-29) +- 修复 去掉 nvue 不支持css 的 align-self 属性,nvue 下不暂支持 absolute 属性 +## 1.1.3(2021-06-24) +- 优化 示例项目 +## 1.1.1(2021-05-12) +- 新增 组件示例地址 +## 1.1.0(2021-05-12) +- 新增 uni-badge 的 absolute 属性,支持定位 +- 新增 uni-badge 的 offset 属性,支持定位偏移 +- 新增 uni-badge 的 is-dot 属性,支持仅显示有一个小点 +- 新增 uni-badge 的 max-num 属性,支持自定义封顶的数字值,超过 99 显示99+ +- 优化 uni-badge 属性 custom-style, 支持以对象形式自定义样式 +## 1.0.7(2021-05-07) +- 修复 uni-badge 在 App 端,数字小于10时不是圆形的bug +- 修复 uni-badge 在父元素不是 flex 布局时,宽度缩小的bug +- 新增 uni-badge 属性 custom-style, 支持自定义样式 +## 1.0.6(2021-02-04) +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue new file mode 100644 index 0000000..f3869c4 --- /dev/null +++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json new file mode 100644 index 0000000..4efafd5 --- /dev/null +++ b/uni_modules/uni-badge/package.json @@ -0,0 +1,88 @@ +{ + "id": "uni-badge", + "displayName": "uni-badge 数字角标", + "version": "1.1.6", + "description": "数字角标(徽章)组件,在元素周围展示消息提醒,一般用于列表、九宫格、按钮等地方。", + "keywords": [ + "", + "badge", + "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": [], + "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" + }, + "快应用": { + "华为": "y", + "联盟": "y" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-badge/readme.md b/uni_modules/uni-badge/readme.md new file mode 100644 index 0000000..d29680b --- /dev/null +++ b/uni_modules/uni-badge/readme.md @@ -0,0 +1,58 @@ + + +## Badge 数字角标 +> **组件名:uni-badge** +> 代码块: `uBadge` + + +数字角标一般和其它控件(列表、9宫格等)配合使用,用于进行数量提示,默认为实心灰色背景, + +### 安装方式 + +本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范,`HBuilderX 2.5.5`起,只需将本组件导入项目,在页面`template`中即可直接使用,无需在页面中`import`和注册`components`。 + +如需通过`npm`方式使用`uni-ui`组件,另见文档:[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55) + +### 基本用法 + +在 ``template`` 中使用组件 + +```html + + + + + + + +``` + + +## API + +### Badge Props + +|属性名 |类型 |默认值 |说明 | +|:-: |:-: |:-: |:-: | +|text |String |- |角标内容 | +|type |String |default|颜色类型,可选值:default(灰色)、primary(蓝色)、success(绿色)、warning(黄色)、error(红色)| +|size |String |normal |Badge 大小,可取值:normal、small | +|is-dot |Boolean|false |不展示数字,只有一个小点 | +|max-num |String/Numbuer|99 |展示封顶的数字值,超过 99 显示99+ | +|custom-style |Object | {} |自定义 Badge 样式, 样式对象语法 | +|inverted |Boolean|false |是否无需背景颜色,为 true 时,背景颜色将变为文字的字体颜色 | +|absolute (不支持 nvue) |String| rightTop|开启绝对定位, 角标将定位到其包裹的标签的四个角上,可选值: rightTop(右上角)、rightBottom(右下角)、leftBottom(左下角) 、leftTop(左上角) | +|offset |Array[number]| [0, 0]|距定位角中心点的偏移量,[-10, -10] 表示向 absolute 指定的方向偏移 10px,[10, 10] 表示向 absolute 指定的反方向偏移 10px,只有存在 absolute 属性时有效,与absolute 的值一一对应(例如:值为rightTop, 对应 offset 为 [right, Top])| + +### Badge Events + +|事件名 |事件说明 |返回参数 | +|:-: |:-: |:-: | +|@click |点击 Badge 触发事件| - | + + + + +## 组件示例 + +点击查看:[https://hellouniapp.dcloud.net.cn/pages/extUI/badge/badge](https://hellouniapp.dcloud.net.cn/pages/extUI/badge/badge) \ No newline at end of file