diff --git a/pages.json b/pages.json index 3818c86..f47493e 100644 --- a/pages.json +++ b/pages.json @@ -99,6 +99,13 @@ "navigationBarBackgroundColor": "#284CD1" } }, + { + "path": "pages/index/testtraining/onLineCourse", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#284CD1" + } + }, { "path": "pages/index/testtraining/teacherSign", "style": { @@ -386,7 +393,8 @@ "style" : { "navigationBarTitleText" : "", - "navigationBarBackgroundColor": "#284CD1" + "navigationBarBackgroundColor": "#284CD1", + "onReachBottomDistance": 50 } }, { diff --git a/pages/index/onlineTestCourse/onlineCourseInfo.vue b/pages/index/onlineTestCourse/onlineCourseInfo.vue new file mode 100644 index 0000000..9ad0ae0 --- /dev/null +++ b/pages/index/onlineTestCourse/onlineCourseInfo.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/pages/index/onlineTestCourse/verciInput.vue b/pages/index/onlineTestCourse/verciInput.vue new file mode 100644 index 0000000..17bcab3 --- /dev/null +++ b/pages/index/onlineTestCourse/verciInput.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/pages/index/testtraining/arr.png b/pages/index/testtraining/arr.png new file mode 100644 index 0000000..b530cb0 Binary files /dev/null and b/pages/index/testtraining/arr.png differ diff --git a/pages/index/testtraining/noCourse.png b/pages/index/testtraining/noCourse.png new file mode 100644 index 0000000..fe264a3 Binary files /dev/null and b/pages/index/testtraining/noCourse.png differ diff --git a/pages/index/testtraining/noEvaluate.png b/pages/index/testtraining/noEvaluate.png new file mode 100644 index 0000000..2868379 Binary files /dev/null and b/pages/index/testtraining/noEvaluate.png differ diff --git a/pages/index/testtraining/noUsePerson.png b/pages/index/testtraining/noUsePerson.png new file mode 100644 index 0000000..8e64806 Binary files /dev/null and b/pages/index/testtraining/noUsePerson.png differ diff --git a/pages/index/testtraining/noregister.png b/pages/index/testtraining/noregister.png new file mode 100644 index 0000000..3a7b2f6 Binary files /dev/null and b/pages/index/testtraining/noregister.png differ diff --git a/pages/index/testtraining/olCourse.png b/pages/index/testtraining/olCourse.png new file mode 100644 index 0000000..4ac4f05 Binary files /dev/null and b/pages/index/testtraining/olCourse.png differ diff --git a/pages/index/testtraining/onLineCourse.vue b/pages/index/testtraining/onLineCourse.vue new file mode 100644 index 0000000..14e74a5 --- /dev/null +++ b/pages/index/testtraining/onLineCourse.vue @@ -0,0 +1,252 @@ + + + + + \ No newline at end of file diff --git a/pages/index/testtraining/testtraining.vue b/pages/index/testtraining/testtraining.vue index 598b6d9..9d06eab 100644 --- a/pages/index/testtraining/testtraining.vue +++ b/pages/index/testtraining/testtraining.vue @@ -1,435 +1,447 @@ - diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue index 804f448..f639305 100644 --- a/pages/personal/personal.vue +++ b/pages/personal/personal.vue @@ -8,22 +8,22 @@ + :src="avatar && avatar.indexOf('http') == 0 ? avatar : base + avatar" alt="">

- {{phoneuserinfo.companyName}} + {{ phoneuserinfo.companyName }}

-

{{nickName}}

+

{{ nickName }}

未认证 - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@
- + @@ -51,7 +51,7 @@ - + @@ -60,7 +60,7 @@
- + @@ -69,7 +69,7 @@ - + @@ -114,13 +114,14 @@ 我的众包 - - + - 我的评价 + 我的培训班 + @@ -146,11 +147,18 @@ 我的订单 - + + + + + 我的评价 + @cancel='tokenshow = false'> \ No newline at end of file diff --git a/pages/personal/setup/accountoverview.vue b/pages/personal/setup/accountoverview.vue index 60f46dc..a999418 100644 --- a/pages/personal/setup/accountoverview.vue +++ b/pages/personal/setup/accountoverview.vue @@ -1,63 +1,82 @@ diff --git a/pages/personal/setup/myreview.vue b/pages/personal/setup/myreview.vue index faa71fb..ce59b4b 100644 --- a/pages/personal/setup/myreview.vue +++ b/pages/personal/setup/myreview.vue @@ -26,7 +26,8 @@ - 暂无评价 + + 暂无评价 @@ -65,7 +66,7 @@ font-weight: bold; color: #9D9D9D; text-align: center; - margin-top: 40rpx; + margin-top: 100px; } .peixunbanpage { diff --git a/pages/personal/setup/peixunban.vue b/pages/personal/setup/peixunban.vue index b06b3c7..8a14f9a 100644 --- a/pages/personal/setup/peixunban.vue +++ b/pages/personal/setup/peixunban.vue @@ -2,123 +2,243 @@ - - +
+ + + {{ item.trainClassName }} + + + + + +

班级名称:{{ item.trainClassName }}

+ +

+ 开课日期:{{ item.trainStartTime.slice(0, 4) }}年{{ item.trainStartTime.slice(5, 7) }}月{{ + item.trainStartTime.slice(8, 10) }}日 +

+

+ 结课时间:{{ item.trainEndTime.slice(0, 4) }}年{{ item.trainEndTime.slice(5, 7) }}月{{ + item.trainEndTime.slice(8, 10) }}日 +

+
+
未开课
+
未开课
+
未开课
+
开课中
+
已结束
+
+ + {{ item.reportName }} + {{ item.reportName ? + '覆盖上传报告' : '上传结课报告' }} + +
+ + - {{item.trainClassName}} + {{ item.trainClassName }} -

报名时间:{{ dateFormat(new Date(item.registrationTime))}}

+

报名时间:{{ dateFormat(new + Date(item.registrationTime)) }}

- - -

班级名称:{{item.trainClassName}}

+ +

班级名称:{{ item.trainClassName }}

-

开课日期:{{item.trainStartTime.slice(0,4)}}年{{item.trainStartTime.slice(5,7)}}月{{item.trainStartTime.slice(8,10)}}日

-

结课时间:{{item.trainEndTime.slice(0,4)}}年{{item.trainEndTime.slice(5,7)}}月{{item.trainEndTime.slice(8,10)}}日

+

+ 开课日期:{{ item.trainStartTime.slice(0, 4) }}年{{ item.trainStartTime.slice(5, 7) }}月{{ + item.trainStartTime.slice(8, 10) }}日 +

+

+ 结课时间:{{ item.trainEndTime.slice(0, 4) }}年{{ item.trainEndTime.slice(5, 7) }}月{{ + item.trainEndTime.slice(8, 10) }}日 +

-
未开课
-
未开课
-
未开课
-
开课中
-
已结束
+
未开课
+
未开课
+
未开课
+
开课中
+
已结束
+
+ + {{ item.reportName }} + {{ item.reportName ? + '覆盖上传报告' : '上传结课报告' }}
- 暂无报名信息 + + + 暂无报名信息 +
- diff --git a/pages/personal/setup/usepeople.vue b/pages/personal/setup/usepeople.vue index 1596587..378e7a3 100644 --- a/pages/personal/setup/usepeople.vue +++ b/pages/personal/setup/usepeople.vue @@ -1,23 +1,24 @@ \ No newline at end of file diff --git a/utils/http.js b/utils/http.js index 1faca8e..a6ddb9f 100644 --- a/utils/http.js +++ b/utils/http.js @@ -1,8 +1,8 @@ import comstemutil from "./comstemutil"; //es6 -// const baseUrl = 'http://192.168.0.230:9999'; -const baseUrl = 'https://www.bjkeyware.com/test-api'; +const baseUrl = 'http://192.168.0.229:9999'; +// const baseUrl = 'https://www.bjkeyware.com/test-api'; // const baseUrl = 'https://www.bjkeyware.com/prod-api'; // const baseUrl = 'http://172.16.36.180:9999';