Commit 1a086996 authored by Damon's avatar Damon
parents c4bb6193 ea7284f4
const UNI_APP = {
ucenterUrl: {
apiUrl: 'http://rest-u.yunya.com', //php端域名请求头
// xueUrl: 'https://xue.banshouhui.com', //学院
apiUrl: 'http://192.168.1.46', //php端域名请求头
xueUrl: 'http://192.168.1.46:8088', //学院
// banshou: 'https://m.banshou.com', //扳手app
},
systemUrl: {
......
;
(function() {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境
let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境
let ENV_VAR = null;
if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') {
......
......@@ -7,7 +7,7 @@ import {
import {
settledApiFun
} from '@/common/api/settled.js';
import { learnApiFun } from "@/common/api/learn.js";
import {learnApiFun} from "@/common/api/learn.js";
import { orderApiFun } from "@/common/api/order.js";
let apiFun = function(vm) {
let commonApi = commonApiFun(vm);
......
const globalUrl = process.uniEnv || {}
const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
const collegeApiUrl = globalUrl.ucenterUrl.xueUrl
let learnApiFun = function(vm){
/* 查询用户基本信息 */
/* 通知消息基本信息 */
let getTrainingNoticeList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/notice/list', params);
/* 获取学习视频基本信息 */
let CourseList = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/course-details?course_id=173',params);
/* 获取章节详情 */
let ChapterDetails = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/chapter-sections',params);
/* 获取课程节信息*/
let CourseSection = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/section-details',params);
const learnApi = {
getTrainingNoticeList,
getTrainingNoticeList,CourseList,ChapterDetails,CourseSection
}
return learnApi
}
......
page {
background-color: #fafafa;
}
::-webkit-scrollbar {
width:0;
height:0;
color:transparent;
display:none;
}
.btn-share {
background-color: transparent;
......
......@@ -31,13 +31,19 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>
.settle-view {
::-webkit-scrollbar {
width: 0;
}
}
.introduction {
border-radius: 12rpx;
overflow: auto;
position: fixed;
top: 370rpx;
bottom: 0rpx;
bottom: 168rpx;
left: 30rpx;
right: 30rpx;
}
......
......@@ -7,7 +7,8 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom"
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{
......@@ -70,7 +71,8 @@
{
"path": "pages/learn/index",
"style": {
"navigationBarTitleText": "学习"
"navigationBarTitleText": "学习",
"navigationStyle":"custom"//隐藏系统导航栏
}
},
{
......@@ -85,17 +87,23 @@
"navigationBarTitleText": "考试答题"
}
},
{
"path": "pages/learn/result",
"style": {
"navigationBarTitleText": "考试结果页"
}
{
"path":"pages/learn/result",
"style":{
"navigationBarTitleText":"考试答题"
}
},
{
"path": "pages/learn/news-details",
"style": {
"navigationBarTitleText": ""
}
},
{
"path":"pages/learn/section",
"style" :{
"navigationBarTitleText": ""
}
},
{
"path": "pages/learn/curriculum",
......@@ -107,7 +115,8 @@
"path": "pages/settle/select",
"style": {
"navigationBarTitleText": "选择可服务的城市",
"navigationBarBackgroundColor": "#FFFFFF"
"navigationBarBackgroundColor": "#FFFFFF",
"disableScroll": true
}
},
{
......@@ -203,8 +212,8 @@
"tabBar": {
"color": "#7A7E83",
"selectedColor": "#007AFF",
"borderStyle": "black",
"backgroundColor": "#F8F8F8",
"borderStyle": "white",
"backgroundColor": "#FFFFFF",
"list": [
{
"pagePath": "pages/index/index",
......
......@@ -53,7 +53,7 @@
</view>
<view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@click="nextClick()">
@click="handleClick()">
<text class="bottomTitle">{{bottomTitle}}</text>
</view>
</view>
......@@ -113,7 +113,7 @@
return process.uniEnv.qn_base_url + 'chenggong.png'
},
timuImage() {
return process.uniEnv.qn_base_url + 'timu.png'
return process.uniEnv.qn_base_url + 'timu-new.png'
}
},
onLoad(e) {
......@@ -300,7 +300,7 @@
that.vuex_token +
'?userExamId=' + this.userExamId +
'&questionId=' + questionId +
'&userAnswerIds=' + this.userAnswerIds,
'&userAnswerIds=' + (this.userAnswerIds || '9999'), // 9999超时自动下一题
method: 'POST',
data: {
// userExamId:this.userExamId,
......@@ -372,7 +372,6 @@
},
startCounting: function() {
if (this.isStop) {
return
}
......@@ -441,16 +440,18 @@
},
// 点击下一步
handleClick() {
// 判断有没有选
if (!this.isSelect) {
return
}
this.nextClick()
},
//下一题
nextClick: function() {
//判断有没有选
if (!this.isSelect) {
return
}
clearTimeout(this.timer)
this.currentNumber = this.currentNumber + 1
......@@ -582,7 +583,9 @@
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
overflow-y:auto;
}
.noticeView {
......@@ -803,10 +806,10 @@
}
.bottom-padding {
margin-bottom: 188rpx;
// margin-bottom: 188rpx;
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 40rpx 30rpx 46rpx 30rpx;
padding: 40rpx 30rpx 40rpx 30rpx;
}
.answerBottomView {
......
<template>
<view class="content">
<view style="width: 700rpx; height: 800rpx">
<!-- <view style="width: 700rpx; height: 800rpx"> -->
<!-- <view class="title-view">充电桩自营平台</view> -->
<u-navbar
:is-back="false"
......@@ -32,7 +32,7 @@
<view class="msg-content-view">
<view class="left-view">
<image class="msg-icon" :src="msgStyleImage[item.content_type]"></image>
<text>{{ item.title }}</text>
<text class="msg-text">{{ item.title }}</text>
</view>
<image class="right-icon" :src="shouyeyouImage"></image>
</view>
......@@ -51,7 +51,7 @@
</u-sticky>
<view class="order-view">
<!-- 入驻成功之后显示推荐订单列表 -->
<view class="order-list-view">
<view class="order-list-view" v-if="loaded">
<!-- 入驻前-->
<view v-if="needSettled" class="tip-view">
<view class="tip-title">当前订单(笔)</view>
......@@ -83,13 +83,19 @@
<view
v-else-if="!needSettled && orderList.length <= 0"
class="no-order-view"
>
暂无订单
>
<image class="no-order-image" :src="wudingdanImage"></image>
<text>当前暂无订单</text>
</view>
</view>
</view>
</view>
<!-- </scroll-view> -->
<!-- </view> -->
<!-- </scroll-view> -->
<view class="bottom-view">
<view class="bottom-line-view"></view>
<view class="bottom-text">我也是有底线哒</view>
<view class="bottom-line-view"></view>
</view>
</view>
</template>
......@@ -106,22 +112,8 @@ export default {
data() {
return {
status: 0, // 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
triggered: false,
location: [116.3896, 39.91917], // 经纬度
// list: [
// {
// image: "https://cdn.uviewui.com/uview/swiper/1.jpg",
// },
// {
// image: "https://cdn.uviewui.com/uview/swiper/2.jpg",
// },
// {
// image: "https://cdn.uviewui.com/uview/swiper/3.jpg",
// },
// ],
title: false,
// mode: "round",
// indicatorPos: "bottomCenter",
title: false,
title: "Hello",
loaded: false,
needSettled: true,
......@@ -129,7 +121,7 @@ export default {
messageList: [],
loadStatus: ["more", "loading", "noMore"],
currentLoadStatus: "loading",
orderList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
orderList: [],
search: {
token: "",
pageNumber: 0,
......@@ -165,11 +157,12 @@ export default {
},
shouyeyouImage() {
return process.uniEnv.qn_base_url + 'shouyeyou.png'
},
wudingdanImage() {
return process.uniEnv.qn_base_url + 'wudingdan.png'
}
},
onLoad() {
this._freshing = false;
this.triggered = false;
},
onShow() {
// 每次进入页面都刷新入驻状态
......@@ -179,7 +172,13 @@ export default {
// 初始化订单数据
this.loadOrderList();
}
},
},
onPullDownRefresh() {
console.log('------下拉刷新------')
// 下拉刷洗
this.initSettleInfo()
},
methods: {
handleClick() { // 点击了cell
console.log('点击了cell')
......@@ -190,7 +189,6 @@ export default {
},
async initSettleInfo() {
let self = this;
if (self.status == 7) return;
const callBack = (vm, result) => {
// 后台自动判断入驻流程是否完成,前台通过status确定状态
if (result && result.record) {
......@@ -208,7 +206,8 @@ export default {
},
loadMessageList() {
let self = this;
self.$u.api.listByNotice().then((res) => {
self.$u.api.listByNotice().then((res) => {
uni.stopPullDownRefresh() // 结束下拉刷新
if (res.code == 200) {
if (res.data && res.data.length > 3) {
self.messageList = res.data.slice(0, 3);
......@@ -224,9 +223,10 @@ export default {
let self = this;
// 加载订单列表
self.search.token = self.vuex_token;
self.$u.api.listByRecommendOrder(self.search).then((res) => {
self.$u.api.listByRecommendOrder(self.search).then((res) => {
uni.stopPullDownRefresh() // 结束下拉刷新
if (res.code == 200) {
if (res.data && res.data.length > 0) {
if (res.data && res.data.length > 0) {
self.orderList.push().apply(res.data);
}
} else {
......@@ -321,19 +321,13 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>
.content {
height: 100vh;
background-color: #f4f5f7;
padding: 0rpx 30rpx 0 30rpx;
.scroll-view {
::-webkit-scrollbar {
/*隐藏滚轮*/
display: none;
}
}
padding: 0rpx 30rpx 0 30rpx;
overflow-y:auto;
.title-view {
color: #333333;
font-weight: bold;
......@@ -375,12 +369,17 @@ export default {
.left-view {
display: flex;
align-items: center;
.msg-icon {
width: 80rpx;
height: 36rpx;
margin-right: 20rpx;
}
}
.msg-text {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 448rpx;
}
}
.right-icon {
......@@ -434,8 +433,8 @@ export default {
}
.order-view {
text-align: center;
text-align: center;
min-height: 460rpx;
.order-list-view {
background-color: #ffffff;
border-radius: 12rpx;
......@@ -446,7 +445,19 @@ export default {
.order-item-view {
}
.no-order-view {
.no-order-view {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
color: #666666;
font-size: 28rpx;
.no-order-image {
width: 374rpx;
height: 218rpx;
margin-top: 100rpx;
margin-bottom: 20rpx;
}
}
.tip-view {
......@@ -472,5 +483,20 @@ export default {
}
}
}
}
}
.bottom-view {
display: flex;
align-items: center;
justify-content: space-between;
padding: 20rpx 40rpx 50rpx 40rpx;
.bottom-line-view {
background-color: #D5D5D5;
height: 2rpx;
width: 30%;
}
.bottom-text {
color: #999999;
font-size: 24rpx;
}
}
</style>
......@@ -45,8 +45,12 @@
}
],
selectId:[],
};
},
onLoad() {
this.getUserExamInfo()
},
methods: {
abc() {
console.log("11111")
......@@ -73,7 +77,10 @@
this.selectId.push(this.list[index].title)
console.log("选中的值", this.selectId)
}
}
},
},
mounted() {
console.log("111111")
......
......@@ -3,10 +3,10 @@
<view class="title">考试规则说明</view>
<view class="test">
<view class="text">
<text class="left">考试科目:</text><text style="color: #007AFF;">服务规范</text>
<text class="left">考试科目:</text><text style="color: #007AFF;">{{exam.examName}}</text>
</view>
<view class="text">
<text class="left">合格条件:</text><text>随机20题,答对20题</text>
<text class="left">合格条件:</text><text>{{exam.ruleDisc}}</text>
</view>
<view class="text">
<text class="left">考试时间:</text><text>30分钟</text>
......@@ -26,9 +26,13 @@
export default {
data() {
return {
examId:1,
exam:null
}
},
onLoad() {
this.getUserExamInfo()
},
methods: {
aaa(){
......@@ -36,7 +40,83 @@
url:'./answer'
})
}
},
//获取考试信息
getUserExamInfo: function() {
uni.showLoading({
title: '请稍候'
})
let that = this
uni.request({
url: 'https://system.banshouhui.com' +
'/wxh-worker-rest/rest/exam' +
'/serviceRule/userExamInfo/' +
'RTOKENf86a7c0606ef5ebf36f211ace3466b7f9de56e37' +
'?examId=' + this.examId,
method: 'POST',
data: {
//examId:this.examId,
},
header: {
'Content-Type': 'application/x-www-form-urlencoded'
},
success: (res) => {
console.log(res.data)
uni.hideLoading()
if (!res.data) {
return
}
if (res.data.code == 401 || res.data.code == 403) {
// uni.navigateTo({
// url: '/pages/login/wxlogin'
// })
// return
console.log('洪塘张学友')
}
if (res.data.code == 200) {
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data.data
console.log(that.exam)
if (res.data.data.examStatus == 2) {
that.applyExam()
return
}
if(res.data.data.examStatus == 1){
console.log('111111111111111111111111111')
that.isComplete = true
that.examScore = res.data.data.examScore
that.postResult()
return
}
if (res.data.data.examStatus == 0 ) {
that.userExamId = res.data.data.id
that.getNext()
}
} else {
uni.showToast({
icon: 'none',
title: res.data.message
})
}
},
fail: (e) => {
uni.hideLoading()
uni.showToast({
icon: 'none',
title: '获取考试信息失败'
})
}
})
},
}
}
</script>
......
......@@ -163,7 +163,8 @@ export default {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.course-video {
......
......@@ -15,59 +15,22 @@
<view class="" style="font-size: 40rpx;font-weight:1000">
目录
</view>
<view class="" style="font-size: 40rpx;font-weight: 1000;">
第一章 充电桩常见问题答疑
</view>
<view class="video" >
<view class="video_1" >
<view class="text" >
视频
</view>
<text class="text2">1-1唯修汇公司简介</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-2可接单评定标准</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-3结算规则</text>
</view>
<view class="video_1">
<view class="text">
视频
</view>
<text class="text2">1-4充电桩安装开城计划</text>
</view>
<view class="video_1">
<view class="text">
视频
</view>
<text class="text2">1-5缴纳质保金和费用答疑</text>
</view>
<view class="video_1" >
<view class="text" >
视频
</view>
<text class="text2">1-6安装材料品牌答疑1</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-7安装材料答疑2</text>
<view v-for="item in list">
<view class="chapter">
{{item.name}}
</view>
<view class="video_1">
<view class="text">
视频
<view class="video" v-for="key in item.section" @click=details(key.id)>
<view class="video_1" >
<view class="text" v-text="key.ware=='0'?'视频':'图文'">
</view>
<text>1-{{key.order}}</text>
<text class="text2">{{key.name}}</text>
<text class="text3" v-text="key.isLearned==false?'未开始':'完成'"></text>
</view>
<text class="text2">1-8其他问题答疑</text>
</view>
</view>
</view>
</view>
</view>
......@@ -77,11 +40,72 @@
export default {
data() {
return {
params:{
course_id:0,
},
list:[],
examId:1,
}
},
onLoad(a){
console.log(a)
this.params.course_id=a.course_id
console.log(this.params.course_id)
this.getCapterDetails()
},
methods: {
//获取章节详情
getCapterDetails() {
console.log(1111111)
this.$u.api
.ChapterDetails(this.params)
.then((res) => {
if (res.code == 200) {
if (res.data) {
this.list = this.list.concat(res.data);
console.log(this.list)
if (res.data.length < 5) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true;
this.loadStatus = "nomore";
} else {
this.isLoadMore = false;
}
} else {
this.isLoadMore = true;
this.loadStatus = "nomore";
}
} else {
//接口请求失败的处理
uni.showToast({
title: res.message,
icon: "none"
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
}
})
.catch((err) => {
uni.showToast({
title: err,
icon: "none",
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
});
},
//跳转到小节
details(id){
console.log(id)
uni.navigateTo({
url:"./section?section_id=" + id
})
}
}
}
</script>
......@@ -101,9 +125,18 @@
width: 128rpx;
height: 128rpx;
}
.chapter{
font-size: 37rpx;
font-weight: 700;
}
.video{
width: 100%;
}
.video_1{
display: flex;
margin: 20rpx 0;
position: relative;
width: 100%;
.text{
width: 100rpx;
height: 38rpx;
......@@ -114,8 +147,15 @@
}
.text2{
width: 397rpx;
font-size: 33rpx;
color: #82848A;
margin-right: 0rpx;
}
.text3{
float: right;
position: relative;
right: 0;
}
}
</style>
......@@ -141,7 +141,7 @@
return {
'color': '#FFFFFF',
'width': '500rpx',
'height': '112rpx',
'height': '104rpx',
'background-color': '#2272FF',
'font-size': '32rpx',
'font-weight': 'bold'
......@@ -226,7 +226,8 @@
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.exam-head {
......@@ -234,10 +235,10 @@
font-weight: bold;
}
.content-gap {
height: 1rpx;
margin-bottom: 200rpx;
}
// .content-gap {
// height: 1rpx;
// margin-bottom: 200rpx;
// }
.tip-text {
background-color: #FFFFFF;
......@@ -271,7 +272,7 @@
margin-bottom: 20rpx;
font-size: 28rpx;
color: #333333;
margin-bottom: 188rpx;
// margin-bottom: 188rpx;
.tip-bottom-h {
font-size: 24rpx;
color: #999999;
......
This diff is collapsed.
<template>
<view>
<view class="title">
《关于充电桩xxxx》
{{newsInfo.title}}
</view>
<view class="content">
于2021年3月23日 10:00 进行《xxx》内容进行培训。
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus 。
zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
<view class="content" v-html="newsInfo.body">
<button @click="add">aaa</button>
{{newsInfo.body}}
</view>
</view>
</template>
......@@ -18,10 +14,24 @@
export default {
data() {
return {
banner:{},
obj:{
},
newsInfo:null
}
},
methods: {
},
onLoad() {
},
onShow(){
uni.$on('news',(news)=>{
this.newsInfo = news;
console.log(news,'news')
})
},
onLoad() {
......
<template>
<view class="content">
<view class="title">
考试结果
</view>
<view class="test-result">
<text class="title">考试结果</text>
<view class="result">
未通过
</view>
<view class="details">
<view class="">
<text class="first">合格条件:</text><text>答对20题</text>
</view>
<view class="">
<text class="first">考试结果:</text><text>答对10题</text>
<view class="test-explain">
<view class="hang">
<text class="text1">合格条件:</text><text class="text2">答对20题</text>
</view>
<view class="">
<text class="first">考试用时</text><text>16分29秒</text>
<view class="hang">
<text class="text1">考试结果:</text><text class="text2">答对10题</text>
</view>
<view class="btn">
<button class="btn1">再答一次</button>
<button class="btn2">退出重考</button>
<view class="hang">
<text class="text1">考试用时:</text><text class="text2">16分29秒</text>
</view>
</view>
<view class="btn">
<button class="btn1">再答一次</button>
<button class="btn2">退出重考</button>
</view>
</view>
</template>
......@@ -32,57 +29,61 @@
}
},
methods:{
methods: {
}
}
</script>
<style lang="scss">
.content{
width: 100%;
height: 950rpx;
background: #DCDFE6;
padding: 53rpx;
}
.title{
font-size: 30rpx;
}
.result{
color: red;
font-size: 73rpx;
text-align: center;
margin: 46rpx 0;
}
.details{
border-top: 2rpx dashed #808080;
height: 600rpx;
padding-top: 94rpx;
view{
margin: 26rpx 0 0;
.first{
margin: 0 20rpx 0;
}
.test-result{
width: 610rpx;
height: 965rpx;
margin: 70rpx auto 0;
.title{
margin: 0 44rpx 0;
}
}
.btn{
.btn1{
width: 477rpx;
height: 61rpx;
border-radius: 27rpx;
line-height: 61rpx;
font-size: 29rpx;
background: #007AFF;
color: #FFFFFF;
margin: 140rpx auto 34rpx;
.result{
color: red;
font-size: 66rpx;
text-align: center;
border-bottom: 1px dashed #000000;
margin: 74rpx 0;
padding: 66rpx;
}
.test-explain{
.hang{
margin: 26rpx 26rpx;
.text1{
color: #a69999;
margin-right: 22rpx;
}
.text2{
color: #333333;
}
}
}
.btn2{
width: 477rpx;
height: 61rpx;
border-radius: 27rpx;
line-height: 61rpx;
font-size: 29rpx;
.btn{
margin-top: 236rpx;
.btn1{
width: 478rpx;
height: 60rpx;
background: #0079fe;
color: #fff;
font-size: 26rpx;
line-height: 60rpx;
margin: 20rpx auto;
}
.btn2{
width: 478rpx;
height: 60rpx;
background: #f2f2f2;
color: #333333;
font-size: 26rpx;
line-height: 60rpx;
margin:0 auto;
}
}
}
</style>
\ No newline at end of file
</style>
<template>
<view>
<view class="title">
{{CourseSectionlist.name}}
</view>
<view class="content" v-html="CourseSectionlist.content">
{{CourseSectionlist.content}}
</view>
</view>
</template>
<script>
export default {
data() {
return {
CourseSectionlist:null,
section_id:{
section_id:0
}
}
},
onLoad(id) {
this.section_id.section_id = id.section_id
this.getCourseSection()
},
methods: {
getCourseSection() {
this.$u.api
.CourseSection(this.section_id)
.then((res) => {
if (res.code == 200) {
if (res.data) {
this.CourseSectionlist = res.data;
console.log("--------")
console.log(this.CourseSectionlist)
if (res.data.length < 5) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true;
this.loadStatus = "nomore";
} else {
this.isLoadMore = false;
}
} else {
this.isLoadMore = true;
this.loadStatus = "nomore";
}
} else {
//接口请求失败的处理
uni.showToast({
title: res.message,
icon: "none"
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
}
})
.catch((err) => {
uni.showToast({
title: err,
icon: "none",
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
});
},
}
}
</script>
<style lang="scss">
.title{
text-align: center;
font-size: 45rpx;
font-weight: 700;
margin: 24rpx;
}
.content{
font-size: 30rpx;
padding: 50rpx;
}
</style>
......@@ -22,13 +22,13 @@
<view class="city-text">{{cityText}}</view>
</view>
</view>
<view class="base-item" style="height: 600rpx;">
<view class="base-item" style="margin-bottom: 0rpx;">
<view class="item item-select" @click="gopage('/pages/settle/select?selectType=working_age')">
<view class="flex-center">
<image class="item-image" :src="mixingImage"></image>
<text class="label">电工工龄(年)</text>
</view>
<p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]">
<p :class="['u-flex-1 u-text-right area', {before: baseInfo.working_age === ''}]">
{{ baseInfo.working_age !== '' ? workingAgeTxt : '去选择'}}
</p>
<u-icon name="arrow-right" color="#2272FF" size="28"></u-icon>
......@@ -63,7 +63,7 @@
</view>
</view>
</view>
<view class="seat"></view>
<!-- <view class="seat"></view> -->
<template v-slot:bottom>
<view class="btn-wrap flex-xc">
<u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle"
......@@ -119,7 +119,7 @@
submitStatus() {
const baseInfo = this.baseInfo
//baseInfo.name && baseInfo.mobile &&
const flag = baseInfo.service_area && baseInfo.working_age !== '' && baseInfo.address
const flag = baseInfo.service_area.length > 0 && baseInfo.working_age !== '' && baseInfo.address !== ''
return flag && !this.saving
},
cityText() {
......@@ -235,7 +235,7 @@
}
this.baseInfo = res.data
uni.showToast({
title: '入驻基本信息提交成功',
title: '提交成功',
icon: 'success'
});
},
......@@ -326,7 +326,9 @@
*/
async submitBaseInfo() {
if (!this.submitStatus) {
return
}
// this.newSubmitBaseInfo()
// return
const baseInfo = this.baseInfo;
......@@ -384,7 +386,8 @@
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.base-list {
......@@ -427,7 +430,8 @@
.label {
color: #333;
font-size: 32rpx;
font-size: 32rpx;
font-weight: bold;
}
.txt {
......@@ -582,9 +586,9 @@
font-weight: bold;
}
.seat {
padding-bottom: 168rpx;
}
// .seat {
// padding-bottom: 168rpx;
// }
/*提交按钮*/
.btn-wrap {
......@@ -680,7 +684,8 @@
.address-view {
border: 2rpx solid #ECECEC;
height: 112rpx;
margin-top: 30rpx;
margin-top: 30rpx;
margin-bottom: 20rpx;
padding: 16rpx 30rpx;
}
......
......@@ -321,7 +321,7 @@ export default {
break;
}
await self.chooseImage("qiniu", attr)
await self.chooseImage("qiniu", {...attr, options: {count: 1}})
if(self.uploadType && self.imgList && self.imgList.length > 0) {
// 设置图片对象
self.imgObj[self.uploadType] = self.imgList
......@@ -460,7 +460,10 @@ export default {
return formFlag;
},
async submitFileInfo() {
async submitFileInfo() {
if (!this.submitBtnStatus) {
return
}
if (!this.checkFileInfo()) {
return;
}
......@@ -525,7 +528,8 @@ export default {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.base-list {
......@@ -735,7 +739,7 @@ export default {
}
.info-view {
margin-bottom: 188rpx;
// margin-bottom: 188rpx;
.title-view {
background-color: #FFFFFF;
......
......@@ -194,7 +194,7 @@
.content-view {
background-color: #FFFFFF;
margin-bottom: 188rpx;
// margin-bottom: 188rpx;
border-radius: 12rpx;
}
......
......@@ -2,7 +2,7 @@
<view class="content">
<Settle :index="5">
<view class="base-list">
<view class="title">充电桩安装需缴纳配件押金</view>
<view class="title">您还需缴纳配件押金</view>
<view class="price"><text>¥ </text>{{settledInfo.record.deposit}}</view>
<view class="list">
<view class="item u-flex u-row-between">
......@@ -146,7 +146,8 @@
this.saving = true
uni.showLoading({
title: '支付中……'
})
})
// 提交支付订单
const code = await this.getCode()
const params = {
......@@ -158,31 +159,14 @@
}
const response = await this.$u.api.paySettleDeposit(params)
console.log(response)
if (response.code !== 200) {
if (response.code !== 200) {
this.saving = false
uni.showToast({
title: response.message,
icon: 'none'
})
return
}
let timer = setTimeout(res => {
clearTimeout(timer)
uni.showModal({
title: '提示',
content: '支付结果',
confirmText: '成功',
cancelText: '失败',
success: function(res) {
if (res.confirm) {
// console.log(res.confirm,'res.confirm')
self.pending()
} else if (res.cancel) {
self.saving = false
console.log('用户点击取消');
}
}
});
}, 1000)
const {
charge,
......@@ -193,16 +177,19 @@
pingpp.createPayment(charge, (result, err) => {
if (result == "success") {
// 只有微信公众账号 (wx_pub)、微信小程序 (wx_lite)、QQ 公众号 (qpay_pub)、支付宝口碑 (alipay_qr)
// 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
// 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
this.showPopView()
uni.showToast({
title: '支付成功',
icon: 'none'
})
} else if (result == "fail") {
// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
// console.log(err.msg)
// console.log(err.msg)
this.showPopView()
} else if (result == "cancel") {
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
this.saving = false
uni.showToast({
title: '您已经取消了支付',
icon: 'none'
......@@ -210,6 +197,26 @@
}
});
},
showPopView() {
// let timer = setTimeout(res => {
// clearTimeout(timer)
uni.showModal({
title: '提示',
content: '支付结果',
confirmText: '成功',
cancelText: '失败',
success: ((res) => {
if (res.confirm) {
// console.log(res.confirm,'res.confirm')
this.pending()
} else if (res.cancel) {
this.pending()
console.log('用户点击取消');
}
})
});
// }, 1000)
}
},
}
</script>
......@@ -223,7 +230,8 @@
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.base-list {
......@@ -231,7 +239,7 @@
border-radius: 12rpx;
padding: 30rpx;
min-height: 160rpx;
margin-bottom: 188rpx;
// margin-bottom: 188rpx;
text-align: center;
.txt {
......
......@@ -2,9 +2,9 @@
<view class="container u-row-between" v-if="info">
<Settle :index="pageIndex">
<view class="content-view">
<view style="min-height: 120rpx;" v-if="status == 8"></view>
<!-- <view style="min-height: 120rpx;" v-if="status == 8"></view> -->
<view class="u-flex u-row-center">
<image :class="['icon', {active: status != 1}]"
<image :class="['icon', {active: status != 1, h: [1, 2, 3, 4].indexOf(status) != -1}]"
:src="imageUrl">
</image>
</view>
......@@ -16,7 +16,7 @@
v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text>
</view>
<view class="services-view">
<view v-if="status != 8">
<view v-if="[1, 2, 3, 4].indexOf(status) != -1">
<image class="service-info-image" :src="erweimaImage"></image>
<view class="content-info-tip">长按二维码添加官方客服微信</view>
<view class="content-info-tip">及时了解审核进度</view>
......@@ -45,14 +45,14 @@
promptList: [{
status: 1,
statusName: '待审核',
txtArr: ['已提交,等待审核', '正在审核中'],
txtArr: ['入驻资料提交成功', '您的申请入驻资料已成功提交,工作人员正在审核中'],
btnTxt: '去首页',
url: '/pages/index/index'
}, {
status: 2,
statusName: '已通过',
txtArr: ['恭喜,审核通过', '“充电桩安装入驻审核”'],
btnTxt: '去考试',
txtArr: ['入驻资料审核成功', '您的申请入驻资料已审核提交,可进行在线学习考试'],
btnTxt: '下一步',
url: '/pages/learn/exam'
}, {
status: 3,
......@@ -64,28 +64,26 @@
}, {
status: 4,
statusName: '已驳回',
txtArr: ['您的入驻资料已被驳回!', '可重新提交资料!'],
txtArr: ['入驻资料审核失败'],
tipsArr: ['原因:', '图片不够清楚'],
btnTxt: '重新提交',
url: '/pages/settle/file'
}, {
status: 8,
statusName: 'step4',
txtArr: ['您已通过', '“充电桩安装入驻考试”'],
tipsArr: ['可以正式签约了'],
btnTxt: '去签约',
txtArr: ['您已通过接单在线考试', '通过在线考试后,可以前往签约'],
btnTxt: '下一步',
url: '/pages/settle/sign-contract'
}, {
status: [5, 6],
statusName: '未支付保证金',
txtArr: ['您已成为', "充电桩安装的签约服务商"],
tipsArr: ['请缴纳1000元质保金'],
btnTxt: '去缴纳保证金',
txtArr: ['您已成功完成签约', "完成签约后,缴纳配件押金即可完成入驻"],
btnTxt: '下一步',
url: '/pages/settle/pay-ensure'
}, {
status: 7,
statusName: '已支付保证金',
txtArr: ['您已成为', "充电桩安装的正式服务商"],
txtArr: ['您已成功缴纳配件押金', " 成功缴纳配件押金后即前往接单"],
btnTxt: '去首页',
url: '/pages/index/index'
}],
......@@ -177,9 +175,10 @@
this.info = this.promptList[0]
return
}
if (status === 6) {
info.tipsArr[0] = '请缴纳' + this.settledInfo.record.deposit + '元质保金'
} else if (status === 4) {
// if (status === 6) {
// info.tipsArr[0] = '请缴纳' + this.settledInfo.record.deposit + '元质保金'
// } else
if (status === 4) {
info.tipsArr[1] = this.settledInfo.record.reason || ''
}
this.info = info
......@@ -218,9 +217,15 @@
height: 224rpx;
&.active {
margin-top: 38rpx;
margin-top: 150rpx;
width: 234rpx;
height: 222rpx;
}
&.h {
margin-top: 38rpx;
width: 234rpx;
height: 222rpx;
}
}
......
......@@ -412,7 +412,15 @@
<style lang="scss" scoped>
.content {
background-color: #F3F3F3;
background-color: #F4F5F7;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
overflow-y:auto;
}
.nav-item,
.age-item {
......@@ -447,7 +455,7 @@
}
.nav-item.active {
background-color: #ededed;
background-color: #F4F5F7;
}
}
......
......@@ -366,7 +366,7 @@
// }
uni.hideLoading()
uni.showToast({
title: '入驻基本信息提交成功',
title: '提交成功',
icon: 'success'
});
// let timer = setTimeout(() => {
......@@ -424,7 +424,8 @@
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
overflow-y:auto;
}
.content-txt {
......@@ -453,8 +454,8 @@
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 30rpx 30rpx 0rpx 30rpx;
margin-bottom: 20rpx;
margin-bottom: 188rpx;
// margin-bottom: 20rpx;
// margin-bottom: 188rpx;
/deep/ .u-radio__label {
line-height: 40rpx;
......
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