feat:对接mpaas

fix:缩短请求超时时间为10s
eric-gitta-moore · Jun 7, 2022 · 748b3c3 · 748b3c3
1 parent d436463
commit 748b3c3
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 70 deletions.
diff --git a/api/http.js b/api/http.js
@@ -8,6 +8,7 @@ http.interceptors.request.use((r) => {
 
 	r.header = {
 		'user-agent': Constant.APPUA,
+		timeout: 1000 * 10,
 		...r.header
 	}
 	// console.info('http.interceptors.request', r)
@@ -28,8 +29,8 @@ http.interceptors.response.use((r) => {
 		// uni.clearStorage()
 		WeappCookies.clearCookies()
 		uni.showToast({
-			title:'请登录',
-			icon:'error',
+			title: '请登录',
+			icon: 'error',
 		})
 		// console.log('uni.getStorageInfoSync', uni.getStorageInfoSync())
 		return Promise.reject('登录过期')

diff --git a/manifest.json b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "学习通手动挡签到",
     "appid" : "__UNI__C397F39",
     "description" : "",
-    "versionName" : "1.2.8",
-    "versionCode" : 128,
+    "versionName" : "1.3.0",
+    "versionCode" : 130,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -47,7 +47,7 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
-                "abiFilters" : [ "arm64-v8a", "x86" ]
+                "abiFilters" : [ "arm64-v8a" ]
             },
             /* ios打包配置 */
             "ios" : {},

diff --git a/nativeplugins/Mpaas-Scan/ios/meta.config b/nativeplugins/Mpaas-Scan/ios/meta.config
@@ -1,7 +1,7 @@
 {
 	"appId":"ALIPUBD27A303011802",
 	"appKey":"ALIPUBD27A303011802_ANDROID",
-	"base64Code":"/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAADAAMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxFobXF3YuKyomL853kn3oFXYrUEAWEFAwAAAQAAEAUAAB4AAADQAQAAFAAAAHwBAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAAABAAAAAAAAAAAAAAAIAAAAAAAAAPFAl2J3AAAAAAAAAAAAAAAv4hIIkVsxR4AnOnegrdRpGNDTnvoW0jhPFNqClJNIw3VbzAa2/U02JIeuxTWCLk1SAetMF72FZtFf6GV1cmdjbngBAwF4dWZ3AwECBgEAEQEBCAFxdHNqb3akHqPNhi/C9HG0e0TEmCN7i7fC0b6RbdEGeB1FTB2LCu9Zg9z6SFqU1fQAnUpn4xK7d33iZEHQOf/BLqC3/dxpKJJMTvX9N5Px50P8dTXwqCtUVo3PEXrILsVyxQB+JzRDzySaHCd6Sqni3uy71s7bbZ5jYt7ZjW0FXRHSH2lAmBWn/pRxgyR0J3+fGSw3Tdu+s2PslB3UhMlgVMw7IxWSlJc1oRM0tNYY17cEzJWHPuDSvIQLM4vXKc6AyDx/x2PowYynN6MmT59edZkRH2MAv2AJNjrQHkhrP2ZeCoZdNHJyI9X+X80jXwkT6pF1O+kFWqSHnGufoB6GVxTIQBVFl+mBazfZd9RMF1SuCyb2LIT5/0Xalg9VywFN8qkkfY5nA2JRnRc0OQwmMWXC3vHkxqNH9iFeq6CVUVT2icjKWxCM9F/pP0l6ycRmhf56htGq48C4JtD7rtU7mmSCMkq6ReDloWxaVlCHz9n6XwQZ8lUACXlpG9mkNQqbDuMWX+PT9ApN0R+xcGED0w+onO2B5lt47n4pHe4ywguzIncTpxS+0rA+o/MQNkxE7TVFiZAcQh7EDs2mlf62ZP18MQ272oQkjC4AmE+kQ48z/4xlyFSKD+87o/R249TU/wAAwqAYBgAAAAA=",
+	"base64Code":"/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAADAAMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxFobXF3q76NJAYvZvv4sr3ZeZmwymEFAwAAAQAAEAUAAB4AAADQAQAAFAAAAHwBAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAAABAAAAAAAAAAAAAAAIAAAAAAAAAJ4rn2J3AAAAAAAAAAAAAAAkY++jIStNrE4UrU6u64Cz3pncMgFUsh8XaqxutsiS2yuCfk2ty/n736ZJjZHJQXBiHaJjcVSDiL8v93V1cmdjbngBAwF4dWZ3AwECBgEAEQEBCAFxdHNqb3Y8NeCMWOtbx6T1c3o3YDnyxAFu1tT0+uIseC9ph710I4UK11tjSv08d/OgikVsBISW2xvtxG5Gc8kdsjJ5dzsgYzdjvK70ngySuCaBO6R+wTvOiYgxpfsa9uFVjNT3p+2nk6Jx8ktO8RhS7kQsIdHgVtj9PeOaKOSnnAJ4R++SY0v0RddgrYE5YKazRfbMMsz0VkJayrFLcfx7HlZUnV4gmQ1DRRcc4dCDuIu+z3AYi6/Os88qfKGo2gLkZTcd6M94fBFekcxrtbaXBEFzFeeqUOdE3ke72MA+fAKZduRWdJ7JNLUkoGzZFHFpxDHFPKxmcsXRRl2tHb6Guw+n+jKxI9p6d5gk2pXZWpwdw7nXX8SX0I0d3hpqjFAFlpRGc+WWNeYXUx5dr5r6s43im6RTKqOk4KbNilo7EodFMJisSzvWej6ynn81TCksK/ZLpI4wEFEGByZ4WX/WT1W20h/T95r6KzZMJ4AwtXkLlyfnip+/KrA/jQftvZvjdS/KiAAFWFYl+OyEeajAnOZuOjPGPi1KWI0EQhQ+1cZsrqJBQBCb8+jVQgus3AEr5tXux0W75gEF88ByRoRWQ4isAF7BQIErhS6d/K2qGEIprxTzI7VZBkxPaCs1gNHU/wAAwqAYBgAAAAA=",
 	"packageName":"com.yunling.chaosign",
 	"rootPath":"mpaas/android/ALIPUBD27A303011802-default",
 	"workspaceId":"default",

diff --git a/pages/activity/nvue-swiper-page.nvue b/pages/activity/nvue-swiper-page.nvue
@@ -164,7 +164,11 @@
 						const gotoSign = (code) => {
 							let reg = /&enc=(?<enc>[\w\d]+)/
 							if (!reg.test(code)) {
-								plus.nativeUI.toast('enc匹配失败')
+								// plus.nativeUI.toast('enc匹配失败')
+								uni.showToast({
+									title:'enc匹配失败',
+									icon:'error'
+								})
 								return null
 							}
 							let regResult = reg.exec(code)
@@ -183,10 +187,32 @@
 									plus.barcode.scan(res.tempFilePaths[0],
 										(type, code) => {
 											console.log(code)
-											gotoSign(code)
+											let reg = /&enc=(?<enc>[\w\d]+)/
+											if (!reg.test(code)) {
+												uni.showModal({
+													title: '解码失败',
+													content: '请检查二维码是否正确',
+													showCancel: false
+												})
+												return null
+											}
+											let regResult = reg.exec(code)
+											console.log(regResult)
+											let enc = regResult.groups.enc
+											console.log(enc)
+											this.allInOneSign(
+												Constant.signType
+												.QRCodeSign,
+												this.checkedActivity, {
+													enc
+												})
 										}, (error) => {
 											console.log(error)
-											plus.nativeUI.toast('扫码失败')
+											uni.showModal({
+												title: '扫码失败',
+												content: '请用微信、支付宝或者第三方扫码，然后输入解码内容进行签到',
+												showCancel: false
+											})
 										})
 								}
 							})
@@ -242,69 +268,9 @@
 									chooseImageByAliMPaas()
 								else if (Number(r.tapIndex === 2))
 									inputEnc()
-							itemList: ['选择二维码图片', '直接输入内容或者enc'],
-							success: r => {
-								if (Number(r.tapIndex) === 0) {
-									uni.chooseImage({
-										count: 1,
-										success: (res) => {
-											console.log(res)
-											plus.barcode.scan(res.tempFilePaths[0],
-												(type, code) => {
-													console.log(code)
-													let reg = /&enc=(?<enc>[\w\d]+)/
-													if (!reg.test(code)) {
-														// plus.nativeUI.toast('解码失败')
-														uni.showModal({
-															title: '解码失败',
-															content: '请检查二维码是否正确',
-															showCancel: false
-														})
-														return null
-													}
-													let regResult = reg.exec(code)
-													console.log(regResult)
-													let enc = regResult.groups.enc
-													console.log(enc)
-													this.allInOneSign(
-														Constant.signType
-														.QRCodeSign,
-														this.checkedActivity, {
-															enc
-														})
-												}, (error) => {
-													console.log(error)
-													// plus.nativeUI.toast('扫码失败')
-													uni.showModal({
-														title: '扫码失败',
-														content: '请用微信或者系统自带的扫码，然后选择第二项直接输入内容进行签到',
-														showCancel: false
-													})
-												})
-										}
-									})
-								} else {
-									uni.showModal({
-										content: '请输入签到二维码扫描出来的内容',
-										editable: true,
-										success: (res) => {
-											let enc = res.content
-											console.log(res.content)
-											let encReg = /&enc=(\w+)/mi
-											if (encReg.test(res.content))
-												enc = encReg.exec(res.content)[1]
-											if (res.confirm)
-												this.allInOneSign(
-													Constant.signType.QRCodeSign,
-													this.checkedActivity, {
-														enc
-													})
-										}
-									})
-								}
 							}
 						})
-						break
+						break;
 					case 4: // 位置签到
 						let lastChooseLocation = uni.getStorageSync(Constant.lastChooseLocation)
 						console.log(`lastChooseLocation`, lastChooseLocation)