工商功能修改

.gitignore

@@ -6,6 +6,7 @@ dist/
 # local env files
 .env.local
 .env.*.local
+manifest.json
 
 # Log files
 npm-debug.log*

manifest.json

@@ -85,8 +85,18 @@
     },
     "h5" : {
         "devServer" : {
-            "port" : 80,
-            "disableHostCheck" : true
+           "port": 80,
+           "disableHostCheck": true,
+        	"proxy": { 
+				"/api": {
+					"target": "https://uat.xiaopay.net",
+					"changeOrigin": true,   
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"  
+					}  
+				} 
+			}  
         },
         "router" : {
             "mode" : "hash",

pages/IcbcModule/Recharge/Recharge.vue

@@ -67,8 +67,9 @@
 			<!-- 支付方式 -->
 			<view class="payType" @click="queryBindCardList">
 				<view>付款方式</view>
-				<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
-						class="arrow"></span></view>
+				<view> {{ bankInfo_.bindCardName}} {{ bankInfo_.bindCardNo.slice(bankInfo_.bindCardNo.length-4) }}<span class="arrow"></span></view>
+			<!-- 	<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
+						class="arrow"></span></view> -->
 			</view>
 			<!-- <view class="" style="height: 1rpx;background-color: #DFDFDF;"></view> -->
 			<!-- 充值生活费 -->
@@ -117,8 +118,8 @@
 						<view class="" v-else>
 							充值金额：{{Money}}元
 						</view>
-						<view class="">
-							付款账户：{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}})
+						<view class="" >
+							付款账户：{{bankInfo_.bindCardName}}({{bankInfo_.bindCardNo && bankInfo_.bindCardNo.slice(bankInfo_.accountNo.length-4)}})
 						</view>
 					</view>
 					<view style="width: 520rpx;height: 1rpx;background: #EEEEEE;"></view>
@@ -142,11 +143,13 @@
 					<!-- 切换绑定的一类卡列表 -->
 					<view class="showBindCardList">
 						<view class="choiceBox">选择付款账户</view>
-						<view class="ListItem" @click="ChangeCardPay('bankName','bindCardNo')"
+						<view 
+						class="ListItem" 
+						@click="ChangeCardPay(item)"
 						v-for="(item,index) in bindcardList" :key="index">
-							<span>{{item.bankName}}</span>
-							<span>{{item.bindCardNo}}</span>
-							<image class='BankListImg' src='../../../static/img/choiceBank.png'></image>
+							<span style="padding-right:10px;">{{item.bindCardName}} </span>
+							<span>尾号：{{item.bindCardNo.slice(item.bindCardNo.length-4)}}</span>
+							<!-- <image class='BankListImg' src='../../../static/img/choiceBank.png'></image> -->
 						</view>
 					</view>
 				</view>
@@ -232,7 +235,9 @@
 					usertype: "1"
 				},
 				bankInfo_: {
-					accountNo: '**** **** **** 1234'
+					accountNo: '**** **** **** 1234',
+					bindCardName:'',
+					bindCardNo:''
 				},
 				ImgUrl: this.$ImgUrl,
 				MoneyList: Array(6).fill(1).map((v, index) => {
@@ -246,7 +251,7 @@
 				tempFiles1: '../../static/img/idCardBg1.png', //上传身份证临时选择文件
 				tempFiles2: '../../static/img/idCardBg0.png',
 				//绑定的一类卡列表 
-				bindcardList: []
+				bindcardList: [],
 			}
 		},
 		onLoad: function(options) {
@@ -438,11 +443,19 @@
 					success: function(res5) {
 						loading.clear();
 						if (res5.code == "10000") {
+							let appStatus = res5.results.appStatus;
+							if(appStatus == '4'){
 								uni.showModal({
 									title: "系统提示",
 									content: "充值成功!"
 								})
 								this_.queryBankInfo();
+							}else{
+								uni.showModal({
+									title: "系统提示",
+									content: appStatus == '1' ? '申请已受理' : '申请失败'
+								})
+							}
 						} else {
 							weui.topTips(res5.message)
 							uni.showModal({
@@ -459,15 +472,10 @@
 			// 复制我卡号
 			async CopyCardNumber() {
 				let value = this.bankInfo_.accountNo
-				// Dialog({
-				// 	title: '系统提示',
-				// 	message: '卡号复制成功'
-				// });
-				uni.showToast({
-					icon: "none",
-					duration: 3000,
-					title: "卡号复制成功！"
-				})
+				Dialog({
+					title: '系统提示',
+					message: '复制成功！'
+				});
 				this.$nextTick(function() {
 					let clipboard = new ClipboardJS('#cardNumright', {
 						text: function() {
@@ -516,14 +524,14 @@
 				}
 			},
 			//换绑卡
-			ChangeCardPay(bankName, bindCard) {
+			ChangeCardPay(item) {
 				let this_ = this;
-				if (bindCard == payCardNumber) {
+				if (bankInfo.bindCardNo == item.bindCardNo) {
 					return
 				}
 				var loading = weui.loading('请稍后');
 				$.ajax({
-					url: gHost + '/bank-wechat/user/bank/change/bind',
+					url: gHost + '/bank-wechat/icbc/account/bindcard/changeDefaultBinding',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -531,16 +539,18 @@
 						userId: userID,
 						sessionid: sessionID,
 						wechattype: 1,
-						accountName: bankName,
-						accountNo: bindCard,
+						bindMedium:item.bindCardNo,
+						bindMediumName:item.bindCardName
 					},
 					success: function(res5) {
 						loading.hide();
 						if (res5.code == "10000") {
 							this_.queryUserBankInfo();
+							this_.close();
 						} else {
 							weui.topTips(res5.message)
 						}
+						this_.popshow = false;
 					},
 					error: function(err) {
 						loading.hide();
@@ -549,14 +559,14 @@
 			},
 			//查询一类卡绑定列表
 			queryBindCardList() {
-				return
 				let this_ = this;
 				let loading = weui.loading('请稍后');
 				$.ajax({
-					url: gHost + '/bank-wechat/query/account',
+					url: gHost + '/bank-wechat/icbc/account/bindcard/bindingList',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
+						mediumId: bankInfo.accountNo,
 						schoolId: bankInfo.schoolId,
 						userId: userID,
 						sessionid: sessionID,
@@ -565,7 +575,7 @@
 					success: function(res4) {
 						loading.hide();
 						if (res4.code == "10000") {
-							this_.bindcardList = res4.results.accountList[0].bindcardList
+							this_.bindcardList = res4.results;
 							this_.popshow = true
 						} else {
 							weui.topTips(res4.message)
@@ -642,8 +652,9 @@
 							}
 							bankInfo = res2.results;
 							bankInfo.sessionid = sessionID;
-							this_.queryBankInfo();
-							this_.bankInfo_ = bankInfo
+							this_.queryBankInfo();  //查余额
+							this_.bankInfo_ = bankInfo;
+							// this_.getBindingList(bankInfo.accountNo,bankInfo.schoolId,bankInfo.id);
 						} else {
 							weui.topTips(res2.message)
 						}
@@ -708,6 +719,25 @@
 		width: 750rpx;
 		background: linear-gradient(180deg, #FFFFFF 0%, #FAFAFA 100%);
 	}
+    .showBindCardList {
+		.choiceBox {
+			text-align: center;
+			font-weight: bold;
+			height: 50px;
+			line-height: 50px;
+			padding: 0;
+			border-bottom: 0.5px solid #e6e6e6;
+		}
+		
+		.ListItem {
+			border-bottom: 1rpx solid #e6e6e6;
+			font-size: 30rpx;
+			padding: 25rpx 0;
+			background: #fff;
+			position: relative;
+			text-align: center;
+		}
+	}
 	
 	.SubmittedSuccessfully {
 		width: 400rpx !important;
@@ -995,26 +1025,12 @@
 	}
 
 
-
-	@media screen and(max-height:600px) {
-		.bottomdiv {
-			// position: fixed;
-			// left: 0;
-			// right: 0;
-			// bottom: 30rpx;
-			margin-top: 173rpx;
-			padding-bottom: 80rpx;
-		}
-	}
-
-	@media screen and(min-height:600px) {
 	.bottomdiv {
 		position: fixed;
 		left: 0;
 		right: 0;
 		bottom: 30rpx;
 	}
-	}
 
 	.DepositID {
 		width: 630rpx;
@@ -1075,7 +1091,7 @@
 			}
 
 			.ContenInfo {
-				// text-align: center;
+				text-align: center;
 				width: 383rpx;
 				height: 159rpx;
 				margin: 0 auto;

pages/IcbcModule/Reflect/Reflect.vue

@@ -209,11 +209,20 @@
 					success: function(res5) {
 						loading.hide();
 						if (res5.code == "10000") {
+							let appStatus = res5.results.appStatus;
+							if(appStatus == '4'){
 								uni.showModal({
 									title: "系统提示",
 									content: "提现成功!"
 								})
 								uni.navigateBack({})
+							}else{
+								uni.showModal({
+									title: "系统提示",
+									content: appStatus == '1' ? '申请已受理' : '申请失败'
+								})
+							}
+							
 						} else {
 							weui.topTips(res5.message)
 							uni.showModal({