Commit b3bd3150 authored by 刘用法's avatar 刘用法
parents fbe34a6b f842eb02
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
} }
.popBtnView { .popBtnView {
margin-top: 110rpx; margin-top: 65rpx;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
dx: 0, dx: 0,
}; };
}, },
onLoad() {}, onLoad() {
this.$refs.tabs.setFinishCurrent(current);
},
computed: { computed: {
swiperList() { swiperList() {
let list = this.currentItem.images || [] let list = this.currentItem.images || []
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</cover-view> </cover-view>
<canvas canvas-id="canvas" id="photoCanvas" class="canvas" <canvas canvas-id="canvas" id="photoCanvas" class="canvas"
:style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas> :style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas>
<view v-show="standardShow" class="page-mask" :z-index="10000"> <view v-if="standardShow" class="page-mask" :z-index="10000">
<photo-standard :currentItem="currentItem" /> <photo-standard :currentItem="currentItem" />
<view class="btn-close"> <view class="btn-close">
<image @click="closeShadow" class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></image> <image @click="closeShadow" class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></image>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<text class="title-view">学习</text> <text class="title-view">学习</text>
</u-navbar> </u-navbar>
<image :src="bannerImage" mode="" class="banner"></image> <image :src="bannerImage" mode="" class="banner"></image>
<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" @animationfinish="animationfinish"> <swiper class="swiper_group" :current="swiperCurrent" @animationfinish="animationfinish">
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 0"> <swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 0">
<scroll-view scroll-y style="height:100%;width:100%;"> <scroll-view scroll-y style="height:100%;width:100%;">
...@@ -23,10 +22,7 @@ ...@@ -23,10 +22,7 @@
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 1"> <swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 1">
<scroll-view scroll-y style="height:100%;width:100%;" @scrolltolower="onReachBottom" <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-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">
{{item.title}} {{item.title}}
...@@ -61,11 +57,9 @@ ...@@ -61,11 +57,9 @@
</view> </view>
</view> </view>
<view class="line-percent u-margin-top-35"> <view class="line-percent u-margin-top-35">
<u-line-progress active-color="#2979ff" :percent="courselist[0].percent" <u-line-progress active-color="#2979ff" :percent="courselist[0].percent" :show-percent="false">
:show-percent="false">
</u-line-progress> </u-line-progress>
<text class="font-default-color" :class="{'font-active-color':courselist[0].percent}" <text class="font-default-color" :class="{'font-active-color':courselist[0].percent}" v-text="courselist[0].status"></text>
v-text="courselist[0].status"></text>
</view> </view>
</view> </view>
<view class="learn-class1 u-margin-left-30" @click="goPlay(courselist[1])"> <view class="learn-class1 u-margin-left-30" @click="goPlay(courselist[1])">
...@@ -80,11 +74,9 @@ ...@@ -80,11 +74,9 @@
</view> </view>
</view> </view>
<view class="line-percent u-margin-top-35"> <view class="line-percent u-margin-top-35">
<u-line-progress active-color="#2979ff" :percent="courselist[1].percent" <u-line-progress active-color="#2979ff" :percent="courselist[1].percent" :show-percent="false">
:show-percent="false">
</u-line-progress> </u-line-progress>
<text class="font-default-color" :class="{'font-active-color':courselist[1].percent}" <text class="font-default-color" :class="{'font-active-color':courselist[1].percent}" v-text="courselist[1].status"></text>
v-text="courselist[1].status"></text>
</view> </view>
</view> </view>
</view> </view>
...@@ -101,13 +93,10 @@ ...@@ -101,13 +93,10 @@
{{ courselist[2].desc }} {{ courselist[2].desc }}
</view> </view>
</view> </view>
<view class="line-percent u-margin-top-35" <view class="line-percent u-margin-top-35" style="display:flex;justify-content: space-between;">
style="display:flex;justify-content: space-between;"> <u-line-progress active-color="#2979ff" :percent="courselist[2].percent" :show-percent="false">
<u-line-progress active-color="#2979ff" :percent="courselist[2].percent"
:show-percent="false">
</u-line-progress> </u-line-progress>
<text class="font-default-color" :class="{'font-active-color':courselist[2].percent}" <text class="font-default-color" :class="{'font-active-color':courselist[2].percent}" v-text="courselist[2].status"></text>
v-text="courselist[2].status"></text>
</view> </view>
</view> </view>
</view> </view>
...@@ -128,8 +117,7 @@ ...@@ -128,8 +117,7 @@
</view> </view>
<view class="u-font-24" style="display:flex;justify-content: space-between;"> <view class="u-font-24" style="display:flex;justify-content: space-between;">
<text class="font-color-999999">{{ examList[0].condition }}</text> <text class="font-color-999999">{{ examList[0].condition }}</text>
<text class="font-default-exam-color" <text class="font-default-exam-color" :class="{'font-active-color':examList[0].isComplete}">
:class="{'font-active-color':examList[0].isComplete}">
{{ examList[0].status }} {{ examList[0].status }}
</text> </text>
</view> </view>
...@@ -146,8 +134,7 @@ ...@@ -146,8 +134,7 @@
</view> </view>
<view class="u-font-24" style="display:flex;justify-content: space-between;"> <view class="u-font-24" style="display:flex;justify-content: space-between;">
<text class="font-color-999999">{{ examList[1].condition }}</text> <text class="font-color-999999">{{ examList[1].condition }}</text>
<text class="font-default-exam-color" <text class="font-default-exam-color" :class="{'font-active-color':examList[1].isComplete}">
:class="{'font-active-color':examList[1].isComplete}">
{{ examList[1].status }}</text> {{ examList[1].status }}</text>
</view> </view>
</view> </view>
...@@ -160,169 +147,176 @@ ...@@ -160,169 +147,176 @@
</template> </template>
<script> <script>
var json = { var json = {
"dev": [{ dev: [
"title": "服务规范", {
"desc": "为用户提供更好服务,自己赚更多钱", title: "服务规范",
"pic": process.uniEnv.qn_base_url + "fwgf-3x.png", desc: "为用户提供更好服务,自己赚更多钱",
"percent": 0, pic: process.uniEnv.qn_base_url + "fwgf-3x.png",
"status": "", percent: 0,
"id": 173, status: "",
"sectionId": "" id: 173,
sectionId: "",
}, },
{ {
"title": "接单规范", title: "接单规范",
"desc": "快速学习,使用APP 接单、抢单", desc: "快速学习,使用APP 接单、抢单",
"pic": process.uniEnv.qn_base_url + "jdgf-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"id": 173, id: 173,
"sectionId": "" sectionId: "",
}, },
{ {
"title": "从0-1学习充电桩安装服务", title: "从0-1学习充电桩安装服务",
"desc": "让你全面了解充电桩市场及服务规范", desc: "让你全面了解充电桩市场及服务规范",
"pic": process.uniEnv.qn_base_url + "cdz-3x.png", pic: process.uniEnv.qn_base_url + "cdz-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"id": 173, id: 173,
"sectionId": "" sectionId: "",
} },
], ],
"test": [{ test: [
"title": "服务规范", {
"desc": "为用户提供更好服务,自己赚更多钱", title: "服务规范",
"pic": process.uniEnv.qn_base_url + "fwgf-3x.png", desc: "为用户提供更好服务,自己赚更多钱",
"percent": 0, pic: process.uniEnv.qn_base_url + "fwgf-3x.png",
"status": "", percent: 0,
"id": 150, status: "",
"sectionId": "" id: 150,
sectionId: "",
}, },
{ {
"title": "接单规范", title: "接单规范",
"desc": "快速学习,使用APP 接单、抢单", desc: "快速学习,使用APP 接单、抢单",
"pic": process.uniEnv.qn_base_url + "jdgf-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"id": 149, id: 149,
"sectionId": "" sectionId: "",
}, },
{ {
"title": "从0-1学习充电桩安装服务", title: "从0-1学习充电桩安装服务",
"desc": "让你全面了解充电桩市场及服务规范", desc: "让你全面了解充电桩市场及服务规范",
"pic": process.uniEnv.qn_base_url + "cdz-3x.png", pic: process.uniEnv.qn_base_url + "cdz-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"id": 151, id: 151,
"sectionId": "" sectionId: "",
} },
], ],
"prod": [{ prod: [
"title": "服务规范", {
"desc": "为用户提供更好服务,自己赚更多钱", title: "服务规范",
"pic": process.uniEnv.qn_base_url + "fwgf-3x.png", desc: "为用户提供更好服务,自己赚更多钱",
"percent": 0, pic: process.uniEnv.qn_base_url + "fwgf-3x.png",
"status": "", percent: 0,
"sectionId": "" status: "",
sectionId: "",
}, },
{ {
"title": "接单规范", title: "接单规范",
"desc": "快速学习,使用APP 接单、抢单", desc: "快速学习,使用APP 接单、抢单",
"pic": process.uniEnv.qn_base_url + "jdgf-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"sectionId": "" sectionId: "",
}, },
{ {
"title": "从0-1学习充电桩安装服务", title: "从0-1学习充电桩安装服务",
"desc": "让你全面了解充电桩市场及服务规范", desc: "让你全面了解充电桩市场及服务规范",
"pic": process.uniEnv.qn_base_url + "cdz-3x.png", pic: process.uniEnv.qn_base_url + "cdz-3x.png",
"percent": 0, percent: 0,
"status": "", status: "",
"sectionId": "" sectionId: "",
} },
] ],
} };
var examJson = { var examJson = {
"dev": [{ dev: [
title: '服务规范', {
desc: '通过本认证,是接单的必要条件', title: "服务规范",
condition: '随机20题,及格20题', desc: "通过本认证,是接单的必要条件",
status: '', condition: "随机20题,及格20题",
status: "",
pic: process.uniEnv.qn_base_url + "fwgf-3x.png", pic: process.uniEnv.qn_base_url + "fwgf-3x.png",
id: 2, id: 2,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
}, },
{ {
title: '接单操作', title: "接单操作",
desc: '快速认证,是否具备接单操作能力', desc: "快速认证,是否具备接单操作能力",
condition: '随机20题,及格16题', condition: "随机20题,及格16题",
status: '', status: "",
pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png",
id: 2, id: 2,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
} },
], ],
"test": [{ test: [
title: '服务规范', {
desc: '通过本认证,是接单的必要条件', title: "服务规范",
condition: '随机10题,及格10题', desc: "通过本认证,是接单的必要条件",
status: '', condition: "随机10题,及格10题",
status: "",
pic: process.uniEnv.qn_base_url + "fwgf-e-3x.png", pic: process.uniEnv.qn_base_url + "fwgf-e-3x.png",
id: 3, id: 3,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
}, },
{ {
title: '交付规范', title: "交付规范",
desc: '快速认证,是否具备接单操作能力', desc: "快速认证,是否具备接单操作能力",
condition: '随机4题,及格4题', condition: "随机5题,及格5题",
status: '', status: "",
pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png",
id: 4, id: 4,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
} },
], ],
"prod": [{ prod: [
title: '服务规范', {
desc: '通过本认证,是接单的必要条件', title: "服务规范",
condition: '随机20题,及格20题', desc: "通过本认证,是接单的必要条件",
status: '', condition: "随机20题,及格20题",
status: "",
pic: process.uniEnv.qn_base_url + "fwgf-e-3x.png", pic: process.uniEnv.qn_base_url + "fwgf-e-3x.png",
id: 3, id: 3,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
}, },
{ {
title: '接单操作', title: "接单操作",
desc: '快速认证,是否具备接单操作能力', desc: "快速认证,是否具备接单操作能力",
condition: '随机20题,及格16题', condition: "随机20题,及格16题",
status: '', status: "",
pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png", pic: process.uniEnv.qn_base_url + "jdgf-e-3x.png",
id: 4, id: 4,
examId: '', examId: "",
examStatus: '', examStatus: "",
isComplete: false isComplete: false,
} },
] ],
} };
let env = process.uniEnv.node_env; let env = process.uniEnv.node_env;
let courseListJson = json.[env]; let courseListJson = json[env];
let examListJson = examJson[env]; let examListJson = examJson[env];
export default { export default {
data() { data() {
return { return {
tabs: [{ tabs: [
{
name: "交付规范", name: "交付规范",
}, },
{ {
...@@ -343,16 +337,17 @@ ...@@ -343,16 +337,17 @@
}, },
list: [], list: [],
rule: { rule: {
pic: process.uniEnv.qn_base_url + "guifan@3x.png" pic: process.uniEnv.qn_base_url + "guifan@3x.png",
}, },
courselist: [{ courselist: [
{
title: courseListJson[0].title, title: courseListJson[0].title,
desc: courseListJson[0].desc, desc: courseListJson[0].desc,
percent: courseListJson[0].percent, percent: courseListJson[0].percent,
status: courseListJson[0].status, status: courseListJson[0].status,
pic: courseListJson[0].pic, pic: courseListJson[0].pic,
id: courseListJson[0].id, id: courseListJson[0].id,
sectionId: courseListJson[0].sectionId sectionId: courseListJson[0].sectionId,
}, },
{ {
title: courseListJson[1].title, title: courseListJson[1].title,
...@@ -361,7 +356,7 @@ ...@@ -361,7 +356,7 @@
status: courseListJson[1].status, status: courseListJson[1].status,
pic: courseListJson[1].pic, pic: courseListJson[1].pic,
id: courseListJson[1].id, id: courseListJson[1].id,
sectionId: courseListJson[1].sectionId sectionId: courseListJson[1].sectionId,
}, },
{ {
title: courseListJson[2].title, title: courseListJson[2].title,
...@@ -371,9 +366,10 @@ ...@@ -371,9 +366,10 @@
pic: courseListJson[2].pic, pic: courseListJson[2].pic,
id: courseListJson[2].id, id: courseListJson[2].id,
sectionId: courseListJson[2].sectionId, sectionId: courseListJson[2].sectionId,
} },
], ],
examList: [{ examList: [
{
title: examListJson[0].title, title: examListJson[0].title,
desc: examListJson[0].desc, desc: examListJson[0].desc,
condition: examListJson[0].condition, condition: examListJson[0].condition,
...@@ -382,7 +378,7 @@ ...@@ -382,7 +378,7 @@
id: examListJson[0].id, id: examListJson[0].id,
examId: examListJson[0].examId, examId: examListJson[0].examId,
examStatus: examListJson[0].examStatus, examStatus: examListJson[0].examStatus,
isComplete: examListJson[0].isComplete isComplete: examListJson[0].isComplete,
}, },
{ {
title: examListJson[1].title, title: examListJson[1].title,
...@@ -393,8 +389,8 @@ ...@@ -393,8 +389,8 @@
id: examListJson[1].id, id: examListJson[1].id,
examId: examListJson[1].examId, examId: examListJson[1].examId,
examStatus: examListJson[1].examStatus, examStatus: examListJson[1].examStatus,
isComplete: examListJson[1].isComplete isComplete: examListJson[1].isComplete,
} },
], ],
loadStatus: "loading", loadStatus: "loading",
isLoadMore: false, isLoadMore: false,
...@@ -403,7 +399,7 @@ ...@@ -403,7 +399,7 @@
isReflesh: true, isReflesh: true,
triggered: false, triggered: false,
_freshing: false, _freshing: false,
} };
}, },
onLoad(param) { onLoad(param) {
var that = this; var that = this;
...@@ -419,21 +415,21 @@ ...@@ -419,21 +415,21 @@
return process.uniEnv.qn_base_url + "banner-xx@3x.png"; return process.uniEnv.qn_base_url + "banner-xx@3x.png";
}, },
}, },
onShow: function(param) { onShow: function (param) {
if(this.current == 2 || this.current == 3){ if (this.current == 2 || this.current == 3) {
this.tabsChange(this.current); this.tabsChange(this.current);
} }
}, },
methods: { methods: {
stopPull() { stopPull() {
let that = this; let that = this;
setTimeout(function(){ setTimeout(function () {
that.triggered = false; that.triggered = false;
that._freshing = false; that._freshing = false;
}, 1000) }, 1000);
}, },
onPulling(e) { onPulling(e) {
return true return true;
console.log("onpulling", e); console.log("onpulling", e);
}, },
onRefresh() { onRefresh() {
...@@ -445,7 +441,7 @@ ...@@ -445,7 +441,7 @@
this.loadNews(); this.loadNews();
}, },
onRestore() { onRestore() {
this.triggered = 'restore'; // 需要重置 this.triggered = "restore"; // 需要重置
console.log("onRestore"); console.log("onRestore");
}, },
onAbort() { onAbort() {
...@@ -471,7 +467,7 @@ ...@@ -471,7 +467,7 @@
.getTrainingNoticeList(this.params) .getTrainingNoticeList(this.params)
.then((res) => { .then((res) => {
that.stopPull(); that.stopPull();
if(res.code != 200){ if (res.code != 200) {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: "none", icon: "none",
...@@ -484,14 +480,16 @@ ...@@ -484,14 +480,16 @@
if (res.data) { if (res.data) {
let length = res.data.length; let length = res.data.length;
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
res.data[i].create_at = this.timeFormat(res.data[i].create_at, res.data[i].create_at = this.timeFormat(
'yyyy.MM.dd hh:mm'); res.data[i].create_at,
"yyyy.MM.dd hh:mm"
);
} }
that.list = that.list.concat(res.data); that.list = that.list.concat(res.data);
} }
if(res.data.length >= 5){ if (res.data.length >= 5) {
that.isLoadMore = false; that.isLoadMore = false;
}else{ } else {
that.isLoadMore = true; that.isLoadMore = true;
that.loadStatus = "nomore"; that.loadStatus = "nomore";
} }
...@@ -509,31 +507,34 @@ ...@@ -509,31 +507,34 @@
}, },
timeFormat(time, format, fromMysql = true) { timeFormat(time, format, fromMysql = true) {
let rate = fromMysql ? 1000 : 1; let rate = fromMysql ? 1000 : 1;
let dataFmt = format || 'yyyy-MM-dd hh:mm:ss' // 需要格式化的规则 let dataFmt = format || "yyyy-MM-dd hh:mm:ss"; // 需要格式化的规则
time = typeof(time) == 'number' ? time : new Date(time * rate) // 处理传入的time time = typeof time == "number" ? time : new Date(time * rate); // 处理传入的time
let fmt = { let fmt = {
'y+': time.getFullYear(), // 年份 "y+": time.getFullYear(), // 年份
'M+': time.getMonth() + 1, // 月份 "M+": time.getMonth() + 1, // 月份
'd+': time.getDate(), // 日 "d+": time.getDate(), // 日
'h+': time.getHours(), // 小时 "h+": time.getHours(), // 小时
'm+': time.getMinutes(), // 分钟 "m+": time.getMinutes(), // 分钟
's+': time.getSeconds() // 秒 "s+": time.getSeconds(), // 秒
} };
for (let i in fmt) { for (let i in fmt) {
if (new RegExp('(' + i + ')').test(dataFmt)) { if (new RegExp("(" + i + ")").test(dataFmt)) {
dataFmt = dataFmt.replace(RegExp.$1, fmt[i].toString().length <= 1 ? '0' + fmt[i] : fmt[i]) dataFmt = dataFmt.replace(
RegExp.$1,
fmt[i].toString().length <= 1 ? "0" + fmt[i] : fmt[i]
);
} }
} }
return dataFmt; return dataFmt;
}, },
getTypeName(percent) { getTypeName(percent) {
if (percent == 0) { if (percent == 0) {
return '未开始'; return "未开始";
} else if (percent == '100') { } else if (percent == "100") {
return '已完成'; return "已完成";
} else { } else {
return '继续'; return "继续";
} }
}, },
//在线学习通用课程信息 //在线学习通用课程信息
...@@ -541,7 +542,7 @@ ...@@ -541,7 +542,7 @@
let courseLength = this.courselist.length; let courseLength = this.courselist.length;
for (let i = 0; i < courseLength; i++) { for (let i = 0; i < courseLength; i++) {
let param = { let param = {
course_id: this.courselist[i].id course_id: this.courselist[i].id,
}; };
this.$u.api this.$u.api
.CourseList(param) .CourseList(param)
...@@ -554,9 +555,13 @@ ...@@ -554,9 +555,13 @@
} }
if (res.data) { if (res.data) {
res.data.learnedInfo.learnPercent *= 100; res.data.learnedInfo.learnPercent *= 100;
this.courselist[i].status = this.getTypeName(res.data.learnedInfo.learnPercent); this.courselist[i].status = this.getTypeName(
this.courselist[i].percent = res.data.learnedInfo.learnPercent; res.data.learnedInfo.learnPercent
this.courselist[i].sectionId = res.data.learnedInfo.nextLearnedSectionId; );
this.courselist[i].percent =
res.data.learnedInfo.learnPercent;
this.courselist[i].sectionId =
res.data.learnedInfo.nextLearnedSectionId;
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -572,7 +577,7 @@ ...@@ -572,7 +577,7 @@
this.swiperCurrent = index; this.swiperCurrent = index;
switch (index) { switch (index) {
case 1: case 1:
this.loadNews() this.loadNews();
break; break;
case 2: case 2:
this.getCourseList(); this.getCourseList();
...@@ -595,9 +600,9 @@ ...@@ -595,9 +600,9 @@
}, },
//跳转到拍照小程序首页 //跳转到拍照小程序首页
goToPrint() { goToPrint() {
console.log("111111");
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({
appId: "wxd1d6eede324b0465", appId: "wxd1d6eede324b0465",
path: "/pages/photo/index",
success(res) { success(res) {
//打开成功 //打开成功
console.log("success", res); console.log("success", res);
...@@ -621,17 +626,18 @@ ...@@ -621,17 +626,18 @@
this.$u.api this.$u.api
.getExamResult(examId) .getExamResult(examId)
.then((res) => { .then((res) => {
if(res.code != 200){ if (res.code != 200) {
console.log('getUserExamInfo 200 err'); console.log("getUserExamInfo 200 err");
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: '获取考试信息失败', title: "获取考试信息失败",
}); });
} }
this.examList[i].examId = res.data.id; this.examList[i].examId = res.data.id;
this.examList[i].examStatus = res.data.examStatus; //i;// this.examList[i].examStatus = res.data.examStatus; //i;//
let examResult = res.data.examLevelResult; let examResult = res.data.examLevelResult;
this.examList[i].status = examResult != '' ? examResult : '未通过'; this.examList[i].status =
examResult != "" ? examResult : "未通过";
// examStatus 用户考试状态 0考试中 1考试完成 2未参与 // examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data; that.exam = res.data;
console.log(that.exam); console.log(that.exam);
...@@ -641,7 +647,8 @@ ...@@ -641,7 +647,8 @@
} }
if (res.data.examStatus == 1) { if (res.data.examStatus == 1) {
console.log("examStatus " + i + " 1"); console.log("examStatus " + i + " 1");
that.examList[i].isComplete = this.examList[i].status == '通过'; that.examList[i].isComplete =
this.examList[i].status == "通过";
that.examScore = res.data.examScore; that.examScore = res.data.examScore;
return; return;
} }
...@@ -651,7 +658,7 @@ ...@@ -651,7 +658,7 @@
} }
}) })
.catch((err) => { .catch((err) => {
console.log('getUserExamInfo err' + err); console.log("getUserExamInfo err" + err);
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
...@@ -673,13 +680,19 @@ ...@@ -673,13 +680,19 @@
}); });
} else if (examInfo.examStatus == 1) { } else if (examInfo.examStatus == 1) {
// examInfo.status = '通过'; // examInfo.status = '通过';
if (examInfo.status == '通过') { if (examInfo.status == "通过") {
wx.navigateTo({ wx.navigateTo({
url: "/pages/learn/exam-pass?userExamId=" + examInfo.examId, url:
"/pages/learn/exam-pass?userExamId=" +
examInfo.examId,
}); });
} else { } else {
wx.navigateTo({ wx.navigateTo({
url: "/pages/learn/result?userExamId=" + examInfo.examId + "&examId=" + examInfo.id, url:
"/pages/learn/result?userExamId=" +
examInfo.examId +
"&examId=" +
examInfo.id,
}); });
} }
} else if (examInfo.examStatus == 2) { } else if (examInfo.examStatus == 2) {
...@@ -691,47 +704,51 @@ ...@@ -691,47 +704,51 @@
//跳转到播放 //跳转到播放
goPlay(info) { goPlay(info) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/learn/section?section_id=" + info.sectionId + "&course_id=" + info.id, url:
"/pages/learn/section?section_id=" +
info.sectionId +
"&course_id=" +
info.id,
}); });
}, },
//跳转到 //跳转到
bbb(e) { bbb(e) {
var news = { var news = {
body: e.body, body: e.body,
title: e.title title: e.title,
}; };
let that = this; let that = this;
wx.navigateTo({ wx.navigateTo({
url: '/pages/learn/news-details', url: "/pages/learn/news-details",
success: function(res) { success: function (res) {
res.eventChannel.emit('acceptDataFromLearn', news) res.eventChannel.emit("acceptDataFromLearn", news);
} },
}); });
}, },
}, },
}; };
</script> </script>
<style> <style>
.study { .study {
height: 100vh; height: 100vh;
background-color: #f4f5f7; background-color: #f4f5f7;
padding: 0rpx 30rpx 0 30rpx; padding: 0rpx 30rpx 0 30rpx;
} }
.title-view { .title-view {
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
font-size: 40rpx; font-size: 40rpx;
} }
.banner { .banner {
width: 690rpx; width: 690rpx;
height: 240rpx; height: 240rpx;
margin-top: 10rpx; margin-top: 10rpx;
} }
/* 交付规范 */ /* 交付规范 */
.standard { .standard {
width: 690rpx; width: 690rpx;
height: 180rpx; height: 180rpx;
display: flex; display: flex;
...@@ -742,11 +759,11 @@ ...@@ -742,11 +759,11 @@
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx; padding: 30rpx;
margin-top: 30rpx; margin-top: 30rpx;
background-color: #FFFFFF; background-color: #ffffff;
} }
/* 培训通知 */ /* 培训通知 */
.notice { .notice {
/* border: #808080 solid 2rpx; */ /* border: #808080 solid 2rpx; */
width: 100%; width: 100%;
min-height: 370rpx; min-height: 370rpx;
...@@ -755,16 +772,16 @@ ...@@ -755,16 +772,16 @@
background-color: #ffffff; background-color: #ffffff;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx; padding: 30rpx;
} }
.n-head { .n-head {
text-align: left; text-align: left;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.news { .news {
height: 168rpx; height: 168rpx;
overflow: hidden; overflow: hidden;
margin-top: 30rpx; margin-top: 30rpx;
...@@ -772,46 +789,46 @@ ...@@ -772,46 +789,46 @@
color: #666666; color: #666666;
line-height: 34rpx; line-height: 34rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
/* 在线学习 */ /* 在线学习 */
.currency-class { .currency-class {
width: 100%; width: 100%;
background: #ffffff; background: #ffffff;
padding: 30rpx; padding: 30rpx;
border-radius: 12rpx; border-radius: 12rpx;
} }
.learn-currency-class { .learn-currency-class {
width: 100%; width: 100%;
border-radius: 12rpx; border-radius: 12rpx;
display: flex; display: flex;
} }
.jf-currency-class { .jf-currency-class {
width: 100%; width: 100%;
height: 180rpx; height: 180rpx;
position: absolute; position: absolute;
border-radius: 12rpx; border-radius: 12rpx;
margin-top: 60rpx; margin-top: 60rpx;
} }
.title { .title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
font-family: PingFang-SC-Bold, PingFang-SC; font-family: PingFang-SC-Bold, PingFang-SC;
} }
.class1 { .class1 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-box-pack: justify; -webkit-box-pack: justify;
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
justify-content: space-between; justify-content: space-between;
} }
.learn-class1 { .learn-class1 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: block; display: block;
...@@ -823,182 +840,181 @@ ...@@ -823,182 +840,181 @@
background-color: #ffffff; background-color: #ffffff;
position: relative; position: relative;
border-radius: 12rpx; border-radius: 12rpx;
} }
.img { .img {
width: 160rpx; width: 160rpx;
height: 120rpx; height: 120rpx;
} }
.learn-img { .learn-img {
width: 330rpx; width: 330rpx;
height: 194rpx; height: 194rpx;
} }
.jf-img { .jf-img {
width: 160rpx; width: 160rpx;
height: 200rpx; height: 200rpx;
position: absolute; position: absolute;
top: -45rpx; top: -45rpx;
left: 30rpx; left: 30rpx;
} }
.right { .right {
width: 434rpx; width: 434rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
.intro { .intro {
color: #9999a6; color: #9999a6;
} }
.tab { .tab {
background: #fff; background: #fff;
height: 82rpx; height: 82rpx;
margin: 0 0; margin: 0 0;
} }
.text { .text {
margin: 0 40rpx; margin: 0 40rpx;
line-height: 82rpx; line-height: 82rpx;
color: #667eb5; color: #667eb5;
} }
.content { .content {
margin: 5px 0; margin: 5px 0;
height: 485rpx; height: 485rpx;
background: #fff; background: #fff;
} }
swiper { swiper {
height: 70vh; height: 70vh;
} }
.line-percent { .line-percent {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
margin: 20rpx; margin: 20rpx;
margin-top: 25rpx; margin-top: 25rpx;
} }
.jf-line { .jf-line {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 120rpx; width: 120rpx;
height: 52rpx; height: 52rpx;
border-radius: 26rpx; border-radius: 26rpx;
background-color: #ffffff; background-color: #ffffff;
color: #2272FF; color: #2272ff;
text-align: center; text-align: center;
padding-left: 20rpx; padding-left: 20rpx;
padding-top: 6rpx; padding-top: 6rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
.u-progress { .u-progress {
width: 160rpx !important; width: 160rpx !important;
height: 12rpx !important; height: 12rpx !important;
background-color: #ececec; background-color: #ececec;
} }
.font-bold { .font-bold {
font-weight: bold; font-weight: bold;
} }
.font-default-color { .font-default-color {
color: #999999; color: #999999;
} }
.font-default-exam-color { .font-default-exam-color {
color: #FA5A49; color: #fa5a49;
} }
.font-active-color { .font-active-color {
color: #2272FF; color: #2272ff;
} }
.font-color-999999 { .font-color-999999 {
color: #999999; color: #999999;
} }
.standard-img { .standard-img {
width: 160rpx; width: 160rpx;
height: 120rpx; height: 120rpx;
} }
.standard-body { .standard-body {
height: 120rpx; height: 120rpx;
display: flex; display: flex;
} }
.standard-body-title { .standard-body-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
}
} .jf-right {
.jf-right {
padding-left: 190rpx; padding-left: 190rpx;
width: 460rpx; width: 460rpx;
color: #ffffff; color: #ffffff;
} }
.notice-bottom { .notice-bottom {
margin-top: 20rpx; margin-top: 20rpx;
display: block; display: block;
position: relative; position: relative;
} }
.notice-bottom-left { .notice-bottom-left {
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
float: left; float: left;
} }
.notice-bottom-right { .notice-bottom-right {
font-size: 24rpx; font-size: 24rpx;
color: #2272FF; color: #2272ff;
float: right; float: right;
} }
.bofang { .bofang {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
position: absolute; position: absolute;
left: 130rpx; left: 130rpx;
top: 70rpx; top: 70rpx;
} }
.learn-desc { .learn-desc {
height: 138rpx; height: 138rpx;
margin-top: -10rpx; margin-top: -10rpx;
padding-top: 20rpx; padding-top: 20rpx;
padding-left: 20rpx; padding-left: 20rpx;
padding-right: 20rpx; padding-right: 20rpx;
} }
.learn-intro { .learn-intro {
color: #999999; color: #999999;
margin-top: 20rpx; margin-top: 20rpx;
font-size: 20rpx; font-size: 20rpx;
} }
.h48 { .h48 {
height: 48rpx; height: 48rpx;
} }
.current-img { .current-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
} }
.load-more { .load-more {
padding-top: 50rpx; padding-top: 50rpx;
padding-bottom: 200rpx; padding-bottom: 200rpx;
} }
</style> </style>
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
//判断是否通过,通过去成功页,失败去失败页 //判断是否通过,通过去成功页,失败去失败页
let examInfo = this.examInfo; let examInfo = this.examInfo;
let examId = this.examId; let examId = this.examId;
let status = examInfo.examLevelResult == "通过"; let status = examInfo.examLevelResult == "已通过";
if (status) { if (status) {
wx.navigateTo({ wx.navigateTo({
url: url:
...@@ -332,7 +332,8 @@ export default { ...@@ -332,7 +332,8 @@ export default {
"&questionId=" + "&questionId=" +
questionId + questionId +
"&userAnswerIds=" + "&userAnswerIds=" +
(this.userAnswerIds || "9999"), // 9999超时自动下一题 (this.userAnswerIds || "9999") +
",", // 9999超时自动下一题
method: "POST", method: "POST",
data: { data: {
// userExamId:this.userExamId, // userExamId:this.userExamId,
......
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