Ver Fonte

修改网站Vi

zhengjinyi há 2 anos atrás
pai
commit
4a4f342194
32 ficheiros alterados com 88 adições e 72 exclusões
  1. 2 2
      src/main/resources/static/css/account/login.css
  2. 10 11
      src/main/resources/static/css/article/article.css
  3. 2 2
      src/main/resources/static/css/base/base.h5.css
  4. 9 9
      src/main/resources/static/css/base/base.pc.css
  5. 4 4
      src/main/resources/static/css/pay/caimei-pay.css
  6. 13 1
      src/main/resources/static/css/pay/caimei-paycash.css
  7. 10 10
      src/main/resources/static/css/pay/caimei-paymobile.css
  8. 10 10
      src/main/resources/static/css/pay/caimei-payunder.css
  9. 4 4
      src/main/resources/static/css/pay/caimei-success.css
  10. 1 1
      src/main/resources/static/css/shopping/shopping.css
  11. 5 5
      src/main/resources/static/css/user-center/dashboard.css
  12. BIN
      src/main/resources/static/img/base/WEB-icon.png
  13. BIN
      src/main/resources/static/img/base/icon.png
  14. BIN
      src/main/resources/static/img/base/logo.png
  15. BIN
      src/main/resources/static/img/base/logo_article@2x.png
  16. BIN
      src/main/resources/static/img/base/logo_m.png
  17. BIN
      src/main/resources/static/img/base/placeholder.png
  18. BIN
      src/main/resources/static/img/base/wechat.h5.png
  19. BIN
      src/main/resources/static/img/common/qr_code_applets.png
  20. BIN
      src/main/resources/static/img/common/qr_code_caimei.png
  21. BIN
      src/main/resources/static/img/common/qr_code_hehe.png
  22. BIN
      src/main/resources/static/img/common/qr_code_mini.jpg
  23. BIN
      src/main/resources/static/img/common/qr_code_mini.png
  24. 0 2
      src/main/resources/templates/account/components/header.html
  25. 3 3
      src/main/resources/templates/article/components/article-header.html
  26. 8 1
      src/main/resources/templates/pay/caimei-hlbpay.html
  27. 1 1
      src/main/resources/templates/pay/caimei-pay.html
  28. 1 1
      src/main/resources/templates/pay/caimei-paymobile.html
  29. 1 1
      src/main/resources/templates/pay/caimei-payunder.html
  30. 2 2
      src/main/resources/templates/pay/caimei-starspay.html
  31. 1 1
      src/main/resources/templates/pay/caimei-success.html
  32. 1 1
      src/main/resources/templates/pay/caimei-wisapay.html

+ 2 - 2
src/main/resources/static/css/account/login.css

@@ -85,9 +85,9 @@ li{list-style:none}
  footer{display:none}
  .loginForm .showPwd{display:none;}
  .login-image{display: none;}
- .loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
+ .loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 8vw;background-size:57vw 43.2vw}
  .loginForm h1{color:#22272e;font-size:6.4vw;font-weight:bold;line-height:10vw}
- .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
+ .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386;display: none;}
  .loginForm .formLine-tabs{ width: 100%;height: 12vw;box-sizing: border-box;padding: 2vw 0;margin-bottom: 2vw;}
  .loginForm .formLine-tabs .tabs-item{ width: 50%;height: 24px;box-sizing: border-box;float: left;display: block;line-height: 24px;font-size: 18px;color: #22272E;position: relative;text-align: center;}
  .loginForm .formLine-tabs .tabs-item:before{content: '';width: 24px;height: 4px;background: #FFFFFF;position: absolute;bottom: -5px;left: 50%;margin-left: -12px;}

+ 10 - 11
src/main/resources/static/css/article/article.css

@@ -71,13 +71,13 @@ dl,dd,dt{zoom:1}
 	.header{position:sticky;width:100%;background:#FF5B00;top:0;left:0;z-index:9999}
 	.header .nav{display:table;width:1185px;margin:0 auto}
 	.nav .logo{display:table-cell;vertical-align:top;height:48px;padding:11px 0;margin-right: 16px;}
-	.nav .logo img{width:56px;height:48px}
+	.nav .logo img{width:168px;height:56px}
 	.nav .type{display:table-cell;vertical-align:top;height:70px}
-	.nav .type a{padding:0 16px;height:70px;line-height:70px;margin-right:1px;font-size:16px;color:#fff;text-align:center;display:table-cell;vertical-align:top;white-space:nowrap; border-bottom: 2px solid #FF5B00;box-sizing: border-box;}
+	.nav .type a{padding:0 16px;height:78px;line-height:78px;margin-right:1px;font-size:16px;color:#fff;text-align:center;display:table-cell;vertical-align:top;white-space:nowrap; box-sizing: border-box;}
 	.type a:hover{background-color:#e96c1c;border-bottom-color: #fec19a}
-	.type a.current{background-color:#e96c1c;border-bottom-color: #fec19a}
-	.nav .search{position:relative;display:table-cell;vertical-align:top;width:280px;height:32px;margin-left:39px}
-	.nav .search .keyword{width:280px;height:32px;line-height:32px;margin:22px 0 16px 0;padding:0 32px 0 16px;border:none;border-radius:16px;background:#eb7941;color:#fff;font-size:14px}
+	.type a.current{background-color:rgba(0,0,0,0.2);}
+	.nav .search{position:relative;display:table-cell;vertical-align:top;width:200px;height:32px;margin-left:39px}
+	.nav .search .keyword{width:200px;height:32px;line-height:32px;margin:22px 0 16px 0;padding:0 32px 0 16px;border:none;border-radius:16px;background:#eb7941;color:#fff;font-size:14px}
 	.search .keyword:focus{border:none;outline:medium}
 	.search .searchBtn{position:absolute;top:22px;right:-1px;display:block;width:32px;height:32px;background:url(/img/info/search.png) no-repeat left 8px}
 	.search .keyword::-webkit-input-placeholder{color:#fff}
@@ -265,14 +265,13 @@ dl,dd,dt{zoom:1}
 	#scrollTop .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;background-position:-58.8vw -9vw}
 	.loading{box-sizing:border-box;padding:20vw 0;text-align:center}
 	.header{position: sticky; top: 0; z-index: 9999; background: #f5f5f5;}
-	.h5-head{box-sizing:border-box;width:100%;background:#FFF;height:13.6vw;margin-bottom:2.6vw;padding:0 2.6vw;position:relative}
+	.h5-head{box-sizing:border-box;width:100%;background:#FFF;height:13.6vw;margin-bottom:2.6vw;padding:2vw 2.6vw;position:relative}
 	.h5-head .index{float:left;width:9vw;line-height:3.4vw;text-align:center;font-size:3.7vw;color:#333}
 	.h5-head .index img{width:100%}
-	.h5-head .hotWord{float:right;background-color:#FF5B00;color:#fff;text-align:center;border-radius:5px;width:16vw;height:9.6vw;line-height:9.6vw;font-size:3.7vw;margin-top:2vw}
-	.search{position:absolute;top:2vw;left:15vw;width:64vw;height:9.6vw;line-height:9.6vw;margin:0 auto;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:5px;}
-	.search .keyword{position:absolute;left:0;top:0;border:none;outline:none;width:48vw;height:9.6vw;font-size:3.7vw;color:#4A4F58;text-indent:7.6vw;background:#FFF url(/img/info/search-m.png) no-repeat 1.6vw center;background-size:auto 60%}
-	.search .searchBtn{position:absolute;right:0;top:0;width:16vw;height:9.6vw;font-size:3.7vw;color:#fff;text-align:center;background-color:#FF5B00}
-	.search .searchBtn:before{content:'搜索'}
+	.h5-head .hotWord{float:right;background-color:#FF5B00;color:#fff;text-align:center;border-radius:5px;width:16vw;height:9.6vw;line-height:9.6vw;font-size:3.7vw;display: none;}
+	.search{position:absolute;top:2vw;left:15vw;width:80vw;height:9.6vw;line-height:9.4vw;margin:0 auto;box-sizing:border-box;border:1px solid #FF5B00;padding: 0 2vw;border-radius: 4.8vw;}
+	.search .keyword{border:none;outline:none;width:100%;height:8vw;line-height:8vw;border-radius:4.7vw;font-size:3.7vw;color:#4A4F58;}
+	.search .searchBtn{position:absolute;right:3vw;top:1vw;width:7vw;height:7vw;background:#FFF url(/img/info/search-m.png) no-repeat center;background-size:cover;}
 	#mHotWord{display:none;position:fixed;bottom:0;left:0;width:100%;height:100%;margin:0 auto;overflow-y:scroll;background-color:rgba(74,79,88,.7);z-index:999;-webkit-overflow-scrolling:touch}
 	#mHotWord .tags{background:#fff;border-bottom:1px solid #e9e9e9;-webkit-box-shadow:#e7e7e7 0px 4px 8px;-moz-box-shadow:#e7e7e7 0px 4px 8px;box-shadow:#e7e7e7 0px 4px 8px;padding:2.6vw}
 	#mHotWord .classify{border-left:solid 4px #FF5B00;height:4.6vw;font-size:4.6vw;line-height:4.6vw;padding-left:2vw;margin:3vw 0;color:#333}

+ 2 - 2
src/main/resources/static/css/base/base.h5.css

@@ -47,8 +47,8 @@
 .content-model .model-content .model-button .button{width: 100%;height: 9.9vw;border-radius: .2vw;background-color: #FF5B00;text-align: center;line-height:9.9vw;font-size: 3.4vw;color: #FFFFFF;cursor: pointer;}
 /* 头部 */
 .baseHeadCenter{box-sizing:border-box;width:100%;height:26.8vw;padding:0 2vw;position:relative;background:#FFF}
-.baseHeadCenter .logo,.classifyBox .logo{width:23.8vw;height:5.9vw;padding:3.75vw 0;position:absolute;top:0;left:50%;margin-left:-11.9vw}
-.baseHeadCenter .logo img,.classifyBox .logo img{display:block;width:24vw;height:6.6vw}
+.baseHeadCenter .logo,.classifyBox .logo{width:33.8vw;height:11.2vw;padding:1.2vw 0;position:absolute;top:0;left:50%;margin-left:-16.9vw;}
+.baseHeadCenter .logo img,.classifyBox .logo img{display:block;width:33.8vw;height:11.2vw;}
 .baseHeadCenter .mClassBtn,.classifyBox .mClassBtn{float:left}
 .baseHeadCenter .mUserCenter{float:right}
 .baseHeadCenter .mClassBtn,

+ 9 - 9
src/main/resources/static/css/base/base.pc.css

@@ -107,7 +107,7 @@ iframe{width:320px !important;height: 280px !important}
 
 .baseHeadCenter,.baseTopNav{width:100%;background:#FFF}
 .baseHeadCenter .wrap{height: 100px;box-sizing: border-box;padding: 10px 0;}
-.baseHeadCenter .logo{float:left;width:168px;height:44px;margin-right:122px;margin-top: 10px;}
+.baseHeadCenter .logo{float:left;width:228px;height:76px;margin-right:75px;}
 .baseHeadCenter .searchBox{width:668px;float:left}
 .baseHeadCenter .search{width:100%;height:44px;line-height:44px;border:1px solid #FFE6DC;position:relative}
 .baseHeadCenter .search:before{content:'';position:absolute;left:104px;top:16px;height:12px;border-right:2px solid #C0C6D1}
@@ -229,15 +229,15 @@ iframe{width:320px !important;height: 280px !important}
 .footContact .item{width: 48px;height: 72px;float: left;margin: 0 12px;position: relative;cursor: pointer;}
 .footContact .item .foot-icon{width:48px;height:48px;float: left;border-radius: 50%;background-color: #4a4f58;}
 .footContact .item .foot-icon .icon{width:48px;height:48px;float: left;border-radius: 50%;background-color: #4a4f58;}
-.footContact .item .foot-icon .icon-kefu:before{width:48px;height:48px;background-position: -1px -596px;}
-.footContact .item .foot-icon .icon-hehe:before{width:48px;height:48px;background-position: -61px -596px;}
-.footContact .item .foot-icon .icon-caimei:before{width:48px;height:48px;background-position: -121px -596px;}
-.footContact .item .foot-icon .icon-mini:before{width:48px;height:48px;background-position: -181px -596px;}
+.footContact .item .foot-icon .icon-kefu:before{width:48px;height:48px;background-position: -0px -593px;}
+.footContact .item .foot-icon .icon-hehe:before{width:48px;height:48px;background-position: -58px -593px;}
+.footContact .item .foot-icon .icon-caimei:before{width:48px;height:48px;background-position: -116px -593px;}
+.footContact .item .foot-icon .icon-mini:before{width:48px;height:48px;background-position: -174px -593px;}
 .footContact .item:hover .foot-code{animation: showAmnation ease-in 0.3s;display: block;top: -135px;}
-.footContact .item:hover .foot-icon.kefu .icon-kefu:before{background-position: -241px -596px;}
-.footContact .item:hover .foot-icon.hehe .icon-hehe:before{background-position: -301px -596px;}
-.footContact .item:hover .foot-icon.caimei .icon-caimei:before{background-position: -1px -656px;}
-.footContact .item:hover .foot-icon.mini .icon-mini:before{background-position: -61px -656px;}
+.footContact .item:hover .foot-icon.kefu .icon-kefu:before{background-position: -0px -651px;}
+.footContact .item:hover .foot-icon.hehe .icon-hehe:before{background-position: -58px -651px;}
+.footContact .item:hover .foot-icon.caimei .icon-caimei:before{background-position: -116px -651px;}
+.footContact .item:hover .foot-icon.mini .icon-mini:before{background-position: -174px -651px;}
 .footContact .item:hover  p{color: #ffffff;}
 .footContact .item .foot-code{transition: showAmnation 0.3s;width: 128px;height: 128px;position: absolute;top: -150px;left: 50%;border-radius: 2px;margin-left: -64px;display: block;display: none; background:#FFF;}
 .footContact .item .foot-code:before{content: '';width: 0;height: 0;border-width: 7px;border-style: solid;border-color:#FFFFFF transparent transparent transparent;position: absolute;bottom: -13px;left: 50%;margin-left: -6px;}

+ 4 - 4
src/main/resources/static/css/pay/caimei-pay.css

@@ -6,9 +6,9 @@
     .container{width: 100%;height: auto;}
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
     .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
-    .head-wrap .logo{width:68px;height: 81px;float: left;}
-    .head-wrap .logo a{width:68px;height: 81px;display: block;}
-    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
+.head-wrap .logo{width:228px;height: 76px;float: left;}
+.head-wrap .logo a{width:228px;height: 76px;display: block;}
+.head-wrap .logo a img{width:228px;height: 76px;display: block;}
     .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
     .pay-container {width: 100%;min-height: 550px;position: relative;margin-bottom:0;opacity: 0;}
     .pay-container.active{opacity: 1;}
@@ -117,7 +117,7 @@
     .pay-alert-content .pay-alert .button a{width: 90px;height: 32px;display: block;background: #FF5B00;border-radius: 2px;font-size: 14px;text-align: center;line-height: 32px;color: #FFFFFF;float: right;}
     .pay-button-main{margin-top:30px;width: 100%;height: 72px;box-sizing: border-box;padding: 11px 0;background-color: #FFFFFF;float: left;border-bottom: 1px solid #EBEBEB;}
     .pay-button-main .pay-button{width: 100%;height: 50px;float: left;}
-    .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
+    .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
     .pay-button-main .pay-button a.disabled{background: #EFEFEF;color:#999999;}
     .footTop{margin-top: 0;}
 

+ 13 - 1
src/main/resources/static/css/pay/caimei-paycash.css

@@ -8,6 +8,12 @@ input::-webkit-outer-spin-button {
  * PC端
  */
 @media screen and (min-width:768px){
+    .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
+    .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
+    .head-wrap .logo{width:228px;height: 76px;float: left;}
+    .head-wrap .logo a{width:228px;height: 76px;display: block;}
+    .head-wrap .logo a img{width:228px;height: 76px;display: block;}
+    .head-wrap .text{height: 76px;float: left;margin-left: 10px;line-height: 76px;font-size: 30px;color: #333333;}
     .inner{width: 1184px;margin: 0 auto;}
     .pageTitle{height:57px;line-height:57px;padding-top:16px}
     .pageTitle h1{color:#2D3036;font-size:16px;font-weight:bold;float:left}
@@ -115,7 +121,7 @@ input::-webkit-outer-spin-button {
     .payment-transfer{width: 100%;height: auto;padding: 0 24px;}
     .pay-button-main{width: 100%;height: 72px;box-sizing: border-box;padding: 11px 0;background-color: #FFFFFF;float: left;border-bottom: 1px solid #EBEBEB;}
     .pay-button-main .pay-button{width: 100%;height: 50px;float: left;}
-    .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
+    .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
     .pay-button-main .pay-button a.disabled{background: #EFEFEF;color:#999999;}
     .footTop{margin-top: 0;}
     .jconfirm .jconfirm-box div.jconfirm-closeIcon{display: none !important;}
@@ -126,6 +132,12 @@ input::-webkit-outer-spin-button {
 * 移动端
 */
 @media screen and (max-width:768px){
+    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;box-sizing: border-box;padding: 2.4vw 0;background: #FFFFFF;}
+    .head-wrap .inner{width: 55vw;height: 11.2vw;margin: 0 auto;}
+    .head-wrap .logo{width:33.8vw;height: 11.2vw;float: left;}
+    .head-wrap .logo a{width:100%;height: 100%;display: block;}
+    .head-wrap .logo a img{width:100%;height: 100%;display: block;}
+    .head-wrap .text{height: 11.2vw;float: left;margin-left: 10px;line-height:11.2vw;font-size: 6vw;color: #333333;}
     .pageTitle .step{width:100%;height:12.4vw;line-height:12.4vw;background:#FFF;color:#9AA5B5;font-size:3.1vw;text-align:center}
     .pageTitle .step span{display:inline-block;height:4.2vw;line-height:4.2vw;vertical-align:middle;position:relative;padding-right:6.4vw}
     .pageTitle .step span:before{font-style:normal;font-size:5.2vw;vertical-align:text-top;margin-right:1vw}

+ 10 - 10
src/main/resources/static/css/pay/caimei-paymobile.css

@@ -4,10 +4,10 @@
 /*@media screen and (min-width:768px){*/
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
     .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
-    .head-wrap .logo{width:68px;height: 81px;float: left;}
-    .head-wrap .logo a{width:68px;height: 81px;display: block;}
-    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
-    .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
+    .head-wrap .logo{width:228px;height: 76px;float: left;}
+    .head-wrap .logo a{width:228px;height: 76px;display: block;}
+    .head-wrap .logo a img{width:228px;height: 76px;display: block;}
+    .head-wrap .text{height: 76px;float: left;margin-left: 10px;line-height: 76px;font-size: 30px;color: #333333;}
     .pay-container {width: 100%;min-height: 436px;position: relative;margin-bottom: 20px;}
     .pay-container .container{opacity:0;}
     .pay-container .container.active{opacity: 1;}
@@ -61,12 +61,12 @@
 @media screen and (max-width:768px){
     body{min-width: 100%;background-color: #FFFFFF;}
     footer{display: none;}
-    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;}
-    .head-wrap .inner{width: 35vw;height: 16vw;}
-    .head-wrap .logo{width:13.6vw;height: 16vw;float: left;}
-    .head-wrap .logo a{width:13.6vw;height: 16vw;display: block;}
-    .head-wrap .logo a img{width:13.6vw;height: 16vw;display: block;}
-    .head-wrap .text{height: 16vw;float: left;margin-left: 10px;line-height: 16vw;font-size: 6vw;color: #333333;}
+    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;box-sizing: border-box;padding: 2.4vw 0;}
+    .head-wrap .inner{width: 55vw;height: 11.2vw;margin: 0 auto;}
+    .head-wrap .logo{width:33.8vw;height: 11.2vw;float: left;}
+    .head-wrap .logo a{width:100%;height: 100%;display: block;}
+    .head-wrap .logo a img{width:100%;height: 100%;display: block;}
+    .head-wrap .text{height: 11.2vw;float: left;margin-left: 10px;line-height:11.2vw;font-size: 6vw;color: #333333;}
     .pay-container {width: 100%;min-height: 100%;position: relative;margin-bottom: 0;}
     .pay-container .container{opacity:0;}
     .pay-container .container.active{opacity: 1;}

+ 10 - 10
src/main/resources/static/css/pay/caimei-payunder.css

@@ -4,10 +4,10 @@
 @media screen and (min-width:768px){
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
     .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
-    .head-wrap .logo{width:68px;height: 81px;float: left;}
-    .head-wrap .logo a{width:68px;height: 81px;display: block;}
-    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
-    .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
+    .head-wrap .logo{width:228px;height: 76px;float: left;}
+    .head-wrap .logo a{width:228px;height: 76px;display: block;}
+    .head-wrap .logo a img{width:228px;height: 76px;display: block;}
+    .head-wrap .text{height: 76px;float: left;margin-left: 10px;line-height: 76px;font-size: 30px;color: #333333;}
     .pay-container {width: 100%;min-height: 436px;position: relative;margin-bottom: 20px;}
     .pay-container .container{opacity:0;}
     .pay-container .container.active{opacity: 1;}
@@ -39,12 +39,12 @@
 @media screen and (max-width:768px){
     body{min-width: 100%;background-color: #FFFFFF;}
     footer{display: none;}
-    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;}
-    .head-wrap .inner{width: 35vw;height: 16vw;margin: 0 auto;}
-    .head-wrap .logo{width:13.6vw;height: 16vw;float: left;}
-    .head-wrap .logo a{width:13.6vw;height: 16vw;display: block;}
-    .head-wrap .logo a img{width:13.6vw;height: 16vw;display: block;}
-    .head-wrap .text{height: 16vw;float: left;margin-left: 10px;line-height: 16vw;font-size: 6vw;color: #333333;}
+    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;box-sizing: border-box;padding: 2.4vw 0;}
+    .head-wrap .inner{width: 55vw;height: 11.2vw;margin: 0 auto;}
+    .head-wrap .logo{width:33.8vw;height: 11.2vw;float: left;}
+    .head-wrap .logo a{width:100%;height: 100%;display: block;}
+    .head-wrap .logo a img{width:100%;height: 100%;display: block;}
+    .head-wrap .text{height: 11.2vw;float: left;margin-left: 10px;line-height:11.2vw;font-size: 6vw;color: #333333;}
     .pay-container {width: 100%;height: auto; position: relative;margin-bottom: 6vw;}
     .pay-container .container{opacity:0;}
     .pay-container .container.active{opacity: 1;}

+ 4 - 4
src/main/resources/static/css/pay/caimei-success.css

@@ -4,10 +4,10 @@
 @media screen and (min-width:768px){
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
     .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
-    .head-wrap .logo{width:68px;height: 81px;float: left;}
-    .head-wrap .logo a{width:68px;height: 81px;display: block;}
-    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
-    .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
+    .head-wrap .logo{width:228px;height: 76px;float: left;}
+    .head-wrap .logo a{width:228px;height: 76px;display: block;}
+    .head-wrap .logo a img{width:228px;height: 76px;display: block;}
+    .head-wrap .text{height: 76px;float: left;margin-left: 10px;line-height: 76px;font-size: 30px;color: #333333;}
     .pay-container{opacity: 0;}
     .pay-container.active{opacity: 1;}
     .pay-content{width: 1184px;margin: 0 auto;margin-bottom: 20px;height: 477px;padding: 50px 300px;background-color: #FFFFFF;display: flex;flex-direction: column;box-sizing: border-box;}

+ 1 - 1
src/main/resources/static/css/shopping/shopping.css

@@ -167,7 +167,7 @@ li{list-style:none}
     .summaryWrap .summary .totalPrice.none{line-height: 50px;}
     .summaryWrap .summary .totalPrice span{color: #f55c5c;}
     .summaryWrap .summary .totalCoupon{font-size:14px;line-height:24px;color: #f55c5c;text-align: left;}
-    .summaryWrap .summary .submit{display:inline-block;width:232px;height:50px;line-height:50px;text-align:center;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius:2px;color:#FFF;float: right;}
+    .summaryWrap .summary .submit{display:inline-block;width:232px;height:50px;line-height:50px;text-align:center;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius:2px;color:#FFF;float: right;}
     .summaryWrap .summary .submit.dis{background:#999;}
     .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:996;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
     .summaryWrap .summary .back{color:#f55c5c}

+ 5 - 5
src/main/resources/static/css/user-center/dashboard.css

@@ -58,11 +58,11 @@ li{list-style:none}
     .user-content .section .user-main .tabs-left .item a .icon{width: 24px;height: 24px;display: block;margin: 0 auto;position: relative;margin-top: 10px;}
     .user-content .section .user-main .tabs-left .item a .icon span{display: block;width: 20px;height: 20px;background-image: linear-gradient(90deg,#ff5353 0%,#ff2424 100%);position: absolute;top: -9px;right: -13px;font-style: normal;font-size: 13px;color: #f94b4b;line-height: 20px;text-align: center;border-radius: 50%;color: #fff;}
     .user-content .section .user-main .tabs-left .item a .icon span.ellipse{width: 30px;height: 20px;border-radius: 10px;line-height: 20px;right: -22px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-1:before{width: 24px;height: 24px;background-position: 0px -516px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-2:before{width: 24px;height: 24px;background-position: -35px -516px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-3:before{width: 24px;height: 24px;background-position: -69px -516px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-4:before{width: 24px;height: 24px;background-position: -102px -516px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-5:before{width: 24px;height: 24px;background-position: -136px -515px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-1:before{width: 24px;height: 24px;background-position: 0px -512px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-2:before{width: 24px;height: 24px;background-position: -38px -512px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-3:before{width: 24px;height: 24px;background-position: -73px -512px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-4:before{width: 24px;height: 24px;background-position: -110px -512px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-5:before{width: 24px;height: 24px;background-position: -145px -512px;}
     .user-content .section .user-main .tabs-left .item a .p{display:block;font-size: 14px;color: #22272e;text-align: center;line-height: 20px;margin-top: 3px;}
     .user-content .section .user-main .tabs-right{float: right;line-height: 60px;font-size: 14px;color: #22272e;}
     .user-content .section .user-main .tabs-right a{display: block;float: right;padding-right: 16px;position: relative}

BIN
src/main/resources/static/img/base/WEB-icon.png


BIN
src/main/resources/static/img/base/icon.png


BIN
src/main/resources/static/img/base/logo.png


BIN
src/main/resources/static/img/base/logo_article@2x.png


BIN
src/main/resources/static/img/base/logo_m.png


BIN
src/main/resources/static/img/base/placeholder.png


BIN
src/main/resources/static/img/base/wechat.h5.png


BIN
src/main/resources/static/img/common/qr_code_applets.png


BIN
src/main/resources/static/img/common/qr_code_caimei.png


BIN
src/main/resources/static/img/common/qr_code_hehe.png


BIN
src/main/resources/static/img/common/qr_code_mini.jpg


BIN
src/main/resources/static/img/common/qr_code_mini.png


+ 0 - 2
src/main/resources/templates/account/components/header.html

@@ -1,12 +1,10 @@
 <header id="globalHead" xmlns:th="http://www.w3.org/1999/xhtml">
     <div class="baseHeadCenter account">
         <div class="wrap clear">
-            <a href="/index.html" class="h5Only mClassBtn mIcon" title="主页"></a>
             <a href="/" class="logo">
                 <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
                 <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
             </a>
-            <a href="javascript:void(0);" title="关闭" class="h5Only closeAccount" onclick="toBeforePath()"></a>
             <p class="accountLogin">已有账号?请直接<a href="/login.html" rel="nofollow">登录</a></p>
         </div>
     </div>

+ 3 - 3
src/main/resources/templates/article/components/article-header.html

@@ -2,11 +2,11 @@
     <!--导航栏-->
     <div class="nav">
         <div class="h5-head">
-            <a class="index" href="/"><img src="/img/info/mall.png">商城</a>
-            <a class="hotWord" href="javascript:void(0);">热搜词</a>
+            <a class="index" href="/"><img src="/img/info/mall.png"></a>
+<!--            <a class="hotWord" href="javascript:void(0);">热搜词</a>-->
         </div>
         <div class="logo">
-            <a href="/" target="_blank"><img src="/img/info/nav-logo.png"/></a>
+            <a href="/" target="_blank"><img src="/img/base/logo_article@2x.png"/></a>
         </div>
         <div class="type">
             <div>

+ 8 - 1
src/main/resources/templates/pay/caimei-hlbpay.html

@@ -9,7 +9,14 @@
 </head>
 <body>
 <!-- 引用头部 -->
-<template th:replace="components/header"></template>
+<div class="head-wrap">
+    <div class="inner clear">
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
+        <div class="text">收银台</div>
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${agent}" id="userAgent">
+    </div>
+</div>
 <div id="payContainer" class="pay-container clear" v-cloak>
     <div class="wrap" v-if="pageType !== '2' && pageType !== '3'">
         <div class="pageTitle">

+ 1 - 1
src/main/resources/templates/pay/caimei-pay.html

@@ -9,7 +9,7 @@
 <body>
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
         <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">

+ 1 - 1
src/main/resources/templates/pay/caimei-paymobile.html

@@ -9,7 +9,7 @@
 <body>
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">收银台</div>
         <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">

+ 1 - 1
src/main/resources/templates/pay/caimei-payunder.html

@@ -9,7 +9,7 @@
 <body>
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">收银台</div>
         <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">

+ 2 - 2
src/main/resources/templates/pay/caimei-starspay.html

@@ -9,7 +9,7 @@
 <body>
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
         <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
@@ -113,7 +113,7 @@
 <div class="footer-stars">
     <div class="stars-inner">
         <div class="innermain">
-            <div class="icon"><img src="/web/login/img/index_logo.png" alt=""></div>
+            <div class="icon"><img src="/web/login/img/logo.png" alt=""></div>
             <div class="text"><p>采美365提供技术支持</p></div>
         </div>
     </div>

+ 1 - 1
src/main/resources/templates/pay/caimei-success.html

@@ -11,7 +11,7 @@
 <!-- 引用头部 -->
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">收银台</div>
         <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">

+ 1 - 1
src/main/resources/templates/pay/caimei-wisapay.html

@@ -9,7 +9,7 @@
 <body>
 <div class="head-wrap">
     <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="logo"><a href="/index.html"><img src="/img/base/logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>