广告弹窗更新

framework/0-conf.js

@@ -16,11 +16,11 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // #endif
 
 // #ifdef APP || MP-WEIXIN
-// const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
+const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
 
-const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
+// const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
-const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
+// const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
 // #endif
 
 // import VConsole from "./vConsole.js"

pages/member/index.vue

@@ -126,6 +126,7 @@
 			// 	this.shopId = e.shopId;
 			// 	this.init();
 			// }
+			console.log(e)
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
 				this.tokenShow = false;
@@ -153,13 +154,31 @@
 					"userId": uni.cache.get('userInfo').id,
 				})
 				if (res.code == 0) {
-					this.shopUserInfo = res.data
+					this.shopUserInfo = res.data;
-				}
+					if ( this.shopUserInfo.isVip == 0 ) {
-			
+						this.memberOpen = true;
-				if ( this.shopUserInfo.isVip == 0 ) {
+					}
-					this.memberOpen = true;
+				} else {
+					let pages = getCurrentPages()
+					if ( pages.length > 1) {
+						uni.navigateBack()
+					} else {
+						setTimeout(res => {
+							uni.exitMiniProgram({
+							    success: function() {
+									console.log('退出小程序成功');
+								},
+							    fail: function(err) {
+									console.log('退出小程序失败', err);
+								}
+							})
+						}, 500)
+					}
+					
+					
 				}
 			
+				
 			},
 			
 			/**

pages/order_food/confirm_order.vue

@@ -518,6 +518,7 @@
 					if (res.data == 1) {
 						this.showToastUppop('支付成功')
 						let _this = this
+				
 						uni.requestSubscribeMessage({
 							tmplIds:["z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ","AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ"],
 							complete() {