diff --git a/src/assets/image/ballotpage/left.png b/src/assets/image/ballotpage/left.png new file mode 100644 index 0000000..c171a49 Binary files /dev/null and b/src/assets/image/ballotpage/left.png differ diff --git a/src/assets/image/ballotpage/time.png b/src/assets/image/ballotpage/time.png new file mode 100644 index 0000000..b882b27 Binary files /dev/null and b/src/assets/image/ballotpage/time.png differ diff --git a/src/assets/image/discuss/dianzan2.png b/src/assets/image/discuss/dianzan2.png new file mode 100644 index 0000000..de59ece Binary files /dev/null and b/src/assets/image/discuss/dianzan2.png differ diff --git a/src/assets/image/liveboradcast/cha.png b/src/assets/image/liveboradcast/cha.png new file mode 100644 index 0000000..1c69414 Binary files /dev/null and b/src/assets/image/liveboradcast/cha.png differ diff --git a/src/assets/image/liveboradcast/toright.png b/src/assets/image/liveboradcast/toright.png new file mode 100644 index 0000000..0b9cca4 Binary files /dev/null and b/src/assets/image/liveboradcast/toright.png differ diff --git a/src/views/ballotpage/BallotPage.vue b/src/views/ballotpage/BallotPage.vue index 2c3d2eb..6c49535 100644 --- a/src/views/ballotpage/BallotPage.vue +++ b/src/views/ballotpage/BallotPage.vue @@ -1,24 +1,41 @@ @@ -124,79 +162,33 @@ export default { width: 100%; display: flex; justify-content: center; - margin-top: -17.5px; + // margin-top: -17.5px; + margin-top: 20px; .noticebox { - width: 90%; - + width: 100%; background: #fff; - border-radius: 4px; + // border-radius: 4px; position: relative; display: flex; justify-content: center; + .line{ + width: 100%; + height: 0; + border-top: 1px solid #F1F2F3; + margin-top: 17px; + position:absolute; + left:0; + } .mani { width: 90%; margin-top: 20px; - - .dir { - width: 100%; - height: 20px; - // background-color: red; - margin-bottom: 20px; - display: flex; - justify-content: right; - font-size: 12px; - color: #2478ff; - .samegt { - margin-top: 3px; - height: 12px; - width: 12px; - } - .samege { - line-height: 12px; - } - .pre { - margin-right: 5px; - // background-size: 100%; - background-image: url(../../assets/image/ballotpage/pre.png); - } - .next { - margin-left: 5px; - // background-size: 100%; - background-image: url(../../assets/image/ballotpage/next.png); - } + // position:relative; + .joininfo{ + color:#0D233A; + font-size: 16px; + font-weight: bold; } - - .lefttitle { - display: flex; - position: relative; - width: 90px; - .img { - margin-top: 1.5px; - width: 16px; - height: 16px; - background-image: url(../../assets/image/ballotpage/cycle.png); - } - .rightmain { - margin-left: 7.5px; - .talk { - margin-left: -1.5px; - font-size: 14px; - font-weight: bold; - color: #333; - position: absolute; - z-index: 999; - } - .box { - position: absolute; - width: 62.5px; - height: 10px; - right: 8px; - bottom: -5px; - background: #ccdfff; - } - } - } - + .samenum { margin-top: 18.5px; position: absolute; @@ -212,8 +204,47 @@ export default { left: 50%; transform: translate(-50%, 0); } + .contenttitle{ + width:100%; + // height:10px; + margin-top: 15px; + // background-color: #bfa; + display:flex; + .timeimg{ + width: 12.8px; + height: 13px; + } + .timee{ + color:#6E7B84; + font-size: 14px; + line-height: 13px; + margin-left: 6px; + } + } + .timebox{ + display:flex; + width: 100%; + height:49px; + background-color:#F2F5F7; + margin-top: 17.5px; + margin-bottom: 27.5px; + border-radius: 10px; + .samez{ + color:#0060FF; + font-size: 18px; + line-height: 49px; + margin-left: 13px; + } + .samey{ + color:#6E7B84; + font-size: 14px; + line-height: 49px; + + margin-left: 13px; + } + } .contentone { - margin-top: 23px; + margin-top: 43px; display: flex; justify-content: space-between; width: 100%; @@ -221,7 +252,7 @@ export default { // height: 200px; .same { position: relative; - width: 95px; + width: 108px; height: 75px; // background-color: red; } @@ -234,110 +265,62 @@ export default { .bh { background-image: url(../../assets/image/ballotpage/baccthr.png); } - } - - .contenttwo { - position: relative; - margin-top: 23px; - width: 100%; - height: 95px; - margin-bottom: 20px; - // #B6C6E1 - // #89AED6 - background-image: linear-gradient(to right, #b6c6e1, #89aed6 90%); - .time { - position: absolute; - left: 50%; - transform: translate(-50%, 0); - margin-top: 15px; - display: flex; - justify-content: space-between; - width: 80%; - color: #fff; + .ballotdetail{ + color:#6E7B84; + line-height: 30px; font-size: 13px; - height: 20px; } - .endbox { - margin-top: 42.5px; - position: absolute; - left: 50%; - transform: translate(-50%, 0); - width: 95%; - height: 45px; - background-color: #f2f5f7; - border-radius: 0 3px 0 3px; + .ballotjoincontainer{ display: flex; - justify-content: center; - .endtalk { - width: 90%; - display: flex; - justify-content: space-between; - margin-top: 18px; - .sameto { - font-size: 14px; - } - .sametoo { - margin-top: -3px; - font-size: 21.5px; - color: #4a9cf8; - } - } - } - } - - .contentthr { - border-radius: 4px; - margin-bottom: 23px; - position: relative; - margin-top: 23px; - width: 100%; - // height: 95px; - background-color: #f2f5f7; - display: flex; - justify-content: center; - .thrcontent { - width: 90%; - margin-top: 19px; - margin-bottom: 24.5px; - // background-color: blue; - font-size: 13px; - line-height: 24px; - } - } - - .contentfor { - margin-top: 23px; - width: 100%; - margin-bottom: 34px; - // height: 20px; - // background-color: red; - .imgcontent { - display: flex; - justify-content: space-between; width: 100%; - .imgsame { - background-size: 100% 100%; - width: 95px; - height: 95px; - // background-color: blue; - border-radius: 4px; - } - .aimg { - background-image: url(../../assets/image/ballotpage/px.jpg); - } - .bimg { - background-image: url(../../assets/image/ballotpage/px.jpg); - } - .cimg { - background-image: url(../../assets/image/ballotpage/px.jpg); + justify-content: center; + .ballotjoin{ + width: 85%; + // height:100px; + // background-color: #bfa; + .ballotitem{ + + .upitem{ + display:flex; + justify-content: space-between; + .left{ + display:flex; + .leftimg{ + width: 4.5px; + height:14.5px; + margin-top: 1px; + } + .leftcontent{ + margin-left: 9px; + color:#6E7B84; + font-size: 13px; + line-height: 30px; + margin-top: -5px; + } + } + .btn{ + background-color: #2478FF; + color:#fff; + width:64px; + height:21px; + border-radius: 10px; + border:0; + font-size: 12px; + line-height:19px; + margin-top: -1px; + } + } + .thinline{ + width: 100%; + border-top: 1px solid #F1F2F3; + margin-top: 17px; + margin-bottom: 17px; + } } } - .text { - font-size: 13px; - line-height: 24px; - margin-top: 18px; } } + } } } diff --git a/src/views/discuss/DiscussDetail.vue b/src/views/discuss/DiscussDetail.vue index b5ceaf4..fa83a2c 100644 --- a/src/views/discuss/DiscussDetail.vue +++ b/src/views/discuss/DiscussDetail.vue @@ -1,28 +1,15 @@ @@ -220,443 +135,122 @@ export default { width: 100%; display: flex; justify-content: center; - margin-top: -17.5px; + // margin-top: -17.5px; + margin-top: 20px; .noticebox { - width: 90%; + width: 100%; background: #fff; - border-radius: 4px; + // border-radius: 4px; position: relative; display: flex; justify-content: center; + .line{ + width: 100%; + height: 0; + border-top: 1px solid #F1F2F3; + margin-top: 17px; + position:absolute; + left:0; + } .mani { width: 90%; margin-top: 20px; - - .dir { - width: 100%; - height: 20px; - // background-color: red; - margin-bottom: 20px; - display: flex; - justify-content: right; - font-size: 12px; - color: #2478ff; - .samegt { - margin-top: 3px; - height: 12px; - width: 12px; - } - .samege { - line-height: 12px; - } - .pre { - margin-right: 5px; - // background-size: 100%; - background-image: url(../../assets/image/ballotpage/pre.png); - } - .next { - margin-left: 5px; - // background-size: 100%; - background-image: url(../../assets/image/ballotpage/next.png); - } - } - - .lefttitle { - display: flex; - position: relative; - width: 90px; - .img { - margin-top: 1.5px; - width: 16px; - height: 16px; - background-image: url(../../assets/image/ballotpage/cycle.png); - } - .rightmain { - margin-left: 7.5px; - .talk { - margin-left: -1.5px; - font-size: 14px; - font-weight: bold; - color: #333; - position: absolute; - z-index: 999; - } - .box { - position: absolute; - width: 62.5px; - height: 10px; - right: 8px; - bottom: -5px; - background: #ccdfff; - } - } - } - - .samenum { - margin-top: 18.5px; - position: absolute; - font-size: 18px; + // position:relative; + .joininfo{ + color:#0D233A; + font-size: 16px; font-weight: bold; - left: 50%; - transform: translate(-50%, 0); } - .samego { - margin-top: 45px; - position: absolute; - font-size: 13px; - left: 50%; - transform: translate(-50%, 0); + + .contenttitle{ + width:100%; + // height:10px; + margin-top: 15px; + // background-color: #bfa; + display:flex; + .timeimg{ + width: 12.8px; + height: 13px; + } + .timee{ + color:#6E7B84; + font-size: 14px; + line-height: 13px; + margin-left: 6px; + } + } + .timebox{ + display:flex; + width: 100%; + height:49px; + background-color:#F2F5F7; + margin-top: 17.5px; + margin-bottom: 27.5px; + border-radius: 10px; + .samez{ + color:#0060FF; + font-size: 18px; + line-height: 49px; + margin-left: 13px; + } + .samey{ + color:#6E7B84; + font-size: 14px; + line-height: 49px; + + margin-left: 13px; + } } .contentone { - margin-top: 23px; + margin-top: 43px; display: flex; - justify-content: center; + justify-content: space-between; width: 100%; margin-bottom: 20px; - height: 74px; - // #DFEBFF - // #fff - background-image: url(../../assets/image/homeworkpage/bacc.png); - background-size: 100% 100%; - color: #4a9cf8; - font-size: 14px; - font-weight: bold; - .onttitle { - margin-top: 15px; - // width: 90%; - } - } - - .contenttwo { - position: relative; - margin-top: 23px; - width: 100%; - height: 95px; - margin-bottom: 20px; - // #B6C6E1 - // #89AED6 - background-image: linear-gradient(to right, #b6c6e1, #89aed6 90%); - .time { - position: absolute; - left: 50%; - transform: translate(-50%, 0); - margin-top: 15px; - display: flex; - justify-content: space-between; - width: 80%; - color: #fff; + // height: 200px; + + .ballotdetail{ + color:#6E7B84; + line-height: 30px; font-size: 13px; - height: 20px; } - .endbox { - margin-top: 42.5px; - position: absolute; - left: 50%; - transform: translate(-50%, 0); - width: 95%; - height: 45px; - background-color: #f2f5f7; - border-radius: 0 3px 0 3px; + .hiscon{ + width: 100%; + .historyitem{ + // margin-left: 21px; + width: 100%; + border-radius: 4px; + .itemtime{ + color:#6E7B84; + margin-left: 21px; + font-size: 12px; + margin-top: 11px; + } + .itemtitle{ + line-height: 22px; + font-size: 13px; + color:#333330; + margin:10.5px 0 10.5px 21px; + } + } + } + + } + .btnc{ + width:100%; display: flex; justify-content: center; - .endtalk { - width: 90%; - display: flex; - justify-content: space-between; - margin-top: 18px; - .sameto { - font-size: 14px; - } - .sametoo { - margin-top: -3px; - font-size: 21.5px; - color: #4a9cf8; - } + .btncc{ + margin-bottom: 19px; + height:33px; + width:88%; + border:0; + background-color: #2478FF; + border-radius: 6px; + color:#fff; + font-size: 14px; } } - } - - .contentthr { - border-radius: 4px; - margin-bottom: 23px; - position: relative; - margin-top: 23px; - width: 100%; - // height: 95px; - background-color: #f2f5f7; - display: flex; - justify-content: center; - .thrcontent { - width: 90%; - margin-top: 19px; - margin-bottom: 15.5px; - // background-color: blue; - font-size: 13px; - line-height: 24px; - } - } - - .contentfor { - margin-top: 23px; - width: 100%; - margin-bottom: 34px; - height: 200px; - // background-color: red; - position: relative; - // .input { - // background-color: #f5f6f7; - // } - .el-textarea__inner { - background-color: #f5f6f7; - } - .uploadDetail { - .samebtnn { - padding: 0; - } - position: absolute; - // top: 110px; - top: 120px; - right: -14px; - z-index: 999; - width: 109%; - .triangle { - top: 156px; - left: 110px; - width: 0; - height: 0; - position: absolute; - border-right: 5px solid transparent; - border-left: 5px solid transparent; - border-top: 5px solid #fff; - // box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11); - } - - .square { - // width: 475px; - // width: 100%; - height: 156px; - background: #ffffff; - box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11); - border-radius: 8px; - .squarecontent1 { - // padding-top: 18px; - margin-top: 10px; - display: flex; - .rar { - margin: 12px 15px 0 27px; - width: 19px; - height: 22px; - background-size: 100% 100%; - background-image: url("../../assets/image/homeworkpage/rar.png"); - } - .rarDetail { - .detail1 { - // height: 14px; - font-size: 12px; - line-height: 30px; - font-weight: 500; - color: #677d86; - } - .detail2 { - // height: 11px; - font-size: 12px; - font-weight: 500; - color: #277aff; - } - .progress { - width: 202px; - height: 8px; - background: #e8f1fe; - border-radius: 4px; - .progressinner { - width: 48%; - height: 8px; - background: linear-gradient( - 0deg, - #2478ff 0%, - #5093ff 100% - ); - border-radius: 4px; - } - } - } - .btn { - border: 0; - background-color: #fff; - color: #277aff; - margin-top: 8px; - cursor: pointer; - width: 40px; - } - } - - .squarecontent2 { - margin-top: 5px; - display: flex; - .rar { - margin: 12px 15px 0 27px; - width: 19px; - height: 22px; - background-size: 100% 100%; - background-image: url("../../assets/image/homeworkpage/rar.png"); - } - .rarDetail { - .detail1 { - // height: 14px; - font-size: 12px; - line-height: 30px; - font-weight: 500; - color: #677d86; - } - .detail2 { - // height: 11px; - font-size: 12px; - font-weight: 500; - color: #277aff; - } - .progress { - width: 202px; - height: 8px; - background: #e8f1fe; - border-radius: 4px; - .progressinner { - width: 80%; - height: 8px; - background: linear-gradient( - 0deg, - #ee625e 0%, - #eea4a1 100% - ); - border-radius: 4px; - } - } - } - .btn { - border: 0; - background-color: #fff; - color: #277aff; - margin-top: 8px; - cursor: pointer; - width: 40px; - } - .btndetail { - // margin-left: 25px; - } - } - - .squarecontent3 { - margin-top: 5px; - display: flex; - .rar { - margin: 12px 15px 0 27px; - width: 19px; - height: 22px; - background-size: 100% 100%; - background-image: url("../../assets/image/homeworkpage/rar.png"); - } - .rarDetail { - .detail1 { - // height: 14px; - font-size: 12px; - line-height: 30px; - font-weight: 500; - color: #677d86; - } - .detail2 { - // height: 11px; - font-size: 12px; - font-weight: 500; - color: #277aff; - } - .progress { - width: 202px; - height: 8px; - background: #e8f1fe; - border-radius: 4px; - .progressinner { - width: 100%; - height: 8px; - background: linear-gradient( - 0deg, - #36d1ae 0%, - #3be5bf 100% - ); - border-radius: 4px; - } - } - } - .btn { - border: 0; - background-color: #fff; - color: #277aff; - margin-top: 8px; - cursor: pointer; - } - .btndetail { - margin-left: 25px; - } - } - } - } - } - - .btnbox { - margin-top: 90px; - // height: 20px; - width: 100%; - // background-color: red; - display: flex; - justify-content: center; - margin-bottom: 20px; - - .btnn { - color: #fff; - width: 60%; - font-size: 14px; - display: flex; - justify-content: space-between; - - .btns { - color: #fff; - width: 83px; - height: 33px; - border: 0; - border-radius: 2px; - } - .btno { - background-color: #ffb96d; - } - .btnt { - background-color: #2478ff; - } - } - } - - .contentfiv { - margin-top: 26px; - width: 100%; - margin-bottom: 34px; - // height: 200px; - // background-color: #bfa; - .his { - width: 100%; - // height: 100px; - background-color: #f2f5f7; - border-radius: 4px; - .histime { - color: #677d86; - font-size: 12px; - margin-top: 11px; - margin-left: 22px; - } - .hiscon { - width: 87%; - font-size: 13px; - line-height: 24px; - margin: 11px 0 11px 22px; - } - } - } } } } diff --git a/src/views/investigat/InvestigatPage.vue b/src/views/investigat/InvestigatPage.vue index 9a383ec..9761cb1 100644 --- a/src/views/investigat/InvestigatPage.vue +++ b/src/views/investigat/InvestigatPage.vue @@ -1,16 +1,16 @@