xyang

.env.development

@@ -0,0 +1,8 @@
+NODE_ENV=development
+VUE_APP_BASE_URL="https://www.kehoubaike.com/api"
+VUE_APP_BASE_WS="wss://www.kehoubaike.com/wss"
+#VUE_APP_BASE_URL="https://test.kehoubaike.com/api"
+#VUE_APP_BASE_WS="wss://test.kehoubaike.com/wss"
+#VUE_APP_BASE_URL="http://192.168.0.25:8083/api.php?s="
+#VUE_APP_BASE_WS="ws://192.168.0.25:20004"
+

.gitignore

@@ -1,9 +1,9 @@
-node_modules
-dist/
-.history/
-.env.development
-.idea/anpaismall.iml
-.idea/misc.xml
-.idea/modules.xml
-.idea/vcs.xml
-.idea/workspace.xml
+node_modules
+dist/
+.history/
+.env.development
+.idea/anpaismall.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/workspace.xml

Readme.md

@@ -1,40 +1,40 @@
-# 使用vue-cli 创建的uni-app项目
-
-## 安装依赖包
-```
-npm install
-````
-
-## 编译开发版本微信小程序
-```
-npm run dev:mp-weixin
-```
-### 使用微信开发者打开dist/mp-weixin目录,即可查看效果
-
-更多指令查询package.json
-
-建议使用vscode开发
-
-提交前请先执行 ```npm run vue:lint``` 验证代码格式
-
-请求接口基本路径配置在 .env.development 与 .env.production
-
-
-在developer分支写的一段话
-
-项目约定文件名: 2020年5月21日17:37:41
-
-组件使用驼峰
-文件夹不准使用-
-页面文件可以使用-连接,但是最多1个-
-
-## 商标统一标准结构
-- 列表
-```j
-
-```
-
-- 单个
-```
-
-```
+# 使用vue-cli 创建的uni-app项目
+
+## 安装依赖包
+```
+npm install
+````
+
+## 编译开发版本微信小程序，运行测试环境
+```
+npm run dev:mp-weixin
+```
+## 打包正式环境
+npm run build:mp-weixin
+
+## 使用微信开发者打开dist/mp-weixin目录,即可查看效果,上传小程序dist/mp-weixin目录
+
+更多指令查询package.json
+
+建议使用vscode开发
+
+提交前请先执行 ```npm run vue:lint``` 验证代码格式
+
+请求接口基本路径配置在 .env.development 与 .env.production
+
+api统一封装后台请求，components公共组件库，common公用文件
+
+在developer分支写的一段话
+
+项目约定文件名:
+
+组件使用驼峰
+文件夹不准使用-
+页面文件可以使用-连接,但是最多1个-
+
+```
+
+- 单个
+```
+
+```

dist/build/mp-weixin/app.js

@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

dist/build/mp-weixin/app.json

@@ -1,70 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/class/gift",
-    "pages/class/detail",
-    "pages/class/shoppingCart",
-    "pages/class/bindPhone",
-    "pages/order/index",
-    "pages/myStudents/myStudents",
-    "pages/studentcenter/index",
-    "pages/studentcenter/operation",
-    "pages/studentcenter/signIn",
-    "pages/studentcenter/classVideo",
-    "pages/studentcenter/works",
-    "pages/studentcenter/evaluate",
-    "pages/studentcenter/absent",
-    "pages/mine/mine",
-    "pages/mine/parents",
-    "pages/mine/teachers",
-    "pages/mine/institution",
-    "pages/mine/setting",
-    "pages/mine/changePhone",
-    "pages/mine/message",
-    "pages/mine/onlineService",
-    "pages/login/index",
-    "pages/agreement/index"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarBackgroundColor": "#FFFFFF",
-    "navigationBarTitleText": "1212",
-    "navigationStyle": "custom",
-    "navigationBarTextStyle": "black",
-    "animationType": "slide-out-right"
-  },
-  "tabBar": {
-    "custom": true,
-    "color": "#707070",
-    "selectedColor": "#3390F5",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "/static/imgs/tabbar/xk1.png",
-        "selectedIconPath": "/static/imgs/tabbar/xk.png",
-        "text": "选课"
-      },
-      {
-        "pagePath": "pages/studentcenter/index",
-        "iconPath": "/static/imgs/tabbar/xszx1.png",
-        "selectedIconPath": "/static/imgs/tabbar/xszx.png",
-        "text": "学生中心"
-      },
-      {
-        "pagePath": "pages/mine/mine",
-        "iconPath": "/static/imgs/tabbar/wd1.png",
-        "selectedIconPath": "/static/imgs/tabbar/wd.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "usingComponents": {
-    "cu-custom": "/components/cu-custom",
-    "page-loading": "/components/page-loading",
-    "mp-tabbar": "/components/mp-tabbar",
-    "float-tab": "/components/float-tab"
-  },
-  "sitemapLocation": "sitemap.json"
-}

dist/build/mp-weixin/app.wxss

@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

dist/build/mp-weixin/components/cu-custom.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/components/float-tab.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/components/mp-tabbar.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/components/page-loading.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/components/shop-cart.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/components/swiper-tab.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-calendar/uni-calendar-item.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-calendar/uni-calendar.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "calendar-item": "/node-modules/@dcloudio/uni-ui/lib/uni-calendar/uni-calendar-item"
-  }
-}

dist/build/mp-weixin/pages/agreement/index.json

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

dist/build/mp-weixin/pages/class/bindPhone.json

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

dist/build/mp-weixin/pages/class/detail.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "swiper-tab": "/components/swiper-tab",
-    "shop-cart": "/components/shop-cart"
-  }
-}

dist/build/mp-weixin/pages/class/gift.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "shop-cart": "/components/shop-cart"
-  }
-}

dist/build/mp-weixin/pages/class/shoppingCart.json

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

dist/build/mp-weixin/pages/index/components/card.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/pages/index/components/course.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

dist/build/mp-weixin/pages/index/index.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "course": "/pages/index/components/course",
-    "card": "/pages/index/components/card"
-  }
-}

dist/build/mp-weixin/pages/login/index.json

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

dist/build/mp-weixin/pages/mine/changePhone.json

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

dist/build/mp-weixin/pages/mine/institution.json

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

dist/build/mp-weixin/pages/mine/message.json

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

dist/build/mp-weixin/pages/mine/mine.json

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

dist/build/mp-weixin/pages/mine/onlineService.json

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

dist/build/mp-weixin/pages/mine/parents.json

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

dist/build/mp-weixin/pages/mine/setting.json

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

dist/build/mp-weixin/pages/mine/teachers.json

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

dist/build/mp-weixin/pages/myStudents/myStudents.json

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

dist/build/mp-weixin/pages/order/index.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "swiper-tab": "/components/swiper-tab"
-  }
-}

dist/build/mp-weixin/pages/studentcenter/absent.json

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

dist/build/mp-weixin/pages/studentcenter/classVideo.json

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

dist/build/mp-weixin/pages/studentcenter/evaluate.json

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

dist/build/mp-weixin/pages/studentcenter/index.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uni-calendar": "/node-modules/@dcloudio/uni-ui/lib/uni-calendar/uni-calendar",
-    "swiper-tab": "/components/swiper-tab"
-  }
-}

dist/build/mp-weixin/pages/studentcenter/operation.json

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

dist/build/mp-weixin/pages/studentcenter/signIn.json

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

dist/build/mp-weixin/pages/studentcenter/works.json

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

dist/build/mp-weixin/project.private.config.json

@@ -1,7 +0,0 @@
-{
-  "projectname": "parentTest",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
-}

package.json

@@ -1,97 +1,98 @@
-{
-  "name": "uni-cli-project",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
-    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --minimize",
-    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
-    "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
-    "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
-    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
-    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
-    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
-    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
-    "build:quickapp": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp vue-cli-service uni-build",
-    "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
-    "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
-    "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
-    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
-    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
-    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
-    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
-    "dev:quickapp": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp vue-cli-service uni-build --watch",
-    "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
-    "serve:quickapp": "node node_modules/@dcloudio/uni-quickapp/bin/serve.js",
-    "lint:fix": "eslint --ext .js,.vue src -c .eslintrc.js --fix",
-    "vue:lint": "vue-cli-service lint",
-    "vue:lintfix": "vue-cli-service lint --fix"
-  },
-  "dependencies": {
-    "@dcloudio/uni-ui": "^1.4.14",
-    "number-precision": "^1.4.0",
-    "vue": "^2.6.10",
-    "vue-class-component": "^6.3.2",
-    "vue-count-to": "^1.0.13",
-    "vue-property-decorator": "^8.5.1",
-    "vuex": "^3.5.1",
-    "vuex-class": "^0.3.2",
-    "vuex-module-decorators": "^0.17.0"
-  },
-  "devDependencies": {
-    "@dcloudio/types": "^1.0.2",
-    "@dcloudio/uni-app-plus": "^2.0.0-31920210514002",
-    "@dcloudio/uni-cli-shared": "^2.0.0-31920210514002",
-    "@dcloudio/uni-h5": "^2.0.0-31920210514002",
-    "@dcloudio/uni-helper-json": "^1.0.5",
-    "@dcloudio/uni-migration": "^2.0.0-31920210514002",
-    "@dcloudio/uni-mp-alipay": "^2.0.0-31920210514002",
-    "@dcloudio/uni-mp-baidu": "^2.0.0-31920210514002",
-    "@dcloudio/uni-mp-qq": "^2.0.0-31920210514002",
-    "@dcloudio/uni-mp-toutiao": "^2.0.0-31920210514002",
-    "@dcloudio/uni-mp-weixin": "^2.0.0-31920210514002",
-    "@dcloudio/uni-stat": "^2.0.0-31920210514002",
-    "@dcloudio/uni-template-compiler": "^2.0.0-31920210514002",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.0-31920210514002",
-    "@dcloudio/vue-cli-plugin-uni": "^2.0.0-31920210514002",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.0-31920210514002",
-    "@dcloudio/webpack-uni-mp-loader": "^2.0.0-31920210514002",
-    "@dcloudio/webpack-uni-pages-loader": "^2.0.0-31920210514002",
-    "@types/lodash": "^4.14.156",
-    "@typescript-eslint/eslint-plugin": "^3.4.0",
-    "@typescript-eslint/parser": "^3.4.0",
-    "@vue/cli-plugin-babel": "3.5.1",
-    "@vue/cli-plugin-typescript": "^3.5.1",
-    "@vue/cli-service": "^4.4.5",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-standard": "^5.1.2",
-    "@vue/eslint-config-typescript": "^5.0.2",
-    "babel-plugin-import": "^1.11.0",
-    "copy-webpack-plugin": "~5.0.0",
-    "cross-env": "^7.0.2",
-    "eslint": "^7.3.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-import-resolver-typescript": "^2.0.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-json": "^2.1.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "node-sass": "^4.14.1",
-    "postcss-comment": "^2.0.0",
-    "prettier": "^2.0.5",
-    "sass-loader": "^8.0.2",
-    "sass-resources-loader": "^2.0.3",
-    "typescript": "^3.9.5",
-    "vue-template-compiler": "^2.6.10"
-  },
-  "browserslist": [
-    "Android >= 4",
-    "ios >= 8"
-  ],
-  "uni-app": {
-    "scripts": {}
-  }
-}
+{
+  "name": "uni-cli-project",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
+    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --minimize",
+    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
+    "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
+    "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
+    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
+    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
+    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
+    "build:quickapp": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp vue-cli-service uni-build",
+    "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
+    "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
+    "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
+    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
+    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
+    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
+    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
+    "dev:quickapp": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp vue-cli-service uni-build --watch",
+    "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
+    "serve:quickapp": "node node_modules/@dcloudio/uni-quickapp/bin/serve.js",
+    "lint:fix": "eslint --ext .js,.vue src -c .eslintrc.js --fix",
+    "vue:lint": "vue-cli-service lint",
+    "vue:lintfix": "vue-cli-service lint --fix"
+  },
+  "dependencies": {
+    "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
+    "@dcloudio/uni-ui": "^1.4.14",
+    "number-precision": "^1.4.0",
+    "vue": "^2.6.10",
+    "vue-class-component": "^6.3.2",
+    "vue-count-to": "^1.0.13",
+    "vue-property-decorator": "^8.5.1",
+    "vuex": "^3.5.1",
+    "vuex-class": "^0.3.2",
+    "vuex-module-decorators": "^0.17.0"
+  },
+  "devDependencies": {
+    "@dcloudio/types": "^1.0.2",
+    "@dcloudio/uni-app-plus": "^2.0.0-31920210514002",
+    "@dcloudio/uni-cli-shared": "^2.0.0-31920210514002",
+    "@dcloudio/uni-h5": "^2.0.0-31920210514002",
+    "@dcloudio/uni-helper-json": "^1.0.5",
+    "@dcloudio/uni-migration": "^2.0.0-31920210514002",
+    "@dcloudio/uni-mp-alipay": "^2.0.0-31920210514002",
+    "@dcloudio/uni-mp-baidu": "^2.0.0-31920210514002",
+    "@dcloudio/uni-mp-qq": "^2.0.0-31920210514002",
+    "@dcloudio/uni-mp-toutiao": "^2.0.0-31920210514002",
+    "@dcloudio/uni-mp-weixin": "^2.0.0-31920210514002",
+    "@dcloudio/uni-stat": "^2.0.0-31920210514002",
+    "@dcloudio/uni-template-compiler": "^2.0.0-31920210514002",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.0-31920210514002",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.0-31920210514002",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.0-31920210514002",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.0-31920210514002",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.0-31920210514002",
+    "@types/lodash": "^4.14.156",
+    "@typescript-eslint/eslint-plugin": "^3.4.0",
+    "@typescript-eslint/parser": "^3.4.0",
+    "@vue/cli-plugin-babel": "3.5.1",
+    "@vue/cli-plugin-typescript": "^3.5.1",
+    "@vue/cli-service": "^4.4.5",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/eslint-config-standard": "^5.1.2",
+    "@vue/eslint-config-typescript": "^5.0.2",
+    "babel-plugin-import": "^1.11.0",
+    "copy-webpack-plugin": "~5.0.0",
+    "cross-env": "^7.0.2",
+    "eslint": "^7.3.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-import-resolver-typescript": "^2.0.0",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-json": "^2.1.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-vue": "^6.2.2",
+    "node-sass": "^4.14.1",
+    "postcss-comment": "^2.0.0",
+    "prettier": "^2.0.5",
+    "sass-loader": "^8.0.2",
+    "sass-resources-loader": "^2.0.3",
+    "typescript": "^3.9.5",
+    "vue-template-compiler": "^2.6.10"
+  },
+  "browserslist": [
+    "Android >= 4",
+    "ios >= 8"
+  ],
+  "uni-app": {
+    "scripts": {}
+  }
+}

src/api/auth.js

@@ -1,66 +1,70 @@
-import fetch from '@/common/utils/fetch.js'
-
-// 微信登录接口，换取openid
-export function _login(params) {
-  return fetch('/parents/login/wx_login', params, 'post')
-}
-// 换取用户详细信息
-export function _auth(params) {
-  return fetch('/parents/login/wx_auth', params, 'post')
-}
-// 微信绑定用户手机
-export function _bindPhone(params) {
-  return fetch('/parents/login/wx_bindphone', params, 'post')
-}
-// 修改用户信息
-export function _changeUserInfo(params) {
-  return fetch('/parents/init/parent_msg', params, 'post')
-}
-// 获取用户信息
-export function _getUserInfo(params) {
-  return fetch('/parents/init/get_parent', params, 'post')
-}
-// 获取验证码
-export function _getCode(params) {
-  return fetch('/index/index/wx_get_code', params, 'post')
-}
-// 修改手机号
-export function _changePhone(params) {
-  return fetch('/parents/login/wx_change_phone', params, 'post')
-}
-// 初始化学生
-export function _getStudents(params) {
-  return fetch('/parents/init/get_students', params, 'post')
-}
-// 绑定学生
-export function _bindStudent(params) {
-  return fetch('/parents/init/bind_student_by_id', params, 'post')
-}
-// 解绑学生
-export function _unbindStudent(params) {
-  return fetch('/parents/init/unbindStudent', params)
-}
-// 获取接送人列表
-export function _getPickup(params) {
-  return fetch('/parents/Pickup/get_pickup', params, 'post')
-}
-// 增加授权人
-export function _addPickup(params) {
-  return fetch('/parents/Pickup/pickup_accredit', params, 'post')
-}
-// 获取老师数据
-export function _getTeacher(params) {
-  return fetch('/parents/teacher/get_teacher', params, 'post')
-}
-// 获取教育机构数据
-export function _getInstitution(params) {
-  return fetch('/parents/institution/get_institution', params, 'post')
-}
-// 获取系统通知
-export function _getNotice(params) {
-  return fetch('/parents/notice/get_notice', params, 'post')
-}
-// 获取通知详情
-export function _noticeDetail(params) {
-  return fetch('/parents/notice/get_notice_details', params, 'post')
-}
+import fetch from '@/common/utils/fetch.js'
+
+// 微信登录接口，换取openid
+export function _login(params) {
+  return fetch('/parents/login/wx_login', params, 'post')
+}
+// 换取用户详细信息
+export function _auth(params) {
+  return fetch('/parents/login/wx_auth', params, 'post')
+}
+// 微信绑定用户手机
+export function _bindPhone(params) {
+  return fetch('/parents/login/wx_bindphone', params, 'post')
+}
+// 判断绑定手机号
+export function _getBindPhone() {
+  return fetch('/parents/login/getBindMobile')
+}
+// 修改用户信息
+export function _changeUserInfo(params) {
+  return fetch('/parents/init/parent_msg', params, 'post')
+}
+// 获取用户信息
+export function _getUserInfo(params) {
+  return fetch('/parents/init/get_parent', params, 'post')
+}
+// 获取验证码
+export function _getCode(params) {
+  return fetch('/index/index/wx_get_code', params, 'post')
+}
+// 修改手机号
+export function _changePhone(params) {
+  return fetch('/parents/login/wx_change_phone', params, 'post')
+}
+// 初始化学生
+export function _getStudents(params) {
+  return fetch('/parents/init/get_students', params, 'post')
+}
+// 绑定学生
+export function _bindStudent(params) {
+  return fetch('/parents/init/bind_student_by_id', params, 'post')
+}
+// 解绑学生
+export function _unbindStudent(params) {
+  return fetch('/parents/init/unbindStudent', params)
+}
+// 获取接送人列表
+export function _getPickup(params) {
+  return fetch('/parents/Pickup/get_pickup', params, 'post')
+}
+// 增加授权人
+export function _addPickup(params) {
+  return fetch('/parents/Pickup/pickup_accredit', params, 'post')
+}
+// 获取老师数据
+export function _getTeacher(params) {
+  return fetch('/parents/teacher/get_teacher', params, 'post')
+}
+// 获取教育机构数据
+export function _getInstitution(params) {
+  return fetch('/parents/institution/get_institution', params, 'post')
+}
+// 获取系统通知
+export function _getNotice(params) {
+  return fetch('/parents/notice/get_notice', params, 'post')
+}
+// 获取通知详情
+export function _noticeDetail(params) {
+  return fetch('/parents/notice/get_notice_details', params, 'post')
+}

src/pages/class/bindPhone.vue

@@ -1,115 +1,122 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true"  title="绑定手机号"></cu-custom>
-		<view class="bind bg-white">
-			<view class="bind-img">
-					<image src="/static/imgs/phone.png" mode="widthFix" style="width:400rpx;" />
-			</view>
-			<view class="bind-text">请绑定手机号</view>
-			<view class="bind-tip" style="margin-top:10px;"> 为向您提供更优质的交易相关基本功能，我们将会获取您的手机号。</view>
-			<view class="bind-tip">
-			为了更好的保障个人权益，请您仔细阅读
-					<text style="color:#02a5b1"  class="text" @tap="goto('user')">《用户协议》</text>和
-					<text style="color:#02a5b1"  class="text" @tap="goto('privacy')">《隐私政策》</text>
-			</view>
-			<button class="bind-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立即绑定</button>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _bindPhone, _login } from '@/api/auth'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-      key: '绑定手机号'
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'token', 'session'
-    ])
-  },
-  methods: {
-    goto(type) {
-      this.globalNavigateTo('agreement', { type })
-    },
-    getPhoneNumber(e) {
-      const detail = e.detail
-      if (!detail.iv) {
-        return false
-      }
-      const _self = this
-      const params = {
-        iv: detail.iv,
-        encryptedData: detail.encryptedData,
-        token: this.token,
-        code: this.globalApp.code
-      }
-      uni.checkSession({
-        success() {
-          params.session = _self.session
-          _self.bindPhone(params)
-        },
-        fail() {
-          uni.login({
-            success: wxres => {
-              _login({ code: wxres.code }).then(res => {
-                params.session = res.data.session_key
-                _self.$store.dispatch('setSession', res.data.session_key)
-                _self.bindPhone(params)
-              })
-            }
-          })
-        }
-      })
-    },
-    bindPhone(params) {
-      _bindPhone(params).then(res => {
-        uni.showToast({ title: res.msg, icon: 'none' })
-        const token = res.data.token
-        this.$store.dispatch('setToken', token)
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 800)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.bind{
-  padding:30px 44rpx 10px;
-}
-.bind-img{
-  margin:0 auto;
-  text-align:center;
-}
-.bind-text{
-    margin-top:20px;
-    color:#000;
-    font-size:18px;
-    text-align:center;
-}
-.bind-tip{
-  font-size:14px;
-}
-.bind-btn{
-  margin-top: 30px;
-  background: #5fd0e4;
-  border-radius:4px;
-  color: #fff;
-  width: 100%;
-  padding: 0;
-  font-size: 14px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 10vw;
-}
-.bind-btn:hover{
-  background: #3f8b97;
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true"  title="绑定手机号"></cu-custom>
+		<view class="bind bg-white">
+			<view class="bind-img">
+					<image src="/static/imgs/phone.png" mode="widthFix" style="width:400rpx;" />
+			</view>
+			<view class="bind-text">请绑定手机号</view>
+			<view class="bind-tip" style="margin-top:10px;"> 为向您提供更优质的交易相关基本功能，我们将会获取您的手机号。</view>
+			<view class="bind-tip">
+			为了更好的保障个人权益，请您仔细阅读
+					<text style="color:#02a5b1"  class="text" @tap="goto('user')">《用户协议》</text>和
+					<text style="color:#02a5b1"  class="text" @tap="goto('privacy')">《隐私政策》</text>
+			</view>
+			<button class="bind-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立即绑定</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import { _bindPhone, _login, _getBindPhone } from '@/api/auth'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      key: '绑定手机号'
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'token', 'session'
+    ])
+  },
+  methods: {
+    goto(type) {
+      this.globalNavigateTo('agreement', { type })
+    },
+    getPhoneNumber(e) {
+      const detail = e.detail
+      if (!detail.iv) {
+        return false
+      }
+      const _self = this
+      const params = {
+        iv: detail.iv,
+        encryptedData: detail.encryptedData,
+        token: this.token,
+        code: this.globalApp.code
+      }
+      uni.checkSession({
+        success() {
+          params.session = _self.session
+          _self.bindPhone(params)
+        },
+        fail() {
+          uni.login({
+            success: wxres => {
+              _login({ code: wxres.code }).then(res => {
+                params.session = res.data.session_key
+                _self.$store.dispatch('setSession', res.data.session_key)
+                _self.bindPhone(params)
+              })
+            }
+          })
+        }
+      })
+    },
+    bindPhone(params) {
+      _bindPhone(params).then(res => {
+        uni.showToast({ title: res.msg, icon: 'none' })
+        const token = res.data.token
+        this.$store.dispatch('setToken', token).then(res => {
+          this.getBindPhone()// 获取手机号
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 800)
+        })
+      })
+    },
+    getBindPhone() {
+      _getBindPhone().then(res => {
+        this.$store.dispatch('setPhone', res.data.mobile)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bind{
+  padding:30px 44rpx 10px;
+}
+.bind-img{
+  margin:0 auto;
+  text-align:center;
+}
+.bind-text{
+    margin-top:20px;
+    color:#000;
+    font-size:18px;
+    text-align:center;
+}
+.bind-tip{
+  font-size:14px;
+}
+.bind-btn{
+  margin-top: 30px;
+  background: #5fd0e4;
+  border-radius:4px;
+  color: #fff;
+  width: 100%;
+  padding: 0;
+  font-size: 14px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 10vw;
+}
+.bind-btn:hover{
+  background: #3f8b97;
+}
+</style>

src/pages/class/shoppingCart.vue

@@ -1,176 +1,173 @@
-<template>
-  <view class="page">
-		<cu-custom :isBack="true"></cu-custom>
-		<view class="header" :style="[{top:topHeader + 'px'}]">
-			<view class="header-title">
-				<view class="header-title-main">
-						<view class="margin-bottom-xs">{{title}}</view>
-						<view class="point"></view>
-				</view>
-			</view>
-		</view>
-			<scroll-view  scroll-y="true"
-			:style="[{height:'calc(100vh - 64px - '+ topHeader+'px)'}]"
-			class="scroll-main">
-				<view class="list">
-					<view class="cu-card margin-bottom shadow" v-for="(item,index) in list" :key="index">
-						<view class="cu-item">
-							<view class="card-header flex justify-between solid-bottom">
-								 <view>{{item.student_name}}</view>
-								 <view>
-									  <text class="cuIcon-delete text-red" @tap="del(item,index)"></text>
-								 </view>
-							</view>
-							<view class="card flex">
-								<view class="card-left">
-									<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
-								</view>
-								<view class="card-right flex-sub margin-left-sm">
-									<view class="card-title">{{item.class_attend_name}}</view>
-									<view class="text-price text-student text-xl margin-top-xs">{{item.price}}</view>
-									<view class="card-item">
-										 <text class="card-label">机构：</text>
-										 <text class="card-text">{{item.agency_name||'-'}}</text>
-									</view>
-									<view class="card-item margin-top-xs" v-if="item.cate_type===0">
-										 <text class="card-label">老师：</text>
-										 <text class="card-text">{{item.teacher_name||'-'}}</text>
-									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">总共：</text>
-										 <text class="card-text">{{item.class_total||'-'}}</text>
-									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">时间：</text>
-										 <text class="card-text">{{item.week_limit||'-'}}</text>
-									</view>
-								</view>
-							</view>
-							<view class="card-footer margin-top-xs" v-if="item.prop">
-								<view v-for="(tag,index) in item.prop" :key="index" class="cu-tag line-red">{{tag}}</view>
-							</view>
-							<view class="card-bottom margin-top-xs">
-								<button @tap="pay(item)" class="cu-btn round bg-student text-white">立即下单</button>
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-	</view>
-</template>
-
-<script>
-import { _shopList, _delShop, _createOrder } from '@/api/course'
-import { mapGetters } from 'vuex'
-import { deepClone } from '@/common/utils'
-import socket from '@/common/webSocket'
-export default {
-  data() {
-    return {
-      title: '购物车',
-      topHeader: this.globalCustomBarHeight,
-      isBind: false,
-      list: []
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'carts'
-    ])
-  },
-  onLoad(option) {
-    this.get_list()
-    socket.initSocket()
-  },
-  methods: {
-    get_list() {
-      _shopList().then(res => {
-        this.isBind = res.isBindMobile
-        this.list = res.data
-        const carts = this.list.map(item => item.class_attend_id)
-        this.$store.dispatch('setCarts', carts)// 刷新购物车
-      })
-    },
-    del(item, index) {
-      const _self = this
-      uni.showModal({
-        title: '提示',
-        content: '确定要删除？',
-        cancelText: '取消',
-        confirmText: '确定',
-        success: res => {
-          if (res.confirm) {
-            _delShop({ shopping_id: item.shopping_id, student_id: item.student_id }).then(res => {
-              _self.get_list()
-            })
-          }
-        }
-      })
-    },
-    pay(item) {
-      const order = JSON.stringify([item])
-      let carts = deepClone(this.carts)
-      const index = carts.indexOf(item.class_attend_id)
-      carts = carts.splice(index, 1)
-      const isBind = this.isBind
-      if (!isBind) {
-        return this.globalNavigateTo('bindPhone')
-      }
-      _createOrder({ result: order }).then(res => {
-        this.socket.onMessage = message => {
-          if (typeof message !== 'object') {
-            return false
-          }
-          if (message.push_type !== 'order') {
-            return false
-          }
-          if (message.code === 400) {
-            uni.showToast({ title: message.msg, icon: 'none', duration: 2000 })
-            return false
-          }
-          this.$store.dispatch('setCarts', carts)
-          this.globalNavigateTo('order')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/common/css/mixin.scss';
-.scroll-main{
-	margin-top:64px;
-	padding:20rpx;
-}
-.cu-card{
-	.cu-item{
-		margin-top:10rpx;
-		padding:20rpx;
-		margin:0;
-	}
-}
-.card-header{
-	padding-bottom:10px;
-  @include title(10px,18px);
-}
-.card{
-	&-title{
-		font-size:16px;
-	}
-	&-image{
-		width:35vw;
-		height:35vw;
-		border-radius:10rpx;
-	}
-	&-label{
-		color:#999;
-	}
-	&-text{
-		color:#333;
-	}
-}
-.card-bottom{
-	text-align:right;
-}
-</style>
+<template>
+  <view class="page">
+		<cu-custom :isBack="true"></cu-custom>
+		<view class="header" :style="[{top:topHeader + 'px'}]">
+			<view class="header-title">
+				<view class="header-title-main">
+						<view class="margin-bottom-xs">{{title}}</view>
+						<view class="point"></view>
+				</view>
+			</view>
+		</view>
+			<scroll-view  scroll-y="true"
+			:style="[{height:'calc(100vh - 64px - '+ topHeader+'px)'}]"
+			class="scroll-main">
+				<view class="list">
+					<view class="cu-card margin-bottom shadow" v-for="(item,index) in list" :key="index">
+						<view class="cu-item">
+							<view class="card-header flex justify-between solid-bottom">
+								 <view>{{item.student_name}}</view>
+								 <view>
+									  <text class="cuIcon-delete text-red" @tap="del(item,index)"></text>
+								 </view>
+							</view>
+							<view class="card flex">
+								<view class="card-left">
+									<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
+								</view>
+								<view class="card-right flex-sub margin-left-sm">
+									<view class="card-title">{{item.class_attend_name}}</view>
+									<view class="text-price text-student text-xl margin-top-xs">{{item.price}}</view>
+									<view class="card-item">
+										 <text class="card-label">机构：</text>
+										 <text class="card-text">{{item.agency_name||'-'}}</text>
+									</view>
+									<view class="card-item margin-top-xs" v-if="item.cate_type===0">
+										 <text class="card-label">老师：</text>
+										 <text class="card-text">{{item.teacher_name||'-'}}</text>
+									</view>
+									<view class="card-item margin-top-xs">
+										 <text class="card-label">总共：</text>
+										 <text class="card-text">{{item.class_total||'-'}}</text>
+									</view>
+									<view class="card-item margin-top-xs">
+										 <text class="card-label">时间：</text>
+										 <text class="card-text">{{item.week_limit||'-'}}</text>
+									</view>
+								</view>
+							</view>
+							<view class="card-footer margin-top-xs" v-if="item.prop">
+								<view v-for="(tag,index) in item.prop" :key="index" class="cu-tag line-red">{{tag}}</view>
+							</view>
+							<view class="card-bottom margin-top-xs">
+								<button @tap="pay(item)" class="cu-btn round bg-student text-white">立即下单</button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+	</view>
+</template>
+
+<script>
+import { _shopList, _delShop, _createOrder } from '@/api/course'
+import { mapGetters } from 'vuex'
+import { deepClone } from '@/common/utils'
+import socket from '@/common/webSocket'
+export default {
+  data() {
+    return {
+      title: '购物车',
+      topHeader: this.globalCustomBarHeight,
+      list: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'carts', 'phone'
+    ])
+  },
+  onLoad(option) {
+    this.get_list()
+    socket.initSocket()
+  },
+  methods: {
+    get_list() {
+      _shopList().then(res => {
+        this.list = res.data
+        const carts = this.list.map(item => item.class_attend_id)
+        this.$store.dispatch('setCarts', carts)// 刷新购物车
+      })
+    },
+    del(item, index) {
+      const _self = this
+      uni.showModal({
+        title: '提示',
+        content: '确定要删除？',
+        cancelText: '取消',
+        confirmText: '确定',
+        success: res => {
+          if (res.confirm) {
+            _delShop({ shopping_id: item.shopping_id, student_id: item.student_id }).then(res => {
+              _self.get_list()
+            })
+          }
+        }
+      })
+    },
+    pay(item) {
+      const order = JSON.stringify([item])
+      let carts = deepClone(this.carts)
+      const index = carts.indexOf(item.class_attend_id)
+      carts = carts.splice(index, 1)
+      if (!this.phone) {
+        return this.globalNavigateTo('bindPhone')
+      }
+      _createOrder({ result: order }).then(res => {
+        this.socket.onMessage = message => {
+          if (typeof message !== 'object') {
+            return false
+          }
+          if (message.push_type !== 'order') {
+            return false
+          }
+          if (message.code === 400) {
+            uni.showToast({ title: message.msg, icon: 'none', duration: 2000 })
+            return false
+          }
+          this.$store.dispatch('setCarts', carts)
+          this.globalNavigateTo('order')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/common/css/mixin.scss';
+.scroll-main{
+	margin-top:64px;
+	padding:20rpx;
+}
+.cu-card{
+	.cu-item{
+		margin-top:10rpx;
+		padding:20rpx;
+		margin:0;
+	}
+}
+.card-header{
+	padding-bottom:10px;
+  @include title(10px,18px);
+}
+.card{
+	&-title{
+		font-size:16px;
+	}
+	&-image{
+		width:35vw;
+		height:35vw;
+		border-radius:10rpx;
+	}
+	&-label{
+		color:#999;
+	}
+	&-text{
+		color:#333;
+	}
+}
+.card-bottom{
+	text-align:right;
+}
+</style>

src/pages/index/index.vue

@@ -1,411 +1,411 @@
-
-<template>
-  <view class="page">
-    <cu-custom :isBack="false"></cu-custom>
-    <view class="header" :style="[{top:topHeader + 'px'}]">
-			 <view class="header-box flex justify-end">
-						<view class="header-title">
-							<view class="header-title-main">
-									<view class="margin-bottom-xs">选课</view>
-									<view class="point"></view>
-							</view>
-						</view>
-						<view class="header-search flex-sub">
-							 <view class="flex justify-between">
-								 	<input type="text" v-model="params.course_name" class="header-search-input flex-sub" placeholder="搜索课程" @confirm="search">
-							 		<text class="cuIcon-search text-gray header-search-icon" @tap="search"></text>
-							 </view>
-						</view>
-			 </view>
-		</view>
-		<scroll-view :scroll-y="true" :refresher-enabled="true" class="scroll-main"
-		:refresher-triggered="triggered"
-		:style="[{height:'calc(100vh - 102px - '+ topHeader+'px)'}]"
-		@refresherrefresh="onRefresh" @scrolltolower="loadMore">
-			<view class="main">
-				<view class="main-title">活动和餐饮</view>
-				<view class="flex justify-around course">
-					<course v-for="(item,index) in courses" :key="index"
-					@tap="goCourse(item.type)"
-					:course="item" class="course-item flex-sub margin-xs"></course>
-				</view>
-				<view class="main-title margin-top-xs">一键报班</view>
-				<view class="apply-class flex">
-					<image mode="widthFix"  @tap="goGift" src="/static/imgs/index/baoban.png" class="flex-sub apply-class-img margin-xs"/>
-				</view>
-				<view class="recommend margin-top-xs">
-					<view class="recommend-title">推荐课程</view>
-					<view class="recommend-filter margin-top-xs flex">
-							<view class="filter-item text-center flex-sub" @tap="sort('home')" :class="{'text-sort':sortCur==='home'}">综合</view>
-							<view class="filter-item text-center flex-sub" @tap="sort('sales')" :class="{'text-sort':sortCur==='sales'}">销量
-								<image mode="widthFix" class="sort-icon" :src="sortCur==='sales'?(sortItem.sales===0?sortIcons.up:sortIcons.down):sortIcons.no"></image>
-							</view>
-							<view class="filter-item text-center flex-sub" @tap="sort('money')" :class="{'text-sort':sortCur==='money'}">价格
-								<image mode="widthFix" class="sort-icon" :src="sortCur==='money'?(sortItem.money===0?sortIcons.up:sortIcons.down):sortIcons.no"></image>
-							</view>
-							<view class="filter-item text-center flex-sub">{{grade_now}}</view>
-							<view class="filter-item text-right flex-sub" @tap="showModal" data-target="FilterModal">筛选
-								<text class="cuIcon-filter text-gray"></text>
-							</view>
-					</view>
-					<view class="list">
-							<view class="cu-card" v-for="(item,index) in list" :key="index">
-								<view class="cu-item">
-									<card :item="item"></card>
-								</view>
-							</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-    <view class="cu-modal drawer-modal justify-end" :class="modalName=='FilterModal'?'show':''" @tap="hideModal">
-      <view class="cu-dialog basis-lg" @tap.stop=""
-        :style="[{top:topHeader+'px',height:'calc(100vh - ' + topHeader + 'px)'}]">
-					<view class="filter-title">机构筛选</view>
-				  <view class="btn-check-group padding-lr">
-						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="agency">
-							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.agency.includes(item.id+'')}"
-								v-for="item in filters.agency" :key="item.id">
-								<checkbox :value="item.id"/>
-								{{item.name}}
-							</label>
-						</checkbox-group>
-        	</view>
-					<view class="filter-title">周期筛选</view>
-					<view class="btn-check-group padding-lr">
-						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
-							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.day.includes(index+'')}"
-								v-for="(item,index) in filters.week" :key="index">
-								<checkbox :value="index"/>
-								{{item}}
-							</label>
-						</checkbox-group>
-        	</view>
-					<view class="filter-title">价格区间（元）</view>
-					<view class="btn-check-group padding-lr">
-						<radio-group  class="flex" style="flex-wrap: wrap;" id="price">
-							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.price===item.name}"
-								 v-for="item in filters.price_list" :key="item.id" @tap="radioChange(item.name)">
-								<radio :value="item.name"/>
-								{{item.name}}
-							</label>
-						</radio-group>
-        	</view>
-					<view class="padding-lr">
-							<button class="check-course cu-btn bg-cyan margin-tb-sm button-hover" @tap="check_course">确定</button>
-					</view>
-      </view>
-    </view>
-    <mp-tabbar :outerSelected="0" />
-  </view>
-</template>
-
-<script>
-import course from './components/course.vue'
-import card from './components/card.vue'
-import { _optionCourse, _filter } from '@/api/course'
-import { filterParams } from '@/common/utils/tool'
-import { mapGetters } from 'vuex'
-export default {
-  components: {
-    course, card
-  },
-  data () {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      modalName: '',
-      triggered: false,
-      grade_now: '年级',
-      sortCur: 'home', // 当前排序
-      filters: {},
-      sortIcons: {
-        no: '/static/imgs/index/xiaoshou_shaixuan.png',
-        up: '/static/imgs/index/xiaoshou_shaixuan1.png',
-        down: '/static/imgs/index/xiaoshou_shaixuan2.png'
-      },
-      sortItem: {
-        home: 0,
-        sales: 0,
-        money: 0
-      },
-      courses: [// 排序情况
-        {
-          applying: true,
-          back: '/static/imgs/index/zmk.png',
-          background: '#5FCFE0',
-          ch: '选课',
-          en: 'Course',
-          type: 0
-        },
-        {
-          applying: true,
-          back: '/static/imgs/index/hdk.png',
-          background: '#f8be32',
-          ch: '活动',
-          en: 'Activity',
-          type: 2
-        },
-        {
-          applying: false,
-          back: '/static/imgs/index/zmk.png',
-          background: '#67d2a9',
-          ch: '报餐',
-          en: 'Catering',
-          type: 1
-        }
-      ],
-      price: [],
-      params: {
-        page_num: 1,
-        course_name: '',
-        agency: [],
-        day: [],
-        price: '',
-        sort: '',
-        list_type: 0// 0 课程,1 餐饮,2活动
-      },
-      init: { // 初始化
-        page_num: 1,
-        course_name: '',
-        agency: [],
-        day: [],
-        price: '',
-        sort: '',
-        list_type: 0// 0 课程,1 餐饮,2活动
-      },
-      list: [],
-      noMore: false, // 还有没
-      originList: {}
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'kid'
-    ])
-  },
-  onShow() {
-    if (!this.kid) {
-      return this.globalNavigateTo('myStudents')
-    }
-    this.params = Object.assign({}, this.init)
-    this.get_list(true)// true初始化加载过滤项
-  },
-  methods: {
-    goCourse(type) {
-      this.params.list_type = type
-      this.search()
-    },
-    loadFilter() { // 加载筛选项
-      const params = {}
-      _filter(params).then(res => {
-        this.filters = res.data
-        this.courses[1].applying = this.filters.is_activity
-        this.courses[2].applying = this.filters.is_catering
-      })
-    },
-    showModal (e) {
-      this.modalName = e.currentTarget.dataset.target
-    },
-    hideModal (e) {
-      this.modalName = null
-    },
-    radioChange(v) {
-      if (this.params.price === v) { // 选中取消
-        this.params.price = null
-      } else { // 空则赋值
-        this.params.price = v
-      }
-    },
-    checkboxChange(e) {
-      const type = e.target.id
-      const values = e.detail.value
-      switch (type) {
-        case 'agency':
-          this.params.agency = values
-          break
-        case 'day':
-          this.params.day = values
-          break
-        case 'price':
-          // this.params.price = values
-          break
-        default:
-          console.log('error')
-      }
-    },
-    search() { // 搜索课程
-      this.params.page_num = 1
-      this.get_list()
-    },
-    check_course() { // 筛选课程
-      this.params.page_num = 1
-      this.get_list()
-      this.hideModal()
-    },
-    onRefresh() { // 下拉刷新
-      this.triggered = true
-      this.params.page_num = 1
-      this.params.list_type = 0
-      this.get_list()
-      setTimeout(() => {
-        this.triggered = false
-      }, 1000)
-    },
-    loadMore() {
-      if (this.noMore) {
-        uni.showToast({ title: '暂无更多课程数据', icon: 'none' })
-        return false
-      }
-      this.params.page_num++
-      this.get_list()
-    },
-    sort(type) { // 排序搜索
-      const sorts = {
-        home: 0,
-        sales: 0,
-        money: 0
-      }
-      if (type === this.sortCur) {
-        const sortOrder = this.sortItem[type]
-        sorts[type] = sortOrder > 0 ? 0 : 1
-      } else {
-        this.sortCur = type
-      }
-      const order = sorts[type] > 0 ? 'desc' : 'asc'
-      this.sortItem = sorts
-      this.params.sort = type + '_' + order
-      this.params.page_num = 1
-      this.get_list()
-    },
-    get_list(init = false) {
-      let params = Object.assign({}, this.params)
-      params = filterParams(params)
-      if (params.day.length > 0) {
-        params.day = JSON.stringify(params.day)
-      }
-      if (params.agency.length > 0) {
-        params.agency = JSON.stringify(params.agency)
-      }
-      _optionCourse(params).then(res => {
-        if (params.page_num > 1) {
-          if (res.data.length < this.page_size) this.noMore = true
-          this.list = this.list.concat(res.data)
-        } else {
-          this.noMore = false
-          this.list = res.data
-          if (this.list && this.list.length > 0) {
-            this.grade_now = this.list[0].grade_now
-          }
-        }
-        // 初始化加载过滤项
-        if (init) this.loadFilter()
-      })
-    },
-    goGift() {
-      this.globalNavigateTo('classGift', { package_id: 0 })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import '~@/common/css/mixin.scss';
-.page{
- height:100vh;
-}
-.scroll-main{
-	margin-top:54px;
-}
-.header{
-	position:fixed;
-	height:54px;
-	left:0;
-	right:0;
-	z-index:999;
-	padding:20rpx;
-	background:#fff;
-	&-box{
-		align-items: center;
-	}
-	&-search{
-		margin-left:60rpx;
-		align-items: center;
-		&-input{
-			background: #ededed;
-    	border-radius: 999em;
-			padding-left:30rpx;
-      line-height:32px;
-			height:32px;
-    	font-size: 14px;
-		}
-		&-icon{
-			margin:0 30rpx;
-			line-height:32px;
-			font-size:24px;
-		}
-	}
-}
-.main{
-	padding:20rpx;
-
-}
-.main-title{
-  font-size: 12px;
-  margin-bottom: 10px;
-  color: #999;
-}
-.search-box{
-	margin-left:20rpx;
-}
-.course-item{
-  border-radius: 10px;
-  color: #fff;
-}
-.recommend{
-	&-title{
-		@include title(10px,18px);
-	}
-	&-filter{
-		.filter-item{
-			position:relative;
-		}
-	}
-	.sort-icon{
-		margin-left:6rpx;
-		width:15rpx;
-	}
-}
-.btn-check-group {
-  checkbox {
-    display: none;
-  }
-	radio{
-		display:none;
-	}
-  label {
-    display: inline-block;
-		margin-right:10rpx;
-    position: relative;
-		padding:0 20rpx;
-    line-height: 30px;
-    border-radius: 100rpx;
-    flex-wrap: nowrap;
-    border: 1px solid #eee;
-  }
-}
-.filter-title{
-	padding-left:30rpx;
-	margin-top:10px;
-	text-align:left;
-	@include title(0,14px)
-}
-.check-course{
-	width:100%;
-}
-.cu-modal.drawer-modal .cu-dialog{
-	min-width:300rpx;
-}
-.cu-card>.cu-item{
-	margin:10rpx;
-}
-</style>
+
+<template>
+  <view class="page">
+    <cu-custom :isBack="false"></cu-custom>
+    <view class="header" :style="[{top:topHeader + 'px'}]">
+			 <view class="header-box flex justify-end">
+						<view class="header-title">
+							<view class="header-title-main">
+									<view class="margin-bottom-xs">选课</view>
+									<view class="point"></view>
+							</view>
+						</view>
+						<view class="header-search flex-sub">
+							 <view class="flex justify-between">
+								 	<input type="text" v-model="params.course_name" class="header-search-input flex-sub" placeholder="搜索课程" @confirm="search">
+							 		<text class="cuIcon-search text-gray header-search-icon" @tap="search"></text>
+							 </view>
+						</view>
+			 </view>
+		</view>
+		<scroll-view :scroll-y="true" :refresher-enabled="true" class="scroll-main"
+		:refresher-triggered="triggered"
+		:style="[{height:'calc(100vh - 102px - '+ topHeader+'px)'}]"
+		@refresherrefresh="onRefresh" @scrolltolower="loadMore">
+			<view class="main">
+				<view class="main-title">活动和餐饮</view>
+				<view class="flex justify-around course">
+					<course v-for="(item,index) in courses" :key="index"
+					@tap="goCourse(item.type)"
+					:course="item" class="course-item flex-sub margin-xs"></course>
+				</view>
+				<view class="main-title margin-top-xs">一键报班</view>
+				<view class="apply-class flex">
+					<image mode="widthFix"  @tap="goGift" src="/static/imgs/index/baoban.png" class="flex-sub apply-class-img margin-xs"/>
+				</view>
+				<view class="recommend margin-top-xs">
+					<view class="recommend-title">推荐课程</view>
+					<view class="recommend-filter margin-top-xs flex">
+							<view class="filter-item text-center flex-sub" @tap="sort('home')" :class="{'text-sort':sortCur==='home'}">综合</view>
+							<view class="filter-item text-center flex-sub" @tap="sort('sales')" :class="{'text-sort':sortCur==='sales'}">销量
+								<image mode="widthFix" class="sort-icon" :src="sortCur==='sales'?(sortItem.sales===0?sortIcons.up:sortIcons.down):sortIcons.no"></image>
+							</view>
+							<view class="filter-item text-center flex-sub" @tap="sort('money')" :class="{'text-sort':sortCur==='money'}">价格
+								<image mode="widthFix" class="sort-icon" :src="sortCur==='money'?(sortItem.money===0?sortIcons.up:sortIcons.down):sortIcons.no"></image>
+							</view>
+							<view class="filter-item text-center flex-sub">{{grade_now}}</view>
+							<view class="filter-item text-right flex-sub" @tap="showModal" data-target="FilterModal">筛选
+								<text class="cuIcon-filter text-gray"></text>
+							</view>
+					</view>
+					<view class="list">
+							<view class="cu-card" v-for="(item,index) in list" :key="index">
+								<view class="cu-item">
+									<card :item="item"></card>
+								</view>
+							</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+    <view class="cu-modal drawer-modal justify-end" :class="modalName=='FilterModal'?'show':''" @tap="hideModal">
+      <view class="cu-dialog basis-lg" @tap.stop=""
+        :style="[{top:topHeader+'px',height:'calc(100vh - ' + topHeader + 'px)'}]">
+					<view class="filter-title">机构筛选</view>
+				  <view class="btn-check-group padding-lr">
+						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="agency">
+							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.agency.includes(item.id+'')}"
+								v-for="item in filters.agency" :key="item.id">
+								<checkbox :value="item.id"/>
+								{{item.name}}
+							</label>
+						</checkbox-group>
+        	</view>
+					<view class="filter-title">周期筛选</view>
+					<view class="btn-check-group padding-lr">
+						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
+							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.day.includes(index+'')}"
+								v-for="(item,index) in filters.week" :key="index">
+								<checkbox :value="index"/>
+								{{item}}
+							</label>
+						</checkbox-group>
+        	</view>
+					<view class="filter-title">价格区间（元）</view>
+					<view class="btn-check-group padding-lr">
+						<radio-group  class="flex" style="flex-wrap: wrap;" id="price">
+							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.price===item.name}"
+								 v-for="item in filters.price_list" :key="item.id" @tap="radioChange(item.name)">
+								<radio :value="item.name"/>
+								{{item.name}}
+							</label>
+						</radio-group>
+        	</view>
+					<view class="padding-lr">
+							<button class="check-course cu-btn bg-cyan margin-tb-sm button-hover" @tap="check_course">确定</button>
+					</view>
+      </view>
+    </view>
+    <mp-tabbar :outerSelected="0" />
+  </view>
+</template>
+
+<script>
+import course from './components/course.vue'
+import card from './components/card.vue'
+import { _optionCourse, _filter } from '@/api/course'
+import { filterParams } from '@/common/utils/tool'
+import { mapGetters } from 'vuex'
+export default {
+  components: {
+    course, card
+  },
+  data () {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      modalName: '',
+      triggered: false,
+      grade_now: '年级',
+      sortCur: 'home', // 当前排序
+      filters: {},
+      sortIcons: {
+        no: '/static/imgs/index/xiaoshou_shaixuan.png',
+        up: '/static/imgs/index/xiaoshou_shaixuan1.png',
+        down: '/static/imgs/index/xiaoshou_shaixuan2.png'
+      },
+      sortItem: {
+        home: 0,
+        sales: 0,
+        money: 0
+      },
+      courses: [// 排序情况
+        {
+          applying: true,
+          back: '/static/imgs/index/zmk.png',
+          background: '#5FCFE0',
+          ch: '选课',
+          en: 'Course',
+          type: 0
+        },
+        {
+          applying: true,
+          back: '/static/imgs/index/hdk.png',
+          background: '#f8be32',
+          ch: '活动',
+          en: 'Activity',
+          type: 2
+        },
+        {
+          applying: false,
+          back: '/static/imgs/index/zmk.png',
+          background: '#67d2a9',
+          ch: '报餐',
+          en: 'Catering',
+          type: 1
+        }
+      ],
+      price: [],
+      params: {
+        page_num: 1,
+        course_name: '',
+        agency: [],
+        day: [],
+        price: '',
+        sort: '',
+        list_type: 0// 0 课程,1 餐饮,2活动
+      },
+      init: { // 初始化
+        page_num: 1,
+        course_name: '',
+        agency: [],
+        day: [],
+        price: '',
+        sort: '',
+        list_type: 0// 0 课程,1 餐饮,2活动
+      },
+      list: [],
+      noMore: false, // 还有没
+      originList: {}
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'kid'
+    ])
+  },
+  onShow() {
+    if (!this.kid) {
+      return this.globalNavigateTo('myStudents')
+    }
+    this.params = Object.assign({}, this.init)
+    this.get_list(true)// true初始化加载过滤项
+  },
+  methods: {
+    goCourse(type) {
+      this.params.list_type = type
+      this.search()
+    },
+    loadFilter() { // 加载筛选项
+      const params = {}
+      _filter(params).then(res => {
+        this.filters = res.data
+        this.courses[1].applying = this.filters.is_activity
+        this.courses[2].applying = this.filters.is_catering
+      })
+    },
+    showModal (e) {
+      this.modalName = e.currentTarget.dataset.target
+    },
+    hideModal (e) {
+      this.modalName = null
+    },
+    radioChange(v) {
+      if (this.params.price === v) { // 选中取消
+        this.params.price = null
+      } else { // 空则赋值
+        this.params.price = v
+      }
+    },
+    checkboxChange(e) {
+      const type = e.target.id
+      const values = e.detail.value
+      switch (type) {
+        case 'agency':
+          this.params.agency = values
+          break
+        case 'day':
+          this.params.day = values
+          break
+        case 'price':
+          // this.params.price = values
+          break
+        default:
+          console.log('error')
+      }
+    },
+    search() { // 搜索课程
+      this.params.page_num = 1
+      this.get_list()
+    },
+    check_course() { // 筛选课程
+      this.params.page_num = 1
+      this.get_list()
+      this.hideModal()
+    },
+    onRefresh() { // 下拉刷新
+      this.triggered = true
+      this.params.page_num = 1
+      this.params.list_type = 0
+      this.get_list()
+      setTimeout(() => {
+        this.triggered = false
+      }, 1000)
+    },
+    loadMore() {
+      if (this.noMore) {
+        uni.showToast({ title: '暂无更多课程数据', icon: 'none' })
+        return false
+      }
+      this.params.page_num++
+      this.get_list()
+    },
+    sort(type) { // 排序搜索
+      const sorts = {
+        home: 0,
+        sales: 0,
+        money: 0
+      }
+      if (type === this.sortCur) {
+        const sortOrder = this.sortItem[type]
+        sorts[type] = sortOrder > 0 ? 0 : 1
+      } else {
+        this.sortCur = type
+      }
+      const order = sorts[type] > 0 ? 'desc' : 'asc'
+      this.sortItem = sorts
+      this.params.sort = type + '_' + order
+      this.params.page_num = 1
+      this.get_list()
+    },
+    get_list(init = false) {
+      let params = Object.assign({}, this.params)
+      params = filterParams(params)
+      if (params.day.length > 0) {
+        params.day = JSON.stringify(params.day)
+      }
+      if (params.agency.length > 0) {
+        params.agency = JSON.stringify(params.agency)
+      }
+      _optionCourse(params).then(res => {
+        if (params.page_num > 1) {
+          if (res.data.length < this.page_size) this.noMore = true
+          this.list = this.list.concat(res.data)
+        } else {
+          this.noMore = false
+          this.list = res.data
+          if (this.list && this.list.length > 0) {
+            this.grade_now = this.list[0].grade_now
+          }
+        }
+        // 初始化加载过滤项
+        if (init) this.loadFilter()
+      })
+    },
+    goGift() {
+      this.globalNavigateTo('classGift', { package_id: 0 })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import '~@/common/css/mixin.scss';
+.page{
+ height:100vh;
+}
+.scroll-main{
+	margin-top:54px;
+}
+.header{
+	position:fixed;
+	height:54px;
+	left:0;
+	right:0;
+	z-index:999;
+	padding:20rpx;
+	background:#fff;
+	&-box{
+		align-items: center;
+	}
+	&-search{
+		margin-left:60rpx;
+		align-items: center;
+		&-input{
+			background: #ededed;
+    	border-radius: 999em;
+			padding-left:30rpx;
+      line-height:32px;
+			height:32px;
+    	font-size: 14px;
+		}
+		&-icon{
+			margin:0 30rpx;
+			line-height:32px;
+			font-size:24px;
+		}
+	}
+}
+.main{
+	padding:20rpx;
+
+}
+.main-title{
+  font-size: 12px;
+  margin-bottom: 10px;
+  color: #999;
+}
+.search-box{
+	margin-left:20rpx;
+}
+.course-item{
+  border-radius: 10px;
+  color: #fff;
+}
+.recommend{
+	&-title{
+		@include title(10px,18px);
+	}
+	&-filter{
+		.filter-item{
+			position:relative;
+		}
+	}
+	.sort-icon{
+		margin-left:6rpx;
+		width:15rpx;
+	}
+}
+.btn-check-group {
+  checkbox {
+    display: none;
+  }
+	radio{
+		display:none;
+	}
+  label {
+    display: inline-block;
+		margin-right:10rpx;
+    position: relative;
+		padding:0 20rpx;
+    line-height: 30px;
+    border-radius: 100rpx;
+    flex-wrap: nowrap;
+    border: 1px solid #eee;
+  }
+}
+.filter-title{
+	padding-left:30rpx;
+	margin-top:10px;
+	text-align:left;
+	@include title(0,14px)
+}
+.check-course{
+	width:100%;
+}
+.cu-modal.drawer-modal .cu-dialog{
+	min-width:300rpx;
+}
+.cu-card>.cu-item{
+	margin:10rpx;
+}
+</style>

src/pages/login/index.vue

@@ -1,121 +1,121 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="false" :isHome="true">
-		</cu-custom>
-		<view class="main">
-			<image src="/static/imgs/login.png" class="logo"></image>
-			<view class="title">课后百科</view>
-			<view class="action margin-top-xl">
-						<view class="des margin-top">您尚未登录需要获取您的授权后进入</view>
-			      <button class="cu-btn block round bg-grey lg margin-top" @tap="back">暂不登录</button>
-			      <button class="cu-btn block round bg-cyan lg margin-top" @tap="login">立即登录</button>
-			</view>
-			<view class="agreement margin-top-lg">
-				<checkbox-group @change="agreement=!agreement" style="display:inline-block;">
-					<label>
-							<checkbox class="cyan check-agreement"></checkbox>
-							<text class="text">阅读并同意以下条款</text>
-					</label>
-        </checkbox-group>
-				<text class="text-cyan"  @tap="goto('user')">《用户协议》</text>
-				<text class="text-cyan" @tap="goto('privacy')">《隐私政策》</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _login, _auth } from '@/api/auth'
-import socket from '@/common/webSocket'
-export default {
-  data() {
-    return {
-      agreement: false,
-      wxCode: ''
-    }
-  },
-  onLoad(options) {
-    uni.login({
-      success: wxres => {
-        this.wxCode = wxres.code
-      }
-    })
-  },
-  methods: {
-    back() {
-      uni.navigateBack({
-        delta: 0
-      })
-    },
-    goto(type) {
-      this.globalNavigateTo('agreement', { type })
-    },
-    login() {
-      if (!this.agreement) {
-        uni.showToast({ title: '请先阅读并勾选协议', icon: 'none' })
-        return
-      }
-      uni.getUserProfile({
-        desc: '用于完善会员资料',
-        success: res => {
-          this.$store.dispatch('setUser', res.userInfo)
-          this.flashToken(res)
-        }
-      })
-    },
-    flashToken(wxConfig) {
-      _login({ code: this.wxCode }).then(res => {
-        const { openid, session_key: session } = res.data
-        this.$store.dispatch('setSession', session)
-        const params = {
-          session: session,
-          iv: wxConfig.iv,
-          encryptedData: wxConfig.encryptedData,
-          openid: openid,
-          code: this.globalApp.code
-        }
-        _auth(params).then(rs => {
-          this.$store.dispatch('setToken', rs.data.token).then(res => {
-            socket.initSocket()
-            this.globalReLaunch('index')
-          })
-        })
-      })
-    },
-    getUserProfile(v) {
-      console.log(v)
-    },
-    getAgreement() {
-
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/common/css/mixin.scss';
-.page{
-	background-color:#fff;
-}
-.main{
-	padding-top:50px;
-	text-align:center;
-}
-.title {
-	margin:12px auto;
-  @include title(32px, 20px);
-	width:80px;
-	border-bottom:4px solid #00d2e330;
-}
-.logo{
-	width:100px;
-	height:100px;
-}
-.action{
-	margin:0 auto;
-	width:80%;
-}
-.check-agreement{
-	transform: scale(0.7);
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="false" :isHome="true">
+		</cu-custom>
+		<view class="main">
+			<image src="/static/imgs/login.png" class="logo"></image>
+			<view class="title">课后百科</view>
+			<view class="action margin-top-xl">
+						<view class="des margin-top">您尚未登录需要获取您的授权后进入</view>
+			      <button class="cu-btn block round bg-grey lg margin-top" @tap="back">暂不登录</button>
+			      <button class="cu-btn block round bg-cyan lg margin-top" @tap="login">立即登录</button>
+			</view>
+			<view class="agreement margin-top-lg">
+				<checkbox-group @change="agreement=!agreement" style="display:inline-block;">
+					<label>
+							<checkbox class="cyan check-agreement"></checkbox>
+							<text class="text">阅读并同意以下条款</text>
+					</label>
+        </checkbox-group>
+				<text class="text-cyan"  @tap="goto('user')">《用户协议》</text>
+				<text class="text-cyan" @tap="goto('privacy')">《隐私政策》</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { _login, _auth, _getBindPhone } from '@/api/auth'
+import socket from '@/common/webSocket'
+export default {
+  data() {
+    return {
+      agreement: false,
+      wxCode: ''
+    }
+  },
+  onLoad(options) {
+    uni.login({
+      success: wxres => {
+        this.wxCode = wxres.code
+      }
+    })
+  },
+  methods: {
+    back() {
+      uni.navigateBack({
+        delta: 0
+      })
+    },
+    goto(type) {
+      this.globalNavigateTo('agreement', { type })
+    },
+    login() {
+      if (!this.agreement) {
+        uni.showToast({ title: '请先阅读并勾选协议', icon: 'none' })
+        return
+      }
+      uni.getUserProfile({
+        desc: '用于完善会员资料',
+        success: res => {
+          this.$store.dispatch('setUser', res.userInfo)
+          this.flashToken(res)
+        }
+      })
+    },
+    flashToken(wxConfig) {
+      _login({ code: this.wxCode }).then(res => {
+        const { openid, session_key: session } = res.data
+        this.$store.dispatch('setSession', session)
+        const params = {
+          session: session,
+          iv: wxConfig.iv,
+          encryptedData: wxConfig.encryptedData,
+          openid: openid,
+          code: this.globalApp.code
+        }
+        _auth(params).then(rs => {
+          this.$store.dispatch('setToken', rs.data.token).then(res => {
+            socket.initSocket()
+            this.getBindPhone()
+            this.globalReLaunch('index')
+          })
+        })
+      })
+    },
+    getBindPhone() {
+      _getBindPhone().then(res => {
+        this.$store.dispatch('setPhone', res.data.mobile)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/common/css/mixin.scss';
+.page{
+	background-color:#fff;
+}
+.main{
+	padding-top:50px;
+	text-align:center;
+}
+.title {
+	margin:12px auto;
+  @include title(32px, 20px);
+	width:80px;
+	border-bottom:4px solid #00d2e330;
+}
+.logo{
+	width:100px;
+	height:100px;
+}
+.action{
+	margin:0 auto;
+	width:80%;
+}
+.check-agreement{
+	transform: scale(0.7);
+}
+</style>

src/pages/mine/mine.vue

@@ -1,330 +1,330 @@
-<template>
-  <view>
-    <cu-custom :isBack="false"></cu-custom>
-    <view class="main">
-			<view class="main-top">
-				<view class="title flex justify-between">
-					<view>{{user.nickName||'未更新用户信息'}}</view>
-					<text class="cuIcon-settings lg text-gray" @tap="goto('setting')"></text>
-				</view>
-			<view class="user">
-			 <view class="user-info flex">
-				 		<image mode="scaleToFill" :src="user.avatarUrl||defaultAvatar" class="avatar"></image>
-						<view class="study-info">
-							  <view class="user-name" @tap="switchStudent">
-									{{ kid_info.name ? kid_info.name + '-' + kid_info.school_name  : '切换学生' }}
-									<!-- <image :src="isLogin?switchIcon:loginIcon" mode="aspectFit" class="switch-icon"></image> -->
-									<text class="iconfont margin-left-xs" style="font-size:18px;" @tap="login">{{isLogin?'&#xe600;':'&#xe716;'}}</text>
-								</view>
-								 <view class="user-learn">已学习{{info.parent_data.learn_day}}天</view>
-						</view>
-			 </view>
-			 <view class="user-relative flex justify-between" v-if="isLogin">
-				  <view v-for="(relate,index) in courseRelates" :key="index" class="course-item" :style="'background:'+relate.background"
-					@tap="goto(relate.page)">
-						 <!-- <image :src="relate.img"  mode="widthFix" class="back-img relate-img"> -->
-						 <text class="iconfont back-img" style="font-size:32px;">{{relate.icon}}</text>
-						 <view class="text-df">{{relate.name}}</view>
-					</view>
-			 </view>
-			 <view class="user-relative flex justify-between" v-else>
-				  <view class="course-item relate-item" v-for="(course,index) in courses" :key="index" :style="'background:'+course.background">
-						<!-- <image :src="course.img" mode="widthFix" class="back-img"> -->
-						<text class="iconfont back-img" style="font-size:40px;">{{course.icon}}</text>
-						<view class="text-lg">{{course.title}}</view>
-						<view class="text-xxl margin-top-xs">{{course.name}}</view>
-					</view>
-			 </view>
-			</view>
-			<view class="order">
-				 <view class="order-title solid-bottom">我的订单</view>
-				 <view class="order-info flex justify-between">
-					  <view v-for="(order,index) in menuList" :key="index" @tap="toOrder(index)">
-							  <view class="order-image">
-									<!-- <image :src="order.img" mode="aspectFill"></image> -->
-									<text class="iconfont text-student" style="font-size:32px;">{{order.icon}}</text>
-								</view>
-							  {{order.title}}
-							</view>
-				 </view>
-			</view>
-			</view>
-			<view class="margin cu-list box-shadow menu margin-top-lg bg-white">
-				<view class="cu-item arrow" @tap="goto('classCart')">
-					<text class="cuIcon-cart lg text-gray" style="font-size:18px;"></text>
-        	<view class="content margin-left-sm">
-          	<text class="text-black">购物车</text>
-        	</view>
-          <view class="action"></view>
-        </view>
-				<view class="cu-item arrow" @tap="goto('message')">
-        	<text class="cuIcon-message lg text-gray" style="font-size:18px;"></text>
-        	<view class="content margin-left-sm">
-          	<text class="text-black">消息中心</text>
-        	</view>
-          <view class="action"></view>
-        </view>
-			  <view class="cu-item arrow" @tap="goto('onlineService')">
-					<text class="iconfont text-gray" style="font-size:18px;">&#xe726;</text>
-        	<view class="content margin-left-sm">
-          	<text class="text-black">在线客服</text>
-        	</view>
-        </view>
-			</view>
-    </view>
-    <mp-tabbar :outerSelected="2" />
-   <view class="cu-modal drawer-modal justify-start" :class="modalName=='showStudent'?'show':''" @tap="hideModal">
-      <view class="cu-dialog basis-lg" @tap.stop=""
-        :style="[{top:topHeader+'px',height:'calc(100vh - ' + topHeader + 'px)'}]">
-        <view class="student-list padding-left">
-          <view class="student margin-top-sm" v-for="(student,index) in students" :key="index" @tap="chooseKid(student.id)">
-						 <view class="flex align-center">
-								 <image mode="scaleToFill" :src="defaultAvatar" class="avatar md"></image>
-								<view class="margin-left-sm">{{student.name}}</view>
-								<text class="cuIcon-check text-student margin-left" style="font-size:22px;" v-if="kid===student.id"></text>
-						 </view>
-						 <view class="flex">
-							 <view class="cu-tag line-green margin-top-xs">
-								{{student.school_name ? student.school_name : ''}}-{{student.grade_name}}-{{student.class_name}}
-								</view>
-						 </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { _getStudents, _getUserInfo } from '@/api/auth'
-export default {
-  data () {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      info: {},
-      modalName: null,
-      students: [],
-      kid_info: {}, // 当前学生
-      menuList: [
-        {
-          title: '全部订单',
-          img: '/static/imgs/mine/qbdd.png',
-          icon: '\ue897'
-        },
-        {
-          title: '待付款',
-          img: '/static/imgs/mine/dfk.png',
-          icon: '\ue896'
-        },
-        {
-          title: '已付款',
-          img: '/static/imgs/mine/yfk.png',
-          icon: '\ue656'
-        },
-        {
-          title: '退课售后',
-          img: '/static/imgs/mine/tksh.png',
-          icon: '\ue61e'
-        }
-      ],
-      courses: [
-        {
-          title: '启蒙教育',
-          name: '我的机构',
-          img: '/static/imgs/mine/wdjg.png',
-          background: '#f8be32',
-          icon: '\ue661'
-        },
-        {
-          title: '启蒙教育',
-          name: '我的老师',
-          img: '/static/imgs/mine/wdls.png',
-          background: '#67d2a9',
-          icon: '\ue603'
-        }
-      ],
-      courseRelates: [
-        {
-          name: '我的学生',
-          img: '/static/imgs/mine/wdjhr.png',
-          background: '#5FCFE0',
-          page: 'myStudents',
-          icon: '\ue604'
-        },
-        {
-          name: '我的监护人',
-          img: '/static/imgs/mine/wdjhr.png',
-          background: '#f8be32',
-          page: 'myParents',
-          icon: '\ue60a'
-        },
-        {
-          name: '我的老师',
-          img: '/static/imgs/mine/wdjg.png',
-          background: '#67d2a9',
-          page: 'myTeachers',
-          icon: '\ue603'
-        },
-        {
-          name: '我的机构',
-          img: '/static/imgs/mine/wdls.png',
-          background: '#FF676E',
-          page: 'myInstitution',
-          icon: '\ue661'
-        }
-      ],
-      loginIcon: '/static/imgs/mine/login.png',
-      switchIcon: '/static/imgs/mine/login1.png',
-      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
-    }
-  },
-  computed: {
-    ...mapGetters({
-      user: 'user',
-      isLogin: 'token',
-      kid: 'kid'
-    })
-  },
-  onShow() {
-    this.get_info()
-  },
-  methods: {
-    login() {
-      if (this.isLogin) return false
-      this.globalNavigateTo('login')
-    },
-    get_info() {
-      _getUserInfo().then(res => {
-        this.info = res.data
-        this.get_students()
-      })
-    },
-    get_students() {
-      _getStudents().then(res => {
-        if (res.data.length < 1) {
-          this.globalNavigateTo('myStudents')
-          return false
-        }
-        this.students = res.data.student_data
-        let kid = this.kid
-        if (!kid) {
-          kid = this.students[0].id
-          this.$store.dispatch('setKid', this.students[0].id)
-        }
-        this.setkidInfo(kid)
-      })
-    },
-    hideModal (e) {
-      this.modalName = null
-    },
-    setkidInfo(kid) { // 设置学生信息
-      this.kid_info = this.students.find(item => item.id === kid)
-    },
-    switchStudent() {
-      if (!this.isLogin) {
-        this.globalNavigateTo('login')
-      } else {
-        this.modalName = 'showStudent'
-      }
-    },
-    goto(page) {
-      if (!this.isLogin) {
-        this.globalNavigateTo('login')
-      } else {
-        this.globalNavigateTo(page)
-      }
-    },
-    toOrder(index) {
-      this.globalNavigateTo('order', { type: index })
-    },
-    chooseKid(id) {
-      uni.showModal({
-        title: '',
-        content: '确定选择该学生?',
-        success: res => {
-          if (res.confirm) {
-            this.$store.dispatch('setKid', id).then(res => {
-              this.setkidInfo(res)
-              this.hideModal()
-            })
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import '~@/common/css/mixin.scss';
-.title{
-	@include title(10px,22px);
-}
-.main{
-	padding-top:10px;
-}
-.main-top{
-	padding:0 30rpx;
-}
-.user{
-
-}
-.user-info{
-	margin-bottom:10px;
-}
-.study-info{
-	margin-left:40rpx;
-	padding-top:6px;
-}
-.user-name{
-	@include title(10px,16px);
-}
-.user-learn{
-	margin-top:20px;
-}
-.user-relative{
-	width:100%;
-}
-.course-item{
-	position:relative;
-	border-radius:10px;
-	padding:16rpx;
-	width:24%;
-	min-height:52px;
-	color:#fff;
-}
-.course-item.relate-item{
-	width:48%;
-}
-.back-img{
-	position:absolute;
-	bottom:8px;
-	right:6px;
-	opacity: .4;
-}
-.order{
-	margin-top:10px;
-}
-.order-info{
-	padding:0 30rpx;
-}
-.order-image{
-	margin:10rpx auto;
-	width:30px;
-	height:30px;
-	image{
-		width:100%;
-		height:100%;
-	}
-}
-.order-title{
-	padding-bottom:10px;
-	@include title(10px,16px);
-}
-.switch-icon{
-	margin-left:10rpx;
-	width:1em;
-	height:1em;
-}
-</style>
+<template>
+  <view>
+    <cu-custom :isBack="false"></cu-custom>
+    <view class="main">
+			<view class="main-top">
+				<view class="title flex justify-between">
+					<view>{{user.nickName||'未更新用户信息'}}</view>
+					<text class="cuIcon-settings lg text-gray" @tap="goto('setting')"></text>
+				</view>
+			<view class="user">
+			 <view class="user-info flex">
+				 		<image mode="scaleToFill" :src="user.avatarUrl||defaultAvatar" class="avatar"></image>
+						<view class="study-info">
+							  <view class="user-name" @tap="switchStudent">
+									{{ kid_info.name ? kid_info.name + '-' + kid_info.school_name  : '切换学生' }}
+									<!-- <image :src="isLogin?switchIcon:loginIcon" mode="aspectFit" class="switch-icon"></image> -->
+									<text class="iconfont margin-left-xs" style="font-size:18px;" @tap="login">{{isLogin?'&#xe600;':'&#xe716;'}}</text>
+								</view>
+								 <view class="user-learn">已学习{{info.parent_data.learn_day}}天</view>
+						</view>
+			 </view>
+			 <view class="user-relative flex justify-between" v-if="isLogin">
+				  <view v-for="(relate,index) in courseRelates" :key="index" class="course-item" :style="'background:'+relate.background"
+					@tap="goto(relate.page)">
+						 <!-- <image :src="relate.img"  mode="widthFix" class="back-img relate-img"> -->
+						 <text class="iconfont back-img" style="font-size:32px;">{{relate.icon}}</text>
+						 <view class="text-df">{{relate.name}}</view>
+					</view>
+			 </view>
+			 <view class="user-relative flex justify-between" v-else>
+				  <view class="course-item relate-item" v-for="(course,index) in courses" :key="index" :style="'background:'+course.background">
+						<!-- <image :src="course.img" mode="widthFix" class="back-img"> -->
+						<text class="iconfont back-img" style="font-size:40px;">{{course.icon}}</text>
+						<view class="text-lg">{{course.title}}</view>
+						<view class="text-xxl margin-top-xs">{{course.name}}</view>
+					</view>
+			 </view>
+			</view>
+			<view class="order">
+				 <view class="order-title solid-bottom">我的订单</view>
+				 <view class="order-info flex justify-between">
+					  <view v-for="(order,index) in menuList" :key="index" @tap="toOrder(index)">
+							  <view class="order-image">
+									<!-- <image :src="order.img" mode="aspectFill"></image> -->
+									<text class="iconfont text-student" style="font-size:32px;">{{order.icon}}</text>
+								</view>
+							  {{order.title}}
+							</view>
+				 </view>
+			</view>
+			</view>
+			<view class="margin cu-list box-shadow menu margin-top-lg bg-white">
+				<view class="cu-item arrow" @tap="goto('classCart')">
+					<text class="cuIcon-cart lg text-gray" style="font-size:18px;"></text>
+        	<view class="content margin-left-sm">
+          	<text class="text-black">购物车</text>
+        	</view>
+          <view class="action"></view>
+        </view>
+				<view class="cu-item arrow" @tap="goto('message')">
+        	<text class="cuIcon-message lg text-gray" style="font-size:18px;"></text>
+        	<view class="content margin-left-sm">
+          	<text class="text-black">消息中心</text>
+        	</view>
+          <view class="action"></view>
+        </view>
+			  <view class="cu-item arrow" @tap="goto('onlineService')">
+					<text class="iconfont text-gray" style="font-size:18px;">&#xe726;</text>
+        	<view class="content margin-left-sm">
+          	<text class="text-black">在线客服</text>
+        	</view>
+        </view>
+			</view>
+    </view>
+    <mp-tabbar :outerSelected="2" />
+   <view class="cu-modal drawer-modal justify-start" :class="modalName=='showStudent'?'show':''" @tap="hideModal">
+      <scroll-view :scroll-y="true" class="cu-dialog basis-lg" @tap.stop=""
+        :style="[{top:topHeader+'px',height:'calc(100vh - 48px - ' + topHeader + 'px)'}]">
+        <view class="student-list padding-left">
+          <view class="student margin-top-sm" v-for="(student,index) in students" :key="index" @tap="chooseKid(student.id)">
+						 <view class="flex align-center">
+								<image mode="scaleToFill" :src="defaultAvatar" class="avatar md"></image>
+								<view class="margin-left-sm">{{student.name}}</view>
+								<text class="cuIcon-check text-student margin-left" style="font-size:22px;" v-if="kid===student.id"></text>
+						 </view>
+						 <view class="flex">
+							 <view class="cu-tag line-green margin-top-xs">
+								{{student.school_name ? student.school_name : ''}}-{{student.grade_name}}-{{student.class_name}}
+								</view>
+						 </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { _getStudents, _getUserInfo } from '@/api/auth'
+export default {
+  data () {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      info: {},
+      modalName: null,
+      students: [],
+      kid_info: {}, // 当前学生
+      menuList: [
+        {
+          title: '全部订单',
+          img: '/static/imgs/mine/qbdd.png',
+          icon: '\ue897'
+        },
+        {
+          title: '待付款',
+          img: '/static/imgs/mine/dfk.png',
+          icon: '\ue896'
+        },
+        {
+          title: '已付款',
+          img: '/static/imgs/mine/yfk.png',
+          icon: '\ue656'
+        },
+        {
+          title: '退课售后',
+          img: '/static/imgs/mine/tksh.png',
+          icon: '\ue61e'
+        }
+      ],
+      courses: [
+        {
+          title: '启蒙教育',
+          name: '我的机构',
+          img: '/static/imgs/mine/wdjg.png',
+          background: '#f8be32',
+          icon: '\ue661'
+        },
+        {
+          title: '启蒙教育',
+          name: '我的老师',
+          img: '/static/imgs/mine/wdls.png',
+          background: '#67d2a9',
+          icon: '\ue603'
+        }
+      ],
+      courseRelates: [
+        {
+          name: '我的学生',
+          img: '/static/imgs/mine/wdjhr.png',
+          background: '#5FCFE0',
+          page: 'myStudents',
+          icon: '\ue604'
+        },
+        {
+          name: '我的监护人',
+          img: '/static/imgs/mine/wdjhr.png',
+          background: '#f8be32',
+          page: 'myParents',
+          icon: '\ue60a'
+        },
+        {
+          name: '我的老师',
+          img: '/static/imgs/mine/wdjg.png',
+          background: '#67d2a9',
+          page: 'myTeachers',
+          icon: '\ue603'
+        },
+        {
+          name: '我的机构',
+          img: '/static/imgs/mine/wdls.png',
+          background: '#FF676E',
+          page: 'myInstitution',
+          icon: '\ue661'
+        }
+      ],
+      loginIcon: '/static/imgs/mine/login.png',
+      switchIcon: '/static/imgs/mine/login1.png',
+      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
+    }
+  },
+  computed: {
+    ...mapGetters({
+      user: 'user',
+      isLogin: 'token',
+      kid: 'kid'
+    })
+  },
+  onShow() {
+    this.get_info()
+  },
+  methods: {
+    login() {
+      if (this.isLogin) return false
+      this.globalNavigateTo('login')
+    },
+    get_info() {
+      _getUserInfo().then(res => {
+        this.info = res.data
+        this.get_students()
+      })
+    },
+    get_students() {
+      _getStudents().then(res => {
+        if (res.data.length < 1) {
+          this.globalNavigateTo('myStudents')
+          return false
+        }
+        this.students = res.data.student_data
+        let kid = this.kid
+        if (!kid) {
+          kid = this.students[0].id
+          this.$store.dispatch('setKid', this.students[0].id)
+        }
+        this.setkidInfo(kid)
+      })
+    },
+    hideModal (e) {
+      this.modalName = null
+    },
+    setkidInfo(kid) { // 设置学生信息
+      this.kid_info = this.students.find(item => item.id === kid)
+    },
+    switchStudent() {
+      if (!this.isLogin) {
+        this.globalNavigateTo('login')
+      } else {
+        this.modalName = 'showStudent'
+      }
+    },
+    goto(page) {
+      if (!this.isLogin) {
+        this.globalNavigateTo('login')
+      } else {
+        this.globalNavigateTo(page)
+      }
+    },
+    toOrder(index) {
+      this.globalNavigateTo('order', { type: index })
+    },
+    chooseKid(id) {
+      uni.showModal({
+        title: '',
+        content: '确定选择该学生?',
+        success: res => {
+          if (res.confirm) {
+            this.$store.dispatch('setKid', id).then(res => {
+              this.setkidInfo(res)
+              this.hideModal()
+            })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import '~@/common/css/mixin.scss';
+.title{
+	@include title(10px,22px);
+}
+.main{
+	padding-top:10px;
+}
+.main-top{
+	padding:0 30rpx;
+}
+.user{
+
+}
+.user-info{
+	margin-bottom:10px;
+}
+.study-info{
+	margin-left:40rpx;
+	padding-top:6px;
+}
+.user-name{
+	@include title(10px,16px);
+}
+.user-learn{
+	margin-top:20px;
+}
+.user-relative{
+	width:100%;
+}
+.course-item{
+	position:relative;
+	border-radius:10px;
+	padding:16rpx;
+	width:24%;
+	min-height:52px;
+	color:#fff;
+}
+.course-item.relate-item{
+	width:48%;
+}
+.back-img{
+	position:absolute;
+	bottom:8px;
+	right:6px;
+	opacity: .4;
+}
+.order{
+	margin-top:10px;
+}
+.order-info{
+	padding:0 30rpx;
+}
+.order-image{
+	margin:10rpx auto;
+	width:30px;
+	height:30px;
+	image{
+		width:100%;
+		height:100%;
+	}
+}
+.order-title{
+	padding-bottom:10px;
+	@include title(10px,16px);
+}
+.switch-icon{
+	margin-left:10rpx;
+	width:1em;
+	height:1em;
+}
+</style>

src/pages/mine/setting.vue

@@ -1,76 +1,86 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="个人信息">
-		</cu-custom>
-		<view class="cu-list menu  bg-white">
-        <view class="cu-item flex justify-between">
-          <view class="content margin-left-sm">
-						<text class="text-black">头像</text>
-          </view>
-					<image mode="scaleToFill" :src="user.avatarUrl" class="avatar lg" v-if="user.avatarUrl"></image>
-        </view>
-        <view class="cu-item flex justify-between">
-          <view class="content margin-left-sm">
-            <text class="text-black">昵称</text>
-          </view>
-					<view>{{user.nickName}}</view>
-        </view>
-        <view class="cu-item flex justify-between">
-          <view class="content margin-left-sm">
-            <text class="text-black">性别</text>
-          </view>
-          <view>{{user.gender?'女':'男'}}</view>
-        </view>
-        <view class="cu-item arrow" @tap="globalNavigateTo('changePhone')">
-          <view class="content margin-left-sm">
-            <text class="text-black">手机号</text>
-          </view>
-        </view>
-		</view>
-    <view class="solids-bottom bg-white text-center padding text-red margin-top" @tap="logOut">
-        退出登录
-    </view>
-	</view>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-      params: {
-        sex: 1
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user'
-    ])
-  },
-  methods: {
-    logOut() {
-      const _self = this
-      uni.showModal({
-        title: '',
-        content: '确认退出？',
-        success: function (res) {
-          if (res.confirm) {
-            _self.$store.dispatch('clear').then(res => {
-              _self.$nextTick(() => {
-                _self.globalReLaunch('index')
-              })
-            })
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="个人信息">
+		</cu-custom>
+		<view class="cu-list menu  bg-white">
+        <view class="cu-item flex justify-between">
+          <view class="content margin-left-sm">
+						<text class="text-black">头像</text>
+          </view>
+					<image mode="scaleToFill" :src="user.avatarUrl" class="avatar lg" v-if="user.avatarUrl"></image>
+        </view>
+        <view class="cu-item flex justify-between">
+          <view class="content margin-left-sm">
+            <text class="text-black">昵称</text>
+          </view>
+					<view>{{user.nickName}}</view>
+        </view>
+        <view class="cu-item flex justify-between">
+          <view class="content margin-left-sm">
+            <text class="text-black">性别</text>
+          </view>
+          <view>{{user.gender?'女':'男'}}</view>
+        </view>
+        <view class="cu-item" :class="phone?'':'arrow'" @tap="toBind">
+          <view class="content margin-left-sm">
+            <text class="text-black">手机号</text>
+          </view>
+					<view>{{phone|hideIdCard(3,4)}}</view>
+        </view>
+		</view>
+    <view class="solids-bottom bg-white text-center padding text-red margin-top" @tap="logOut">
+        退出登录
+    </view>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { hideIdCard } from '@/common/utils/filter'
+export default {
+  data() {
+    return {
+      params: {
+        sex: 1
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user', 'phone'
+    ])
+  },
+  filters: {
+    hideIdCard
+  },
+  methods: {
+    logOut() {
+      const _self = this
+      uni.showModal({
+        title: '',
+        content: '确认退出？',
+        success: function (res) {
+          if (res.confirm) {
+            _self.$store.dispatch('clear').then(res => {
+              _self.$nextTick(() => {
+                _self.globalReLaunch('index')
+              })
+            })
+          }
+        }
+      })
+    },
+    toBind() {
+      if (!this.phone) {
+        this.globalNavigateTo('bindPhone')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+</style>

src/pages/myStudents/myStudents.vue

@@ -1,298 +1,302 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="false" :isHome="true">
-			 <view slot="content">我的学生</view>
-		</cu-custom>
-		<scroll-view>
-			<view class="cu-card case no-card">
-				<view class="cu-item shadow">
-					<view class="image">
-      			<image src="/static/imgs/mine/img.png" mode="widthFix"></image>
-						 <view class="image-tag">应趣教育 课后百科</view>
-					</view>
-				</view>
-			</view>
-			  <view class="cu-card">
-					 <view class="cu-item shadow">
-						  <view class="students-title flex justify-between align-center">
-								 <view class="text-lg">学生列表</view>
-								 <view class="text-xs text-grey">
-									 <text class="text-red">点击选择，左滑删除，右侧添加</text>
-									 <text class="cuIcon-roundaddfill text-cyan margin-left-xl add-icon"
-									 @tap="showModal" data-target="ChooseModal"
-									 ></text>
-								 </view>
-							</view>
-							<view class="cu-list menu-avatar">
-									<view class="cu-item" :class="moveModel=='move-box-'+ index?'move-cur':''"
-									v-for="(item,index) in result.student_data" :key="index"
-									@touchstart="ListTouchStart" @touchmove="ListTouchMove"
-									@touchend="ListTouchEnd" :data-target="'move-box-' + index"
-									@tap="chooseKid(item.id)">
-									 <image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
-										<view class="content">
-											<view>{{item.name}}</view>
-											<view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
-										</view>
-										<view class="action">
-											<text class="cuIcon-check text-student font-check" v-if="item.id===kid"></text>
-										</view>
-										<view class="move student-move">
-											<view class="bg-red" @tap.stop="unbind(item.id)">删除</view>
-										</view>
-									</view>
-							</view>
-					 </view>
-				</view>
-		</scroll-view>
-		<!-- 选择学生列表 -->
-		<view class="cu-modal" :class="modalName=='showStudents'?'show':''" @tap="hideModal">
-			<view class="cu-dialog bg-student" @tap.stop=''>
-				<view class="padding text-left modal-body radius-student">
-					<view class="cu-list menu-avatar">
-							<view class="cu-item"  v-for="(item,index) in chooseList" :key="index" @tap="save(item.id)">
-								<view class="cu-inner" :class="{'checked':item.id===selectKid}">
-									<image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
-									<view class="content">
-											<view>{{item.name}}</view>
-											<view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
-									</view>
-								</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--添加学生-->
-    <view class="cu-modal" :class="modalName=='ChooseModal'?'show':''" @tap="hideModal">
-      <view class="cu-dialog bg-student" @tap.stop=''>
-        <view class="cu-bar justify-around">
-          <view class="content modal-title">添加学生</view>
-        </view>
-        <view class="padding-xl text-left modal-body">
-				  <view>
-            <input type="text"  v-model.trim="student.student_name" placeholder="请输入学生名字" class="student-input text-black text-lg">
-          </view>
-					<view class="margin-top" v-if="student.student_name">
-            <input type="text"  v-model.trim="student.school_name" placeholder="请输入学校名称" class="student-input text-black text-lg">
-          </view>
-					<view class="margin-top">
-						 <button class="student-input text-student text-left" @tap="get_students">获取学生</button>
-					</view>
-        </view>
-        <view class="cu-bar modal-footer">
-          <view class="action"></view>
-        </view>
-      </view>
-    </view>
-	</view>
-</template>
-
-<script>
-import { _getStudents, _bindStudent, _unbindStudent } from '@/api/auth'
-import { _shopList } from '@/api/course'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-      showAdd: false,
-      modalName: null,
-      selectKid: 0,
-      student: {
-        student_name: '',
-        school_name: ''
-      },
-      result: null,
-      chooseList: [],
-      moveModel: null,
-      listTouchStart: 0,
-      listTouchDirection: null,
-      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'kid'
-    ])
-  },
-  onLoad() {
-    this.get_list()
-  },
-  onShow() {
-    const kid = this.kid
-    if (kid) {
-      this.selectKid = kid
-    } else {
-      uni.showModal({
-        title: '请选择学生',
-        content: '请先选择一个学生',
-        showCancel: false,
-        success: res => {
-
-        }
-      })
-    }
-  },
-  methods: {
-    showModal(e) {
-      this.modalName = e.currentTarget.dataset.target
-    },
-    hideModal(e) {
-      this.modalName = null
-    },
-    get_list() {
-      _getStudents().then(res => {
-        this.result = res.data
-      })
-    },
-    get_students() {
-      if (!this.student.student_name) return uni.showToast({ title: '请输入学生姓名', icon: 'none' })
-      if (!this.student.school_name) return uni.showToast({ title: '请输入学校名称', icon: 'none' })
-      _getStudents(this.student).then(res => {
-        const students = res.data.student_data
-        if (students.length > 0) {
-          this.modalName = 'showStudents'
-          this.chooseList = students
-        } else {
-          uni.showToast({ title: '暂无学生信息', icon: 'none' })
-        }
-      })
-    },
-    save(id) {
-      this.selectKid = id
-      uni.showModal({
-        title: '确定绑定？',
-        success: res => {
-          if (res.confirm) {
-            _bindStudent({ student: id }).then(res => {
-              uni.showToast({ title: '绑定成功！' })
-              this.$store.dispatch('setKid', id)
-              this.setCarts()
-              this.get_list()
-              this.modalName = ''
-            })
-          }
-        }
-      })
-    },
-    unbind(id) {
-      const _self = this
-      uni.showModal({
-        title: '确定解绑？',
-        message: '',
-        success: res => {
-          if (res.confirm) {
-            _unbindStudent({ student: id }).then(res => {
-              if (res.code === 1) {
-                uni.showToast({ title: '解绑成功！' })
-                if (_self.kid === id) { _self.$store.dispatch('setKid', 0) }// 解绑选中学生
-                this.get_list()
-              }
-            })
-          }
-        }
-      })
-    },
-    chooseKid(id) {
-      uni.showModal({
-        title: '确定选择学生',
-        message: '确定选择该学生?',
-        success: res => {
-          if (res.confirm) {
-            this.selectKid = id
-            this.$store.dispatch('setKid', id)
-            this.setCarts()
-            this.globalReLaunch('index')
-          }
-        }
-      })
-    },
-    setCarts() { // 刷新购物车
-      _shopList().then(res => {
-        const carts = res.data.map(item => item.class_attend_id)
-        this.$store.dispatch('setCarts', carts)
-      })
-    },
-    ListTouchStart(e) {
-      this.listTouchStart = e.touches[0].pageX
-    },
-    ListTouchMove(e) {
-      this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
-    },
-    ListTouchEnd(e) {
-      if (this.listTouchDirection === 'left') {
-        this.moveModel = e.currentTarget.dataset.target
-      } else {
-        this.moveModel = null
-      }
-      this.listTouchDirection = null
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-.image{
-	padding-bottom:20px;
-}
-.image-tag{
-	position:absolute;
-	top:10px;
-	left:10px;
-	font-size:24px;
-	font-weight:bold;
-	color: #6d4f26;
-}
-.students-title{
-	padding:30rpx;
-}
-.add-icon{
-	display:inline-block;
-	width:40px;
-	height:40px;
-	line-height:40px;
-	text-align:center;
-	font-size:22px;
-}
-.student-input{
-	height:40px;
-	line-height:40px;
-	border-radius:20px;
-	background-color:#fff;
-}
-.radius-student{
-	border-radius:20rpx;
-}
-.cu-inner{
-	margin:10rpx;
-	display:flex;
-	align-items:center;
-	width:100%;
-}
-.cu-inner.checked{
-    background: #5fd0e4;
-    color: #fff;
-    border-radius: 20rpx;
-}
-.cu-dialog{
-	width:90%;
-}
-.modal-title{
-    font-weight: bold;
-    color: #516029;
-    font-size: 20px;
-}
-.font-check{
-	font-size:22px;
-}
-.cu-list>.cu-item .move.student-move{
-	width:130rpx;
-	text-align:center;
-}
-.cu-list>.cu-item.move-cur{
-	transform: translateX(-130rpx);
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="false" :isHome="true">
+			 <view slot="content">我的学生</view>
+		</cu-custom>
+		<scroll-view>
+			<view class="cu-card case no-card">
+				<view class="cu-item shadow">
+					<view class="image">
+      			<image src="/static/imgs/mine/img.png" mode="widthFix"></image>
+						 <view class="image-tag">应趣教育 课后百科</view>
+					</view>
+				</view>
+			</view>
+			  <view class="cu-card">
+					 <view class="cu-item shadow">
+						  <view class="students-title flex justify-between align-center">
+								 <view class="text-lg">学生列表</view>
+								 <view class="text-xs text-grey">
+									 <text class="text-red">点击选择，左滑删除，右侧添加</text>
+									 <text class="cuIcon-roundaddfill text-cyan margin-left-xl add-icon"
+									 @tap="showModal" data-target="ChooseModal"
+									 ></text>
+								 </view>
+							</view>
+							<view class="padding-lr text-right" v-if="!phone">
+								  <text class="text-red text-xs">右侧点击绑定手机号，直接获取绑定学生列表</text>
+									<text class="cuIcon-mobile text-cyan add-icon margin-left-xl" @tap="globalNavigateTo('bindPhone')"></text>
+							</view>
+							<view class="cu-list menu-avatar">
+									<view class="cu-item" :class="moveModel=='move-box-'+ index?'move-cur':''"
+									v-for="(item,index) in result.student_data" :key="index"
+									@touchstart="ListTouchStart" @touchmove="ListTouchMove"
+									@touchend="ListTouchEnd" :data-target="'move-box-' + index"
+									@tap="chooseKid(item.id)">
+									 <image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
+										<view class="content">
+											<view>{{item.name}}</view>
+											<view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
+										</view>
+										<view class="action">
+											<text class="cuIcon-check text-student font-check" v-if="item.id===kid"></text>
+										</view>
+										<view class="move student-move">
+											<view class="bg-red" @tap.stop="unbind(item.id)">删除</view>
+										</view>
+									</view>
+							</view>
+					 </view>
+				</view>
+		</scroll-view>
+		<!-- 选择学生列表 -->
+		<view class="cu-modal" :class="modalName=='showStudents'?'show':''" @tap="hideModal">
+			<view class="cu-dialog bg-student" @tap.stop=''>
+				<view class="padding text-left modal-body radius-student">
+					<view class="cu-list menu-avatar">
+							<view class="cu-item"  v-for="(item,index) in chooseList" :key="index" @tap="save(item.id)">
+								<view class="cu-inner" :class="{'checked':item.id===selectKid}">
+									<image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
+									<view class="content">
+											<view>{{item.name}}</view>
+											<view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
+									</view>
+								</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!--添加学生-->
+    <view class="cu-modal" :class="modalName=='ChooseModal'?'show':''" @tap="hideModal">
+      <view class="cu-dialog bg-student" @tap.stop=''>
+        <view class="cu-bar justify-around">
+          <view class="content modal-title">添加学生</view>
+        </view>
+        <view class="padding-xl text-left modal-body">
+				  <view>
+            <input type="text"  v-model.trim="student.student_name" placeholder="请输入学生名字" class="student-input text-black text-lg">
+          </view>
+					<view class="margin-top" v-if="student.student_name">
+            <input type="text"  v-model.trim="student.school_name" placeholder="请输入学校名称" class="student-input text-black text-lg">
+          </view>
+					<view class="margin-top">
+						 <button class="student-input text-student text-left" @tap="get_students">获取学生</button>
+					</view>
+        </view>
+        <view class="cu-bar modal-footer">
+          <view class="action"></view>
+        </view>
+      </view>
+    </view>
+	</view>
+</template>
+
+<script>
+import { _getStudents, _bindStudent, _unbindStudent } from '@/api/auth'
+import { _shopList } from '@/api/course'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      showAdd: false,
+      modalName: null,
+      selectKid: 0,
+      student: {
+        student_name: '',
+        school_name: ''
+      },
+      result: null,
+      chooseList: [],
+      moveModel: null,
+      listTouchStart: 0,
+      listTouchDirection: null,
+      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'kid', 'phone'
+    ])
+  },
+  onLoad() {
+  },
+  onShow() {
+    this.get_list()
+    const kid = this.kid
+    if (kid) {
+      this.selectKid = kid
+    } else {
+      uni.showModal({
+        title: '请选择学生',
+        content: '请先选择一个学生',
+        showCancel: false,
+        success: res => {
+
+        }
+      })
+    }
+  },
+  methods: {
+    showModal(e) {
+      this.modalName = e.currentTarget.dataset.target
+    },
+    hideModal(e) {
+      this.modalName = null
+    },
+    get_list() {
+      _getStudents().then(res => {
+        this.result = res.data
+      })
+    },
+    get_students() {
+      if (!this.student.student_name) return uni.showToast({ title: '请输入学生姓名', icon: 'none' })
+      if (!this.student.school_name) return uni.showToast({ title: '请输入学校名称', icon: 'none' })
+      _getStudents(this.student).then(res => {
+        const students = res.data.student_data
+        if (students.length > 0) {
+          this.modalName = 'showStudents'
+          this.chooseList = students
+        } else {
+          uni.showToast({ title: '暂无学生信息', icon: 'none' })
+        }
+      })
+    },
+    save(id) {
+      this.selectKid = id
+      uni.showModal({
+        title: '确定绑定？',
+        success: res => {
+          if (res.confirm) {
+            _bindStudent({ student: id }).then(res => {
+              uni.showToast({ title: '绑定成功！' })
+              this.$store.dispatch('setKid', id)
+              this.setCarts()
+              this.get_list()
+              this.modalName = ''
+            })
+          }
+        }
+      })
+    },
+    unbind(id) {
+      const _self = this
+      uni.showModal({
+        title: '确定解绑？',
+        message: '',
+        success: res => {
+          if (res.confirm) {
+            _unbindStudent({ student: id }).then(res => {
+              if (res.code === 1) {
+                uni.showToast({ title: '解绑成功！' })
+                if (_self.kid === id) { _self.$store.dispatch('setKid', 0) }// 解绑选中学生
+                this.get_list()
+              }
+            })
+          }
+        }
+      })
+    },
+    chooseKid(id) {
+      uni.showModal({
+        title: '确定选择学生',
+        message: '确定选择该学生?',
+        success: res => {
+          if (res.confirm) {
+            this.selectKid = id
+            this.$store.dispatch('setKid', id)
+            this.setCarts()
+            this.globalReLaunch('index')
+          }
+        }
+      })
+    },
+    setCarts() { // 刷新购物车
+      _shopList().then(res => {
+        const carts = res.data.map(item => item.class_attend_id)
+        this.$store.dispatch('setCarts', carts)
+      })
+    },
+    ListTouchStart(e) {
+      this.listTouchStart = e.touches[0].pageX
+    },
+    ListTouchMove(e) {
+      this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
+    },
+    ListTouchEnd(e) {
+      if (this.listTouchDirection === 'left') {
+        this.moveModel = e.currentTarget.dataset.target
+      } else {
+        this.moveModel = null
+      }
+      this.listTouchDirection = null
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+.image{
+	padding-bottom:20px;
+}
+.image-tag{
+	position:absolute;
+	top:10px;
+	left:10px;
+	font-size:24px;
+	font-weight:bold;
+	color: #6d4f26;
+}
+.students-title{
+	padding:0 30rpx;
+}
+.add-icon{
+	display:inline-block;
+	width:40px;
+	height:40px;
+	line-height:40px;
+	text-align:center;
+	font-size:22px;
+}
+.student-input{
+	height:40px;
+	line-height:40px;
+	border-radius:20px;
+	background-color:#fff;
+}
+.radius-student{
+	border-radius:20rpx;
+}
+.cu-inner{
+	margin:10rpx;
+	display:flex;
+	align-items:center;
+	width:100%;
+}
+.cu-inner.checked{
+    background: #5fd0e4;
+    color: #fff;
+    border-radius: 20rpx;
+}
+.cu-dialog{
+	width:90%;
+}
+.modal-title{
+    font-weight: bold;
+    color: #516029;
+    font-size: 20px;
+}
+.font-check{
+	font-size:22px;
+}
+.cu-list>.cu-item .move.student-move{
+	width:130rpx;
+	text-align:center;
+}
+.cu-list>.cu-item.move-cur{
+	transform: translateX(-130rpx);
+}
+</style>

src/pages/studentcenter/index.vue

@@ -1,360 +1,366 @@
-<template>
-  <view class="page">
-    <cu-custom :isBack="false"></cu-custom>
-		<view class="header" :style="[{top:topHeader + 'px'}]">
-			<view class="header-title header-switch">
-				<view class="header-title-main" @tap="changeTab('schedule')" :class="{'cur':type==='schedule'}">
-						<view class="margin-bottom-xs">日程表</view>
-						<view class="point"></view>
-				</view>
-				<view class="header-title-main margin-left-lg" @tap="changeTab('mine')" :class="{'cur':type==='mine'}">
-						<view class="margin-bottom-xs">我的</view>
-						<view class="point"></view>
-				</view>
-			</view>
-			 <view style="width:120px;" v-if="type==='mine'">
-				 	<swiper-tab :menuList="menuList" @changeTab="swipe" :activeTab="currentIndex"></swiper-tab>
-			 </view>
-		</view>
-		<!-- 日程表 -->
-		<view v-if="type==='schedule'">
-			<scroll-view scroll-y="true"
-			:style="[{marginTop:'56px',height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
-			 <uni-calendar class="uni-calendar--hook" :selected="info.selected"
-				style="padding-top:100px;"
-				:showMonth="false" @change="changeDay" @monthSwitch="monthSwitch" />
-				<view class="cu-card margin-top-xs padding-xs">
-					<view class="cu-item day-info">
-						<view class="day-title flex justify-between solid-bottom padding text-lg">
-							 <view>应到上课节数：{{present.be_section_num}}节</view>
-							 <view>实际上课节数: {{present.actual_section_num}}节</view>
-						</view>
-						<view class="day-chart flex justify-between padding">
-							<view v-for="(chart,key) in attendance" :key="key" class="flex-sub">
-									<canvas :canvas-id="key" style="margin:0 auto;width:100%;height:80px;"></canvas>
-									<view style="margin-left:18px;">{{chart.title}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="list margin-top-xs">
-					<view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in classList" :key="index">
-						<view class="cu-item" v-for="(mark,i) in item.mark" :key="i">
-							<view class="card-header flex justify-end solid-bottom">
-									<view class="text-student course-status">
-											{{mark.status_desc}}
-									</view>
-							</view>
-							<view class="card flex">
-									<view class="card-left">
-										<img mode="scaleToFill" :src="mark.avatar" alt="" class="card-image">
-									</view>
-									<view class="card-right margin-left-sm">
-										<view class="card-title">{{mark.course_name}}</view>
-										<view class="card-item margin-top-xs" >
-										 	<text class="card-text">{{mark.start_at}}</text>
-									  </view>
-										<view class="card-item margin-top-xs" >
-										 	<text class="card-text">{{mark.end_at}}</text>
-									  </view>
-										<view class="card-item margin-top-xs">
-											<button class="cu-btn round line-cyan button-hover" @tap="classOperation(mark.class_plan_id)">
-												{{mark.status==-1?'查看':'去上课'}}
-											</button>
-											<button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)">去请假</button>
-										</view>
-									</view>
-								</view>
-						</view>
-					</view>
-				</view>
-		  </scroll-view>
-		</view>
-		<!-- 我的 -->
-		<view v-if="type==='mine'">
-			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-main"
-			:style="[{height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
-				<view class="list">
-						<view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in list" :key="index">
-							<view class="cu-item">
-								<view class="card-header flex justify-between solid-bottom">
-									<view v-if="item.day">{{item.day}}</view>
-									<view class="text-student course-status" v-if="item.status">
-											{{item.status}}
-									</view>
-									<view class="text-student course-status" v-if="currentIndex===1">
-											已完结
-									</view>
-								</view>
-								<view class="card flex">
-									<view class="card-left">
-										<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
-									</view>
-									<view class="card-right margin-left-sm">
-										<view class="card-title">{{item.attend_name}}</view>
-										<view class="card-item margin-top-xs" >
-											<text class="card-label">机构：</text>
-										 	<text class="card-text">{{item.agency_name||'-'}}</text>
-									  </view>
-										<view class="card-item margin-top-xs" >
-											<text class="card-label">老师：</text>
-										 	<text class="card-text">{{item.teacher||'-'}}</text>
-									  </view>
-									</view>
-								</view>
-							</view>
-						</view>
-				</view>
-			</scroll-view>
-		</view>
-    <mp-tabbar :outerSelected="1" />
-  </view>
-</template>
-
-<script>
-import NP from 'number-precision'
-import { uniCalendar } from '@dcloudio/uni-ui'
-import { _nowCourse, _courseHistory, _attendance, _dateCourse } from '@/api/course'
-import { getDate } from '@/common/utils'
-import swiperTab from '@/components/swiper-tab.vue'
-export default {
-  components: {
-    uniCalendar, swiperTab
-  },
-  data () {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      type: 'schedule',
-      menuList: ['我的', '历史'],
-      currentIndex: 0,
-      page_num: 1,
-      noMore: false, // 加载判断
-      list: [],
-      classList: [], // 日程表
-      info: { // 日历数据
-        year: '',
-        month: '',
-        day: '',
-        selected: []
-      },
-      present: {
-        absenteeism_num: 0,
-        actual_section_num: 5,
-        be_section_num: 5,
-        late_num: 0,
-        leave_num: 0,
-        normal_num: 0
-      }, // 实际出席情况
-      attendance: { // 出席统计数据
-        leave_num: {
-          title: '请假', times: 2, color: '#9bde78'
-        },
-        late_num: {
-          title: '正常', times: 3, color: '#e0be60'
-        },
-        normal_num: {
-          title: '迟到', times: 1, color: '#61d4e2'
-        },
-        absenteeism_num: {
-          title: '旷课', times: 0, color: '#d697eb'
-        }
-      }
-    }
-  },
-  onShow() {
-    const today = getDate(new Date(), 0)
-    this.info.year = today.year
-    this.info.month = today.month
-    this.info.day = today.date
-    this.init()
-  },
-  methods: {
-    init() {
-      if (this.type === 'mine') {
-        this.get_list()
-      } else {
-        this.get_attend().then(res => {
-          this.present = res.data
-          this.fix_attend(res.data)
-          this.drawChart()
-          this.get_dateCourse()
-        })
-      }
-    },
-    classOperation(id) { // 上课
-      this.globalNavigateTo('studentOperation', { id })
-    },
-    askLeave(id) { // 请假
-      this.globalNavigateTo('studentAbsent', { id })
-    },
-    loadMore() {
-      if (this.noMore) {
-        uni.showToast({ title: '没有更多了', icon: 'none' })
-        return false
-      }
-      this.page_num++
-      this.get_list()
-    },
-    get_list() {
-      if (this.currentIndex === 0) {
-        this.get_course()
-      } else {
-        this.get_history()
-      }
-    },
-    get_course() {
-      _nowCourse({ page_num: this.page_num }).then(res => {
-        if (this.page_num > 1) {
-          if (res.data.length < this.page_size) this.noMore = true
-          this.list = this.list.concat(res.data)
-        } else {
-          this.noMore = false
-          this.list = res.data
-        }
-      })
-    },
-    get_history() {
-      _courseHistory({ page_num: this.page_num }).then(res => {
-        if (this.page_num > 1) {
-          if (res.data.length < this.page_size) this.noMore = true
-          this.list = Object.assign({}, this.list, res.data)
-        } else {
-          this.noMore = false
-          this.list = res.data
-        }
-      })
-    },
-    drawChart() {
-      for (var key in this.attendance) {
-        this.draw(this.attendance[key], key)
-      }
-    },
-    changeTab(type) {
-      this.type = type
-      this.$nextTick(() => {
-        this.init()
-      })
-    },
-    swipe(index) {
-      this.currentIndex = index
-      this.page_num = 1
-      this.get_list()
-    },
-    changeDay(e) {
-      // 模拟动态打卡
-      // if (this.info.selected.length > 5) return
-      // this.info.selected.push({
-      //   date: e.fulldate,
-      //   info: '打卡'
-      // })
-    },
-    monthSwitch(e) {
-      console.log(e)
-    },
-    get_attend() { // 获取出席情况
-      const date = this.info.year + '-' + this.info.month
-      return new Promise((resolve, reject) => {
-        const info = _attendance({ date })
-        resolve(info)
-      })
-    },
-    fix_attend(info) { // 补充出席实际数据
-      Object.keys(this.attendance).forEach(key => {
-        this.attendance[key].times = info[key]
-      })
-    },
-    get_dateCourse() { // 获取对应日期数据
-      _dateCourse({ year: this.info.year, month: this.info.month }).then(res => {
-        this.classList = res.data
-      })
-    },
-    draw (ele, key) {
-      const ctx = uni.createCanvasContext(key)
-      const value = NP.divide(ele.times, this.present.be_section_num) * 100// 次数转化对应百分比值
-      const startAngle = 1.5
-      const endAngle = 1.5 + value * 2 / 100
-      // 画圆环
-      ctx.beginPath()
-      ctx.arc(34, 40, 28, 0, 2 * Math.PI)
-      ctx.setStrokeStyle('#EDEDED') // 弧线的颜色
-      ctx.setLineWidth('8') // 弧的宽度
-      ctx.setLineCap('round') // 线条结束端点样式 butt 平直 round 圆形 square 正方形
-      ctx.stroke()
-      // 画进度条
-      ctx.beginPath()
-      ctx.arc(34, 40, 28, startAngle * Math.PI, endAngle * Math.PI)
-      ctx.setStrokeStyle(ele.color)
-      ctx.setLineWidth('8')
-      ctx.setLineCap('round')
-      ctx.stroke()
-      ctx.setFontSize(14)
-      ctx.setFillStyle('#000') // 文字的颜色
-      ctx.fillText(ele.times + '次', 20, 44)
-      ctx.draw()
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import '~@/common/css/mixin.scss';
-.page{
-	height:100vh;
-}
-.header-switch{
-	justify-content:start;
-	.header-title-main{
-		font-size:18px;
-		color:#999;
-		.point{
-			opacity: 0;
-		}
-		&.cur{
-			transition: font-size .3s;
-			font-size:24px;
-			color:#000;
-			.point{
-				opacity: 1;
-		  }
-		}
-	}
-}
-.day-info{
-
-}
-.scroll-main{
-	margin-top:78px;
-	padding:20rpx;
-}
-.cu-card{
-	.cu-item{
-		margin-top:10rpx;
-		padding:20rpx;
-		margin:0;
-	}
-}
-.card-header{
-	padding-bottom:10px;
-  @include title(10px,18px);
-}
-.card{
-	&-title{
-		font-size:16px;
-	}
-	&-image{
-		width:35vw;
-		height:25vw;
-		border-radius:2vw;
-	}
-	&-label{
-		color:#999;
-	}
-	&-text{
-		color:#333;
-	}
-}
-.course-status{
-	font-size:14px;
-	font-weight:normal;
-}
-</style>
+<template>
+  <view class="page">
+    <cu-custom :isBack="false"></cu-custom>
+		<view class="header" :style="[{top:topHeader + 'px'}]">
+			<view class="header-title header-switch">
+				<view class="header-title-main" @tap="changeTab('schedule')" :class="{'cur':type==='schedule'}">
+						<view class="margin-bottom-xs">日程表</view>
+						<view class="point"></view>
+				</view>
+				<view class="header-title-main margin-left-lg" @tap="changeTab('mine')" :class="{'cur':type==='mine'}">
+						<view class="margin-bottom-xs">我的</view>
+						<view class="point"></view>
+				</view>
+			</view>
+			 <view style="width:120px;" v-if="type==='mine'">
+				 	<swiper-tab :menuList="menuList" @changeTab="swipe" :activeTab="currentIndex"></swiper-tab>
+			 </view>
+		</view>
+		<!-- 日程表 -->
+		<view v-if="type==='schedule'">
+			<scroll-view scroll-y="true"
+			:style="[{marginTop:'56px',height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
+			 <uni-calendar class="uni-calendar--hook" :selected="info.selected"
+				style="padding-top:100px;"
+				:showMonth="false" @change="changeDay" @monthSwitch="monthSwitch" />
+				<view class="cu-card margin-top-xs padding-xs">
+					<view class="cu-item day-info">
+						<view class="day-title flex justify-between solid-bottom padding text-lg">
+							 <view>应到上课节数：{{present.be_section_num}}节</view>
+							 <view>实际上课节数: {{present.actual_section_num}}节</view>
+						</view>
+						<view class="day-chart flex justify-between padding">
+							<view v-for="(chart,key) in attendance" :key="key" class="flex-sub">
+									<canvas :canvas-id="key" style="margin:0 auto;width:100%;height:80px;"></canvas>
+									<view style="margin-left:18px;">{{chart.title}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="list margin-top-xs">
+					<view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in classList" :key="index">
+						<view class="cu-item" v-for="(mark,i) in item.mark" :key="i">
+							<view class="card-header flex justify-end solid-bottom">
+									<view class="text-student course-status">
+											{{mark.status_desc}}
+									</view>
+							</view>
+							<view class="card flex">
+									<view class="card-left">
+										<img mode="scaleToFill" :src="mark.avatar" alt="" class="card-image">
+									</view>
+									<view class="card-right margin-left-sm">
+										<view class="card-title">{{mark.course_name}}</view>
+										<view class="card-item margin-top-xs" >
+										 	<text class="card-text">{{mark.start_at}}</text>
+									  </view>
+										<view class="card-item margin-top-xs" >
+										 	<text class="card-text">{{mark.end_at}}</text>
+									  </view>
+										<view class="card-item margin-top-xs">
+											<button class="cu-btn round line-cyan button-hover" @tap="classOperation(mark.class_plan_id)">
+												{{mark.status==-1?'查看':'去上课'}}
+											</button>
+											<button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)">去请假</button>
+										</view>
+									</view>
+								</view>
+						</view>
+					</view>
+				</view>
+		  </scroll-view>
+		</view>
+		<!-- 我的 -->
+		<view v-if="type==='mine'">
+			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-main"
+			:style="[{height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
+				<view class="list">
+						<view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in list" :key="index">
+							<view class="cu-item">
+								<view class="card-header flex justify-between solid-bottom">
+									<view v-if="item.day">{{item.day}}</view>
+									<view class="text-student course-status" v-if="item.status">
+											{{item.status}}
+									</view>
+									<view class="text-student course-status" v-if="currentIndex===1">
+											已完结
+									</view>
+								</view>
+								<view class="card flex">
+									<view class="card-left">
+										<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
+									</view>
+									<view class="card-right margin-left-sm">
+										<view class="card-title">{{item.attend_name}}</view>
+										<view class="card-item margin-top-xs" >
+											<text class="card-label">机构：</text>
+										 	<text class="card-text">{{item.agency_name||'-'}}</text>
+									  </view>
+										<view class="card-item margin-top-xs" >
+											<text class="card-label">老师：</text>
+										 	<text class="card-text">{{item.teacher||'-'}}</text>
+									  </view>
+									</view>
+								</view>
+							</view>
+						</view>
+				</view>
+			</scroll-view>
+		</view>
+    <mp-tabbar :outerSelected="1" />
+  </view>
+</template>
+
+<script>
+import NP from 'number-precision'
+import { uniCalendar } from '@dcloudio/uni-ui'
+import { _nowCourse, _courseHistory, _attendance, _dateCourse } from '@/api/course'
+import { getDate } from '@/common/utils'
+import swiperTab from '@/components/swiper-tab.vue'
+export default {
+  components: {
+    uniCalendar, swiperTab
+  },
+  data () {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      type: 'schedule',
+      menuList: ['我的', '历史'],
+      currentIndex: 0,
+      page_num: 1,
+      noMore: false, // 加载判断
+      list: [],
+      classList: [], // 日程表
+      info: { // 日历数据
+        year: '',
+        month: '',
+        day: '',
+        selected: []
+      },
+      present: {
+        absenteeism_num: 0,
+        actual_section_num: 5,
+        be_section_num: 5,
+        late_num: 0,
+        leave_num: 0,
+        normal_num: 0
+      }, // 实际出席情况
+      attendance: { // 出席统计数据
+        leave_num: {
+          title: '请假', times: 2, color: '#9bde78'
+        },
+        late_num: {
+          title: '正常', times: 3, color: '#e0be60'
+        },
+        normal_num: {
+          title: '迟到', times: 1, color: '#61d4e2'
+        },
+        absenteeism_num: {
+          title: '旷课', times: 0, color: '#d697eb'
+        }
+      }
+    }
+  },
+  onReady() {
+    const today = getDate(new Date(), 0)
+    this.info.year = today.year
+    this.info.month = today.month
+    this.info.day = today.date
+    this.init()
+  },
+  methods: {
+    init() {
+      if (this.type === 'mine') {
+        this.get_list()
+      } else {
+        this.getSehedule()
+      }
+    },
+    getSehedule() {
+      this.get_attend().then(res => {
+        this.present = res.data
+        this.fix_attend(res.data)
+        this.drawChart()
+        this.get_dateCourse()
+      })
+    },
+    classOperation(id) { // 上课
+      this.globalNavigateTo('studentOperation', { id })
+    },
+    askLeave(id) { // 请假
+      this.globalNavigateTo('studentAbsent', { id })
+    },
+    loadMore() {
+      if (this.noMore) {
+        uni.showToast({ title: '没有更多了', icon: 'none' })
+        return false
+      }
+      this.page_num++
+      this.get_list()
+    },
+    get_list() {
+      if (this.currentIndex === 0) {
+        this.get_course()
+      } else {
+        this.get_history()
+      }
+    },
+    get_course() {
+      _nowCourse({ page_num: this.page_num }).then(res => {
+        if (this.page_num > 1) {
+          if (res.data.length < this.page_size) this.noMore = true
+          this.list = this.list.concat(res.data)
+        } else {
+          this.noMore = false
+          this.list = res.data
+        }
+      })
+    },
+    get_history() {
+      _courseHistory({ page_num: this.page_num }).then(res => {
+        if (this.page_num > 1) {
+          if (res.data.length < this.page_size) this.noMore = true
+          this.list = Object.assign({}, this.list, res.data)
+        } else {
+          this.noMore = false
+          this.list = res.data
+        }
+      })
+    },
+    drawChart() {
+      for (var key in this.attendance) {
+        this.draw(this.attendance[key], key)
+      }
+    },
+    changeTab(type) {
+      this.type = type
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    swipe(index) {
+      this.currentIndex = index
+      this.page_num = 1
+      this.get_list()
+    },
+    changeDay(e) {
+      this.info.day = e.date
+      // 模拟动态打卡
+      // if (this.info.selected.length > 5) return
+      // this.info.selected.push({
+      //   date: e.fulldate,
+      //   info: '打卡'
+      // })
+    },
+    monthSwitch(e) {
+      this.info.year = e.year
+      this.info.month = e.month < 10 ? '0' + e.month : e.month
+      this.getSehedule()
+    },
+    get_attend() { // 获取出席情况
+      const date = this.info.year + '-' + this.info.month
+      return new Promise((resolve, reject) => {
+        const info = _attendance({ date })
+        resolve(info)
+      })
+    },
+    fix_attend(info) { // 补充出席实际数据
+      Object.keys(this.attendance).forEach(key => {
+        this.attendance[key].times = info[key]
+      })
+    },
+    get_dateCourse() { // 获取对应日期数据
+      _dateCourse({ year: this.info.year, month: this.info.month }).then(res => {
+        this.classList = res.data
+      })
+    },
+    draw (ele, key) {
+      const ctx = uni.createCanvasContext(key)
+      const value = NP.divide(ele.times, this.present.be_section_num) * 100// 次数转化对应百分比值
+      const startAngle = 1.5
+      const endAngle = 1.5 + value * 2 / 100
+      // 画圆环
+      ctx.beginPath()
+      ctx.arc(34, 40, 28, 0, 2 * Math.PI)
+      ctx.setStrokeStyle('#EDEDED') // 弧线的颜色
+      ctx.setLineWidth('8') // 弧的宽度
+      ctx.setLineCap('round') // 线条结束端点样式 butt 平直 round 圆形 square 正方形
+      ctx.stroke()
+      // 画进度条
+      ctx.beginPath()
+      ctx.arc(34, 40, 28, startAngle * Math.PI, endAngle * Math.PI)
+      ctx.setStrokeStyle(ele.color)
+      ctx.setLineWidth('8')
+      ctx.setLineCap('round')
+      ctx.stroke()
+      ctx.setFontSize(14)
+      ctx.setFillStyle('#000') // 文字的颜色
+      ctx.fillText(ele.times + '次', 20, 44)
+      ctx.draw()
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import '~@/common/css/mixin.scss';
+.page{
+	height:100vh;
+}
+.header-switch{
+	justify-content:start;
+	.header-title-main{
+		font-size:18px;
+		color:#999;
+		.point{
+			opacity: 0;
+		}
+		&.cur{
+			transition: font-size .3s;
+			font-size:24px;
+			color:#000;
+			.point{
+				opacity: 1;
+		  }
+		}
+	}
+}
+.day-info{
+
+}
+.scroll-main{
+	margin-top:78px;
+	padding:20rpx;
+}
+.cu-card{
+	.cu-item{
+		margin-top:10rpx;
+		padding:20rpx;
+		margin:0;
+	}
+}
+.card-header{
+	padding-bottom:10px;
+  @include title(10px,18px);
+}
+.card{
+	&-title{
+		font-size:16px;
+	}
+	&-image{
+		width:35vw;
+		height:25vw;
+		border-radius:2vw;
+	}
+	&-label{
+		color:#999;
+	}
+	&-text{
+		color:#333;
+	}
+}
+.course-status{
+	font-size:14px;
+	font-weight:normal;
+}
+</style>

src/pages/studentcenter/signIn.vue

@@ -1,200 +1,202 @@
-<template>
-  <view class="page">
-		<cu-custom :isBack="true" title="上课签到"></cu-custom>
-		<view class="header bg-white" 	:style="[{top:topHeader + 'px'}]">
-			<view class="icon_title flex align-center justify-between solid-bottom">
-				<view class="info flex align-center justify-between">
-					 <image mode="scaleToFill" :src="user.avatarUrl" class="avatar lg" v-if="user.avatarUrl"></image>
-			  	 <view class="username">{{user.nickName}}</view>
-				</view>
-				<view style="color:#00D2E3">{{info.status_desc}}</view>
-    	</view>
-			<view class="class_info">
-				<view style="font-size:15px;margin-top: .6rem;">{{info.start_at}}</view>
-				<view class="class_title">{{info.course_name}}</view>
-				<view class="address flex align-center">
-					<image src="/static/imgs/school.png" mode="widthFix" style="width:18px;"/>
-					<view style="margin-left: 10px;margin-right: 20px">{{info.school_name}}</view>
-					<image src="/static/imgs/address.png" mode="widthFix" style="width:14px;"/>
-					<view style="margin-left: 10px">{{info.classroom_name}}</view>
-				</view>
-    	</view>
-		</view>
-		<view class="content">
-			<view class="content_title">签到说明</view>
-    	<view>接到学生后请“点击签到”按钮作为签到</view>
-			<view class="button" :style="checked?'background: #ddd':''"  hover-class="button_hover" @tap="signIn">
-				<view class="text" :style="checked?'color: #aaa':''"> {{checked?'已签到':'点击签到'}}</view>
-				<view class="pulse" v-if="!checked"></view>
-				<view class="pulse1" v-if="!checked"></view>
-    	</view>
-     	<view class="des_title">
-				<view class="line"></view>
-				<view>注意事项</view>
-				<view class="line"></view>
-    	</view>
-			<view>为确保学校每个学生的接送安全，平台特将接送学生的有关的 安全细则及注意事项重申如下，希望相关监护人及学生遵照执 行： </view>
-			<view>1.要遵守校规，按时到校，听从教师的教导。 </view>
-			<view>2.上课要自觉遵守课堂纪律，认真听讲，积极思维，好好学习。</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _getSignIn, _toSignIn } from '@/api/course'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      checked: false,
-      plan_id: '',
-      clock_in_id: '',
-      info: {}
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user'
-    ])
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.plan_id)
-    if (!id) uni.navigateBack()
-    this.plan_id = id
-    this.init()
-  },
-  methods: {
-    init() {
-      _getSignIn({ plan_id: this.plan_id }).then(res => {
-        this.info = res.data.sign_data
-      })
-    },
-    signIn() {
-      _toSignIn({ plan_id: this.plan_id }).then(res => {
-        this.checked = true
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.header{
-  border-radius: 0 0 10px 10px;
-  padding: .8rem;
-  .icon_title{
-    .info{
-      .username{
-        font-size: 21px;
-        margin-left: 15px;
-      }
-    }
-  }
-  .class_info{
-    margin-left: .8rem;
-  }
-  .class_title{
-    font-size: 20px;
-    font-weight: 550;
-    margin-top: .6rem;
-  }
-  .address{
-    display: flex;
-    align-items: center;
-    color: #898E96;
-    font-size: 14px;
-    margin-top: .6rem;
-  }
-}
-.content{
-  margin-top: .8rem;
-  background: #fff;
-  color: #888;
-  padding: 2rem;
-  font-size: 14px;
-  .content_title{
-    font-size: 15px;
-    font-weight: 600;
-    color: #000;
-    margin-bottom: .4rem;
-  }
-  .button{
-    margin: 2rem auto;
-    width: 30vw;
-    height: 30vw;
-    border-radius: 50%;
-    background: #5fcfe0;
-    text-align: center;
-    line-height: 30vw;
-    font-size: 18px;
-    color: #fff;
-    font-weight: 600;
-    position: relative;
-    .text{
-			position: absolute;
-			top: 50%;
-      left: 50%;
-      transform: translate(-50%,-50%);
-		  width: 30vw;
-      z-index: 999;
-    }
-    .pulse{
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 30vw;
-      height: 30vw;
-      border-radius: 50%;
-      animation: warn1 2s linear .5s infinite;
-      background: #bfeff7;
-      z-index: 1;
-    }
-    .pulse1{
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 30vw;
-      height: 30vw;
-      border-radius: 50%;
-      animation: warn1 2s linear 1s infinite;
-      background: #76dae8;
-      z-index: 1;
-    }
-  }
-  .des_title{
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: 1rem;
-    .line{
-      border: 1px solid #aaa;
-      width: 20vw;
-      margin: 0 15px;
-    }
-  }
-}
-
-@keyframes warn1 {
-  0% {
-  transform: scale(1);
-  opacity: 0;
-  }
-  25% {
-  transform: scale(1);
-  opacity: .1;
-  }
-  50% {
-  transform: scale(1);
-  opacity: .3;
-  }
-  75% {
-  transform: scale(1.1);
-  opacity: .5;
-  }
-  100% {
-  transform: scale(1.3);
-  opacity: 0;
-  }
-}
-</style>
+<template>
+  <view class="page">
+		<cu-custom :isBack="true" title="上课签到"></cu-custom>
+		<view class="header bg-white" 	:style="[{top:topHeader + 'px'}]">
+			<view class="icon_title flex align-center justify-between solid-bottom">
+				<view class="info flex align-center justify-between">
+					 <image mode="scaleToFill" :src="user.avatarUrl" class="avatar lg" v-if="user.avatarUrl"></image>
+			  	 <view class="username">{{user.nickName}}</view>
+				</view>
+				<view style="color:#00D2E3">{{info.status_desc}}</view>
+    	</view>
+			<view class="class_info">
+				<view style="font-size:15px;margin-top: .6rem;">{{info.start_at}}</view>
+				<view class="class_title">{{info.course_name}}</view>
+				<view class="address flex align-center">
+					<image src="/static/imgs/school.png" mode="widthFix" style="width:18px;"/>
+					<view style="margin-left: 10px;margin-right: 20px">{{info.school_name}}</view>
+					<image src="/static/imgs/address.png" mode="widthFix" style="width:14px;"/>
+					<view style="margin-left: 10px">{{info.classroom_name}}</view>
+				</view>
+    	</view>
+		</view>
+		<view class="content">
+			<view class="content_title">签到说明</view>
+    	<view>接到学生后请“点击签到”按钮作为签到</view>
+			<view class="button" :style="checked?'background: #ddd':''"  hover-class="button_hover" @tap="signIn">
+				<view class="text" :style="checked?'color: #aaa':''"> {{checked?'已签到':'点击签到'}}</view>
+				<view class="pulse" v-if="!checked"></view>
+				<view class="pulse1" v-if="!checked"></view>
+    	</view>
+     	<view class="des_title">
+				<view class="line"></view>
+				<view>注意事项</view>
+				<view class="line"></view>
+    	</view>
+			<view>为确保学校每个学生的接送安全，平台特将接送学生的有关的 安全细则及注意事项重申如下，希望相关监护人及学生遵照执 行： </view>
+			<view>1.要遵守校规，按时到校，听从教师的教导。 </view>
+			<view>2.上课要自觉遵守课堂纪律，认真听讲，积极思维，好好学习。</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { _getSignIn, _toSignIn } from '@/api/course'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      checked: false,
+      plan_id: '',
+      clock_in_id: '',
+      info: {}
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.plan_id)
+    if (!id) uni.navigateBack()
+    this.plan_id = id
+    this.init()
+  },
+  methods: {
+    init() {
+      _getSignIn({ plan_id: this.plan_id }).then(res => {
+        this.info = res.data.sign_data
+        this.checked = !this.info.status
+      })
+    },
+    signIn() {
+      if (this.checked) return false
+      _toSignIn({ clock_in_id: this.info.clock_in_id }).then(res => {
+        this.checked = true
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.header{
+  border-radius: 0 0 10px 10px;
+  padding: .8rem;
+  .icon_title{
+    .info{
+      .username{
+        font-size: 21px;
+        margin-left: 15px;
+      }
+    }
+  }
+  .class_info{
+    margin-left: .8rem;
+  }
+  .class_title{
+    font-size: 20px;
+    font-weight: 550;
+    margin-top: .6rem;
+  }
+  .address{
+    display: flex;
+    align-items: center;
+    color: #898E96;
+    font-size: 14px;
+    margin-top: .6rem;
+  }
+}
+.content{
+  margin-top: .8rem;
+  background: #fff;
+  color: #888;
+  padding: 2rem;
+  font-size: 14px;
+  .content_title{
+    font-size: 15px;
+    font-weight: 600;
+    color: #000;
+    margin-bottom: .4rem;
+  }
+  .button{
+    margin: 2rem auto;
+    width: 30vw;
+    height: 30vw;
+    border-radius: 50%;
+    background: #5fcfe0;
+    text-align: center;
+    line-height: 30vw;
+    font-size: 18px;
+    color: #fff;
+    font-weight: 600;
+    position: relative;
+    .text{
+			position: absolute;
+			top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+		  width: 30vw;
+      z-index: 999;
+    }
+    .pulse{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 30vw;
+      height: 30vw;
+      border-radius: 50%;
+      animation: warn1 2s linear .5s infinite;
+      background: #bfeff7;
+      z-index: 1;
+    }
+    .pulse1{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 30vw;
+      height: 30vw;
+      border-radius: 50%;
+      animation: warn1 2s linear 1s infinite;
+      background: #76dae8;
+      z-index: 1;
+    }
+  }
+  .des_title{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 1rem;
+    .line{
+      border: 1px solid #aaa;
+      width: 20vw;
+      margin: 0 15px;
+    }
+  }
+}
+
+@keyframes warn1 {
+  0% {
+  transform: scale(1);
+  opacity: 0;
+  }
+  25% {
+  transform: scale(1);
+  opacity: .1;
+  }
+  50% {
+  transform: scale(1);
+  opacity: .3;
+  }
+  75% {
+  transform: scale(1.1);
+  opacity: .5;
+  }
+  100% {
+  transform: scale(1.3);
+  opacity: 0;
+  }
+}
+</style>

src/store/user.js

@@ -1,100 +1,115 @@
-export default {
-  state: {
-    user: null,
-    token: '',
-    session: '',
-    kid: 0,
-    carts: []// 购物车
-  },
-  getters: {
-    user(state) {
-      return state.user || JSON.parse(uni.getStorageSync('user'))
-    },
-    kid(state) {
-      return state.kid || uni.getStorageSync('kid')
-    },
-    token(state) {
-      return state.token || uni.getStorageSync('token')
-    },
-    session(state) {
-      return state.session || uni.getStorageSync('session')
-    },
-    carts(state) {
-      return state.carts || JSON.parse(uni.getStorageSync('carts'))
-    }
-  },
-  mutations: {
-    CLEAR(state) {
-      state.user = null
-      state.token = ''
-      state.session = ''
-      state.kid = 0
-      state.carts = null
-      uni.clearStorage()
-    },
-    SET_USER(state, user) {
-      state.user = user
-      uni.setStorage({
-        key: 'user',
-        data: JSON.stringify(user)
-      })
-    },
-    SET_KID(state, kid) {
-      state.kid = kid
-      uni.setStorage({
-        key: 'kid',
-        data: kid
-      })
-    },
-    SET_TOKEN(state, token) {
-      state.token = token
-      uni.setStorage({
-        key: 'token',
-        data: token
-      })
-    },
-    SET_SESSION(state, session) {
-      state.session = session
-      uni.setStorage({
-        key: 'session',
-        data: session
-      })
-    },
-    SET_CARTS(state, carts = []) {
-      state.carts = carts
-      uni.setStorage({
-        key: 'carts',
-        data: JSON.stringify(carts)
-      })
-    }
-  },
-  actions: {
-    clear({ commit }) {
-      return new Promise((resolve, reject) => {
-        commit('CLEAR')
-        resolve(true)
-      })
-    },
-    setUser({ commit }, user) {
-      commit('SET_USER', user)
-    },
-    setKid({ commit }, kid) {
-      return new Promise((resolve, reject) => {
-        commit('SET_KID', kid)
-        resolve(kid)
-      })
-    },
-    setToken({ commit }, token) {
-      return new Promise((resolve, reject) => {
-        commit('SET_TOKEN', token)
-        resolve(token)
-      })
-    },
-    setSession({ commit }, session) {
-      commit('SET_SESSION', session)
-    },
-    setCarts({ commit }, carts) {
-      commit('SET_CARTS', carts)
-    }
-  }
-}
+export default {
+  state: {
+    user: null,
+    token: '',
+    session: '',
+    kid: 0,
+    phone: '',
+    carts: []// 购物车
+  },
+  getters: {
+    user(state) {
+      return state.user || JSON.parse(uni.getStorageSync('user'))
+    },
+    kid(state) {
+      return state.kid || uni.getStorageSync('kid')
+    },
+    phone(state) {
+      return state.phone || uni.getStorageSync('phone')
+    },
+    token(state) {
+      return state.token || uni.getStorageSync('token')
+    },
+    session(state) {
+      return state.session || uni.getStorageSync('session')
+    },
+    carts(state) {
+      return state.carts || JSON.parse(uni.getStorageSync('carts'))
+    }
+  },
+  mutations: {
+    CLEAR(state) {
+      state.user = null
+      state.token = ''
+      state.session = ''
+      state.phone = ''
+      state.kid = 0
+      state.carts = null
+      uni.clearStorage()
+    },
+    SET_USER(state, user) {
+      state.user = user
+      uni.setStorage({
+        key: 'user',
+        data: JSON.stringify(user)
+      })
+    },
+    SET_PHONE(state, phone) {
+      state.phone = phone
+      uni.setStorage({
+        key: 'phone',
+        data: phone
+      })
+    },
+    SET_KID(state, kid) {
+      state.kid = kid
+      uni.setStorage({
+        key: 'kid',
+        data: kid
+      })
+    },
+    SET_TOKEN(state, token) {
+      state.token = token
+      uni.setStorage({
+        key: 'token',
+        data: token
+      })
+    },
+    SET_SESSION(state, session) {
+      state.session = session
+      uni.setStorage({
+        key: 'session',
+        data: session
+      })
+    },
+    SET_CARTS(state, carts = []) {
+      state.carts = carts
+      uni.setStorage({
+        key: 'carts',
+        data: JSON.stringify(carts)
+      })
+    }
+  },
+  actions: {
+    clear({ commit }) {
+      return new Promise((resolve, reject) => {
+        commit('CLEAR')
+        resolve(true)
+      })
+    },
+    setUser({ commit }, user) {
+      commit('SET_USER', user)
+    },
+    setPhone({ commit }, phone) {
+      commit('SET_PHONE', phone)
+    },
+    setKid({ commit }, kid) {
+      return new Promise((resolve, reject) => {
+        commit('SET_KID', kid)
+        resolve(kid)
+      })
+    },
+    setToken({ commit }, token) {
+      return new Promise((resolve, reject) => {
+        commit('SET_TOKEN', token)
+        resolve(token)
+      })
+    },
+    setSession({ commit }, session) {
+      commit('SET_SESSION', session)
+    },
+    setCarts({ commit }, carts) {
+      commit('SET_CARTS', carts)
+    }
+  }
+}