diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5196f76..225e79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -150,6 +150,7 @@
- | 修改合并手机号逻辑 | [5d391a3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5d391a3)
- | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/30e352f)
- | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/87b20fd)
+ - | 修改扫码逻辑 | [e1234a6](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/e1234a6)
- | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/531c14d)
- | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/df6acf2)
- | 修改时间轴bug | [fe08608](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/fe08608)
diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue
index 34a34fb..1e15230 100644
--- a/src/components/Upload/Upload.vue
+++ b/src/components/Upload/Upload.vue
@@ -9,9 +9,9 @@
:class="
identityInfo.isMax === 0 && identityInfo.personNumber > 1
? 'icons4'
- : identityInfo.isMax === 1 && identityInfo.personNumber <= 1
- ? 'icons2'
- : 'icons3'
+ : (identityInfo.isMax === 1 && identityInfo.personNumber <= 1) || (!identityInfo.isMax && identityInfo.personNumber > 1)
+ ? 'icons3'
+ : 'icons2'
"
>
diff --git a/src/mixins/tool.js b/src/mixins/tool.js
index 4318def..b2e1a0a 100644
--- a/src/mixins/tool.js
+++ b/src/mixins/tool.js
@@ -84,9 +84,7 @@ export default {
.showModal('提示', '是否申请成为家属?')
.then(async () => {
const params = { bindUserId };
- console.log('params: ', params);
const res = await this.getCreateTrainee(params);
- console.log('res: ', res);
if (!res.length) {
this.$t.ui.showToast('提醒工具箱拥有者添加使用者信息');
setTimeout(() => {
@@ -193,7 +191,6 @@ export default {
async handleUpgrade() {
try {
const params = { keyUserIds: this.keyUserIds };
- console.log('params: ', params);
await this.$u.api.upgradeTrainee(params);
this.$refs.uModal.clearLoading();
this.setAlert('使用者设置成功', 'success');
diff --git a/src/pagesProject/project/components/ConfigInfo/components/Family.vue b/src/pagesProject/project/components/ConfigInfo/components/Family.vue
index a903c72..bdfd63a 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/Family.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/Family.vue
@@ -91,7 +91,7 @@ export default {
item.open = false;
}
});
- this.itemList = date;
+ this.itemList = [...date];
}
} catch (error) {
console.error('error: ', error);
diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
index ebf358a..b33388e 100644
--- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
+++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
@@ -17,16 +17,18 @@
-
-
+
+
+
+
测评结果
-
+
训练结果
@@ -43,7 +43,9 @@
过程还原
-
+
+
+
diff --git a/src/pagesProject/project/components/Roles/Roles.vue b/src/pagesProject/project/components/Roles/Roles.vue
index bd55255..1b23074 100644
--- a/src/pagesProject/project/components/Roles/Roles.vue
+++ b/src/pagesProject/project/components/Roles/Roles.vue
@@ -105,7 +105,7 @@ export default {
query
.selectAll('.tab-children')
.boundingClientRect(data => {
- this.roleLeft = data[0].left;
+ this.roleLeft = data && data.length ? data[0].left : 0;
})
.exec();
});