diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 94c1df1..685207f 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -133,6 +133,29 @@ const relationsBind = (invite, type) => { }) } +// 提交运营中心别名 +const submitTeamName = (data) => { + return request({ + url: 'user/team', + data:data, + method: 'POST' + }) +} +// 获取运营中心记录 +const getTeam = () => { + return request({ + url : 'user/team', + }) +} + +// 获取运营中心记录 +const getTeamLogs = data => { + return request({ + url: 'user/team/logs', + data + }) +} + export { relations, code, @@ -148,5 +171,8 @@ export { userInfoBank, getRegion, relationsVerify, - relationsBind + relationsBind, + submitTeamName, + getTeam, + getTeamLogs, } diff --git a/manifest.json b/manifest.json index c11c7e1..fb01d48 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.3.0", - "versionCode" : 102, + "versionName" : "1.2.9", + "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 50b0034..7f4e18f 100644 --- a/pages.json +++ b/pages.json @@ -220,6 +220,16 @@ "navigationBarBackgroundColor": "#926fff", "navigationBarTextStyle": "white" } + }, { + "path": "pages/account/yunying", + "auth": true, + "name": "YunYing", + "style": { + "navigationBarTitleText": "运营中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } }, { "path": "pages/account/cash", "auth": true, diff --git a/pages/account/bonus.vue b/pages/account/bonus.vue index 47f54cc..3f88037 100644 --- a/pages/account/bonus.vue +++ b/pages/account/bonus.vue @@ -2,11 +2,17 @@ - - {{total}} - {{ type === 'balance' ? '账户余额': '已提现总金额'}} + + + {{total}} + {{ type === 'balance' ? '账户余额': '已提现总金额'}} + + 提现 - 提现 + + 已发放 :¥{{sended}} + 待发放 :¥{{frozen}} + @@ -16,17 +22,22 @@ :activeStyle="{color: '#906BFF', fontWeight: 'bold'}" lineColor="#8E6AFF" @click="onTabs" - > + /> - {{item.remark || '-'}} + + {{item.remark || '-'}} + {{item.frozen.text}} + {{item.created_at}} - {{item.amount}} + + {{item.amount}} + @@ -64,6 +75,8 @@ { name: '提现记录', value: 'withdraws' }, ], total : '0.00', + sended : '0.00', + frozen : '0.00', list : [], page : { current : 1, @@ -90,6 +103,8 @@ } this.list = [] this.total = '0.00' + this.sended = '0.00' + this.frozen = '0.00' this.getList() }, // 获取账户余额 @@ -106,9 +121,11 @@ balance({ page: this.page.current }).then(res => { - let { balance, logs } = res; + let { balance, logs ,sended,frozen } = res; let atList = logs.page.current == 1 ? [] : this.list this.total = balance + this.sended = sended + this.frozen = frozen this.list = atList.concat(logs.data) this.page = logs.page this.pagesShow = false @@ -171,9 +188,31 @@ background-position: top center; padding: 50rpx 30rpx 170rpx; color: white; - display: flex; - justify-content: space-between; - align-items: center; + .total-item-1{ + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + } + .total-item-2{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + // margin-top: $margin; + position: relative; + top: $margin ; + padding-bottom: 20rpx; + font-size: 30rpx; + view{ + opacity: 0.9; + font-size: 26rpx; + } + span{ + font-size:32rpx; + } + } .total-left{ width: calc( 100% - 200rpx ); } @@ -183,17 +222,17 @@ font-family: Arial, Helvetica, sans-serif; } .total-text{ - font-size: 30rpx; - opacity: .7; + font-size: 26rpx; + opacity: .9; line-height: 40rpx; padding-top: 20rpx; } .total-btn{ background: white; color: #8E6AFF; - line-height: 80rpx; + line-height: 70rpx; border-radius: 40rpx; - width: 170rpx; + width: 200rpx; font-weight: bold; text-align: center; } @@ -231,6 +270,9 @@ text-align: right; font-weight: bold; color: #9675FF; + .active{ + color: #d90017; + } } .type{ font-weight: bold; @@ -241,6 +283,20 @@ padding-right: 10rpx; color: $main-color; } + span{ + font-size: 22rpx; + font-weight: normal; + background-color: rgba(#8E6AFF, 0.4); + padding: 2rpx 20rpx; + border-radius: 40rpx; + color: #fff; + position: relative; + left: 20rpx; + top: -6rpx; + } + .active{ + background-color: rgba(#d90017, 0.4); + } } .remark{ font-size: 28rpx; diff --git a/pages/account/yunying.vue b/pages/account/yunying.vue new file mode 100644 index 0000000..06caf7f --- /dev/null +++ b/pages/account/yunying.vue @@ -0,0 +1,559 @@ + + + + + diff --git a/pages/user/index.vue b/pages/user/index.vue index 4fdaac5..343a2e9 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -1,476 +1,694 @@ - - - - - diff --git a/static/icons/yunying.png b/static/icons/yunying.png new file mode 100644 index 0000000..20fab21 Binary files /dev/null and b/static/icons/yunying.png differ diff --git a/static/icons/yunying_bg.png b/static/icons/yunying_bg.png new file mode 100644 index 0000000..106c0d6 Binary files /dev/null and b/static/icons/yunying_bg.png differ