1.1.0

app.js

@@ -15,7 +15,7 @@ App({
   },
   globalData: {
     version: "1.1.0",
-    IsProduction: false,
+    IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
     ProgramName: "数学计算题",

pages/index/index.js

@@ -157,22 +157,32 @@ Page({
 
           //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
           that.getQuestionType(function () {
-            setTimeout(function () {
-              common.getStorageValue(that, "IsStart", false, function () {
-                if (that.data.IsStart) {
 
-                  wx.redirectTo({
-                    url: '../main/default'
-                  })
-
-                }
-                else {
-                  wx.redirectTo({
-                    url: '../main/help'
-                  })
-                }
+            if (that.data.ProductID) {
+              var url = "../../package4/main/activateOK?ProductID=" + that.data.ProductID
+                + "&ProductUserID=" + that.data.ProductUserID
+                + "&CurrentUserID=" + app.globalData.userInfo.UserID
+                + "&CurrentProductID=" + app.globalData.ProgramID;
+              wx.redirectTo({
+                url: url
               });
-            }, 2000);
+            }
+            else {
+              setTimeout(function () {
+                common.getStorageValue(that, "IsStart", false, function () {
+                  if (that.data.IsStart) {
+                    wx.redirectTo({
+                      url: '../main/default'
+                    })
+                  }
+                  else {
+                    wx.redirectTo({
+                      url: '../main/help'
+                    })
+                  }
+                });
+              }, 2000);
+            }
             that.getPriceList();
           });
         }

pages/main/default.js

@@ -24,18 +24,22 @@ Page({
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
-    
     wx.login({
       success: function (res0) {
         code = res0.code;
       }
     });
-    
+
   },
   onUnload: function () {
-    
+
   },
   onShow: function () {
+    if (wx.getStorageSync("HasActivate") == 1) {
+      wx.navigateTo({
+        url: '../../package4/main/activate',
+      });
+    }
     var list = wx.getStorageSync("AnswerList");
     var answerLength = 0;
     if (list && list.length > 0) {
@@ -71,6 +75,7 @@ Page({
         }
       }
     });
+
   },
   downloadUserAvatar: function () {
     var avatar = wx.getStorageSync("Avatar");