联调激活码

api/user.js

@@ -14,7 +14,7 @@ module.exports = {
   // 设置用户信息
   setUserInfo: (data, method = 'post') => request('/user', method, data),
   // 兑换激活码
-  getLearnCard: data => request('/v3/learnCard/exchange', 'get', data),
+  getLearnCard: data => request('/v3/learnCard/exchange', 'get', data, false, false),
   // 购买vip
   buyVip: data => request('/order', 'post', data, true),
   //获取是否vip及过期时间

pages/my/index.js

@@ -59,36 +59,46 @@ Page({
       title: '请输入激活码',
       editable: true,
       success: async ({
+        confirm,
         content
       }) => {
-        let regexp = /^[a-zA-Z0-9]{4}$/
-        if (regexp.test(content)) {
-          let activationRes = await getLearnCard({
-            cardNo: content
-          })
-          console.log(activationRes);
-          if (typeof this.getTabBar === 'function') {
-            this.getTabBar().setData({
-              mask: true
+        if (confirm) {
+          let regexp = /^[a-zA-Z0-9]{4}$/
+          if (regexp.test(content)) {
+            let activationRes = await getLearnCard({
+              cardNo: content
             })
-          }
-          this.setData({
-            activationModal: true,
-            activationRes
-          })
-        } else {
-          if (typeof this.getTabBar === 'function') {
-            this.getTabBar().setData({
-              mask: true
+            console.log(activationRes);
+            if (activationRes.code == 200) {
+              activationRes = {
+                code: 200,
+                message: '快去朗读挑战吧！'
+              }
+            }
+            this.setUserInfo()
+            if (typeof this.getTabBar === 'function') {
+              this.getTabBar().setData({
+                mask: true
+              })
+            }
+            this.setData({
+              activationModal: true,
+              activationRes
             })
-          }
-          this.setData({
-            activationModal: true,
-            activationRes: {
-              code: 581,
-              message: '请检查激活码输入是否正确'
+          } else {
+            if (typeof this.getTabBar === 'function') {
+              this.getTabBar().setData({
+                mask: true
+              })
             }
-          })
+            this.setData({
+              activationModal: true,
+              activationRes: {
+                code: 581,
+                message: '请检查激活码输入是否正确'
+              }
+            })
+          }
         }
       }
     })

utils/request.js

@@ -14,7 +14,7 @@ if (envVersion == 'develop') {
   oldUrl = 'https://reader-api.ai160.com'
 }
 
-function request(url, method, data, oldBaseUrl = false) {
+function request(url, method, data, oldBaseUrl = false, intercept = true) {
   let header = {
     'uid': wx.getStorageSync('uid') || '',
     'channelCode': '3001'
@@ -33,21 +33,22 @@ function request(url, method, data, oldBaseUrl = false) {
             message
           }
         } = result
-        if (code == '200') {
-          reslove(data)
-        } else if (code == '1102') {
-          console.log(code, '<=====code1', message);
-          wx.clearStorage()
-        } else if (code == '581') {
-          //  581是学习卡激活时报错，另起弹窗
+        if (intercept) {
+          if (code == '200') {
+            reslove(data)
+          } else if (code == '1102') {
+            console.log(code, '<=====code1', message);
+            wx.clearStorage()
+          } else if (code) {
+            console.log(code, '<=====code2', message);
+            wx.showToast({
+              title: message,
+              icon: "none",
+              duration: 3000
+            })
+          }
+        } else {
           reslove(result.data)
-        } else if (code) {
-          console.log(code, '<=====code2', message);
-          wx.showToast({
-            title: message,
-            icon: "none",
-            duration: 3000
-          })
         }
       },
       fail: (res) => {