diff --git a/newPages/examinationAdd/assets/style/index.rpx.scss b/newPages/examinationAdd/assets/style/index.rpx.scss
index b9685f1..985ee9f 100644
--- a/newPages/examinationAdd/assets/style/index.rpx.scss
+++ b/newPages/examinationAdd/assets/style/index.rpx.scss
@@ -110,6 +110,18 @@
white-space: nowrap;
line-height: 28rpx;
}
+ .text_191 {
+ width: 112rpx;
+ height: 28rpx;
+ overflow-wrap: break-word;
+ color: rgba(44, 120, 245, 1);
+ font-size: 28rpx;
+ font-family: PingFang SC-Semibold;
+ font-weight: 600;
+ text-align: right;
+ white-space: nowrap;
+ line-height: 28rpx;
+ }
.image-text_1 {
width: 116rpx;
height: 28rpx;
@@ -270,6 +282,8 @@
width: 646rpx;
height: 28rpx;
margin: 50rpx 0 0 20rpx;
+ display: flex;
+ justify-content: space-between;
.text_10 {
width: 112rpx;
height: 28rpx;
diff --git a/newPages/examinationAdd/index.vue b/newPages/examinationAdd/index.vue
index 3757dcd..c772edd 100644
--- a/newPages/examinationAdd/index.vue
+++ b/newPages/examinationAdd/index.vue
@@ -17,16 +17,12 @@
是否通过
-
-
- {{ selectedValue || '请选择' }}
+ {{ selectedValue || '请选择' }}
-
-
分数
@@ -80,9 +76,23 @@
- {{ subjectValue || '请选择科目' }}
+ {{ subjectValue || '请选择科目' }}
+
+
+ 考试科目
+
+ {{ formatSubject(process.subject) }}
+
+
+
+
+
备注
@@ -168,6 +178,8 @@ export default {
this.process.id = options.id
this.process.coachId = options.coachId
this.process.userId = this.userInfo.id
+ this.process.coachId = options.coachId
+ this.process.userName = options.nickname
console.log('options', options)
console.log('batchItemId', this.batchItemId)
},
@@ -247,6 +259,14 @@ export default {
const minutes = String(date.getMinutes()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}`;
},
+
+ formatSubject(subject) {
+ switch (Number(subject)) {
+ case 2: return '科目二';
+ case 3: return '科目三';
+ default: return '未知科目';
+ }
+ },
deletePic(event) {
@@ -348,6 +368,10 @@ export default {
},
saveData() {
+ if (!this.process.userId || !this.process.subject || !this.process.examScore || !this.process.examStatus || !this.process.examTime) {
+ uni.showToast({title: '信息填写不完整', icon: 'none'});
+ return;
+ }
if (this.process.subject == 1 || this.process.subject == 4) {
this.saveDataOne()
}
@@ -398,22 +422,23 @@ export default {
})
},
saveDataTwo() {
- /* const postData = {
+ const postData = {
...this.process, // 先拷贝 process 原有数据
tenantId: this.opTenantId,
fraction: this.process.examScore,
ifPass: this.process.examStatus,
id: this.batchItemId,
- remark: this.process.remark
+ userName: this.userInfo.nickname,
+ remark: this.process.remark,
images: this.fileList?.map(item => item.url).join(',') || '',
- } */
+ }
- // console.log('提交数据是:', postData)
- this.process.userId = this.userInfo.id
+ console.log('提交数据是:', postData)
+ /* this.process.userId = this.userInfo.id
this.process.tenantId = this.opTenantId
this.process.fraction = this.process.examScore
this.process.ifPass = this.process.examStatus
- this.process.images = this.fileList?.map(item => item.url).join(',') || '';
+ this.process.images = this.fileList?.map(item => item.url).join(',') || ''; */
if (!this.process.userId || !this.process.subject || !this.process.examScore || !this.process.examStatus || !this.process.examTime) {
uni.showToast({title: '信息填写不完整', icon: 'none'});
return;
@@ -421,8 +446,8 @@ export default {
request({
url: '/app-api/examBatch/update',
method: 'PUT',
- // data: postData,
- data: this.process,
+ data: postData,
+ // data: this.process,
}).then(res => {
if (res.code === 0) {
uni.showToast({
diff --git a/newPages/examinationList/index.vue b/newPages/examinationList/index.vue
index 659f4c6..407d4ba 100644
--- a/newPages/examinationList/index.vue
+++ b/newPages/examinationList/index.vue
@@ -189,6 +189,7 @@ export default {
}));
this.pickerShow = true;
} else if (this.courseList.length === 1) {
+ console.log('1231231',this.courseList[0])
this.goToScoreEntry(this.courseList[0]);
} else {
this.$u.toast("暂无课程信息");
@@ -219,6 +220,7 @@ export default {
);
if (hasSubject1Or4) {
+ console.log('selectedCourse', this.selectedCourse)
this.goToScoreEntry(selectedCourse);
} else {
uni.showToast({
@@ -233,6 +235,7 @@ export default {
},
goToScoreEntry(course) {
+ console.log('course', course)
this.$u.route({
url: '/newPages/examinationAdd/index',
params: {
@@ -240,6 +243,7 @@ export default {
courseType: course.courseType,
userId: course.userId,
tenantId: course.tenantId,
+ coachId :course.coachUserId,
}
});
},
diff --git a/newPages/register/index.vue b/newPages/register/index.vue
index 879275f..76538b9 100644
--- a/newPages/register/index.vue
+++ b/newPages/register/index.vue
@@ -526,6 +526,17 @@ export default {
url: `/small/jxInfo/prepayment?type=jsapi&orderNo=${this.orderNo}&orderId=${this.orderId}&payType=${payType}`,
method: 'get'
});
+ /* if(res.userName != this.name ||
+ res.userPhone != this.phone ||
+ res.coachUserId != this.jlId ||
+ res.coachUserName != jlName ||
+ res.userNo != this.identity ||
+ res.userSex != this.sex ||
+ res.reserveMoney != this.payPrice ||
+ res.payType != this.payType
+ res.restMoney != ){
+
+ } */
const result = await this.handleWxPayment(res);
if (result === 'success') {