修复

pages/user-center/happinessPassbook.vue

@@ -80,7 +80,7 @@
                             <view style="padding: 20rpx 0;">
 								<view class="userMyOrderState row-sb-n">
 									<view v-for="(item,index) in stateList" :key="index"
-									:class="[msg.Type==item.ID?'active':'']"
+									:class="[msg.active==item.ID?'active':'']"
 									@click="research(item.ID)">
 										{{ item.Name }}
 									</view>
@@ -153,14 +153,16 @@
 					{Name:'全部',ID:0},
 					{Name:'收入',ID:1},
 					{Name:'支付',ID:2},
+					{Name:'待结算',ID:3},
 				],
 				msg:{
 					pageIndex:1,//是	[string]
 					pageSize:10,//是	[string]
-					BalanceState:0,//	状态 1查询已反记录 2查询待结算记录
+					BalanceState:1,//	状态 1查询已反记录 2查询待结算记录
 					Type:0,//	类型 1存入 2扣除
 					StartTime:'',//	开始时间
 					EndTime:'',
+					active: 0,
 				},
 				dataList: [],
 				status: "加载中",
@@ -259,8 +261,16 @@
 				}
 			},
 			research(ID) {
-				if(ID==this.msg.Type) return
-				if(ID>=0) this.msg.Type = ID
+				if(ID>=0) {
+					this.msg.active = ID
+					if(ID!=3){
+						if(ID==this.msg.Type) return
+						this.msg.Type = ID
+						this.msg.BalanceState = 1
+					}else{
+						this.msg.BalanceState = 2
+					}
+				}
 				this.msg.pageIndex = 1
 				this.dataList = []
 				this.getList()

pages/user-center/points.vue

@@ -81,7 +81,7 @@
 							<view style="padding: 20rpx 0;">
 								<view class="userMyOrderState row-sb-n">
 									<view v-for="(item,index) in stateList" :key="index"
-									:class="[msg.Type==item.ID?'active':'']"
+									:class="[msg.active==item.ID?'active':'']"
 									@click="research(item.ID)">
 										{{ item.Name }}
 									</view>
@@ -154,14 +154,16 @@
 					{Name:'全部',ID:0},
 					{Name:'已获取',ID:1},
 					{Name:'已消耗',ID:2},
+					{Name:'待获取',ID:3},
 				],
 				msg:{
 					pageIndex:1,//是	[string]
 					pageSize:10,//是	[string]
-					IntegralState:0,
+					IntegralState:1, //状态 1已反积分记录 2待结算积分记录
 					Type:0,//	类型 1存入 2扣除
 					QStartDate:'',//	开始时间
 					QEndDate:'',
+					active:0,
 				},
 				dataList: [],
 				status: "加载中",
@@ -260,8 +262,16 @@
 				}
 			},
 			research(ID) {
-				if(ID==this.msg.Type) return
-				if(ID>=0) this.msg.Type = ID
+				if(ID>=0) {
+					this.msg.active = ID
+					if(ID!=3){
+						if(ID==this.msg.Type) return
+						this.msg.Type = ID
+						this.msg.IntegralState = 1
+					}else{
+						this.msg.IntegralState = 2
+					}
+				}
 				this.msg.pageIndex = 1
 				this.dataList = []
 				this.getList()