|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
<div class="page">
|
|
3
|
3
|
<div class="profit-info">
|
|
4
|
4
|
<h6 class="tit">累计优选佣金</h6>
|
|
5
|
|
- <div class="money">4505.8</div>
|
|
|
5
|
+ <div class="money" v-if="dataInfo">{{dataInfo.totalCommission / 100}}</div>
|
|
6
|
6
|
</div>
|
|
7
|
7
|
|
|
8
|
8
|
<div class="filter">
|
|
|
@@ -25,35 +25,38 @@
|
|
25
|
25
|
</div>
|
|
26
|
26
|
|
|
27
|
27
|
<ul class="list">
|
|
28
|
|
- <li>
|
|
|
28
|
+ <li v-for="item of listData" :key="item.id">
|
|
29
|
29
|
<div class="top">
|
|
30
|
|
- <div class="tit">订单佣金</div>
|
|
31
|
|
- <div class="money">+12.90</div>
|
|
|
30
|
+ <div class="tit">{{ item.title }}</div>
|
|
|
31
|
+ <div class="money">+{{ item.amount / 100 }}</div>
|
|
32
|
32
|
</div>
|
|
33
|
33
|
<div class="info">
|
|
34
|
|
- <div class="date">2021/03/29</div>
|
|
35
|
|
- <div class="formula">￥16(佣金)-￥2(积分抵扣) = ￥16</div>
|
|
|
34
|
+ <div class="date">
|
|
|
35
|
+ {{ item.createdTime | dateFormat("yyyy-MM-dd hh:mm") }}
|
|
|
36
|
+ </div>
|
|
|
37
|
+ <div class="formula blod">
|
|
|
38
|
+ ￥{{ item.totalCommission / 100 }}(佣金)-￥{{
|
|
|
39
|
+ item.pointsPrice / 100
|
|
|
40
|
+ }}(积分抵扣) = ￥{{ item.amount / 100 }}
|
|
|
41
|
+ </div>
|
|
36
|
42
|
</div>
|
|
37
|
43
|
<div class="bottom">
|
|
38
|
|
- <div class="num">订单号：154546464666</div>
|
|
39
|
|
- <div class="link">查看订单</div>
|
|
40
|
|
- </div>
|
|
41
|
|
- </li>
|
|
42
|
|
- <li>
|
|
43
|
|
- <div class="top">
|
|
44
|
|
- <div class="tit">订单佣金</div>
|
|
45
|
|
- <div class="money">+12.90</div>
|
|
46
|
|
- </div>
|
|
47
|
|
- <div class="info">
|
|
48
|
|
- <div class="date">2021/03/29</div>
|
|
49
|
|
- <div class="formula">￥16(佣金)-￥2(积分抵扣) = ￥16</div>
|
|
50
|
|
- </div>
|
|
51
|
|
- <div class="bottom">
|
|
52
|
|
- <div class="num">订单号：154546464666</div>
|
|
53
|
|
- <div class="link">查看订单</div>
|
|
|
44
|
+ <div class="num">订单号：{{ item.orderNo }}</div>
|
|
|
45
|
+ <div
|
|
|
46
|
+ class="link"
|
|
|
47
|
+ @click="
|
|
|
48
|
+ jump({
|
|
|
49
|
+ path: '/pages/youxuan/order/detail',
|
|
|
50
|
+ query: { id: item.orderId },
|
|
|
51
|
+ })
|
|
|
52
|
+ "
|
|
|
53
|
+ >
|
|
|
54
|
+ 查看订单
|
|
|
55
|
+ </div>
|
|
54
|
56
|
</div>
|
|
55
|
57
|
</li>
|
|
56
|
58
|
</ul>
|
|
|
59
|
+ <div class="more-text" v-if="dataEnd">- 没有更多数据了 -</div>
|
|
57
|
60
|
</div>
|
|
58
|
61
|
</template>
|
|
59
|
62
|
|
|
|
@@ -69,15 +72,86 @@ export default {
|
|
69
|
72
|
startDate: "",
|
|
70
|
73
|
endDate: "",
|
|
71
|
74
|
},
|
|
|
75
|
+ pageIndex: 1,
|
|
|
76
|
+ dataEnd: false,
|
|
|
77
|
+ listData: [],
|
|
|
78
|
+ dataInfo:null,
|
|
72
|
79
|
};
|
|
73
|
80
|
},
|
|
74
|
|
-
|
|
75
|
81
|
onShow() {},
|
|
76
|
82
|
|
|
|
83
|
+ onLoad() {
|
|
|
84
|
+ this.getList();
|
|
|
85
|
+ this.getInfo();
|
|
|
86
|
+ },
|
|
|
87
|
+ onPullDownRefresh() {
|
|
|
88
|
+ this.getList(true);
|
|
|
89
|
+ this.getInfo();
|
|
|
90
|
+ },
|
|
|
91
|
+ onReachBottom() {
|
|
|
92
|
+ this.getMoreList();
|
|
|
93
|
+ },
|
|
|
94
|
+
|
|
77
|
95
|
// 函数
|
|
78
|
96
|
methods: {
|
|
|
97
|
+
|
|
|
98
|
+ getInfo(){
|
|
|
99
|
+ this.api.get("/Yx/GetProfitInfo").then((res) => {
|
|
|
100
|
+ this.dataInfo = res.data;
|
|
|
101
|
+ });
|
|
|
102
|
+ },
|
|
|
103
|
+
|
|
|
104
|
+ getList(isPull) {
|
|
|
105
|
+ uni.showLoading({
|
|
|
106
|
+ title: "加载中...",
|
|
|
107
|
+ });
|
|
|
108
|
+ this.pageIndex = 1;
|
|
|
109
|
+ this.dataEnd = false;
|
|
|
110
|
+ let sendData = {
|
|
|
111
|
+ pageIndex: this.pageIndex++,
|
|
|
112
|
+ };
|
|
|
113
|
+ if (this.filter.startDate) {
|
|
|
114
|
+ sendData.startTime = this.filter.startDate;
|
|
|
115
|
+ }
|
|
|
116
|
+ if (this.filter.endDate) {
|
|
|
117
|
+ sendData.endTime = this.filter.endDate;
|
|
|
118
|
+ }
|
|
|
119
|
+ this.api.get("/Yx/GetProfitList", sendData).then((res) => {
|
|
|
120
|
+ if (isPull) {
|
|
|
121
|
+ uni.stopPullDownRefresh();
|
|
|
122
|
+ }
|
|
|
123
|
+ uni.hideLoading();
|
|
|
124
|
+ this.listData = res.data;
|
|
|
125
|
+ if (!this.listData.length) {
|
|
|
126
|
+ this.dataEnd = true;
|
|
|
127
|
+ }
|
|
|
128
|
+ });
|
|
|
129
|
+ },
|
|
|
130
|
+ getMoreList() {
|
|
|
131
|
+ uni.showLoading({
|
|
|
132
|
+ title: "加载中...",
|
|
|
133
|
+ });
|
|
|
134
|
+ let sendData = {
|
|
|
135
|
+ pageIndex: this.pageIndex++,
|
|
|
136
|
+ };
|
|
|
137
|
+ if (this.filter.startDate) {
|
|
|
138
|
+ sendData.startTime = this.filter.startDate;
|
|
|
139
|
+ }
|
|
|
140
|
+ if (this.filter.endDate) {
|
|
|
141
|
+ sendData.endTime = this.filter.endDate;
|
|
|
142
|
+ }
|
|
|
143
|
+ this.api.get("/Yx/GetProfitList", sendData).then((res) => {
|
|
|
144
|
+ uni.hideLoading();
|
|
|
145
|
+ this.listData = [...this.listData, ...res.data];
|
|
|
146
|
+ if (!this.listData.length) {
|
|
|
147
|
+ this.dataEnd = true;
|
|
|
148
|
+ }
|
|
|
149
|
+ });
|
|
|
150
|
+ },
|
|
|
151
|
+
|
|
79
|
152
|
dateChange(e, name) {
|
|
80
|
153
|
this.filter[name] = e.detail.value;
|
|
|
154
|
+ this.getList();
|
|
81
|
155
|
},
|
|
82
|
156
|
},
|
|
83
|
157
|
|
|
|
@@ -133,30 +207,43 @@ export default {
|
|
133
|
207
|
border-bottom: 1px solid #f1f1f1;
|
|
134
|
208
|
padding: px(30) px(40);
|
|
135
|
209
|
}
|
|
136
|
|
- .top,.info,.bottom{
|
|
|
210
|
+ .top,
|
|
|
211
|
+ .info,
|
|
|
212
|
+ .bottom {
|
|
137
|
213
|
display: flex;
|
|
138
|
214
|
align-items: center;
|
|
139
|
215
|
justify-content: space-between;
|
|
140
|
216
|
}
|
|
141
|
|
- .tit{
|
|
|
217
|
+ .tit {
|
|
142
|
218
|
font-size: px(48);
|
|
143
|
219
|
}
|
|
144
|
|
- .money{
|
|
145
|
|
- color:#ff4b26;
|
|
|
220
|
+ .money {
|
|
|
221
|
+ color: #ff4b26;
|
|
146
|
222
|
}
|
|
147
|
|
- .info,.bottom{
|
|
|
223
|
+ .info,
|
|
|
224
|
+ .bottom {
|
|
148
|
225
|
font-size: px(40);
|
|
149
|
226
|
color: #666;
|
|
150
|
227
|
margin-top: px(10);
|
|
151
|
228
|
}
|
|
152
|
|
- .formula{
|
|
|
229
|
+ .formula {
|
|
153
|
230
|
font-weight: bold;
|
|
154
|
231
|
}
|
|
155
|
|
- .link{
|
|
|
232
|
+ .link {
|
|
156
|
233
|
color: #4395ff;
|
|
157
|
234
|
}
|
|
158
|
|
- .num{
|
|
|
235
|
+ .num {
|
|
159
|
236
|
color: #999;
|
|
160
|
237
|
}
|
|
161
|
238
|
}
|
|
|
239
|
+.blod {
|
|
|
240
|
+ font-weight: bold;
|
|
|
241
|
+}
|
|
|
242
|
+.more-text {
|
|
|
243
|
+ display: flex;
|
|
|
244
|
+ justify-content: center;
|
|
|
245
|
+ padding-bottom: px(60);
|
|
|
246
|
+ font-size: px(34);
|
|
|
247
|
+ color: #999;
|
|
|
248
|
+}
|
|
162
|
249
|
</style>
|
