Compare commits
No commits in common. "30bc198fe9455b9968352330bedc479c4b6d94f8" and "40a009bd2b222ac0f64f9546c5adcb3c37939945" have entirely different histories.
30bc198fe9
...
40a009bd2b
|
@ -341,12 +341,7 @@
|
||||||
confirmSelectedDate(e) {
|
confirmSelectedDate(e) {
|
||||||
this.selectedDate = e;
|
this.selectedDate = e;
|
||||||
this.commissionDetail = [];
|
this.commissionDetail = [];
|
||||||
this.currentPage = 1;
|
this.getHomePageNum(this.selectedDate);
|
||||||
this.getHomePageNum({
|
|
||||||
artificerId: this.artificerId,
|
|
||||||
fundData: this.selectedDate,
|
|
||||||
fundType: this.activeRange,
|
|
||||||
});
|
|
||||||
this.getCommissionDataList({
|
this.getCommissionDataList({
|
||||||
artificerId: this.artificerId,
|
artificerId: this.artificerId,
|
||||||
fundData: this.selectedDate,
|
fundData: this.selectedDate,
|
||||||
|
|
|
@ -284,7 +284,6 @@
|
||||||
confirmSelectedDate(e) {
|
confirmSelectedDate(e) {
|
||||||
this.selectedDate = e;
|
this.selectedDate = e;
|
||||||
this.fundDetail = [];
|
this.fundDetail = [];
|
||||||
this.currentPage = 1;
|
|
||||||
this.getFundDataList({
|
this.getFundDataList({
|
||||||
artificerId: this.userId,
|
artificerId: this.userId,
|
||||||
detailsType: this.activeIntegral,
|
detailsType: this.activeIntegral,
|
||||||
|
|
|
@ -352,12 +352,6 @@
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"path": "dashang/index",
|
|
||||||
"style": {
|
|
||||||
"navigationBarTitleText": "打赏明细",
|
|
||||||
"enablePullDownRefresh": false
|
|
||||||
}
|
|
||||||
},{
|
|
||||||
"path": "help/helpDetail",
|
"path": "help/helpDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "帮助详情",
|
"navigationBarTitleText": "帮助详情",
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
<view class="" style="font-size: 24px;font-weight: bold;">
|
<view class="" style="font-size: 24px;font-weight: bold;">
|
||||||
{{ currentRealIncome ? currentRealIncome : 0 }}
|
{{ currentRealIncome ? currentRealIncome : 0 }}
|
||||||
</view>
|
</view>
|
||||||
<view class="" style="font-size: 14px; margin-top: 5px;">当期项目收益(元)</view>
|
<view class="" style="font-size: 14px; margin-top: 5px;">当期收益(元)</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="shuxian"></view>
|
<view class="shuxian"></view>
|
||||||
<view class="" @tap="goNav('/pages/index/currentPoints')">
|
<view class="" @tap="goNav('/pages/index/currentPoints')">
|
||||||
|
@ -333,10 +333,6 @@
|
||||||
<image src="../../static/index/order_1.png" style="width: 70rpx;height: 70rpx;"></image>
|
<image src="../../static/index/order_1.png" style="width: 70rpx;height: 70rpx;"></image>
|
||||||
<view class="tongji-text">紧急报警</view>
|
<view class="tongji-text">紧急报警</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="text-center" @click="goNav('/my/dashang/index')">
|
|
||||||
<image src="../../static/index/order_1.png" style="width: 70rpx;height: 70rpx;"></image>
|
|
||||||
<view class="tongji-text">打赏明细</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="flex justify-between margin-top" style="border: 1rpx solid #cccccc;background-color: #e1f5ea; border-radius: 20rpx;">
|
<!-- <view class="flex justify-between margin-top" style="border: 1rpx solid #cccccc;background-color: #e1f5ea; border-radius: 20rpx;">
|
||||||
<view class="guanlibox" @click="goDetail(1)">
|
<view class="guanlibox" @click="goDetail(1)">
|
||||||
|
@ -754,7 +750,7 @@ export default {
|
||||||
that.time = setInterval(function () {
|
that.time = setInterval(function () {
|
||||||
that.getNewOrder()
|
that.getNewOrder()
|
||||||
console.log(that.time);
|
console.log(that.time);
|
||||||
}, 1000000)
|
}, 10000)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log(this.userId,"false============>");
|
console.log(this.userId,"false============>");
|
||||||
|
|
Loading…
Reference in New Issue