xialei 1 год назад
Родитель
Сommit
3955fd90b8
2 измененных файлов с 37 добавлено и 30 удалено
  1. 35 28
      openmerchant/amountopening/index.vue
  2. 2 2
      shop/perating/activitecode.vue

+ 35 - 28
openmerchant/amountopening/index.vue

@@ -17,15 +17,18 @@
17 17
 					<view class="amountopening-jinggao-top">
18 18
 						开通电商商户
19 19
 					</view>
20
-					<view class="amountopening-jinggao-bot">
20
+		<!-- 			<view class="amountopening-jinggao-bot">
21 21
 						¥19800/年
22
-					</view>
22
+					</view> -->
23 23
 				</view>
24 24
 				<view class="amountopening-kaiqi">
25 25
 					<view class="amountopening-kaiqi-text">
26 26
 						开通商户立享八项功能权益
27 27
 					</view>
28
-					<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
28
+			<!-- 		<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
29
+						我有激活码
30
+					</view> -->
31
+					<view class="amountopening-kaiqi-iocnr" @click="payment">
29 32
 						我有激活码
30 33
 					</view>
31 34
 				</view>
@@ -171,31 +174,35 @@
171 174
 					console.log('激活码激活 -->',fail)
172 175
 				})
173 176
 			},
174
-			payment() {
175
-				let userInfo = uni.getStorageSync('userinfo')
176
-				// 用户状态判断
177
-				selectMerchant({
178
-					uid: userInfo.uid
179
-				}).then(data => {
180
-					console.log('data = ',data)
181
-					if (data.data.status == 200) {
182
-						if (data.data.data.status == -1) {
183
-							this.pushToUserApplet()
184
-						} else {
185
-							uni.redirectTo({
186
-								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
187
-							});
188
-							return
189
-						}
190
-					}
191
-				}, fail => {
192
-					uni.showToast({
193
-						title: fail,
194
-						icon: "none"
195
-					})
196
-				}).catch(err => {
197
-					console.log(err)
198
-				})
177
+			payment() {
178
+				uni.showToast({
179
+					title: '升级中',
180
+					icon: "none"
181
+				});
182
+				// let userInfo = uni.getStorageSync('userinfo')
183
+				// // 用户状态判断
184
+				// selectMerchant({
185
+				// 	uid: userInfo.uid
186
+				// }).then(data => {
187
+				// 	console.log('data = ',data)
188
+				// 	if (data.data.status == 200) {
189
+				// 		if (data.data.data.status == -1) {
190
+				// 			this.pushToUserApplet()
191
+				// 		} else {
192
+				// 			uni.redirectTo({
193
+				// 				url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
194
+				// 			});
195
+				// 			return
196
+				// 		}
197
+				// 	}
198
+				// }, fail => {
199
+				// 	uni.showToast({
200
+				// 		title: fail,
201
+				// 		icon: "none"
202
+				// 	})
203
+				// }).catch(err => {
204
+				// 	console.log(err)
205
+				// })
199 206
 				
200 207
 				
201 208
 			},

+ 2 - 2
shop/perating/activitecode.vue

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