Explorar el Código

fix:红包问题

suwadaimyojin hace 2 años
padre
commit
d83e30977e
Se han modificado 3 ficheros con 18 adiciones y 11 borrados
  1. 9 1
      api/user.js
  2. 2 2
      pages/user/index.vue
  3. 7 8
      pages/users/user_wallet/index.vue

+ 9 - 1
api/user.js

@@ -174,7 +174,15 @@ export function getGreenIntegralList(q) {
 }
 
 /*
- * 红色积分记录
+ * 红包余额变动分页
+ * */
+export function redMoneyRecordList(q) {
+	return request.post("/v1/re/money/redMoneyRecordList", q);
+}
+
+
+/*
+ * 红色积分记录after
  * */
 export function getBalanceList(q) {
 	return request.post("/v1/balance/page", q);

+ 2 - 2
pages/user/index.vue

@@ -107,8 +107,8 @@
 						<view class="num-wrapper">
 							<view class="num-item"
 								@click="goMenuPage('/pages/users/user_wallet/index')">
-								<text class="num">{{userInfo.nowMoney || 0}}</text>
-								<view class="txt">{{$t('包余额')}}</view>
+								<text class="num">{{userInfo.redMoney || 0}}</text>
+								<view class="txt">{{$t('包余额')}}</view>
 							</view>
 							<view class="num-item" @click="goMenuPage('/pages/users/user_green_integral/index')">
 								<text class="num">{{userInfo.ticket || 0}}</text>

+ 7 - 8
pages/users/user_wallet/index.vue

@@ -3,24 +3,23 @@
 		<view class='integral-details' :style="colorStyle">
 			<view class='header'>
 				<view class='my'>
-					<view class='currentScore'>{{$t(`包余额`)}}</view>
-					<view class="scoreNum">{{userInfo.nowMoney}}</view>
+					<view class='currentScore'>{{$t(`包余额`)}}</view>
+					<view class="scoreNum">{{userInfo.redMoney}}</view>
 					<view class='line'></view>
 				</view>
-				<view class='my'>
+				<!-- <view class='my'>
 					<view class='currentScore'>{{$t(`加速提现额度`)}}</view>
 					<view class="scoreNum">{{userInfo.accBalance}}</view>
 					<view class='line'></view>
-				</view>
+				</view> -->
 			</view>
 			<view class='wrapper'>
 				<view class='list' :hidden='current!=0'>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
 						<view>
 							<view class='state'>{{$t(item.source)}}</view>
-							<view v-if="item.sourceCode == 4">
+							<view  v-if="(item.sourceCode == 4 ||item.sourceCode == 6)">
 								<view>手续费:{{item.chargeAmount}}</view>
-								<view>税费:{{item.taxAmount}}</view>
 							</view>
 							<view>{{item.createTime}}</view>
 						</view>
@@ -49,7 +48,7 @@
 <script>
 	import {
 		getUserInfo,
-		getBalanceList
+		redMoneyRecordList,
 	} from '@/api/user.js';
 	import dayjs from '@/plugin/dayjs/dayjs.min.js';
 	import {
@@ -145,7 +144,7 @@
 				if (that.loadend) return;
 				that.loading = true;
 				that.loadTitle = '';
-				getBalanceList({
+				redMoneyRecordList({
 					current: that.page,
 					size: that.limit
 				}).then(function(res) {