Skip to content

T
thinkApp
Commit 26f77b1f authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 92bf768d 4b88036a
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 57 deletions
src/components/setComments/commentDetails.vue
View file @ 26f77b1f
......@@ -27,7 +27,10 @@
<view>暂无评论规则数据</view>
</view>
</view>
<commentDetailsPopu ref="getcommentPopup" @change="changeData"></commentDetailsPopu>
<template v-show="show">
<commentDetailsPopu ref="getcommentPopup" @change="changeData"></commentDetailsPopu>
</template>
</view>
</template>
<script>
......
src/components/setComments/commentDetailsPopu.vue
View file @ 26f77b1f
......@@ -87,16 +87,6 @@
};
</script>
<style scoped>
.custom-button {
width: 26rpx;
color: #fff;
font-size: 20rpx;
line-height: 36rpx;
text-align: center;
background-color: #ee0a24;
border-radius: 100rpx;
}
.commentPopup-content {
background: #F7F7F7;
border-radius: 30rpx;
......@@ -115,41 +105,6 @@
text-align: center;
color: #FFFFFF;
}
.commentPopup-save {
justify-content: center;
margin-top: 40rpx;
}
.commentPopup-box .noData {
text-align: center;
flex: 1;
width: 100%;
}
.commentPopup-box .noData image {
width: 200rpx;
margin-bottom: 40rpx;
}
.commentPopup-box .noData view {
font-size: 24rpx;
color: #cecece;
text-align: center;
}
.commentPopup-name {
background-color: #F7F7F7;
text-align: center;
border: 1px solid #F7F7F7;
height: 88rpx;
line-height: 88rpx;
padding: 0 10rpx;
border-radius: 44rpx;
font-size: 30rpx;
letter-spacing: 1rpx;
}
.commentPopup-title {
width: 100%;
text-align: center;
......
src/components/setComments/studentsPopu.vue 0 → 100644
View file @ 26f77b1f
<template>
<van-popup :show="show" :round="true" position="bottom"
custom-style="height: 80%" @close="closepopup">
<view class="studentsPopu-box flex">
<view class="studentsPopu-title">选择学员 <text>(2/50)</text></view>
<view class="studentsPopu-search flex">
<van-search
:value="Keywords"
shape="round"
style="border-radius: 20rpx;width: 100%;"
input-align="center"
background="#F6F6F6"
@change="searchKeywords"
placeholder="请输入搜索关键词"
/>
</view>
<view class="studentsPopuImg">
<view class="studentsPopu-img-box flex">
<view class="studentsPopu-img-list active flex" @click="clickChoose">
<view class="studentsPopu-imgbox flex">
<view class="studentsPopu-img flex">
<view>
<van-image width="119rpx" height="119rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653894197000_691.png" />
</view>
</view>
</view>
<text class="studentsPopu-text">学员名称</text>
</view>
<view class="studentsPopu-img-list flex" @click="clickChoose">
<view class="studentsPopu-imgbox flex">
<view class="studentsPopu-img flex">
<view>
<van-image width="119rpx" height="119rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653894197000_691.png" />
</view>
</view>
</view>
<text class="studentsPopu-text">学员名称</text>
</view>
</view>
</view>
<view class="footer">
<view class="studentsPopu-save flex">
<view @click="save">确认</view>
</view>
</view>
</view>
</van-popup>
</template>
<script>
import {
ref,
reactive,
toRefs,
onMounted,
getCurrentInstance,
inject,
watch
} from "vue";
import { uploadFile } from "@/utils/index";
export default {
props: {
},
components: {},
setup(props,ctx) {
let {
proxy
} = getCurrentInstance();
let data = reactive({
show: false,
loading: false,
Keywords:''
});
let methods = {
// 选中
clickChoose(){
},
// 搜索
searchKeywords(){
},
showFun(){
data.show = true
},
closepopup(){
data.show = false
},
save(){
data.show = false
}
};
let that = methods;
return {
...toRefs(data),
...methods
};
},
onLoad(){
},
onShow() {
}
};
</script>
<style scoped>
.studentsPopu-text{
text-align: center;
font-weight: 500;
font-size: 26rpx;
color: #282828;
letter-spacing: 1rpx;
margin-top: 15rpx;
}
.studentsPopu-img view{
width: 119rpx;
height: 119rpx;
/* border: 1rpx solid #E5E5E5; */
background: #E5E5E5;
border-radius: 50%;
overflow: hidden;
}
.studentsPopu-img-list.active .studentsPopu-img{
background: #C91928;
box-shadow: 0rpx 0rpx 59rpx 0rpx rgba(201, 23, 39, 0.34);
}
.studentsPopu-img{
width: 130rpx;
height: 130rpx;
background: #FFFFFF;
box-shadow: 0rpx 6rpx 29rpx 0rpx rgba(76, 76, 76, 0.09);
border-radius: 50%;
justify-content: center;
align-items: center;
}
.studentsPopu-imgbox{
justify-content: center;
}
.studentsPopu-img-list{
flex: 0 0 25%;
flex-direction: column;
}
.studentsPopu-img-box{
height: 90%;
padding: 40rpx 25rpx;
flex-wrap: wrap;
margin-bottom: 100rpx;
overflow-y: auto;
}
.studentsPopuImg{
max-height: 670rpx;
overflow: hidden;
}
.studentsPopu-search{
padding: 30rpx 27rpx 5rpx 27rpx;
}
.studentsPopu-title text{
font-size: 26rpx;
color: #949494;
font-weight: 400;
margin-left: 20rpx;
}
.studentsPopu-title{
font-size: 36rpx;
font-weight: 800;
color: #282828;
letter-spacing: 1rpx;
padding: 48rpx 55rpx 0 55rpx;
}
.studentsPopu-save view{
background: #C91727;
font-size: 30rpx;
font-weight: bold;
letter-spacing: 1rpx;
width: 260rpx;
line-height: 88rpx;
border-radius: 44rpx;
text-align: center;
color: #FFFFFF;
}
.studentsPopu-save{
justify-content: center;
margin-top: 40rpx;
margin-bottom: 40rpx;
}
.studentsPopu-box{
background: #f6f6f6;
/* padding: 48rpx 0 60rpx 0; */
flex-direction: column;
height: 100%;
overflow: hidden;
}
.footer{
position: fixed;
left: 0;
right: 0;
bottom: 0;
}
</style>
src/pages/setComments/addComment.vue
View file @ 26f77b1f
......@@ -14,23 +14,49 @@
</text>
</view>
<view class="addComment-img-box flex">
<view class="addComment-img-list flex">
<view class="addComment-img">
<view>
<van-icon name="plus" />
<view class="addComment-img-list activeOne flex" @click="selectStudents">
<view class="addComment-imgbox flex">
<view class="addComment-img">
<view>
<van-icon name="plus" />
</view>
</view>
</view>
<text class="addComment-text">添加学员</text>
</view>
<view class="addComment-img-list flex">
<view class="addComment-imgbox flex">
<view class="addComment-img">
<view>
<van-image width="119rpx" height="119rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653894197000_691.png" />
</view>
</view>
</view>
<text class="addComment-text">学员名称</text>
</view>
</view>
<!-- <setComments :CourseCommentTimesList="courseTimeList" @refreshData="getCourseCommentTimes"></setComments> -->
<view class="addComment-textarea-box">
<view class="content-textarea-box">
<textarea placeholder="请填写评论内容"></textarea>
</view>
<view class="Sure-button flex">
<view v-if="clickShow" @click="clickSure" >确定</view>
<view v-else class="active" >确定</view>
</view>
</view>
<template v-show="show">
<studentsPopu ref="getstudentsPopup"></studentsPopu>
</template>
</view>
<view class="addComment-bj"></view>
</view>
</template>
<script>
import setComments from '@/components/setComments/setComments'
import studentsPopu from '@/components/setComments/studentsPopu'
import {
ref,
reactive,
toRefs,
onMounted,
......@@ -44,9 +70,12 @@
},
components: {
navbar,
setComments
studentsPopu
},
setup() {
let {
refs
} = getCurrentInstance();
let {
proxy
} = getCurrentInstance();
......@@ -81,6 +110,8 @@
},
courseTimeList: [], //课程自动生成评论次数
courseRule: {}, //课程评价规则
clickShow:true,
show:false
});
let methods = {
back() {
......@@ -89,6 +120,19 @@
})
},
// 点击弹出学员列表
selectStudents(){
data.show = true
setTimeout(()=>{
refs.getstudentsPopup.$vm.showFun()
},500)
},
// 点击确定
clickSure(){
data.clickShow = false
console.log(data.clickShow)
},
radioChange(e) {
console.log("打印国家名称", e.target.value)
},
......@@ -129,12 +173,81 @@
};
</script>
<style scoped>
.Sure-button view.active{
background-color: #F6F6F6;
color: #C91727;
}
.Sure-button view{
width: 359rpx;
line-height: 88rpx;
background-color: #C91727;
border-radius: 44rpx;
color: #FFFFFF;
font-size: 30rpx;
font-weight: bold;
text-align: center;
letter-spacing: 1rpx;
}
.Sure-button{
justify-content: center;
margin-top: 67rpx;
}
.content-textarea-box textarea{
width: 100%;
}
.content-textarea-box{
background: #F6F6F6;
border-radius: 30rpx;
padding: 33rpx 37rpx;
min-height: 537rpx;
}
.addComment-textarea-box{
border-radius: 50rpx 50rpx 0 0;
/* background: #FFFFFF; */
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654049334000_485.png') no-repeat top 0 center #FFFFFF;
background-size: 141rpx 41rpx;
padding: 50rpx 50rpx 37rpx 50rpx;
}
.addComment-text{
text-align: center;
font-weight: 500;
font-size: 26rpx;
color: #282828;
letter-spacing: 1rpx;
margin-top: 15rpx;
}
.addComment-img-list.activeOne .addComment-img view{
text-align: center;
line-height: 123rpx;
color: #DCDCDC;
font-weight: bold;
font-size: 50rpx;
}
.addComment-img view{
width: 119rpx;
height: 119rpx;
border: 1rpx solid #DBDBDB;
border-radius: 50%;
margin: 5rpx;
overflow: hidden;
}
.addComment-img{
width: 130rpx;
height: 130rpx;
background: #FFFFFF;
border-radius: 50%;
}
.addComment-imgbox{
justify-content: center;
}
.addComment-img-list{
flex: 0 0 25%;
flex-direction: column;
}
.addComment-img-box{
padding: 0 50rpx;
justify-content: space-between;
padding: 0 20rpx;
flex-wrap: wrap;
margin-bottom: 50rpx;
}
.addComment-title van-icon{
font-size: 38rpx;
......@@ -165,6 +278,19 @@
position: relative;
z-index: 3;
}
.addComment-content{
position: relative;
z-index: 1;
}
.addComment-bj{
position: fixed;
right: 0;
left: 0;
top: 0;
bottom: 0;
z-index: 0;
background: #F6F6F6;
}
.navbarSticky {
display: sticky;
top: 0;
......
src/pages/setComments/commentRulesList.vue
View file @ 26f77b1f
......@@ -38,7 +38,9 @@
<view class="save flex"><text v-if="!isDefaultRule" @click="saveRules">保存</text></view>
</view>
</view>
<rulesPopup ref="getrulesPopup" @change="changeData"></rulesPopup>
<template v-show="show">
<rulesPopup ref="getrulesPopup" @change="changeData"></rulesPopup>
</template>
</view>
</template>
<script>
......@@ -81,6 +83,7 @@
}, //课程规则
isDefaultRule: true, //是否是默认规则（
detailItem: {}, //当前编辑项
show:false
});
let methods = {
back() {
......
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