From 6685425ae0e058fa461e673dddca147547636a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com>
Date: Wed, 26 Aug 2020 18:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                      | 2 +-
 config/app.js                    | 2 +-
 main.js                          | 2 +-
 pages/users/user_bill/index.vue  | 4 ++--
 pages/users/user_money/index.vue | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/user.js b/api/user.js
index 6dfacc97..2080f364 100644
--- a/api/user.js
+++ b/api/user.js
@@ -122,7 +122,7 @@ export function userActivity(){
 }
 
 /*
- * 资金明细（types|0=全部,1=消费,2=充值,3=返佣,4=提现）
+ * 余额明细（types|2=全部,1=支出,2=收入）
  * */
 export function getCommissionInfo(q, types) {
   return request.get("spread/commission/" + types, q);
diff --git a/config/app.js b/config/app.js
index 39ef331e..41f83446 100644
--- a/config/app.js
+++ b/config/app.js
@@ -26,4 +26,4 @@ module.exports = {
 	TOKENNAME: 'Authori-zation',
 	// 缓存时间 0 永久
 	EXPIRE:0,
-};
\ No newline at end of file
+};
diff --git a/main.js b/main.js
index 32ef9411..ac9ea62e 100644
--- a/main.js
+++ b/main.js
@@ -55,4 +55,4 @@ const app = new Vue({
 	store,
 	Cache
 })
-app.$mount();
\ No newline at end of file
+app.$mount();
diff --git a/pages/users/user_bill/index.vue b/pages/users/user_bill/index.vue
index afb3920a..ab002045 100644
--- a/pages/users/user_bill/index.vue
+++ b/pages/users/user_bill/index.vue
@@ -3,8 +3,8 @@
 		<view class='bill-details'>
 			<view class='nav acea-row'>
 				<view class='item' :class='type==0 ? "on":""' @click='changeType(0)'>全部</view>
-				<view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>消费</view>
-				<view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>充值</view>
+				<view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>支出</view>
+				<view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>收入</view>
 			</view>
 			<view class='sign-record'>
 				<view class='list' v-for="(item,index) in userBillList" :key="index">
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 53e34ea4..ec6e919a 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -18,11 +18,11 @@
 						</view>
 						<view class='cumulative acea-row row-top'>
 							<view class='item'>
-								<view>累计充值(元)</view>
+								<view>累计收入(元)</view>
 								<view class='money'>{{statistics.recharge || 0}}</view>
 							</view>
 							<view class='item'>
-								<view>累计消费(元)</view>
+								<view>累计支出(元)</view>
 								<view class='money'>{{statistics.orderStatusSum || 0}}</view>
 							</view>
 						</view>
@@ -39,7 +39,7 @@
 						<view class='pictrue'>
 							<image src='../../../static/images/record2.png'></image>
 						</view>
-						<view>消费记录</view>
+						<view>支出记录</view>
 					</navigator>
 					<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2' v-if="recharge_switch">
 						<view class='pictrue'>