Commit 0bf99ddf authored by zhengzy's avatar zhengzy

冲突

parent 10fa606f
const UNI_APP = { const UNI_APP = {
ucenterUrl: { ucenterUrl: {
apiUrl: 'http://rest-u.yunya.com', //php端域名请求头 apiUrl: 'http://192.168.1.46', //php端域名请求头
// xueUrl: 'https://xue.banshouhui.com', //学院 xueUrl: 'http://192.168.1.46:8088', //学院
// banshou: 'https://m.banshou.com', //扳手app // banshou: 'https://m.banshou.com', //扳手app
}, },
systemUrl: { systemUrl: {
......
; ;
(function() { (function() {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境
let ENV_VAR = null; let ENV_VAR = null;
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -162,12 +162,12 @@ ...@@ -162,12 +162,12 @@
</template> </template>
<script> <script>
<<<<<<< .merge_file_a10028 export default {
export default {
data() { data() {
return { return {
msg:"赣南吴彦祖", msg: "赣南吴彦祖",
tabs: [{ tabs: [
{
name: "交付规范", name: "交付规范",
}, },
{ {
...@@ -186,11 +186,11 @@ ...@@ -186,11 +186,11 @@
start: 0, start: 0,
}, },
list: [], list: [],
courselist:null, courselist: null,
loadStatus: "loading", //加载样式:loadMore-加载前样式,loading-加载加载中样式,nomore-没有数据样式 loadStatus: "loading", //加载样式:loadMore-加载前样式,loading-加载加载中样式,nomore-没有数据样式
isLoadMore: false, //是否加载中 isLoadMore: false, //是否加载中
course_id:"course_id_=173", course_id: "course_id_=173",
exam:null exam: null,
}; };
}, },
onLoad() { onLoad() {
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
this.getCourseList(); this.getCourseList();
this.getUserExamInfo(); this.getUserExamInfo();
}, },
computed:{ computed: {
bannerImage() { bannerImage() {
return process.uniEnv.qn_base_url + 'banner-xx.png' return process.uniEnv.qn_base_url + "banner-xx.png";
}, },
}, },
methods: { methods: {
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
//接口请求失败的处理 //接口请求失败的处理
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: "none" icon: "none",
}); });
this.isLoadMore = false; this.isLoadMore = false;
if (this.params.start > 0) { if (this.params.start > 0) {
...@@ -253,8 +253,8 @@ ...@@ -253,8 +253,8 @@
if (res.code == 200) { if (res.code == 200) {
if (res.data) { if (res.data) {
this.courselist = res.data; this.courselist = res.data;
console.log("--------") console.log("--------");
console.log(this.courselist) console.log(this.courselist);
if (res.data.length < 5) { if (res.data.length < 5) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页 //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true; this.isLoadMore = true;
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
//接口请求失败的处理 //接口请求失败的处理
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: "none" icon: "none",
}); });
this.isLoadMore = false; this.isLoadMore = false;
if (this.params.start > 0) { if (this.params.start > 0) {
...@@ -311,28 +311,29 @@ ...@@ -311,28 +311,29 @@
}); });
}, },
//跳转到课程介绍 //跳转到课程介绍
ccc(id){ ccc(id) {
uni.navigateTo({ uni.navigateTo({
url:"./curriculum?course_id=" + id url: "./curriculum?course_id=" + id,
}) });
}, },
//跳转到 //跳转到
bbb(e) { bbb(e) {
var news = { var news = {
body:e.body, body: e.body,
id:e.id, id: e.id,
level:e.level, level: e.level,
title:e.title title: e.title,
}; };
// console.log(news) // console.log(news)
uni.navigateTo({ uni.navigateTo({
url: "./news-details" url: "./news-details",
}); });
setTimeout(()=>{uni.$emit('news',news),console.log('发送数据')},500) setTimeout(() => {
uni.$emit("news", news), console.log("发送数据");
console.log('跳转结束11111111') }, 500);
console.log("跳转结束11111111");
}, },
//scroll-view到底部加载更多 //scroll-view到底部加载更多
onreachBottom() { onreachBottom() {
...@@ -362,183 +363,177 @@ ...@@ -362,183 +363,177 @@
}, },
//考核认证,通用认证,考试通过or未通过查询接口请求 //考核认证,通用认证,考试通过or未通过查询接口请求
getUserExamInfo() { getUserExamInfo() {
uni.showLoading({ uni.showLoading({
title: '请稍候' title: "请稍候",
}) });
let that = this let that = this;
uni.request({ uni.request({
url: 'http://192.168.1.22' + url:
'/wxh-worker-rest/rest/exam' + "http://192.168.1.22" +
'/serviceRule/userExamInfo/' + "/wxh-worker-rest/rest/exam" +
'RTOKENe83309bff5846d2ff0949d58a0c0f643d60d107d' + "/serviceRule/userExamInfo/" +
'?examId=' + 2, getApp().globalData.token +
method: 'POST', "?examId=" +
2,
method: "POST",
data: { data: {
//examId:this.examId, //examId:this.examId,
}, },
header: { header: {
'Content-Type': 'application/x-www-form-urlencoded' "Content-Type": "application/x-www-form-urlencoded",
}, },
success: (res) => { success: (res) => {
console.log(res.data) console.log(res.data);
uni.hideLoading() uni.hideLoading();
if (!res.data) { if (!res.data) {
return return;
} }
if (res.data.code == 401 || res.data.code == 403) { if (res.data.code == 401 || res.data.code == 403) {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/login/wxlogin' // url: '/pages/login/wxlogin'
// }) // })
// return // return
console.log('洪塘张学友') console.log("洪塘张学友");
} }
if (res.data.code == 200) { if (res.data.code == 200) {
//examStatus 用户考试状态 0考试中 1考试完成 2未参与 //examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data.data that.exam = res.data.data;
console.log(that.exam) console.log(that.exam);
if (res.data.data.examStatus == 2) { if (res.data.data.examStatus == 2) {
that.applyExam() that.applyExam();
return return;
} }
if(res.data.data.examStatus == 1){ if (res.data.data.examStatus == 1) {
console.log('111111111111111111111111111') console.log("111111111111111111111111111");
that.isComplete = true that.isComplete = true;
that.examScore = res.data.data.examScore that.examScore = res.data.data.examScore;
that.postResult() that.postResult();
return return;
} }
if (res.data.data.examStatus == 0 ) { if (res.data.data.examStatus == 0) {
that.userExamId = res.data.data.id that.userExamId = res.data.data.id;
that.getNext() that.getNext();
} }
} else { } else {
uni.showToast({ uni.showToast({
icon: 'none', icon: "none",
title: res.data.message title: res.data.message,
}) });
} }
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading();
uni.showToast({ uni.showToast({
icon: 'none', icon: "none",
title: '获取考试信息失败' title: "获取考试信息失败",
}) });
}
})
}, },
});
}, },
}; },
};
</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-left: -15rpx; */ /* margin-left: -15rpx; */
} }
//交付规范 /* //交付规范 */
.standard { .standard {
width: 656rpx; width: 656rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1rpx solid #82848a; border-bottom: 1rpx solid #82848a;
padding: 0 34rpx; padding: 0 34rpx;
margin: 72rpx auto; margin: 72rpx auto;
} }
//培训通知 /* //培训通知 */
.notice { .notice {
border: #808080 solid 2rpx; border: #808080 solid 2rpx;
width: 100%; width: 100%;
height: 400rpx; height: 400rpx;
margin-top: 36rpx; margin-top: 36rpx;
overflow: hidden; overflow: hidden;
} }
.n-head { .n-head {
text-align: center; text-align: center;
margin: 32rpx 0; margin: 32rpx 0;
} }
.news{ .news {
}
} /* //在线学习 */
//在线学习 .currency-class {
.currency-class {
width: 100%; width: 100%;
background: #ffffff; background: #ffffff;
padding: 18rpx; padding: 18rpx;
margin-bottom: 11px; margin-bottom: 11px;
border-radius: 12rpx; border-radius: 12rpx;
} }
.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: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-top: 22rpx; padding-top: 22rpx;
margin-top: 28rpx; margin-top: 28rpx;
border-top: 1rpx solid #808080; border-top: 1rpx solid #808080;
} }
.img { .img {
width: 201rpx; width: 201rpx;
height: 201rpx; height: 201rpx;
display: block; display: block;
margin-right: 0rpx; margin-right: 0rpx;
} }
.right { .right {
width: 428rpx; width: 428rpx;
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: 691rpx; height: 691rpx;
} }
</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