Merge remote-tracking branch 'origin/master'

ghsApp/src/api/recharge/index.js

@@ -4,3 +4,8 @@ import https from '@/plugins/luch-request_0.0.7/request'
 export const rechargeBalance = data => {
 	return https.get('/recharge/balance', data)
 }
+
+//充值记录
+export const rechargeList = data => {
+	return https.get('/recharge/list', data)
+}

ghsApp/src/pagesStore/me/rechargeList.vue

@@ -1,13 +1,38 @@
 <template>
-<view>充值</view>
+	<div>
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+						{{ item.name }}
+					</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list.data" :key="index">
+					<t-td
+						v-for="(column, colIndex) in columns"
+						:key="colIndex"
+						:align="column.align"
+						:color="column.color"
+					>
+						<view>
+							{{ item[column.dataIndex] || "" }}
+						</view>
+					</t-td>
+				</t-tr>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</div>
 </template>
 
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { withdrawCashList } from '@/api/store'
+import { rechargeList } from '@/api/recharge'
 import list from '@/mixins/list'
 export default {
-	name: "rechargeList",//提现记录
+	name: "rechargeList",
 	components: {
 		AppWrapperEmpty
 	},
@@ -16,17 +41,23 @@ export default {
 		return {
 			columns: [
 				{
-					name: "提现时间",
-					dataIndex: "time",
+					name: "充值时间",
+					dataIndex: "addTime",
 					color: "info",
 					align: "center"
 				},
 				{
-					name: "提现金额",
+					name: "金额",
 					dataIndex: "amount",
 					color: "info",
 					align: "center"
 				},
+				{
+					name: "累计充值",
+					dataIndex: "totalRecharge",
+					color: "info",
+					align: "center"
+				},
 				{
 					name: "状态",
 					dataIndex: "statusText",
@@ -42,12 +73,12 @@ export default {
                     title: '加载中'
                 });
 				try {
-				const res = await withdrawCashList({
+				const res = await rechargeList({
 					page:this.list.page
 				})
 				res.data.list  = res.data.list.map(i=>({
 					...i,
-					statusText: i.status ==1?'待处理':i.status ==2?'处理中':'已完成'				  
+					statusText: i.status ==1?'待充值':i.status ==2?'已充值':''				  
 				}))
 			   this.completes(res)
               } finally {
@@ -72,4 +103,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>