diff --git a/pages/login/login.js b/pages/login/login.js
index 382da27..d0d830c 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -11,7 +11,7 @@ const utils = require("../../utils/utils")
const app = getApp()
Page({
data: {
- currentRole: 'user', // 当前选择的角色：user/teacher/parent
+ currentRole: 'teacher', // 当前选择的角色：user/teacher/parent
agreed: false, // 是否同意协议
top: 24, //胶囊距离顶部top
@@ -535,7 +535,9 @@ Page({
}
} else {
- this.autoLogin(this)
+ this.setData({
+ isLoading: false
+ })
}
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 05251ee..5d3676b 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -22,7 +22,7 @@
-
用户
-
+ -->
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 3051bfe..851af8a 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -135,7 +135,7 @@ page {
border-radius: 24rpx 24rpx 0 0;
/* padding: 16rpx 0; */
/* background: rgb(38, 165, 246); */
- /* overflow: hidden; */
+ overflow: hidden;
height: 80rpx;
}
@@ -198,7 +198,7 @@ page {
}
.tab-active-2{
- border-radius: 48rpx 48rpx 0 0;
+ border-radius: 24rpx 48rpx 0 0;
}
.tab-active-2-1{
diff --git a/pages/student/my/my.js b/pages/student/my/my.js
index 7850bee..9b53168 100644
--- a/pages/student/my/my.js
+++ b/pages/student/my/my.js
@@ -16,7 +16,7 @@ Page({
*/
data: {
user: {},
- theme: 'user'
+ theme: 'parent'
},
/**
diff --git a/pages/student/my/my.wxml b/pages/student/my/my.wxml
index 35d5748..0487590 100644
--- a/pages/student/my/my.wxml
+++ b/pages/student/my/my.wxml
@@ -13,10 +13,7 @@
{{user.userTrueName || '跃动会员'}}
-
-
-
-
diff --git a/pages/student/my/my.wxss b/pages/student/my/my.wxss
index 682d623..5d33ed5 100644
--- a/pages/student/my/my.wxss
+++ b/pages/student/my/my.wxss
@@ -76,7 +76,9 @@ page {
align-items: center;
background-color: #fff;
font-size: 24rpx;
- padding: 20rpx 0;
+ padding: 18rpx 0;
+ margin: 80rpx 30rpx 40rpx 30rpx;
+ border-radius: 20rpx;
}
.lab-item {
@@ -87,8 +89,8 @@ page {
}
.lab-img {
- width: 48rpx;
- height: 48rpx;
+ width: 60rpx;
+ height: 60rpx;
/* margin-top: 20rpx; */
margin-bottom: 20rpx;
}
diff --git a/project.config.json b/project.config.json
index 0f3b3f3..041c52c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -53,9 +53,9 @@
"disableSWC": true
},
"compileType": "miniprogram",
- "libVersion": "3.7.12",
+ "libVersion": "3.15.2",
"appid": "wx9d179138d229d06b",
- "projectname": "YZ-Ai-Sport-Native-Demo",
+ "projectname": "跃动家长&教师端",
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
diff --git a/project.private.config.json b/project.private.config.json
index 45d8a1a..a640400 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,6 +1,6 @@
{
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "projectname": "YD-SPORT",
+ "projectname": "%E8%B7%83%E5%8A%A8%E5%AE%B6%E9%95%BF%26%E6%95%99%E5%B8%88%E7%AB%AF",
"setting": {
"compileHotReLoad": true,
"bigPackageSizeSupport": true,
@@ -21,52 +21,5 @@
"useIsolateContext": true
},
"libVersion": "3.15.2",
- "condition": {
- "miniprogram": {
- "list": [
- {
- "name": "module-sport/pages/sport-full-screen",
- "pathName": "module-sport/pages/sport-full-screen",
- "query": "sportKey=Rope-Skipping&time=120&number=20&type=num&theme=homeWork&homeWorkId=51&groupNumber=2&timeout=3&music=https%3A%2F%2Fyuedong-wechatapplet.oss-cn-shanghai.aliyuncs.com%2FUpload%2FBackgroundMusic%2FCarly%2520Rae%2520Jepsen-Turn%2520Me%2520Up.mp3",
- "scene": null,
- "launchMode": "default"
- },
- {
- "name": "subpackage/train/check-type/check-page",
- "pathName": "subpackage/train/check-type/check-page",
- "query": "homeWorkId=51&sportKey=Rope-Skipping",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "pages/login/login",
- "pathName": "pages/login/login",
- "query": "redeemCode=0000",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "subpackage/user/redeem-class/redeem-class",
- "pathName": "subpackage/user/redeem-class/redeem-class",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "subpackage/teacher/report-detail/report-detail",
- "pathName": "subpackage/teacher/report-detail/report-detail",
- "query": "id=837&studentNo=Student_0005",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "pages/student/my/my",
- "pathName": "pages/student/my/my",
- "query": "",
- "launchMode": "default",
- "scene": null
- }
- ]
- }
- }
+ "condition": {}
}
\ No newline at end of file
diff --git a/subpackage/user/login/login.js b/subpackage/user/login/login.js
index 2c51488..f6bcd7a 100644
--- a/subpackage/user/login/login.js
+++ b/subpackage/user/login/login.js
@@ -4,7 +4,7 @@ const { addMyCount, addMyCountWithToken, getUserAccount, getOpenId } = require('
const tabService = require("../../../utils/tab-serve")
Page({
data: {
- currentRole: 'user', // 当前选择的角色：user/teacher/parent
+ currentRole: 'teacher', // 当前选择的角色：user/teacher/parent
agreed: false, // 是否同意协议
top:24,//胶囊距离顶部top
diff --git a/subpackage/user/login/login.wxml b/subpackage/user/login/login.wxml
index 3403453..1b61f81 100644
--- a/subpackage/user/login/login.wxml
+++ b/subpackage/user/login/login.wxml
@@ -18,12 +18,12 @@
-
+