Merge branch 'develop'

.hbuilderx/launch.json

+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

src/main.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import App from './App'
 
 
-
 // OSS静态资源
 Vue.prototype.$iImgUrl = 'https://szcf.superbest.wang/xcxImages/'
 

src/pages.json

@@ -246,9 +246,9 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
-		
-		
+
+
+
 		{
 			"path": "pages/AgreementSZXY/agreement/main",
 			"style": {
@@ -270,9 +270,40 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/BankModule/Recharge/Recharge",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "充值",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/BankModule/Reflect/Reflect",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "提现",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/recharging/recharging",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "充值申请成功",
+				"enablePullDownRefresh": false
+
+			}
+
+		}, {
+			"path": "pages/OpenAccountAgreement/OpenAccountAgreement",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "三类户开户协议",
+				"enablePullDownRefresh": false
+			}
+
 		}
-		
-		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

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',

src/pages/assignDeposit/assignDeposit.vue

@@ -1531,7 +1531,7 @@
 	.CodeMsg {
 		color: #01BC73;
 		background: #F7F6FB;
-		font-size: 32rpx;
+		font-size: 28rpx;
 		font-weight: 600;
 		line-height: 80rpx;
 		letter-spacing: 3rpx;

src/pages/recharging/recharging.vue

+<template>
+	<view>
+		<view class="logs-box">
+			<view class="item pass">
+				<view class="item-a">
+					<view class="title">充值申请已提交</view>
+					<view class="price">￥{{ money }}</view>
+					<view class="name">来自 {{ bankName }}({{ bankNumber }})</view>
+				</view>
+			</view>
+			<view class="item">
+				<view class="item-a">
+					<image :src="ImgUrl+'xzf/icon-05.png'" class="bank-waitImg"></image></image>
+					<view class="title">银行处理中</view>
+				</view>
+			</view>
+			<view class="item">
+				<view class="item-a">
+					<view class="title">预计 {{ time }}前到账</view>
+					<view class="name">如信息有误，资金将原路返回</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn" @click="toback">我知道了</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name:"recharging",
+	data() {
+		return {
+			ImgUrl: this.$ImgUrl,
+			bankName:'',
+			bankNumber:'',
+			time:'',
+			money:''
+			
+		}
+	},
+	onLoad(options){
+		this.bankName = 	options.bankName;  		//银行名称
+		this.bankNumber = 	options.bankNumber;   	//银行卡号
+		this.time = 	  	options.time; 			//预计到账时间
+		this.money = 		options.money; 			//到账金额
+
+	},
+	methods: {
+		toback(){
+			wx.navigateBack()
+		}
+	}
+}
+</script>
+
+<style scoped>
+
+.logs-box {
+	padding:85upx  85upx 0;
+	
+	
+}
+.item {
+	padding:0 70upx 70upx;
+	border-left:3upx solid #DADADA;
+	position: relative;
+	min-height: 139upx;
+}
+  
+.item:last-child {
+	border-color:#fff;
+}
+.item-a {
+	position: relative;
+	top: -20upx;
+}
+
+.bank-waitImg {
+	position: absolute;
+	left: -116upx;
+	top: -15upx;
+	width: 92upx;
+	height: 92upx;
+	z-index: 2;
+}
+.item::after {
+	content: "";
+	position: absolute;
+	left: -16upx;
+	top: -2upx;
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+	background: #DADADA;
+}
+
+.item.pass {
+	border-color: #15B780;
+}
+
+.item.pass::after {
+	background: #15B780;
+}
+
+.title {
+	font-size: 32upx;
+	font-weight: 500;
+	color: #282828;
+}
+
+.price {
+	font-size: 28upx;
+	font-weight: 500;
+	color: #999999;
+}
+
+.name {
+	font-size: 28upx;
+	font-weight: 500;
+	color: #999999;
+}
+
+.btn {
+	width: 522upx;
+	height: 90upx;
+	line-height: 90upx;
+	text-align: center;
+	font-size: 32upx;
+	font-weight: 500;
+	color: #15B780;
+	margin: 100upx auto 0;
+	border:2upx solid #15B780;
+	border-radius: 8upx;
+}
+</style>