Merge branch 'develop' into uat

src/pages/BankModule/Recharge/Recharge.vue

@@ -234,13 +234,22 @@
 					bindCardNo: ''
 				},
 				ImgUrl: this.$ImgUrl,
-				MoneyList: Array(5).fill(1).map((v, index) => {
-					return {
-						lable: index == 4 ? '其他金额' : '元',
-						value: index == 4 ? '' : 50 * (index + 1) + 50,
-						tips: index == 1 ? "推荐充值" : null
-					}
-				}),
+				MoneyList: [{
+					lable: '元',
+					value: 100
+				}, {
+					lable: '元',
+					value: 200
+				}, {
+					lable: '元',
+					value: 500
+				}, {
+					lable: '元',
+					value: 1000
+				}, {
+					lable: '其他金额',
+					value: ''
+				}],
 				numberList: [],
 				tempFiles1: '../../static/img/idCardBg1.png', //上传身份证临时选择文件
 				tempFiles2: '../../static/img/idCardBg0.png',
@@ -419,7 +428,7 @@
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
-						amount: (this.Money * 1).toFixed(2), //充值金额，单位元
+						amount: ((this.Money || this.inputOtherM) * 1).toFixed(2), //充值金额，单位元
 						schoolId: bankInfo.schoolId, //学校id
 						userId: userID, //用户id
 						sessionid: sessionID,

src/pages/IcbcModule/Recharge/Recharge.vue

@@ -241,13 +241,22 @@
 					bindCardNo: ''
 				},
 				ImgUrl: this.$ImgUrl,
-				MoneyList: Array(5).fill(1).map((v, index) => {
-					return {
-						lable: index == 4 ? '其他金额' : '元',
-						value: index == 4 ? '' : 50 * (index + 1) +50,
-						tips: index == 1 ? "推荐充值" : null
-					}
-				}),
+				MoneyList:[{
+					lable:'元',
+					value:100
+				},{
+					lable:'元',
+					value:200
+				},{
+					lable:'元',
+					value:500
+				},{
+					lable:'元',
+					value:1000
+				},{
+					lable:'其他金额',
+					value:''
+				}],
 				numberList: [],
 				tempFiles1: '../../static/img/idCardBg1.png', //上传身份证临时选择文件
 				tempFiles2: '../../static/img/idCardBg0.png',