From 47ed709df8765abaf7943755ba7afc454b4ea2df Mon Sep 17 00:00:00 2001 From: chengkun <2500338766@qq.com> Date: Tue, 12 Jul 2022 18:24:44 +0800 Subject: [PATCH] feature-hub-1.0: subpackages finish --- README.en.md | 36 ---- api/profit.js | 9 + package-lock.json | 163 +++++++++++++- .../about/about.vue | 0 .../contact/contact.vue | 0 .../extends/extends.vue | 0 .../inviteLog/inviteLog.vue | 0 .../notice/notice.vue | 0 .../withdraw/withdraw.vue | 0 pages.json | 165 +++++++++----- pages/index/banner.vue | 22 ++ pages/index/index.vue | 55 +++-- pages/profit/profit.vue | 203 +++++++++++++++++- pages/profit/profitEndDetails.vue | 118 ++++++++++ pages/profit/profitEndOrder.vue | 57 +++++ pages/profit/profitInDetails.vue | 117 ++++++++++ pages/profit/profitInOrder.vue | 89 ++++++++ pages/profit/profitPreDetails.vue | 107 +++++++++ pages/userInfo/userInfo.vue | 14 +- 19 files changed, 1040 insertions(+), 115 deletions(-) delete mode 100644 README.en.md rename {pages/userInfo => pages-userInfo}/about/about.vue (100%) rename {pages/userInfo => pages-userInfo}/contact/contact.vue (100%) rename {pages/userInfo => pages-userInfo}/extends/extends.vue (100%) rename {pages/userInfo => pages-userInfo}/inviteLog/inviteLog.vue (100%) rename {pages/userInfo => pages-userInfo}/notice/notice.vue (100%) rename {pages/userInfo => pages-userInfo}/withdraw/withdraw.vue (100%) create mode 100644 pages/index/banner.vue create mode 100644 pages/profit/profitEndDetails.vue create mode 100644 pages/profit/profitEndOrder.vue create mode 100644 pages/profit/profitInDetails.vue create mode 100644 pages/profit/profitInOrder.vue create mode 100644 pages/profit/profitPreDetails.vue diff --git a/README.en.md b/README.en.md deleted file mode 100644 index ed03978..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# bnyer-cloud-hub - -#### Description -节点hub微信小程序端 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/api/profit.js b/api/profit.js index 5845be4..a9d6b02 100644 --- a/api/profit.js +++ b/api/profit.js @@ -74,3 +74,12 @@ export function queryFrontProfitInfo(creatorId) { }) } +// 查询指定艺术家转入钱包收益详情 +export function queryFrontEndAmtDetails(id) { + return request({ + url: `${serviceTitle}${prefix}/queryFrontEndAmtDetails/${id}`, + method: 'get' + }) +} + + diff --git a/package-lock.json b/package-lock.json index b4fdc0b..df664b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,167 @@ { + "name": "bnyer-cloud-hub", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "dependencies": { + "axios": "^0.26.1", + "js-md5": "^0.7.3", + "qs": "^6.10.3", + "vue-router": "^4.0.14", + "vuex": "^4.0.2" + } + }, + "node_modules/@vue/devtools-api": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.0.tgz", + "integrity": "sha512-pF1G4wky+hkifDiZSWn8xfuLOJI1ZXtuambpBEYaf7Xaf6zC/pM29rvAGpd3qaGXnr4BAXU1Pxz/VfvBGwexGA==" + }, + "node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "dependencies": { + "follow-redirects": "^1.14.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.1", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz", + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/get-intrinsic": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz", + "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, + "node_modules/object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/vue-router": { + "version": "4.0.16", + "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.0.16.tgz", + "integrity": "sha512-JcO7cb8QJLBWE+DfxGUL3xUDOae/8nhM1KVdnudadTAORbuxIC/xAydC5Zr/VLHUDQi1ppuTF5/rjBGzgzrJNA==", + "dependencies": { + "@vue/devtools-api": "^6.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/posva" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, + "node_modules/vuex": { + "version": "4.0.2", + "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", + "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", + "dependencies": { + "@vue/devtools-api": "^6.0.0-beta.11" + }, + "peerDependencies": { + "vue": "^3.0.2" + } + } + }, "dependencies": { "@vue/devtools-api": { "version": "6.2.0", diff --git a/pages/userInfo/about/about.vue b/pages-userInfo/about/about.vue similarity index 100% rename from pages/userInfo/about/about.vue rename to pages-userInfo/about/about.vue diff --git a/pages/userInfo/contact/contact.vue b/pages-userInfo/contact/contact.vue similarity index 100% rename from pages/userInfo/contact/contact.vue rename to pages-userInfo/contact/contact.vue diff --git a/pages/userInfo/extends/extends.vue b/pages-userInfo/extends/extends.vue similarity index 100% rename from pages/userInfo/extends/extends.vue rename to pages-userInfo/extends/extends.vue diff --git a/pages/userInfo/inviteLog/inviteLog.vue b/pages-userInfo/inviteLog/inviteLog.vue similarity index 100% rename from pages/userInfo/inviteLog/inviteLog.vue rename to pages-userInfo/inviteLog/inviteLog.vue diff --git a/pages/userInfo/notice/notice.vue b/pages-userInfo/notice/notice.vue similarity index 100% rename from pages/userInfo/notice/notice.vue rename to pages-userInfo/notice/notice.vue diff --git a/pages/userInfo/withdraw/withdraw.vue b/pages-userInfo/withdraw/withdraw.vue similarity index 100% rename from pages/userInfo/withdraw/withdraw.vue rename to pages-userInfo/withdraw/withdraw.vue diff --git a/pages.json b/pages.json index 73e85c4..c599d85 100644 --- a/pages.json +++ b/pages.json @@ -14,55 +14,7 @@ "enablePullDownRefresh": true } }, - { - "path": "pages/userInfo/userInfo", - "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": false - } - },{ - "path": "pages/userInfo/about/about", - "style": { - "navigationBarTitleText": "关于", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/contact/contact", - "style": { - "navigationBarTitleText": "联系我们", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/extends/extends", - "style": { - "navigationBarTitleText": "邀请更多", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/inviteLog/inviteLog", - "style": { - "navigationBarTitleText": "邀请记录", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/notice/notice", - "style": { - "navigationBarTitleText": "系统公告", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/withdraw/withdraw", - "style": { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false - } - } - ,{ + { "path" : "pages/index/upload/upload", "style" : { @@ -84,7 +36,7 @@ "path" : "pages/login/login", "style" : { - "navigationBarTitleText": "", + "navigationBarTitleText": "登录", "enablePullDownRefresh": false } @@ -92,13 +44,120 @@ ,{ "path" : "pages/register/register", "style" : + { + "navigationBarTitleText": "注册", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/index/banner", + "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } } + ,{ + "path" : "pages/profit/profitPreDetails", + "style" : + { + "navigationBarTitleText": "即将入账详情", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/profit/profitInDetails", + "style" : + { + "navigationBarTitleText": "已入账详情", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/profit/profitInOrder", + "style" : + { + "navigationBarTitleText": "收益结算单", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/profit/profitEndDetails", + "style" : + { + "navigationBarTitleText": "转入钱包详情", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/profit/profitEndOrder", + "style" : + { + "navigationBarTitleText": "转入钱包结算单", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/userInfo/userInfo", + "style" : + { + "navigationBarTitleText": "我的", + "enablePullDownRefresh": false + } + } ], + + "subPackages": [{ + "root": "pages-userInfo", + "pages":[{ + "path":"about/about", + "style":{ + "navigationBarTitleText": "关于节点", + "enablePullDownRefresh": false + } + }, + { + "path":"contact/contact", + "style":{ + "navigationBarTitleText": "联系我们", + "enablePullDownRefresh": false + } + }, + { + "path":"extends/extends", + "style":{ + "navigationBarTitleText": "邀请更多人", + "enablePullDownRefresh": false + } + }, + { + "path":"inviteLog/inviteLog", + "style":{ + "navigationBarTitleText": "邀请记录", + "enablePullDownRefresh": false + } + },{ + "path":"notice/notice", + "style":{ + "navigationBarTitleText": "通知公告", + "enablePullDownRefresh": false + } + }, + { + "path":"withdraw/withdraw", + "style":{ + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false + } + }] + }], + "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "bnyer", @@ -116,15 +175,15 @@ "iconPath": "static/index-default.png", "selectedIconPath": "static/index-select.png", "text": "首页" - }, - { + }, + { "pagePath": "pages/profit/profit", "iconPath": "static/theme-default.png", "selectedIconPath": "static/theme-select.png", "text": "收益" }, { - "pagePath": "pages/userInfo/userInfo", + "pagePath": "pages/userInfo/userInfo", "iconPath": "static/mine-default.png", "selectedIconPath": "static/mine-select.png", "text": "我的" diff --git a/pages/index/banner.vue b/pages/index/banner.vue new file mode 100644 index 0000000..a623498 --- /dev/null +++ b/pages/index/banner.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 7d5679c..1ed92ca 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,13 +1,14 @@