Commit a33dad75 authored by 黄奎's avatar 黄奎

111

parents 4c4778f1 5ef2f509
This diff is collapsed.
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
}; };
</script> </script>
<style scoped> <style scoped>
<<<<<<< HEAD
.setComments-Evaluation view text:first-child { .setComments-Evaluation view text:first-child {
border-right: 1px solid #E5E5E5; border-right: 1px solid #E5E5E5;
padding: 0 16rpx 0 0; padding: 0 16rpx 0 0;
...@@ -261,6 +262,130 @@ ...@@ -261,6 +262,130 @@
.index-student-information { .index-student-information {
min-height: 800rpx; min-height: 800rpx;
=======
.setComments-Evaluation view text:first-child{
border-right: 1px solid #E5E5E5;
padding: 0 16rpx 0 0;
}
.setComments-Evaluation view text:last-child{
margin-left: 16rpx;
}
.setComments-Evaluation view text{
display: inline-block;
letter-spacing: 1rpx;
}
.setComments-Evaluation view{
float: right;
margin-top: 25rpx;
margin-bottom: 27rpx;
font-size: 24rpx;
font-weight: 500;
color: #CE8086;
}
.setComments-Evaluation{
height: 85rpx;
border-top: 1rpx solid #E5E5E5;
}
.setComments-source{
font-size: 20rpx;
color: #C2BCBA;
font-weight: 500;
justify-content: space-between;
padding: 26rpx 0 25rpx 0;
}
.point{
width: 8rpx;
height: 8rpx;
background: #E64150;
border-radius: 50%;
}
.setComments-options-title,.setComments-options-text{
font-size: 24rpx;
font-weight: 500;
color: #CE8086;
text-align: center;
font-weight: bold;
}
.setComments-options-text text{
padding: 5rpx 0;
}
.setComments-options-text{
flex-direction: column;
margin-top: 10rpx;
position: absolute;
left: 0;
right: 0;
top: 35rpx;
background: #FCEEEF;
padding: 20rpx 0 20rpx 0;
border-radius: 0 0 25rpx 25rpx;
}
.setComments-options-title text{
margin-right: 10rpx;
margin-left: 10rpx;
}
.setComments-options-title{
justify-content: center;
align-items: center;
}
.setComments-options{
flex-grow: 1;
border-radius: 25rpx;
background: #FCEEEF;
flex-direction: column;
padding: 14rpx 17rpx 15rpx 17rpx;
letter-spacing: 1rpx;
position: relative;
}
.setComments-title-right{
width: 190rpx;
flex-shrink: 0;
}
.setComments-title-left{
letter-spacing: 1rpx;
flex-grow: 1;
color: #282828;
font-size: 26rpx;
font-weight: bold;
margin-right: 20rpx;
}
.center-line{
position: absolute;
left: 0;
top: 30rpx;
width: 4rpx;
height: 23rpx;
background: #282828;
}
.setComments-content{
position: relative;
background: #FFFFFF;
padding: 21rpx 27rpx 0 22rpx;
box-shadow: 0rpx 6rpx 29rpx 0rpx rgba(76, 76, 76, 0.09);
border-radius: 30rpx;
}
.setComments-content-box{
padding: 0 50rpx;
}
.setComments-add van-icon{
font-size: 25rpx;
margin-right: 20rpx;
}
.setComments-add{
width: 190rpx;
margin: auto;
border-radius: 27rpx;
border: 1rpx solid #FB6087;
color: #FB6087;
font-size: 24rpx;
letter-spacing: 1rpx;
padding: 10rpx 0;
margin-bottom: 47rpx;
text-align: center;
}
.index-student-information{
min-height: 800rpx;
>>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
background: #FFFFFF; background: #FFFFFF;
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
padding: 71rpx 0 30rpx 0; padding: 71rpx 0 30rpx 0;
......
...@@ -51,6 +51,11 @@ ...@@ -51,6 +51,11 @@
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "pages/setComments/commentRulesList",
"style": {
"navigationStyle": "custom"
}
} }
], ],
......
<template>
<view class="commentRulesList-box">
<navbar class="navbarSticky" bg="#FFFFFF">
<view class="commentRulesList-header-box flex">
<van-icon class="commentRulesList-header-left" name="arrow-left" @click="back"/>
<text class="commentRulesList-header-title">评论规则</text>
</view>
</navbar>
<view class="commentRulesList-content">
<view class="commentRulesList-title flex">
<van-image class="img" width="35rpx" height="40rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980136000_413.png" />
<text>默认评论规则</text>
</view>
<view class="commentRulesList-list">
<view class="commentRulesList-cross" @click="deleteRules">
<van-icon name="cross" />
</view>
<view class="commentRulesList-img flex">
<view>百分比: 0%-40%</view>
<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="commentRulesList-comment">
这位学员很优秀,平时课上的问题都
能积极回答,正确率非常高
。这次考试得分也很高,希望再接再厉
</view>
</view>
<view class="noData">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653902791000_806.png" mode="widthFix"></image>
<view>暂无评论规则数据</view>
</view>
</view>
<view class="commentRulesList-footer-box">
<view class="commentRulesList-footer flex">
<view class="add flex">
<text>添加自定义规则</text>
<view class="Wire"></view>
</view>
<view class="save flex"><text>保存</text></view>
</view>
</view>
<rulesPopup></rulesPopup>
</view>
</template>
<script>
import rulesPopup from '@/components/setComments/rulesPopup'
import setComments from '@/components/setComments/setComments'
import {
reactive,
toRefs,
onMounted,
getCurrentInstance,
inject
} from "vue";
import navbar from '../../components/navbar.vue'
export default {
props: {
},
components: {
navbar,
setComments,
rulesPopup
},
setup() {
let {
proxy
} = getCurrentInstance();
let data = reactive({
value:1,
optionsList:[
{ text: '部分可见', value: 0 },
{ text: '可见不可见', value: 1 },
{ text: '活动商品', value: 2 },
],
radioList:[
{name:'使用默认配置',id:1,checked:true},
{name:'自定义评价',id:2}
],
checked:'1',
obj:{},
Msg: {
HomeWorkId: '',
},
showPhone: false,
showLogin: true, //多次点击
HomeWorkId:'',
jobDetails: {},
dataList:[],
pageState:'more'
});
let methods = {
back(){
uni.navigateBack({
delta: 1
})
},
editRules(){//编辑规则
},
deleteRules (){//删除规则
uni.showModal({
title: '提示',
content: '将删除该规则,是否继续',
success: function (res) {
if (res.confirm) {
console.log('---')
} else if (res.cancel) {
uni.showToast({
title:'已取消',
icon:'none',
duration: 500
})
}
}
});
}
}
return {
...toRefs(data),
...methods
};
},
onLoad(option) {
this.Msg.HomeWorkId = option.HomeWorkId
},
};
</script>
<style scoped>
.noData{
text-align: center;
flex:1;
width: 100%;
}
.noData image{
width:200rpx;
margin-bottom: 40rpx;
}
.noData view{
font-size: 24rpx;
color: #cecece;
text-align: center;
}
.save{
margin-left: 24rpx;
}
.Wire{
width: 2rpx;
height: 32rpx;
background: #DCDCDC;
margin-left: 24rpx;
flex-shrink: 0;
margin-top: 25rpx;
}
.save text{
background: #D13A48;
color: #FFFFFF;
}
.add text{
background: #FFFFFF;
color: #D13A48;
}
.add text,.save text{
line-height: 88rpx;
flex-grow: 2;
border: 1rpx solid #D13A48;
border-radius: 44rpx;
text-align: center;
font-weight: bold;
font-size: 30rpx;
letter-spacing: 1rpx;
}
.add,.save{
flex: 0 0 50%;
flex-shrink: 0;
}
.commentRulesList-footer{
padding: 29rpx 70rpx;
align-items: center;
}
.commentRulesList-footer-box{
position: fixed;
left: 0;
right: 0;
bottom: 0;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 21rpx 0rpx rgba(165, 165, 165, 0.34);
}
.commentRulesList-comment{
font-size: 30rpx;
font-weight: 400;
color: #282828;
line-height: 58rpx;
letter-spacing: 1rpx;
}
.commentRulesList-img .img{
margin-top: 5rpx;
flex-shrink: 0;
}
.commentRulesList-img view{
flex-grow: 1;
margin-right: 15rpx;
}
.commentRulesList-img{
justify-content: space-between;
align-items: center;
font-size: 30rpx;
font-weight: bold;
color: #D9868D;
margin-bottom: 34rpx;
}
.commentRulesList-cross{
position: absolute;
right: -12rpx;
top: -12rpx;
width: 44rpx;
height: 44rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 21rpx 0rpx rgba(165, 165, 165, 0.34);
border-radius: 10rpx;
font-size: 26rpx;
color: #D9868D;
text-align: center;
line-height: 44rpx;
}
.commentRulesList-list{
background: #FCEEEF;
border-radius: 30px;
position: relative;
padding: 37rpx 38rpx 36rpx 45rpx;
margin-bottom: 40rpx;
min-height: 290rpx;
}
.commentRulesList-title .img{
flex-shrink: 0;
display: inline-block;
margin-top: 5rpx;
}
.commentRulesList-title text{
font-size: 40rpx;
font-weight: bold;
color: #282828;
margin-left: 29rpx;
letter-spacing: 1rpx;
}
.commentRulesList-title{
align-items: center;
margin-bottom: 35rpx;
}
.commentRulesList-content{
padding: 0 50rpx;
margin-bottom: 240rpx;
}
.commentRulesList-box{
background: #FFFFFF;
}
.commentRulesList-header-title{
font-size: 32rpx;
font-weight: 500;
color: #282828;
flex:1;
text-align: center;
padding-right: 40rpx;
}
.navbarSticky {
display: sticky;
top: 0;
z-index: 9;
}
</style>
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<text class="setComments-index-header-title">设置评语</text> <text class="setComments-index-header-title">设置评语</text>
</view> </view>
</navbar> </navbar>
<<<<<<< HEAD
<view class="setComments-index-content"> <view class="setComments-index-content">
<view class="setComments-index-setType flex"> <view class="setComments-index-setType flex">
<view class="setComments-setType-left flex"> <view class="setComments-setType-left flex">
...@@ -28,6 +29,32 @@ ...@@ -28,6 +29,32 @@
</view> </view>
<setComments :CourseCommentTimesList="courseTimeList" @refreshData="getCourseCommentTimes"></setComments> <setComments :CourseCommentTimesList="courseTimeList" @refreshData="getCourseCommentTimes"></setComments>
</view> </view>
=======
<view class="setComments-index-content">
<view class="setComments-index-setType flex">
<view class="setComments-setType-left flex">
<view>
<van-image class="img" width="29rpx" height="29rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653977710000_475.png" />
</view>
<view class="setComments-setType-text flex">
<text>自定义评价</text>
<view>从自动评价规则进入修改</view>
</view>
</view>
<view class="setComments-setType-right flex" @click="goRules">
<view>
<text>自动评价规则</text>
<van-image class="img" width="14rpx" height="13rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653977684000_601.png" />
</view>
</view>
</view>
<setComments></setComments>
</view>
>>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
</view> </view>
</template> </template>
<script> <script>
...@@ -88,6 +115,7 @@ ...@@ -88,6 +115,7 @@
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
<<<<<<< HEAD
}, },
radioChange(e) { radioChange(e) {
console.log("打印国家名称", e.target.value) console.log("打印国家名称", e.target.value)
...@@ -101,6 +129,15 @@ ...@@ -101,6 +129,15 @@
}) })
} }
} }
=======
},
goRules(){
uni.navigateTo({
url:'/pages/setComments/commentRulesList'
})
}
}
>>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
return { return {
...toRefs(data), ...toRefs(data),
...methods ...methods
...@@ -114,6 +151,7 @@ ...@@ -114,6 +151,7 @@
}; };
</script> </script>
<style scoped> <style scoped>
<<<<<<< HEAD
.setComments-setType-right view text { .setComments-setType-right view text {
margin-right: 11rpx; margin-right: 11rpx;
} }
...@@ -186,6 +224,69 @@ ...@@ -186,6 +224,69 @@
} }
.navbarSticky { .navbarSticky {
=======
.setComments-setType-right view text{
margin-right: 11rpx;
}
.setComments-setType-right view{
color: #D9868D;
background: #F5DEE0;
border-radius: 25rpx;
width: 200rpx;
height: 50rpx;
line-height: 50rpx;
text-align: center;
letter-spacing: 1rpx;
}
.setComments-setType-right{
flex-shrink: 0;
font-size: 24rpx;
font-weight: 500;
}
.setComments-setType-text view{
font-size: 24rpx;
color: #AFAFAF;
font-weight: 400;
margin-top: 15rpx;
}
.setComments-setType-text text{
font-size: 30rpx;
font-weight: bold;
color: #282828;
}
.setComments-setType-text{
flex-direction: column;
margin-left: 26rpx;
letter-spacing: 1rpx;
}
.setComments-setType-left view:first-child{
flex-shrink: 0;
}
.setComments-setType-left{
flex-grow: 1;
margin-right: 32rpx;
}
.setComments-index-setType{
background: #FCEEEF;
box-shadow: 0rpx 6rpx 52rpx 0rpx rgba(230, 65, 80, 0.19);
border-radius: 50rpx;
margin: 55rpx 50rpx 50rpx 50rpx;
padding: 33rpx 50rpx;
}
.setComments-index-box{
background: #F6F6F6;
}
.setComments-index-header-title{
font-size: 32rpx;
font-weight: 500;
color: #282828;
flex:1;
text-align: center;
padding-right: 40rpx;
}
.navbarSticky {
>>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
display: sticky; display: sticky;
top: 0; top: 0;
z-index: 9; z-index: 9;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment