更新

components/transBlock/index.vue

@@ -82,6 +82,12 @@
 			sendTextMessage() {  
 				if (!this.submitCheck()) return
 				
+				// this.time = 60
+				// this.timefn()
+				// this.isFocus = true
+				// this.$refs.smscodePopup.open()
+				// return 
+
 				if (this.time === 0) {
 					this.params.code = ''
 					this.params.verifyCodeToken = ''

pages/tabbar/home/home.vue

@@ -871,6 +871,22 @@
 				this.getScanRes('fixed_1371293944539422720')
 			},
 			openScan() {
+				let user = uni.getStorageSync('user')
+				if(!user) {
+					uni.showModal({
+						title: '请您登录',
+						content: "登录星油加油才可以加油 |˛˙꒳​˙)♡",
+						confirmText: '去登陆',
+						success: (res) => {
+							if (res.confirm) {
+								uni.reLaunch({
+									url: '../../../BagAuth/pages/login/login'
+								})
+							}
+						}
+					})
+					return 
+				}
 				uni.scanCode({
 					scanType: 'qrCode',
 					onlyFromCamera: true,

pages/tabbar/qrCenter/qrCenter.vue

@@ -159,7 +159,18 @@
 					scanType: 'qrCode',
 					onlyFromCamera: true,
 					success: (res) => {
-						console.log(res.result)
+						if (typeof res.result === 'string') {
+							let result = JSON.parse(res.result)
+							if (result.qrcodeText) {
+								uni.showModal({
+									title: '',
+									content: "请使用首页扫一扫功能或油卡页面转卡功能赠油哦 |˛˙꒳​˙)♡",
+								})
+								return 
+							}
+							this.getScanRes(res.result)
+							return 
+						}
 						this.getScanRes(res.result)
 					},
 					fail: (err) => {