diff --git a/apis/interfaces/withdraws.js b/apis/interfaces/withdraws.js
new file mode 100644
index 0000000..9fad558
--- /dev/null
+++ b/apis/interfaces/withdraws.js
@@ -0,0 +1,97 @@
+/**
+ * zdx
+ * moduleName: 提现模块
+ */
+
+import {
+ request
+} from '../index.js'
+
+
+// 添加前置条件
+const accountsCreate = () => {
+ return request({
+ url: 'withdraws/accounts/create'
+ })
+}
+
+// 添加银行卡
+const withdrawsAccounts = (data) => {
+ return request({
+ url: 'withdraws/accounts',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 银行卡列表
+const withdrawsAccountsList = (data) => {
+ return request({
+ url: 'withdraws/accounts',
+ method: 'get',
+ data: data
+ })
+}
+
+// 编辑银行卡前置
+const accountsCreateEdit = (id) => {
+ return request({
+ url: 'withdraws/accounts/'+id+'/edit'
+ })
+}
+
+// 编辑银行卡
+const withdrawsAccountsEdits = (data) => {
+ return request({
+ url: 'withdraws/accounts/'+data.bank_account_id,
+ method: 'PUT',
+ data: data
+ })
+}
+
+// 删除银行卡
+const withdrawsAccountsDelete = (id) => {
+ return request({
+ url: 'withdraws/accounts/'+id,
+ method: 'DELETE'
+ })
+}
+
+// 提现前置记录
+const withdrawsIndexCreate = () => {
+ return request({
+ url: 'withdraws/index/create'
+ })
+}
+
+// 提现接口
+const withdrawsIndex = (data) => {
+ return request({
+ url: 'withdraws/index',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 提现记录
+const withdrawsIndexLists = (data) => {
+ return request({
+ url: 'withdraws/index',
+ method: 'get',
+ data: data
+ })
+}
+
+//
+
+export {
+ accountsCreate,
+ withdrawsAccounts,
+ withdrawsAccountsList,
+ accountsCreateEdit,
+ withdrawsAccountsEdits,
+ withdrawsAccountsDelete,
+ withdrawsIndexCreate,
+ withdrawsIndex,
+ withdrawsIndexLists
+}
diff --git a/pages.json b/pages.json
index 85f6922..a19d067 100644
--- a/pages.json
+++ b/pages.json
@@ -180,22 +180,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",
@@ -263,23 +254,23 @@
"name": "Fragment"
},
{
- "path": "pages/wallet/addCard",
+ "path": "pages/wallet/addBank",
"style": {
"navigationBarTitleText": "添加银行卡",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
},
- "name": "addCard"
+ "name": "addBank"
},{
- "path": "pages/wallet/selectCard",
+ "path": "pages/wallet/bankList",
"style": {
"navigationBarTitleText": "银行卡列表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
},
- "name": "selectCard"
+ "name": "bankList"
},{
"path": "pages/wallet/withdrawList",
"style": {
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/addBank.vue b/pages/wallet/addBank.vue
new file mode 100644
index 0000000..768e856
--- /dev/null
+++ b/pages/wallet/addBank.vue
@@ -0,0 +1,334 @@
+
+
+
+ {{bank_account_id===''?'添加':'编辑'}}提现银行
+
+ 收款人姓名
+
+
+
+ 收款人手机号
+
+
+
+ 开户行
+
+
+ {{selectBankObj.label?selectBankObj.label:'请选择开户行'}}
+
+
+
+ 收款人账号
+
+
+
+ 支行名称
+
+
+
+ 确认{{bank_account_id===''?'添加':'编辑'}}银行
+ 提现记录
+
+
+
+
+
+
+
+
+
diff --git a/pages/wallet/addCard.vue b/pages/wallet/addCard.vue
deleted file mode 100644
index 02446ee..0000000
--- a/pages/wallet/addCard.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
- 添加提现银行
-
- 收款人姓名
-
-
-
- 收款人账号
-
-
-
- 开户行
-
-
-
- 支行名称
-
-
-
- 收款人手机号
-
-
-
- 确认添加银行
- 提现记录
-
-
-
-
-
-
diff --git a/pages/wallet/bankList.vue b/pages/wallet/bankList.vue
new file mode 100644
index 0000000..d69c7e0
--- /dev/null
+++ b/pages/wallet/bankList.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+ {{item.bank.name}}
+ 快捷支付
+
+ 储值卡
+ {{item.no}}
+
+
+
+
+
+
+
+
+
+
+
+
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/extract.vue b/pages/wallet/extract.vue
index 053a33b..7c64fa1 100644
--- a/pages/wallet/extract.vue
+++ b/pages/wallet/extract.vue
@@ -4,9 +4,9 @@
能量球钱包
-
+ (≈ {{ cost || '0.00' }} CNY)
- {{ balance.balance || '0.00' }}
+ {{ balance || '0.00' }}
提现记录
@@ -14,98 +14,59 @@
提现至银行卡
- 添加银行卡
-
-
-
-
- 选择银行卡
-
- 选择银行卡
+ 添加银行卡
+ {{bankInfo.name?bankInfo.name:'选择银行卡'}}
+
- ≈ ¥{{total}}
+ placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" placeholder="提现数量" />
全部提现
- 提现至银行卡
- 预计5- 10个工作日到账
+ ≈ ¥{{total}}
+ 提现至银行卡
+ 预计5- 10个工作日到账 手续费: {{tax}}%
-
-
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/selectCard.vue b/pages/wallet/selectCard.vue
deleted file mode 100644
index bd3429a..0000000
--- a/pages/wallet/selectCard.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
- 浦发银行 快捷支付
-
- 储值卡
- 622 8480530 382837819
-
-
-
-
-
-
-
-
-
-
-
-
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/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue
index 338cf5f..2cb5c4a 100644
--- a/pages/wallet/withdrawList.vue
+++ b/pages/wallet/withdrawList.vue
@@ -30,16 +30,23 @@
-
+
+
+ {{item.way}}
+ {{item.status.status_text}}
+
- 能量球:150
- 金额≈¥300
-
-
- {{item.created_at}} 提现
- {{item.paid_at || index === 0 ? '2021-11-11 11:11:11到账':'努力打款中'}}
+
+ 能量球:{{item.quantity}}
+ 金额≈¥{{item.take}} 手续费:{{item.tax}}
+
+ {{item.create_at}}
+
@@ -53,16 +60,15 @@
+
+
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