Merge branch 'master' of...

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into shipanpan

project.config.json

@@ -21,20 +21,22 @@
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
+        "useMultiFrameRuntime": false,
+        "useApiHook": true,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
         },
+        "enableEngineNative": false,
         "useIsolateContext": true,
         "useCompilerModule": false,
         "userConfirmedUseCompilerModuleSwitch": false,
-		"useMultiFrameRuntime": false,
-		"useApiHook": true,
-		"enableEngineNative": false,
+        "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [],
-		"minifyWXSS": true
+        "minifyWXSS": true,
+        "bundle": false
     },
     "compileType": "miniprogram",
     "libVersion": "2.14.0",
@@ -48,14 +50,6 @@
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {},
     "condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
         "plugin": {
             "list": []
         },
@@ -166,18 +160,51 @@
                     "scene": null
                 },
                 {
-					"id": 14,
-					"name": "pages/sign/apply/apply",
+                    "name": "财务",
+                    "pathName": "pages/tabbar/financial/financial",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "课程管理详情页面",
+                    "pathName": "pages/index/classManagement/classManagement",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "申请成为教练",
                     "pathName": "pages/sign/apply/apply",
                     "query": "",
                     "scene": null
                 },
                 {
-					"id": 15,
-					"name": "初次打开",
-					"pathName": "pages/sign/login/login",
+                    "name": "课程瞬间上传",
+                    "pathName": "pages/index/courseInstant/courseInstant",
+                    "query": "type=check&lesson_id=93",
+                    "scene": null
+                },
+                {
+                    "name": "教学区域",
+                    "pathName": "pages/my/teachingArea/teachingArea",
                     "query": "",
                     "scene": null
+                },
+                {
+                    "name": "课程管理",
+                    "pathName": "pages/index/classManagement/classManagement",
+                    "query": "classTime=2020-11-28 10:00～11:00&class_id=23&lesson_id=85",
+                    "scene": null
+                },
+                {
+                    "name": "运动评价",
+                    "pathName": "pages/index/evaluation/evaluation",
+                    "query": "child_id=341&class_id=25&class_single_id=93&course_id=1001",
+                    "scene": null
+                },
+                {
+                    "name": "pages/tabbar/index/index",
+                    "pathName": "pages/tabbar/index/index",
+                    "scene": null
                 }
             ]
         }