chengjie лет назад: 7
Родитель
Сommit
cbecb75b9f
1 измененных файлов с 23 добавлено и 22 удалено
  1. 23 22
      pages/main/index.js

+ 23 - 22
pages/main/index.js

@@ -52,27 +52,27 @@ Page({
52
     common.getStorageValue(this, "IsRemind", true, function () { });
52
     common.getStorageValue(this, "IsRemind", true, function () { });
53
   },
53
   },
54
   onShow: function () {
54
   onShow: function () {
55
-    this.getData();
55
+    if (wx.getStorageSync("HasActivate") == 1) {
56
+      wx.navigateTo({
57
+        url: '../../package4/main/activate',
58
+      });
59
+    }
60
+    else {
61
+      this.getData();
56
 
62
 
57
-    if (wx.getStorageSync("indexNav")) {
58
-      var obj = {
59
-        currentTarget: {
60
-          dataset: {
61
-            id: 2,
63
+      if (wx.getStorageSync("indexNav")) {
64
+        var obj = {
65
+          currentTarget: {
66
+            dataset: {
67
+              id: 2,
68
+            }
62
           }
69
           }
63
         }
70
         }
71
+        this.selectNav(obj);
72
+        wx.removeStorageSync("indexNav");
64
       }
73
       }
65
-      this.selectNav(obj);
66
-      wx.removeStorageSync("indexNav");
67
-    }
68
 
74
 
69
-    //如果未激活,请先去激活
70
-    if (wx.getStorageSync("IsShowActivty")) {
71
-      wx.navigateTo({
72
-        url: '../about/paylist',
73
-      });
74
-    }
75
-    else {
75
+
76
       if (app.globalData.goto) {
76
       if (app.globalData.goto) {
77
         var url = "../main/list?id=1";
77
         var url = "../main/list?id=1";
78
         if (app.globalData.goto == "test")
78
         if (app.globalData.goto == "test")
@@ -82,7 +82,7 @@ Page({
82
         });
82
         });
83
         app.globalData.goto = "";
83
         app.globalData.goto = "";
84
       }
84
       }
85
-      else{
85
+      else {
86
         var IsRemindTest = wx.getStorageSync("IsRemindTest");
86
         var IsRemindTest = wx.getStorageSync("IsRemindTest");
87
         if (IsRemindTest == 1) {
87
         if (IsRemindTest == 1) {
88
           wx.setStorageSync('IsRemindTest', 2);
88
           wx.setStorageSync('IsRemindTest', 2);
@@ -92,6 +92,7 @@ Page({
92
         }
92
         }
93
       }
93
       }
94
     }
94
     }
95
+
95
   },
96
   },
96
   getData: function () {
97
   getData: function () {
97
     var that = this;
98
     var that = this;
@@ -170,16 +171,16 @@ Page({
170
           app.globalData.DayNumber = data.DayNumber;
171
           app.globalData.DayNumber = data.DayNumber;
171
 
172
 
172
         var isShow = data.IsShow;
173
         var isShow = data.IsShow;
173
-        if (isShow==-1){
174
-          isShow=0;
174
+        if (isShow == -1) {
175
+          isShow = 0;
175
         }
176
         }
176
-        else{
177
+        else {
177
           var systemInfo = wx.getSystemInfoSync();
178
           var systemInfo = wx.getSystemInfoSync();
178
           if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
179
           if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
179
             isShow = 1;
180
             isShow = 1;
180
           }
181
           }
181
         }
182
         }
182
-        
183
+
183
         app.globalData.IsShow = isShow;
184
         app.globalData.IsShow = isShow;
184
         that.setData({
185
         that.setData({
185
           IsShow: isShow,
186
           IsShow: isShow,
@@ -205,7 +206,7 @@ Page({
205
     }
206
     }
206
   },
207
   },
207
   selectNav: function (e) {
208
   selectNav: function (e) {
208
-    var that=this;
209
+    var that = this;
209
     var id = e.currentTarget.dataset.id;
210
     var id = e.currentTarget.dataset.id;
210
     //console.log(id);
211
     //console.log(id);
211
     if (id == "1") {
212
     if (id == "1") {