From 8edc92f4758c0a122cfe3e31451fed4d23b62bee Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Sat, 25 Sep 2021 10:28:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=A4=E8=AF=81=E4=BC=81=E4=B8=9A=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/setting.js | 10 +++- pages/setting/setting.vue | 97 +++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 29 deletions(-) diff --git a/apis/interfaces/setting.js b/apis/interfaces/setting.js index 956163f..6f59950 100644 --- a/apis/interfaces/setting.js +++ b/apis/interfaces/setting.js @@ -71,6 +71,13 @@ const aboutUs = () => { url: 'articles/about' }) } +// 获取企业认证状态 -1.未认证，0.审核中，1.审核通过，2.驳回 +const companyStatus = () => { + return request({ + url: 'companies/applies/query' + }) +} + export { login, @@ -80,5 +87,6 @@ export { agreementLogin, resetUserInfo, getUserSettingInfo, - aboutUs + aboutUs, + companyStatus } diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index 82949ad..3bfdf4d 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -33,20 +33,28 @@ - + 个人认证 - + + + + - + 企业认证 - + + + + @@ -80,7 +88,8 @@ import { wechatbind, resetUserInfo, - getUserSettingInfo + getUserSettingInfo, + companyStatus } from '@/apis/interfaces/setting' import { uploads @@ -96,8 +105,8 @@ showPath: '' }, is_bind: true, // 微信绑定 - is_certification: true, // 个人认证 - is_company: true, // 企业认证 + certification: {}, // 个人认证 + companyCode: {}, // 企业认证 -1.未认证，0.审核中，1.审核通过，2.驳回 } }, onShow() { @@ -107,38 +116,59 @@ } }) this.getUserInfo() + }, onPullDownRefresh() { this.getUserInfo() }, methods: { // 是否个人认证 - certification(is_certfication) { - console.log(is_certfication) - if (is_certfication) { + certificationClick(certfication) { + console.log(certfication) + if (certfication.is_true) { // 跳转到个人认证信息完成展示页面 - this.$router.push({ - name: '' + // this.$refs.uToast.show({ + // title: '认证通过！', + // type: 'primary', + // duration: 3000 + // }) + uni.showModal({ + title: '认证信息', + content: '真实姓名：<' + certfication.message.name + '>,身份证号：' + certfication.message.idcard, + showCancel:false }) } else { // 跳转到个人认证信息页面 - this.$router.push({ - name: '' + uni.navigateTo({ + url: '/pages/certification/personal' }) } }, - // 是否展示企业信息 - company(is_company) { - console.log(is_company) - if (is_company) { - // 跳转到企业认证完成信息展示页面 - this.$router.push({ - name: '' - }) - } else { + // 是否展示企业信息 企业认证 -1.未认证，0.审核中，1.审核通过，2.驳回 + company(code) { + console.log(code, '是否企业认证') + if (code === -1) { // 跳转到企业认证页面 - this.$router.push({ - name: '' + uni.navigateTo({ + url: '/pages/company/approve' + }) + } else if (code === 2) { + // 跳转到企业认证页面 + uni.navigateTo({ + url: '/pages/company/approve?form_type=put' + }) + } else if (code === 0) { + this.$refs.uToast.show({ + title: '审核中', + type: 'primary', + duration: 3000 + }) + } else if (code === 1) { + // 跳转到企业认证页面 + this.$refs.uToast.show({ + title: '认证通过！', + type: 'primary', + duration: 3000 }) } }, @@ -148,8 +178,7 @@ this.avatar.showPath = res.avatar this.nickname = res.nickname this.is_bind = res.is_bind - this.is_certification = res.is_certification - this.is_company = res.is_company + this.certification = res.certification uni.stopPullDownRefresh() }).catch(err => { this.$refs.uToast.show({ @@ -158,6 +187,17 @@ duration: 3000 }) }) + // -1.未认证，0.审核中，1.审核通过，2.驳回 + companyStatus().then(res => { + console.log(res) + this.companyCode = res + }).catch(err => { + this.$refs.uToast.show({ + title: err.message, + type: 'primary', + duration: 3000 + }) + }) }, // 点击绑定用户得授权信息，且绑定带修改 getUser() { @@ -385,8 +425,9 @@ flex: 1; input { - padding-right: 30rpx; + padding-right: 20rpx; width: 100%; + font-size: 30rpx; } } From 2d0fbac73b82e0e3d97ff3e53b6f99776c0edb02 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Sat, 25 Sep 2021 10:53:25 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/news.js | 53 +++++++++ pages.json | 17 ++- pages/news/detail.vue | 248 ++++++++++++++++++++++++++++++++++++++++ pages/news/index.vue | 179 +++++++++++++++++++++++++++++ 4 files changed, 496 insertions(+), 1 deletion(-) create mode 100644 apis/interfaces/news.js create mode 100644 pages/news/detail.vue create mode 100644 pages/news/index.vue diff --git a/apis/interfaces/news.js b/apis/interfaces/news.js new file mode 100644 index 0000000..644d82f --- /dev/null +++ b/apis/interfaces/news.js @@ -0,0 +1,53 @@ +/** + * Web-zdx + * moduleName: 通知消息列表 + */ + +import {request} from '../index.js' + +// 消息列表 +const notificationsType = () => { + return request({ + url: 'notifications', + method: 'GET' + }) +} +// 根据type 获取具体消息列表 +const notificationsList = (type,data) => { + return request({ + url: 'notifications/'+type+'/list', + method: 'GET', + data:data + }) +} +// 根据type 全部已读 +const notificationsReaded = (type) => { + return request({ + url: 'notifications/'+type, + method: 'PUT' + }) +} +// 根据type 全部已读 +const notificationsDelete= () => { + return request({ + url: 'notifications', + method: 'DELETE' + }) +} +// 根据消息id获取消息详情 +const notificationsDetail= (id) => { + return request({ + url: 'notifications/'+id, + method: 'get' + }) +} + + + +export { + notificationsType, + notificationsList, + notificationsDetail, + notificationsReaded, + notificationsDelete +} diff --git a/pages.json b/pages.json index 643815a..9b7799b 100644 --- a/pages.json +++ b/pages.json @@ -129,7 +129,22 @@ "style": { "navigationBarTitleText": "企业认证" } - }], + },{ + "path": "pages/news/index", + "name": "news", + "auth": true, + "style": { + "navigationBarTitleText": "消息中心" + } + },{ + "path": "pages/news/detail", + "name": "newsDetail", + "auth": true, + "style": { + "navigationBarTitleText": "消息列表" + } + } + ], "globalStyle": { "navigationStyle": "custom", "backgroundColor": "#F5F5F5" diff --git a/pages/news/detail.vue b/pages/news/detail.vue new file mode 100644 index 0000000..3b283d0 --- /dev/null +++ b/pages/news/detail.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/pages/news/index.vue b/pages/news/index.vue new file mode 100644 index 0000000..ded065a --- /dev/null +++ b/pages/news/index.vue @@ -0,0 +1,179 @@ + + + + + From 3a48656538eb148c775569032045864b93c6ecdb Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Sat, 25 Sep 2021 10:59:03 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/no-list-components/index.vue | 69 ++++++++++++++++++++++++ main.js | 6 ++- pages/news/detail.vue | 1 + pages/news/index.vue | 6 +-- static/imgs/news_1.png | Bin 0 -> 2780 bytes static/imgs/news_2.png | Bin 0 -> 2855 bytes static/imgs/news_2_1.png | Bin 0 -> 569 bytes static/imgs/news_3.png | Bin 0 -> 3448 bytes static/imgs/news_3_1.png | Bin 0 -> 338 bytes 9 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 components/no-list-components/index.vue create mode 100644 static/imgs/news_1.png create mode 100644 static/imgs/news_2.png create mode 100644 static/imgs/news_2_1.png create mode 100644 static/imgs/news_3.png create mode 100644 static/imgs/news_3_1.png diff --git a/components/no-list-components/index.vue b/components/no-list-components/index.vue new file mode 100644 index 0000000..fa2f702 --- /dev/null +++ b/components/no-list-components/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/main.js b/main.js index 11f608a..6c51a8d 100644 --- a/main.js +++ b/main.js @@ -4,7 +4,8 @@ import App from './App' import Vue from 'vue' import { router, RouterMount } from './router' import store from './store' -import uView from 'uview-ui' +import uView from 'uview-ui' +import noList from './components/no-list-components/index.vue' Vue.use(router) Vue.use(uView); Vue.config.productionTip = false @@ -12,7 +13,8 @@ Vue.prototype.$store = store App.mpType = 'app' const app = new Vue({ ...App -}) +}) +Vue.component('no-list',noList) // #ifdef H5 RouterMount(app,router,'#app') // #endif diff --git a/pages/news/detail.vue b/pages/news/detail.vue index 3b283d0..8ffa1ac 100644 --- a/pages/news/detail.vue +++ b/pages/news/detail.vue @@ -22,6 +22,7 @@ notificationsDetail, notificationsReaded } from '@/apis/interfaces/news.js' + export default { data() { return { diff --git a/pages/news/index.vue b/pages/news/index.vue index ded065a..452e1fb 100644 --- a/pages/news/index.vue +++ b/pages/news/index.vue @@ -3,9 +3,9 @@ - - - + + + {{item.name}} {{item.title || '暂无任何未读消息'}} diff --git a/static/imgs/news_1.png b/static/imgs/news_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4838c92a5dae95b8d0834f6fd24ee70ba7d28a04 GIT binary patch literal 2780 zcmYjT2T+sQ7XCvhK_Y}^kfJ1rq67qC6$PaISqKTeMQIV0BB0czy8a4*1OyE#8)=GC z1QDaKEXpcDf}%(fVWkNXP!`!>~W003+! z*@3Pww*J^CBrNmN{Hg!|@yVIuPK1v-!J_{z&$|!*$6?}>{Sua5_bQKH?uLn8=(I=C zBbb~hD~09%KX%W50xP}lRe0X1@+|)0#F^Ew|6jMH%kTcZs-%{d!^AzGLoF?H%;37` z{V=h+*x{JTb!I(x$Y>(dU&Dm-Ydh)Ed)R|*;s;oM|Nh;LU85H=LoF+X^#?+PE;pXJ z=GM6va2yys+oTUBq2IjjSNt6R@zA+RVqA}1a;HhyxbyV}=WBl&pPO*H+GrX+YJd41 zC9TCN>!l;J$^1Ouqo~>-WZEEP$|kxWjQz{2xY8}}sb%D6YDu|G%qMc{Yq&IW${TV@ zE1aiiQI*AoVYn{Wn}1kG4Om4EkgvS8OX|E;yBu5a*)MxOGI#9bm{2gg!Jk}nr_UBY zpGhj5US8drTiP5PUv2H1y>MgVUH__A>Oe#18n0)i_se4b@3UaiZ0*~b?5at-_(?|j z#Kqzfr{tk;GwVGgYlY92p|Yj=cZ;!wi%lPeW!#B#Iec2iaA0nCId|pBo8_}P3n4io z)99JoHB)YvzIvyQ<<<|=t9vOIdrn?&t?d}Mjs3C~efuEXTH_d3M>k;VnW0f1i*d@& zhpe<>*WC0hj}hmnp)vI^uk+pG>QWXf?v&5U%G6YU+p}z2!@=4(v#C0{@4o>63L=44 z?(qYk3%$G*T`-pWikJOnUM!=lban_{sPQtCU5@Eo(QMJD3Ad<1vA26m!fuo5<2to2 zOf*D0X^tF{2@LD#9H@(#{A+PKP7od(Y@$;iQ&CYdIogsLCme40)YmsOlojJQoy==3^!5)+dEk9%bSs8P*+8zq(lRf1g_JJ6qcuTD6hNo;XVL%&P&~nk` z%FA~QXm=6aWkf@vPlG+d7eM;%w`HbrfyDPn!e{N-)wwKWzq#JMK&WM8U(>=rMLS%6 z;vV<6=NtJlP>LQ%^^N4m)CO-0g;=Cu{$^+GA3tMVj&fg8x+)HX0*QK3F0h_qRc^`P zHSXz_ipQa%LeHf#2M|kN#VoV+?2EE*F6Vsub|=q)g;AJ(is< zxcf(|WqRZycAi-cJ?DerQ>gkN46Zuzczslaq`QnfR=i%Na$`#sD;{sCw6b{~6@eo> zSZ=^^LpXKA!ZaX>=J8@=JE9|HEwNEoi~vq4s`6O}A8BZ4Y5BKbOV!W03tSQ=ZY_Dp zNyaa(wS5}T>_QGL)~RW!1g{3LMVTV0l{fQ#SDR}70yEfBD`{E4_i0{yvcQfP)^rs2 zN{wIbchzZmx|o;Ig(QH#{z;7Xd->1-LWM#NiCqehr^`+$e?g0MPM(E)$JI|m{&!;& z)9Q&UVjJ7T4S57>l&FaV#NBh?Wlbo3*(TDeZ3D_%A4O9TyLN+vwVVtCiFg$aQCaqh z)Lnd+7*OgyiVUs$-_tri%Nz=jj@Wl>+^8I7&fN_E`#Qo=J`pngU?^mR=SL1ni+0Wf zrWTkc-Qz#hEN;+Y7zbHg+r6y81;9y@{);}WXv8sP&&xM{BzLFp@vC9@G&smcAV)Vk zb1^uncr>$Tj&U8ifncJaFnqM6R?J5?Mt;Fr%ZfA=R^Mw`%SNavB)oyqz%`*67qzPT z6ZeK)DV+?mK?YS$WU~sYOHfr=ZHCBXo*9>dk0s!50&V+7$CHjRiRuz;o04psR3%yh zxa9xKE*g^W>Qz~FEBG>ke1&*tb*(YmojREOfqd8`X(zlGqydgwgYqVS?s_;k}j=#oq77Yi7WPdtKXb z*4srouB)wDFglgYQLrCyOrK)Oc$JFUc?Je))|++aBwgA!RfR8SH=&q`(&M_Bw{lJA z!ldO-Lg}oOy6ltBQQF)~!&-7LG-BYK-wd!ahduM8gS`r*R*+HMulD09giB7#5txL8 z0ei(r*ioyK43TG&6M9(8tT$bRprb_%l3@qi=4;$kY zjJQ2-y4JoC#wK5BUdYl87{X^aB8%o#288F)b9kR|Wy#5ak+i+=4CsrgTQlJCFd-XT zN-4Ej>W+}z8Hm)0xONIvIEG+xG@LrKBx1+O0gOI02d6N0lz$vuyxCG>uv55g{nQ|1 zvdsKBYV#=H5M7=m(%$w;cF#`yLi*Qq!{bg)5!LsNK{k>=88Flzai}wy%V3ZLjJRob z7O%&og~#k|Qcby6q_4I|pVrW>LB&B5+c#5GQd~|y-Wv+h;jS8P`7SIcUHw_8xa3iu zhDw6y3|cK#>+g-Y!;|=h@1MSJhIdT7;fkLPse1a{yN0zutwYlIT0qU4 z{(61iZU;)Xe+BhM_+uCCRd?7DFkw~t8p}`cY5nJNY+z04>u!Ou zPL~3fuTyjD0f4o>mCFHa{|R&Ofv`5ezgFfaT#O7byct{#k2k_6<0InrN}j>9`piR! zj#PDrXd9?a)8pe1hOY$m=E;Z^NC89`1QMA3C@YAJ;DyIoLGuVruV^bM+KOYj2^=Dk`OBE{T%^^C(3p4C{k%IkF`)Xosp9AI1=!!}y6N$izrx+S@Wbk+KK$p!U z{A84CNfh*g#&P`$1lgd7Q<8l$#U-AVsx+r2X6aDQDFYFYnX>|Cw;NYhS+^3~isjQ=ZhxiS87j!R()(20g&Ow%^X+)^8IpTifUiAwCpUseYR|VVR!hW5b7F+{^KtLkcf_8wKeU^ Fe*juo9mD_t literal 0 HcmV?d00001 diff --git a/static/imgs/news_2.png b/static/imgs/news_2.png new file mode 100644 index 0000000000000000000000000000000000000000..dd19454736476f3ad603b23da0b5f41a7756a86c GIT binary patch literal 2855 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 Hu0mjfj`|N* literal 0 HcmV?d00001 diff --git a/static/imgs/news_3.png b/static/imgs/news_3.png new file mode 100644 index 0000000000000000000000000000000000000000..87ab761f0363cde2a23ddd8be810af1f5822a5b1 GIT binary patch literal 3448 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 NXcTwnTC#ug{{iTzP8t9J literal 0 HcmV?d00001 diff --git a/static/imgs/news_3_1.png b/static/imgs/news_3_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a4065ce701ec7b7ff875775d07f08b184bc2a43a GIT binary patch literal 338 zcmV-Y0j>UtP)8X|44WLM2P=Flm9@V|30YyL7M+Ye*Z^#|Nrmu)7$kXLqbmg z000PdQchC<2cA1b2E^s1tCHBmft>F;BDsJW?(iPC#kg_3 Date: Sat, 25 Sep 2021 11:59:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?'=E6=8F=90=E7=8E=B0=E6=A8=A1=E5=9D=97'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/wallet.js | 159 +++++++++++ components/numberJpan/numberJpan.vue | 238 ++++++++++++++++ components/property/record.vue | 93 +++++++ pages.json | 50 +++- pages/user/index.vue | 6 +- pages/wallet/add.vue | 65 +++++ pages/wallet/cmsWithDraw.vue | 50 ++++ pages/wallet/code.vue | 136 ++++++++++ pages/wallet/create.vue | 138 ++++++++++ pages/wallet/extract.vue | 389 +++++++++++++++++++++++++++ pages/wallet/guide.vue | 125 +++++++++ pages/wallet/index.vue | 144 ++++++++++ pages/wallet/mnemonic.vue | 108 ++++++++ pages/wallet/privatekey.vue | 108 ++++++++ pages/wallet/property.vue | 343 +++++++++++++++++++++++ pages/wallet/resetPassword.vue | 150 +++++++++++ pages/wallet/results.vue | 77 ++++++ pages/wallet/transfer.vue | 216 +++++++++++++++ pages/wallet/validation.vue | 169 ++++++++++++ static/icons/logs-null.png | Bin 0 -> 5610 bytes static/imgs/cart_empty.png | Bin 0 -> 3602 bytes 21 files changed, 2756 insertions(+), 8 deletions(-) create mode 100644 apis/interfaces/wallet.js create mode 100644 components/numberJpan/numberJpan.vue create mode 100644 components/property/record.vue create mode 100644 pages/wallet/add.vue create mode 100644 pages/wallet/cmsWithDraw.vue create mode 100644 pages/wallet/code.vue create mode 100644 pages/wallet/create.vue create mode 100644 pages/wallet/extract.vue create mode 100644 pages/wallet/guide.vue create mode 100644 pages/wallet/index.vue create mode 100644 pages/wallet/mnemonic.vue create mode 100644 pages/wallet/privatekey.vue create mode 100644 pages/wallet/property.vue create mode 100644 pages/wallet/resetPassword.vue create mode 100644 pages/wallet/results.vue create mode 100644 pages/wallet/transfer.vue create mode 100644 pages/wallet/validation.vue create mode 100644 static/icons/logs-null.png create mode 100644 static/imgs/cart_empty.png diff --git a/apis/interfaces/wallet.js b/apis/interfaces/wallet.js new file mode 100644 index 0000000..b383342 --- /dev/null +++ b/apis/interfaces/wallet.js @@ -0,0 +1,159 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 钱包 + */ + +import {request} from '../index.js' + +// 导出助记词 +const seed = () => { + return request({ + url: 'chain/safe/seed' + }) +} + +const hash = (data) => { + return request({ + url: 'chain/wallet/hash', + method: 'POST', + data: data + }) +} + +// 收款码 +const code = () => { + return request({ + url: 'chain/account/code' + }) +} + +// 原石余额 +const sum = () => { + return request({ + url: 'chain/account/balance' + }) +} + +// 原石价格 +const price = () => { + return request({ + url: 'nodes/price' + }) +} + +// 账户记录 +const logs = (data) => { + return request({ + url: 'chain/account/logs', + data: data + }) +} + +// 设置安全密码 +const security = (data) => { + return request({ + url: 'chain/safe/security', + method: 'POST', + data + }) +} + +// 转账 +const transfer = (data) => { + return request({ + url: 'chain/account/transfer', + method: 'POST', + data + }) +} + +// 钱包私钥 +const privatekey = (code) => { + return request({ + url : "chain/safe/private_key", + data: { + code + } + }) +} + +// 获取可提现信息 +const withdraw = () => { + return request({ + url : "withdraw" + }) +} + +// 提现记录 +const withdrawLogs = (data) => { + return request({ + url : "withdraw/logs", + data:data + }) +} + +// 提现 +const withdrawDo = (data) => { + return request({ + url : "withdraw", + method: 'POST', + data:data + }) +} + +// 验证支付密码是否正确 +const securityCheck = (password) => { + return request({ + url : "chain/safe/security/check", + method: 'POST', + data:{ + code : password, + } + }) +} + +// 修改密码 +const securityReset = (data) => { + return request({ + url : "chain/safe/security", + method: 'PUT', + data:data + }) +} + +// 提现服务条款 +const cmsWithdraw = () => { + return request({ + url : "cms/withdraw" + }) +} + +// 私钥规则 +const keyrules = () => { + return request({ + url: 'cms/keyrules' + }) +} + +export { + seed, + hash, + code, + sum, + price, + logs, + security, + transfer, + privatekey, + withdraw, + withdrawLogs, + withdrawDo, + securityCheck, + securityReset, + cmsWithdraw, + keyrules +} + diff --git a/components/numberJpan/numberJpan.vue b/components/numberJpan/numberJpan.vue new file mode 100644 index 0000000..c8017b1 --- /dev/null +++ b/components/numberJpan/numberJpan.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/components/property/record.vue b/components/property/record.vue new file mode 100644 index 0000000..a5a5ccd --- /dev/null +++ b/components/property/record.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/pages.json b/pages.json index 9b7799b..4c6acb9 100644 --- a/pages.json +++ b/pages.json @@ -129,22 +129,62 @@ "style": { "navigationBarTitleText": "企业认证" } - },{ + }, { "path": "pages/news/index", "name": "news", "auth": true, "style": { "navigationBarTitleText": "消息中心" } - },{ + }, { "path": "pages/news/detail", "name": "newsDetail", "auth": true, "style": { "navigationBarTitleText": "消息列表" } - } - ], + }, { + "path": "pages/wallet/property", + "name": "walletProperty", + "style": { + "navigationBarTitleText": "能量钱包", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "backgroundColor": "#b11eff", + "type": "transparent", + "buttons": [{ + "float": "right", + "fontSize": "14", + "text": "管理", + "background": "rgba(255,255,255,0)" + }], + "backButton": { + "background": "rgba(255,255,255,0)" + } + } + } + } + }, { + "path": "pages/wallet/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" + } ], "globalStyle": { "navigationStyle": "custom", "backgroundColor": "#F5F5F5" @@ -176,4 +216,4 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" } -} \ No newline at end of file +} diff --git a/pages/user/index.vue b/pages/user/index.vue index bc7f439..c996934 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -122,7 +122,7 @@ 当前能量球价值￥0.00 - + 去提现 @@ -131,8 +131,8 @@ 我的资产 - - 能量球钱包 + + 能量球钱包 {{userData.account.coins || 0}} diff --git a/pages/wallet/add.vue b/pages/wallet/add.vue new file mode 100644 index 0000000..d0522c7 --- /dev/null +++ b/pages/wallet/add.vue @@ -0,0 +1,65 @@ + + + + + + + diff --git a/pages/wallet/cmsWithDraw.vue b/pages/wallet/cmsWithDraw.vue new file mode 100644 index 0000000..5476ab1 --- /dev/null +++ b/pages/wallet/cmsWithDraw.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/pages/wallet/code.vue b/pages/wallet/code.vue new file mode 100644 index 0000000..3adee0c --- /dev/null +++ b/pages/wallet/code.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/pages/wallet/create.vue b/pages/wallet/create.vue new file mode 100644 index 0000000..2d7a1ad --- /dev/null +++ b/pages/wallet/create.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue new file mode 100644 index 0000000..1823bf8 --- /dev/null +++ b/pages/wallet/extract.vue @@ -0,0 +1,389 @@ + + + + + diff --git a/pages/wallet/guide.vue b/pages/wallet/guide.vue new file mode 100644 index 0000000..04170d9 --- /dev/null +++ b/pages/wallet/guide.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/pages/wallet/index.vue b/pages/wallet/index.vue new file mode 100644 index 0000000..32c5b7e --- /dev/null +++ b/pages/wallet/index.vue @@ -0,0 +1,144 @@ + + + + + + + diff --git a/pages/wallet/mnemonic.vue b/pages/wallet/mnemonic.vue new file mode 100644 index 0000000..41e18a9 --- /dev/null +++ b/pages/wallet/mnemonic.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/pages/wallet/privatekey.vue b/pages/wallet/privatekey.vue new file mode 100644 index 0000000..0cd040c --- /dev/null +++ b/pages/wallet/privatekey.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue new file mode 100644 index 0000000..5583158 --- /dev/null +++ b/pages/wallet/property.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/pages/wallet/resetPassword.vue b/pages/wallet/resetPassword.vue new file mode 100644 index 0000000..c054f91 --- /dev/null +++ b/pages/wallet/resetPassword.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/pages/wallet/results.vue b/pages/wallet/results.vue new file mode 100644 index 0000000..2e2718c --- /dev/null +++ b/pages/wallet/results.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/pages/wallet/transfer.vue b/pages/wallet/transfer.vue new file mode 100644 index 0000000..e66843c --- /dev/null +++ b/pages/wallet/transfer.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/pages/wallet/validation.vue b/pages/wallet/validation.vue new file mode 100644 index 0000000..e28cb42 --- /dev/null +++ b/pages/wallet/validation.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/static/icons/logs-null.png b/static/icons/logs-null.png new file mode 100644 index 0000000000000000000000000000000000000000..eda2c1063decf97b7f95f041913ecbc2200967b5 GIT binary patch literal 5610 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 XHs@i6k(vZ}h6~tQI$&zdeXjl=N_I;^ literal 0 HcmV?d00001 diff --git a/static/imgs/cart_empty.png b/static/imgs/cart_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..64d64c852d8a6cada814c5db604837794ef2c33a GIT binary patch literal 3602 zcmV+t4(;)YP)#%k({TMtHRFL z;lRq(rm?%w+U3K}+O)mL&)MXbqOFsmve4P&oU6N&ps>o--><;Xo~g9O(At%xw$a<= zk)5pC;_T7d0MKs+-g9uhb%AU{4PDKjuSy#~CR000ctNkl8f&z(sNy=k&_mOzx=_}tQA;4E= ztn=u-GoSi0uxA`zcnf2y0Ngoj^DrXpfjNg=-oTJLEP*$NDGx*T+=tR4-j&RR26#h? z9oqXPux62DAXToKL$k6FxDTaAl1qEN>9e=60@e&B=tH*DH_We;X)${F*Sf8|jOoDw zKNdf6$c*lofvKx~2!Z7_ASp&~vPLJ#LUdSiJYhq{5UzBpsrf#P8yp|YQm6R#ig0`^ zYn|e_zpfn8o}N*PkxWmpzs1(bRFXUr*8hs4c-{Ru(}@|dW{|RYiOC+-*$>@S0dIyZ z_E6lCeV3seOty}nsZ#A^KXqFT>>1zL`3u}BbxD@bCG+1dvRnVB|HaEQS+dRa6ik}+P+77a zcF1fdRFZ6S2`0y^hw3Doysk0h<+|CnyxGQNTck*`9@7|%27+W3_(68rJ+Dno1# ziBlw&H1ePLDBIYy=P8NL!T@{84;OJN;Y%zZS`xPs{jYM%xo!f`=xtxxE*LG5E9^BX zKoiF*6j0XcQd;SxfL^Gkpa|LVwkI$@wx(#e$1{yh+kv4 zU>c);_RhYiZ5W8d_~zMb9IptQn5O8vj6@=lNF>q`N!(d9hn(-XPj4`iHM zVQS`SU|-Ty?GS-SajVRDFXNp<(ehE7w-1^kOL*h4lde*zFfxNc=EC0R|@>2|I;4GNWlb#3*G;Van-a1CSd*ESKFFyM<~n*QZwH zNh^g7ZmiT*^0AYCHi3GOGlwju474%4t_{Ds2;NW&{`xeEqK)BoZSxs#>;qW(lZG;e z*X1(B3i}2PP-bt8xw&3gOwuY!5@|YQz+=vglr#u);X4f|)0c<#`)jDe(i}%1)tEGP8ZeG_67q z0!BabGGns+JV8}TT5{6i$^w0TYQ9i4i^d1o`WFUn5$$y$xJIljx|e3^_Kc)t_1r_J z7OQO5P8X7wO;;8-&=mZjW|Sb7d{vQY0SDSb7oI-}VrAhCde3p3YopekJ{8L7dqg(XTYTF`XfFVO!Z3crHvw#xx*w;ak~Dcuu6o8q+}f;iT`C z1zy^5K)MRXh?Pa(C|w#0NtbskJB5KzteG)}(A8-xyM^J9IwV~M^Zw%zzC6Rx<<-hw z!|*8fq%J|8m9w4kC2cgSym+W|=8w{>ABghcUhmS}8n3?ksdjQ7a*W@;mB6RiM z%BBz`oD9re5==bW6JumP_{yRY9LV5IYM$r@3Fjcl;8eDk4KrFxdY-M8z5?&Y! zpf2a(tSp{J5Nj-i=1(Rett_4(Esce6$jE6}D~tLgRvHVT`QIg>tt_e_OJgB4e=-j| z9{p|S?pBirf-nH@1Y{t)C`kN7d@%%&bnN z|HBV4h`ubVS9CE$4>5@0Pixeb#XYJb22o^}9Q)&uq>32C@V}3;MTQymBnC13|3+Df z`T0oFT@0wm?xSph*q8JohB5pfqb&bId(+P~F^J(`eOIKwksaF03*s119bz7a|D~h6FpdF9U1C!Y|HDFz z&w7`V_@_hTPQD&V&;X$qs7>?ynKq8 z9|KaOc#X;nLySo2cBj%1lltX_Bc|J(Qfojez4Ag6(>ew;?@On=AjL)(8f%L2*vEt` zHu4zIuGet`7F=w^F`%@?V;@i*o#jNhyl2{T; zVl7ExNi2yau_Ttnl2~_=SQ1NONi2yau_V@=B$mXISQ1NONi2zVCy6DoBsPiICk;-x zVx_Q|{CJ{a303TEEo^6hr6CDZ?B?Ynn*;SHM6tJxaFu0$bA~5&UI>@T`bAP#~i)-o0Fql=$JR>ce@zkH<}RAx Date: Sat, 25 Sep 2021 14:08:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E2=80=98=E9=80=9A=E7=94=A8=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=A4=84=E7=90=86=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 +++- components/no-list-components/index.vue | 19 +++++++++++-------- pages/wallet/index.vue | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/apis/index.js b/apis/index.js index ec79c85..dd9661c 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,6 +10,7 @@ import store from '@/store' // 基础配置 const config = { apiUrl : 'http://api.ahxh.shangkelian.cn/api/', + apiUrls : 'http://api.ahxh.shangkelian.cn', timeout : 60000 } @@ -154,5 +155,6 @@ const loginHint = () => { export { request, - uploading + uploading, + config } diff --git a/components/no-list-components/index.vue b/components/no-list-components/index.vue index fa2f702..85d597f 100644 --- a/components/no-list-components/index.vue +++ b/components/no-list-components/index.vue @@ -1,13 +1,14 @@ - diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue index 5583158..25d426d 100644 --- a/pages/wallet/property.vue +++ b/pages/wallet/property.vue @@ -266,8 +266,8 @@ } .balance { - font-size: $title-size * 2; - padding: ($padding / 2) 0; + font-size: $title-size * 2.5; + padding: $padding 0; color: white; } @@ -275,18 +275,17 @@ background: rgba($color: #000000, $alpha: .1); color: rgba($color: white, $alpha: .7); display: inline-block; - padding: 0 $padding; - font-size: $title-size-m; - height: 50rpx; - line-height: 50rpx; + font-size: 24rpx; + padding: 6rpx $padding; border-radius: $radius-m; border: solid 1rpx rgba($color: white, $alpha: .4) + } .balance-flex { display: flex; justify-content: center; - margin-top: $margin * 3; + margin-top: $margin * 2; .balance-flex-item { background-color: white; @@ -296,7 +295,7 @@ color: $text-price; margin: 0 $margin; border-radius: $radius-m; - font-size: $title-size; + font-size: 28rpx; } } } diff --git a/scss/globa.scss b/scss/globa.scss index f63b05f..e4906a3 100644 --- a/scss/globa.scss +++ b/scss/globa.scss @@ -76,7 +76,7 @@ $padding: 30rpx; -webkit-line-clamp: 2; } -.ellipsis { +.ellipsis-1 { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/static/imgs/account-bg.png b/static/imgs/account-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..166699cf2c24b180582e03d09d049d39f3aeec51 GIT binary patch literal 2921 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 Q5eA%fbUXd(RM5@;0Q&yWSpWb4 literal 0 HcmV?d00001 diff --git a/static/imgs/record-icon.png b/static/imgs/record-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4480415394419c9f833560fe9e45d01e9273298f GIT binary patch literal 1071 zcmV+~1kn45P)C0000*P)t-s0001k zMBs));DbWpg+k$lL*Ru&;e|utghJtkL*a!(;Dtlsg+t(lL*a!(;Dkftf<@wmL*a%& z;e|uthC$$jL*Ru&;EX6@w*UYD7IachQvg4|e~d@m$Wmdp=&sZ7B@=QpqaB-^P}$@F z00V71j3&BN zcOmzPeGXlnTr?wm2V<*@FUgfPa4g;?{6MlE4#K;DMFi&$Y+c8pNysKOuotmH5mnr$ z`5ML4+ZE;(H_^_p35%PtAg8Hu2kK_y?Q3VAkp@0exq=Jt)JQSzYKH((!=X)8c!7tFjDnr085C&MI#jnsR z1pr|c0-z)eYFy_MXDDa!Q;+YcxdSi(m!;+o!i=i~kl^qgGiL@2AR@D7LX@R0c~*<% z5jca8juD3u*8wRPMi*4?7E)4T`O=_y`$H+FJR2nqfkeObs3Cx!a)yooEsg?Ppcx+8 zYDT_5pb_8-)QI*WjaF;{8Ux1_ur!Zp!W+JTD;R+{x90zPlg)x22s8ra0yJ&&@T+~a zTmiZV%NJO>TaFxQ04;C@=)Wqa09`vhwa*ZsYa>^H^8A(B7YQJR084-d?&mK^1$@C` zy!yC{V?iunDFj$~;6}nb_6{=-(8V)XV8GW*0)Y%LB3EF-*R%ow9Ko;!%#J;P1|nMk zri?GREE0hTjx9huO#!}ugQP2vpw<ZHYyia{lblM0Vmq39iDDO zEZ`-Z)z2|IO9g^#yMDq4MyY@kez2&YUPy!jUi!(VvA>WnO4FG>T0!+)f#>VS?+e7z zPqzW2Oq>#eh^vf;e7cS0pYII_$*e+_SyBfmuV9!tB^(n-SlD$m^}bQi6-FS@>{-O( zdqFjqeWQG_-V_sEi|?>!E#=ZLW>YWc(=TWQxZ=TF6^g2vX|=-x={6Kr{|}|r83>Ky z>T1)IbUO|})xiB*M?CZox#%DB(Ld;Pf}>vghuuza+)w|&;|Y#@p5V~y36A}q;NbHe pZ>x_3Z#^7~UqAdVX Date: Sat, 25 Sep 2021 16:27:55 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=A2=8E=E7=89=87=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/wallet/fragment.vue | 6 ++++-- pages/wallet/property.vue | 34 ++++++++++++++++++++++++---------- static/imgs/record-icon.png | Bin 1071 -> 3404 bytes 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/pages/wallet/fragment.vue b/pages/wallet/fragment.vue index c6a780d..d436bb2 100644 --- a/pages/wallet/fragment.vue +++ b/pages/wallet/fragment.vue @@ -34,7 +34,7 @@ - 完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片 + 完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片 {{cointype==='in'?'+':'-'}}5 2021-12-22 12:12:12 @@ -206,6 +206,7 @@ bottom: 0; right: 0; z-index: 1; + opacity: .5; } .record-top-nav { @@ -315,8 +316,9 @@ width: 600rpx; .title { - font-size: 30rpx; + font-size: 32rpx; width: 600rpx; + color: #444; } .money { diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue index 25d426d..b732dd4 100644 --- a/pages/wallet/property.vue +++ b/pages/wallet/property.vue @@ -1,6 +1,7 @@ @@ -137,10 +364,83 @@ background: #1f1922; overflow: hidden; } + // 平台概况 + .situation{ + margin: 0 $margin; + background-image: linear-gradient(to bottom, $block-color, #1f1922); + border-radius: $radius; + padding: $padding $padding/2 $padding*2; + // 平台统计 + .header{ + display: flex; + flex-wrap: wrap; + margin-bottom: $margin*2; + .number{ + color: white; + font-size: $title-size; + padding-top: $padding/2; + font-weight: bold; + } + .title{ + color: rgba($color: white, $alpha: .4); + font-size: $title-size-sm; + } + .header-item{ + width: 50%; + padding: $padding / 2; + box-sizing: border-box; + &:first-child{ + width: 100%; + .number{ + font-size: $title-size; + } + } + } + } + // 节点信息 + .node-info{ + display: flex; + flex-wrap: wrap; + margin: 0 -$margin / 2; + .node-item{ + background: rgba($color: $block-color, $alpha: .8); + width: calc(50% - #{$margin}); + margin: $margin / 2; + padding: $padding; + box-sizing: border-box; + border-radius: $radius/2; + } + .number{ + font-size: $title-size + 4; + font-weight: bold; + color: white; + } + .title{ + font-size: $title-size-sm; + color: white; + } + } + // 图表 + .chart{ + background: rgba($color: $block-color, $alpha: .8); + padding: $padding; + border-radius: $radius/2; + margin-top: $margin; + .title{ + text-align: center; + line-height: 80rpx; + color: white; + font-size: $title-size-m; + } + .chart-f2{ + height: 200px; + } + } + } // 数据统计 .total { position: relative; - margin: $margin ($margin + $margin/2); + margin: $margin; background: #2b2449; padding: 0; display: flex; @@ -171,6 +471,12 @@ background: linear-gradient(to bottom, transparent, rgba(255, 255, 255, .7), transparent); } } + // 求助icon + .help-icon{ + vertical-align: middle; + margin-left: $margin/3; + opacity: .7; + } // 矿石 .ore { position: relative; diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue new file mode 100644 index 0000000..48c53b6 --- /dev/null +++ b/pages/instrument/Spread.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/pages/news/detail.vue b/pages/news/detail.vue index 8ffa1ac..7687a4e 100644 --- a/pages/news/detail.vue +++ b/pages/news/detail.vue @@ -1,6 +1,6 @@