Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

src/components/setComments/commentDetails.vue

@@ -4,22 +4,21 @@
 			<van-icon name="plus" /><text>增加评论</text> </view>
             <view class="index-student-information">
                 <view class="commentDetailsList-content">
-                    <view class="commentDetailsList-list">
+                    <view class="commentDetailsList-list" v-for="(item,index) in CourseCommentTimesList" :key="index">
                         <view class="commentDetailsList-cross"  @click="deleteRules">
                             <van-icon name="cross" />
                         </view>
                         <view class="commentDetailsList-img flex">
                             <view>学员1</view>
                             <view class="flex">
-                                <text>可见</text>
+                                <text>{{item.ShowType}}</text>
                                 <van-image @click="editRules" class="img" width="31rpx" height="30rpx" fit="cover" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980151000_180.png" />
                             </view>
                             <view class="Wire"></view>
                         </view>
                             
                         <view class="commentDetailsList-comment">
-                            这位学员很优秀，平时课上的问题都能积极回
-                            答，正确率非常高。这次考试得分也很高，希望再接再厉
+                            {{item.Info}}
                         </view>
                     </view>
                 </view>
@@ -145,7 +144,7 @@
 			};
 		},
 		onLoad(option) {
-
+			
 		},
 	};
 </script>

src/components/setComments/setComments.vue

@@ -82,7 +82,7 @@
 				},
 				goComment(item){
 					uni.navigateTo({
-						url: '/pages/setComments/commentDetails'
+						url: '/pages/setComments/commentDetails?comment='+ encodeURIComponent(JSON.stringify(item))
 					})
 				},
 				clickOptionsShow(item) {

src/pages/setComments/addComment.vue

@@ -7,7 +7,22 @@
 			</view>
 		</navbar>
 		<view class="addComment-content">
-			
+			<view class="addComment-title flex">
+				<van-icon name="friends-o" />
+				<text>
+					选择学员 (0)
+				</text>
+			</view>
+			<view class="addComment-img-box flex">
+				<view class="addComment-img-list flex">
+					<view class="addComment-img">
+						<view>
+							<van-icon name="plus" />
+						</view>
+					</view>
+					<text class="addComment-text">添加学员</text>
+				</view>
+			</view>
 			<!-- <setComments :CourseCommentTimesList="courseTimeList" @refreshData="getCourseCommentTimes"></setComments> -->
 		</view>
 
@@ -114,6 +129,24 @@
 	};
 </script>
 <style scoped>
+	.addComment-img-list{
+		flex: 0 0 25%;
+	}
+	.addComment-img-box{
+		padding: 0 50rpx;
+		justify-content: space-between;
+	}
+	.addComment-title van-icon{
+		font-size: 38rpx;
+		margin-right: 20rpx;
+	}
+	.addComment-title{
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #282828;
+		letter-spacing: 1rpx;
+		padding: 54rpx 50rpx 42rpx 50rpx;
+	}
 	.addComment-header-box{
 	    padding: 20rpx 42rpx;
 		flex-direction: row;

src/pages/setComments/commentDetails.vue

@@ -10,18 +10,18 @@
 			<view class="commentDetails-index-setType flex">
 				<view class="commentDetails-setType-text flex">
                     <view>
-                        第一次评价
+                        第{{topData.Times}}次评价
                     </view>
                     <view class="flex">
-                        <text>部分可见</text>
+                        <text>{{topData.ShowTypeStr}}</text>
                     </view>
 				</view>
 				<view class="commentDetails-setType-time flex" @click="goRules">
 					<view>
-                        来源:
+                        来源:{{topData.CreateTypeStr}}
                     </view>
                     <view>
-                        时间:
+                        时间:{{topData.CreateTime}}
                     </view>
 				</view>
 			</view>
@@ -81,9 +81,16 @@
 				checked: '1',
 				Msg: {
 					CourseId: '',
+					CommentTimes:1
 				},
 				courseTimeList: [], //课程自动生成评论次数
 				courseRule: {}, //课程评价规则
+				topData:{
+					ShowTypeStr:"",
+					Times:1,
+					CreateTime:"",
+					CreateTypeStr:""
+				}
 			});
 			let methods = {
 				back() {
@@ -95,14 +102,6 @@
 				radioChange(e) {
 					console.log("打印国家名称", e.target.value)
 				},
-				//获取课程评论次数列表
-				getCourseCommentTimes() {
-					proxy.$request("/Teacher/GetCourseCommentTimes", data.Msg).then(res => {
-						if (res) {
-							data.courseTimeList = res.Data;
-						}
-					})
-				},
 				//获取课程评价规则信息
 				getCourseRule() {
 					proxy.$request("/Teacher/GetCourseComment", data.Msg).then(res => {
@@ -115,6 +114,13 @@
 					uni.navigateTo({
 						url: '/pages/setComments/commentRulesList?CourseId=' + data.Msg.CourseId
 					})
+				},
+				getStuCommentList(){
+					proxy.$request("/Teacher/GetStuCommentList", data.Msg).then(res => {
+						if (res) {
+							data.courseTimeList = res.Data;
+						}
+					})
 				}
 			};
 
@@ -123,10 +129,16 @@
 				...methods
 			};
 		},
-		onLoad(option) {
-			this.Msg.CourseId = option.CourseId;
+		onLoad(options) {
+			let json=JSON.parse(decodeURIComponent(options.comment))
+			this.Msg.CourseId = json.CourseId;
+			this.topData.ShowTypeStr = json.ShowTypeStr;
+			this.topData.Times = json.Times;
+			this.topData.CreateTime = json.CreateTime;
+			this.topData.CreateTypeStr = json.CreateTypeStr;
+			this.Msg.CommentTimes = json.Times;
 			this.getCourseRule();
-			this.getCourseCommentTimes();
+			this.getStuCommentList();
 		},
 
 	};