From 96e07d313556b34404cddeec77e809734b8a7ed7 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Mon, 26 Sep 2022 20:11:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/listblue010.png | Bin 0 -> 629 bytes public/images/listblue04.png | Bin 0 -> 738 bytes public/images/listblue05.png | Bin 0 -> 840 bytes public/images/listblue06.png | Bin 0 -> 864 bytes public/images/listblue07.png | Bin 0 -> 776 bytes public/images/listblue08.png | Bin 0 -> 887 bytes public/images/listblue09.png | Bin 0 -> 863 bytes src/api/phase2/index.js | 2 +- src/assets/styles/portal-index.scss | 6 + src/assets/styles/portal.scss | 8 +- src/components/UcHeader/Index.vue | 2 +- src/views/Index.vue | 170 +++++++++++----------------- src/views/portal/course/Index.vue | 3 - 13 files changed, 80 insertions(+), 111 deletions(-) create mode 100644 public/images/listblue010.png create mode 100644 public/images/listblue04.png create mode 100644 public/images/listblue05.png create mode 100644 public/images/listblue06.png create mode 100644 public/images/listblue07.png create mode 100644 public/images/listblue08.png create mode 100644 public/images/listblue09.png diff --git a/public/images/listblue010.png b/public/images/listblue010.png new file mode 100644 index 0000000000000000000000000000000000000000..64bad65924d6f9ed3d36c12f0b440cb5521afb59 GIT binary patch literal 629 zcmV-*0*d{KP)Px%FG)l}R7gwhmceTiQ4q$zmnBfdSmI4Yp^?0|%R&T&UV15d5na=)Or}Ob_-T)m9O*N%oDbY|3U$(k-d>l6TvAGxMAI-kaSO zIH4s@h>HpMzbQXb>UzCC-EOz@#u($e?sl@OX0w_1eg7&m&lqF2jWO%4>$cNWKNMW4 zR4!z**$pAYMIpqVlrkSr=y~3f5Mmj?RLs7^%=c{DUONo_7r0z5XLGsS0)VFg&W8z- zV9)dBgb*7;lK(Kq6dcFd9R=?L*J`zEK@hA0IF|_8Q%W6lthHVNa6j_du`KIW5Crc5 zWFp%mrBtZK(A5X7R;v$M6}P$XQHEdDW$xd8r*aAJa0w_@u~NmJYyoNG4rK3 zSZlox;13wU8>Q6kBZI>+X|-D4hIOp9t^+7cz!Rze#pTifLmA)T4ID`?=B7kLPj(;vaA;f}|ax3yV zTF0X29}6j^lhz8$0>gORLn_eiNz3mN0FC6O;NkxCM4DH(HE0 P00000NkvXXu0mjfI29uW literal 0 HcmV?d00001 diff --git a/public/images/listblue04.png b/public/images/listblue04.png new file mode 100644 index 0000000000000000000000000000000000000000..2765a4bf6442d454b5c13f1b7c25a9beb18bd6c2 GIT binary patch literal 738 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 literal 0 HcmV?d00001 diff --git a/public/images/listblue08.png b/public/images/listblue08.png new file mode 100644 index 0000000000000000000000000000000000000000..411cc44dcec3f90971f4304f6a662fb3f193fa6d GIT binary patch literal 887 zcmV--1Bm>IP)Px&F-b&0R7gwhmP?2gM-+ztQ`MQpj7TCrU{EJRrm9+J;S;kEUm+nFMMYewAVfvb zg-a0>WkgMasM{ovRft@{h2*)BU?5@;aU){(mOm7bY9bML@a zH*=Ohb&=dij>nDcehheUaBxnVrk9v`RkZ*SF*9FC({yilclRr=mrAA6&bdPX zKFEQd2q6wCrGBXg9|Ml#_zHl}$4UIg7<1HGyMdYisI`Wfp9Mh>c6D_PPXr$UE*6XP zgCH0JAbb)L9cN|*U{_Y;zSerKwe}|fUuW7~09ygv$bt45WBi(NV+1&kp?cM5naY$0h^zmj0YeSS^HD?wmWH+ss1e+-@TBgXP=dd%1_1{cKc12(d*e z^=rf6QmM4dIae2)B*}0P1XlrgH%3QYn=2d6XEh3T&b1NI-vFl90AFiqY5AhFv-3sM zzZk%G%)BWp{1U)*0PAw?*srzz@oj*AXXa0`9$!&Pt+&=buU;lZ^n=#=K-0m@{11TH z8TdD?_2xK^9{`w{X$7tI&W6F(+MWJtoai_KSODPP9Apd_z-42Mzf{JJ5yKTl(Iz5# za}0=R4S-LX`AoG!xm^BOO6doyVl{xjj4>OmwU3zjqfEPKjM)*#@d{?1;Wa7cEv1xq zr4l2+y}i9kN@;W3{1(7s0P8dDq1Jkqwe~WA&6)PUKhw@Y^>#xzq_^8C!;9ZMnsp!@$n@yFABpjo)ma!Xz0TvNiH(;m$|}a z0H+Iu!ik=q9_RHaiVhRekx^%PIC~Z=?V1$03hV3Z^S$gMqNi N002ovPDHLkV1f?sp^pFn literal 0 HcmV?d00001 diff --git a/public/images/listblue09.png b/public/images/listblue09.png new file mode 100644 index 0000000000000000000000000000000000000000..a1bef5bfbe6400e6407adf1bce537ca8022e8fc6 GIT binary patch literal 863 zcmV-l1EBngP)Px&8A(JzR7gwhmQ6@iK@`XTGjr>qW=J0hQjzJM(O!!%D_ZmgK@<{1(I=7BKH9XX zAe88Xs34+M5hjF%7)7+HMYM{-con^Oz4Kna2#TOA7ZTLFcTU{6H?C>+M9htMdES}x zoAaOloOuir^sx!zViNq{lpj`VBI3DRt`0zh@B0u!Jh5&2&7Zq+97l4_8yI6HM3nP9 zFO^It2a4JK5O8mAZ>8sXokX-UD!>>cBD&#u-hpH?`J=nLdrEnE`85E$fk8fb&pF?3 z+xCNh!H0ld*L?_J-Cq`-Qc4|jUH2$}lf&f@(bq&Gv7oxTx_>12AaFXJo@ZHB9smy( zF~*J)kqux^SmdLWa*o#eC4gj@lV*(VF~&RtV1==RQp!t3gI(9%2;hFSfOEdq7_$Vx zxmav25oL&|JdE8`O6_!A_cMT*A^4({^3Z6&I{r%?*c*o-g2Jnc8Dnsz&LZQ%PSymr_sbQDn*70QkYh&{F6H!G> z+VKJVzF*5Z?}`it;B9EEY2(_ll+tk=XN3@AJAm(;^DDmZKZ#ro;I>j~OVQ@iTJH)* z<4D&DK)n#6$`}(3nGd#YXX55!jCD#Ww-pWU>FL?T7`qz>16WQ(XQPD8^B97w(XIaY_8z?I)dsS6c_3h6NQ>j!%X=&-AV2W9m^{%F-COeX$;=fJ) p*(+A5G3QN6J!T1uEihqH{{*7#iZ1J)YvTX_002ovPDHLkV1ipWk}?1Q literal 0 HcmV?d00001 diff --git a/src/api/phase2/index.js b/src/api/phase2/index.js index aef384bc..c15b0348 100644 --- a/src/api/phase2/index.js +++ b/src/api/phase2/index.js @@ -3,7 +3,7 @@ import ajax from '@/utils/xajax.js' /** * 首页推荐案例 - * @param type 1最热 2最新 + * @param type 2最热 1最新 * */ const cases=function (type){ return ajax.get('/xboe/portal/index/cases?type='+type); diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index e222e539..19b2ce7a 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -53,6 +53,12 @@ color: #00253E; line-height: 22px; } +.portal-index-summary{ + font-size: 14px; + font-weight: 400; + color: #04243C; + line-height: 24px; +} .portal-summary-text{ // 问答详情 font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index ec489079..5ad5a9f8 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -41,10 +41,10 @@ body { // margin: 0px auto; } .index-course{ - width: 25%; + // width: 25%; } .course-index{ - width: 33.3333%; + // width: 33.3333%; } } @@ -89,11 +89,11 @@ body { } .index-course{ // width: 16.6666666667%; - width: 33.3333%; + // width: 33.3333%; } .course-index{ // width: 20%; - width: 33.3333%; + // width: 33.3333%; } } diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index ac3983bb..63044990 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -181,7 +181,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; this.uinfo.monthTotalDay = item.total; } if(item.statType == 30) { - this.uinfo.uCurrency = item.todays; + this.uinfo.uCurrency = item.total; } }); } diff --git a/src/views/Index.vue b/src/views/Index.vue index 5aeacbd5..750487f6 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -22,15 +22,15 @@
  • 累计学习 -

    120.75小时

    +

    {{userData.studyHourValue}}小时

  • 经验值等级 -

    L1

    +

    {{userData.level}}

  • 我的U币 -

    307个

    +

    {{userData.coinValue}}个

@@ -58,10 +58,10 @@
- +
- + 录播课
高效谈判系列课
@@ -77,14 +77,14 @@
- +
- + 录播课
{{ course.name }}
@@ -103,7 +103,6 @@
-
@@ -115,20 +114,8 @@

课程排行榜

  • - - - - - - - - - - - - - - + + {{ item.name }} @@ -170,12 +157,12 @@
      -
    • +

    • - 人气榜NO.1 - 2022-05-19 + 人气榜NO.{{ind+1}} + 2022-05-19

      {{ca.title}}

      {{ca.summary}}

      @@ -190,24 +177,12 @@
    -
    +

    案例排行榜

    • - - - - - - - - - - - - - - + + {{ item.title }}
      • @@ -292,28 +267,16 @@
    -
    +
    -
    +

    文章排行榜

    • - - + + - - - - - - - - - - - - - {{ item.sysCreateUname }} + {{ item.title }}
    @@ -336,7 +299,7 @@
    • -

      300正在关注{{ qa.sysCreateTime.substring(0, 10) }}

      +

      {{qa.views}}正在关注{{ qa.sysCreateTime.substring(0, 10) }}

      {{ qa.title }}

      {{ qa.content }}

      @@ -346,35 +309,23 @@

      {{qa.authorInfo.name}}

      -

      +

    -
    +
    -
    +

    问答排行榜

      -
    • - - +
    • + + - - - - - - - - - - - - - {{ item.sysCreateUname }} + {{ item.title }}
    @@ -408,17 +359,21 @@ import { toScore,cutFullName} from '@/utils/tools.js'; import { swiper, swiperSlide } from 'vue-awesome-swiper'; import apiPlace from "@/api/phase2/place.js" import AuthorImg from '@/components/Portal/authorImg.vue'; +import apiStart from '@/api/phase2/stat.js' +import apiIndex from '@/api/phase2/index.js' export default { name: 'index', components: {AuthorImg, portalHeader,ad, portalFooter, articleImage, portalFloatTools, authorInfo, interactRowBar, interactBar, courseImage }, computed: { - // ...mapGetters(['userInfo']) + ...mapGetters(['userInfo']) }, data() { return { + userData:{}, userInfo:{}, ankingList:[], + answersList:[], Popularity:[], scorelist:[], resonimg:[], @@ -481,6 +436,8 @@ export default { this.getScoreList(); this.getPopularity(); this.getAnkingData(); + this.getLevel(); + this.getQaAnswers(); }, computed: { @@ -496,15 +453,33 @@ export default { // }) }, methods: { + getPic(index) { + return `/images/listblue0${index+1}.png` + }, + getLevel(){//获取经验值和等级 + apiStart.getUserStatTotalInfo(this.userInfo.aid).then(res=>{ + if(res.status == 200) { + this.userData = res.result; + } + }); + }, + getQaAnswers() { + apiIndex.qaAnswers(3).then(res=>{ + if (res.status == 200) { + this.answersList = res.result; + } + }) + + }, getAnkingData() {// 文章排行榜 - apiArticle.countsUsername(5).then(res => { + apiIndex.articleViews(7).then(res => { if (res.status == 200) { this.ankingList = res.result; } }); }, getPopularity() {//案例排行榜 - apiCase.queryPraises(5).then(res => { + apiCase.queryPraises(4).then(res => { if (res.status == 200) { this.Popularity = res.result; // console.log(this.Popularity) @@ -615,15 +590,7 @@ export default { this.getCaseData(); }, getCaseData() { - let params = { - pageSize: this.caseList.num, - orderAsc: false, - orderField: 'id' - }; - if (this.caseList.orderType == 2) { - params.orderField = 'comments'; - } - apiCase.indexList(params).then(res => { + apiIndex.cases(this.caseList.orderType).then(res => { if (res.status == 200) { if (res.result.length > 0) { let userIds = []; @@ -775,7 +742,6 @@ export default { }); } else { console.log('加载用户信息失败:' + res.error); - //this.$message.error(res.message); } }); }, @@ -799,12 +765,10 @@ export default { }); } else { console.log('加载用户信息失败:' + res.error); - //this.$message.error(res.message); } }); }, jumpRouter(item) { - // window.open(`${this.webBaseUrl}/qa/answer?id=${item.id}`) this.$router.push({ path: '/qa/answer', query: { id: item.id } }); } } @@ -820,7 +784,7 @@ export default { height: 370px; background: rgba(0,0,0,0.39); border-radius: 8px; - z-index: 999999; + z-index: 999; backdrop-filter: blur(10px); padding: 38px 47px 31px 32px; text-align: center; @@ -1051,10 +1015,10 @@ export default { .cast-time{ font-size: 14px; color: #6E7B84; - display: flex; - justify-content: space-between; + // display: flex; + // justify-content: space-between; margin-bottom: 20px; - span:first-child{ + .time-one{ height: 24px; background: rgba($color: #387DF7, $alpha: 0.1); border-radius: 4px; @@ -1159,8 +1123,10 @@ export default { box-sizing: border-box; } .course-card { + padding: 30px; // width: 290px; - margin-bottom: 15px; + margin-bottom: 30px; + margin-right: 36px; box-sizing: border-box; position: relative; background-color: #ffffff; @@ -1193,12 +1159,12 @@ export default { } .course-image-box { position: relative; - // width: 362px; - // height: 165px; - width: 100%; + width: 350px; + height: 200px; + // width: 100%; .course-image { - width: 100%; - height: 100%; + // width: 100%; + // height: 100%; // width: 288px; // height: 165px; } diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 261476a5..f86c34e4 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -87,9 +87,6 @@
    -