0409

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;

newPages/examinationAdd/index.vue

@@ -17,16 +17,12 @@
     <view class="group_4 flex-col">
       <view class="block_1 flex-row justify-between" @click="show = true">
         <text class="text_19">是否通过</text>
-        <view class="image-text_1 flex-row justify-between">
-
           <view>
             <u-picker v-model="process.examStatus" :show="show" :columns="ifPassColumns" title="是否通过"
                       @confirm="ifPassOnConfirm" @cancel="show = false">
             </u-picker>
-            <text class="text-group_2">{{ selectedValue || '请选择' }}</text>
+            <text class="text_191">{{ selectedValue || '请选择' }}</text>
           </view>
-
-        </view>
       </view>
       <view class="text-wrapper_7 flex-row justify-between">
         <text class="text_4">分数</text>
@@ -80,9 +76,23 @@
           <u-picker v-model="process.subject" :show="subjectShow" :columns="subjectColumns" title="科目"
                     @confirm="subjectOnConfirm" @cancel="subjectShow = false">
           </u-picker>
-          <text class="text-group_2">{{ subjectValue || '请选择科目' }}</text>
+          <text class="text_11">{{ subjectValue || '请选择科目' }}</text>
         </view>
       </view>
+	  
+	  <view class="text-wrapper_11 flex-row justify-between" 
+	        v-else-if="process.subject == 2 || process.subject == 3">
+	    <text class="text_10">考试科目</text>
+	    
+	      <text class="text_11">{{ formatSubject(process.subject) }}</text>
+	    
+	  </view>
+	  
+	  <!-- <view class="text-wrapper_3 flex-row justify-between" v-if="item.subject == 2 || item.subject == 3">
+	    <text class="text_8">考试地址：</text>
+	    <text class="text_9">{{ item.addr }}</text>
+	  </view> -->
+	  
     </view>
     <view class="group_5 flex-col">
       <text class="text_16">备注</text>
@@ -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)
   },
@@ -248,6 +260,14 @@ export default {
       return `${year}-${month}-${day} ${hours}:${minutes}`;
     },
 	
+	formatSubject(subject) {
+	      switch (Number(subject)) {
+	        case 2: return '科目二';
+	        case 3: return '科目三';
+			default: return '未知科目';
+	      }
+	    },
+
 
     deletePic(event) {
       this.fileList.splice(event.index, 1);
@@ -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)
+      console.log('提交数据是：', postData)
-      this.process.userId = this.userInfo.id
+      /* 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: postData,
-        data: this.process,
+        // data: this.process,
       }).then(res => {
         if (res.code === 0) {
           uni.showToast({

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,
         }
       });
     },

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') {