diff --git a/common/common.js b/common/common.js
index 011473a..55a9747 100644
--- a/common/common.js
+++ b/common/common.js
@@ -29,14 +29,17 @@ const userLoginout = serverUrl + "/business/h5/index/logout";
 const useraboutUs = serverUrl + "/business/h5/index/aboutUs";
 
 //  商户账户余额信息
-const walletAccount = serverUrl + "/business/h5/wallet/account";
+const walletAccount = serverUrl + "/business/h5/wallet/account"; 
+
+//  商户充值金额列表
+const rechargeList = serverUrl + "/business/h5/wallet/rechargeList";
 
 //
 const requestSign = function(inputData) {
 
 	var jsonList = inputData || {};
 
-  // jsonList.orgId = public_orgId;
+  jsonList.orgId = public_orgId;
 	jsonList.sign_type = "md5";
 	jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104";
 	jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
@@ -44,7 +47,7 @@ const requestSign = function(inputData) {
 	jsonList.terminalSource = "11";
 	jsonList.token = getGlobalUser("globalUser").token;
   // jsonList.token = getGlobalUser("globalUser").token;
-  // jsonList.token = 'eb1538c4c2ee45d7b2610cf071c4a27f';
+  // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea';
 
 	var arrData = [];
 	for (var key in jsonList) {
@@ -135,6 +138,7 @@ export default {
 	userLoginout,
 	useraboutUs,
 	walletAccount,
+	rechargeList,
   //  通过商户ID查询停车记录信息
   getBusinessParkOrderByBusIdForPage:serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage",
 }
diff --git a/common/filters.js b/common/filters.js
index 13c812e..563b008 100644
--- a/common/filters.js
+++ b/common/filters.js
@@ -36,6 +36,13 @@ const toFixed2 = num => {
 	return isNaN(num) ? 0.00 : parseFloat((num/100).toFixed(2));
 }
 
+// 钱保留两位小数+其他
+const ortherToFixed = num => {
+	if(num === -1) return '其他';
+	return isNaN(num) ? 0.00 : parseFloat((num/100).toFixed(2));
+}
+
+
 // 数字每三位加个逗号
 const toThousands =(num)=> {
     var result = [],
@@ -66,6 +73,7 @@ export default {
 	RMB,
 	cutString,
 	toFixed2,
+	ortherToFixed,
 	toThousands,
 	sexFilter,
 }
diff --git a/pages/moneyRecharge/moneyRecharge.vue b/pages/moneyRecharge/moneyRecharge.vue
index 07289f7..6342279 100644
--- a/pages/moneyRecharge/moneyRecharge.vue
+++ b/pages/moneyRecharge/moneyRecharge.vue
@@ -10,10 +10,16 @@
 			<uni-grid :column="3" :highlight="true" :showBorder="false" :square="false" @change="change">
 				<uni-grid-item v-for="(item, index) in ListData" :index="index" :key="index">
 					<view class="grid-item-box" style="background-color: #fff;">
-						<view class="text" :class="currentIndex==index?'itemActive':''">{{item.text}}</view>
+						<view class="text" :class="currentIndex==index?'itemActive':''">
+							{{item.rechargeCode | ortherToFixed}}
+						</view>
 					</view>
 				</uni-grid-item>
 			</uni-grid>
+			<view class="jy-fix-height34" :style="isShowInput?'':'display:none;'">
+				<input class="jy-fix-height34 uni-list-cell-hover" type="digit" v-model="rechargeNum"
+					placeholder=" 请输入金额" />
+			</view>
 		</uni-section>
 
 		<view class="uni-list-cell-pd">
@@ -40,39 +46,23 @@
 </template>
 
 <script>
-	
 	export default {
 		data() {
 			return {
 				acctBalance: '0.00',
-				ListData: [{
-						text: '100元'
-					},
-					{
-						text: '200元'
-					},
-					{
-						text: '300元'
-					},
-					{
-						text: '600元'
-					},
-					{
-						text: '1000元'
-					},
-					{
-						text: '其他'
-					},
-				],
+				ListData: [],
 				currentIndex: 0,
-
+				// isShowInput: false,
+				rechargeNum: '',
 			}
 		},
 		onLoad() {
 
 		},
 		mounted() {
-			this.recharge()
+			this.recharge();
+			this.rechargeList();
+
 		},
 		methods: {
 			recharge() {
@@ -89,19 +79,36 @@
 
 				})
 			},
+			rechargeList() {
+				let that = this;
+				that.$myRequest({
+					url: that.$common.rechargeList,
+					method: 'POST',
+					data: that.$common.requestSign()
+				}).then(res => {
 
-			change(e) {
+					console.log(res)
+					let data = res.data;
+					that.ListData = data;
 
+				})
+			},
+			change(e) {
+				let that = this;
 				let {
 					index
-				} = e.detail
-
-				this.currentIndex = index
-				console.log(index + 1)
-
+				} = e.detail;
+				that.currentIndex = index;
+
+				if (that.ListData[index].rechargeCode == -1) {
+					console.log('1')
+					that.isShowInput = true;
+					that.rechargeNum = ''
+				}
+				that.isShowInput = false;
 			},
 			detailCell() {
-				
+
 			}
 		}
 	}