Merge branch 'master' of https://git.bjtdba.com/shop/H5-Merchant

openmerchant/amountopening/index.vue

@@ -25,12 +25,12 @@
 					<view class="amountopening-kaiqi-text">
 						开通商户立享八项功能权益
 					</view>
-			<!-- 		<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
-						我有激活码
-					</view> -->
-					<view class="amountopening-kaiqi-iocnr" @click="payment">
+					<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
 						我有激活码
 					</view>
+			<!-- 		<view class="amountopening-kaiqi-iocnr" @click="payment">
+						我有激活码
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -174,66 +174,35 @@
 				})
 			},
 			payment() {
-// <<<<<<< HEAD
-// 				let userInfo = uni.getStorageSync('userinfo')
-// 				// 用户状态判断
-// 				selectMerchant({
-// 					uid: userInfo.uid
-// 				}).then(data => {
-// 					console.log('data = ',data)
-// 					if (data.data.status == 200) {
-// 						if (data.data.data.status == -1) {
-// 							this.pushToUserApplet()
-// 						} else {
-// 							uni.redirectTo({
-// 								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
-// 							});
-// 							return
-// 						}
-// 					}
-// 				}, fail => {
-// 					uni.showToast({
-// 						title: fail,
-// 						icon: "none"
-// 					})
-// 				}).catch(err => {
-// 					console.log(err)
-// 				})
-// =======
-				uni.showToast({
-					title: '升级中',
-					icon: "none"
-				});
-				// let userInfo = uni.getStorageSync('userinfo')
-				// // 用户状态判断
-				// selectMerchant({
-				// 	uid: userInfo.uid
-				// }).then(data => {
-				// 	console.log('data = ',data)
-				// 	if (data.data.status == 200) {
-				// 		if (data.data.data.status == -1) {
-				// 			this.pushToUserApplet()
-				// 		} else {
-				// 			uni.redirectTo({
-				// 				url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
-				// 			});
-				// 			return
-				// 		}
-				// 	}
-				// }, fail => {
-				// 	uni.showToast({
-				// 		title: fail,
-				// 		icon: "none"
-				// 	})
-				// }).catch(err => {
-				// 	console.log(err)
-				// })
-				
-// >>>>>>> 3955fd90b8225baed7aa662df1578ac9b433983f
-				
-				
+				// uni.showToast({
+				// 	title: '升级中',
+				// 	icon: "none"
+				// });
+				let userInfo = uni.getStorageSync('userinfo')
+				// 用户状态判断
+				selectMerchant({
+					uid: userInfo.uid
+				}).then(data => {
+					console.log('data = ',data)
+					if (data.data.status == 200) {
+						if (data.data.data.status == -1) {
+							this.pushToUserApplet()
+						} else {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
+							});
+							return
+						}
+					}
+				}, fail => {
+					uni.showToast({
+						title: fail,
+						icon: "none"
+					})
+				}).catch(err => {
+					console.log(err)
+				})
 			},
-			
 			pushToUserApplet() {
 				
 				uni.showToast({