联调激活码

api/user.js

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

pages/my/index.js

@@ -1,6 +1,7 @@
 import {
   getMyInfo,
   getVipInfo,
+  getLearnCard
 } from '~/api/user'
 import {
   createStoreBindings
@@ -15,7 +16,8 @@ Page({
     vipTime: '',
     tasks: [],
     isIos: app.globalData.isIOS,
-    activationModal: false
+    activationModal: false,
+    activationRes: {}
   },
   onLoad() {
     // 手工绑定 
@@ -56,15 +58,25 @@ Page({
     wx.showModal({
       title: '请输入激活码',
       editable: true,
-      success: () => {
+      success: async ({
-        if (typeof this.getTabBar === 'function') {
+        content
-          this.getTabBar().setData({
+      }) => {
-            mask: true
+        if (content.trim()) {
+          let activationRes = await getLearnCard({
+            cardNo: content
+          })
+          console.log(activationRes);
+          if (typeof this.getTabBar === 'function') {
+            this.getTabBar().setData({
+              mask: true
+            })
+          }
+          this.setData({
+            activationModal: true,
+            activationRes
           })
         }
-        this.setData({
+        /*   */
-          activationModal: true
-        })
       }
     })
   },

pages/my/index.less

@@ -221,7 +221,7 @@
       }
 
       .tips1 {
-        margin: 40rpx 0rpx 24rpx;
+        margin: 36rpx 0rpx 24rpx;
         color: #131313;
         font-weight: bold;
         font-size: 34rpx;

pages/my/index.wxml

@@ -64,9 +64,9 @@
   </view>
   <view class="activationModal" wx:if="{{activationModal}}">
     <view class="box zoomIn">
-      <image src="/static/lan.png" class="sLcon" />
+      <image src="{{activationRes.code==200?'/static/lan.png':'/static/df.png'}}" class="sLcon" />
-      <view class="tips1">恭喜您，激活成功</view>
+      <view class="tips1">{{activationRes.code==200?'恭喜您，激活成功':'很遗憾，激活失败'}}</view>
-      <view class="tips2">快去朗读挑战吧！</view>
+      <view class="tips2">{{activationRes.message}}</view>
       <image src="/static/lollipop.png" class="close" catchtap="closeModal" />
     </view>
   </view>

pages/my/index.wxss

@@ -190,7 +190,7 @@
   height: 100rpx;
 }
 .container .activationModal .box .tips1 {
-  margin: 40rpx 0rpx 24rpx;
+  margin: 36rpx 0rpx 24rpx;
   color: #131313;
   font-weight: bold;
   font-size: 34rpx;

utils/request.js

@@ -38,6 +38,9 @@ function request(url, method, data, oldBaseUrl = false) {
         } else if (code == '1102') {
           console.log(code, '<=====code1', message);
           wx.clearStorage()
+        } else if (code == '581') {
+          //  581是学习卡激活时报错，另起弹窗
+          reslove(result.data)
         } else if (code) {
           console.log(code, '<=====code2', message);
           wx.showToast({