update

server/service/course/course_action_users.go

@@ -97,11 +97,19 @@ func (courseActionUsersService *CourseActionUsersService)GetCourseActionUsersInf
 		}
 		var actionInfo course.CourseAction
 		err = global.GVA_DB.Model(&course.CourseAction{}).Where("id = ?",v.Aid).First(&actionInfo).Error
-		if err != nil {
+		if err != nil && err != gorm.ErrRecordNotFound{
+			return
+		} else if err != nil && err == gorm.ErrRecordNotFound {
+			continue
+		}
+		var user course.CourseUsers
+		err = global.GVA_DB.Model(&course.CourseUsers{}).Where("id = ?",v.Uid).First(&user).Error
+		if err != nil && err != gorm.ErrRecordNotFound{
 			return
 		} else if err != nil && err == gorm.ErrRecordNotFound {
 			continue
 		}
+		courseActionUserss[k].Addr = user.Address
 		courseActionUserss[k].CourseName = courseInfo.CourseName
 		courseActionUserss[k].ActionName = actionInfo.ActionName
 		courseActionUserss[k].ActionStart = actionInfo.ActionStart

web/src/view/courseActionUsers/courseActionUsers.vue

@@ -73,9 +73,9 @@
         <el-table-column align="left" label="日期" width="180">
             <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
         </el-table-column>
-        <el-table-column align="left" label="用户" prop="uid" width="120" />
-        <el-table-column align="left" label="课程" prop="cid" width="120" />
-        <el-table-column align="left" label="活动编号" prop="aid" width="120" />
+        <el-table-column align="left" label="用户" prop="addr" width="120" />
+        <el-table-column align="left" label="课程" prop="courseName" width="120" />
+        <el-table-column align="left" label="活动" prop="actionName" width="120" />
 <!--        <el-table-column align="left" label="签到 0 未签到 1 已签到" prop="isSign" width="120">-->
 <!--            <template #default="scope">{{ formatBoolean(scope.row.isSign) }}</template>-->
 <!--        </el-table-column>-->
@@ -84,7 +84,7 @@
          </el-table-column>
         <el-table-column align="left" label="按钮组">
             <template #default="scope">
-            <el-button type="primary" link icon="edit" class="table-button" @click="updateCourseActionUsersFunc(scope.row)">变更</el-button>
+<!--            <el-button type="primary" link icon="edit" class="table-button" @click="updateCourseActionUsersFunc(scope.row)">变更</el-button>-->
             <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
             </template>
         </el-table-column>