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 @@
-
-
-
-
-
- 激活您的OC Chain区块链钱包地址。地址可以理解为您的个人银行卡卡号,与他人转账时是区块链上两个地址的交易行为
-
- 激活钱包
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- 扫码转入OC COIN
-
-
-
-
- 钱包地址
- {{address || '-'}}
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 请设置6位数字密码。建议不要使用连续的数字。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 总资产(元)
- 0.00
-
-
-
-
-
-
-
- OC COIN
- ≈¥0.21
-
-
- 120,330.00
- ¥25269.3000
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 您已接收OC Chain托管
- {{key || '-'}}
- 复制我的私钥
-
-
-
-
- {{item.title || '-'}}
- {{item.description || '-'}}
-
-
-
-
- 免责条款
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 请设置6位数字密码。建议不要使用连续的数字。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 交易已提交
- 预计10秒内到账,可在交易记录中查询,以实际到账时间为准
-
- 交易哈希
- {{hash}}
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- OCC
-
-
- {{balance.balance || '0.00'}}
-
-
- ≈{{cny || '0.00'}}
-
-
-
-
- 请认真确认地址及数量,地址错误无法找回
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- 验证您的钱包助记词
-
-
-
- {{ item }}
-
-
-
-
- 按顺序填写助记词
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/static/imgs/news_1.png b/static/imgs/news_1.png
index 4838c92..00fd460 100644
Binary files a/static/imgs/news_1.png and b/static/imgs/news_1.png differ
diff --git a/static/imgs/news_2.png b/static/imgs/news_2.png
index dd19454..1c94d1f 100644
Binary files a/static/imgs/news_2.png and b/static/imgs/news_2.png differ
diff --git a/static/imgs/news_2_1.png b/static/imgs/news_2_1.png
index 1d12137..21b16d9 100644
Binary files a/static/imgs/news_2_1.png and b/static/imgs/news_2_1.png differ
diff --git a/static/imgs/news_3.png b/static/imgs/news_3.png
index 87ab761..85ffa1b 100644
Binary files a/static/imgs/news_3.png and b/static/imgs/news_3.png differ
diff --git a/static/imgs/record-icon.png b/static/imgs/record-icon.png
index 9464afb..9aaa992 100644
Binary files a/static/imgs/record-icon.png and b/static/imgs/record-icon.png differ
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 @@
+
+
+
+ {{displayValue}}
+
+
+
+
+
+
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