diff --git a/manifest.json b/manifest.json
index d21c1e3..39185fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "2.0.35",
- "versionCode" : 2035,
+ "versionName" : "2.0.36",
+ "versionCode" : 2036,
"sassImplementationName" : "node-sass",
"app-plus" : {
"nvueCompiler" : "uni-app",
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index 0e5a3f1..6046a46 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -236,8 +236,8 @@
- {{item.student.nickname}}
+ v-if="item.student.name != null && item.student.name != ''">
+ {{item.student.name}}
匿名用户
@@ -286,10 +286,10 @@
- 全部同学的
+
- 只看我自己的
+
@@ -309,7 +309,7 @@
-
+
日期:{{item.createTime}}
@@ -403,21 +403,21 @@
班长:
- {{admins.monitor.user.nickname != null && admins.monitor.user.nickname != '' ? admins.monitor.user.nickname : '匿名用户'}}
+ {{admins.monitor.user.name != null && admins.monitor.user.name != '' ? admins.monitor.user.name : '匿名用户'}}
暂未设置
副班长:
- {{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}
+ {{admins.dmonitor.user.name != null && admins.dmonitor.user.name != '' ? admins.dmonitor.user.name : '匿名用户'}}
暂未设置
学习委员:
- {{admins.learner.user.nickname != null && admins.learner.user.nickname != '' ? admins.learner.user.nickname : '匿名用户'}}
+ {{admins.learner.user.name != null && admins.learner.user.name != '' ? admins.learner.user.name : '匿名用户'}}
暂未设置
@@ -425,7 +425,7 @@
- {{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+',' : '匿名用户,'}}
+ {{item.user.name != null && item.user.name != '' ? item.user.name+',' : '匿名用户,'}}
@@ -505,7 +505,9 @@
{{submitInfo.photo && submitInfo.photo != '' && submitInfo.photo != null ? '去修改' : '去上传'}}
+ style="display: block; height: 30px;"
+ >
+ {{submitInfo.photo && submitInfo.photo != '' && submitInfo.photo != null ? '去修改' : '去上传'}}
@@ -963,13 +965,33 @@
.then(async (res) => {
console.log('课程购买情况',res);
if (res.code == 0) {
- if (res.msg != '') {
- msg = res.msg
- var outputStr = await this.convertToHalfWidth(res.msg)
- uni.showModal({
- title: '提示',
- content: `您${outputStr}课程没有购买,请尽快购买班级内教学需要的课程,逾期您将被系统自动踢出班级,感谢您的理解和支持`
- })
+ if (res.res && res.res.length > 0) {
+ const msgArr = res.res
+ for (const item of msgArr) {
+ const outputStr = await this.convertToHalfWidth(item)
+ const isPass = await new Promise(resolve => {
+ uni.showModal({
+ title: '提示',
+ content: `${outputStr}`,
+ success: (res) => {
+ if (res.confirm) {
+ resolve(true)
+ } else {
+ resolve(false)
+ }
+ }
+ })
+ })
+ if (!isPass) {
+ break
+ }
+ }
+ // msg = res.msg
+ // var outputStr = await this.convertToHalfWidth(res.msg)
+ // uni.showModal({
+ // title: '提示',
+ // content: `${outputStr}`
+ // })
}
}
}).catch(e => {
@@ -2260,7 +2282,7 @@ uni.navigateTo({
color: #999;
}
- .date {}
+ // .date {}
@@ -2688,7 +2710,7 @@ uni.navigateTo({
}
}
- .optionsBox {}
+ // .optionsBox {}
.btn_box_certificate {
margin-top: 70rpx;
@@ -2713,13 +2735,13 @@ uni.navigateTo({
}
.userinfoPup {
- .tips {
- // .item{justify-content: space-around;}
- }
+ // .tips {
+ // // .item{justify-content: space-around;}
+ // }
.small_btn {
color: #55aaff;
border: #55aaff 1px solid;
}
}
-
\ No newline at end of file
+
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index 75a58a8..9e583d7 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -292,11 +292,11 @@
- {{ item.student.nickname }}
+ {{ item.student.name }}
({{ item.student.tel }})
@@ -429,9 +429,9 @@
v-if="admins.monitor.user != null && admins.monitor.id"
>
{{
- admins.monitor.user.nickname != null &&
- admins.monitor.user.nickname != ""
- ? admins.monitor.user.nickname
+ admins.monitor.user.name != null &&
+ admins.monitor.user.name != ""
+ ? admins.monitor.user.name
: "匿名用户"
}}
{{
- admins.dmonitor.user.nickname != null &&
- admins.dmonitor.user.nickname != ""
- ? admins.dmonitor.user.nickname
+ admins.dmonitor.user.name != null &&
+ admins.dmonitor.user.name != ""
+ ? admins.dmonitor.user.name
: "匿名用户"
}}
({{ admins.dmonitor.user.tel }})
@@ -463,9 +463,9 @@
v-if="admins.learner.user != null && admins.learner.id"
>
{{
- admins.learner.user.nickname != null &&
- admins.learner.user.nickname != ""
- ? admins.learner.user.nickname
+ admins.learner.user.name != null &&
+ admins.learner.user.name != ""
+ ? admins.learner.user.name
: "匿名用户"
}}
({{ admins.learner.user.tel }})
@@ -476,7 +476,7 @@
- {{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}
+ {{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}
({{item.user.tel}})
@@ -493,8 +493,8 @@
>
{{
- item.user.nickname != null && item.user.nickname != ""
- ? item.user.nickname
+ item.user.name != null && item.user.name != ""
+ ? item.user.name
: "匿名用户"
}}
({{ item.user.tel }})
@@ -516,9 +516,9 @@
{{
- thisStudent.student.nickname != null &&
- thisStudent.student.nickname != ""
- ? thisStudent.student.nickname
+ thisStudent.student.name != null &&
+ thisStudent.student.name != ""
+ ? thisStudent.student.name
: "匿名用户"
}}
@@ -548,9 +548,9 @@
{{
- thisStudentScore.user.nickname != null &&
- thisStudentScore.user.nickname != ""
- ? thisStudentScore.user.nickname
+ thisStudentScore.user.name != null &&
+ thisStudentScore.user.name != ""
+ ? thisStudentScore.user.name
: "匿名用户"
}}
diff --git a/pages/miniClass/classInfoWork.vue b/pages/miniClass/classInfoWork.vue
index bc2eb86..0dc00cf 100644
--- a/pages/miniClass/classInfoWork.vue
+++ b/pages/miniClass/classInfoWork.vue
@@ -91,8 +91,8 @@
- {{item.student.nickname}}
+ v-if="item.student.name != null && item.student.name != ''">
+ {{item.student.name}}
({{item.student.tel}})
@@ -170,7 +170,7 @@
班长:
- {{admins.monitor.user.nickname != null && admins.monitor.user.nickname != '' ? admins.monitor.user.nickname : '匿名用户'}}
+ {{admins.monitor.user.name != null && admins.monitor.user.name != '' ? admins.monitor.user.name : '匿名用户'}}
({{admins.monitor.user.tel}})
暂未设置
@@ -178,14 +178,14 @@
副班长:
- {{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}
+ {{admins.dmonitor.user.name != null && admins.dmonitor.user.name != '' ? admins.dmonitor.user.name : '匿名用户'}}
({{admins.dmonitor.user.tel}})
暂未设置
学习委员:
- {{admins.learner.user.nickname != null && admins.learner.user.nickname != '' ? admins.learner.user.nickname : '匿名用户'}}
+ {{admins.learner.user.name != null && admins.learner.user.name != '' ? admins.learner.user.name : '匿名用户'}}
({{admins.learner.user.tel}})
暂未设置
@@ -194,7 +194,7 @@
- {{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}
+ {{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}
({{item.user.tel}})
@@ -205,7 +205,7 @@
- {{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}
+ {{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}
({{item.user.tel}})
@@ -217,7 +217,7 @@
- {{thisStudent.student.nickname != null && thisStudent.student.nickname != '' ? thisStudent.student.nickname : "匿名用户"}}
+ {{thisStudent.student.name != null && thisStudent.student.name != '' ? thisStudent.student.name : "匿名用户"}}
身份信息:
@@ -272,7 +272,7 @@
ref="">
- {{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
+ {{thisStudentScore.user.name != null && thisStudentScore.user.name != '' ? thisStudentScore.user.name : "匿名用户"}}
身份信息:
diff --git a/pages/miniClass/components/sutdent_score_list.vue b/pages/miniClass/components/sutdent_score_list.vue
index 057f675..6ab4c78 100644
--- a/pages/miniClass/components/sutdent_score_list.vue
+++ b/pages/miniClass/components/sutdent_score_list.vue
@@ -36,8 +36,8 @@
- {{item.user.nickname}}
+ v-if="item.user.name != null && item.user.name != ''">
+ {{item.user.name}}
({{item.user.tel}})
diff --git a/pages/miniClass/memberSet.vue b/pages/miniClass/memberSet.vue
index e81c297..7b72dee 100644
--- a/pages/miniClass/memberSet.vue
+++ b/pages/miniClass/memberSet.vue
@@ -29,7 +29,7 @@
- {{form.monitor && form.monitor.nickname != '' && form.monitor.nickname != null ? form.monitor.nickname : '匿名用户'}}
+ {{form.monitor && form.monitor.name != '' && form.monitor.name != null ? form.monitor.name : '匿名用户'}}
-
{{form.monitor.tel}}
@@ -68,7 +68,7 @@
- {{form.dmonitor && form.dmonitor.nickname != '' && form.dmonitor.nickname != null ? form.dmonitor.nickname : '匿名用户'}}
+ {{form.dmonitor && form.dmonitor.name != '' && form.dmonitor.name != null ? form.dmonitor.name : '匿名用户'}}
-
{{form.dmonitor.tel}}
@@ -106,7 +106,7 @@
- {{form.learner && form.learner.nickname != '' && form.learner.nickname != null ? form.learner.nickname : '匿名用户'}}
+ {{form.learner && form.learner.name != '' && form.learner.name != null ? form.learner.name : '匿名用户'}}
-
{{form.learner.tel}}
@@ -146,7 +146,7 @@
- {{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}}
+ {{item && item.name != '' && item.name != null ? item.name : '匿名用户'}}
- {{item.tel}}
@@ -183,7 +183,7 @@
- {{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}}
+ {{item && item.name != '' && item.name != null ? item.name : '匿名用户'}}
- {{item.tel}}
diff --git a/pages/miniClass/studentsInClass.vue b/pages/miniClass/studentsInClass.vue
index b8b7d1a..4aaa5b0 100644
--- a/pages/miniClass/studentsInClass.vue
+++ b/pages/miniClass/studentsInClass.vue
@@ -53,8 +53,8 @@
- {{item.student.nickname}}
+ v-if="item.student.name != null && item.student.name != ''">
+ {{item.student.name}}
匿名用户
@@ -81,7 +81,7 @@
- {{thisStudent.student.nickname != null && thisStudent.student.nickname != '' ? thisStudent.student.nickname : "匿名用户"}}
+ {{thisStudent.student.name != null && thisStudent.student.name != '' ? thisStudent.student.name : "匿名用户"}}
身份信息:
普通用户
diff --git a/pages/miniClass/taskDetail.vue b/pages/miniClass/taskDetail.vue
index fcc1f66..b28d5b9 100644
--- a/pages/miniClass/taskDetail.vue
+++ b/pages/miniClass/taskDetail.vue
@@ -53,7 +53,7 @@
- 匿名用户
+ {{item.createUser.name}}
匿名用户
diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue
index e2603b4..eada64a 100644
--- a/pages/miniClass/taskDetailForMan.vue
+++ b/pages/miniClass/taskDetailForMan.vue
@@ -43,7 +43,7 @@
{{item.createUser.nickname}}
+ v-if="item.createUser.name != '' && item.createUser.name != null">{{item.createUser.name}}
匿名用户
@@ -107,7 +107,7 @@
日期:{{curReplay.createTime}}
- 学员信息:{{curReplay.createUser.nickname != null && curReplay.createUser.nickname != '' ? curReplay.createUser.nickname : '匿名用户'}}
+ 学员信息:{{curReplay.createUser.name != null && curReplay.createUser.name != '' ? curReplay.createUser.name : '匿名用户'}}
/ {{curReplay.createUser.tel}}