feat(miniClass): 增加补充姓名提示并更新用户显示字段从nickname改为name
- 将多个页面中用户昵称显示字段从 `nickname` 统一改为 `name` - 优化课程购买提示逻辑,支持多条信息分次提示 - 更新应用版本号至2.0.36
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -236,8 +236,8 @@
|
||||
</view>
|
||||
<view class="textItems flex_box">
|
||||
<text class="txt555"
|
||||
v-if="item.student.nickname != null && item.student.nickname != ''">
|
||||
{{item.student.nickname}}
|
||||
v-if="item.student.name != null && item.student.name != ''">
|
||||
{{item.student.name}}
|
||||
</text>
|
||||
<text v-else>匿名用户</text>
|
||||
</view>
|
||||
@@ -286,10 +286,10 @@
|
||||
<view class="" v-if="tijiaoTitleId == 2 && false" style="margin: 20rpx 0;">
|
||||
<radio-group @change="radioChange1" class="flex_box">
|
||||
<view class="" style="margin-right:20rpx ;">
|
||||
<radio value="0" />全部同学的</label>
|
||||
<radio value="0" /><label>全部同学的</label>
|
||||
</view>
|
||||
<view class="">
|
||||
<radio value="1" checked="true" />只看我自己的</label>
|
||||
<radio value="1" checked="true" /><label>只看我自己的</label>
|
||||
</view>
|
||||
</radio-group>
|
||||
</view>
|
||||
@@ -309,7 +309,7 @@
|
||||
</view>
|
||||
<view class="leve3">
|
||||
<view class="tips flex_box" v-if="item.zhedie">
|
||||
<!-- <text>发布者:{{item.createUser.nickname != null && item.createUser.nickname != '' ? item.createUser.nickname : '匿名用户'}}</text> -->
|
||||
<!-- <text>发布者:{{item.createUser.name != null && item.createUser.name != '' ? item.createUser.name : '匿名用户'}}</text> -->
|
||||
<text style="" class="date">日期:{{item.createTime}}</text>
|
||||
</view>
|
||||
<template v-if="tijiaoTitleId == 2 && isHave">
|
||||
@@ -403,21 +403,21 @@
|
||||
<view class="item">
|
||||
<text class="adminName">班长:</text>
|
||||
<view class="personbox" v-if="admins.monitor.user != null">
|
||||
<text>{{admins.monitor.user.nickname != null && admins.monitor.user.nickname != '' ? admins.monitor.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.monitor.user.name != null && admins.monitor.user.name != '' ? admins.monitor.user.name : '匿名用户'}}</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text class="adminName">副班长:</text>
|
||||
<view class="personbox" v-if="admins.dmonitor.user != null">
|
||||
<text>{{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.dmonitor.user.name != null && admins.dmonitor.user.name != '' ? admins.dmonitor.user.name : '匿名用户'}}</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
</view>
|
||||
<view class="item"><text class="adminName">学习委员:</text>
|
||||
|
||||
<view class="personbox" v-if="admins.learner.user != null">
|
||||
<text>{{admins.learner.user.nickname != null && admins.learner.user.nickname != '' ? admins.learner.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.learner.user.name != null && admins.learner.user.name != '' ? admins.learner.user.name : '匿名用户'}}</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
</view>
|
||||
@@ -425,7 +425,7 @@
|
||||
<template v-if="admins.scorer.length > 0">
|
||||
<view class="arryItemSub" v-for="(item,index) in admins.scorer" :key="index">
|
||||
<template v-if="item.user != null">
|
||||
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+',' : '匿名用户,'}}</text>
|
||||
<text>{{item.user.name != null && item.user.name != '' ? item.user.name+',' : '匿名用户,'}}</text>
|
||||
<!-- <text>({{item.user.tel}}),</text> -->
|
||||
</template>
|
||||
</view>
|
||||
@@ -505,7 +505,9 @@
|
||||
<text class="small_btn border_radius_10"
|
||||
v-if="!submitInfo.photo || submitInfo.photo != '' || submitInfo.photo != null"
|
||||
@click="onPageJump('/pages/mine/userInfo/persData')"
|
||||
style="display: block; height: 30px;">{{submitInfo.photo && submitInfo.photo != '' && submitInfo.photo != null ? '去修改' : '去上传'}}</text>
|
||||
style="display: block; height: 30px;"
|
||||
>
|
||||
{{submitInfo.photo && submitInfo.photo != '' && submitInfo.photo != null ? '去修改' : '去上传'}}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -292,11 +292,11 @@
|
||||
<text
|
||||
class="txt555"
|
||||
v-if="
|
||||
item.student.nickname != null &&
|
||||
item.student.nickname != ''
|
||||
item.student.name != null &&
|
||||
item.student.name != ''
|
||||
"
|
||||
>
|
||||
{{ item.student.nickname }}
|
||||
{{ item.student.name }}
|
||||
<template>
|
||||
<text>({{ item.student.tel }})</text>
|
||||
</template>
|
||||
@@ -429,9 +429,9 @@
|
||||
v-if="admins.monitor.user != null && admins.monitor.id"
|
||||
>
|
||||
<text>{{
|
||||
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
|
||||
: "匿名用户"
|
||||
}}</text>
|
||||
<text v-if="admins.monitor.id"
|
||||
@@ -447,9 +447,9 @@
|
||||
v-if="admins.dmonitor.user != null && admins.dmonitor.id"
|
||||
>
|
||||
<text>{{
|
||||
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
|
||||
: "匿名用户"
|
||||
}}</text>
|
||||
<text>({{ admins.dmonitor.user.tel }})</text>
|
||||
@@ -463,9 +463,9 @@
|
||||
v-if="admins.learner.user != null && admins.learner.id"
|
||||
>
|
||||
<text>{{
|
||||
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
|
||||
: "匿名用户"
|
||||
}}</text>
|
||||
<text>({{ admins.learner.user.tel }})</text>
|
||||
@@ -476,7 +476,7 @@
|
||||
<template v-if="admins.counter.length > 0">
|
||||
<view class="arryItemSub" v-for="(item,index) in admins.counter" :key="index">
|
||||
<template v-if="item.user != null">
|
||||
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}</text>
|
||||
<text>({{item.user.tel}}) </text>
|
||||
</template>
|
||||
</view>
|
||||
@@ -493,8 +493,8 @@
|
||||
>
|
||||
<template v-if="item.user != null">
|
||||
<text>{{
|
||||
item.user.nickname != null && item.user.nickname != ""
|
||||
? item.user.nickname
|
||||
item.user.name != null && item.user.name != ""
|
||||
? item.user.name
|
||||
: "匿名用户"
|
||||
}}</text>
|
||||
<text>({{ item.user.tel }}) </text>
|
||||
@@ -516,9 +516,9 @@
|
||||
<view class="upopBox" style="">
|
||||
<h3 style="margin-bottom: 20rpx">
|
||||
{{
|
||||
thisStudent.student.nickname != null &&
|
||||
thisStudent.student.nickname != ""
|
||||
? thisStudent.student.nickname
|
||||
thisStudent.student.name != null &&
|
||||
thisStudent.student.name != ""
|
||||
? thisStudent.student.name
|
||||
: "匿名用户"
|
||||
}}
|
||||
</h3>
|
||||
@@ -548,9 +548,9 @@
|
||||
<view class="upopBox manScoreBox" style="">
|
||||
<h3 style="margin-bottom: 20rpx">
|
||||
{{
|
||||
thisStudentScore.user.nickname != null &&
|
||||
thisStudentScore.user.nickname != ""
|
||||
? thisStudentScore.user.nickname
|
||||
thisStudentScore.user.name != null &&
|
||||
thisStudentScore.user.name != ""
|
||||
? thisStudentScore.user.name
|
||||
: "匿名用户"
|
||||
}}
|
||||
</h3>
|
||||
|
||||
@@ -91,8 +91,8 @@
|
||||
</view>
|
||||
<view :class="['textItems','flex_box']">
|
||||
<text class="txt555"
|
||||
v-if="item.student.nickname != null && item.student.nickname != ''">
|
||||
{{item.student.nickname}}
|
||||
v-if="item.student.name != null && item.student.name != ''">
|
||||
{{item.student.name}}
|
||||
<template>
|
||||
<text>({{item.student.tel}})</text>
|
||||
</template>
|
||||
@@ -170,7 +170,7 @@
|
||||
<view class="item">
|
||||
<text class="adminName">班长:</text>
|
||||
<view class="personbox" v-if="admins.monitor.user != null && admins.monitor.id">
|
||||
<text>{{admins.monitor.user.nickname != null && admins.monitor.user.nickname != '' ? admins.monitor.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.monitor.user.name != null && admins.monitor.user.name != '' ? admins.monitor.user.name : '匿名用户'}}</text>
|
||||
<text v-if="admins.monitor.id">({{admins.monitor.user.tel}})</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
@@ -178,14 +178,14 @@
|
||||
<view class="item">
|
||||
<text class="adminName">副班长:</text>
|
||||
<view class="personbox" v-if="admins.dmonitor.user != null && admins.dmonitor.id">
|
||||
<text>{{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.dmonitor.user.name != null && admins.dmonitor.user.name != '' ? admins.dmonitor.user.name : '匿名用户'}}</text>
|
||||
<text>({{admins.dmonitor.user.tel}})</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
</view>
|
||||
<view class="item"><text class="adminName">学习委员:</text>
|
||||
<view class="personbox" v-if="admins.learner.user != null && admins.learner.id">
|
||||
<text>{{admins.learner.user.nickname != null && admins.learner.user.nickname != '' ? admins.learner.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{admins.learner.user.name != null && admins.learner.user.name != '' ? admins.learner.user.name : '匿名用户'}}</text>
|
||||
<text>({{admins.learner.user.tel}})</text>
|
||||
</view>
|
||||
<text v-else>暂未设置</text>
|
||||
@@ -194,7 +194,7 @@
|
||||
<template v-if="admins.counter.length > 0">
|
||||
<view class="arryItemSub" v-for="(item,index) in admins.counter" :key="index">
|
||||
<template v-if="item.user != null">
|
||||
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}</text>
|
||||
<text>({{item.user.tel}}) </text>
|
||||
</template>
|
||||
</view>
|
||||
@@ -205,7 +205,7 @@
|
||||
<template v-if="admins.scorer.length > 0">
|
||||
<view class="arryItemSub" v-for="(item,index) in admins.scorer" :key="index">
|
||||
<template v-if="item.user != null">
|
||||
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}</text>
|
||||
<text>{{item.user.name != null && item.user.name != '' ? item.user.name : '匿名用户'}}</text>
|
||||
<text>({{item.user.tel}}) </text>
|
||||
</template>
|
||||
</view>
|
||||
@@ -217,7 +217,7 @@
|
||||
<u-popup key="2" v-if="showStudentBlank" :show="showStudentBlank" :round="10" @close="closePup" ref="">
|
||||
<view class="upopBox" style="">
|
||||
<h3 style="margin-bottom: 20rpx;">
|
||||
{{thisStudent.student.nickname != null && thisStudent.student.nickname != '' ? thisStudent.student.nickname : "匿名用户"}}
|
||||
{{thisStudent.student.name != null && thisStudent.student.name != '' ? thisStudent.student.name : "匿名用户"}}
|
||||
</h3>
|
||||
<view class="item">
|
||||
<text><b>身份信息:</b></text>
|
||||
@@ -272,7 +272,7 @@
|
||||
ref="">
|
||||
<view class="upopBox manScoreBox" style="">
|
||||
<h3 style="margin-bottom: 20rpx;">
|
||||
{{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
|
||||
{{thisStudentScore.user.name != null && thisStudentScore.user.name != '' ? thisStudentScore.user.name : "匿名用户"}}
|
||||
</h3>
|
||||
<view class="item">
|
||||
<text><b>身份信息:</b></text>
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
</view>
|
||||
<view :class="['textItems','flex_box']">
|
||||
<view class="txt555"
|
||||
v-if="item.user.nickname != null && item.user.nickname != ''">
|
||||
{{item.user.nickname}}
|
||||
v-if="item.user.name != null && item.user.name != ''">
|
||||
{{item.user.name}}
|
||||
<template>
|
||||
<text v-if="pageSorce!='myClass'">({{item.user.tel}})</text>
|
||||
</template>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<view class="textBox">
|
||||
<view class="">
|
||||
<text style="width: 100%; display: inline-block;">
|
||||
{{form.monitor && form.monitor.nickname != '' && form.monitor.nickname != null ? form.monitor.nickname : '匿名用户'}}
|
||||
{{form.monitor && form.monitor.name != '' && form.monitor.name != null ? form.monitor.name : '匿名用户'}}
|
||||
</text>
|
||||
<text style="width: 100%; display: inline-block;"> -
|
||||
{{form.monitor.tel}}</text>
|
||||
@@ -68,7 +68,7 @@
|
||||
<view class="textBox">
|
||||
<view class="">
|
||||
<text style="width: 100%; display: inline-block;">
|
||||
{{form.dmonitor && form.dmonitor.nickname != '' && form.dmonitor.nickname != null ? form.dmonitor.nickname : '匿名用户'}}
|
||||
{{form.dmonitor && form.dmonitor.name != '' && form.dmonitor.name != null ? form.dmonitor.name : '匿名用户'}}
|
||||
</text>
|
||||
<text style="width: 100%; display: inline-block;"> -
|
||||
{{form.dmonitor.tel}}</text>
|
||||
@@ -106,7 +106,7 @@
|
||||
<view class="textBox">
|
||||
<view class="">
|
||||
<text style="width: 100%; display: inline-block;">
|
||||
{{form.learner && form.learner.nickname != '' && form.learner.nickname != null ? form.learner.nickname : '匿名用户'}}
|
||||
{{form.learner && form.learner.name != '' && form.learner.name != null ? form.learner.name : '匿名用户'}}
|
||||
</text>
|
||||
<text style="width: 100%; display: inline-block;"> -
|
||||
{{form.learner.tel}}</text>
|
||||
@@ -146,7 +146,7 @@
|
||||
<view class="textBox">
|
||||
<view class="">
|
||||
<text style="width: 100%; display: inline-block;">
|
||||
{{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}}
|
||||
{{item && item.name != '' && item.name != null ? item.name : '匿名用户'}}
|
||||
</text>
|
||||
<text style="width: 100%; display: inline-block;"> - {{item.tel}}</text>
|
||||
</view>
|
||||
@@ -183,7 +183,7 @@
|
||||
<view class="textBox">
|
||||
<view class="">
|
||||
<text style="width: 100%; display: inline-block;">
|
||||
{{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}}
|
||||
{{item && item.name != '' && item.name != null ? item.name : '匿名用户'}}
|
||||
</text>
|
||||
<text style="width: 100%; display: inline-block;"> - {{item.tel}}</text>
|
||||
</view>
|
||||
|
||||
@@ -53,8 +53,8 @@
|
||||
</view>
|
||||
<view class="textItems flex_box">
|
||||
<text class="nick"
|
||||
v-if="item.student.nickname != null && item.student.nickname != ''">
|
||||
{{item.student.nickname}}
|
||||
v-if="item.student.name != null && item.student.name != ''">
|
||||
{{item.student.name}}
|
||||
</text>
|
||||
<text class="nick" v-else>
|
||||
匿名用户
|
||||
@@ -81,7 +81,7 @@
|
||||
</view>
|
||||
<u-popup key="1" v-if="showEditBlank" :show="showEditBlank" :round="10" @close="closePup" ref="">
|
||||
<view class="upopBox" style="">
|
||||
<h3 style="margin-bottom: 20rpx;">{{thisStudent.student.nickname != null && thisStudent.student.nickname != '' ? thisStudent.student.nickname : "匿名用户"}}</h3>
|
||||
<h3 style="margin-bottom: 20rpx;">{{thisStudent.student.name != null && thisStudent.student.name != '' ? thisStudent.student.name : "匿名用户"}}</h3>
|
||||
<view class="item">
|
||||
<text><b>身份信息:</b></text>
|
||||
<text v-if="thisStudent.student.vip == '0'">普通用户</text>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<image v-else src="/static/icon/morenAvavter.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="userName flex_box">
|
||||
<text v-if="item.createUser.nickname != '' && item.createUser.nickname != null">匿名用户</text>
|
||||
<text v-if="item.createUser.name != '' || item.createUser.name != null">{{item.createUser.name}}</text>
|
||||
<text v-else>匿名用户</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
</view>
|
||||
<view class="userName flex_box">
|
||||
<text
|
||||
v-if="item.createUser.nickname != '' && item.createUser.nickname != null">{{item.createUser.nickname}}</text>
|
||||
v-if="item.createUser.name != '' && item.createUser.name != null">{{item.createUser.name}}</text>
|
||||
<text v-else>匿名用户</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -107,7 +107,7 @@
|
||||
日期:{{curReplay.createTime}}
|
||||
</view>
|
||||
<view class="" v-if="curReplay.createUser" style="color: #999;padding: 10rpx 0; font-size: 26rpx;">
|
||||
学员信息:{{curReplay.createUser.nickname != null && curReplay.createUser.nickname != '' ? curReplay.createUser.nickname : '匿名用户'}}
|
||||
学员信息:{{curReplay.createUser.name != null && curReplay.createUser.name != '' ? curReplay.createUser.name : '匿名用户'}}
|
||||
/ {{curReplay.createUser.tel}}
|
||||
</view>
|
||||
<!-- <view class="score" v-show="curReplay.scoreSuccess != 0">
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
日期:{{curReplay.createTime}}
|
||||
</view>
|
||||
<view class="" v-if="curReplay.createUser" style="color: #999;padding: 10rpx 0;">
|
||||
学员信息:{{curReplay.createUser.nickname != null && curReplay.createUser.nickname != '' ? curReplay.createUser.nickname : '匿名用户'}}
|
||||
学员信息:{{curReplay.createUser.name != null && curReplay.createUser.name != '' ? curReplay.createUser.name : '匿名用户'}}
|
||||
/ {{curReplay.createUser.tel}}
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user