From bb49e55e75b9db5283b0b72f4ba75cfa4c726c41 Mon Sep 17 00:00:00 2001 From: hcj Date: Fri, 16 Aug 2024 15:27:36 +0800 Subject: [PATCH] v1.0.6 --- components/onLineCourseItem/index.vue | 237 +++++ components/onLineCourseItem/liveSteam.png | Bin 0 -> 348 bytes components/poster/index.vue | 68 ++ pages.json | 15 +- pages/index/index.vue | 553 ++++++++---- pages/index/testcrowdsourc/companyInfo.vue | 4 +- pages/index/testcrowdsourc/userInfo.vue | 4 +- pages/index/testtraining/arr.png | Bin 866 -> 0 bytes pages/index/testtraining/noCourse.png | Bin 42207 -> 0 bytes pages/index/testtraining/noEvaluate.png | Bin 26799 -> 0 bytes pages/index/testtraining/noUsePerson.png | Bin 29058 -> 0 bytes pages/index/testtraining/noregister.png | Bin 62762 -> 0 bytes pages/index/testtraining/olCourse.png | Bin 1081 -> 0 bytes pages/index/testtraining/onLineCourse.vue | 304 ++++++- pages/index/testtraining/testtraining.vue | 200 ++--- pages/index/toolleasing/tooldetails.vue | 998 +++++++++++---------- pages/personal/login.vue | 2 +- pages/personal/myCourse/allMyCourse.vue | 109 +++ pages/personal/myCourse/myCourse.vue | 100 ++- pages/personal/ordernumber/ordernumber.vue | 19 +- pages/personal/personal.vue | 6 +- pages/personal/phonelogin.vue | 2 +- pages/personal/privacy.vue | 76 +- pages/personal/setup/aboutus.vue | 2 +- pages/personal/setup/accountoverview.vue | 32 +- pages/personal/setup/index.vue | 2 +- pages/personal/setup/mycompanyinfo.vue | 4 +- pages/personal/setup/myreview.vue | 6 +- pages/personal/setup/myuserinfo.vue | 4 +- pages/personal/setup/pcweb.vue | 2 +- pages/personal/setup/peixunban.vue | 53 +- pages/personal/setup/usepeople.vue | 2 +- uni.scss | 40 +- utils/share.js | 4 +- utils/util.js | 22 +- 35 files changed, 1899 insertions(+), 971 deletions(-) create mode 100644 components/onLineCourseItem/index.vue create mode 100644 components/onLineCourseItem/liveSteam.png create mode 100644 components/poster/index.vue delete mode 100644 pages/index/testtraining/arr.png delete mode 100644 pages/index/testtraining/noCourse.png delete mode 100644 pages/index/testtraining/noEvaluate.png delete mode 100644 pages/index/testtraining/noUsePerson.png delete mode 100644 pages/index/testtraining/noregister.png delete mode 100644 pages/index/testtraining/olCourse.png create mode 100644 pages/personal/myCourse/allMyCourse.vue diff --git a/components/onLineCourseItem/index.vue b/components/onLineCourseItem/index.vue new file mode 100644 index 0000000..938ea69 --- /dev/null +++ b/components/onLineCourseItem/index.vue @@ -0,0 +1,237 @@ + + + + + \ No newline at end of file diff --git a/components/onLineCourseItem/liveSteam.png b/components/onLineCourseItem/liveSteam.png new file mode 100644 index 0000000000000000000000000000000000000000..c4f86eec608a576b39c4c75a2528f6eaba602b00 GIT binary patch literal 348 zcmV-i0i*tjP)Px$7D+@wR5(xVl&?#JQ51%sH;v)K%3v4-VPYFLJ_?u?iN8Vd>R7_Kl0WZ-eiPJLST?=RTYt?>SZ%@*B7T^hR903j`wdcTb1!ieVY7K3dfEKU>p + + haibao + + + + 长按分享 + + + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index f47493e..d2a782e 100644 --- a/pages.json +++ b/pages.json @@ -206,13 +206,13 @@ }, { "path": "pages/personal/login", "style": { - "navigationBarTitleText": "登录关键测试宝", + "navigationBarTitleText": "登录小关软测宝", "navigationBarBackgroundColor": "#284CD1" } }, { "path": "pages/personal/phonelogin", "style": { - "navigationBarTitleText": "关键测试宝", + "navigationBarTitleText": "小关软测宝", "navigationBarBackgroundColor": "#284CD1" } }, @@ -251,7 +251,7 @@ }, { "path": "pages/personal/setup/pcweb", "style": { - "navigationBarTitleText": "关键测试宝", + "navigationBarTitleText": "小关软测宝", "navigationBarBackgroundColor": "#284CD1" } }, @@ -397,6 +397,15 @@ "onReachBottomDistance": 50 } }, + { + "path" : "pages/personal/myCourse/allMyCourse", + "style" : + { + "navigationBarTitleText" : "线上培训班", + "navigationBarBackgroundColor": "#284CD1", + "onReachBottomDistance": 50 + } + }, { "path" : "pages/personal/courseSign/courseSign", "style" : diff --git a/pages/index/index.vue b/pages/index/index.vue index 8c8e6d7..31d86f0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,21 +1,43 @@ - \ No newline at end of file diff --git a/pages/index/testcrowdsourc/companyInfo.vue b/pages/index/testcrowdsourc/companyInfo.vue index 458eed4..b8124fe 100644 --- a/pages/index/testcrowdsourc/companyInfo.vue +++ b/pages/index/testcrowdsourc/companyInfo.vue @@ -225,8 +225,8 @@ \ No newline at end of file diff --git a/pages/index/testtraining/testtraining.vue b/pages/index/testtraining/testtraining.vue index 9d06eab..80a690f 100644 --- a/pages/index/testtraining/testtraining.vue +++ b/pages/index/testtraining/testtraining.vue @@ -5,19 +5,12 @@ - - - 软测课堂 - 时间：{{ '今日 20:00' }} - - 如何使用性能测试工具 - 讲师: 风清扬老师 - - 去学习 - 付费学习: {{ '9.9' }} - + + 线上培训课程 + 更多> - + @@ -338,7 +331,6 @@ -

@@ -587,11 +579,15 @@ @@ -1832,87 +1858,27 @@ export default { box-sizing: border-box; } -.onlineTrain { - margin: 30rpx 0rpx; - height: 270rpx; - background: #FFFFFF; - border-radius: 10rpx; -} -.onLineTitle { +.onLineTrainTitle { + margin: 10rpx 0; + line-height: 80rpx; display: flex; - font-family: PingFang SC; - font-weight: 500; - height: 88rpx; - line-height: 54rpx; + align-items: center; justify-content: space-between; } -.onLineClassName { - height: 54rpx; - width: 183rpx; - text-align: center; - background: linear-gradient(90deg, #5EA6FD, #1A81F9); - border-radius: 9rpx 0rpx 46rpx 0rpx; - font-size: 24rpx; - color: #FFFFFF; -} - -.onLineCourse { - font-size: 28rpx; - line-height: 46rpx; - font-family: PingFang SC; +.onLineTrainTitle .onLineTitleText { font-weight: bold; - color: #1A1A1A; - margin-left: 24rpx; - -} - -.onLineCourseTime { - margin-left: 24rpx; - margin-right: 30rpx; - width: 174rpx; - line-height: 88rpx; - font-size: 22rpx; - color: #808080; -} - -.onLineTeacher { - margin-top: 10rpx; - margin-left: 24rpx; - font-size: 24rpx; - font-weight: 500; - color: #666666; - line-height: 46rpx; -} - -.onLineBtnWrap { - display: flex; - justify-content: flex-end; + font-size: 30rpx; } -.onLineBtn { - width: 209rpx; - height: 50rpx; - border-radius: 25rpx; - width: 209rpx; - width: 167rpx; - font-family: PingFang SC; +.onLineTrainTitle .more { font-weight: 500; - font-size: 24rpx; - color: #FFFFFF; - line-height: 49rpx; - text-align: center; + font-size: 28rpx; + color: #808080; } -.toLearn { - background: linear-gradient(90deg, #FB8C16, #FEC36E); -} -.toPay { - background: linear-gradient(90deg, #5EA6FD, #1A81F9); - border: 1px solid #AAD1FE; -} .logobg { width: 100%; diff --git a/pages/index/toolleasing/tooldetails.vue b/pages/index/toolleasing/tooldetails.vue index a5911ad..805866e 100644 --- a/pages/index/toolleasing/tooldetails.vue +++ b/pages/index/toolleasing/tooldetails.vue @@ -2,7 +2,7 @@ - +

- {{tooldetilsdata.tool.name}} + {{ tooldetilsdata.tool.name }}

类型： - {{findLabelValueByPropnew(tooltypelist, tooldetilsdata.tool.toolType+'', 'dictValue', 'dictLabel' ) }} + {{ findLabelValueByPropnew(tooltypelist, tooldetilsdata.tool.toolType + '', 'dictValue', + 'dictLabel') }} - 交付方式：{{tooldetilsdata.tool.deliverType}} + 交付方式：{{ tooldetilsdata.tool.deliverType }} -

{{item.title}} : {{item.funDesc}}

+

{{ item.title }} : {{ item.funDesc }}

{{tooldetilsdata.tool.productQA}} + style="color:#808080;white-space:pre-line;font-size: .9rem;">{{ tooldetilsdata.tool.productQA }}

暂无问题

购买数量：

- 1 + 1

支付金额：

-

+

¥ - {{addPriceAll}} + + {{ typeName == '线下测试服务(金额面议)' ? '金额面议' : addPriceAll }}

- 限时免费 + {{ typeName == '线下测试服务(金额面议)' ? '金额面议' : '限时免费' }}

@@ -209,7 +213,7 @@

微信支付 - {{lingqianIS ? '零钱不足':'零钱'}} + {{ lingqianIS ? '零钱不足' : '零钱' }}

@@ -241,508 +245,538 @@ + @cancel='tokenshow = false'> \ No newline at end of file diff --git a/pages/personal/login.vue b/pages/personal/login.vue index 3b709da..8a89de2 100644 --- a/pages/personal/login.vue +++ b/pages/personal/login.vue @@ -3,7 +3,7 @@ -

关键测试宝

+

小关软测宝