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

# Conflicts:
#	pages/index/merchant-details/merchant-details.vue
1.解决冲突

Utils/Api.js

@@ -328,6 +328,12 @@ export const unbindStore = params => {
 	return POST('POST', `${base}/device/unbindStore`, params).then(res => res.data);
 }
 
+//切换渠道
+export const switchPlatform = params => {
+	return POST('POST', `${base}/merPlatform/switchPlatform`, params).then(res => res.data);
+}
+
+
 
 
 

pages/index/merchant-details/merchant-details.vue

@@ -101,14 +101,34 @@
 		<!-- 渠道列表 -->
 		<view class="mart15 width100" v-if="current == 2">
 			<!-- v-for="(item,indexplt) in merPlatformList" :key="indexplt" -->
-			<view class="width94 backcorfff border-r mart15" v-for="(item,indexplt) in merPlatformList" :key="indexplt">
+			<view class="width94 backcorfff border-r mart15 paddbotm10" v-for="(item,indexplt) in merPlatformList"
+				:key="indexplt" @click="jumpDetailsparts(item.merId,item.platformType)">
 				<view class="notes" style="border-bottom: 0px;">
-					<view class="width100 margle">
+					<view class="width70 margle">
 						<view class="font16 fcor333" v-if="item.platformType == 1">渠道名称: 拉卡拉</view>
-						<view class="font14 fcor999 mart5">商户号: {{item.cupNo}}</view>
+						<view class="font16 fcor333" v-if="item.platformType == 5">渠道名称: 随行付</view>
-						<view class="font14 fcor999 mart5">终端号: {{item.merPlatformTerm.termNo}}</view>
+						<view class="font14 fcor999 mart5" v-if="item.cupNo">商户号: {{item.cupNo}}</view>
+						<view class="font14 fcoreb5 mart5" v-if="item.suggestionReject">审核驳回原因:
+							{{item.suggestionReject}}
 						</view>
 					</view>
+					<view class="otstatucs" v-if="item.status == 0">
+						不可用
+					</view>
+					<view class="storestus" v-if="item.status == 1">
+						可用
+					</view>
+					<view class="otstatucs" v-if="item.status == 2">
+						审核中
+					</view>
+					<view class="otstatucs" v-if="item.status == 3">
+						审核驳回
+					</view>
+				</view>
+				<view class="btnschange width90 border-r" v-if="item.platformType == 1 && !item.currentPlatform"
+					@click.stop="switchPlatform(item.merId,item.platformType)">切换拉卡拉</view>
+				<view class="btnschange width90 border-r" v-if="item.platformType == 5 && !item.currentPlatform"
+					@click.stop="switchPlatform(item.merId,item.platformType)">切换随行付</view>
 			</view>
 		</view>
 		<view class="width94 alijus" v-if="current == 0">
@@ -123,7 +143,8 @@
 	import {
 		getMerDetail,
 		getStoreListByMer,
-		getMerPlatformList
+		getMerPlatformList,
+		switchPlatform
 	} from '../../../Utils/Api.js';
 	export default {
 		components: {
@@ -144,6 +165,9 @@
 			this.merid = options.id;
 			this.getMerDetail(this.merid);
 		},
+		onShow() {
+			this.getMerPlatformList();
+		},
 		methods: {
 			//筛选
 			change(index) {
@@ -265,7 +289,39 @@
 						url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
 					})
 				}
-
+			},
+			//跳转进件
+			jumpDetailsparts(item, item1) {
+				uni.navigateTo({
+					url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + item + '&merPlatformType=' +
+						item1
+				})
+			},
+			//切换渠道
+			switchPlatform(item, item1) {
+				uni.showModal({
+					title: '切换渠道',
+					content: '是否确认切换当前渠道',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '处理中...'
+							})
+							let data = {
+								"merId": item,
+								"platformType": item1
+							}
+							switchPlatform(data).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									this.getMerPlatformList();
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			}
 		}
 	}
@@ -279,7 +335,7 @@
 	.notes {
 		width: calc(100% - 40rpx);
 		display: flex;
-		align-items: center;
+		align-items: flex-start;
 		padding: 30rpx 0 30rpx 20rpx;
 		border-bottom: 1px solid #f6f6f6;
 	}
@@ -335,4 +391,14 @@
 	.lin10 {
 		height: 10px;
 	}
+
+	.btnschange {
+		background-color: #0083f5;
+		font-size: 14px;
+		width: 90px;
+		text-align: center;
+		padding-top: 5px;
+		padding-bottom: 5px;
+		color: #FFFFFF;
+	}
 </style>

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

@@ -11,11 +11,12 @@
 		</view>
 		<!-- 审核状态回馈 -->
 		<view class="width100 line10 "></view>
-		<view class="width100" style="background-color: #eb6a53;" v-if="merDetailInfo.merStatus == 4">
+		<view class="width100" style="background-color: #eb6a53;"
+			v-if="merDetailInfo.merContractFailMsg && merDetailInfo.merContractFailMsg.response_msg">
 			<view class="font18 fcorfff paading10 aliitem">
 				<image src="../../../static/img/error.png" mode="widthFix" class="iconw25 marglerig"></image>审核失败
 				<text class="fotct margle20 backcorfff fcoreb5 font14 border-r marRight20 flright paddtop5 paddbotm5"
-					style="width: 80px;" @click="reconsider">复议提交</text>
+					style="width: 80px;" @click="reconsider" v-if="merPlatformType && merPlatformType == 1">复议提交</text>
 			</view>
 			<view class="font14 fcorfff paading10">{{merDetailInfo.merContractFailMsg.response_msg}}</view>
 
@@ -179,11 +180,39 @@
 				</pickRegions>
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
-			<!-- <view class="username">
+
-				<view class="namecont">mcc编号</view>
+			<view class="username">
-				<input placeholder="请输入四位数字的mcc编号" v-model="mccno" maxlength="4" style="width: 70%;"
+				<view class="namecont font16">经营类型</view>
+				<picker mode="selector" style="width: 70%;" :range="merOperateList" range-key="codeName"
+					@change="bindUserCard">
+					<view class=" text1 marRight10 font14" v-if="merOperateType">
+						{{merOperateName}}
+					</view>
+					<view class=" text1 marRight10 fcor999 font14" v-else>
+						请选择设备类型
+					</view>
+				</picker>
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
+
+			<view class="username" v-if="merOperateType == 2">
+				<view class="namecont font16">线上类型</view>
+				<picker mode="selector" style="width: 70%;" :range="merOnlineList" range-key="codeName"
+					@change="bindUserCard1">
+					<view class=" text1 marRight10 font14" v-if="merOnlineType">
+						{{merOnlinetypsName}}
+					</view>
+					<view class=" text1 marRight10 fcor999 font14" v-else>
+						请选择设备类型
+					</view>
+				</picker>
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
+			<view class="username" v-if="merOperateType == 2">
+				<view class="namecont">线上产品名称</view>
+				<input placeholder="请输入线上产品名称" v-model="merOnlineName" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view> -->
+			</view>
 			<view class="username">
 				<view class="namecont">mcc编号</view>
 				<input placeholder="请选择mcc编号" v-model="mccname" style="width: 70%;" disabled="true"
@@ -837,6 +866,13 @@
 				larIdCardAddress: '', //身份证地址
 				idcardtime: '1', // times:选择时间  longterm: 长期 
 				uncorporsettelimg: '', //非法人结算授权书
+				merOperateList: '', //商户经营类型
+				merOnlineList: '', //商户线上产品类型
+				merOperateType: '', //"商户经营类型  1：线下  2：线上",
+				merOperateName: '', // 1：线下  2：线上",
+				merOnlineType: '', //"商户线上产品类型 1：APP    2：网站    3：公众号/小程序/服务窗
+				merOnlinetypsName: '', //1：APP    2：网站    3：公众号/小程序/服务窗
+				merOnlineName: '', //"商户线上产品名称"
 				uploaduncorporsettelimg: '', //上传非法人结算委托书
 				settleimg: '', //结算人银行卡照片
 				uploadsettleimg: '', //上传结算人银行卡照片
@@ -885,6 +921,7 @@
 				merDetailInfo: '', //用户信息
 				rateCodeList: [], //费率字典
 				merRateList: [], //提交费率数组
+				merPlatformType: '' //渠道ID
 			}
 		},
 		computed: {
@@ -905,6 +942,7 @@
 		},
 		onLoad(options) {
 			this.merId = options.id;
+			this.merPlatformType = options.merPlatformType;
 			this.getMerDetail(1);
 		},
 		onShow() {
@@ -933,6 +971,8 @@
 				this.storelongitude = app.globalData.storeMessage.location.lng;
 				this.storelatitude = app.globalData.storeMessage.location.lat;
 			}
+			this.merOperateList = app.globalData.Dictionaries.MER_OPERATE_TYPE;
+			this.merOnlineList = app.globalData.Dictionaries.MER_ONLINE_TYPE;
 		},
 		onUnload() {
 			app.globalData.businessid = '';
@@ -945,6 +985,16 @@
 			app.globalData.depositaryBank = '';
 		},
 		methods: {
+			//商户经营类型
+			bindUserCard(e) {
+				this.merOperateType = this.merOperateList[e.target.value].codeValue;
+				this.merOperateName = this.merOperateList[e.target.value].codeName;
+			},
+			//商户线上产品类型
+			bindUserCard1(e) {
+				this.merOnlineType = this.merOnlineList[e.target.value].codeValue;
+				this.merOnlinetypsName = this.merOnlineList[e.target.value].codeName;
+			},
 			//显示商户弹出
 			showPopup() {
 				this.$refs.popup.show();
@@ -1000,6 +1050,10 @@
 			//进件复议
 			reconsider() {
 				let that = this;
+				let platformType = "";
+				if (that.merPlatformType && that.merPlatformType != undefined) {
+					platformType = that.merPlatformType;
+				}
 				uni.showModal({
 					title: '复议提交',
 					content: '确认信息是否正确',
@@ -1009,7 +1063,8 @@
 								title: '提交审核中...'
 							})
 							let datas = {
-								"merId": that.merId
+								"merId": that.merId,
+								"merPlatformType": platformType
 							}
 							reconsider(datas).then(res => {
 								uni.hideLoading();
@@ -1517,8 +1572,13 @@
 			},
 			//查询商户信息
 			getMerDetail(item) {
+				let platformType = "";
+				if (this.merPlatformType && this.merPlatformType != undefined) {
+					platformType = this.merPlatformType;
+				}
 				let datas = {
-					merId: this.merId
+					merId: this.merId,
+					merPlatformType: platformType
 				}
 				getMerDetail(datas).then(res => {
 					if (res.return_code == '000000' && res.return_data) {
@@ -1581,6 +1641,20 @@
 
 								this.idcardname = res.return_data.larName;
 								this.idcard = res.return_data.larIdCard;
+								this.merOperateType = res.return_data.merOperateType;
+								this.merOnlineType = res.return_data.merOnlineType;
+								for (var i = 0; i < this.merOperateList.length; i++) {
+									if (res.return_data.merOperateType == this.merOperateList[i].codeValue) {
+										this.merOperateName = this.merOperateList[i].codeName;
+									}
+								}
+								for (var j = 0; j < this.merOnlineList.length; j++) {
+									if (res.return_data.merOnlineType == this.merOnlineList[j].codeValue) {
+										this.merOnlinetypsName = this.merOnlineList[j].codeName;
+									}
+								}
+								//商户线上产品类型
+								this.merOnlineName = res.return_data.merOnlineName;
 								this.larIdCardAddress = res.return_data.larIdCardAddress
 								this.getImgSignedUrl(1, res.return_data.blisUrl, 2);
 								this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg, 2);
@@ -1926,6 +2000,33 @@
 					});
 					return;
 				}
+				if (!that.merOperateType) {
+					uni.showToast({
+						title: '请选择经营类型',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+
+				if (that.merOperateType && that.merOperateType == 2) {
+					if (!that.merOnlineType) {
+						uni.showToast({
+							title: '请选择线上产品类型',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if (!that.merOnlineName) {
+						uni.showToast({
+							title: '请输入线上产品名称',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}
 
 				if (that.merchantId == 3) {
 					this.start_date = '';
@@ -1957,6 +2058,9 @@
 					"blisPeriodEnd": that.end_date,
 					"larName": that.idcardname,
 					"larIdCard": that.idcard,
+					"merOperateType": that.merOperateType,
+					"merOnlineType": that.merOnlineType,
+					"merOnlineName": that.merOnlineName,
 					"larIdCardAddress": that.larIdCardAddress,
 					"larIdCardPortraitImg": that.uploadidcardposimg,
 					"larIdCardNationalEmblemImg": that.uploadidcardsideimg,
@@ -2308,6 +2412,10 @@
 					});
 					return;
 				}
+				let platformType = "";
+				if (that.merPlatformType && that.merPlatformType != undefined) {
+					platformType = that.merPlatformType;
+				}
 				uni.showModal({
 					title: '提交审核',
 					content: '确认信息是否正确。',
@@ -2326,6 +2434,7 @@
 								"doorHeadImg": that.uploadstoreimg1,
 								"cashRegisterImg": that.uploadstoreimg2,
 								"internalImg": that.uploadstoreimg3,
+								"merPlatformType": platformType,
 								"storeRegion": {
 									"address": that.storeAddress,
 									"areaCode": that.storeareaCode,

pages/index/modifyRate/modifyRate.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 
-		<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6">提交审核</view>
+		<view class="btn" @click="updatemodifyRate()" v-if="!modifyDetails || modifyDetails.status == 4 || modifyDetails.status == 6 || modifyDetails.status == 3">提交审核</view>
 	</view>
 </template>