1.4.5

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.4.4",
+    Version: "1.4.5",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/main/default.js

@@ -39,92 +39,97 @@ Page({
   },
   onShow: function () {
     var that = this;
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
-
-          if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
-            if (app.globalData.userInfo.Subscribe == 1) {
-              wx.navigateTo({
-                url: '../other/userbook',
-              });
-              app.globalData.GotoUrl = "";
-            }
-            else{
-              wx.redirectTo({
-                url: '../other/newuser',
-              });
+    if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+      if (app.globalData.userInfo.Subscribe == 0) {
+        wx.redirectTo({
+          url: '../other/newuser',
+        });
+      }
+    }
+    else {
+      wx.getSetting({
+        success(res) {
+          if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
+            if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+              if (app.globalData.userInfo.Subscribe == 1) {
+                wx.navigateTo({
+                  url: '../other/userbook',
+                });
+                app.globalData.GotoUrl = "";
+              }
             }
-          }
-          else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
-            var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
-            var today = common.formatDateCHS(common.formatTime(new Date()));
-            if (productServiceTime < today) {
-              wx.redirectTo({
-                url: '../other/userbook',
-              });
+            else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+              var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+              var today = common.formatDateCHS(common.formatTime(new Date()));
+              if (productServiceTime < today) {
+                wx.redirectTo({
+                  url: '../other/userbook',
+                });
+              }
+              else if (app.globalData.userInfo.ClassDayNumber < 0) {
+                wx.redirectTo({
+                  url: '../other/userbook',
+                });
+              }
+              else if (app.globalData.GotoUrl) {
+                //console.log(app.globalData.GotoUrl);
+                wx.navigateTo({
+                  url: app.globalData.GotoUrl,
+                });
+                app.globalData.GotoUrl = "";
+              }
             }
-            else if (app.globalData.userInfo.ClassDayNumber<0){
-              wx.redirectTo({
-                url: '../other/userbook',
-              });
+            else if (app.globalData.userInfo.IsShow == 0) {
+              main.buildInitData(function () { });
             }
-            else if (app.globalData.GotoUrl) {
-              //console.log(app.globalData.GotoUrl);
-              wx.navigateTo({
-                url: app.globalData.GotoUrl,
+
+            that.setData({
+              IsAccredit: true,
+            });
+
+            common.getStorageValue(that, "UserName", "秒过", function () {
+              wx.setNavigationBarTitle({
+                title: that.data.UserName
               });
-              app.globalData.GotoUrl="";
-            }
-          }
-          else if (app.globalData.userInfo.IsShow == 0){
-            main.buildInitData(function () {});
-          }
-          
-          that.setData({
-            IsAccredit: true,
-          });
-
-          common.getStorageValue(that, "UserName", "秒过", function () {
-            wx.setNavigationBarTitle({
-              title: that.data.UserName
             });
-          });
-
-          //判断是否出现推广广告
-          common.getStorageValue(that, "IsShowMarketing", app.globalData.userInfo.HasIntroducer, function () {
-            if (app.globalData.userInfo.HasIntroducer==0 && that.data.IsShowMarketing==3){
-              var isShowMarketingTime = wx.getStorageSync("IsShowMarketingTime");
-              if (common.formatTime(new Date()) >= isShowMarketingTime) {
-                wx.removeStorageSync("IsShowMarketing");
-                wx.removeStorageSync("IsShowMarketingTime");
-                that.setData({
-                  IsShowMarketing:0,
-                });
+
+            //判断是否出现推广广告
+            common.getStorageValue(that, "IsShowMarketing", app.globalData.userInfo.HasIntroducer, function () {
+              if (app.globalData.userInfo.HasIntroducer == 0 && that.data.IsShowMarketing == 3) {
+                var isShowMarketingTime = wx.getStorageSync("IsShowMarketingTime");
+                if (common.formatTime(new Date()) >= isShowMarketingTime) {
+                  wx.removeStorageSync("IsShowMarketing");
+                  wx.removeStorageSync("IsShowMarketingTime");
+                  that.setData({
+                    IsShowMarketing: 0,
+                  });
+                }
               }
-            }
-          });
+            });
 
-          that.init();
+            that.init();
 
-          that.getTaskTodayList();
+            that.getTaskTodayList();
 
-          that.isNoSavedCard();
-        }
-        else {
-          wx.navigateTo({
-            url: '../index/accredit',
-          });
-        }
+            that.isNoSavedCard();
+          }
+          else {
+            wx.navigateTo({
+              url: '../index/accredit',
+            });
+          }
 
-        if (res.authSetting['scope.record'] === true) {
-          app.globalData.IsRecorderAccredit = 1;
-        }
-        else if (res.authSetting['scope.record'] === false) {
-          app.globalData.IsRecorderAccredit = -1;
+          if (res.authSetting['scope.record'] === true) {
+            app.globalData.IsRecorderAccredit = 1;
+          }
+          else if (res.authSetting['scope.record'] === false) {
+            app.globalData.IsRecorderAccredit = -1;
+          }
         }
-      }
-    });
+      });
+    }
+
+    
     wx.setNavigationBarColor({
       frontColor: "#ffffff",
       backgroundColor: "#3157BA",

pages/main/searchWeb2.js

@@ -135,8 +135,12 @@ Page({
                 str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
               }
               else if (item.Tag == "拼音" || item.Tag == "默写") {
-                if (item.SoundMark)
-                  str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                if (item.SoundMark){
+                  if (this.data.Result.CHN.HanZi)
+                    str = "[读 src='" + this.data.Result.CHN.HanZi + "']" + item.Content + "[/读]";
+                  else
+                    str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                }
                 else
                   str = "[读]" + item.Content + "[/读]";
               }