new push

flymysql · Oct 21, 2018 · 418d82b · 418d82b
1 parent deee333
commit 418d82b
Show file tree

Hide file tree

Showing 68 changed files with 5,693 additions and 4,233 deletions.
diff --git a/app.js b/app.js
@@ -3,9 +3,12 @@ var Bmob = require('/dist/Bmob-1.6.4.min.js');
 //var qcloud = require('./vendor/wafer2-client-sdk/index');
 //var config = require('./config');
 var util = require('./utils/util.js')
-Bmob.initialize("1f5588b50881978b44ccaf8edd435221", "132a4ff6818ca417ccf6c4c14c466081");
+Bmob.initialize("你的appid", "你的secret id");
 
 App({
+  globalData:{
+    userInfo:[]
+  },
   appData: {
     //appId: config.service.appId,
     //baseUrl: `${config.service.host}/weapp/`,
@@ -18,20 +21,50 @@ App({
    // this.doLogin();
     Bmob.User.auth().then(res => {
       console.log(res)
+      const query = Bmob.Query('_User');
+      query.get(res.objectId).then(res => {
+        console.log(res)
+        wx.setStorage({
+          key: 'data_objectid',
+          data: res.data_objectid,
+        })
+      }).catch(err => {
+        console.log(err)
+      })
+      wx.setStorage({
+        key: 'usr_objectId',
+        data: res.objectId,
+      })
+
       console.log('一键登陆成功')
 
     }).catch(err => {
       console.log(err)
     });
 
-    if(!wx.getStorageSync("word_list")){
+    this.globalData.userInfo=wx.getStorageSync("userInfo")
+    if(!wx.getStorageSync("word_list")&&!wx.getStorageSync("all_detail")){
+      wx.setStorage({
+        key: 'all_detail',
+        data: [],
+      })
+
       wx.setStorage({
         key: 'word_list',
-        data: [{"word":"test","ease":0.4,"day":0}],
+        data: [],
       })
       wx.setStorage({
         key: 'day_task',
-        data: 5,
+        data: 30,
+      })
+      wx.setStorage({
+        key: "my_word_num",
+        data: 1000,
+      })
+
+      wx.setStorage({
+        key: "free_word_num",
+        data: 1000,
       })
     }
 

diff --git a/app.json b/app.json
@@ -2,6 +2,7 @@
   "pages":[
     "pages/study/study",
     "pages/job/job",
+    "pages/all_detail/all_detail",
     "pages/search/search",
     "pages/detail-word/detail-word",
     "pages/me/me",
@@ -11,8 +12,7 @@
     "pages/audio_test/audio_test",
     "pages/about/about",
     "pages/my_word/my_word",
-    "pages/suggestion/suggestion",
-    "pages/rank/rank"
+    "pages/suggestion/suggestion"
 
   ],
 
@@ -32,23 +32,30 @@
     "list": [
       {
         "pagePath": "pages/study/study",
-        "text": "首页",
+        "text": "学习",
         "iconPath": "images/home2.png",
         "selectedIconPath": "images/home.png"
       },
 
       {
         "pagePath": "pages/job/job",
         "text": "选词",
-        "iconPath": "images/search2.png",
-        "selectedIconPath": "images/search.png"
+        "iconPath": "images/choice.png",
+        "selectedIconPath": "images/choice2.png"
+      },
+
+      {
+        "pagePath": "pages/all_detail/all_detail",
+        "text": "统计",
+        "iconPath": "images/statistic.png",
+        "selectedIconPath": "images/statistic2.png"
       },
 
       {
         "pagePath": "pages/me/me",
         "text": "我的",
-        "iconPath": "images/ji.png",
-        "selectedIconPath": "images/ji2.png"
+        "iconPath": "images/我的.png",
+        "selectedIconPath": "images/我的2.png"
       }
     ]
   }

diff --git a/assets/font/chalkboard.ttf b/assets/font/chalkboard.ttf
diff --git a/dist/Bmob-1.6.1.min.js b/dist/Bmob-1.6.1.min.js
diff --git a/dist/Bmob-1.6.2.min.js b/dist/Bmob-1.6.2.min.js
diff --git a/dist/Bmob-1.6.3.hap.min.js b/dist/Bmob-1.6.3.hap.min.js
diff --git a/dist/Bmob-1.6.4.min.js b/dist/Bmob-1.6.4.min.js
diff --git a/dist/使用说明.md b/dist/使用说明.md
diff --git a/images/bottom.gif b/images/bottom.gif
diff --git a/images/choice.png b/images/choice.png
diff --git a/images/choice2.png b/images/choice2.png
diff --git a/images/home.png b/images/home.png
diff --git a/images/home2.png b/images/home2.png
diff --git a/images/ji.png b/images/ji.png
diff --git a/images/ji2.png b/images/ji2.png
diff --git a/images/search.png b/images/search.png
diff --git a/images/search2.png b/images/search2.png
diff --git a/images/statistic.png b/images/statistic.png
diff --git a/images/statistic2.png b/images/statistic2.png
diff --git a/images/我的.png b/images/我的.png
diff --git a/images/我的2.png b/images/我的2.png
diff --git a/imgs/PK_equal.svg b/imgs/PK_equal.svg
diff --git a/imgs/PK_fail.svg b/imgs/PK_fail.svg
diff --git a/imgs/PK_success.svg b/imgs/PK_success.svg
diff --git a/imgs/VS.svg b/imgs/VS.svg
diff --git a/imgs/entry_fighting.jpg b/imgs/entry_fighting.jpg
diff --git a/imgs/entry_friends.jpg b/imgs/entry_friends.jpg
diff --git a/imgs/entry_qr.svg b/imgs/entry_qr.svg
diff --git a/imgs/entry_rank.jpg b/imgs/entry_rank.jpg
diff --git a/imgs/exp.svg b/imgs/exp.svg