Browse Source

佣金总收入列表借口分页

lihongxiao 6 months ago
parent
commit
9235c88bf7
3 changed files with 32 additions and 30 deletions
  1. 4 4
      config/baseUrl.js
  2. 2 2
      manifest.json
  3. 26 24
      pages/my/commission.vue

+ 4 - 4
config/baseUrl.js

@@ -15,12 +15,12 @@ if (process.env.NODE_ENV === 'development') {
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
-	h5BaseUrl = "https://test.baoxianzhanggui.com/copartnerH5";
+	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
+	// h5BaseUrl = "https://test.baoxianzhanggui.com/copartnerH5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxian8zhanggui.com/copartnerH5";
-	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
-	// h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/copartnerH5";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/copartnerH5";
 	socketUrl = "";
 }
 const courtConfig = {

+ 2 - 2
manifest.json

@@ -9,8 +9,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.1",
-    "versionCode" : 121,
+    "versionName" : "1.1.9",
+    "versionCode" : 119,
     "app-plus" : {
         "error" : {
             "url" : "hybrid/html/error.html"

+ 26 - 24
pages/my/commission.vue

@@ -74,8 +74,8 @@
 					</view>
 				</view>
 			</block>
-			<u-loadmore style="margin-top: 5px;" v-if="directLsit.length!=0" :status="status" />
-			<o-empty v-if="directLsit.length==0" />
+			<u-loadmore style="margin-top: 5px;" v-if="withdrawalData.length!=0" :status="status" />
+			<o-empty v-if="withdrawalData.length==0" />
 		</view>
 		<my-date-picker ref="datePicker" @confirmPickDate="confirmPickDate" />
 	</view>
@@ -103,7 +103,6 @@
 					boxShadow: ''
 					// 其他样式属性...
 				},
-				directLsit: {},
 				source: 0,
 				totalPages: 0,
 				totalSize: 0,
@@ -113,8 +112,6 @@
 					pageSize: 20,
 				},
 				withdrawalData: [],
-
-
 				industryData: '全部行业',
 				industryShow: false,
 				industrySector: '0',
@@ -128,6 +125,8 @@
 					lable: '保险',
 					value: '2'
 				}],
+				beginTime:'',
+				endTime:'' 
 			}
 		},
 		async onLoad(params) {
@@ -148,7 +147,9 @@
 				if (dateStr1) {
 					dateStr1 += ' 23:59:59'
 				}
-				this.queryData(dateStr, dateStr1)
+				this.beginTime=dateStr
+				this.endTime=dateStr1
+				this.queryData()
 			},
 			view(item) {
 				uni.navigateTo({
@@ -160,42 +161,43 @@
 					delta: 1, // 返回的页面数,如果是1表示返回上一页
 					success: function() {}
 				});
-
 			},
 			onReachBottom() {
 				if (this.pageRequest.pageNum >= this.totalPages) return;
 				this.status = 'loading';
 				this.pageRequest.pageNum = ++this.pageRequest.pageNum;
 				setTimeout(async () => {
-					let res = await this.$http.post('/APPPartner/getCommissionInfos', {
-						beginTime: '2024-10-08 16:21:11',
-						endTime: '2024-10-11 16:21:11',
-						// industrySector: '1',
-						industrySector: this.industrySector
+					let res = await this.$http.post('/APPPartner/getCommissionInfo', {
+						beginTime:this.beginTime,
+						endTime:this.endTime,
+						industrySector: this.industrySector,
+						...this.pageRequest
 					});
 					if (res.code == '200') {
-						// this.totalSize = res.data.totalSize;
-						this.directLsit = [...this.withdrawalData, ...res.data.content];
+						this.totalPages = res.data.totalPages;
+						this.totalSize = res.data.totalSize;
+						this.withdrawalData = [...this.withdrawalData, ...res.data.content];
 					}
-					// if (this.pageRequest.pageNum >= this.totalPages) this.status = 'nomore';
+					if (this.pageRequest.pageNum >= this.totalPages) this.status = 'nomore';
 					else this.status = 'loading';
 				}, 1000)
 			},
-			async queryData(beginTime = '', endTime = '') {
+			async queryData() {	
 				let params = {
-					beginTime,
-					endTime,
+					beginTime:this.beginTime,
+					endTime:this.endTime,
 					// industrySector: '1',
+					...this.pageRequest,
 					industrySector: this.industrySector
 					// ...this.pageRequest
 				}
-				let res = await this.$http.post('/APPPartner/getCommissionInfos', params);
+				let res = await this.$http.post('/APPPartner/getCommissionInfo', params);
 				if (res.code == '200') {
-					this.withdrawalData = res.data
-					// this.totalPages = res.data.totalPages;
-					// this.totalSize = res.data.totalSize;
-					// if (this.pageRequest.pageNum >= res.data.totalPages) this.status = 'nomore';
-					// else this.status = 'loadmore';
+					this.withdrawalData = res.data.content
+					this.totalPages = res.data.totalPages;
+					this.totalSize = res.data.totalSize;
+					if (this.pageRequest.pageNum >= res.data.totalPages) this.status = 'nomore';
+					else this.status = 'loadmore';
 
 				}
 			},