Merge branch 'dev'

Kyncc · Oct 25, 2017 · cd223ae · cd223ae
2 parents ef8cfde + 02c709a
commit cd223ae
Show file tree

Hide file tree

Showing 318 changed files with 4,363 additions and 2,747 deletions.
diff --git a/README.md b/README.md
@@ -62,11 +62,11 @@
         ├── camera      # 拍错题
         ├── workbook    # 查答案
         ├── example     # 例题
-        ├── collect     # 收藏本模块
+        ├── collect     # 收藏模块
         ├── correct     # 纠错
+        ├── comment     # 教师评价
         ├── myclass     # 我的班级
-        ├── error       # 错题本
-        ├── errorCamera # 拍照错题本
+        ├── download    # 下载中心
         ├── homework    # 我的作业
         ├── myBook      # 我的习题册
         ├── report      # 知识图谱

diff --git a/dist/index.html b/dist/index.html
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -6,8 +6,8 @@
 	"id": "H55E5EFFB",/*应用的标识，创建应用时自动生成，勿手动修改*/
 	"name": "归纳本-学生端",/*应用名称，程序桌面图标名称*/
 	"version": {
-		"name": "3.4.0",/*应用版本名称*/
-		"code": "340"
+		"name": "3.5.0",/*应用版本名称*/
+		"code": "350"
 	},
 	"description": "",/*应用描述信息*/
 	"icons": {
@@ -116,9 +116,9 @@
 				"statics": {
 					"umeng": {
 						"appkey_ios": "584125476e27a40bc4000e49",
-						"channelid_ios": "3.4.0",
+						"channelid_ios": "3.5.0",
 						"appkey_android": "5833f42d8630f57e24001bc5",
-						"channelid_android": "3.4.0"
+						"channelid_android": "3.5.0"
 					}
 				},
 				"share": {

diff --git a/dist/static/css/app.5380761ec44d360925c11bd15078214d.css b/dist/static/css/app.5380761ec44d360925c11bd15078214d.css
diff --git a/dist/static/css/app.fa10ceef42b97d066ae808a74b3dbd00.css b/dist/static/css/app.fa10ceef42b97d066ae808a74b3dbd00.css
diff --git a/dist/static/img/camera.38cae33.jpg b/dist/static/img/camera.38cae33.jpg
diff --git a/dist/static/img/camera.c5ad489.jpg b/dist/static/img/camera.c5ad489.jpg
diff --git a/dist/static/img/class.3d03bc4.jpg b/dist/static/img/class.3d03bc4.jpg
diff --git a/dist/static/img/class.a76b5e2.jpg b/dist/static/img/class.a76b5e2.jpg
diff --git a/dist/static/img/error.300dce2.jpg b/dist/static/img/error.300dce2.jpg
diff --git a/dist/static/img/homework.056b527.jpg b/dist/static/img/homework.056b527.jpg
diff --git a/dist/static/img/homework.0b44a56.jpg b/dist/static/img/homework.0b44a56.jpg
diff --git a/dist/static/img/induce.32b5742.jpg b/dist/static/img/induce.32b5742.jpg
diff --git a/dist/static/img/induce.7376e3c.jpg b/dist/static/img/induce.7376e3c.jpg
diff --git a/dist/static/img/statistics.6ae0e5f.jpg b/dist/static/img/statistics.6ae0e5f.jpg
diff --git a/dist/static/js/0.37715c463d3d43ec35f7.js b/dist/static/js/0.37715c463d3d43ec35f7.js
diff --git a/dist/static/js/0.608843995d4e2172e351.js b/dist/static/js/0.608843995d4e2172e351.js
diff --git a/dist/static/js/1.5b118c035c0a81c79f1a.js b/dist/static/js/1.5b118c035c0a81c79f1a.js
diff --git a/dist/static/js/1.b6021e78298299c2df89.js b/dist/static/js/1.b6021e78298299c2df89.js
diff --git a/dist/static/js/10.c37ed675d71bbf24f435.js b/dist/static/js/10.c37ed675d71bbf24f435.js
diff --git a/dist/static/js/10.c936c5dd8dfc1bda5459.js b/dist/static/js/10.c936c5dd8dfc1bda5459.js
diff --git a/dist/static/js/100.3a8b3bf675ee3c04a80d.js b/dist/static/js/100.3a8b3bf675ee3c04a80d.js
diff --git a/dist/static/js/101.e1174c69fd48ebfe7710.js b/dist/static/js/101.e1174c69fd48ebfe7710.js
diff --git a/dist/static/js/102.2f10d66adcdcb1edcf75.js b/dist/static/js/102.2f10d66adcdcb1edcf75.js
diff --git a/dist/static/js/103.a4fb82cbdb46c5409157.js b/dist/static/js/103.a4fb82cbdb46c5409157.js
diff --git a/dist/static/js/104.8d46f33acaebe6e20373.js b/dist/static/js/104.8d46f33acaebe6e20373.js
diff --git a/dist/static/js/105.fb7a73ae55cc3e205831.js b/dist/static/js/105.fb7a73ae55cc3e205831.js