|
@@ -40,88 +40,181 @@
|
|
|
</view>
|
|
|
|
|
|
<view class="show-income1">
|
|
|
- <view>
|
|
|
- <view style="display: flex;align-items: center;margin-left: 5%;">
|
|
|
- <p>我获得的收益总数</p>
|
|
|
- <image id="helpicon" :src="picture.icon_help" mode=""
|
|
|
- style="width: 35rpx;height: 35rpx;padding-left: 10rpx;" @click="showHelp = true" />
|
|
|
- </view>
|
|
|
-
|
|
|
- <view class="tip_box" v-if="showHelp" :style="{ top: boxTop + 'px'}">
|
|
|
- <view class="container" :style="{
|
|
|
- 'margin-right': cotainerMargin + 'px',
|
|
|
- backgroundColor: '#404040', borderRadius: '5px' }">
|
|
|
- <!-- 提示文字 -->
|
|
|
- <view class="tips">
|
|
|
- <p style="font-size: 24rpx;color: #fff">{{Text}}</p>
|
|
|
- </view>
|
|
|
- <view class="close" @click="showHelp = false">
|
|
|
- <image class="closeImg" src="../../static/delete.png" />
|
|
|
+ <view class="show-income1-left">
|
|
|
+ <view class="show-income1-left-up">
|
|
|
+ <view style="display: flex;align-items: center;">
|
|
|
+ <p>我获得的收益总数</p>
|
|
|
+ <image id="helpicon" :src="picture.icon_help" mode=""
|
|
|
+ style="width: 35rpx;height: 35rpx;padding-left: 10rpx;"
|
|
|
+ @click="showIncomeHelp = true" />
|
|
|
+ </view>
|
|
|
+ <view class="tip_box" v-if="showIncomeHelp" :style="{ top: boxTop + 'px'}">
|
|
|
+ <view class="container" :style="{
|
|
|
+ 'margin-right': cotainerMargin + 'px',
|
|
|
+ backgroundColor: '#404040', borderRadius: '5px' }">
|
|
|
+ <!-- 提示文字 -->
|
|
|
+ <view class="tips">
|
|
|
+ <p>{{Text}}</p>
|
|
|
+ </view>
|
|
|
+ <view class="close" @click="showIncomeHelp = false">
|
|
|
+ <image class="closeImg" src="../../static/delete.png" />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view class="show-income1-text">
|
|
|
- <view style="padding-left: 5%;">
|
|
|
- <p style="font-size: 40rpx;font-weight:bold;color: #F0D232;"
|
|
|
- @click="toincome('can')">
|
|
|
- {{information.showIncome?information.showIncome:'0.00'}}
|
|
|
+ <view class="show-income1-left-down">
|
|
|
+ <p @click="toIncome('can')">
|
|
|
+ {{information.showIncome?information.showIncome:'0.0'}}
|
|
|
</p>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
+ <view class="show-income1-right">
|
|
|
<view>
|
|
|
- <button class="show-income1-btn" type="default" @click="toincome('can')">去提现</button>
|
|
|
+ <button class="show-income1-btn" type="default" @click="toIncome('can')">提现</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="show-income2">
|
|
|
- <view class="show-income2-text" @click="toincome('can')">
|
|
|
+ <view class="show-income2-text" @click="toIncome('can')">
|
|
|
<p style="padding-bottom: 20rpx;">可提现</p>
|
|
|
- <p>{{information.showCanwithdraw?information.showCanwithdraw:'0.00'}}</p>
|
|
|
+ <p>{{information.showCanwithdraw?information.showCanwithdraw:'0.0'}}</p>
|
|
|
</view>
|
|
|
- <view class="show-income2-text" @click="toincome('ed')">
|
|
|
+ <view class="show-income2-text" @click="toIncome('ed')">
|
|
|
<p style="padding-bottom: 20rpx;">已提现</p>
|
|
|
- <p>{{information.showWithdrawed?information.showWithdrawed:'0.00'}}</p>
|
|
|
+ <p>{{information.showWithdrawed?information.showWithdrawed:'0.0'}}</p>
|
|
|
</view>
|
|
|
- <view class="show-income2-text" @click="toincome('ing')">
|
|
|
+ <view class="show-income2-text" @click="toIncome('ing')">
|
|
|
<p style="padding-bottom: 20rpx;">提现中</p>
|
|
|
- <p>{{information.showWithdrawing?information.showWithdrawing:'0.00'}}</p>
|
|
|
+ <p>{{information.showWithdrawing?information.showWithdrawing:'0.0'}}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
+ <view class="show-income1">
|
|
|
+ <view class="show-income1-left">
|
|
|
+ <view class="show-income1-left-up" style="margin-bottom: 10rpx;">
|
|
|
+ <view style="display: flex;align-items: center;">
|
|
|
+ <p>创作者积分</p>
|
|
|
+ <image id="helpicon" :src="picture.icon_help" mode=""
|
|
|
+ style="width: 35rpx;height: 35rpx;padding-left: 10rpx;" @click="showPointHelp = true" />
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="tip_box" v-if="showPointHelp" :style="{ top: boxTop + 'px'}">
|
|
|
+ <view class="container" :style="{
|
|
|
+ 'margin-right': cotainerMargin + 'px',
|
|
|
+ backgroundColor: '#404040', borderRadius: '5px' }">
|
|
|
+ <!-- 提示文字 -->
|
|
|
+ <view class="tips">
|
|
|
+ <p>{{Text}}</p>
|
|
|
+ </view>
|
|
|
+ <view class="close" @click="showPointHelp = false">
|
|
|
+ <image class="closeImg" src="../../static/delete.png" />
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="show-income1-left-down">
|
|
|
+ <p @click="toPoint()">
|
|
|
+ {{information.showIncome?information.showIncome:'0'}}
|
|
|
+ </p>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="show-income1-right" @click="toPoint()">
|
|
|
+ <image class="show-body1-icon" :src="picture.icon_right"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
<view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
|
|
|
<view class="show-body1">
|
|
|
- <view class="show-body1-text1" @click="tomytask('all')">
|
|
|
+ <view class="show-body1-text1" @click="toMyTask('all')">
|
|
|
<p>我的任务</p>
|
|
|
</view>
|
|
|
- <view class="show-body1-text2" @click="tomytask('all')">
|
|
|
+ <view class="show-body1-text2" @click="toMyTask('all')">
|
|
|
<image class="show-body1-icon" :src="picture.icon_right"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="show-body2">
|
|
|
- <view class="show-body2-text" @click="tomytask('all')">
|
|
|
- <p class="task-num-p">{{information.task_all?information.task_all:0}}</p>
|
|
|
+ <view class="show-body2-text" @click="toMyTask('all')">
|
|
|
+ <p class="task-num-p">{{information.numAllTask?information.numAllTask:0}}</p>
|
|
|
<p padding>全部任务</p>
|
|
|
</view>
|
|
|
- <view class="show-body2-text" @click="tomytask('apply')">
|
|
|
- <p class="task-num-p">{{information.task_apply?information.task_apply:0}}
|
|
|
- <p>
|
|
|
+ <view class="show-body2-text" @click="toMyTask('apply')">
|
|
|
+ <p class="task-num-p">{{information.numApplyTask?information.numApplyTask:0}}</p>
|
|
|
<p>已报名</p>
|
|
|
</view>
|
|
|
- <view class="show-body2-text" @click="tomytask('execute')">
|
|
|
- <p class="task-num-p">{{information.task_execute?information.task_execute:0}}</p>
|
|
|
+ <view class="show-body2-text" @click="toMyTask('execute')">
|
|
|
+ <p class="task-num-p">{{information.numExecuteTask?information.numExecuteTask:0}}</p>
|
|
|
+ <p>执行中</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2-text" @click="toMyTask('end')">
|
|
|
+ <p class="task-num-p">{{ information.numEndTask ? information.numEndTask:0}}</p>
|
|
|
+ <p>已结束</p>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
|
|
|
+ <view class="show-body1">
|
|
|
+ <view class="show-body1-text1" @click="toMyTeam('exe')">
|
|
|
+ <p>YOUNG之团</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body1-text2" @click="toMyTeam('exe')">
|
|
|
+ <p style="color: #f0d232;">看看团长收益</p>
|
|
|
+ <image class="show-body1-icon" :src="picture.icon_right"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2">
|
|
|
+ <view class="show-body2-text" @click="toMyTeam('exe')">
|
|
|
+ <p class="task-num-p">{{information.numExeTeam?information.numExeTeam:0}}</p>
|
|
|
+ <p padding>开团中</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2-text" @click="toMyTeam('end')">
|
|
|
+ <p class="task-num-p">{{information.numEndTeam?information.numEndTeam:0}} </p>
|
|
|
+ <p>已结束</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2-text">
|
|
|
+ <p style="color: #fff;">已结束</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2-text">
|
|
|
+ <p style="color: #fff;">已结束</p>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
|
|
|
+ <view class="show-body1">
|
|
|
+ <view class="show-body1-text1" @click="toMySec('all')">
|
|
|
+ <p>选品广场</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body1-text2" @click="toMySec('all')">
|
|
|
+ <image class="show-body1-icon" :src="picture.icon_right"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2">
|
|
|
+ <view class="show-body2-text" @click="toMySec('apply')">
|
|
|
+ <p class="task-num-p">{{information.numApplySec?information.numApplySec:0}}</p>
|
|
|
+ <p padding>已报名</p>
|
|
|
+ </view>
|
|
|
+ <view class="show-body2-text" @click="toMySec('execute')">
|
|
|
+ <p class="task-num-p">{{information.numExecuteSec?information.numExecuteSec:0}}</p>
|
|
|
<p>执行中</p>
|
|
|
</view>
|
|
|
- <view class="show-body2-text" @click="tomytask('end')">
|
|
|
- <p class="task-num-p">{{ information.task_end ? information.task_end:0}}</p>
|
|
|
+ <view class="show-body2-text" @click="toMySec('end')">
|
|
|
+ <p class="task-num-p">{{information.numEndSec?information.numEndSec:0}}</p>
|
|
|
<p>已结束</p>
|
|
|
</view>
|
|
|
+ <view class="show-body2-text">
|
|
|
+ <p style="color: #fff;">已结束</p>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
<view class="show-body">
|
|
|
<view class="show-body2">
|
|
|
<view class="show-body2-text" @click="handleInformation()">
|
|
|
- <image class="show-info-icon" style="width: 60rpx;height: 60rpx;padding-bottom: 15rpx;" :src="picture.icon_person"></image>
|
|
|
+ <image class="show-info-icon" style="width: 60rpx;height: 60rpx;padding-bottom: 15rpx;"
|
|
|
+ :src="picture.icon_person"></image>
|
|
|
<p>我的信息</p>
|
|
|
</view>
|
|
|
<view class="show-body2-text" @click="handleSubmitTask()">
|
|
@@ -304,7 +397,8 @@
|
|
|
navH: getApp().globalData.navHeight,
|
|
|
hasUnReadMessage: false,
|
|
|
Text: "在平台产生的总收益【可提现+已提现+提现中】",
|
|
|
- showHelp: false,
|
|
|
+ showPointHelp: false,
|
|
|
+ showIncomeHelp: false,
|
|
|
boxTop: 0,
|
|
|
arrowMargin: 0,
|
|
|
cotainerMargin: 0,
|
|
@@ -382,10 +476,10 @@
|
|
|
.then(res => {
|
|
|
console.log(res)
|
|
|
if (res.data.code === 0) {
|
|
|
- this.information.task_all = res.data.data.all_num
|
|
|
- this.information.task_apply = res.data.data.sign_up_num
|
|
|
- this.information.task_execute = res.data.data.going_on_num
|
|
|
- this.information.task_end = res.data.data.completed_num
|
|
|
+ this.information.numAllTask = res.data.data.all_num
|
|
|
+ this.information.numApplyTask = res.data.data.sign_up_num
|
|
|
+ this.information.numExecuteTask = res.data.data.going_on_num
|
|
|
+ this.information.numEndTask = res.data.data.completed_num
|
|
|
}
|
|
|
})
|
|
|
await this.$https.get('/youngee/c/t/g/has-un-read-message')
|
|
@@ -457,7 +551,7 @@
|
|
|
this.login()
|
|
|
},
|
|
|
// 进入收益页面
|
|
|
- toincome(tab) {
|
|
|
+ toIncome(tab) {
|
|
|
console.log(tab)
|
|
|
if (this.token !== '') {
|
|
|
switch (tab) {
|
|
@@ -480,8 +574,16 @@
|
|
|
} else
|
|
|
this.login()
|
|
|
},
|
|
|
+ toPoint() {
|
|
|
+ if (this.token !== '') {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/mycenter/mypoint/mypoint'
|
|
|
+ });
|
|
|
+ } else
|
|
|
+ this.login()
|
|
|
+ },
|
|
|
// 进入我的任务页面
|
|
|
- tomytask(tab) {
|
|
|
+ toMyTask(tab) {
|
|
|
console.log(tab)
|
|
|
if (this.token !== '') {
|
|
|
var data = {
|
|
@@ -494,6 +596,34 @@
|
|
|
} else
|
|
|
this.login()
|
|
|
},
|
|
|
+ // 进入我的young之团页面
|
|
|
+ toMyTeam(tab) {
|
|
|
+ console.log("toMyTeam: ",tab)
|
|
|
+ if (this.token !== '') {
|
|
|
+ var data = {
|
|
|
+ tab: tab
|
|
|
+ };
|
|
|
+ data = JSON.stringify(data)
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/mycenter/myteam/myteam?textObj=' + encodeURIComponent(data)
|
|
|
+ });
|
|
|
+ } else
|
|
|
+ this.login()
|
|
|
+ },
|
|
|
+ // 进入我的选品页面
|
|
|
+ toMySec(tab) {
|
|
|
+ console.log("toMySec: ",tab)
|
|
|
+ if (this.token !== '') {
|
|
|
+ var data = {
|
|
|
+ tab: tab
|
|
|
+ };
|
|
|
+ data = JSON.stringify(data)
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/mycenter/myselection/myselection?textObj=' + encodeURIComponent(data)
|
|
|
+ });
|
|
|
+ } else
|
|
|
+ this.login()
|
|
|
+ },
|
|
|
// 保留两位小数点
|
|
|
toDecimal(x) {
|
|
|
var f = parseFloat(x);
|
|
@@ -624,30 +754,40 @@
|
|
|
|
|
|
.show-income1 {
|
|
|
height: 150rpx;
|
|
|
- margin: 0 3%;
|
|
|
- }
|
|
|
-
|
|
|
- .show-income1-text {
|
|
|
+ margin: 0 3% 0 8%;
|
|
|
display: flex;
|
|
|
- align-items: center;
|
|
|
justify-content: space-between;
|
|
|
- padding: 0 5%;
|
|
|
- margin-top: 30rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .show-income1-text2 {
|
|
|
- flex: 1;
|
|
|
- display: flex;
|
|
|
+ align-items: center;
|
|
|
}
|
|
|
|
|
|
.show-income1-btn {
|
|
|
- width: auto;
|
|
|
+ width: 150rpx;
|
|
|
// padding: 0 40rpx;
|
|
|
text-align: center;
|
|
|
background-color: #F0D232;
|
|
|
border-radius: 15rpx;
|
|
|
font-size: 32rpx;
|
|
|
- line-height: 200%;
|
|
|
+ line-height: 250%;
|
|
|
+ }
|
|
|
+
|
|
|
+ .show-income1-left {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: start;
|
|
|
+ }
|
|
|
+
|
|
|
+ .show-income1-left-up {
|
|
|
+ margin-bottom: 10rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .show-income1-left-down p {
|
|
|
+ font-size: 40rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #F0D232;
|
|
|
+ }
|
|
|
+
|
|
|
+ .show-income1-right {
|
|
|
+ padding-right: 20rpx;
|
|
|
}
|
|
|
|
|
|
.show-income2 {
|
|
@@ -687,6 +827,7 @@
|
|
|
.show-body1-text2 {
|
|
|
display: flex;
|
|
|
justify-content: flex-end;
|
|
|
+ align-items: center;
|
|
|
margin-right: 20rpx;
|
|
|
flex: 1;
|
|
|
// display: flex;
|
|
@@ -745,7 +886,7 @@
|
|
|
height: 50rpx;
|
|
|
padding-bottom: 20rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
.butto {
|
|
|
text-align: center;
|
|
@@ -955,6 +1096,11 @@
|
|
|
padding-right: 12rpx;
|
|
|
}
|
|
|
|
|
|
+ .tips p {
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #fff
|
|
|
+ }
|
|
|
+
|
|
|
.close {
|
|
|
display: flex;
|
|
|
align-items: center;
|