首頁 探索 說明
登入
service-platform
/
web-test
3
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

合并

wxy 4 年之前
父節點
86bab900c7 e507ff1ee3
當前提交
deb7110f15
共有 21 個文件被更改，包括 425 次插入 和 3407 次删除
分割檢視 顯示文件統計
  1. 8 6
      public/home.html
  2. 0 6
      public/static/css/bootstrap.min.css
  3. 0 301
      public/static/css/iconfont.css
  4. 0 111
      public/static/css/lib.css
  5. 0 97
      public/static/css/mubu2017.css
  6. 0 2267
      public/static/css/style.css
  7. 0 233
      public/static/css/style1.css
  8. 143 175
      public/static/home/css/index.css
  9. 106 78
      src/layout/live/head.vue
  10. 73 22
      src/layout/userCenter/heads.vue
  11. 1 1
      src/plugins/setting.js
  12. 1 1
      src/router/index.js
  13. 3 4
      src/views/dynamic/index.vue
  14. 1 1
      src/views/dynamic/parts/userTwo.vue
  15. 6 99
      src/views/market/index.vue
  16. 75 0
      src/views/market/re.vue
  17. 2 1
      src/views/superAdminCenter/index.vue
  18. 1 1
      src/views/technical/index.vue
  19. 2 1
      src/views/userCenter/index.vue
  20. 1 1
      src/views/userCenter/productInfo/part/infoRelease.vue
  21. 2 1
      vue.config.js

+ 8 - 6
public/home.html
查看文件 

@@ -47,12 +47,14 @@
 
 
 <body>
 
   <div class="header">
 
-    <a href="" style="display: none;">
 
-      <div class="home-btn"></div>
 
-    </a>
 
-    <img class='image' src="static/images/logo.png" alt="">
 
-    <p class='title'>中科在线</p>
 
-    <!-- <p class='notice' >通知</p> -->
 
+   <div class='left'>
 
+      <img class='image' src="static/images/logo.png" alt="">
 
+      <p class='title'>中科在线</p>
 
+   </div>
 
+   <div class='right'>
 
+      <button onclick="window.open('http://free.liaoningdoupo.com/platlive/webLogin')">平台登录</button>
 
+      <button onclick="window.open('http://free.liaoningdoupo.com/platlive/adminLogin')">管理登录</button>
 
+   </div>
 
   </div>
 
   <img class="sci-wheel" src="static/home/images/sci.gif" alt="">
 
   <!-- 导航 -->

文件差異過大導致無法顯示
+ 0 - 6
public/static/css/bootstrap.min.css


文件差異過大導致無法顯示
+ 0 - 301
public/static/css/iconfont.css


+ 0 - 111
public/static/css/lib.css
查看文件 

@@ -1,111 +0,0 @@
 
-/* CSS Document */
 
-/**
 
-* +----------------------------------------------------------
 
-* 主样式
 
-* +----------------------------------------------------------
 
-*/
 
-*{
 
-	-webkit-box-sizing: border-box;
 
-	-moz-box-sizing: border-box;
 
-	box-sizing: border-box;
 
-	margin: 0;
 
-	padding: 0;
 
-	font-family: 微软雅黑;
 
-	letter-spacing: 1px;
 
-}
 
-html,body{
 
-	width: 100%; height: 100%;
 
-	overflow: hidden;
 
-	font-size: 14px;
 
-}
 
-
 
-li{
 
-	list-style: none;
 
-}
 
-a{
 
-	display: block;
 
-}
 
-a:hover{
 
-	color: #df621e;
 
-	-webkit-transition: all 0.2s ease-in-out;
 
-}
 
-
 
-iframe{
 
-	border: 0; width: 100%; height: 100%;
 
-}
 
-.pull-left{ float: left; }
 
-.pull-right{ float: right; }
 
-
 
-.show{ display: block; }
 
-.hide{ display: none; }
 
-
 
-.i-bold{
 
-	font-weight: bolder;
 
-}
 
-/*字体颜色*/
 
-.i-green{ color:#00c851 !important;}
 
-.i-yellow{ color:#e7592b !important;}
 
-.i-red{ color:#d90000 !important; font-weight: border;}
 
-.i-blue{ color:#2292ef !important;}
 
-.i-lightblue{ color:#00a5e0 !important;}
 
-.i-gray{ color:#6c6c6e !important;}
 
-
 
-/*背景颜色*/
 
-.bg-green{ background-color:#00c851 !important;}
 
-.bg-yellow{ background-color:#e7592b !important;}
 
-.bg-red{ background-color:#d90000 !important;}
 
-.bg-blue{ background-color:#2292ef !important;}
 
-.bg-white{ background-color: white !important;}
 
-.bg-gray{ background-color: #6c6c6e !important;}
 
-
 
-/*渐变色*/
 
-.shade-white{
 
-	display: block;
 
-	background-image:url(../images/shade/white.png);
 
-	background-repeat:repeat-x;
 
-	background-size: 100% 100%;
 
-	background-position: 0 0;
 
-}
 
-.shade-menu{
 
-	display: block;
 
-	background-image:url(../images/shade/menu.png);
 
-	background-repeat:repeat-x;
 
-	background-size: 100% 100%;
 
-	background-position: 0 0;
 
-}
 
-
 
-.shadow{
 
-	box-shadow:0px 4px 8px rgba(0,0,0,0.3);
 
-}
 
-.shadow1{
 
-	background: url(../images/shadow.png);
 
-	width: 220px; height: 15px;
 
-	background-size: 100%;
 
-	background-position: 0 0;
 
-	position: absolute; bottom: -15px; left: 0;
 
-}
 
-.shadow2{
 
-	background: url(../images/shadow.png);
 
-	width: 100%; height: 15px;
 
-	background-size: 100%;
 
-	background-position: 0 -15px;
 
-	position: absolute; bottom: -15px; left: 0;
 
-}
 
-
 
-/* 数字提示 */
 
-.num{
 
-  width: 15px; height: 15px; text-align: center; line-height: 15px;
 
-  border-radius: 99px;
 
-  color: white; font-weight: bolder;
 
-}
 
-.num-1{
 
-	margin-left: 5px;
 
-  padding: 5px 10px; text-align: center; line-height: 15px;
 
-  border-radius: 99px;
 
-  color: white; font-weight: bolder;
 
-}
 
-
 
-/* layui修改 */
 
-.layui-input-block{
 
-	margin-left: 0;
 
-}

+ 0 - 97
public/static/css/mubu2017.css
查看文件 

@@ -1,97 +0,0 @@
 
-html,body,div,p,span,h1,h2,h3,h4,p,a, em,font,img,strong,dl,dt,dd,ul,li{margin:0; padding:0; font-family:"Microsoft YaHei";}
 
-html,body{height:100%; font-size:12px;}    
-ul,ol{list-style:none;}
 
-ul li{list-style-type:none;}
 
-img{border:0;}    
-em,i{font-style:normal;}
 
-.f_r,.fr{float:right;}
 
-.f_l,.fl{float:left;}
 
-canvas { cursor:crosshair; display:block;}
 
-.mubu{ background:url(../images/mubu_1_s.jpg) no-repeat top center; min-width:960px;height:99.9%;}
 
-.mubu_main{ width:960px; margin:0 auto; text-align:center; padding-top:300px; }
 
-.mubu_main h1{ font-size:50px; color:#f1ea2e; text-shadow:2px 2px 5px #000; line-height:1.5em; height:1.5em; overflow:hidden;}
 
-.mubu_main h2{ font-size:40px; color:#f1ea2e; text-shadow:2px 2px 5px #000; line-height:1.5em; height:1.5em; overflow:hidden; margin-bottom:30px;}
 
-.mubu_main p{ font-size:24px; line-height:1.5em; height:1.5em; overflow:hidden; color:#fff; text-shadow:2px 2px 5px #000;}
 
-.mubu_main p.into{ margin-top:50px; height:120px;}
 
-.mubu_top{ background:url(../images/mubu_2_s.png) no-repeat top center; position:fixed; top:0; left:0; height:150px; width:100%;}
 
-.mubu_left{ background:url(../images/mubu_left_s.jpg) no-repeat; width:720px; height:100%; position:fixed; top:0; left:-720px; -webkit-animation:mubu_dh_1 5s linear; animation:mubu_dh_1 8s linear forwards; display:none\9;}
 
-.mubu_right{ background:url(../images/mubu_right_s.jpg) no-repeat; width:720px; height:100%; position:fixed; top:0; right:-720px; -webkit-animation:mubu_dh_2 5s linear; animation:mubu_dh_2 8s linear forwards; display:none\9;}
 
-@-webkit-keyframes mubu_dh_1 {
 
-	0%{left:0;}
 
-	75% { left:-540px; opacity:100;}
 
-	100% { left:-720px; opacity:0; display:none;}
 
-}
 
-@keyframes mubu_dh_1 {
 
-	0% { left:0;}
 
-	75% { left:-540px; opacity:100;}
 
-	100% { left:-720px; opacity:0; display:none;}
 
-}
 
-@-webkit-keyframes mubu_dh_2 {
 
-    0% { right:0;}
 
-	75% { right:-540px; opacity:100;}
 
-	100% { right:-720px; opacity:0; display:none;}
 
-}
 
-@keyframes mubu_dh_2 {
 
-    0% { right:0;}
 
-	75% { right:-540px; opacity:100;}
 
-	100% { right:-720px; opacity:0; display:none;}
 
-}
 
-.mubu .yanhua2 {width: 100px;height: 100px; display:block; overflow: hidden;background: url(../images/mubu_yh_1.png) no-repeat 0 0; position:absolute; top:300px; left:70%; animation: fireworksfn 5s linear infinite;-webkit-animation: fireworksfn 3s linear infinite;-moz-animation: fireworksfn 3s linear infinite;-ms-animation: fireworksfn 3s linear infinite;-o-animation: fireworksfn 1.5s infinite; display:none\9;}
 
-.mubu .yanhua3 {width: 100px;height: 100px; display:block; overflow: hidden;background: url(../images/mubu_yh_2.png) no-repeat 0 0; position:absolute; top:250px; left:25%; animation: fireworksfn 4s linear infinite;-webkit-animation: fireworksfn 4s linear infinite;-moz-animation: fireworksfn 4s linear infinite;-ms-animation: fireworksfn 4s linear infinite;-o-animation: fireworksfn 1.5s infinite; display:none\9;}
 
-.mubu .yanhua4 {width: 70px;height: 70px; display:block; overflow: hidden;background: url(../images/nyear-wwwa5.png) no-repeat -6px -1px; position:absolute; top:250px; left:50%; animation: fireworksfn 3s linear infinite;-webkit-animation: fireworksfn 4s linear infinite;-moz-animation: fireworksfn 5s linear infinite;-ms-animation: fireworksfn 5s linear infinite;-o-animation: fireworksfn 1.5s infinite; display:none\9;}
 
-@media (min-width:1440px){ 
-.mubu{ background:url(../images/mubu_1.jpg) no-repeat top center; height:99.9%;}
 
-.mubu_main{ width:1150px; margin:0 auto; text-align:center; padding-top:300px; }
 
-.mubu_main h1{ font-size:50px; color:#f1ea2e; text-shadow:2px 2px 5px #000; line-height:1.5em; height:1.5em; overflow:hidden;}
 
-.mubu_main h2{ font-size:40px; color:#f1ea2e; text-shadow:2px 2px 5px #000; line-height:1.5em; height:1.5em; overflow:hidden; margin-bottom:30px;}
 
-.mubu_main p{ font-size:24px; line-height:1.5em; height:1.5em; overflow:hidden; color:#fff; text-shadow:2px 2px 5px #000;}
 
-.mubu_main p.into{ margin-top:50px; height:120px;}
 
-.mubu_top{ background:url(../images/mubu_2.png) no-repeat top center; position:fixed; top:0; left:0; height:200px; width:100%;}
 
-.mubu_left{ background:url(../images/mubu_left.jpg) no-repeat; width:960px; height:100%; position:fixed; top:0;left:-960px; -webkit-animation:mubu_dh_1 5s ease-in; animation:mubu_dh_1 8s linear forwards; display:none\9;}
 
-.mubu_right{ background:url(../images/mubu_right.jpg) no-repeat; width:960px; height:100%; position:fixed; top:0; right:-960px; -webkit-animation:mubu_dh_2 5s ease-in; animation:mubu_dh_2 8s linear forwards; display:none\9;}
 
-@-webkit-keyframes mubu_dh_1 {
 
-    0% { left:0;}
 
-	75% { left:-720px; opacity:100;}
 
-	100% { left:-960px; opacity:0; display:none;}
 
-}
 
-@keyframes mubu_dh_1 {
 
-    0% { left:0;}
 
-	75% { left:-720px; opacity:100;}
 
-	100% { left:-960px; opacity:0; display:none;}
 
-}
 
-@-webkit-keyframes mubu_dh_2 {
 
-    0% { right:0;}
 
-	75% { right:-720px; opacity:100;}
 
-	100% { right:-960px; opacity:0; display:none;}
 
-}
 
-@keyframes mubu_dh_2 {
 
-    0% { right:0;}
 
-	75% { right:-720px; opacity:100;}
 
-	100% { right:-960px; opacity:0; display:none;}
 
-}
 
-.mubu .yanhua2 {width: 100px;height: 100px; display:block; overflow: hidden;background: url(../images/mubu_yh_1.png) no-repeat 0 0; position:absolute; top:450px; left:70%; animation: fireworksfn 5s linear infinite;-webkit-animation: fireworksfn 3s linear infinite;-moz-animation: fireworksfn 3s linear infinite;-ms-animation: fireworksfn 3s linear infinite;-o-animation: fireworksfn 1.5s infinite;}
 
-.mubu .yanhua3 {width: 100px;height: 100px; display:block; overflow: hidden;background: url(../images/mubu_yh_2.png) no-repeat 0 0; position:absolute; top:350px; left:30%; animation: fireworksfn 4s linear infinite;-webkit-animation: fireworksfn 4s linear infinite;-moz-animation: fireworksfn 4s linear infinite;-ms-animation: fireworksfn 4s linear infinite;-o-animation: fireworksfn 1.5s infinite;}
 
-.mubu .yanhua4 {width: 70px;height: 70px; display:block; overflow: hidden;background: url(../images/nyear-wwwa5.png) no-repeat -6px -1px; position:absolute; top:400px; left:50%; animation: fireworksfn 3s linear infinite;-webkit-animation: fireworksfn 4s linear infinite;-moz-animation: fireworksfn 5s linear infinite;-ms-animation: fireworksfn 5s linear infinite;-o-animation: fireworksfn 1.5s infinite;}
 
-}
 
-
 
-/*ÑÌ»¨*/
 
-@keyframes fireworksfn{
 
-	0%{opacity:1;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0)}
 
-	50%{opacity:1;-webkit-transform:scale(2);-moz-transform:scale(2);-ms-transform:scale(2);-o-transform:scale(2);transform:scale(2)}
 
-	100%{opacity:0;-webkit-transform:scale(4);-moz-transform:scale(4);-ms-transform:scale(4);-o-transform:scale(4);transform:scale(4)}
 
-	}
 
-@-moz-keyframes fireworksfn{
 
-	0%{opacity:1;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0)}
 
-	50%{opacity:1;-webkit-transform:scale(2);-moz-transform:scale(2);-ms-transform:scale(2);-o-transform:scale(2);transform:scale(2)}
 
-	100%{opacity:0;-webkit-transform:scale(4);-moz-transform:scale(4);-ms-transform:scale(4);-o-transform:scale(4);transform:scale(4)}
 
-	}
 
-@-webkit-keyframes fireworksfn{
 
-	0%{opacity:1;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0)}
 
-	50%{opacity:1;-webkit-transform:scale(2);-moz-transform:scale(2);-ms-transform:scale(2);-o-transform:scale(2);transform:scale(2)}
 
-	100%{opacity:0;-webkit-transform:scale(4);-moz-transform:scale(4);-ms-transform:scale(4);-o-transform:scale(4);transform:scale(4)}
 
-	}
 
-@-o-keyframes fireworksfn{
 
-	0%{opacity:1;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0)}
 
-	50%{opacity:1;-webkit-transform:scale(2);-moz-transform:scale(2);-ms-transform:scale(2);-o-transform:scale(2);transform:scale(2)}
 
-	100%{opacity:0;-webkit-transform:scale(4);-moz-transform:scale(4);-ms-transform:scale(4);-o-transform:scale(4);transform:scale(4)}
 
-	}

文件差異過大導致無法顯示
+ 0 - 2267
public/static/css/style.css


+ 0 - 233
public/static/css/style1.css
查看文件 

@@ -1,233 +0,0 @@
 
-:root {
 
-	font-size: calc(16px + (20 - 16) * (100vw - 320px)/(980 - 320));
 
-	--rotateTimes: 0;
 
-}
 
-
 
-nav,
 
-ul,
 
-li {
 
-	transform-style: preserve-3d;
 
-}
 
-
 
-nav,
 
-li {
 
-	position: absolute;
 
-	top: 30%;
 
-	left: 50%;
 
-}
 
-
 
-nav,
 
-li a {
 
-	border-radius: 50%;
 
-}
 
-
 
-nav {
 
-	width: 100em;
 
-	height: 70em;
 
-	transform: translate(-50%, -50%) rotateX(75deg);
 
-	position: relative;
 
-}
 
-
 
-ul,
 
-li a {
 
-	width: 100%;
 
-	height: 100%;
 
-}
 
-
 
-ul {
 
-	list-style: none;
 
-}
 
-
 
-li {
 
-	animation: idle 4s ease-in-out infinite;
 
-	text-align: center;
 
-	width: 15em;
 
-	height: 15em;
 
-	transform: translate(-50%, -50%);
 
-}
 
-
 
-li a {
 
-	box-shadow: 0 0 0 0.1em #0cf inset, 0 0 1em #0cf inset;
 
-	color: currentColor;
 
-	display: inline-block;
 
-	text-decoration: none;
 
-	transition: transform 0.4s linear, box-shadow 0.15s linear, margin 0.1s linear, width 0.1s linear, height 0.1s linear;
 
-}
 
-
 
-li a span {
 
-	transition: color 0.15s linear;
 
-}
 
-
 
-li a:before {
 
-	background-color: #fff;
 
-	border-radius: 50%;
 
-	content: "";
 
-	display: block;
 
-	opacity: 0.5;
 
-	position: absolute;
 
-	top: 2.75em;
 
-	left: 3.75em;
 
-	width: 1em;
 
-	height: 0.5em;
 
-	transform: rotate(-45deg);
 
-}
 
-
 
-li a:focus,
 
-li a.current {
 
-	box-shadow: 0 0 0 0.1em #ff0 inset, 0 0 1em #ff0 inset;
 
-	outline: 0;
 
-}
 
-
 
-li a:focus span,
 
-li a.current span {
 
-	color: #ff0;
 
-}
 
-
 
-li a:hover {
 
-	margin: -5% 0 0 -5%;
 
-	width: 110%;
 
-	height: 110%;
 
-	box-shadow: 0 0 0 0.1em #ff0 inset, 0 0 1em #ff0 inset;
 
-}
 
-
 
-li a:hover svg {
 
-	width: 3em;
 
-	height: 3em;
 
-}
 
-
 
-@media (prefers-reduced-motion) {
 
-	li {
 
-		animation: none;
 
-	}
 
-}
 
-
 
-svg {
 
-	display: block;
 
-	margin: 1.25em auto 1.5em auto;
 
-	transition: width 0.1s linear, height 0.1s linear;
 
-	width: 2.5em;
 
-	height: 2.5em;
 
-}
 
-
 
-/* Position bubbles */
 
-li:nth-of-type(1) {
 
-	animation-delay: 0s;
 
-}
 
-
 
-li:nth-of-type(1) a {
 
-	transform: rotate(calc(0deg + var(--rotateTimes) * 51.4285714286deg)) translateY(9em) rotate(calc(0deg - var(--rotateTimes) * 51.4285714286deg)) rotateX(-75deg);
 
-}
 
-
 
-li:nth-of-type(2) {
 
-	animation-delay: -0.5s;
 
-}
 
-
 
-li:nth-of-type(2) a {
 
-	transform: rotate(calc(-51.4285714286deg + var(--rotateTimes) * 51.4285714286deg)) translateY(9em) rotate(calc(51.4285714286deg - var(--rotateTimes) * 51.4285714286deg)) rotateX(-75deg);
 
-}
 
-
 
-li:nth-of-type(3) {
 
-	animation-delay: -1s;
 
-}
 
-
 
-li:nth-of-type(3) a {
 
-	transform: rotate(calc(-102.8571428571deg + var(--rotateTimes) * 51.4285714286deg)) translateY(9em) rotate(calc(102.8571428571deg - var(--rotateTimes) * 51.4285714286deg)) rotateX(-75deg);
 
-}
 
-
 
-li:nth-of-type(4) {
 
-	animation-delay: -1.5s;
 
-}
 
-
 
-li:nth-of-type(4) a {
 
-	transform: rotate(calc(-154.2857142857deg + var(--rotateTimes) * 51.4285714286deg)) translateY(9em) rotate(calc(154.2857142857deg - var(--rotateTimes) * 51.4285714286deg)) rotateX(-75deg);
 
-}
 
-
 
-li:nth-of-type(5) {
 
-	animation-delay: -2s;
 
-}
 
-
 
-li:nth-of-type(5) a {
 
-	transform: rotate(calc(-205.7142857143deg + var(--rotateTimes) * 51.4285714286deg)) translateY(9em) rotate(calc(205.7142857143deg - var(--rotateTimes) * 51.4285714286deg)) rotateX(-75deg);
 
-}
 
-
 
-/* Animations */
 
-.rise {
 
-	animation: rise 1s ease-out;
 
-}
 
-
 
-.rise a {
 
-	animation: fadeOut 1s ease-out;
 
-}
 
-
 
-.rise a.pop {
 
-	animation: pop 1s linear;
 
-}
 
-
 
-.rise a.pop svg,
 
-.rise a.pop span {
 
-	visibility: hidden;
 
-}
 
-
 
-@keyframes rise {
 
-	from {
 
-		transform: translateZ(0);
 
-	}
 
-
 
-	15% {
 
-		transform: translateZ(-1em);
 
-	}
 
-
 
-	to {
 
-		transform: translateZ(35em);
 
-	}
 
-}
 
-
 
-@keyframes fadeOut {
 
-
 
-	from,
 
-	15% {
 
-		opacity: 1;
 
-	}
 
-
 
-	50%,
 
-	to {
 
-		opacity: 0;
 
-	}
 
-}
 
-
 
-@keyframes pop {
 
-	from {
 
-		margin: -5% 0 0 -5%;
 
-		width: 110%;
 
-		height: 110%;
 
-		opacity: 1;
 
-	}
 
-
 
-	10%,
 
-	to {
 
-		margin: -20% 0 0 -20%;
 
-		width: 140%;
 
-		height: 140%;
 
-		opacity: 0;
 
-	}
 
-}
 
-
 
-@keyframes idle {
 
-
 
-	from,
 
-	to {
 
-		transform: translate(-50%, -48%);
 
-	}
 
-
 
-	25% {
 
-		transform: translate(-52%, -50%);
 
-	}
 
-
 
-	50% {
 
-		transform: translate(-50%, -52%);
 
-	}
 
-
 
-	75% {
 
-		transform: translate(-48%, -50%);
 
-	}
 
-}

+ 143 - 175
public/static/home/css/index.css
查看文件 

@@ -1,283 +1,251 @@
 
 html {
 
-    margin: 0;
 
-    padding: 0;
 
+  margin: 0;
 
+  padding: 0;
 
 }
 
 
 html,
 
 body {
 
-    width: 100%;
 
-    height: 100%;
 
-    margin: 0px;
 
-    padding: 0px;
 
-    font-family: 'Lato', sans-serif;
 
-    font-size: 16px;
 
+  width: 100%;
 
+  height: 100%;
 
+  margin: 0px;
 
+  padding: 0px;
 
+  font-family: "Lato", sans-serif;
 
+  font-size: 16px;
 
 }
 
 
 .social-icon a {
 
-    position: fixed;
 
-    background: white;
 
-    color: white;
 
-    display: inline-block;
 
-    width: 100px;
 
-    height: 100px;
 
-    transform: translate(-50%, -50%) rotate(45deg);
 
-    transition: .15s ease;
 
-    z-index: 30;
 
+  position: fixed;
 
+  background: white;
 
+  color: white;
 
+  display: inline-block;
 
+  width: 100px;
 
+  height: 100px;
 
+  transform: translate(-50%, -50%) rotate(45deg);
 
+  transition: 0.15s ease;
 
+  z-index: 30;
 
 }
 
 
 .social-icon i {
 
-    position: absolute;
 
-    font-size: 1.8em;
 
-    pointer-events: none;
 
-    z-index: 1000;
 
+  position: absolute;
 
+  font-size: 1.8em;
 
+  pointer-events: none;
 
+  z-index: 1000;
 
 }
 
 
 .social-icon:hover a {
 
-    transform: translate(-50%, -50%) rotate(45deg) scale(1.05);
 
+  transform: translate(-50%, -50%) rotate(45deg) scale(1.05);
 
 }
 
 
 .youtube a {
 
-    top: 100%;
 
-    left: 0%;
 
-    box-shadow: 0px 0px 15px 5px rgba(230, 33, 23, 0.5);
 
+  top: 100%;
 
+  left: 0%;
 
+  box-shadow: 0px 0px 15px 5px rgba(230, 33, 23, 0.5);
 
 }
 
 
 .youtube i {
 
-    left: 8px;
 
-    bottom: 8px;
 
-    color: #E62117;
 
+  left: 8px;
 
+  bottom: 8px;
 
+  color: #e62117;
 
 }
 
 
 .github a {
 
-    top: 100%;
 
-    left: 100%;
 
-    box-shadow: 0px 0px 15px 3px rgba(126, 126, 126, 0.5);
 
+  top: 100%;
 
+  left: 100%;
 
+  box-shadow: 0px 0px 15px 3px rgba(126, 126, 126, 0.5);
 
 }
 
 
 .github i {
 
-    right: 8px;
 
-    bottom: 8px;
 
+  right: 8px;
 
+  bottom: 8px;
 
 }
 
 
 #canvas-container-1 {
 
-    height: 100%;
 
-    width: 80%;
 
-    margin: 0 auto;
 
+  height: 100%;
 
+  width: 80%;
 
+  margin: 0 auto;
 
 }
 
 
 #canvas-1 {
 
-    display: block;
 
-    position: relative;
 
-    top: 50%;
 
-    left: 50%;
 
-    transform: translate(-50%, -50%);
 
+  display: block;
 
+  position: relative;
 
+  top: 50%;
 
+  left: 50%;
 
+  transform: translate(-50%, -50%);
 
 }
 
 
 #site-link {
 
-    color: #0099ff;
 
-    display: inline-block;
 
-    position: fixed;
 
-    bottom: 4%;
 
-    left: 50%;
 
-    transform: translate(-50%, 0%);
 
-    font-variant: small-caps;
 
+  color: #0099ff;
 
+  display: inline-block;
 
+  position: fixed;
 
+  bottom: 4%;
 
+  left: 50%;
 
+  transform: translate(-50%, 0%);
 
+  font-variant: small-caps;
 
 }
 
 
 body {
 
-    background: url(../../home/images/bg_1.jpg);
 
-    background-size: cover;
 
+  background: url(../../home/images/bg_1.jpg);
 
+  background-size: cover;
 
 }
 
 
 .fn_1 {
 
-    width: 200px;
 
-    height: 170px;
 
-    background: url(../../home/images/fn_1.png) no-repeat;
 
-    background-size: 100%;
 
+  width: 200px;
 
+  height: 170px;
 
+  background: url(../../home/images/fn_1.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_1:hover {
 
-    background: url(../../home/images/fn_1_h.png) no-repeat;
 
-    background-size: 100%;
 
+  background: url(../../home/images/fn_1_h.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_2 {
 
-    width: 200px;
 
-    height: 170px;
 
-    background: url(../../home/images/fn_3.png) no-repeat;
 
-    background-size: 100%;
 
+  width: 200px;
 
+  height: 170px;
 
+  background: url(../../home/images/fn_3.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_2:hover {
 
-    background: url(../../home/images/fn_3_h.png) no-repeat;
 
-    background-size: 100%;
 
+  background: url(../../home/images/fn_3_h.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_3 {
 
-    width: 200px;
 
-    height: 170px;
 
-    background: url(../../home/images/fn_2.png) no-repeat;
 
-    background-size: 100%;
 
+  width: 200px;
 
+  height: 170px;
 
+  background: url(../../home/images/fn_2.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_3:hover {
 
-    background: url(../../home/images/fn_2_h.png) no-repeat;
 
-    background-size: 100%;
 
+  background: url(../../home/images/fn_2_h.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_4 {
 
-    width: 200px;
 
-    height: 170px;
 
-    background: url(../../home/images/fn_4.png) no-repeat;
 
-    background-size: 100%;
 
+  width: 200px;
 
+  height: 170px;
 
+  background: url(../../home/images/fn_4.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_4:hover {
 
-    background: url(../../home/images/fn_4_h.png) no-repeat;
 
-    background-size: 100%;
 
+  background: url(../../home/images/fn_4_h.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_5 {
 
-    width: 200px;
 
-    height: 170px;
 
-    background: url(../../home/images/fn_5.png) no-repeat;
 
-    background-size: 100%;
 
+  width: 200px;
 
+  height: 170px;
 
+  background: url(../../home/images/fn_5.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .fn_5:hover {
 
-    background: url(../../home/images/fn_5_h.png) no-repeat;
 
-    background-size: 100%;
 
+  background: url(../../home/images/fn_5_h.png) no-repeat;
 
+  background-size: 100%;
 
 }
 
 
 .sci-wheel {
 
-    position: absolute;
 
-    top: 0;
 
-    right: 0;
 
-    width: 100px;
 
+  position: absolute;
 
+  top: 0;
 
+  right: 0;
 
+  width: 100px;
 
 }
 
 
 .header {
 
-    width: 100%;
 
-    height: 100px;
 
-    line-height: 100px;
 
-    padding: 0 40px;
 
-    background: rgba(0, 0, 0, 0.3);
 
-}
 
-
 
-.header .image {
 
-    float: left;
 
-    margin: 27px 10px;
 
-    width: 60px;
 
+  width: 100%;
 
+  height: 100px;
 
+  line-height: 100px;
 
+  padding: 0 40px;
 
+  background: rgba(0, 0, 0, 0.3);
 
 }
 
-
 
-.header .title {
 
-    float: left;
 
-    font-size: 30px;
 
-    color: white;
 
-    letter-spacing: 3px;
 
-}
 
-.header .login{
 
-  float: right;
 
-  width: 270px;
 
-  margin: 30px 60px 0 0px;
 
-}
 
-.header .login a:first-child{
 
+.header .left {
 
   float: left;
 
-  width: 40px;
 
-  height: 40px;
 
-  border: 1px solid #ccc;
 
-  background-color: #cccccc3f;
 
-  border-radius: 5px;
 
+  width: 50%;
 
 }
 
-.header .login a:first-child img{
 
-    float: left;
 
-    padding: 10px;
 
+.header .left .image {
 
+  float: left;
 
+  margin: 27px 10px;
 
+  width: 60px;
 
 }
 
-.header .login a:nth-child(2){
 
+.header .left .title {
 
   float: left;
 
-  width: 100px;
 
-  height: 40px;
 
-  border: 1px solid #ccc;
 
-  line-height: 40px;
 
-  text-align: center;
 
-  color: #ccc;
 
-  background-color: #cccccc3f;
 
-  border-radius: 5px;
 
+  font-size: 30px;
 
+  color: white;
 
+  letter-spacing: 3px;
 
 }
 
-.header .login a:nth-child(3){
 
+.header .right {
 
   float: left;
 
-  width: 100px;
 
-  height: 40px;
 
-  border: 1px solid #ccc;
 
-  line-height: 40px;
 
-  text-align: center;
 
-  color: #ccc;
 
-  background-color: #cccccc3f;
 
+  width: 50%;
 
+  text-align: right;
 
+  padding: 0 70px 0 0;
 
+}
 
+.header .right button {
 
+  background: #409eff;
 
+  color: #fff;
 
+  padding: 4px 4px;
 
+  font-size: 14px;
 
   border-radius: 5px;
 
 }
 
-.header .home-btn {
 
-    float: left;
 
-    margin-top: 20px;
 
-    width: 74px;
 
-    height: 74px;
 
-    border: 1px solid #102262;
 
-    border-radius: 5px;
 
-    background: url(../../home/images/login/icon.png) no-repeat center center;
 
-    background-size: 45% 45%;
 
-    cursor: pointer;
 
+.header .right button:hover {
 
+  cursor: pointer;
 
 }
 
 
 .center {
 
-    position: absolute;
 
-    top: 20px;
 
-    bottom: 0;
 
-    left: 0;
 
-    right: 0;
 
-    margin: auto;
 
-    width: 930px;
 
-    height: 500px;
 
-    z-index: 999;
 
-    background: rgba(5, 19, 44, 0.6);
 
+  position: absolute;
 
+  top: 20px;
 
+  bottom: 0;
 
+  left: 0;
 
+  right: 0;
 
+  margin: auto;
 
+  width: 930px;
 
+  height: 500px;
 
+  z-index: 999;
 
+  background: rgba(5, 19, 44, 0.6);
 
 }
 
 
 .center .list {
 
-    display: block;
 
-    float: left;
 
-    margin: 60px 29px;
 
+  display: block;
 
+  float: left;
 
+  margin: 60px 29px;
 
 }
 
 
 .center .list:nth-child(1) {
 
-    position: relative;
 
-    left: 75px;
 
-    top: 60px;
 
+  position: relative;
 
+  left: 75px;
 
+  top: 60px;
 
 }
 
 
 .center .list:nth-child(2) {
 
-    position: relative;
 
-    left: 80px;
 
-    top: 0;
 
+  position: relative;
 
+  left: 80px;
 
+  top: 0;
 
 }
 
 
 .center .list:nth-child(3) {
 
-    position: relative;
 
-    left: 85px;
 
-    top: 60px;
 
+  position: relative;
 
+  left: 85px;
 
+  top: 60px;
 
 }
 
 
 .center .list:nth-child(4) {
 
-    position: relative;
 
-    left: -187px;
 
-    top: -145px;
 
+  position: relative;
 
+  left: -187px;
 
+  top: -145px;
 
 }
 
 
 .center .list:nth-child(5) {
 
-    position: relative;
 
-    top: -145px;
 
-    left: 606px;
 
+  position: relative;
 
+  top: -145px;
 
+  left: 606px;
 
 }
 
 
 .center .list p {
 
-    text-align: center;
 
-    color: #00BAF1;
 
-    font-size: 35px;
 
-    margin-top: 190px;
 
+  text-align: center;
 
+  color: #00baf1;
 
+  font-size: 35px;
 
+  margin-top: 190px;
 
 }

+ 106 - 78
src/layout/live/head.vue
查看文件 

@@ -6,54 +6,28 @@
 
       </div>
 
       <div class="supertop">
 
         <div class="w_1200">
 
-          <!-- <el-col :span="12" class="left">
 
+          <el-col :span="12" class="left">
 
             <span>欢迎来到中科在线</span>
 
             <span @click="guanzhu()">关注公众号</span>
 
           </el-col>
 
           <el-col :span="12" class="right">
 
-            <el-col :span="18" class="one">
 
-              <span v-if="user.uid || user.suid">
 
-                {{ user.name || user.adminuser }}
 
-              </span>
 
-            </el-col>
 
-            <el-col
 
-              :span="3"
 
-              class="two"
 
-              v-if="user.role == '2' || user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
 
-            >
 
-              <span v-if="user.uid">
 
-                <button
 
-                  type="text"
 
-                  class="center"
 
-                  @click="tuCenter"
 
-                  v-if="user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
 
-                >
 
-                  个人中心
 
-                </button>
 
-                <button type="button" @click="zhuxiao" class="outLogin">退出</button>
 
-              </span>
 
-              <span v-else>
 
-                <el-button type="primary" size="mini" class="loginBtn" @click="webLogin">平台登录</el-button>
 
+            <span v-if="user.uid || user.suid" class="name"> {{ user.name || user.adminuser }}</span>
 
+            <span v-if="user.uid">
 
+              <span
 
+                v-if="user.role == '2' || user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
 
+              >
 
+                <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
 
+                <el-button @click="zhuxiao" type="danger" size="mini">退出登录</el-button>
 
               </span>
 
-            </el-col>
 
-            <el-col :span="3" class="two" v-if="user.role == '0' || user.role == '1' || user.role == '7'">
 
-              <span v-if="user.uid">
 
-                <button type="text" class="center" @click="tuCenter" v-if="user.role == '0' || user.role == '1' || user.role == '7'">
 
-                  个人中心
 
-                </button>
 
-                <button type="button" @click="zhuxiao" class="outLogin">退出</button>
 
-              </span>
 
-              <span v-else>
 
-                <el-button type="primary" size="mini" class="loginBtn" @click="adminLogin">管理登录</el-button>
 
+            </span>
 
+            <el-button v-else type="primary" size="mini" @click="webLogin">平台登录</el-button>
 
+            <span v-if="user.uid">
 
+              <span v-if="user.role == '0' || user.role == '1' || user.role == '7'">
 
+                <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
 
+                <el-button @click="zhuxiao" type="danger" size="mini">退出登录</el-button>
 
               </span>
 
-            </el-col>
 
-          </el-col> -->
 
-          <el-col :span="12" class="left">
 
-            <span>欢迎来到中科在线</span>
 
-            <span @click="guanzhu()">关注公众号</span>
 
-          </el-col>
 
-          <el-col :span="12" class="right">
 
-            右侧
 
+            </span>
 
+            <el-button v-else type="primary" size="mini" @click="adminLogin">管理登录</el-button>
 
           </el-col>
 
         </div>
 
       </div>
 
@@ -205,7 +179,21 @@ export default {
 
 </script>
 
 
 <style lang="less" scoped>
 
-@import '~@/style/style.css';
 
+.w_1200 {
 
+  width: 1200px;
 
+  margin: 0 auto;
 
+}
 
+.superbanner {
 
+  position: relative;
 
+  height: 250px;
 
+  overflow: hidden;
 
+}
 
+
 
+.superbanner img {
 
+  width: 100%;
 
+  height: 250px;
 
+  overflow: hidden;
 
+}
 
 .supertop {
 
   .left {
 
     height: 40px;
 
@@ -221,41 +209,81 @@ export default {
 
       font-weight: bold;
 
     }
 
   }
 
-  // .right {
 
-  //   height: 40px;
 
-  //   line-height: 40px;
 
-  //   font-size: 16px;
 
-  //   color: #000;
 
-  //   .one {
 
-  //     text-align: right;
 
-  //     color: #000;
 
-  //     font-weight: bold;
 
-  //   }
 
-  //   .two {
 
-  //     text-align: center;
 
-  //     .loginBtn:hover {
 
-  //       cursor: pointer;
 
-  //     }
 
-  //     .center {
 
-  //       font-size: 15px;
 
-  //       font-weight: bold;
 
-  //       color: #fff;
 
-  //     }
 
-  //     .center:hover {
 
-  //       cursor: pointer;
 
-  //       color: #0085d2;
 
-  //     }
 
-  //     .outLogin {
 
-  //       margin: 0 0 0 5px;
 
-  //       font-weight: bold;
 
-  //       font-size: 14px;
 
-  //     }
 
-  //     .outLogin:hover {
 
-  //       cursor: pointer;
 
-  //       color: #0085d2;
 
-  //     }
 
-  //   }
 
-  // }
 
+  .right {
 
+    text-align: right;
 
+    height: 40px;
 
+    line-height: 40px;
 
+    font-size: 16px;
 
+    color: #000;
 
+    .name {
 
+      font-weight: bold;
 
+      margin: 0 10px;
 
+    }
 
+  }
 
+}
 
+.superlogo {
 
+  position: absolute;
 
+  top: 40px;
 
+  width: 100%;
 
+  padding: 50px 0 0 0;
 
+}
 
+
 
+.superlogo img {
 
+  width: 76px;
 
+  height: 64px;
 
+  overflow: hidden;
 
+}
 
+
 
+.superlogo span {
 
+  color: #2d64b3;
 
+  font-size: 36px;
 
+  font-family: cursive;
 
+  text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
 
+  font-weight: 600;
 
+  position: relative;
 
+  top: 10px;
 
+  padding: 0 0 0 10px;
 
+}
 
+
 
+.supermenu {
 
+  position: absolute;
 
+  bottom: 0;
 
+  width: 100%;
 
+  height: 50px;
 
+}
 
+
 
+.supermenu .info {
 
+  height: 50px;
 
+  line-height: 50px;
 
+  background: #0085d2;
 
+}
 
+
 
+.supermenu .info ul li {
 
+  float: left;
 
+  height: 50px;
 
+  line-height: 50px;
 
+  font-size: 20px;
 
+  /* border-right: 1px solid #76bdfe; */
 
+  width: 20%;
 
+  text-align: center;
 
+}
 
+.supermenu .info ul li span {
 
+  background-color: #76bdfe;
 
+  height: 50px;
 
+  float: right;
 
+  width: 1px;
 
+}
 
+
 
+.supermenu .info ul .active {
 
+  background-color: #fe950e;
 
+}
 
+
 
+.supermenu .info ul li a {
 
+  color: #fff;
 
+}
 
+
 
+.supermenu .info ul li:last-child {
 
+  border-right: 0;
 
 }
 
 .btnER {
 
   font-size: 16px;

+ 73 - 22
src/layout/userCenter/heads.vue
查看文件 

@@ -1,44 +1,38 @@
 
 <template>
 
   <div id="heads">
 
-    <div class="w_0100">
 
+    <el-row>
 
       <div class="superbanner">
 
         <img :src="top_bg" />
 
       </div>
 
       <div class="supertop">
 
         <div class="w_1200">
 
-          <p>
 
-            欢迎来到中科在线
 
-          </p>
 
-          <p>
 
-            <span v-if="user || user.name || user.adminuser"
 
-              >{{ user.name || user.adminuser }}
 
-
 
-              <button type="button" class="logininfo" @click="zhuxiao">退出登录</button>
 
-            </span>
 
-          </p>
 
+          <el-col :span="12" class="left">
 
+            <span>欢迎来到中科在线</span>
 
+          </el-col>
 
+          <el-col :span="12" class="right" v-if="user || user.name || user.adminuser">
 
+            <span>{{ user.name || user.adminuser }}</span>
 
+            <el-button type="danger" size="mini" @click="zhuxiao">退出登录</el-button>
 
+          </el-col>
 
         </div>
 
       </div>
 
       <div class="superlogo">
 
         <div class="w_1200">
 
-          <a href="/platlive/market/index">
 
+          <el-col :span="24" @click.native="linkBtn()">
 
             <img :src="logo" />
 
             <span>
 
               中科在线
 
             </span>
 
-          </a>
 
+          </el-col>
 
         </div>
 
       </div>
 
-      <div class="supermenu">
 
-        <div class="w_1200"></div>
 
-      </div>
 
-    </div>
 
+    </el-row>
 
   </div>
 
 </template>
 
 <script>
 
+import Vue from 'vue';
 
 import { mapState, createNamespacedHelpers } from 'vuex';
 
 const { mapActions: login } = createNamespacedHelpers('login');
 
 const { mapActions: dockLogin } = createNamespacedHelpers('dockLogin');
 
-
 
 export default {
 
   name: 'heads',
 
   props: {},
 
@@ -73,6 +67,11 @@ export default {
 
     async toLogin() {
 
       this.$router.push({ path: '/' });
 
     },
 
+    // 返回科技超市页面
 
+    linkBtn() {
 
+      // this.$router.push({ path: `${process.env.NODE_ENV === 'development' ? '' : Vue.config.weixin.baseUrl}/market/index` });
 
+      this.$router.push({ path: '/market/index' });
 
+    },
 
   },
 
   computed: {
 
     ...mapState(['user']),
 
@@ -81,14 +80,66 @@ export default {
 
 </script>
 
 
 <style lang="less" scoped>
 
-@import '~@/style/style.css';
 
-.logininfo {
 
-  font-size: 20px;
 
-  margin: 0 0 0 5px;
 
+.w_1200 {
 
+  width: 1200px;
 
+  margin: 0 auto;
 
 }
 
 /deep/.superbanner {
 
   position: relative;
 
   height: 250px;
 
   overflow: hidden;
 
 }
 
+.supertop {
 
+  .left {
 
+    height: 40px;
 
+    line-height: 40px;
 
+    font-size: 16px;
 
+    span:last-child {
 
+      padding: 0 10px;
 
+      font-weight: bold;
 
+    }
 
+    span:last-child:hover {
 
+      cursor: pointer;
 
+      color: #0085d2;
 
+      font-weight: bold;
 
+    }
 
+  }
 
+  .right {
 
+    text-align: right;
 
+    height: 40px;
 
+    line-height: 40px;
 
+    span {
 
+      color: #000;
 
+      font-weight: bold;
 
+      font-size: 16px;
 
+      padding: 0 10px;
 
+    }
 
+  }
 
+}
 
+.superlogo {
 
+  position: absolute;
 
+  top: 40px;
 
+  width: 100%;
 
+  padding: 50px 0 0 0;
 
+}
 
+
 
+.superlogo img {
 
+  width: 76px;
 
+  height: 64px;
 
+  overflow: hidden;
 
+}
 
+
 
+.superlogo span {
 
+  color: #2d64b3;
 
+  font-size: 36px;
 
+  font-family: cursive;
 
+  text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
 
+  font-weight: 600;
 
+  position: relative;
 
+  top: 10px;
 
+  padding: 0 0 0 10px;
 
+}
 
+.superlogo:hover {
 
+  cursor: pointer;
 
+}
 
 </style>

+ 1 - 1
src/plugins/setting.js
查看文件 

@@ -2,7 +2,7 @@ import Vue from 'vue';
 
 
 Vue.config.weixin = {
 
   // baseUrl: process.env.BASE_URL + 'weixin',
 
-  baseUrl: 'http://10.16.8.209:9005',
 
+  baseUrl: `http://${location.host}`,
 
 };
 
 
 Vue.config.stomp = {

+ 1 - 1
src/router/index.js
查看文件 

@@ -355,7 +355,7 @@ const routes = [...live];
 
 
 const router = new VueRouter({
 
   mode: 'history',
 
-  base: process.env.NODE_ENV === 'development' ? '' : process.env.VUE_APP_ROUTER,
 
+  base: process.env.NODE_ENV === 'development' ? '' : 'platlive',
 
   routes,
 
 });
 
 checkLogin(router);

+ 3 - 4
src/views/dynamic/index.vue
查看文件 

@@ -151,7 +151,7 @@ export default {
 
   // border: 1px solid red;
 
 }
 
 .dataShow .dataShowInfo .center .centerInfo {
 
-  width: 93%;
 
+  width: 98%;
 
   height: 500px;
 
   background: #fff;
 
   border: 1px transparent solid;
 
@@ -218,13 +218,12 @@ export default {
 
 .dataImage {
 
   float: left;
 
   width: 100%;
 
-  height: 160px;
 
-  margin: 20px 0;
 
+  height: 140px;
 
   overflow: hidden;
 
 }
 
 .dataImage .el-image {
 
   width: 100%;
 
-  height: 160px;
 
+  height: 140px;
 
 }
 
 .dealShow {
 
   float: left;

+ 1 - 1
src/views/dynamic/parts/userTwo.vue
查看文件 

@@ -143,7 +143,7 @@ export default {
 
   border-radius: 10px;
 
   box-shadow: 0 0 5px #ccc;
 
   padding: 10px;
 
-  margin: 20px 5px 20px 14px;
 
+  margin: 30px 5px 30px 14px;
 
 }
 
 .one {
 
   background: url('~@/assets/dynamic1.png') no-repeat;

+ 6 - 99
src/views/market/index.vue
查看文件 

@@ -68,7 +68,7 @@
 
             </el-col>
 
           </div>
 
         </el-col>
 
-        <el-col :span="24" class="image">
 
+        <el-col :span="24" class="centerimage">
 
           <el-image :src="gongqiuImage"></el-image>
 
         </el-col>
 
         <el-col :span="24" class="down">
 
@@ -748,80 +748,8 @@ export default {
 
         overflow: hidden;
 
         height: 213px;
 
         margin-top: 10px;
 
-        // margin: 0 0 5px 0;
 
-        // border: 1px dashed #ccc;
 
-        // padding: 5px;
 
-        // .achieveListLeft {
 
-        //   text-align: center;
 
-        //   background-color: #ec6c2d;
 
-        //   text-align: center;
 
-        //   span {
 
-        //     color: #fff;
 
-        //     font-size: 14px;
 
-        //     font-weight: bold;
 
-        //   }
 
-        // }
 
-        // .achieveListRight {
 
-        //   .company {
 
-        //     p:first-child {
 
-        //       font-size: 20px;
 
-        //       font-family: cursive;
 
-        //       font-style: italic;
 
-        //       color: #ec6c2d;
 
-        //       font-weight: bold;
 
-        //       padding: 0 10px 5px 10px;
 
-        //     }
 
-        //     p:nth-child(2) {
 
-        //       border: 1px solid #ec6c2d;
 
-        //     }
 
-        //     p:nth-child(3) {
 
-        //       border: 2px solid #f3e639;
 
-        //       margin: 5px 0 0 0;
 
-        //       width: 70%;
 
-        //     }
 
-        //   }
 
-        //   .achimage {
 
-        //     padding: 10px 5px;
 
-        //   }
 
-        //   .achname {
 
-        //     padding: 0px 10px;
 
-        //     font-size: 20px;
 
-        //     font-family: cursive;
 
-        //     font-style: italic;
 
-        //     -webkit-text-fill-color: white;
 
-        //     -webkit-text-stroke-color: #ec6c2d;
 
-        //     -webkit-text-stroke-width: 1px;
 
-        //     overflow: hidden;
 
-        //     text-overflow: ellipsis;
 
-        //     -webkit-line-clamp: 3;
 
-        //     word-break: break-all;
 
-        //     display: -webkit-box;
 
-        //     -webkit-box-orient: vertical;
 
-        //     margin: 10px 0 0 0;
 
-        //   }
 
-        //   .brief {
 
-        //     font-size: 16px;
 
-        //     padding: 0px 7px;
 
-        //     font-weight: bold;
 
-        //     line-height: 26px;
 
-        //     overflow: hidden;
 
-        //     text-overflow: ellipsis;
 
-        //     -webkit-line-clamp: 9;
 
-        //     word-break: break-all;
 
-        //     display: -webkit-box;
 
-        //     -webkit-box-orient: vertical;
 
-        //   }
 
-        //   .companyInfo {
 
-        //     position: absolute;
 
-        //     bottom: 14px;
 
-        //     p {
 
-        //       font-size: 10px;
 
-        //       padding: 0 10px;
 
-        //     }
 
-        //   }
 
-        // }
 
+
 
         .achieveImage {
 
-          // transition: all 0.4s linear;
 
           .el-image {
 
             width: 100%;
 
             height: 210px;
 
@@ -830,17 +758,6 @@ export default {
 
             transition: all 0.4s linear;
 
           }
 
         }
 
-        // .name {
 
-        //   position: absolute;
 
-        //   bottom: 0;
 
-        //   width: 97%;
 
-        //   height: 40px;
 
-        //   line-height: 40px;
 
-        //   background: #0085d25f;
 
-        //   font-size: 16px;
 
-        //   padding: 0 10px;
 
-        //   color: #333;
 
-        // }
 
         .name {
 
           color: #fff;
 
           width: 100%;
 
@@ -855,18 +772,6 @@ export default {
 
           z-index: 200;
 
           transition: all 0.4s linear;
 
         }
 
-        // .name {
 
-        //   position: absolute;
 
-        //   bottom: 0;
 
-        //   width: 97%;
 
-        //   height: 40px;
 
-        //   line-height: 40px;
 
-        //   background: #0085d25f;
 
-        //   font-size: 16px;
 
-        //   padding: 0 10px;
 
-        //   color: #333;
 
-        //   display: none;
 
-        // }
 
       }
 
       .achieveList:hover {
 
         cursor: pointer;
 
@@ -964,9 +869,11 @@ export default {
 
     }
 
   }
 
 }
 
-.image {
 
+.centerimage {
 
   text-align: center;
 
-  margin: 15px 0;
 
+  .el-image {
 
+    height: 140px;
 
+  }
 
 }
 
 .down {
 
   height: 550px;

+ 75 - 0
src/views/market/re.vue
查看文件 

@@ -0,0 +1,75 @@
 
+<template>
 
+  <div id="re">
 
+    <el-row>
 
+      <el-col :span="24">
 
+        <el-col
 
+          :span="12"
 
+          class="achieveList"
 
+          v-for="(item, index) in achieveList"
 
+          :key="index"
 
+          @click.native="$router.push({ path: '/market/marketlists', query: { type: '1', column_name: '技术成果', id: item.id } })"
 
+        >
 
+          <el-col :span="24" class="achieveImage">
 
+            <el-image v-if="item.image && item.image.length > 0" :src="item.image[0].url"></el-image>
 
+            <el-image v-else :src="achievezb"></el-image>
 
+          </el-col>
 
+          <el-col :span="24" class="name textOver">
 
+            {{ item.name }}
 
+          </el-col>
 
+        </el-col>
 
+      </el-col>
 
+    </el-row>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import { mapState, createNamespacedHelpers } from 'vuex';
 
+export default {
 
+  metaInfo: { title: 're' },
 
+  name: 're',
 
+  props: {},
 
+  components: {},
 
+  data: function() {
 
+    return {};
 
+  },
 
+  created() {},
 
+  methods: {},
 
+  computed: {
 
+    ...mapState(['user']),
 
+  },
 
+};
 
+</script>
 
+
 
+<style lang="less" scoped>
 
+.achieveList {
 
+  position: relative;
 
+  height: 220px;
 
+  margin: 0 0 5px 0;
 
+  border: 1px dashed #ccc;
 
+  padding: 5px;
 
+  .achieveImage .el-image {
 
+    width: 100%;
 
+    height: 210px;
 
+    overflow: hidden;
 
+    border-radius: 5px;
 
+  }
 
+  .name {
 
+    position: absolute;
 
+    bottom: 0;
 
+    width: 97%;
 
+    height: 40px;
 
+    line-height: 40px;
 
+    background: #0085d25f;
 
+    font-size: 16px;
 
+    padding: 0 10px;
 
+    color: #333;
 
+  }
 
+}
 
+.achieveList:hover {
 
+  cursor: pointer;
 
+  .name {
 
+    color: #0085d2;
 
+    font-weight: bold;
 
+  }
 
+}
 
+</style>

+ 2 - 1
src/views/superAdminCenter/index.vue
查看文件 

@@ -105,7 +105,8 @@ export default {
 
 
 <style lang="less" scoped>
 
 .w_1200 {
 
-  width: 80%;
 
+  // width: 80%;
 
+  width: 1200px;
 
   margin: 0 auto;
 
 }
 
 .info {

+ 1 - 1
src/views/technical/index.vue
查看文件 

@@ -170,7 +170,7 @@ export default {
 
 <style lang="less" scoped>
 
 .jishuImage {
 
   width: 100%;
 
-  height: 160px;
 
+  height: 140px;
 
 }
 
 .main {
 
   // width: 80%;

+ 2 - 1
src/views/userCenter/index.vue
查看文件 

@@ -90,7 +90,8 @@ export default {
 
 
 <style lang="less" scoped>
 
 .w_1200 {
 
-  width: 80%;
 
+  // width: 80%;
 
+  width: 1200px;
 
   margin: 0 auto;
 
 }
 
 .info {

+ 1 - 1
src/views/userCenter/productInfo/part/infoRelease.vue
查看文件 

@@ -812,7 +812,7 @@ export default {
 
   /deep/.el-radio-group {
 
     border: 1px solid #ccc;
 
     padding: 12px 20px;
 
-    width: 396px;
 
+    width: 268px;
 
   }
 
   /deep/.langInfo .el-form-item__label {
 
     padding: 27px 0;

+ 2 - 1
vue.config.js
查看文件 

@@ -2,7 +2,8 @@ const path = require('path');
 
 const common = path.resolve(__dirname, '../common');
 
 module.exports = {
 
   publicPath: process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_ROUTER,
 
-  // outputDir: process.env.VUE_APP_ROUTER,
 
+  // 打包文件
 
+  outputDir: 'platlive',
 
   configureWebpack: config => {
 
     Object.assign(config, {
 
       // 开发生产共同配置