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

openmerchant/amountopening/index.vue

@@ -17,15 +17,18 @@
 					<view class="amountopening-jinggao-top">
 						开通电商商户
 					</view>
-					<view class="amountopening-jinggao-bot">
+		<!-- 			<view class="amountopening-jinggao-bot">
 						¥19800/年
-					</view>
+					</view> -->
 				</view>
 				<view class="amountopening-kaiqi">
 					<view class="amountopening-kaiqi-text">
 						开通商户立享八项功能权益
 					</view>
-					<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
+			<!-- 		<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
+						我有激活码
+					</view> -->
+					<view class="amountopening-kaiqi-iocnr" @click="payment">
 						我有激活码
 					</view>
 				</view>
@@ -171,30 +174,62 @@
 				})
 			},
 			payment() {
-				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)
-				})
+// <<<<<<< 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
 				
 				
 			},

shop/perating/activitecode.vue

@@ -16,12 +16,12 @@
 		<view class="activite-nav">
 			<view class="activite-card">
 				<image class="activite-card-logo"
-					src="https://cdn.bjtdba.com/vod/image/2024-04-18/20240418171035764.png" mode=""></image>
+					src="https://cdn.bjtdba.com/vod/image/2025-02-18/20250218234259970.png" mode=""></image>
 				<view class="activite-cardImg">
 					<image :src="qrcode_src" mode="widthFix"></image>
 				</view>
 				<view class="activite-cardText">{{code_id}}</view>
-				<view class="activite-cardBtn">
+				<view class="activite-cardBtn">	
 					扫码即得养老金
 				</view>
 				<view class="activite-cardPrompt">