|
|
@@ -18,12 +18,12 @@
|
|
|
<view class="data">
|
|
|
<view class="left">
|
|
|
<view @click.stop="showTime = true">
|
|
|
- <text>2021年7月</text>
|
|
|
+ <text>{{defaultTime}}</text>
|
|
|
<text class="cuIcon-unfold padding-left-10"></text>
|
|
|
</view>
|
|
|
- <view>
|
|
|
+ <!-- <view>
|
|
|
<text>支出 ￥ 165.00 收入 ￥ 463.00</text>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
<view class="right">
|
|
|
<text>统计</text>
|
|
|
@@ -32,7 +32,7 @@
|
|
|
</view>
|
|
|
|
|
|
<view class="card">
|
|
|
- <view style="display: flex;">
|
|
|
+ <view v-if="current==0" style="display: flex;">
|
|
|
<view class="area1 area-padding " style="padding-left: 40rpx;">
|
|
|
<text>积分来源</text>
|
|
|
</view>
|
|
|
@@ -45,27 +45,43 @@
|
|
|
</view>
|
|
|
<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
|
|
|
:up="upOption">
|
|
|
- <view @click="$jump('/pages/bill/billDetail?billDetail='+JSON.stringify(item))" class="item" hover-class="hoverClass"
|
|
|
+ <view @click="$jump('/pages/bill/billDetail?billDetail='+JSON.stringify(item)+'¤t='+current)" class="item" hover-class="hoverClass"
|
|
|
v-for="(item,index) in list" :key="index">
|
|
|
- <view class="area1">
|
|
|
- <view class="item-padding">
|
|
|
- <image :src="item.channelLogo" mode="aspectFit"></image>
|
|
|
- <view class="">
|
|
|
- <text>{{item.channelName}}</text>
|
|
|
- <text>{{item.jsTime}}</text>
|
|
|
+ <block v-if="current==0">
|
|
|
+ <view class="area1">
|
|
|
+ <view class="item-padding">
|
|
|
+ <image :src="item.channelLogo" mode="aspectFit"></image>
|
|
|
+ <view class="">
|
|
|
+ <text>{{item.channelName}}</text>
|
|
|
+ <text>{{item.jsTime}}</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="area2 text-area ">
|
|
|
+ <view class="item-padding">
|
|
|
+ <image style="width: 35rpx;height: 35rpx;margin-bottom: -5rpx;"
|
|
|
+ src="@/static/icon/points-value.png"></image>
|
|
|
+ <text style="font-size: 32rpx;margin-left: 10rpx;color: #F39248;">+{{item.point}}</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="area3 text-area ">
|
|
|
+ <view class="item-padding" style="font-size: 34rpx;color: #000;">￥{{item.pointValue}}</view>
|
|
|
+ </view>
|
|
|
+ </block>
|
|
|
+ <block v-if="current==1">
|
|
|
+ <view class="area1">
|
|
|
+ <view class="item-padding">
|
|
|
+ <image :src="item.userAvator" mode="aspectFit"></image>
|
|
|
+ <view class="">
|
|
|
+ <text>{{item.userName}}</text>
|
|
|
+ <text>{{item.updateTime}}</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class="area2 text-area ">
|
|
|
- <view class="item-padding">
|
|
|
- <image style="width: 35rpx;height: 35rpx;margin-bottom: -5rpx;"
|
|
|
- src="@/static/icon/points-value.png"></image>
|
|
|
- <text style="font-size: 32rpx;margin-left: 10rpx;color: #F39248;">+{{item.point}}</text>
|
|
|
+ <view class="area3 text-area u-flex-1" >
|
|
|
+ <view class="item-padding" style="text-align: right;flex:1;font-size: 34rpx;color: #F39248;margin-right: 20rpx;">+￥{{item.realPayAmount}}</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class="area3 text-area ">
|
|
|
- <view class="item-padding" style="font-size: 34rpx;color: #000;">￥{{item.pointValue}}</view>
|
|
|
- </view>
|
|
|
+ </block>
|
|
|
</view>
|
|
|
</mescroll-body>
|
|
|
|
|
|
@@ -118,8 +134,14 @@
|
|
|
let res = await this.$api.shop.detail(params)
|
|
|
this.shopData = res.data
|
|
|
},
|
|
|
+ async shop(){
|
|
|
+ let params = {}
|
|
|
+
|
|
|
+ let res = await this.$api.shop.remainDetailPage(params)
|
|
|
+ },
|
|
|
confirmTime(e){
|
|
|
this.defaultTime = e.year + '-' +e.month
|
|
|
+ this.downCallback()
|
|
|
},
|
|
|
upCallback(mescroll) {
|
|
|
if (!this.vuex_shopId) {
|
|
|
@@ -132,13 +154,24 @@
|
|
|
monthTime:this.defaultTime
|
|
|
}
|
|
|
try {
|
|
|
- this.$api.shop.yingshouPage(params).then(res => {
|
|
|
- let data = res.data.records
|
|
|
- let total = res.data.total
|
|
|
- mescroll.endBySize(data.length, total);
|
|
|
- if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
|
|
|
- this.list = this.list.concat(data); //追加新数据
|
|
|
- })
|
|
|
+ if(this.current==0){
|
|
|
+ this.$api.shop.yingshouPage(params).then(res => {
|
|
|
+ let data = res.data.records
|
|
|
+ let total = res.data.total
|
|
|
+ mescroll.endBySize(data.length, total);
|
|
|
+ if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
|
|
|
+ this.list = this.list.concat(data); //追加新数据
|
|
|
+ })
|
|
|
+ }else if(this.current==1){
|
|
|
+ this.$api.shop.remainDetailPage(params).then(res => {
|
|
|
+ let data = res.data.records
|
|
|
+ let total = res.data.total
|
|
|
+ mescroll.endBySize(data.length, total);
|
|
|
+ if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
|
|
|
+ this.list = this.list.concat(data); //追加新数据
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
} catch (e) {
|
|
|
this.mescroll.endErr()
|
|
|
}
|
|
|
@@ -146,10 +179,11 @@
|
|
|
downCallback() {
|
|
|
setTimeout(() => {
|
|
|
this.mescroll.resetUpScroll();
|
|
|
- }, 800)
|
|
|
+ }, 10)
|
|
|
},
|
|
|
change(index) {
|
|
|
this.current = index;
|
|
|
+ this.downCallback()
|
|
|
}
|
|
|
}
|
|
|
}
|
