1.2.0

pages/main/index.js

@@ -52,27 +52,27 @@ Page({
     common.getStorageValue(this, "IsRemind", true, function () { });
   },
   onShow: function () {
-    this.getData();
+    if (wx.getStorageSync("HasActivate") == 1) {
+      wx.navigateTo({
+        url: '../../package4/main/activate',
+      });
+    }
+    else {
+      this.getData();
 
-    if (wx.getStorageSync("indexNav")) {
-      var obj = {
-        currentTarget: {
-          dataset: {
-            id: 2,
+      if (wx.getStorageSync("indexNav")) {
+        var obj = {
+          currentTarget: {
+            dataset: {
+              id: 2,
+            }
           }
         }
+        this.selectNav(obj);
+        wx.removeStorageSync("indexNav");
       }
-      this.selectNav(obj);
-      wx.removeStorageSync("indexNav");
-    }
 
-    //如果未激活，请先去激活
-    if (wx.getStorageSync("IsShowActivty")) {
-      wx.navigateTo({
-        url: '../about/paylist',
-      });
-    }
-    else {
+
       if (app.globalData.goto) {
         var url = "../main/list?id=1";
         if (app.globalData.goto == "test")
@@ -82,7 +82,7 @@ Page({
         });
         app.globalData.goto = "";
       }
-      else{
+      else {
         var IsRemindTest = wx.getStorageSync("IsRemindTest");
         if (IsRemindTest == 1) {
           wx.setStorageSync('IsRemindTest', 2);
@@ -92,6 +92,7 @@ Page({
         }
       }
     }
+
   },
   getData: function () {
     var that = this;
@@ -170,16 +171,16 @@ Page({
           app.globalData.DayNumber = data.DayNumber;
 
         var isShow = data.IsShow;
-        if (isShow==-1){
-          isShow=0;
+        if (isShow == -1) {
+          isShow = 0;
         }
-        else{
+        else {
           var systemInfo = wx.getSystemInfoSync();
           if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
             isShow = 1;
           }
         }
-        
+
         app.globalData.IsShow = isShow;
         that.setData({
           IsShow: isShow,
@@ -205,7 +206,7 @@ Page({
     }
   },
   selectNav: function (e) {
-    var that=this;
+    var that = this;
     var id = e.currentTarget.dataset.id;
     //console.log(id);
     if (id == "1") {