Skip to content

S
self-support
Commit f170223e authored by Damon's avatar Damon
Browse files
Options

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

parents ca0e8c74 0f554642
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 74 deletions
src/pages.json
View file @ f170223e
...@@ -204,7 +204,8 @@ ...@@ -204,7 +204,8 @@
"path": "cert/index", "path": "cert/index",
"style": { "style": {
"navigationBarTitleText": "我的证件", "navigationBarTitleText": "我的证件",
"navigationStyle":"custom" "navigationStyle":"custom",
"disableScroll": true
} }
}, },
{ {
......
src/pages/index/index.vue
View file @ f170223e
<template> <template>
<TabBarPage title="扳手会" :fixed="true"> <TabBarPage title="扳手会" :fixed="true">
<view class="content-view"> <view class="content-view">
<scroll-view scroll-y @scrolltolower="reachBottom" <scroll-view style="height: 100%;" scroll-y @scrolltolower="reachBottom"
scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh" refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
@refresherrestore="onRestore" @refresherabort="onAbort" enable-back-to-top> @refresherrestore="onRestore" @refresherabort="onAbort" enable-back-to-top>
......
src/pages/index/learn.vue
View file @ f170223e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs" <u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs"
:current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper> :current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper>
<swiper class="swiper_group" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"> <swiper class="swiper_group" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 0"> <swiper-item @touchmove.stop.prevent="stopTouchMove">
<scroll-view scroll-y style="height:100%;width:100%;"> <scroll-view scroll-y style="height:100%;width:100%;">
<view class="jf-currency-class"> <view class="jf-currency-class">
<image :src="jianBianImg" mode="" class="current-img"></image> <image :src="jianBianImg" mode="" class="current-img"></image>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 1"> <swiper-item @touchmove.stop.prevent="stopTouchMove">
<scroll-view scroll-y style="height:100%;width:100%;" @scrolltolower="onreachBottom" scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @refresherpulling="onPulling" @refresherrefresh="onRefresh" @refresherrestore="onRestore" @refresherabort="onAbort"> <scroll-view scroll-y style="height:100%;width:100%;" @scrolltolower="onreachBottom" scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @refresherpulling="onPulling" @refresherrefresh="onRefresh" @refresherrestore="onRestore" @refresherabort="onAbort">
<view v-for="item in list" :key="item.id" class="notice" @click="bbb(item)"> <view v-for="item in list" :key="item.id" class="notice" @click="bbb(item)">
<view class="n-head"> <view class="n-head">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 2"> <swiper-item @touchmove.stop.prevent="stopTouchMove">
<scroll-view scroll-y style="height:100%;width:100%;"> <scroll-view scroll-y style="height:100%;width:100%;">
<view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view> <view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view>
<view class="learn-currency-class"> <view class="learn-currency-class">
...@@ -81,8 +81,7 @@ ...@@ -81,8 +81,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="title u-margin-top-30 u-margin-bottom-30">技能课程</view> <view class="learn-currency-class u-margin-bottom-20 u-margin-top-30" style="padding-bottom: 300rpx;">
<view class="learn-currency-class u-margin-bottom-20" style="padding-bottom: 300rpx;">
<view class="learn-class1" @click="goPlay(courselist[2])"> <view class="learn-class1" @click="goPlay(courselist[2])">
<image class="learn-img" :src="courselist[2].pic" mode=""></image> <image class="learn-img" :src="courselist[2].pic" mode=""></image>
<image class="bofang" :src="bofang" mode=""></image> <image class="bofang" :src="bofang" mode=""></image>
...@@ -103,7 +102,7 @@ ...@@ -103,7 +102,7 @@
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 3"> <swiper-item @touchmove.stop.prevent="stopTouchMove">
<scroll-view scroll-y style="height:100%;width:100%;"> <scroll-view scroll-y style="height:100%;width:100%;">
<view class="title u-margin-top-10 u-margin-bottom-30">通用认证</view> <view class="title u-margin-top-10 u-margin-bottom-30">通用认证</view>
<view class="currency-class"> <view class="currency-class">
...@@ -151,8 +150,8 @@ ...@@ -151,8 +150,8 @@
var json = { var json = {
dev: [ dev: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "为用户提供更好服务，自己赚更多钱", desc: "前期的安装材料及安装工具的准备是工作的良好开始",
pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -160,8 +159,8 @@ var json = { ...@@ -160,8 +159,8 @@ var json = {
sectionId: "", sectionId: "",
}, },
{ {
title: "接单规范", title: "服务理念与时效",
desc: "快速学习，使用APP 接单、抢单", desc: "为用户提供更好的服务，自己赚更多的钱",
pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -169,8 +168,8 @@ var json = { ...@@ -169,8 +168,8 @@ var json = {
sectionId: "", sectionId: "",
}, },
{ {
title: "从0-1学习充电桩安装服务", title: "充电桩安装要点提示",
desc: "让你全面了解充电桩市场及服务规范", desc: "在充电装安装过程中需要着重注意的要点",
pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png", pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -180,8 +179,8 @@ var json = { ...@@ -180,8 +179,8 @@ var json = {
], ],
test: [ test: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "为用户提供更好服务，自己赚更多钱", desc: "前期的安装材料及安装工具的准备是工作的良好开始",
pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -189,8 +188,8 @@ var json = { ...@@ -189,8 +188,8 @@ var json = {
sectionId: "", sectionId: "",
}, },
{ {
title: "接单规范", title: "服务理念与时效",
desc: "快速学习，使用APP 接单、抢单", desc: "为用户提供更好的服务，自己赚更多的钱",
pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -198,8 +197,8 @@ var json = { ...@@ -198,8 +197,8 @@ var json = {
sectionId: "", sectionId: "",
}, },
{ {
title: "从0-1学习充电桩安装服务", title: "充电桩安装要点提示",
desc: "让你全面了解充电桩市场及服务规范", desc: "在充电装安装过程中需要着重注意的要点",
pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png", pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -209,24 +208,24 @@ var json = { ...@@ -209,24 +208,24 @@ var json = {
], ],
prod: [ prod: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "为用户提供更好服务，自己赚更多钱", desc: "前期的安装材料及安装工具的准备是工作的良好开始",
pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "fwgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
sectionId: "", sectionId: "",
}, },
{ {
title: "接单规范", title: "服务理念与时效",
desc: "快速学习，使用APP 接单、抢单", desc: "为用户提供更好的服务，自己赚更多的钱",
pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png", pic: process.uniEnv.qn_base_url + "jdgf-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
sectionId: "", sectionId: "",
}, },
{ {
title: "从0-1学习充电桩安装服务", title: "充电桩安装要点提示",
desc: "让你全面了解充电桩市场及服务规范", desc: "在充电装安装过程中需要着重注意的要点",
pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png", pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
...@@ -238,7 +237,7 @@ var json = { ...@@ -238,7 +237,7 @@ var json = {
var examJson = { var examJson = {
dev: [ dev: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "通过本认证，是接单的必要条件", desc: "通过本认证，是接单的必要条件",
condition: "随机20题，及格20题", condition: "随机20题，及格20题",
status: "", status: "",
...@@ -264,7 +263,7 @@ var examJson = { ...@@ -264,7 +263,7 @@ var examJson = {
], ],
test: [ test: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "通过本认证，是接单的必要条件", desc: "通过本认证，是接单的必要条件",
condition: "随机10题，及格10题", condition: "随机10题，及格10题",
status: "", status: "",
...@@ -290,7 +289,7 @@ var examJson = { ...@@ -290,7 +289,7 @@ var examJson = {
], ],
prod: [ prod: [
{ {
title: "服务规范", title: "安装材料及工具准备",
desc: "通过本认证，是接单的必要条件", desc: "通过本认证，是接单的必要条件",
condition: "随机20题，及格20题", condition: "随机20题，及格20题",
status: "", status: "",
...@@ -327,7 +326,7 @@ export default { ...@@ -327,7 +326,7 @@ export default {
name: "交付规范", name: "交付规范",
}, },
{ {
name: "培训通知", name: "消息通知",
}, },
{ {
name: "在线学习", name: "在线学习",
...@@ -408,6 +407,7 @@ export default { ...@@ -408,6 +407,7 @@ export default {
isReflesh: true, isReflesh: true,
triggered: false, triggered: false,
_freshing: false, _freshing: false,
isOnLoad: 0
}; };
}, },
onLoad(param) { onLoad(param) {
...@@ -425,13 +425,14 @@ export default { ...@@ -425,13 +425,14 @@ export default {
}, },
}, },
onShow: function (param) { onShow: function (param) {
this.isOnLoad = 1;
try { try {
if (param.tabs) { if (param.tabs) {
this.current = param.tabs; this.current = param.tabs;
this.swiperCurrent = param.tabs; this.swiperCurrent = param.tabs;
} }
} catch (e) {} } catch (e) {}
if (this.current == 2 || this.current == 3) { if (this.current == 1 ||this.current == 2 || this.current == 3) {
this.tabsChange(this.current); this.tabsChange(this.current);
} }
}, },
...@@ -709,31 +710,9 @@ export default { ...@@ -709,31 +710,9 @@ export default {
index index
].questionTime; ].questionTime;
var examInfo = this.examList[index]; var examInfo = this.examList[index];
if (examInfo.examStatus == 0) { wx.navigateTo({
wx.navigateTo({ url: "/pages/learn/assessment?examId=" + examInfo.id,
url: "/pages/learn/assessment?examId=" + examInfo.id, });
});
} else if (examInfo.examStatus == 1) {
let url = '';
if (examInfo.status == "已通过") {
url = "/pages/learn/exam-pass?userExamId=" +
examInfo.examId +
"&examId=" +
examInfo.id;
} else {
url = "/pages/learn/result?userExamId=" +
examInfo.examId +
"&examId=" +
examInfo.id
}
wx.navigateTo({
url: url,
});
} else if (examInfo.examStatus == 2) {
wx.navigateTo({
url: "/pages/learn/assessment?examId=" + examInfo.id,
});
}
}, },
//跳转到播放 //跳转到播放
goPlay(info) { goPlay(info) {
......
src/pages/learn/answer.vue
View file @ f170223e
...@@ -368,7 +368,7 @@ export default { ...@@ -368,7 +368,7 @@ export default {
var wz = str.indexOf("."); var wz = str.indexOf(".");
let str1 = str.substring(wz + 1); let str1 = str.substring(wz + 1);
console.log(that.currentItem); console.log(that.currentItem);
that.currentItem.question.content = str1; that.currentItem.question.content = str1.replace('*', '');
console.log(str1, "切割的字符串"); console.log(str1, "切割的字符串");
} }
if (res.data.data.answerList) { if (res.data.data.answerList) {
...@@ -682,6 +682,7 @@ export default { ...@@ -682,6 +682,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding-right: 30rpx;
.title-text { .title-text {
border-radius: 8rpx; border-radius: 8rpx;
......
src/pages/learn/assessment.vue
View file @ f170223e
...@@ -159,10 +159,12 @@ export default { ...@@ -159,10 +159,12 @@ export default {
uni.hideLoading(); uni.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data.ruleDisc) { if (res.data.data.ruleDisc) {
console.log(res.data.data.ruleDisc);
var str = res.data.data.ruleDisc; var str = res.data.data.ruleDisc;
console.log(str.substring(0, 11)); let strArr = str.split('（')[0].split('，');
this.ruleDisc = str.substring(0, 11); this.desc.title = strArr[0];
this.desc.score = strArr[1];
this.desc.time = strArr[2];
this.ruleDisc = strArr[3];
} }
} }
}, },
...@@ -206,7 +208,7 @@ export default { ...@@ -206,7 +208,7 @@ export default {
font-size: 40rpx; font-size: 40rpx;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
line-height: 20px; line-height: 68rpx;
padding: 50rpx 58rpx 46rpx 30rpx; padding: 50rpx 58rpx 46rpx 30rpx;
} }
......
src/pages/learn/section.vue
View file @ f170223e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<view class="title-content"> <view class="title-content">
<view class="item-content"> <view class="item-content">
<view class="item-st"> <view class="item-st">
<image style="width: 80rpx; height: 36rpx" :src="kcImage"></image> <image class="kc-image" :src="kcImage"></image>
<text class="item-st-text">{{ courseTotal }}课时</text> <text class="item-st-text">{{ courseTotal }}课时</text>
</view> </view>
<view class="item-title">{{ courseTitle }}</view> <view class="item-title">{{ courseTitle }}</view>
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
</view> </view>
<view class="learn-view" v-if="courseId >= 0"> <view class="learn-view" v-if="courseId >= 0">
<view class="learn-view-title color-teacher">课程讲师</view> <view class="learn-view-title color-teacher">课程讲师</view>
<view class="" style="padding-top: 30rpx;display: flex;padding-left: 30rpx;"> <view class="teacher-desc">
<u-avatar :style="{'width':'100rpx', 'height':'100rpx'}" :src="teacherImage" mode="circle"> <u-avatar :style="{'width':'100rpx', 'height':'100rpx'}" :src="teacherImage" mode="circle">
</u-avatar> </u-avatar>
<view style="height:120rpx;font-size: 30rpx;padding-left:30rpx;padding-right: 30rpx;"> <view class="teacher-right">
<view class="" style="display: flex;font-size: 32rpx;"> <view class="teacher-right-top">
<view class="" style="font-size: 32rpx;font-weight: bold;">{{ teacher.name }}</view> <view class="" style="font-size: 32rpx;font-weight: bold;">{{ teacher.name }}</view>
<view class="" <view class="teacher-disc">课程讲师
style="font-size: 24rpx;margin-left: 30rpx;margin-top: 6rpx;color: #999999;">课程讲师
</view> </view>
</view> </view>
<view class="" style="font-size: 24rpx;margin-top: 30rpx;">{{ teacherIntro }}</view> <view class="teacher-intro">{{ teacherIntro }}</view>
</view> </view>
</view> </view>
<u-line color="#F4F5F7" margin="30rpx 0 0 0" />
<view class="learn-view-title">目录</view> <view class="learn-view-title">目录</view>
<view class="scroll_box"> <view class="scroll_box">
<scroll-view scroll-x @scroll="scroll" :scroll-left="scrollValue"> <scroll-view scroll-x @scroll="scroll" :scroll-left="scrollValue">
...@@ -373,13 +373,13 @@ ...@@ -373,13 +373,13 @@
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
height: 820rpx; height: 820rpx;
padding: 0 30rpx;
.learn-view-title { .learn-view-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
margin-bottom: 10rpx; margin-bottom: 10rpx;
padding-top: 30rpx; padding-top: 30rpx;
margin-left: 30rpx;
} }
.learn-list { .learn-list {
...@@ -456,10 +456,8 @@ ...@@ -456,10 +456,8 @@
width: 100%; width: 100%;
height: 150rpx; height: 150rpx;
overflow: hidden; overflow: hidden;
// padding: 20rpx;
padding-left: 20rpx;
background: #fff; background: #fff;
// border: 1px solid red; margin-top: 30rpx;
} }
.scroll_box scroll-view { .scroll_box scroll-view {
...@@ -484,4 +482,38 @@ ...@@ -484,4 +482,38 @@
border: 2rpx solid #2272FF; border: 2rpx solid #2272FF;
box-sizing: border-box; box-sizing: border-box;
} }
.teacher-intro {
font-size: 24rpx;
margin-top: 15rpx;
}
.teacher-disc {
font-size: 24rpx;
margin-top: 6rpx;
color: #999999;
padding-left: 30rpx;
}
.kc-image {
width: 80rpx;
height: 36rpx
}
.teacher-desc {
padding-top: 30rpx;
display: flex;
padding-left: 30rpx;
}
.teacher-right {
font-size: 30rpx;
padding-left: 30rpx;
padding-right: 30rpx;
}
.teacher-right-top {
display: flex;
font-size: 32rpx;
}
</style> </style>
src/pages/mine/cert/index.vue
View file @ f170223e
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<view class="content-cody"> <view class="content-cody">
<u-cell-group :border="false"> <u-cell-group :border="false">
<u-cell-item v-for="(item, index) in list" :title="item.name" :value="item.isUploadName" :arrow="true" :key="index" <u-cell-item v-for="(item, index) in list" :title="item.name" :value="item.isUploadName" :arrow="true" :key="index"
:value-style="{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}"> :value-style="{'color': item.color,'padding-left':'30rpx','padding-right':'30rpx'}" @click="toDetail(item.keyName)"
:title-style="{'padding-left':'20rpx'}">
<u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon> <u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
</u-cell-item> </u-cell-item>
</u-cell-group> </u-cell-group>
...@@ -144,5 +145,7 @@ ...@@ -144,5 +145,7 @@
color: #007AFF; color: #007AFF;
} }
.u-cell {
padding: 26rpx 0 !important;
}
</style> </style>
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