1。优化权益活动报名

Utils/Api.js

@@ -270,3 +270,8 @@ export const configRosterRate = params => {
 export const reconsider = params => {
 	return POST('POST', `${base}/mer/reconsider`, params).then(res => res.data);
 }
+
+//根据商户查询结算
+export const getSettleAcctByMer = params => {
+	return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data);
+}

pages/index/depositaryBank/depositaryBank.vue

@@ -4,7 +4,7 @@
 		<unisearchbar v-model="searchValue" class="mart20" @input="getBankList" placeholder="搜索内容" radius="100">
 		</unisearchbar>
 		<!-- 商户名字 -->
-		<view v-if="taryBankList == ''" class="mart60 fotct font14 fcor666">
+		<view v-if="!taryBankList" class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
 		</view>
 		<view class="width100">
@@ -53,7 +53,7 @@
 				}
 				getBankList(datas).then(res => {
 					uni.hideLoading();
-					if (res.return_code == '000000' && res.return_data) {
+					if (res.return_code == '000000') {
 						this.taryBankList = res.return_data;
 					} else {
 						uni.showToast({

pages/index/equity-activities-details/equity-activities-details.vue

@@ -19,10 +19,51 @@
 			<rich-text :nodes="activitydetails.details"></rich-text>
 		</view>
 
+		<view class="width90 mart20 marb15 fcor333 fontwig6 font16" v-if="activitydetails.bankActivityRoster ==null">
+			商户信息
+		</view>
+		
+		<view class="username">
+			<view class="namecont">商户名称</view>
+			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merName}}</view>
+		</view>
+		<view class="username">
+			<view class="namecont">支行名称</view>
+			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankName}}</view>
+		</view>
+		<view class="username">
+			<view class="namecont">支行行号</view>
+			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankCode}}</view>
+		</view>
+		<!-- <view class="username">
+			<view class="namecont">银行地址</view>
+			<pickRegions :defaultRegion="defaultRegionCodes" class="width70" @getRegion="handleBankCityCode">
+				<view style="color: #333333;font-size:14px;padding-top:2px;	text-align: right;padding-right: 10px;"
+					v-if="bankregionName">
+					{{bankregionName}}
+				</view>
+				<view style="color: #bfbfbf;font-size:14px;padding-top:2px;	text-align: right;padding-right: 10px;"
+					v-else>请选择银行地址</view>
+			</pickRegions>
+			<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+		</view> -->
+
+		<!-- <view class="username">
+			<view class="namecont">所属支行</view>
+			<input placeholder="请选择所属支行" v-model="belongbranch" style="width: 70%;" disabled="true"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw" @click="showdepositaryBank()">
+			</image>
+		</view> -->
+
+
+
 		<view class="width90 mart20 marb15 fcor333 fontwig6 font16" v-if="activitydetails.bankActivityRoster !=null">
 			选择周期费率
-			<text class="fcoreb5" v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 1">(已生效)</text>
+			<text class="fcoreb5"
-			<text class="fcoreb5" v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 2">(未配置)</text>
+				v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 1">(已生效)</text>
+			<text class="fcoreb5"
+				v-if="activitydetails.bankActivityRoster.bankActivityRosterRateList[0].status == 2">(未配置)</text>
 		</view>
 		<view class="username" v-for="(item,index) in activityList" :key="index">
 			<view class="namecont">
@@ -46,24 +87,78 @@
 	import {
 		queryActivityDetail,
 		enrollActivity,
-		configRosterRate
+		configRosterRate,
+		getSettleAcctByMer
 	} from '../../../Utils/Api.js';
+	import pickRegions from '../../../components/pick-regions/pick-regions.vue';
+	let app = getApp();
 	export default {
+		components: {
+			pickRegions
+		},
 		data() {
 			return {
 				activitydetails: '', //活动数据
 				detailsid: '', // 详情id
 				merId: '', //商户id
 				activityList: [], // 所有费率
-				changeValue: '' //选择的值
+				changeValue: '', //选择的值
+				region: [], //选择区域
+				defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
+				defaultRegionCodes: '110101', //区级编号
+				bankareaCode: '', //开户行市区编号
+				bankregionName: '', //开户行名字
+				belongbranch: '', //所属支行
+				branchBankNo: '', //所属支行编号
+				merDetailInfo: '' //商户信息
 			}
 		},
 		onLoad(options) {
 			this.detailsid = options.id;
 			this.merId = options.merid;
 			this.queryActivityDetail();
+			this.getSettleAcctByMer();
+		},
+		onShow() {
+			if (app.globalData.depositaryBank) {
+				this.belongbranch = app.globalData.depositaryBank;
+			}
+			if (app.globalData.branchBankNo) {
+				this.branchBankNo = app.globalData.branchBankNo;
+			}
+		},
+		onUnload() {
+			app.globalData.depositaryBank = '';
+			app.globalData.bankareaCode = '';
+			app.globalData.branchBankNo = '';
+			app.globalData.clearNo = '';
 		},
 		methods: {
+			//查询商户信息
+			getSettleAcctByMer() {
+				let datas = {
+					merId: this.merId
+				}
+				getSettleAcctByMer(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.merDetailInfo = res.return_data;
+						this.branchBankNo = res.return_data.mer.merSettleAcct.openningBankCode;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//选择开户行
+			handleBankCityCode(region) {
+				this.region = region;
+				this.bankareaCode = this.region.map(item => item.code)[2];
+				this.bankregionName = this.region.map(item => item.name).join('-');
+				app.globalData.bankareaCode = this.bankareaCode;
+			},
 			//选择卡号
 			changefeil(e) {
 				let query = e.target.value;
@@ -75,6 +170,20 @@
 					}
 				}
 			},
+			//选择支行
+			showdepositaryBank() {
+				if (!this.bankareaCode) {
+					uni.showToast({
+						title: '请选择地区',
+						duration: 2000,
+						icon: 'none'
+					})
+					return;
+				}
+				uni.navigateTo({
+					url: '/pages/index/depositaryBank/depositaryBank'
+				})
+			},
 			changefeilvalue(item) {
 				this.changeValue = item;
 			},
@@ -91,8 +200,11 @@
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.activitydetails = res.return_data;
-						this.activityList = res.return_data.bankActivityRoster
+						if (res.return_data.bankActivityRoster) {
-							.bankActivityRosterRateList
+							this.activityList = res.return_data.bankActivityRoster
+								.bankActivityRosterRateList
+						}
+
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -115,6 +227,7 @@
 							})
 							let datas = {
 								bankActivityId: that.detailsid,
+								branchBankNo: that.branchBankNo,
 								merId: that.merId
 							}
 							enrollActivity(datas).then(res => {
@@ -129,7 +242,7 @@
 								} else {
 									uni.showToast({
 										title: res.return_msg,
-										duration: 2000,
+										duration: 3000,
 										icon: 'none'
 									})
 								}
@@ -228,7 +341,7 @@
 
 		.namecont {
 			color: #666666;
-			width: 80%;
+			width: 60%;
 		}
 	}
 </style>

pages/index/equity-activities/equity-activities.vue

@@ -68,6 +68,10 @@
 		},
 		onLoad(options) {
 			this.merId = options.id;
+		},
+		onShow() {
+			this.pageNum = 1;
+			this.activityList = [];
 			this.queryActivityList();
 		},
 		methods: {

pages/index/merchant-incoming-parts/merchant-incoming-parts.vue

@@ -79,6 +79,14 @@
 		<view class="width100 mart10 backcorfff" v-if="merchart == 2 && currentstatus != 1">
 			<view class="titlename font18 fontwig6 fcor333">营业信息</view>
 			<!-- 个体商户,企业商户 -->
+			<view class="username">
+				<view class="namecont">机构类型</view>
+				<picker mode="selector" style="width: 70%;" :range="organizationType" range-key="codeName"
+					@change="changefeilvalue">
+					<view class="text1">{{organizationName}}</view>
+				</picker>
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
 			<view class="username">
 				<view class="namecont">商户类型</view>
 				<input placeholder="请选择商户类型" v-model="merchantType" style="width: 70%;" disabled="true"
@@ -263,6 +271,10 @@
 		<!--第二步 已录入基本信息 -->
 		<view class="width100 mart10 backcorfff" v-if="merchart == 2 && currentstatus == 1">
 			<view class="titlename font18 fontwig6 fcor333">营业信息</view>
+			<view class="username">
+				<view class="namecont">机构类型</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.orgName}}</view>
+			</view>
 			<view class="username">
 				<view class="namecont">商户类型</view>
 				<view class="font14 fcor333 text2 width75 fotrt" v-if="merDetailInfo.merType == 1">个体商户</view>
@@ -800,6 +812,9 @@
 				getCodeisWaiting: false, //是否点击
 				ischecked: false, //是否同意条约
 				currentstatus: 0, //当前步骤状态 1: 已录入  其他:未录入
+				organizationType: [], //机构类型
+				organizationId: '', //机构id
+				organizationName: '', //机构名称
 				merchantType: '个体商户', //商户类型
 				merchantId: '1', //商户id
 				lementType: '对公结算', //结算账户类型
@@ -1531,6 +1546,8 @@
 								this.merchantId = 1;
 							}
 							this.companyname = res.return_data.merName
+							this.organizationName = res.return_data.orgName;
+							this.organizationId = res.return_data.orgNo;
 							this.merabbreviation = res.return_data.merAbbreviate;
 							this.mccno = res.return_data.merMccCode;
 							this.mccname = res.return_data.merMccName;
@@ -1560,6 +1577,8 @@
 								this.detailsaddress = res.return_data.merRegion.address;
 							}
 							if (res.return_data && this.merchart == 2) {
+								this.getDictionaryByCodeTypeOrg();
+								
 								this.idcardname = res.return_data.larName;
 								this.idcard = res.return_data.larIdCard;
 								this.larIdCardAddress = res.return_data.larIdCardAddress
@@ -1673,6 +1692,7 @@
 						}
 					} else {
 						this.getDictionaryByCodeType();
+						this.getDictionaryByCodeTypeOrg();
 					}
 				})
 			},
@@ -1923,6 +1943,7 @@
 				})
 				let datas = {
 					"id": that.merId,
+					"orgNo": that.organizationId,
 					"merType": that.merchantId,
 					"merName": that.companyname,
 					"merAbbreviate": that.merabbreviation,
@@ -2350,6 +2371,26 @@
 						this.rateCodeList = res.return_data;
 					}
 				})
+			},
+			//查询机构数据字典
+			getDictionaryByCodeTypeOrg() {
+				let params = {
+					codeType: 'ORG_NO'
+				}
+				getDictionaryByCodeType(params).then(res => {
+					if (res.return_code == '000000') {
+						this.organizationType = res.return_data;
+						if (!this.merDetailInfo.orgName) {
+							this.organizationId = res.return_data[0].codeValue;
+							this.organizationName = res.return_data[0].codeName;
+						}
+					}
+				})
+			},
+			//选择机构类型
+			changefeilvalue(e) {
+				this.organizationId = this.organizationType[e.target.value].codeValue;
+				this.organizationName = this.organizationType[e.target.value].codeName;
 			}
 		}
 	}

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>惠支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.b08b58bb.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.bc8fb141.js></script></body></html>