Skip to content

S
self-support
Commit 7aa05a24 authored by 刘用法's avatar 刘用法
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents 2a134270 6bcdfaea
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 34 deletions
src/components/createCom/XhCheckbox.vue
View file @ 7aa05a24
......@@ -54,7 +54,7 @@
display: flex;
flex-wrap: wrap;
.txt{
color:#666;
color:#333;
padding:10rpx 30rpx;
margin: 5rpx;
background: #F4F5F7;
......@@ -62,7 +62,8 @@
display: flex;
flex-wrap: wrap;
line-height: 50rpx;
max-width: 48%;
max-width: 48%;
align-items: center;
&.active{
background-color: #2272FF;
color:#fff;
......
src/components/createCom/XhRadio.vue
View file @ 7aa05a24
......@@ -36,7 +36,7 @@
display: flex;
flex-wrap: wrap;
.txt{
color:#666;
color:#333;
padding:10rpx 30rpx;
margin: 5rpx;
background: #F4F5F7;
......@@ -44,8 +44,8 @@
display: flex;
flex-wrap: wrap;
line-height: 50rpx;
text-align: center;
max-width: 48%;
max-width: 48%;
align-items: center;
&.active{
background-color: #2272FF;
color:#fff;
......
src/components/photo/preview.vue
View file @ 7aa05a24
......@@ -162,7 +162,6 @@
}
},
fail(e) {
debugger
}
})
}
......
src/pages/learn/index.vue
View file @ 7aa05a24
......@@ -13,7 +13,7 @@
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
<view class="currency-class" :style="{'background-image':'url(/static/photo/jianbian@3x.png)'}">
<view class="class1" @click=ccc(courselist[0].id)>
<view class="class1" @click="goToPrint">
<image class="img" :src="rule.pic" mode=""></image>
<view class="right u-margin-left-30 u-padding-top-10 u-padding-bottom-14 width-360">
<view class="u-font-32 font-bold">
......@@ -53,7 +53,7 @@
<view class="top">
<view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view>
<view class="currency-class">
<view class="class1" @click=ccc(courselist[0].id)>
<view class="class1" @click=ccc(courselist[0].sectionId)>
<image class="img" :src="courselist[0].pic" mode=""></image>
<view class="right">
<view class="u-font-32 font-bold">
......@@ -72,7 +72,7 @@
</view>
</view>
</view>
<view class="class1 u-margin-top-40" @click=ccc(courselist[1].id)>
<view class="class1 u-margin-top-40" @click=ccc(courselist[1].sectionId)>
<image class="img" :src="courselist[1].pic" mode=""></image>
<view class="right">
<view class="u-font-32 font-bold">
......@@ -94,7 +94,7 @@
</view>
<view class="title u-margin-top-50 u-margin-bottom-30">技能课程</view>
<view class="currency-class">
<view class="class1" @click=ccc(courselist[2].id)>
<view class="class1" @click=ccc(courselist[2].sectionId)>
<image class="img" :src="courselist[2].pic" mode=""></image>
<view class="right">
<view class="u-font-32 font-bold">
......@@ -221,7 +221,8 @@
percent: 0,
status: '',
pic: process.uniEnv.qn_base_url + "guifan1@3x.png",
id: 173
id: 173,
sectionId: ''
},
{
title: '接单操作',
......@@ -229,7 +230,8 @@
percent: 0,
status: '',
pic: process.uniEnv.qn_base_url + "guifan2@3x.png",
id: 173
id: 173,
sectionId: ''
},
{
title: '从0-1学习充电桩安装服务',
......@@ -237,7 +239,8 @@
percent: 0,
status: '',
pic: process.uniEnv.qn_base_url + "kecehng1@3x.png",
id: 173
id: 173,
sectionId: ''
}
],
examList: [{
......@@ -356,6 +359,7 @@
res.data.learnedInfo.learnPercent *= 100;
this.courselist[i].status = this.getTypeName(res.data.learnedInfo.learnPercent);
this.courselist[i].percent = res.data.learnedInfo.learnPercent;
this.courselist[i].sectionId = res.data.learnedInfo.nextLearnedSectionId;
}
}
})
......@@ -418,7 +422,7 @@
//跳转到课程介绍
ccc(id) {
uni.navigateTo({
url: "./curriculum?course_id=" + id,
url: "./section?section_id=" + 288,
});
},
//跳转到
......
src/pages/learn/section.vue
View file @ 7aa05a24
......@@ -8,23 +8,35 @@
<view class="item-content">
<view class="item-st">
<image style="width: 80rpx; height: 36rpx" :src="kcImage"></image>
<text class="item-st-text">{{ courseTitle.split(" ") ? courseTitle.split(" ")[0] : "" }}</text>
<text class="item-st-text">5课时</text>
</view>
<view class="item-title">{{ courseTitle.split(" ") ? courseTitle.split(" ")[1] : "" }}</view>
<view class="item-title">服务规范</view>
</view>
<view>接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。</view>
</view>
<view class="learn-view" v-if="courseId >= 0">
<view class="learn-view-title">视频内容介绍</view>
<!-- <view
class="learn-list"
v-for="(item, key) in courseOutlines[courseId]"
:key="key"
> -->
<!-- <view class="learn-list-item">{{ item }}</view> -->
<view class="u-content">
<u-parse :html="CourseSectionlist.content"></u-parse>
</view>
<view class="learn-view-title">课程讲师</view>
<view class="" style="padding-top: 30rpx;display: flex;padding-left: 30rpx;">
<u-avatar :style="{'width':'100rpx', 'height':'100rpx'}" :src="teacher.avatar" mode="circle"></u-avatar>
<view style="height:120rpx;font-size: 30rpx;padding-left:30rpx;">
<view class="" style="display: flex;font-size: 32rpx;">
<view class="" style="font-size: 32rpx;font-weight: bold;">{{ teacher.name }}</view>
<view class="" style="font-size: 24rpx;margin-left: 30rpx;margin-top: 6rpx;">课程讲师</view>
</view>
<view class="" style="font-size: 24rpx;margin-top: 30rpx;">反正这里就是放老师的简介，只是写啥我也不知道，反正就是写很厉害的简介啦</view>
</view>
</view>
<view class="learn-view-title">目录</view>
<view class="" style="display: flex;overflow: auto;padding-top: 30rpx;padding-bottom: 30rpx;">
<view v-for="(item, index) in list" :key="index">
<view @click="goNext(item.id)" class="list-cell list-default" :class="{'list-default-active': item.isActive}" style="width:280rpx;height:150rpx;margin-left: 20rpx;padding: 20rpx;border-radius: 12rpx;">
<view class="" style="font-size: 24rpx;">{{ item.title }}</view>
<view class="" style="font-size: 26rpx;margin-top: 16rpx;">
{{ item.intro }}
</view>
</view>
</view>
</view>
</view>
</view>
......@@ -53,6 +65,17 @@
section_id: 0,
isShowVideo: false,
CourseSectionlist: {name: '', content: ''}, //节信息
list: [
{'title': '第一节', 'intro': '考核规则1：接单及 时率', 'isActive': true},
{'title': '第二节', 'intro': '考核规则1：接单及 时率', 'isActive': false},
{'title': '第三节', 'intro': '考核规则1：接单及 时率', 'isActive': false},
{'title': '第四节', 'intro': '考核规则1：接单及 时率', 'isActive': false},
{'title': '第五节', 'intro': '考核规则1：接单及 时率', 'isActive':false},
],
teacher: {
name: "",
avatar: ""
},
playerOptions: {
playbackRates: [0.7, 1.0, 1.5, 2.0], //播放速度
autoplay: true, //如果true,浏览器准备好时开始回放。
......@@ -118,6 +141,11 @@
// #endif
},
methods: {
goNext(id){
uni.navigateTo({
url: "./section?section_id=" + id,
});
},
onPlayerTimeupdate(player) {
console.log('-----onplay----');
console.log(player);
......@@ -165,6 +193,8 @@
this.courseDesc = res.data.content;
this.section_id = res.data.id;
this.section_content = res.data.content;
this.teacher.name = res.data.teachers[0].name;
this.teacher.avatar = res.data.teachers[0].avatar;
if (this.isShowVideo) {
let coureWareList = res.data.courseware;
this.courseSrc = coureWareList[0].src;
......@@ -195,7 +225,7 @@
status: 1,
};
this.$u.api.updateLearnCourses(param).then((res) => {
console.log('--' + this.howTimeToUpdateLearnedStatus + '更新一次观看状态--time:' + nowTime);
// console.log('--' + this.howTimeToUpdateLearnedStatus + '更新一次观看状态--time:' + nowTime);
}).catch((err) => {
console.log('--------updateLearnedStatusForText---------');
console.log(err);
......@@ -326,8 +356,8 @@
.learn-view {
background-color: #ffffff;
border-radius: 12rpx;
padding: 38rpx 30rpx 30rpx 30rpx;
margin-bottom: 20rpx;
// padding: 38rpx 30rpx 30rpx 30rpx;
// margin-bottom: 20rpx;
font-size: 32rpx;
color: #333333;
......@@ -335,6 +365,8 @@
font-size: 32rpx;
font-weight: bold;
margin-bottom: 10rpx;
padding-top: 30rpx;
margin-left: 30rpx;
}
.learn-list {
......@@ -358,4 +390,18 @@
padding: 40rpx 30rpx;
margin-bottom: 20rpx;
}
.list-default {
background-color: #F4F5F7;
border-radius: 12rpx;
color: #333333;
}
.list-default-active {
background-color: #ffffff;
border-radius: 12rpx;
color: #2272FF;
border: 2rpx solid #2272FF;
box-sizing: border-box;
}
</style>
src/pages/order/complete.vue
View file @ 7aa05a24
<template>
<view class="com-content">
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" @close="closeCheckResult" @handle-problem="handerProgrom"></complete-check>
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="u-wrap" v-if="!takeStatus">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper>
......@@ -325,6 +325,11 @@
self.completeCheckResult = checkResult
return pass
},
confirm(){// 检查结果窗口 确认回调
uni.navigateTo({
url: 'pages/order/index'
})
},
closeCheckResult(){// 检查结果窗口取消回调
this.completeCheckStatus = false
},
......@@ -348,7 +353,6 @@
self.completeCheckStatus = true
}else{
console.log("完工");
self.completeCheckStatus = true
if(self.inGuaranteePeriod === 'Y'){
self.$u.api.inOrderFinish(self.orderId).then((res)=>{
console.log(res)
......
src/pages/order/feedback.vue
View file @ 7aa05a24
......@@ -160,8 +160,6 @@ export default {
}
},
async onLoad(e) {
this.orderId = 1;
this.categoryId = 88;
if (e) {
this.orderId = e.orderId || null;
this.categoryId = e.categoryId || null;
......@@ -327,7 +325,6 @@ export default {
},
async submitForm() {
let self = this;
self.orderId = 666;
if (!self.orderId) {
uni.showToast({
icon: error,
......
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