Merge branch 'huipay-h5' into huipay-app-dev

pages/index/settlement_details/settlement_details.vue

@@ -66,7 +66,9 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view>
+		<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人授权书</view>
+		<image class="width90 " mode="widthFix" :src="uncorporsettelimg" v-if="auditDetail.settleType == 3"></image>
 		<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人身份证图片</view>
 		<image class="width90 " mode="widthFix" :src="idcardposimg" v-if="auditDetail.settleType == 3"></image>
 		<image class="width90 " mode="widthFix" :src="idcardsideimg" v-if="auditDetail.settleType == 3"></image>
@@ -102,7 +104,8 @@
 				auditDetail: '', //详情资料
 				rejectReason: '', //驳回内容
 				accopenperimg: '', //开户许可证图片
-				settleimg: '', //结算银行卡
+				settleimg: '', //结算银行卡
+				uncorporsettelimg:'', //结算非法人信息
 				idcardposimg: '', //身份证正面
 				idcardsideimg: '' //身份证反面
 			}
@@ -127,6 +130,9 @@
 						this.getImgSignedUrl(5, res.return_data.auditObject.openningBankLicenseUrl);
 						if (res.return_data.auditObject.bankCardImg) {
 							this.getImgSignedUrl(4, res.return_data.auditObject.bankCardImg);
+						}
+						if (res.return_data.auditObject.commissionImg) {
+							this.getImgSignedUrl(10, res.return_data.auditObject.commissionImg);
 						}
 						if (res.return_data.auditObject.settleType == 3) {
 							this.getImgSignedUrl(2, res.return_data.auditObject.settleIdCardPortraitImg);
@@ -155,6 +161,9 @@
 						}
 						if (item == 3) {
 							this.idcardsideimg = res.return_data;
+						}
+						if (item == 10) {
+							this.uncorporsettelimg = res.return_data;
 						}
 					}
 				})

pages/index/updateSettlement/updateSettlement.vue

@@ -3,14 +3,17 @@
 		<!-- 审核状态回馈 -->
 		<view class="width100 height100p" style="background-color: #eb6a53;"
 			v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4 || applyByMerList.status == 6)">
-			<view class="font18 fcorfff paading10 aliitem" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
+			<view class="font18 fcorfff paading10 aliitem"
+				v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
 				<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
 			</view>
-			<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">{{applyByMerList.rejectReason}}
+			<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
+				{{applyByMerList.rejectReason}}
 			</view>
-			<view class="font18 fcorfff paddtop35 fotct" v-if="applyByMerList.status == 2 || applyByMerList.status == 5">
+			<view class="font18 fcorfff paddtop35 fotct"
+				v-if="applyByMerList.status == 2 || applyByMerList.status == 5">
 				审核中
-			</view>
+			</view>
 		</view>
 
 		<!--第三步 未录入结算信息 -->
@@ -22,6 +25,20 @@
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showPopup()" />
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
+			<view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view>
+			<view class="width94 displ" v-if="lementId == 3">
+				<image :src="uncorporsettelimg" v-if="uncorporsettelimg" @click="upload(10)" mode="widthFix"
+					class="width45">
+				</image>
+				<image src="../../../static/img/businesslic7.png" v-else mode="widthFix" @click="upload(10)"
+					class="width45" style="margin-left: 3%;"></image>
+				<image src="../../../static/img/businesslic8.png" mode="widthFix" class="width45"
+					style="margin-left: 3%;" @click="perImage('../../../static/img/businesslic8.png')"></image>
+			</view>
+			<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="lementId == 3">
+				<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image>
+				<text class="width90p">请预览并保存授权书到本地，打印填写完整并签字后拍照上传；图片需清晰完整，以免审核失败</text>
+			</view>
 			<view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3">
 				<view class="width70 aliitem fcor666">
 					非法人身份证照片
@@ -187,7 +204,8 @@
 				</view>
 			</view>
 		</wybPopup>
-		<view class="btn" @tap="submitsotre" v-if="!applyByMerList || applyByMerList.status == 4 || applyByMerList.status == 6">提交审核</view>
+		<view class="btn" @tap="submitsotre"
+			v-if="!applyByMerList || applyByMerList.status == 4 || applyByMerList.status == 6">提交审核</view>
 		<view class="height60"></view>
 	</view>
 </template>
@@ -224,6 +242,8 @@
 				idcardname: '', //证件姓名
 				idcard: '', //身份证号
 				larIdCardAddress: '', //身份证地址
+				uncorporsettelimg: '', //非法人结算授权书
+				uploaduncorporsettelimg: '', //上传非法人结算委托书
 				settleimg: '', //结算人银行卡照片
 				uploadsettleimg: '', //上传结算人银行卡照片
 				accopenperimg: '', //开户许可证图片
@@ -324,6 +344,10 @@
 							if (res.return_data.openningBankLicenseUrl) {
 								this.getImgSignedUrl(5, res.return_data.openningBankLicenseUrl, 2);
 							}
+							if (res.return_data.commissionImg) {
+								this.getImgSignedUrl(10, res.return_data.commissionImg, 2);
+							}
+
 							if (res.return_data.electronicPact) {
 								this.electronicProtocolimg = res.return_data.electronicPact
 									.split(
@@ -351,6 +375,7 @@
 							this.idcard = res.return_data.settleIdCardNo;
 							this.timetype = res.return_data.settleIdPeriodType;
 							this.bankareaCode = res.return_data.openningBankAreaCode;
+							this.larIdCardAddress = res.return_data.settleIdCardAddress;
 							this.idcardposimg = res.return_data.settleIdCardPortraitImg;
 							this.uploadidcardposimg = res.return_data.settleIdCardPortraitImg;
 							this.idcardsideimg = res.return_data.settleIdCardNationalEmblemImg;
@@ -506,6 +531,10 @@
 								this.accopenperimg = res.return_data;
 							}
 						}
+						if (item == 10) {
+							this.uploaduncorporsettelimg = item1;
+							this.uncorporsettelimg = res.return_data;
+						}
 					}
 				})
 			},
@@ -789,6 +818,7 @@
 								"openningBankName": that.belongbranch, //"银行名称",
 								"bankCardNo": that.bankNo, //"银行卡号",
 								"openningBankAreaCode": that.bankareaCode, // 开户地址
+								"commissionImg": that.uploaduncorporsettelimg, // 结算委托书
 								"bankCardHolder": that.bankName, //"银行卡持有人",
 								"openningBankCode": that.openingbankNo, //"开户行号",
 								"bankName": that.belongbank, //"开户行名称",
@@ -813,7 +843,7 @@
 										title: '提交成功',
 										icon: 'none',
 										duration: 2000
-									})
+									})
 									uni.navigateBack();
 								} else {
 									uni.showToast({