1.1.34

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.33",
+    Version: "1.1.34",
     IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",

app.json

@@ -49,5 +49,21 @@
     "wxaa1a8b48d9853872",
     "wx80059777521b897c"
   ],
-  "sitemapLocation": "sitemap.json"
+  "sitemapLocation": "sitemap.json",
+  "subPackages": [
+    {
+      "root": "marketing",
+      "pages": [
+        "main/index"
+      ]
+    }
+  ],
+  "preloadRule": {
+    "marketing/main/index": {
+      "network": "all",
+      "packages": [
+        "marketing"
+      ]
+    }
+  }
 }

marketing/main/index.js

@@ -0,0 +1,66 @@
+// marketing/main/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

marketing/main/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

marketing/main/index.wxml

@@ -0,0 +1,2 @@
+<!--marketing/main/index.wxml-->
+<text>marketing/main/index.wxml</text>

marketing/main/index.wxss

@@ -0,0 +1 @@
+/* marketing/main/index.wxss */

pages/index/index.js

@@ -252,12 +252,7 @@ Page({
     });
   },
   getBaiduToken: function () {
-    main.getData('GetBaiduToken', function (data) {
-      if (data) {
-        app.globalData.BaiduToken = data;
-        //console.log(app.globalData.BaiduToken);
-      }
-    });
+    main.getBaiduToken();
   },
   getUserConfig: function () {
     var that = this;

pages/main/detail.js

@@ -97,6 +97,8 @@ Page({
       });
     }
 
+    if (app.globalData.BaiduToken === "")
+      main.getBaiduToken();
   },
   onShow: function () {
     var that = this;

pages/main/preview.js

@@ -94,6 +94,9 @@ Page({
         })
       }
     }
+
+    if (app.globalData.BaiduToken==="")
+      main.getBaiduToken();
   },
   onShow: function () {
     var that = this;

pages/main/setting.js

@@ -6,7 +6,7 @@ const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间
 const arrSortType2 = ["随机的", "较早的", "较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "临时"];
-var arrUserID = [2, 787];
+var arrUserID = [2, 102];
 
 Page({
   data: {

utils/main.js

@@ -66,6 +66,15 @@ function getLocalHost(callback) {
   }
 }
 
+function getBaiduToken() {
+  getData('GetBaiduToken', function (data) {
+    if (data) {
+      app.globalData.BaiduToken = data;
+      //console.log(app.globalData.BaiduToken);
+    }
+  });
+}
+
 function payMoney(payType, buyType, money, detail, callback) {
   console.log(money);
   if (app.globalData.userInfo.UserID < 8)
@@ -2397,4 +2406,5 @@ module.exports = {
   setCollect: setCollect,
   UploadUserConfig: UploadUserConfig,
   getServerImage: getServerImage,
+  getBaiduToken: getBaiduToken,
 }