Bladeren bron

调整样式

zhengjinyi 1 jaar geleden
bovenliggende
commit
b61c61205f
24 gewijzigde bestanden met toevoegingen van 977 en 951 verwijderingen
  1. 1 1
      src/main/resources/static/css/account/forget.css
  2. 1 1
      src/main/resources/static/css/article/article.css
  3. 4 2
      src/main/resources/static/css/supplier-center/dashboard.css
  4. 4 2
      src/main/resources/static/css/supplier-center/operation/list.css
  5. 3 1
      src/main/resources/static/css/supplier-center/order/detail.css
  6. 79 76
      src/main/resources/static/css/supplier-center/order/logistics-detail.css
  7. 9 7
      src/main/resources/static/css/supplier-center/order/logistics.css
  8. 86 87
      src/main/resources/static/css/supplier-center/order/order-return.css
  9. 2 1
      src/main/resources/static/css/supplier-center/order/orderlist.css
  10. 39 37
      src/main/resources/static/css/supplier-center/order/qualifications-details.css
  11. 86 83
      src/main/resources/static/css/supplier-center/order/qualifications.css
  12. 83 81
      src/main/resources/static/css/supplier-center/order/record.css
  13. 1 0
      src/main/resources/static/css/supplier-center/order/settlement.css
  14. 109 107
      src/main/resources/static/css/supplier-center/setting/information.css
  15. 40 39
      src/main/resources/static/css/supplier-center/setting/password.css
  16. 41 41
      src/main/resources/static/css/supplier-center/setting/phone.css
  17. 1 0
      src/main/resources/static/css/supplier-center/shop/goods.css
  18. 1 0
      src/main/resources/static/css/supplier-center/shop/release.css
  19. 4 2
      src/main/resources/templates/supplier-center/order/detail.html
  20. 1 1
      src/main/resources/templates/supplier-center/order/order-return.html
  21. 94 94
      src/main/resources/templates/supplier-center/order/remarks-add.html
  22. 79 79
      src/main/resources/templates/supplier-center/order/remarks-details.html
  23. 207 207
      src/main/resources/templates/supplier-center/order/settlement.html
  24. 2 2
      src/main/resources/templates/supplier-center/shop/goods.html

+ 1 - 1
src/main/resources/static/css/account/forget.css

@@ -18,7 +18,7 @@ footer .footTop{display:none;}
     .right-header .header-tabs.ri{ border-radius: 0 19px 19px 0;}
     .container{width: 100%;height: auto;box-sizing: border-box;float: left;background-color: #FFF;}
     .foot{width:100%;height:96px;background:#F5F5F5;margin:30px auto}
-    .footer{width:1185px;margin:0 auto;text-align:center;height: 96px;box-sizing: border-box;padding: 20px 0;}
+    .footer{margin:0 auto;text-align:center;height: 96px;box-sizing: border-box;padding: 20px 0;}
     .footer p{line-height: 30px;color: #666666;}
     .footer p span{margin:0 5px}
     .footer p span a{color: #666666;}

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

@@ -132,7 +132,7 @@ dl,dd,dt{zoom:1}
 	.search .keyword:-ms-input-placeholder{color:#B2B2B2}
 	/* .content.sea-top{margin-top:110px} */
 	.foot{width:100%;height:auto;background:#262626;}
-	.footer{width:1185px;margin:0 auto;text-align:center;height: auto;box-sizing: border-box;padding: 24px 0;}
+	.footer{margin:0 auto;text-align:center;height: auto;box-sizing: border-box;padding: 24px 0;}
 	.footer p{line-height: 30px;color: #FFFFFF;}
 
 	/*友情链接*/

+ 4 - 2
src/main/resources/static/css/supplier-center/dashboard.css

@@ -74,8 +74,10 @@
 
 /*移动端*/
  @media screen and (max-width:768px){
- #dashboard{width: 100%;overflow: hidden;padding-top: 27vw;}
- #dashboard li {list-style: none;}
+     body{ background: #FFFFFF; }
+     footer{display:none}
+     #dashboard{width: 100%;overflow: hidden;padding-top: 27vw;}
+     #dashboard li {list-style: none;}
      .wrap_tittle{height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
      .mIcon.wrap_tittle:before{width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}
      .mIcon.open:before{width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}

+ 4 - 2
src/main/resources/static/css/supplier-center/operation/list.css

@@ -69,6 +69,8 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    #operationPage{ padding-top: 27vw; }
+    footer{display: none;}
     .navLayout{border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
     .navLayout .crumbs{display:none;}
     .navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
@@ -80,11 +82,11 @@ li{list-style:none}
     .navLayout .navList.on .tab{color:#FF5B00}
     .navLayout .navList .con a.on{color:#FF5B00;background-color:#ffe6dc}
     .order-header{padding: 2.7vw 4vw;background: #fff}
-    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;}
+    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;border-radius: 5.9vw;}
     .search span.label{padding-left: 2.7vw;color: #627386}
     .search-input {height: -webkit-fill-available;width: 70vw;border: none;border-radius: .27vw}
     input::placeholder{color: #9aa5b5}
-    .header-button{width: 35.3vw;height: 11.2vw;border: 1px solid #FF5B00;text-align: center;line-height: 11.2vw;background: #ffe6dc;margin: 2.7vw auto}
+    .header-button{width: 35.3vw;height: 11.2vw;border: 1px solid #FF5B00;text-align: center;line-height: 11.2vw;background: #ffe6dc;margin: 2.7vw auto;border-radius: 5.8vw;}
     .header-button >a{color: #FF5B00;font-size: 3.7vw}
     .section .list{margin: 2.7vw 0;background: #fff;padding: 2.7vw 3.3vw;}
     .list div span{display: inline-block;line-height: 6.4vw;color: #9aa5b5;}

+ 3 - 1
src/main/resources/static/css/supplier-center/order/detail.css

@@ -65,6 +65,8 @@
 
 /*移动*/
 @media screen and (max-width:768px) {
+    #seeDetail{ padding-top: 27vw; }
+    footer{display: none;}
     .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
     .mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}
     .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}
@@ -122,5 +124,5 @@
     .el-dialog-red{font-size: 12px;color: #F94B4B;line-height: 24px;margin-top: 30px;}
     .el-dialog-h1{font-size: 16px;color: #22272E;line-height: 24px;}
     .el-dialog-h1 span{color: #FF5B00;}
-    footer{display: none;}
+
 }

+ 79 - 76
src/main/resources/static/css/supplier-center/order/logistics-detail.css

@@ -1,76 +1,79 @@
-
-@media screen and (min-width:768px) {
-    .crumbs {font-size: 16px;color: #22272e}
-   .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
-    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #FF5B00;}
-    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
-    .userinfo .user p span {color: #22272e;}
-    .address {margin-bottom: 15px;color: #627386;}
-    .address span {color: #22272e;}
-    .record-product {margin-top: 20px;}
-    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
-    .product ul li {list-style: none;display: inline-block;}
-    .product-title li {width: 11%;text-align: center;}
-    .product-title li:nth-child(1) {width: 42%;text-align: left;}
-    .product {padding: 0 21px;background: #fff;overflow: hidden;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
-    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
-    .product-info li {width: 100%;padding: 15px 0}
-    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-info li div.product-img {width: 42%;text-align: left}
-    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
-    .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
-    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}
-    .img-remark span {color: #627386;}
-    .img-remark ul {display: inline-block;}
-    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
-    .img-remark{margin: 30px 0;}
-    .img-remark li img {width: 100%;height: 100%;}
-    .remark {color: #627386;}
-    .remark span {color: #22272e;}
-    .record-button {float: right;padding: 20px}
-    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;color: #FF5B00;margin-left: 10px;cursor: pointer;}
-    .logis{margin-top: 30px;}
-    .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
-    .logistics-info{color: #627386;margin-bottom: 8px}
-    .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
-    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
-    #InformationList{padding: 15px 22px;background: #fff;}
-}
-
-/*移动*/
-@media screen and (max-width:768px) {
-    .crumbs {font-size: 3.4vw;color: #22272e}
-    .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
-    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
-    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid .27vw #FF5B00;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #FF5B00;}
-    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
-    .userinfo .user p span {color: #22272e;}
-    .address {margin-bottom: 4vw;color: #627386;}
-    .address span {color: #22272e;}
-    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
-    .product ul li {list-style: none;display: inline-block;}
-    .product-title li {color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
-    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
-    .product {padding: 0 5.3vw;background: #fff;overflow: hidden;padding-bottom: 5.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)}
-    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
-    .product-info li {width: 100%;padding-top: 2.7vw;height: 37vw}
-    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size:3.4vw;letter-spacing: .2vw;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-info li div.product-img {width: 100%;text-align: left;top: 0}
-    .product-img img {width: 18.7vw; height: 18.7vw;border: solid .27vw #e2e7ef;top: 0;}
-    .product-info li div {color: #22272e;display: inline-block;top: 11.6vw;width: 21vw;position: relative}
-    .record-time {font-size: 3.1vw;padding-top: 2.7vw}
-    .img-remark span {color: #627386;}
-    .img-remark ul {display: inline-block;}
-    .img-remark li {display: inline-block;width: 13.3vw;height: 13.3vw;margin-left: 2.7vw;}
-    .img-remark{margin: 2.7vw 0;}
-    .img-remark li img {width: 100%;height: 100%;}
-    .remark {color: #627386;}
-    .remark span {color: #22272e;}
-    .logis{background: #fff}
-    .delivery-logis-title{color: #22272e;font-size: 3.4vw;padding: 0 5.3vw}
-    .logistics-info{background: #fff;padding: 2.7vw 5.3vw;color: #627386;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
-    .logistics-info div{margin-right: 17vw;display: inline-block;line-height: 6.4vw}
-    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 3.4vw;margin: 2.7vw 4vw}
-    .record-product{    background: #fff; margin-top: 2.7vw}
-}
+
+@media screen and (min-width:768px) {
+    .crumbs {font-size: 16px;color: #22272e}
+   .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;}
+    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 18px;border: solid 1px #FF5B00;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #FF5B00;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 15px;color: #627386;}
+    .address span {color: #22272e;}
+    .record-product {margin-top: 20px;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .product ul li {list-style: none;display: inline-block;}
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 42%;text-align: left;}
+    .product {padding: 0 21px;background: #fff;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;}
+    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
+    .product-info li {width: 100%;padding: 15px 0}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 42%;text-align: left}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
+    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
+    .img-remark{margin: 30px 0;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .record-button {float: right;padding: 20px}
+    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;color: #FF5B00;margin-left: 10px;cursor: pointer;}
+    .logis{margin-top: 30px;}
+    .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .logistics-info{color: #627386;margin-bottom: 8px}
+    .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
+    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
+    #InformationList{padding: 15px 22px;background: #fff;border-radius: 8px;overflow: hidden;}
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    #logisticsDetail{ padding-top: 27vw; }
+    footer{display: none;}
+    body{ background: #FFFFFF; }
+    .crumbs {font-size: 3.4vw;color: #22272e}
+    .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid .27vw #FF5B00;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #FF5B00;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
+    .product ul li {list-style: none;display: inline-block;}
+    .product-title li {color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
+    .product {padding: 0 5.3vw;background: #fff;overflow: hidden;padding-bottom: 5.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)}
+    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-info li {width: 100%;padding-top: 2.7vw;height: 37vw}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size:3.4vw;letter-spacing: .2vw;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 100%;text-align: left;top: 0}
+    .product-img img {width: 18.7vw; height: 18.7vw;border: solid .27vw #e2e7ef;top: 0;}
+    .product-info li div {color: #22272e;display: inline-block;top: 11.6vw;width: 21vw;position: relative}
+    .record-time {font-size: 3.1vw;padding-top: 2.7vw}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 13.3vw;height: 13.3vw;margin-left: 2.7vw;}
+    .img-remark{margin: 2.7vw 0;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .logis{background: #fff}
+    .delivery-logis-title{color: #22272e;font-size: 3.4vw;padding: 0 5.3vw}
+    .logistics-info{background: #fff;padding: 2.7vw 5.3vw;color: #627386;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .logistics-info div{margin-right: 17vw;display: inline-block;line-height: 6.4vw}
+    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 3.4vw;margin: 2.7vw 4vw}
+    .record-product{    background: #fff; margin-top: 2.7vw}
+}

+ 9 - 7
src/main/resources/static/css/supplier-center/order/logistics.css

@@ -29,7 +29,7 @@
     input::placeholder{color: #9aa5b5;font-size: 12px;}
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
-    .companyBtn{position: absolute;width: 36px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;margin-left: 8px;cursor: pointer;}
+    .companyBtn{position: absolute;width: 36px;height: 36px;background-color: #ffffff;border-radius: 18px;border: solid 1px #b8bfca;margin-left: 8px;cursor: pointer;}
     .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 80px;display: block;background-size: 80px;}
     .add-text {font-size: 12px;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 13px;}
     .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 80px;height: 80px;border-radius: 2px;}
@@ -58,6 +58,8 @@
 
 /*移动*/
 @media screen and (max-width:768px) {
+    #addlogistics{ padding-top: 27vw; }
+    footer{display: none;}
     .crumbs {font-size:3.4vw;color: #22272e}
     .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
     .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
@@ -86,11 +88,11 @@
     .logist-right>div{margin-top: 1.3vw;}
     .company-number>div{margin: 4vw 0;}
     .logistics-order-number.company{width: 72vw}
-    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
+    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: 5.9vw;border: solid .27vw #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
     input::placeholder,textarea::placeholder {color: #9aa5b5;font-size:3.2vw;}
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
-    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;
+    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: 5.9vw;border: solid .27vw #b8bfca;
     margin-left: .53vw;cursor: pointer;color: #b8bfca;position: relative;top:1.3vw}
     .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 23vw;display: block;    background-size: 23vw;}
     .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0px;cursor: pointer;width: 23vw;height: 23vw;border-radius: .53vw;}
@@ -104,13 +106,13 @@
     .form-upload-tips{float: left;position: relative;}
     .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -3.5vw;left:1.3vw;}
     .form-upload-tips:hover .wen-tips {display: block;}
-    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
+    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: 3vw;border: solid .27vw #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
     .remarks{position: relative}
     .remarks .rema{line-height:10.7vw ;}
     .size-num {position: absolute;right: 2.7vw;top: 52vw;color: #9aa5b5}
-    .defineBtn button{width: 100%;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #fff;background-color: #FF5B00;border-radius: .53vw;border: solid .27vw #FF5B00;cursor: pointer;margin-bottom: 2.7vw}
+    .defineBtn button{width: 100%;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #fff;background-color: #FF5B00;border-radius: 5.6vw;border: solid .27vw #FF5B00;cursor: pointer;margin-bottom: 2.7vw}
     .defineBtn button:nth-child(2){background:#ffe6dc;color: #FF5B00 }
     .defineBtn{overflow: hidden;margin-top: 4vw}
-    .mIcon.add-company:before{width: 5.3vw;height: 6.7vw;background-position: -33.9vw -68.8vw}
-    .mIcon.sub-company:before{width: 5.3vw;height:6.7vw;background-position: -41.3vw -68vw}
+    .mIcon.add-company:before{width: 5.3vw;height: 6.7vw;background-position: -33.9vw -69.8vw;}
+    .mIcon.sub-company:before{width: 5.3vw;height:6.7vw;background-position: -42.3vw -70vw;}
 }

+ 86 - 87
src/main/resources/static/css/supplier-center/order/order-return.css

@@ -1,87 +1,86 @@
-@media screen and (min-width:768px) {
-    .crumbs {font-size: 16px;color: #22272e}
-    .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
-    .comback {width: 90px;height: 36px;float: right;text-align: right;display: inline-block;}
-    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
-    .userinfo .user p span {color: #22272e;}
-    .address {margin-bottom: 15px;color: #627386;}
-    .address span {color: #22272e;}
-    .product-info {margin-top: 20px;}
-    .price {overflow: hidden;}
-    .protitle {color: #22272e;font-size: 16px;padding: 15px;float: left;}
-    .price-right {float: right;padding: 15px;color: #22272e;}
-    .red {color: #f94b4b;}
-    .info-title {color: #22272e;font-size: 16px;padding: 15px;}
-    .title-name {color: #22272e;margin-bottom: 20px}
-    .title-name p{float: left;}
-    .title-time {float: right;color: #9aa5b5;}
-    .order-item {display: flex;width: 100%;}
-    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: auto;margin-right: 40px;}
-    .order-item p.state{color:#FF5B00;margin-left: 20px;}
-    .order-item p.none{width: 100%;}
-    .order-product .product-img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left;position: relative;}
-    .order-product .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
-    .product-info .num{margin-right: 80px;}
-    .order-product .product-img img{width: 100%;height: 100%;}
-    .order-product .product-main{float: right;width: 87%;}
-    .order-product .product-main p{line-height: 32px;}
-    .order-product .product-main h3{line-height: 32px;}
-    .order-product{overflow: hidden;margin-bottom: 10px}
-    .red {color: #f94b4b;}
-    .none {color: #333333;}
-    .order-info {margin-top: 20px;}
-    .order-info .content {background: #fff;padding: 15px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .order-item.pay span {color: #FF5B00;}
-
-    .NoText{color: #627386}
-    .section-botton {width: 100%;height: 76px;box-sizing: border-box;float: left;padding: 20px;background-color: #FFFFFF;margin-top: 20px}
-    .section-botton .inner .btn {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;line-height: 36px;color: #FF5B00;display: inline-block;margin-right: 16px;float: right;}
-    .section-botton.fiexd {position: fixed;bottom: 0;right: 0;}
-    .section-botton.fiexd .inner {width: 1184px;margin: 0 auto;z-index: 9999;}
-}
-
-
-/*移动*/
-@media screen and (max-width:768px) {
-    .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
-    .mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}
-    .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}
-    .right{width: 100%;}
-    .userinfo {padding: 1.3vw 3.3vw;background: #fff;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
-    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
-    .comback {width: 22.4vw;height: 7.2vw;display: inline-block;float: right;text-align: right;}
-    .userinfo .user p:nth-child(1){width: 100%;}
-    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
-    .userinfo .user p span {color: #22272e;}
-    .address {margin-bottom: 4vw;color: #627386;}
-    .address span {color: #22272e;}
-    .product-info {margin-top: 4vw;background: #fff}
-    .price {overflow: hidden;}
-    .protitle {color: #22272e;font-size: 3.4vw;padding: 4vw;float: left}
-    .price-right {float: right;padding: 4vw;color: #22272e}
-    .red {color: #f94b4b;}
-    .info-title {color: #22272e;font-size: 3.4vw;padding: 4vw;}
-    .title-name {color: #22272e;margin-bottom: 5.3vw}
-    .title-name p{float: left;}
-    .title-name p.state{color:#FF5B00;margin-left: 10vw;}
-    .title-time {float: right;color: #9aa5b5;}
-    .order-item p {margin-bottom: 5.3vw;display: inline-block;color: #627386;width: 48%}
-    .red {color: #f94b4b;}
-    .order-info {margin-top:5.3vw;}
-    .order-info .content {background: #fff;padding: 4vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
-    .order-item.pay span {color: #FF5B00;}
-    .order-product .product-img{width: 28VW;height: 28VW;border: solid 1px #e2e7ef;float: left;position: relative;}
-    .product-info .num:nth-child(1){float: left;}
-    .product-info .num:nth-child(2){float: right;}
-    .order-product .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
-    .order-product .product-img img{width: 100%;height: 100%;}
-    .order-product .product-main{float: right;width: 65%;}
-    .order-product{overflow: hidden;margin-bottom: 1.9vw;}
-    .order-product .product-main p{line-height: 6vw;}
-    .order-product .product-main h3{line-height: 6vw;}
-    .section-botton {width: 100%;height: 15.6vw;box-sizing: border-box;padding: 3vw;background-color: #FFFFFF;position: fixed;bottom: 0;right: 0;}
-    .section-botton.fiexd .inner {width: 100%;}
-    .section-botton .inner .btn {float: right;box-sizing: border-box;width: 22.4vw;height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #FF5B00;text-align: center;line-height: 9.6vw;color: #FF5B00;display: inline-block}
-    footer{display: none;}
-}
+@media screen and (min-width:768px) {
+    .crumbs {font-size: 16px;color: #22272e}
+    .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;}
+    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback {width: 90px;height: 36px;float: right;text-align: right;display: inline-block;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 15px;color: #627386;}
+    .address span {color: #22272e;}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px;float: left;}
+    .price-right {float: right;padding: 15px;color: #22272e;}
+    .red {color: #f94b4b;}
+    .info-title {color: #22272e;font-size: 16px;padding: 15px;}
+    .title-name {color: #22272e;margin-bottom: 20px}
+    .title-name p{float: left;}
+    .title-time {float: right;color: #9aa5b5;}
+    .order-item {display: flex;width: 100%;}
+    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: auto;margin-right: 40px;}
+    .order-item p.state{color:#FF5B00;margin-left: 20px;}
+    .order-item p.none{width: 100%;}
+    .order-product .product-img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left;position: relative;}
+    .order-product .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
+    .product-info .num{margin-right: 80px;}
+    .order-product .product-img img{width: 100%;height: 100%;}
+    .order-product .product-main{float: right;width: 87%;}
+    .order-product .product-main p{line-height: 32px;}
+    .order-product .product-main h3{line-height: 32px;}
+    .order-product{overflow: hidden;margin-bottom: 10px}
+    .red {color: #f94b4b;}
+    .none {color: #333333;}
+    .order-info {margin-top: 20px;}
+    .order-info .content {background: #fff;padding: 15px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;}
+    .order-item.pay span {color: #FF5B00;}
+
+    .NoText{color: #627386}
+    .section-botton {width: 100%;height: 76px;box-sizing: border-box;float: left;padding: 20px;background-color: #FFFFFF;margin-top: 20px}
+    .section-botton .inner .btn {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;line-height: 36px;color: #FF5B00;display: inline-block;margin-right: 16px;float: right;}
+    .section-botton.fiexd {position: fixed;bottom: 0;right: 0;}
+    .section-botton.fiexd .inner {width: 1184px;margin: 0 auto;z-index: 9999;}
+}
+
+
+/*移动*/
+@media screen and (max-width:768px) {
+    .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
+    .mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}
+    .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}
+    .right{width: 100%;}
+    .userinfo {padding: 1.3vw 3.3vw;background: #fff;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback {width: 22.4vw;height: 7.2vw;display: inline-block;float: right;text-align: right;}
+    .userinfo .user p:nth-child(1){width: 100%;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {margin-top: 4vw;background: #fff}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 4vw;float: left}
+    .price-right {float: right;padding: 4vw;color: #22272e}
+    .red {color: #f94b4b;}
+    .info-title {color: #22272e;font-size: 3.4vw;padding: 4vw;}
+    .title-name {color: #22272e;margin-bottom: 5.3vw}
+    .title-name p{float: left;}
+    .title-name p.state{color:#FF5B00;margin-left: 10vw;}
+    .title-time {float: right;color: #9aa5b5;}
+    .order-item p {margin-bottom: 5.3vw;display: inline-block;color: #627386;width: 48%}
+    .red {color: #f94b4b;}
+    .order-info {margin-top:5.3vw;}
+    .order-info .content {background: #fff;padding: 4vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .order-item.pay span {color: #FF5B00;}
+    .order-product .product-img{width: 28VW;height: 28VW;border: solid 1px #e2e7ef;float: left;position: relative;}
+    .product-info .num:nth-child(1){float: left;}
+    .product-info .num:nth-child(2){float: right;}
+    .order-product .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
+    .order-product .product-img img{width: 100%;height: 100%;}
+    .order-product .product-main{float: right;width: 65%;}
+    .order-product{overflow: hidden;margin-bottom: 1.9vw;}
+    .order-product .product-main p{line-height: 6vw;}
+    .order-product .product-main h3{line-height: 6vw;}
+    .section-botton {width: 100%;height: 15.6vw;box-sizing: border-box;padding: 3vw;background-color: #FFFFFF;position: fixed;bottom: 0;right: 0;}
+    .section-botton.fiexd .inner {width: 100%;}
+    .section-botton .inner .btn {float: right;box-sizing: border-box;width: 22.4vw;height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #FF5B00;text-align: center;line-height: 9.6vw;color: #FF5B00;display: inline-block}
+    footer{display: none;}
+}

+ 2 - 1
src/main/resources/static/css/supplier-center/order/orderlist.css

@@ -8,7 +8,7 @@
     textarea::placeholder{color: #9aa5b5;}
     #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
     #newBtn{float: left;margin: 0}
-    .supplier-main{margin-top: 10px;background: #fff;}
+    .supplier-main{margin-top: 10px;background: #fff;border-radius: 8px;overflow: hidden;}
     .order-content{padding: 10px 20px;overflow: hidden}
     .order-tips{ padding: 0 20px;background: #FFECEC;line-height: 40px;font-size: 14px;color: #F94B4B;}
     .order-title{background-color: #ffffff;padding: 10px 20px;overflow: hidden;}
@@ -45,6 +45,7 @@
 
 /*移动*/
 @media screen and (max-width:768px) {
+    #orderList{ padding-top: 27vw; }
     .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
     .mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}  .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}
     .right{width: 100%;}

+ 39 - 37
src/main/resources/static/css/supplier-center/order/qualifications-details.css

@@ -1,37 +1,39 @@
-@media screen and (min-width:768px) {
-    .crumbs {font-size: 16px;color: #22272e}
-    .qualifications-content{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);min-height: 518px;box-sizing: border-box;padding:32px 197px;}
-    .qualifications-content.empty{padding: 126px 197px;}
-    .qualifications-content.empty .empty-container-image{width: 210px;height: 140px;}
-    .qualifications-content.empty .error-text{line-height:44px;font-size: 14px;color: #22272e;}
-    .qualifications-content.empty .login-btn{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 36px;cursor: pointer;}
-    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 20px;}
-    .qualifications-content .list-view-title{width: 100%;height: 44px;line-height:44px;font-size: 16px;color: #22272e;}
-    .qualifications-content .list-view{width: 100%;min-height: 44px;line-height:44px;font-size: 14px;}
-    .qualifications-content .list-view.margin{margin-bottom: 20px;}
-    .qualifications-content .list-view-label{width: 74px;min-height: 44px;line-height:44px;font-size: 14px;color: #627386;float: left;}
-    .qualifications-content .list-view-text{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
-    .qualifications-content .list-file-view{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
-    .qualifications-content .list-view-image{width:112px;height: 80px;display: block;float: left;margin-right: 16px;margin-bottom: 16px;}
-    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
-    .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
-    .qualifications-btn .edit-button{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 36px;cursor: pointer;}
-}
-
-/*移动*/
-@media screen and (max-width:768px) {
-    .crumbs {font-size:3.4vw;color: #22272e}
-    .qualifications-content{background: #fff;box-sizing: border-box;padding:3.4vw;}
-    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 2vw;}
-    .qualifications-content .list-view-title{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.6vw;color: #22272e;}
-    .qualifications-content .list-view{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.2vw;}
-    .qualifications-content .list-view.margin{margin-bottom: 20px;}
-    .qualifications-content .list-view-label{width: 16.2vw;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #627386;float: left;}
-    .qualifications-content .list-view-text{width:77vw;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #22272e;float: left;}
-    .qualifications-content .list-file-view{width:100%;min-height: 6vw;line-height:6vw;font-size: 3.2vw;color: #22272e;float: left;}
-    .qualifications-content .list-view-image{width:17.6vw;height: 13.6vw;display: block;float: left;margin-right: 2vw;margin-bottom: 2vw;}
-    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
-    .qualifications-btn{width: 100%;height: 11.2vw;float: left;margin-top: 5vw;}
-    .qualifications-btn .edit-button{width: 100%;height: 11.2vw;margin: 0 auto;font-size: 3.2vw;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 11.2vw;}
-
-}
+@media screen and (min-width:768px) {
+    .crumbs {font-size: 16px;color: #22272e}
+    .qualifications-content{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);min-height: 518px;box-sizing: border-box;padding:32px 197px;border-radius: 8px;overflow: hidden;}
+    .qualifications-content.empty{padding: 126px 197px;}
+    .qualifications-content.empty .empty-container-image{width: 210px;height: 140px;}
+    .qualifications-content.empty .error-text{line-height:44px;font-size: 14px;color: #22272e;}
+    .qualifications-content.empty .login-btn{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 36px;cursor: pointer;border-radius: 18px;}
+    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 20px;}
+    .qualifications-content .list-view-title{width: 100%;height: 44px;line-height:44px;font-size: 16px;color: #22272e;}
+    .qualifications-content .list-view{width: 100%;min-height: 44px;line-height:44px;font-size: 14px;}
+    .qualifications-content .list-view.margin{margin-bottom: 20px;}
+    .qualifications-content .list-view-label{width: 74px;min-height: 44px;line-height:44px;font-size: 14px;color: #627386;float: left;}
+    .qualifications-content .list-view-text{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
+    .qualifications-content .list-file-view{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
+    .qualifications-content .list-view-image{width:112px;height: 80px;display: block;float: left;margin-right: 16px;margin-bottom: 16px;}
+    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
+    .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
+    .qualifications-btn .edit-button{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 36px;cursor: pointer;}
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    #qualifications{ padding-top: 27vw; }
+    footer{display: none;}
+    .crumbs {font-size:3.4vw;color: #22272e}
+    .qualifications-content{background: #fff;box-sizing: border-box;padding:3.4vw;}
+    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 2vw;}
+    .qualifications-content .list-view-title{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.6vw;color: #22272e;}
+    .qualifications-content .list-view{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.2vw;}
+    .qualifications-content .list-view.margin{margin-bottom: 20px;}
+    .qualifications-content .list-view-label{width: 16.2vw;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #627386;float: left;}
+    .qualifications-content .list-view-text{width:77vw;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #22272e;float: left;}
+    .qualifications-content .list-file-view{width:100%;min-height: 6vw;line-height:6vw;font-size: 3.2vw;color: #22272e;float: left;}
+    .qualifications-content .list-view-image{width:17.6vw;height: 13.6vw;display: block;float: left;margin-right: 2vw;margin-bottom: 2vw;}
+    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
+    .qualifications-btn{width: 100%;height: 11.2vw;float: left;margin-top: 5vw;}
+    .qualifications-btn .edit-button{width: 100%;height: 11.2vw;margin: 0 auto;font-size: 3.2vw;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 11.2vw;border-radius: 5.6vw;}
+
+}

+ 86 - 83
src/main/resources/static/css/supplier-center/order/qualifications.css

@@ -1,83 +1,86 @@
-@media screen and (min-width:768px) {
-    .crumbs {font-size: 16px;color: #22272e}
-    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;cursor: pointer;}
-    .qualifications-title{width: 100%;height: 36px;background-image: linear-gradient(270deg, #ffffff 0%, rgba(225,86,22,0.1) 51%, #ffffff 100%);color: #FF5B00;font-size: 16px;line-height: 36px;text-align: center;margin-bottom: 20px;}
-    .qualifications-content{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);min-height: 500px;box-sizing: border-box;padding:32px 236px;}
-    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 20px;}
-    .qualifications-content .list-view-title{width: 100%;height: 44px;line-height:44px;font-size: 16px;color: #22272e;}
-    .qualifications-content .list-view-title .title-left{float: left;}
-    .qualifications-content .list-view-title .title-right{float: right;color: #FF5B00;cursor: pointer;}
-    .qualifications-content .list-view{width: 100%;min-height: 44px;line-height:44px;font-size: 14px;}
-    .qualifications-content .list-view.margin{margin-bottom: 20px;}
-    .qualifications-content .list-view-label{width: 100%;min-height: 30px;line-height:30px;font-size: 14px;color: #627386;float: left;}
-    .qualifications-content .select {position: relative;display: block;width: 100%;color: #22272e;vertical-align: middle;text-align: left;height: 36px;user-select: none}
-    .qualifications-content .select .placeholder {position: relative;display: block;padding-left: 10px;border-radius: 2px;cursor: pointer;border: solid 1px #b8bfca;height: 36px;line-height: 36px;color: #333333;}
-    .qualifications-content .select.is-open .placeholder:after {content: '\f077';}
-    .qualifications-content .select.is-open ul {display: block;}
-    .qualifications-content .select.select--white .placeholder {background: #fff;color: #999;}
-    .qualifications-content .select.select--white .placeholder:hover {background: #fafafa;}
-    .qualifications-content .select ul {position: absolute;overflow: hidden;width: 100%;background: #fff;border-radius: 2px;top: 100%;left: 0;list-style: none;margin: 2px 0 0 0;padding: 0;z-index: 100;border: solid 1px #b8bfca;max-height: 350px;overflow: auto;}
-    .qualifications-content .select ul li {display: block;text-align: left;padding: 10px;color: #999;cursor: pointer;box-sizing: border-box;height: 50px;line-height: 30px;}
-    .qualifications-content .select ul li:hover {background-color: #ffe6dc;color: #FF5B00}
-    .icon.brand:before {width: 25px;height: 25px;background-position: -87px 11px;position: absolute;right: 15px}
-    .qualifications-content .list-view-text{width:100%;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
-    .qualifications-content .list-view-text .input{width:100%;height: 36px;padding: 0 10px;line-height:36px;font-size: 14px;color: #22272e;box-sizing: border-box;border: 1px solid #b8bfca;border-radius: 2px;}
-    .qualifications-content .list-file-view{width:100%;min-height: 30px;line-height:30px;font-size: 14px;color: #22272e;float: left;position: relative;}
-    .qualifications-content .list-view-upload{width: 100%;height: 80px;float: left;}
-    .qualifications-content .upload-file{width: 92px;height: 66px;float: left;position: relative;margin-right: 7px;}
-    .qualifications-content .upload-file .icon-add-file{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-file@2x.png");display: block;}
-    .qualifications-content .upload-file .icon-add-img{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-image@2x.png");display: block;}
-    .qualifications-content .upload-file .input-file{width:100% ;height: 100%;position: absolute;top: 0;left: 0;opacity: 0;}
-    .qualifications-content .upload-image{width: 92px;height: 66px;float: left;margin-right: 7px;margin-bottom: 7px;border: solid 1px #b8bfca;box-sizing: border-box;cursor: pointer;position: relative;}
-    .qualifications-content .list-view-image{width: 100%;height: 100%;display: block;}
-    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
-    .qualifications-content .list-btn{width: 156px;height: 36px;cursor: pointer;box-sizing: border-box;border: 1px solid #FF5B00;line-height: 36px;color: #FF5B00;margin: 0 auto;border-radius: 2px;padding: 10px 37px;cursor: pointer;}
-    .qualifications-content .list-btn .i-span{width: 16px;height: 16px;display: block;border-radius: 50%;border: 1px solid #FF5B00;box-sizing: border-box;text-align: center;line-height: 13px;font-size: 14px;float: left;}
-    .qualifications-content .list-btn .p-span{display: block;float: right;line-height: 16px;height: 16px;}
-    .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
-    .qualifications-btn .cancel-button{width: 232px;height: 50px;float: left;font-size: 14px;box-sizing: border-box;border: 1px solid #FF5B00;background-color: #ffe6dc;color: #FF5B00;text-align: center;line-height: 50px;cursor: pointer;}
-    .qualifications-btn .edit-button{width: 232px;height: 50px;float: right;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 50px;cursor: pointer;}
-}
-
-/*移动*/
-@media screen and (max-width:768px) {
-    .crumbs {font-size:3.4vw;color: #22272e}
-    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -89.6vw -7.7vw;position: absolute;top: -1vw;right: -.8vw}
-    .brand.mIcon:before{width: 5.3vw;height: 5.3vw;background-position: -51.2vw -.27vw;position: absolute;top: 2vw;right: 2.7vw}
-    .qualifications-title{width: 100%;height: 9.6vw;background-image: linear-gradient(270deg, #ffffff 0%, rgba(225,86,22,0.1) 51%, #ffffff 100%);color: #FF5B00;font-size: 3vw;line-height: 9.6vw;text-align: center;margin-bottom:4vw;}
-    .qualifications-content{background: #fff;box-sizing: border-box;padding:3.4vw;padding-bottom: 20vw;}
-    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 2vw;}
-    .qualifications-content .list-view-title{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.6vw;color: #22272e;}
-    .qualifications-content .list-view-title .title-left{float: left;}
-    .qualifications-content .list-view-title .title-right{float: right;color: #FF5B00;cursor: pointer;}
-    .qualifications-content .list-view{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.2vw;}
-    .qualifications-content .list-view.margin{margin-bottom: 20px;}
-    .qualifications-content .list-view-label{width:100%;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #627386;float: left;}
-    .qualifications-content .list-view-text{width:100%;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #22272e;float: left;}
-    .qualifications-content .list-view-text .input{width:100%;height:8.8vw;padding: 0 2vw;line-height:8.8vw;font-size:3.2vw;color: #22272e;box-sizing: border-box;border: 1px solid #b8bfca;border-radius: 2px;}
-    .qualifications-content .list-file-view{width:100%;min-height: 8.8vw;line-height:8.8vw;position: relative;font-size: 3.2vw;color: #22272e;float: left;margin-bottom: 3vw;}
-    .qualifications-content .list-view-upload{width: 100%;height: 16vw;float: left;}
-    .qualifications-content .upload-file{width: 17vw;height: 13.6vw;float: left;position: relative;}
-    .qualifications-content .upload-file .icon-add-file{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-file@1x.png");display: block;background-size: cover;}
-    .qualifications-content .upload-file .icon-add-img{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-image@1x.png");display: block;background-size: cover;}
-    .qualifications-content .upload-file .input-file{width:100% ;height: 100%;position: absolute;top: 0;left: 0;opacity: 0;}
-    .qualifications-content .upload-image{width: 17vw;height: 13.6vw;float: left;margin-right:2vw;margin-bottom: 2vw;border: solid 1px #b8bfca;box-sizing: border-box;cursor: pointer;position: relative;}
-    .qualifications-content .list-view-image{width:100%;height: 100%;display: block;float: left;}
-    .qualifications-content .upload-image:nth-child(5n){margin-right: 0;}
-    .qualifications-btn{width: 100%;height: 11.2vw;float: left;margin-top: 5vw;}
-    .qualifications-content .list-btn{width: 33.2vw;height: 9vw;cursor: pointer;box-sizing: border-box;border: 1px solid #FF5B00;line-height:  9vw;color: #FF5B00;margin: 0 auto;margin-top: 10vw;border-radius: 2px;padding: 2vw 6vw;}
-    .qualifications-content .list-btn .i-span{width: 5vw;height: 5vw;display: block;border-radius: 50%;border: 1px solid #FF5B00;box-sizing: border-box;text-align: center;line-height: 4.5vw;font-size: 3.6vw;float: left;}
-    .qualifications-content .list-btn .p-span{display: block;float: right;line-height: 5vw;height: 5vw;font-size: 3.4vw;}
-    .qualifications-btn .cancel-button{width: 100%;height: 11.2vw;text-align: center;line-height: 11.2vw;color: #FF5B00;}
-    .qualifications-btn .edit-button{width: 100%;height: 11.2vw;font-size: 3.2vw;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 11.2vw;}
-
-    .select {position: relative;display: block;width: 100%;color: #9aa5b5;vertical-align: middle;text-align: left;height: 9.6vw;user-select: none}
-    .select .placeholder {position: relative;display: block;padding-left: 2.7vw;border-radius: .53vw;cursor: pointer;border: solid .27vw #b8bfca;height:9.6vw;line-height: 9.6vw;color: #333333;}
-    .select.is-open .placeholder:after {content: '\f077';}
-    .select.is-open ul {display: block;}
-    .select.select--white .placeholder {background: #fff;color: #999;}
-    .select.select--white .placeholder:hover {background: #fafafa;}
-    .select ul {position: absolute;width: 99.5%;background: #fff;border-radius: .53vw;top: 100%;left: 0;list-style: none;border: solid 1px #b8bfca;max-height: 93.3vw;overflow: auto;z-index: 1;}
-    .select ul li {display: block;text-align: left;padding: 0.8em 1em 0.8em 1em;color: #999;cursor: pointer;}
-    .select ul li:hover {background-color: #ffe6dc;color: #FF5B00}
-}
+@media screen and (min-width:768px) {
+    .crumbs {font-size: 16px;color: #22272e}
+    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;cursor: pointer;}
+    .qualifications-title{width: 100%;height: 36px;background-image: linear-gradient(270deg, #ffffff 0%, rgba(225,86,22,0.1) 51%, #ffffff 100%);color: #FF5B00;font-size: 16px;line-height: 36px;text-align: center;margin-bottom: 20px;}
+    .qualifications-content{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);min-height: 500px;box-sizing: border-box;padding:32px 236px;border-radius: 8px;overflow: hidden;}
+    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 20px;}
+    .qualifications-content .list-view-title{width: 100%;height: 44px;line-height:44px;font-size: 16px;color: #22272e;}
+    .qualifications-content .list-view-title .title-left{float: left;}
+    .qualifications-content .list-view-title .title-right{float: right;color: #FF5B00;cursor: pointer;}
+    .qualifications-content .list-view{width: 100%;min-height: 44px;line-height:44px;font-size: 14px;}
+    .qualifications-content .list-view.margin{margin-bottom: 20px;}
+    .qualifications-content .list-view-label{width: 100%;min-height: 30px;line-height:30px;font-size: 14px;color: #627386;float: left;}
+    .qualifications-content .select {position: relative;display: block;width: 100%;color: #22272e;vertical-align: middle;text-align: left;height: 36px;user-select: none}
+    .qualifications-content .select .placeholder {position: relative;display: block;padding-left: 10px;border-radius: 18px;cursor: pointer;border: solid 1px #b8bfca;height: 36px;line-height: 36px;color: #333333;}
+    .qualifications-content .select.is-open .placeholder:after {content: '\f077';}
+    .qualifications-content .select.is-open ul {display: block;}
+    .qualifications-content .select.select--white .placeholder {background: #fff;color: #999;}
+    .qualifications-content .select.select--white .placeholder:hover {background: #fafafa;}
+    .qualifications-content .select ul {position: absolute;overflow: hidden;width: 100%;background: #fff;border-radius: 2px;top: 100%;left: 0;list-style: none;margin: 2px 0 0 0;padding: 0;z-index: 100;border: solid 1px #b8bfca;max-height: 350px;overflow: auto;}
+    .qualifications-content .select ul li {display: block;text-align: left;padding: 10px;color: #999;cursor: pointer;box-sizing: border-box;height: 50px;line-height: 30px;}
+    .qualifications-content .select ul li:hover {background-color: #ffe6dc;color: #FF5B00}
+    .icon.brand:before {width: 25px;height: 25px;background-position: -87px 11px;position: absolute;right: 15px}
+    .qualifications-content .list-view-text{width:100%;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
+    .qualifications-content .list-view-text .input{width:100%;height: 36px;padding: 0 10px;line-height:36px;font-size: 14px;color: #22272e;box-sizing: border-box;border: 1px solid #b8bfca;border-radius: 18px;}
+    .qualifications-content .list-file-view{width:100%;min-height: 30px;line-height:30px;font-size: 14px;color: #22272e;float: left;position: relative;}
+    .qualifications-content .list-view-upload{width: 100%;height: 80px;float: left;}
+    .qualifications-content .upload-file{width: 92px;height: 66px;float: left;position: relative;margin-right: 7px;}
+    .qualifications-content .upload-file .icon-add-file{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-file@2x.png");display: block;}
+    .qualifications-content .upload-file .icon-add-img{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-image@2x.png");display: block;}
+    .qualifications-content .upload-file .input-file{width:100% ;height: 100%;position: absolute;top: 0;left: 0;opacity: 0;}
+    .qualifications-content .upload-image{width: 92px;height: 66px;float: left;margin-right: 7px;margin-bottom: 7px;border: solid 1px #b8bfca;box-sizing: border-box;cursor: pointer;position: relative;}
+    .qualifications-content .list-view-image{width: 100%;height: 100%;display: block;}
+    .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
+    .qualifications-content .list-btn{width: 156px;height: 36px;cursor: pointer;box-sizing: border-box;border: 1px solid #FF5B00;line-height: 36px;color: #FF5B00;margin: 0 auto;border-radius: 2px;padding: 10px 37px;cursor: pointer;}
+    .qualifications-content .list-btn .i-span{width: 16px;height: 16px;display: block;border-radius: 50%;border: 1px solid #FF5B00;box-sizing: border-box;text-align: center;line-height: 13px;font-size: 14px;float: left;}
+    .qualifications-content .list-btn .p-span{display: block;float: right;line-height: 16px;height: 16px;}
+    .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
+    .qualifications-btn .cancel-button{width: 232px;height: 50px;float: left;font-size: 14px;box-sizing: border-box;border: 1px solid #FF5B00;background-color: #ffe6dc;color: #FF5B00;text-align: center;line-height: 50px;cursor: pointer;border-radius: 25px;}
+    .qualifications-btn .edit-button{width: 232px;height: 50px;float: right;font-size: 14px;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 50px;cursor: pointer;border-radius: 25px;}
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    #qualifications{ padding-top: 27vw; }
+    footer{display: none;}
+    body{ background: #FFFFFF; }
+    .crumbs {font-size:3.4vw;color: #22272e}
+    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -89.6vw -7.7vw;position: absolute;top: -1vw;right: -.8vw}
+    .brand.mIcon:before{width: 5.3vw;height: 5.3vw;background-position: -51.2vw -.27vw;position: absolute;top: 2vw;right: 2.7vw}
+    .qualifications-title{width: 100%;height: 9.6vw;background-image: linear-gradient(270deg, #ffffff 0%, rgba(225,86,22,0.1) 51%, #ffffff 100%);color: #FF5B00;font-size: 3vw;line-height: 9.6vw;text-align: center;margin-bottom:4vw;}
+    .qualifications-content{background: #fff;box-sizing: border-box;padding:3.4vw;padding-bottom: 20vw;}
+    .qualifications-content .list{width: 100%;height: auto;margin-bottom: 2vw;}
+    .qualifications-content .list-view-title{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.6vw;color: #22272e;}
+    .qualifications-content .list-view-title .title-left{float: left;}
+    .qualifications-content .list-view-title .title-right{float: right;color: #FF5B00;cursor: pointer;}
+    .qualifications-content .list-view{width: 100%;height:8.8vw;line-height:8.8vw;font-size: 3.2vw;}
+    .qualifications-content .list-view.margin{margin-bottom: 20px;}
+    .qualifications-content .list-view-label{width:100%;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #627386;float: left;}
+    .qualifications-content .list-view-text{width:100%;min-height: 8.8vw;line-height:8.8vw;font-size: 3.2vw;color: #22272e;float: left;}
+    .qualifications-content .list-view-text .input{width:100%;height:8.8vw;padding: 0 2vw;line-height:8.8vw;font-size:3.2vw;color: #22272e;box-sizing: border-box;border: 1px solid #b8bfca;border-radius: 4.4vw;}
+    .qualifications-content .list-file-view{width:100%;min-height: 8.8vw;line-height:8.8vw;position: relative;font-size: 3.2vw;color: #22272e;float: left;margin-bottom: 3vw;}
+    .qualifications-content .list-view-upload{width: 100%;height: 16vw;float: left;}
+    .qualifications-content .upload-file{width: 17vw;height: 13.6vw;float: left;position: relative;}
+    .qualifications-content .upload-file .icon-add-file{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-file@1x.png");display: block;background-size: cover;}
+    .qualifications-content .upload-file .icon-add-img{width:100% ;height: 100%;background: url("/img/supplier/icon-upload-image@1x.png");display: block;background-size: cover;}
+    .qualifications-content .upload-file .input-file{width:100% ;height: 100%;position: absolute;top: 0;left: 0;opacity: 0;}
+    .qualifications-content .upload-image{width: 17vw;height: 13.6vw;float: left;margin-right:2vw;margin-bottom: 2vw;border: solid 1px #b8bfca;box-sizing: border-box;cursor: pointer;position: relative;}
+    .qualifications-content .list-view-image{width:100%;height: 100%;display: block;float: left;}
+    .qualifications-content .upload-image:nth-child(5n){margin-right: 0;}
+    .qualifications-btn{width: 100%;height: 11.2vw;float: left;margin-top: 5vw;}
+    .qualifications-content .list-btn{width: 33.2vw;height: 9vw;cursor: pointer;box-sizing: border-box;border: 1px solid #FF5B00;line-height:  9vw;color: #FF5B00;margin: 0 auto;margin-top: 10vw;border-radius: 2px;padding: 2vw 6vw;}
+    .qualifications-content .list-btn .i-span{width: 5vw;height: 5vw;display: block;border-radius: 50%;border: 1px solid #FF5B00;box-sizing: border-box;text-align: center;line-height: 4.5vw;font-size: 3.6vw;float: left;}
+    .qualifications-content .list-btn .p-span{display: block;float: right;line-height: 5vw;height: 5vw;font-size: 3.4vw;}
+    .qualifications-btn .cancel-button{width: 100%;height: 11.2vw;text-align: center;line-height: 11.2vw;color: #FF5B00;}
+    .qualifications-btn .edit-button{width: 100%;height: 11.2vw;font-size: 3.2vw;background-color: #FF5B00;color: #FFFFFF;text-align: center;line-height: 11.2vw;border-radius: 5.6vw;}
+
+    .select {position: relative;display: block;width: 100%;color: #9aa5b5;vertical-align: middle;text-align: left;height: 9.6vw;user-select: none}
+    .select .placeholder {position: relative;display: block;padding-left: 2.7vw;border-radius: 5vw;cursor: pointer;border: solid .27vw #b8bfca;height:9.6vw;line-height: 9.6vw;color: #333333;}
+    .select.is-open .placeholder:after {content: '\f077';}
+    .select.is-open ul {display: block;}
+    .select.select--white .placeholder {background: #fff;color: #999;}
+    .select.select--white .placeholder:hover {background: #fafafa;}
+    .select ul {position: absolute;width: 99.5%;background: #fff;border-radius: .53vw;top: 100%;left: 0;list-style: none;border: solid 1px #b8bfca;max-height: 93.3vw;overflow: auto;z-index: 1;}
+    .select ul li {display: block;text-align: left;padding: 0.8em 1em 0.8em 1em;color: #999;cursor: pointer;}
+    .select ul li:hover {background-color: #ffe6dc;color: #FF5B00}
+}

+ 83 - 81
src/main/resources/static/css/supplier-center/order/record.css

@@ -1,81 +1,83 @@
-
-@media screen and (min-width:768px) {
-    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
-    .crumbs {font-size: 16px;color: #22272e }
-    .userinfo { padding: 5px 20px; background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .info {height: 56px;line-height: 56px; border-bottom: solid 1px #e2e7ef;font-size: 16px; color: #22272e; overflow: hidden }
-    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;float: right; line-height: 36px; margin-top: 10px;cursor: pointer;color: #FF5B00; }
-    .userinfo .user p {display: inline-block;color: #627386; margin: 15px 45px 15px 0px; }
-    .userinfo .user p span { color: #22272e; }
-    .address {margin-bottom: 15px; color: #627386;}
-    .address span {color: #22272e; }
-    .record-product { margin-top: 20px; }
-    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px; }
-    .product ul li {list-style: none;display: inline-block; }
-    .product-title li {width: 11%;text-align: center;}
-    .product-title li:nth-child(1) {width: 42%;text-align: left; }
-    .product {padding: 0 20px;background: #fff;overflow: hidden;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); }
-    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
-    .product-info li {width: 100%;padding: 15px 0}
-    .product-img{position: relative;}
-    .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
-    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-info li div.product-img {width: 42%;text-align: left}
-    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
-    .product-info li div {display: inline-block;width: 11%;text-align: center}
-    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px;}
-    .img-remark span {color: #627386;}
-    .img-remark ul {display: inline-block;}
-    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
-    .img-remark li img {width: 100%;height: 100%;}
-    .img-remark{margin: 20px 0;}
-    .remark {color: #627386;}
-    .remark span {color: #22272e;}
-    .record-button {float: right;padding: 20px}
-    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;color: #FF5B00;margin-left: 10px;cursor: pointer;}
-    .no-delivery-record {width: 968px;height: 423px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);position: relative;}
-    .no-delivery-record img {position: absolute;top: 10%;left: 50%;transform: translate(-50%,50%);width: 220px;}
-    .no-delivery-record p{position: absolute;top: 68%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
-    .no-delivery-record span{color: #FF5B00;}
-}
-
-/*移动*/
-@media screen and (max-width:768px) {
-    .right{width: 100%;overflow: hidden}
-    .userinfo { padding: 1.3vw 3.2vw; background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
-    .info { height: 13vw; line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
-    .comback { width: 22.4vw; height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid 1px #FF5B00; float: right;line-height: 7.2vw; margin-top: 2.7vw;cursor: pointer;  color: #FF5B00}
-    .userinfo .user p:nth-child(1){ width: 100%; }
-    .userinfo .user p { display: inline-block;color: #627386; margin: 0 8vw 4vw 0; }
-    .userinfo .user p span { color: #22272e; }
-    .address {margin-bottom: 4vw;color: #627386; }
-    .address span { color: #22272e; }
-    .protitle {color: #22272e;font-size: 3.4vw;padding: 6vw 5.3vw 4vw 4vw;}
-    .product ul li{list-style: none;display: inline-block;}
-    .product-title li {color: #9aa5b5;position: relative;top: 26vw;width: 21vw;}
-    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0}
-    .product{padding: 0 4vw;background: #fff;overflow: hidden;}
-    .record-product{    background: #fff; margin-top: 2.7vw}
-    .product-title{height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
-    .product-info li{width: 100%;padding-top: 2.7vw;height: 36vw}
-    .product-img{position: relative;}
-    .product-img h3{display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4vw;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
-    .product-info li div.product-img{width: 100%;text-align: left;top: 0;}
-    .product-img img{width: 15vw;height: 15vw;border: solid .27vw #e2e7ef;}
-    .product-info li div{display: inline-block;color: #22272e;top: 13.6vw;width: 21vw;position: relative}
-    .record-time{color: #9aa5b5;font-size: 3.1vw;padding: 4vw 0}
-    .img-remark span{color: #627386;}
-    .img-remark ul{display: inline-block;}
-    .img-remark li {display: inline-block;width: 13.9vw;height: 13.9vw;margin-left: 10px;}
-    .img-remark li img{width: 100%;height: 100%;}
-    .remark{color: #627386;padding: 10px 0;}
-    .remark span{color: #22272e;}
-    .record-button{float: right;padding: 5.3vw 0}
-    .record-button button{width: 22.4vw;height:9.6vw;line-height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #FF5B00;text-align: center;color: #FF5B00;margin-left: 2.7vw;}
-    .no-delivery-record {width: 100%;height:90vw;background-color: #ffffff;position: relative;}
-    .no-delivery-record img {width:48vw;position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
-    .no-delivery-record p{position: absolute;top: 65%;left: 24%;font-size: 3.2vw;color: #4a4f58}
-    .no-delivery-record span{color: #FF5B00;}
-
-}
+
+@media screen and (min-width:768px) {
+    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+    .crumbs {font-size: 16px;color: #22272e }
+    .userinfo { padding: 5px 20px; background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;}
+    .info {height: 56px;line-height: 56px; border-bottom: solid 1px #e2e7ef;font-size: 16px; color: #22272e; overflow: hidden }
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 18px;border: solid 1px #FF5B00;float: right; line-height: 36px; margin-top: 10px;cursor: pointer;color: #FF5B00; }
+    .userinfo .user p {display: inline-block;color: #627386; margin: 15px 45px 15px 0px; }
+    .userinfo .user p span { color: #22272e; }
+    .address {margin-bottom: 15px; color: #627386;}
+    .address span {color: #22272e; }
+    .record-product { margin-top: 20px; border-radius: 8px;overflow: hidden;background: #FFFFFF;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px; }
+    .product ul li {list-style: none;display: inline-block; }
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 42%;text-align: left; }
+    .product {padding: 0 20px;background: #fff;overflow: hidden;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); }
+    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
+    .product-info li {width: 100%;padding: 15px 0}
+    .product-img{position: relative;}
+    .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 42%;text-align: left}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-info li div {display: inline-block;width: 11%;text-align: center}
+    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px;}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .img-remark{margin: 20px 0;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .record-button {float: right;padding: 20px}
+    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 18px;border: solid 1px #FF5B00;text-align: center;color: #FF5B00;margin-left: 10px;cursor: pointer;}
+    .no-delivery-record {width: 968px;height: 423px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);position: relative;}
+    .no-delivery-record img {position: absolute;top: 10%;left: 50%;transform: translate(-50%,50%);width: 220px;}
+    .no-delivery-record p{position: absolute;top: 68%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
+    .no-delivery-record span{color: #FF5B00;}
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    #deliveryRecode{ padding-top: 27vw; }
+    footer{display: none;}
+    .right{width: 100%;overflow: hidden}
+    .userinfo { padding: 1.3vw 3.2vw; background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+    .info { height: 13vw; line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback { width: 22.4vw; height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid 1px #FF5B00; float: right;line-height: 7.2vw; margin-top: 2.7vw;cursor: pointer;  color: #FF5B00}
+    .userinfo .user p:nth-child(1){ width: 100%; }
+    .userinfo .user p { display: inline-block;color: #627386; margin: 0 8vw 4vw 0; }
+    .userinfo .user p span { color: #22272e; }
+    .address {margin-bottom: 4vw;color: #627386; }
+    .address span { color: #22272e; }
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 6vw 5.3vw 4vw 4vw;}
+    .product ul li{list-style: none;display: inline-block;}
+    .product-title li {color: #9aa5b5;position: relative;top: 26vw;width: 21vw;}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0}
+    .product{padding: 0 3vw;background: #fff;overflow: hidden;}
+    .record-product{    background: #fff; margin-top: 2.7vw}
+    .product-title{height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-info li{width: 100%;padding-top: 2.7vw;height: 36vw}
+    .product-img{position: relative;}
+    .product-img h3{display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4vw;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
+    .product-info li div.product-img{width: 100%;text-align: left;top: 0;}
+    .product-img img{width: 15vw;height: 15vw;border: solid .27vw #e2e7ef;}
+    .product-info li div{display: inline-block;color: #22272e;top: 13.6vw;width: 21vw;position: relative}
+    .record-time{color: #9aa5b5;font-size: 3.1vw;padding: 4vw 0}
+    .img-remark span{color: #627386;}
+    .img-remark ul{display: inline-block;}
+    .img-remark li {display: inline-block;width: 13.9vw;height: 13.9vw;margin-left: 10px;}
+    .img-remark li img{width: 100%;height: 100%;}
+    .remark{color: #627386;padding: 10px 0;}
+    .remark span{color: #22272e;}
+    .record-button{float: right;padding: 5.3vw 0}
+    .record-button button{height:9vw;padding: 0 3vw; line-height: 9vw;background-color: #ffe6dc;border: solid .27vw #FF5B00;text-align: center;color: #FF5B00;margin-left: 2.7vw;border-radius: 4.5vw;}
+    .no-delivery-record {width: 100%;height:90vw;background-color: #ffffff;position: relative;}
+    .no-delivery-record img {width:48vw;position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
+    .no-delivery-record p{position: absolute;top: 65%;left: 24%;font-size: 3.2vw;color: #4a4f58}
+    .no-delivery-record span{color: #FF5B00;}
+
+}

+ 1 - 0
src/main/resources/static/css/supplier-center/order/settlement.css

@@ -36,6 +36,7 @@
 /* 移动*/
 
 @media screen and (max-width: 768px){
+    #settlement{ padding-top: 27vw; }
     table, td, th{border: none;}
     .head-top{padding: 3vw 0;background: #fff;}
     .head-top .form-row{margin:1.5vw 0;color: #627386;float: left;width: 50%;}

+ 109 - 107
src/main/resources/static/css/supplier-center/setting/information.css

@@ -1,107 +1,109 @@
-@media screen and (min-width:768px){
-   .crumbs{color: #22272e;font-size: 16px;}
-   .head-wrap{background: #fff;border-bottom: 1px solid #e2e7ef}
-   .head-top{height: 60px;line-height: 60px;color: #9aa5b5;margin: auto;width: fit-content}
-   .head-top div{display: inline-block;cursor: pointer}
-   .head-top div:nth-child(2){margin: 0 57px;}
-   .header-tabs .line{width: 20px; height: 20px;line-height: 20px;display: inline-block;background: #9aa5b5; border-radius: 50%; color: #fff;font-size: 10px;
-    text-align: center;position: relative;top: 0px;right: 5px}
-   .header-tabs.current{color: #FF5B00}
-   .header-tabs .line.linestyle{color: #fff;background: #FF5B00}
-   .container{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); padding-top: 19px}
-   .container .forget-form{width: 500px; margin: 0 auto;padding: 20px 0}
-   .formLine select[name="cityID"]{margin: 0 14px}
-   .formLine p:nth-child(1){padding-left: 0;color: #627386;}
-   .formLine.rightTxt p{padding-left: 0;}
-   .formLine p em{margin: 0}
-   input[type="text"]::placeholder,textarea::placeholder{color: #9aa5b5;}
-   .formLine .diyBox.second{width: 111px}
-   .formLine .business .diyBox {margin-right: 14px}
-   .formLine .form-upload{width: 128px;height: auto;float: left;margin-right: 20px; margin-bottom: 10px}
-   .formLine .form-upload.list{width: 100%;}
-   .formLine .formLine-file{width: 128px;height: 90px;position: relative;float: left}
-   .formLine .form-upload-tips{width: 20px;height: 90px;float: left;position: relative;}
-   .formLine .form-upload-tips .icon{width: 20px;height: 20px;float: left;background: url("/img/base/icon.png") no-repeat;display: block;margin-top: 40px;}
-   .formLine .form-upload-tips .icon-wen{background-position: -84px -144px;cursor: pointer;}
-   .formLine .form-upload-tips .wen-tips{width: 182px;height: 46px;line-height: 46px;text-align: center;color: #FFF;font-size: 14px; background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: -24px;left: -2px;border-radius: 3px;display: none;}
-   .formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left: 5px;}
-   .formLine .form-upload-tips:hover .wen-tips{display: block;}
-   .formLine .file{width: 128px;height: 90px;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
-   .formLine .formLine-file .icon{width: 128px;height: 90px;display: block;}
-   .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
-   .formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
-   .formLine .formLine-file .file-logo{background: url("/img/account/icon-logo.png") no-repeat;}
-   .formLine .formLine-file .file-produce{background: url("/img/account/icon-produce.png") no-repeat;}
-   .formLine .formLine-file .file-health{background: url("/img/account/icon-health.png") no-repeat;}
-   .formLine .formLine-file .file-tax{background: url("/img/account/icon-tax.png") no-repeat;}
-   .formLine .formLine-file .file-honor{background: url("/img/account/icon-honor.png") no-repeat;}
-   .formLine .formLine-file .file-product{background: url("/img/account/icon-product.png") no-repeat;}
-   .formLine .form-upload-image{width: 128px;height: 90px;position: relative; margin:0 20px 10px 0;float: left}
-   .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
-   .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
-   .formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
-   .formLine .business{height:auto;position:relative}
-   .formLine .addbusiness{overflow: hidden}
-   .formLine .addbusiness input[type="text"] {width: 260px;display: block;float: left;margin-right: 15px;}
-   .formLine .addbusiness a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #FF5B00;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;}
-   .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
-   .formLine.info textarea{margin: 0px}
-   .header{ width: 100%;height: 60px; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
-   .header .header-p{height: 34px; line-height: 18px; font-size: 12px;color: #FF5B00; text-align: center;margin: auto;width: 355px;padding-top: 12px}
-   }
-
-
-/*移动*/
-
-@media screen and (max-width:768px){
-   .head-top{height: 18.9vw;line-height: 25vw;color: #9aa5b5;margin: auto;}
-   .head-top div{display: inline-block;cursor: pointer}
-   .head-top div:nth-child(2){margin: 0px 4vw;}
-   .header-tabs .line{width: 5.3vw; height: 5.3vw;line-height: 5.3vw;display: inline-block;background: #9aa5b5; border-radius: 50%; color: #fff;font-size: 2.9vw;
-    text-align: center;position: relative;top: -6.7vw;right: -13.9vw}
-   .header-tabs.current{color: #FF5B00}
-   .header-tabs .line.linestyle{color: #fff;background: #FF5B00}
-   .forget-form{background: #fff;padding: 3.3vw;}
-   .formLine p{color: #627386;}
-   .formLine .business{overflow: hidden}
-   input[type="text"]::placeholder,textarea::placeholder{color: #9aa5b5;}
-   .form-upload-image{width: 36vw;height: 25.3vw;position: relative;}
-   .form-upload-image img{width: 100%;height: 100%}
-   .formLine .form-upload-image .mIcon:before {width: 5.3vw;height: 5.3vw;background-position: -89vw -8.3vw;transition: none;}
-   .formLine{overflow: hidden}
-   .formLine select[name="cityID"]{margin: 0 1.3vw}
-   .formLine .business .diyBox {margin-right: 3.4vw}
-   .formLine .diyBox.second {width: 26.7vw}
-   .formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 5.3vw;margin-bottom: 2.7vw}
-   .formLine .form-upload.list{width: 100%;}
-   .formLine .formLine-file{width: 36vw;height: 25.3vw;position: relative;float: left}
-   .formLine .form-upload-tips{width: 5.3vw;height: 25.3vw;float: left;position: relative;}
-   .formLine .form-upload-tips .icon{width: 5.3vw;height: 5.3vw;float: left;background: url("/img/base/icon.png") no-repeat;display: block;margin-top: 40px;}
-   .formLine .form-upload-tips .icon-wen{background-position: -84px -144px;cursor: pointer;}
-   .formLine .form-upload-tips .wen-tips{width: 48.5vw;height: 12.3vw;line-height: 12.3vw;text-align: center;color: #FFF;font-size: 3.4vw; background-color: #1890f9;box-shadow: 0px .8vw 1.6vw 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: -6.4vw;left: -.53vw;border-radius: .8vw;display: none;}
-   .formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 2vw;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -4vw;left: 1.3vw;}
-   .formLine .form-upload-tips:hover .wen-tips{display: block;}
-   .formLine .file{width: 36vw;height: 25.3vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
-   .formLine .formLine-file .icon{width: 36vw;height:25.3vw;display: block;}
-   .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
-   .formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
-   .formLine .formLine-file .file-logo{background: url("/img/account/icon-logo.png") no-repeat;}
-   .formLine .formLine-file .file-produce{background: url("/img/account/icon-produce.png") no-repeat;}
-   .formLine .formLine-file .file-health{background: url("/img/account/icon-health.png") no-repeat;}
-   .formLine .formLine-file .file-tax{background: url("/img/account/icon-tax.png") no-repeat;}
-   .formLine .formLine-file .file-honor{background: url("/img/account/icon-honor.png") no-repeat;}
-   .formLine .formLine-file .file-product{background: url("/img/account/icon-product.png") no-repeat;}
-   .formLine .list .form-upload-image{position: relative;float: left;margin: 0 2.7vw 2.7vw 0}
-   .formLine .form-upload-image .upload-img{width: 36vw;height:25.3vw;display: block;}
-   .formLine .form-upload-image .icon{width: 5.3vw;height: 5.3vw;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
-   .formLine .business{height:auto;position:relative}
-   .formLine .addbusiness{overflow: hidden}
-   .formLine .addbusiness input[type="text"] {width: 69.4vw;display: block;float: left;margin-right: 1.3vw;}
-   .formLine .addbusiness a {display: block;float: left;width: 21.4vw;height: 11vw;line-height: 11.2vw;font-size: 3.4vw;
-    color: #FF5B00; background-color: #ffe6dc; border-radius: .53vw;border: solid .27vw #FF5B00;text-align: center}
-   .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
-   .formLine.info textarea{margin: 0px}
-   .header{ width: 100%; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
-   .header .header-p{height: 16vw; line-height: 7vw; font-size: 3.1vw;color: #FF5B00; text-align: center;margin: auto;padding: 0 2.7vw}
-
-}
+@media screen and (min-width:768px){
+   .crumbs{color: #22272e;font-size: 16px;}
+   .head-wrap{background: #fff;border-bottom: 1px solid #e2e7ef}
+   .head-top{height: 60px;line-height: 60px;color: #9aa5b5;margin: auto;width: fit-content}
+   .head-top div{display: inline-block;cursor: pointer}
+   .head-top div:nth-child(2){margin: 0 57px;}
+   .header-tabs .line{width: 20px; height: 20px;line-height: 20px;display: inline-block;background: #9aa5b5; border-radius: 50%; color: #fff;font-size: 10px;
+    text-align: center;position: relative;top: 0px;right: 5px}
+   .header-tabs.current{color: #FF5B00}
+   .header-tabs .line.linestyle{color: #fff;background: #FF5B00}
+   .container{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); padding-top: 19px}
+   .container .forget-form{width: 500px; margin: 0 auto;padding: 20px 0}
+   .formLine select[name="cityID"]{margin: 0 14px}
+   .formLine p:nth-child(1){padding-left: 0;color: #627386;}
+   .formLine.rightTxt p{padding-left: 0;}
+   .formLine p em{margin: 0}
+   input[type="text"]::placeholder,textarea::placeholder{color: #9aa5b5;}
+   .formLine .diyBox.second{width: 111px}
+   .formLine .business .diyBox {margin-right: 14px}
+   .formLine .form-upload{width: 128px;height: auto;float: left;margin-right: 20px; margin-bottom: 10px}
+   .formLine .form-upload.list{width: 100%;}
+   .formLine .formLine-file{width: 128px;height: 90px;position: relative;float: left}
+   .formLine .form-upload-tips{width: 20px;height: 90px;float: left;position: relative;}
+   .formLine .form-upload-tips .icon{width: 20px;height: 20px;float: left;background: url("/img/base/icon.png") no-repeat;display: block;margin-top: 40px;}
+   .formLine .form-upload-tips .icon-wen{background-position: -84px -144px;cursor: pointer;}
+   .formLine .form-upload-tips .wen-tips{width: 182px;height: 46px;line-height: 46px;text-align: center;color: #FFF;font-size: 14px; background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: -24px;left: -2px;border-radius: 3px;display: none;}
+   .formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left: 5px;}
+   .formLine .form-upload-tips:hover .wen-tips{display: block;}
+   .formLine .file{width: 128px;height: 90px;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+   .formLine .formLine-file .icon{width: 128px;height: 90px;display: block;}
+   .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+   .formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
+   .formLine .formLine-file .file-logo{background: url("/img/account/icon-logo.png") no-repeat;}
+   .formLine .formLine-file .file-produce{background: url("/img/account/icon-produce.png") no-repeat;}
+   .formLine .formLine-file .file-health{background: url("/img/account/icon-health.png") no-repeat;}
+   .formLine .formLine-file .file-tax{background: url("/img/account/icon-tax.png") no-repeat;}
+   .formLine .formLine-file .file-honor{background: url("/img/account/icon-honor.png") no-repeat;}
+   .formLine .formLine-file .file-product{background: url("/img/account/icon-product.png") no-repeat;}
+   .formLine .form-upload-image{width: 128px;height: 90px;position: relative; margin:0 20px 10px 0;float: left}
+   .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
+   .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
+   .formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
+   .formLine .business{height:auto;position:relative}
+   .formLine .addbusiness{overflow: hidden}
+   .formLine .addbusiness input[type="text"] {width: 260px;display: block;float: left;margin-right: 15px;}
+   .formLine .addbusiness a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #FF5B00;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;}
+   .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
+   .formLine.info textarea{margin: 0px}
+   .header{ width: 100%;height: 60px; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
+   .header .header-p{height: 34px; line-height: 18px; font-size: 12px;color: #FF5B00; text-align: center;margin: auto;width: 355px;padding-top: 12px}
+   }
+
+
+/*移动*/
+
+@media screen and (max-width:768px){
+   #information{ padding-top: 27vw; }
+   footer{display: none;}
+   .head-top{height: 18.9vw;line-height: 25vw;color: #9aa5b5;margin: auto;}
+   .head-top div{display: inline-block;cursor: pointer}
+   .head-top div:nth-child(2){margin: 0px 4vw;}
+   .header-tabs .line{width: 5.3vw; height: 5.3vw;line-height: 5.3vw;display: inline-block;background: #9aa5b5; border-radius: 50%; color: #fff;font-size: 2.9vw;
+    text-align: center;position: relative;top: -6.7vw;right: -13.9vw}
+   .header-tabs.current{color: #FF5B00}
+   .header-tabs .line.linestyle{color: #fff;background: #FF5B00}
+   .forget-form{background: #fff;padding: 3.3vw;}
+   .formLine p{color: #627386;}
+   .formLine .business{overflow: hidden}
+   input[type="text"]::placeholder,textarea::placeholder{color: #9aa5b5;}
+   .form-upload-image{width: 36vw;height: 25.3vw;position: relative;}
+   .form-upload-image img{width: 100%;height: 100%}
+   .formLine .form-upload-image .mIcon:before {width: 5.3vw;height: 5.3vw;background-position: -89vw -8.3vw;transition: none;}
+   .formLine{overflow: hidden}
+   .formLine select[name="cityID"]{margin: 0 1.3vw}
+   .formLine .business .diyBox {margin-right: 3.4vw}
+   .formLine .diyBox.second {width: 26.7vw}
+   .formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 5.3vw;margin-bottom: 2.7vw}
+   .formLine .form-upload.list{width: 100%;}
+   .formLine .formLine-file{width: 36vw;height: 25.3vw;position: relative;float: left}
+   .formLine .form-upload-tips{width: 5.3vw;height: 25.3vw;float: left;position: relative;}
+   .formLine .form-upload-tips .icon{width: 5.3vw;height: 5.3vw;float: left;background: url("/img/base/icon.png") no-repeat;display: block;margin-top: 40px;}
+   .formLine .form-upload-tips .icon-wen{background-position: -84px -144px;cursor: pointer;}
+   .formLine .form-upload-tips .wen-tips{width: 48.5vw;height: 12.3vw;line-height: 12.3vw;text-align: center;color: #FFF;font-size: 3.4vw; background-color: #1890f9;box-shadow: 0px .8vw 1.6vw 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: -6.4vw;left: -.53vw;border-radius: .8vw;display: none;}
+   .formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 2vw;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -4vw;left: 1.3vw;}
+   .formLine .form-upload-tips:hover .wen-tips{display: block;}
+   .formLine .file{width: 36vw;height: 25.3vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+   .formLine .formLine-file .icon{width: 36vw;height:25.3vw;display: block;}
+   .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+   .formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
+   .formLine .formLine-file .file-logo{background: url("/img/account/icon-logo.png") no-repeat;}
+   .formLine .formLine-file .file-produce{background: url("/img/account/icon-produce.png") no-repeat;}
+   .formLine .formLine-file .file-health{background: url("/img/account/icon-health.png") no-repeat;}
+   .formLine .formLine-file .file-tax{background: url("/img/account/icon-tax.png") no-repeat;}
+   .formLine .formLine-file .file-honor{background: url("/img/account/icon-honor.png") no-repeat;}
+   .formLine .formLine-file .file-product{background: url("/img/account/icon-product.png") no-repeat;}
+   .formLine .list .form-upload-image{position: relative;float: left;margin: 0 2.7vw 2.7vw 0}
+   .formLine .form-upload-image .upload-img{width: 36vw;height:25.3vw;display: block;}
+   .formLine .form-upload-image .icon{width: 5.3vw;height: 5.3vw;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
+   .formLine .business{height:auto;position:relative}
+   .formLine .addbusiness{overflow: hidden}
+   .formLine .addbusiness input[type="text"] {width: 69.4vw;display: block;float: left;margin-right: 1.3vw;}
+   .formLine .addbusiness a {display: block;float: left;width: 21.4vw;height: 11vw;line-height: 11.2vw;font-size: 3.4vw;
+    color: #FF5B00; background-color: #ffe6dc; border-radius: .53vw;border: solid .27vw #FF5B00;text-align: center}
+   .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
+   .formLine.info textarea{margin: 0px}
+   .header{ width: 100%; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
+   .header .header-p{height: 16vw; line-height: 7vw; font-size: 3.1vw;color: #FF5B00; text-align: center;margin: auto;padding: 0 2.7vw}
+
+}

+ 40 - 39
src/main/resources/static/css/supplier-center/setting/password.css

@@ -1,39 +1,40 @@
-@charset "utf-8";
-li{list-style:none}
-/**
- *重置密码
- * PC端
- */
-@media screen and (min-width:768px){
-    body{background-color: #F5F5F5;}
-    footer .footTop{display:none;}
-    .navLayout{min-height: 705px;}
-    .signAccount{width:1184px;margin:20px auto;min-height: 458px;background-color: #FFFFFF;}
-    .signAccount .title{height:42px;line-height:42px;font-size:16px;color:#22272e;text-align:left;background-color: #F5F5F5;}
-    .forget-form{width:498px;margin:0 auto;padding: 20px 0;}
-    .right-header{width: 100%;height: 88px;box-sizing: border-box;float: left;padding:24px 316px;background-color: #FFF;}
-    .right-header .header-tabs{width: 168px;height: 38px;background-color: #f0f3f7;border-radius: 2px 0px 0px 2px;;line-height: 38px;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
-    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
-    .container{width: 100%;min-height:485px;box-sizing: border-box;padding: 16px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .formLine p{color: #627386}
-    input::placeholder{color: #9aa5b5;}
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    body{width:100%;height:100%;background-color: #ffffff;}
-    footer{display:none}
-    .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
-    .forget-form{padding:0;}
-    .signAccount form{width:93.4vw;margin:0 auto;}
-    .subLine{margin-top:2vw;float: left;width: 100%;}
-    .container form{padding: 0 2.7vw}
-    .formLine p{color: #627386}
-     input::placeholder{color: #9aa5b5}
-    .right-header{    width: 100%;box-sizing: border-box;padding: 0 3.3vw;}
-    .right-header .header-tabs{width: 46.7vw;height: 9.6vw;background-color: #f0f3f7;border-radius: .53vw 0px 0px .53vw;;line-height: 9.6vw;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
-    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
-    .mIcon.showPwd:before{width: 5.3vw;height: 5.3vw;background-position: -42vw -8vw;right: 8px;top: 12.5vw;position: absolute}
-}
+@charset "utf-8";
+li{list-style:none}
+/**
+ *重置密码
+ * PC端
+ */
+@media screen and (min-width:768px){
+    body{background-color: #F5F5F5;}
+    footer .footTop{display:none;}
+    .navLayout{min-height: 705px;}
+    .signAccount{width:1184px;margin:20px auto;min-height: 458px;background-color: #FFFFFF;}
+    .signAccount .title{height:42px;line-height:42px;font-size:16px;color:#22272e;text-align:left;background-color: #F5F5F5;}
+    .forget-form{width:498px;margin:0 auto;padding: 20px 0;}
+    .right-header{width: 100%;height: 88px;box-sizing: border-box;float: left;padding:24px 316px;background-color: #FFF;}
+    .right-header .header-tabs{width: 168px;height: 38px;background-color: #f0f3f7;border-radius: 2px 0px 0px 2px;;line-height: 38px;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
+    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
+    .container{width: 100%;min-height:485px;box-sizing: border-box;padding: 16px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .formLine p{color: #627386}
+    input::placeholder{color: #9aa5b5;}
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{width:100%;height:100%;background-color: #ffffff;}
+    footer{display:none}
+    #passwordPage{padding-top: 27vw;}
+    .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
+    .forget-form{padding:0;}
+    .signAccount form{width:93.4vw;margin:0 auto;}
+    .subLine{margin-top:2vw;float: left;width: 100%;}
+    .container form{padding: 0 2.7vw}
+    .formLine p{color: #627386}
+     input::placeholder{color: #9aa5b5}
+    .right-header{    width: 100%;box-sizing: border-box;padding:3.3vw;}
+    .right-header .header-tabs{width: 46.7vw;height: 9.6vw;background-color: #f0f3f7;border-radius: 5vw;line-height: 9.6vw;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
+    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
+    .mIcon.showPwd:before{width: 5.3vw;height: 5.3vw;background-position: -42vw -8vw;right: 8px;top: 12.5vw;position: absolute}
+}

+ 41 - 41
src/main/resources/static/css/supplier-center/setting/phone.css

@@ -1,41 +1,41 @@
-@charset "utf-8";
-li{list-style:none}
-/**
- *找回密码
- * PC端
- */
-@media screen and (min-width:768px){
-    body{background-color: #F5F5F5;}
-    footer .footTop{display:none;}
-    .navLayout{min-height: 648px;}
-    .signAccount{width:1184px;margin:20px auto;min-height: 458px;background-color: #FFFFFF;}
-    .signAccount .title{height:42px;line-height:42px;font-size:16px;color:#22272e;text-align:left;background-color: #F5F5F5;}
-    .forget-form{width:498px;margin:0 auto;padding: 20px 0;}
-    .header{width: 100%;height: 76px;box-sizing: border-box;padding: 20px 0;background-color: #FFFFFF;}
-    .header .header-p{width: 100%;height: 36px;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 36px;font-size: 14px;color:#FF5B00;text-align: center;}
-    .container{width: 100%;min-height:510px;box-sizing: border-box;padding:0 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .container .title{width: 100%;line-height: 36px;font-size: 14px;color: #627386;text-align: center;}
-    .container .title span{color: #f94b4b;}
-    input::placeholder{color: #9aa5b5;}
-    .formLine p {color: #627386;}
-
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    body{width:100%;height:100%;background-color: #ffffff;}
-    footer{display:none}
-    .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
-    .forget-form{padding:0;}
-    .signAccount form{width:93.4vw;margin:0 auto;}
-    .subLine{margin-top:2vw;float: left;width: 100%;}
-    .header{width: 100%;box-sizing: border-box;padding: 2.7vw 0;background-color: #FFFFFF;}
-    .header .header-p{width: 100%;height: 9.6vw;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 9.6vw;font-size: 3.1vw;color:#FF5B00;text-align: center;}
-    .container .title{color: #22272e;font-weight: bold;text-align: center;padding: 10.4vw 0}
-    .container form{padding: 0 2.7vw}
-    .container .title span{color: #f94b4b}
-    .formLine p{color: #627386}
-    input::placeholder{color: #9aa5b5}
-}
+@charset "utf-8";
+li{list-style:none}
+/**
+ *找回密码
+ * PC端
+ */
+@media screen and (min-width:768px){
+    body{background-color: #F5F5F5;}
+    footer .footTop{display:none;}
+    .navLayout{min-height: 648px;}
+    .signAccount{width:1184px;margin:20px auto;min-height: 458px;background-color: #FFFFFF;}
+    .signAccount .title{height:42px;line-height:42px;font-size:16px;color:#22272e;text-align:left;background-color: #F5F5F5;}
+    .forget-form{width:498px;margin:0 auto;padding: 20px 0;}
+    .header{width: 100%;height: 76px;box-sizing: border-box;padding: 20px 0;background-color: #FFFFFF;}
+    .header .header-p{width: 100%;height: 36px;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 36px;font-size: 14px;color: #FF5B00;text-align: center;}
+    .container{width: 100%;min-height:510px;box-sizing: border-box;padding:0 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .container .title{width: 100%;line-height: 36px;font-size: 14px;color: #22272E;text-align: center;}
+    .container .title span{color: #f94b4b;}
+    input::placeholder{color: #9aa5b5}
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{width:100%;height:100%;background-color: #ffffff;}
+    footer{display:none}
+    #phonePage{padding-top: 27vw;}
+    .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
+    .forget-form{padding:0;}
+    .signAccount form{width:93.4vw;margin:0 auto;}
+    .subLine{margin-top:2vw;float: left;width: 100%;}
+    .header{width: 100%;box-sizing: border-box;padding: 2.7vw 0;background-color: #FFFFFF;}
+    .header .header-p{width: 100%;height: 9.6vw;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 9.6vw;font-size: 3.1vw;color:#FF5B00;text-align: center;}
+    .container .title{color: #22272e;font-weight: bold;text-align: left;padding: 3vw; font-size: 3.4vw;}
+    .container form{padding: 0 2.7vw}
+    .container .title span{color: #f94b4b}
+    .formLine p{color: #627386}
+    input::placeholder{color: #9aa5b5}
+
+}

+ 1 - 0
src/main/resources/static/css/supplier-center/shop/goods.css

@@ -27,6 +27,7 @@ li{list-style: none}
 
 /*移动*/
  @media screen and (max-width:768px) {
+    #myGoods{ padding-top: 27vw; }
     table, td, th{border: none;}
     .head-top{padding: 3vw 0;background: #fff;}
     .head-top .form-row{margin:1.5vw 0;color: #627386;float: left;width: 50%;}

+ 1 - 0
src/main/resources/static/css/supplier-center/shop/release.css

@@ -194,6 +194,7 @@ div{box-sizing: border-box;}
 /*移动*/
 
 @media screen and (max-width:768px) {
+    #releaseContainer{ padding-top: 27vw; }
     .container .release-stepbox{height: 17.6vw;}
     .container .release-stepbox>div{float: left;    width: 20%;text-align: center;top: 9.3vw;position: relative;}
     .release-stepbox .stepSpan p{color: #9aa5b5}

+ 4 - 2
src/main/resources/templates/supplier-center/order/detail.html

@@ -150,11 +150,12 @@
                     </div>
                     <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
                         <div class="inner" style="text-align: right">
-                            <el-button @click="history.go(-1)">返回</el-button>
+                            <el-button @click="history.go(-1)" round>返回</el-button>
                             <el-button
                                     v-if="[11,12,21,22,31,32].indexOf(order.status)!=-1"
                                     type="primary"
                                     style="margin: 0 10px;"
+                                    round
                                     @click="handeleDropdown(1,order.shopOrderId)">
                                 发货
                             </el-button>
@@ -162,11 +163,12 @@
                                     v-if="[2,3].indexOf(order.sendOutStatus) !== -1"
                                     type="primary"
                                     style="margin: 0 10px;"
+                                    round
                                     @click="handeleDropdown(2,order.shopOrderId)">
                                 发货记录
                             </el-button>
                             <el-dropdown class="dropdown" trigger="click" placement="top">
-                                <el-button type="primary">操作</el-button>
+                                <el-button type="primary" round>操作</el-button>
                                 <el-dropdown-menu slot="dropdown" >
                                     <el-dropdown-item v-if="order.status === 0">
                                         <div @click="handeleDropdown(8,order.shopOrderId)">分享订单</div>

+ 1 - 1
src/main/resources/templates/supplier-center/order/order-return.html

@@ -95,7 +95,7 @@
                      <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'" v-if="[2,12,13,21,22,23,31,32,33].indexOf(order.status)!=-1" >
                         <div class="inner" style="text-align: right;">
                             本次退款金额:<span style="color: #F94B4B;">¥{{ order.receiptAmount | amountfilters }}</span>
-                            <el-button type="primary"  style="margin-left: 20px;" @click="handeleReturn(order.shopOrderId)">确认退款</el-button>
+                            <el-button type="primary"  style="margin-left: 20px;" @click="handeleReturn(order.shopOrderId)" round>确认退款</el-button>
                         </div>
                     </div>
                 </div>

+ 94 - 94
src/main/resources/templates/supplier-center/order/remarks-add.html

@@ -1,94 +1,94 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
-<head>
-  <title>采美365网-添加订单备注</title>
-  <template th:replace="components/head-link"></template>
-  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-  <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
-  <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
-  <link th:href="@{/css/supplier-center/order/remarks-add.css(v=${version})}" rel="stylesheet" type="text/css">
-  <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 我的采美 -->
-<div id="Voucher" v-cloak>
-  <div class="navLayout">
-    <div class="crumbs" v-if="isPC">
-      <span>我的交易</span>
-      <span>&gt;</span>
-      <span>我的订单</span>
-      <span>&gt;</span>
-      <span>上传支付凭证</span>
-    </div>
-    <div class="wrap clear">
-      <!--左侧面包屑-->
-      <template th:replace="supplier-center/components/tableft"></template>
-      <div class="right">
-        <div class="add-logistics">
-          <el-form ref="logisticFrom" :model="params" :rules="rules">
-            <el-form-item label="备注:" prop="remarks">
-              <el-input
-                      v-model="params.remarks"
-                      type="textarea"
-                      show-word-limit
-                      placeholder="请输入备注文字,200字以内"
-                      maxlength="200"
-                      :autosize="{ minRows: 5, maxRows: 6}">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="图片:" prop="logImage" style="margin-bottom: 0"></el-form-item>
-            <el-form-item label="" prop="logImage">
-              <div class="form-el-upload">
-                <el-upload
-                        :class="{hide: hideImg}"
-                        :action="actionUrl"
-                        :headers="getToken"
-                        list-type="picture-card"
-                        :before-upload="beforeUploadImg"
-                        :on-remove="handleRemove"
-                        :on-success="handleSuccess"
-                        :limit="5"
-                >
-                  <div slot="tip" class="el-upload__tip">请上传jgp,jpeg,png格式的图片,每张不超过5M</div>
-                  <i class="el-icon-plus"></i>
-                </el-upload>
-              </div>
-            </el-form-item>
-            <el-form-item label="文件:" class="fileUpload" style="margin-bottom: 0;">
-              <el-upload
-                      :action="fileUrl"
-                      :headers="getToken"
-                      :before-upload="beforeUploadFile"
-                      :on-remove="handlerFileRemove"
-                      :on-success="handleFileSuccess"
-                      :limit="5"
-              >
-                <div slot="tip" class="el-upload__tip">请上传pdf,doc,xlsx格式的文件,每个不超过5M</div>
-                <el-button v-if="!hideFile" size="small" type="primary">浏览</el-button>
-              </el-upload>
-            </el-form-item>
-            <el-form-item>
-              <div class="filter-container" style="text-align: right;margin-top: 120px;">
-                <el-button plain  style="width: 100px; margin: 0 10px;" @click="history.go(-1)">返回</el-button>
-                <el-button type="primary" style="width: 100px;margin: 0 10px;" @click="handleSave('logisticFrom')">保存</el-button>
-              </div>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript"th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/remarks-add.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+  <title>采美365网-添加订单备注</title>
+  <template th:replace="components/head-link"></template>
+  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+  <!--element ui 样式表-->
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
+  <link th:href="@{/css/supplier-center/order/remarks-add.css(v=${version})}" rel="stylesheet" type="text/css">
+  <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 我的采美 -->
+<div id="Voucher" v-cloak>
+  <div class="navLayout">
+    <div class="crumbs" v-if="isPC">
+      <span>我的交易</span>
+      <span>&gt;</span>
+      <span>我的订单</span>
+      <span>&gt;</span>
+      <span>添加订单备注</span>
+    </div>
+    <div class="wrap clear">
+      <!--左侧面包屑-->
+      <template th:replace="supplier-center/components/tableft"></template>
+      <div class="right">
+        <div class="add-logistics">
+          <el-form ref="logisticFrom" :model="params" :rules="rules">
+            <el-form-item label="备注:" prop="remarks">
+              <el-input
+                      v-model="params.remarks"
+                      type="textarea"
+                      show-word-limit
+                      placeholder="请输入备注文字,200字以内"
+                      maxlength="200"
+                      :autosize="{ minRows: 5, maxRows: 6}">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="图片:" prop="logImage" style="margin-bottom: 0"></el-form-item>
+            <el-form-item label="" prop="logImage">
+              <div class="form-el-upload">
+                <el-upload
+                        :class="{hide: hideImg}"
+                        :action="actionUrl"
+                        :headers="getToken"
+                        list-type="picture-card"
+                        :before-upload="beforeUploadImg"
+                        :on-remove="handleRemove"
+                        :on-success="handleSuccess"
+                        :limit="5"
+                >
+                  <div slot="tip" class="el-upload__tip">请上传jgp,jpeg,png格式的图片,每张不超过5M</div>
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </div>
+            </el-form-item>
+            <el-form-item label="文件:" class="fileUpload" style="margin-bottom: 0;">
+              <el-upload
+                      :action="fileUrl"
+                      :headers="getToken"
+                      :before-upload="beforeUploadFile"
+                      :on-remove="handlerFileRemove"
+                      :on-success="handleFileSuccess"
+                      :limit="5"
+              >
+                <div slot="tip" class="el-upload__tip">请上传pdf,doc,xlsx格式的文件,每个不超过5M</div>
+                <el-button v-if="!hideFile" size="small" type="primary" round>浏览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item>
+              <div class="filter-container" style="text-align: right;margin-top: 120px;">
+                <el-button plain  style="width: 100px; margin: 0 10px;" @click="history.go(-1)" round>返回</el-button>
+                <el-button type="primary" style="width: 100px;margin: 0 10px;" @click="handleSave('logisticFrom')" round>保存</el-button>
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/remarks-add.js(v=${version})}"></script>
+</body>
+</html>

+ 79 - 79
src/main/resources/templates/supplier-center/order/remarks-details.html

@@ -1,79 +1,79 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
-<head>
-  <title>采美365网-订单备注</title>
-  <template th:replace="components/head-link"></template>
-  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-  <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
-  <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
-  <link th:href="@{/css/supplier-center/order/remarks-details.css(v=${version})}" rel="stylesheet" type="text/css">
-  <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 我的采美 -->
-<div id="Voucher" v-cloak>
-  <div class="navLayout">
-    <div class="crumbs" v-if="isPC">
-      <span>我的交易</span>
-      <span>&gt;</span>
-      <span>我的订单</span>
-      <span>&gt;</span>
-      <span>上传支付凭证</span>
-    </div>
-    <div class="wrap clear">
-      <!--左侧面包屑-->
-      <template th:replace="supplier-center/components/tableft"></template>
-      <div class="right">
-        <div class="remarks-content">
-          <template v-if="remarksList.length > 0">
-            <div class="remarks-list" v-for="(remarks,index) in remarksList" :key="index" >
-              <div class="remarks-title">
-                <p class="name">{{ remarks.shopName }}</p>
-                <p class="time">{{ remarks.time }}</p>
-              </div>
-              <div class="remarks-label">备注内容:</div>
-              <div class="remarks-text">{{ remarks.remarks }}</div>
-              <template v-if="remarks.images">
-                <div class="remarks-label">图片:</div>
-                <div class="remarks-img">
-                  <a :href="imgs" v-for="(imgs,imgIndex) in remarks.images" target="_blank">
-                    <img class="imgs" :src="imgs" >
-                  </a>
-                </div>
-              </template>
-              <template v-if="remarks.ossFiles">
-                <div class="remarks-label">文件:</div>
-                <div class="remarks-file">
-                  <div v-for="file, i in remarks.ossFiles" :key="i">
-                    <span class="text">{{ file.name }}</span>
-                    <el-button type="text" @click="handlerDownload(file)">下载</el-button>
-                  </div>
-                </div>
-              </template>
-            </div>
-          </template>
-          <div class="empty" v-else>
-            <img src="/img/common/empty.png">
-          </div>
-          <div class="filter-container" style="text-align: right;margin-top: 20px;">
-            <el-button plain  style="margin: 0 10px;" @click="history.go(-1)">返回</el-button>
-            <el-button type="primary" style="margin: 0 10px;" @click="handleSaveRemark">添加备注</el-button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript"th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/remarks-details.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+  <title>采美365网-订单备注</title>
+  <template th:replace="components/head-link"></template>
+  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+  <!--element ui 样式表-->
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
+  <link th:href="@{/css/supplier-center/order/remarks-details.css(v=${version})}" rel="stylesheet" type="text/css">
+  <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 我的采美 -->
+<div id="Voucher" v-cloak>
+  <div class="navLayout">
+    <div class="crumbs" v-if="isPC">
+      <span>我的交易</span>
+      <span>&gt;</span>
+      <span>我的订单</span>
+      <span>&gt;</span>
+      <span>订单备注</span>
+    </div>
+    <div class="wrap clear">
+      <!--左侧面包屑-->
+      <template th:replace="supplier-center/components/tableft"></template>
+      <div class="right">
+        <div class="remarks-content">
+          <template v-if="remarksList.length > 0">
+            <div class="remarks-list" v-for="(remarks,index) in remarksList" :key="index" >
+              <div class="remarks-title">
+                <p class="name">{{ remarks.shopName }}</p>
+                <p class="time">{{ remarks.time }}</p>
+              </div>
+              <div class="remarks-label">备注内容:</div>
+              <div class="remarks-text">{{ remarks.remarks }}</div>
+              <template v-if="remarks.images">
+                <div class="remarks-label">图片:</div>
+                <div class="remarks-img">
+                  <a :href="imgs" v-for="(imgs,imgIndex) in remarks.images" target="_blank">
+                    <img class="imgs" :src="imgs" >
+                  </a>
+                </div>
+              </template>
+              <template v-if="remarks.ossFiles">
+                <div class="remarks-label">文件:</div>
+                <div class="remarks-file">
+                  <div v-for="file, i in remarks.ossFiles" :key="i">
+                    <span class="text">{{ file.name }}</span>
+                    <el-button type="text" @click="handlerDownload(file)">下载</el-button>
+                  </div>
+                </div>
+              </template>
+            </div>
+          </template>
+          <div class="empty" v-else>
+            <img src="/img/common/empty.png">
+          </div>
+          <div class="filter-container" style="text-align: right;margin-top: 20px;">
+            <el-button plain  style="margin: 0 10px;" @click="history.go(-1)" round>返回</el-button>
+            <el-button type="primary" style="margin: 0 10px;" @click="handleSaveRemark" round>添加备注</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/remarks-details.js(v=${version})}"></script>
+</body>
+</html>

+ 207 - 207
src/main/resources/templates/supplier-center/order/settlement.html

@@ -1,207 +1,207 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
-<head>
-    <title>采美365网</title>
-    <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/supplier-center/order/settlement.css(v=${version})}" rel="stylesheet" type="text/css">
-    <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
-    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
-    <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-
-<!-- 我的采美 -->
-<div id="settlement">
-    <div class="navLayout" v-cloak>
-         <div class="crumbs" v-if="isPC">
-            <span>我的店铺</span>
-            <span>&gt;</span>
-            <span>结算管理</span>
-        </div>
-        <div class="wrap clear">
-             <!--左侧面包屑-->
-            <template th:replace="supplier-center/components/tableft"></template>
-            <div class="right">
-                <div class="head-top clear">
-                    <div class='form-row low'>
-                        <span v-if="isPC">订单编号:</span>
-                        <el-input
-                                v-model="listQuery.shopOrderNo"
-                                class="state"
-                                placeholder="请输入订单编号"
-                                clearable
-                                @keyup.enter.native="getList"
-                                @clear="getList"
-                        ></el-input>
-                    </div>
-                    <div class='form-row low'>
-                        <span v-if="isPC">买家名称:</span>
-                        <el-input
-                                v-model="listQuery.name"
-                                class="state"
-                                placeholder="请输入买家名称"
-                                clearable
-                                @keyup.enter.native="getList"
-                                @clear="getList"
-                        ></el-input>
-                    </div>
-                    <div class="form-row">
-                        <span v-if="isPC">结算状态:</span>
-                        <el-select v-model="listQuery.payStatus" class="state" clearable @change="getList">
-                            <el-option label="所有" value="" ></el-option>
-                            <el-option label="待结算" value="1"></el-option>
-                            <el-option label="部分结算" value="2"></el-option>
-                            <el-option label="已结算" value="3"></el-option>
-                        </el-select>
-                    </div>
-                    <div class="form-row">
-                        <span v-if="isPC">退款状态:</span>
-                        <el-select v-model="listQuery.refundStatus" class="state" clearable @change="getList">
-                            <el-option label="所有" value="" ></el-option>
-                            <el-option label="无退款" value="1"></el-option>
-                            <el-option label="部分退款" value="2"></el-option>
-                            <el-option label="已退款" value="3"></el-option>
-                        </el-select>
-                    </div>
-                    <div class="form-row time">
-                        <span v-if="isPC">下单时间:</span>
-                        <el-date-picker
-                                class="time"
-                                v-model="listQuery.beginTime"
-                                type="date"
-                                format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择开始日期">
-                        </el-date-picker>
-                        至
-                        <el-date-picker
-                                class="time"
-                                v-model="listQuery.endTime"
-                                type="date"
-                                format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择结束日期">
-                        </el-date-picker>
-                    </div>
-                    <div id="newBtn">
-                        <el-button type="primary" @click="getList">查询</el-button>
-                        <el-button type="success" :disabled="disabled"  @click="downloadExportExcel">导出报表</el-button>
-                    </div>
-                </div>
-                <div class="main-content" v-if="list.length>0">
-                    <el-table
-                            :data="list"
-                            v-loading="listLoading"
-                            element-loading-text="Loading"
-                            border
-                            fit
-                            height="600px"
-                            highlight-current-row
-                            :header-cell-style="{background:'#E1E1E1',color:'#606266'}"
-                    >
-                        <el-table-column label="订单编号" align="center" prop="shopOrderNo" width="200"  fixed="left">
-                            <template slot-scope="{row}">
-                                {{ row.shopOrderNo}}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="下单时间" align="center" prop="orderTime" width="200">
-                            <template slot-scope="{row}">
-                                {{ row.orderTime}}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="买家" align="center" prop="name" width="200">
-                            <template slot-scope="{row}">
-                                {{ row.name}}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品信息" align="center" prop="status" width="250">
-                            <template slot-scope="{row}">
-                                <p v-for="item in row.orderProductList">{{ item.name }}</p>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="订单金额" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.totalAmount | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="退款状态" align="center" prop="refundType" width="120">
-                            <template slot-scope="{row}">
-                                <el-tag v-if="row.refundStatus*1===1" type="info" size="small">无退款</el-tag>
-                                <el-tag v-else-if="row.refundStatus*1===2" type="warning" size="small">部分退款</el-tag>
-                                <el-tag v-else-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="退款金额" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.refundAmount | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="收款手续费" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.paymentCommission | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="结算手续费" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.prorateCommission | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="结算状态" align="center" prop="receiptStatus" width="120">
-                            <template slot-scope="{row}">
-                                <el-tag v-if="row.settlestatus*1===1" type="danger" size="small">待结算</el-tag>
-                                <el-tag v-if="row.settlestatus*1===2" type="warning" size="small">部分结算</el-tag>
-                                <el-tag v-if="row.settlestatus*1===3" type="success" size="small">已结算</el-tag>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="总结算金额" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.shouldPayShopAmount | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="已结算金额" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ row.settleAmount  | NumFormat }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="未结算金额" align="center" prop="payTotalFee" width="200">
-                            <template slot-scope="{row}">
-                                ¥{{ (row.shouldPayShopAmount - row.settleAmount) | NumFormat }}
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-                <div v-else class="empty">
-                    <img src="/img/order/icon-set.svg"/>
-                    <div class="msg"><p>暂无数据</p></div>
-                </div>
-                <div class="pagination">
-                    <el-pagination
-                            background
-                            :small="false"
-                            @current-change="handleCurrentChange"
-                            :current-page="listQuery.pageNum"
-                            :page-size="listQuery.pageSize"
-                            :layout="layout"
-                            :total="total"
-                    >
-                    </el-pagination>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/settlement.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美365网</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/settlement.css(v=${version})}" rel="stylesheet" type="text/css">
+    <!--element ui 样式表-->
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div id="settlement">
+    <div class="navLayout" v-cloak>
+         <div class="crumbs" v-if="isPC">
+            <span>我的店铺</span>
+            <span>&gt;</span>
+            <span>结算管理</span>
+        </div>
+        <div class="wrap clear">
+             <!--左侧面包屑-->
+            <template th:replace="supplier-center/components/tableft"></template>
+            <div class="right">
+                <div class="head-top clear">
+                    <div class='form-row low'>
+                        <span v-if="isPC">订单编号:</span>
+                        <el-input
+                                v-model="listQuery.shopOrderNo"
+                                class="state"
+                                placeholder="请输入订单编号"
+                                clearable
+                                @keyup.enter.native="getList"
+                                @clear="getList"
+                        ></el-input>
+                    </div>
+                    <div class='form-row low'>
+                        <span v-if="isPC">买家名称:</span>
+                        <el-input
+                                v-model="listQuery.name"
+                                class="state"
+                                placeholder="请输入买家名称"
+                                clearable
+                                @keyup.enter.native="getList"
+                                @clear="getList"
+                        ></el-input>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">结算状态:</span>
+                        <el-select v-model="listQuery.payStatus" class="state" clearable @change="getList">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="待结算" value="1"></el-option>
+                            <el-option label="部分结算" value="2"></el-option>
+                            <el-option label="已结算" value="3"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">退款状态:</span>
+                        <el-select v-model="listQuery.refundStatus" class="state" clearable @change="getList">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="无退款" value="1"></el-option>
+                            <el-option label="部分退款" value="2"></el-option>
+                            <el-option label="已退款" value="3"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row time">
+                        <span v-if="isPC">下单时间:</span>
+                        <el-date-picker
+                                class="time"
+                                v-model="listQuery.beginTime"
+                                type="date"
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"
+                                placeholder="选择开始日期">
+                        </el-date-picker>
+                        至
+                        <el-date-picker
+                                class="time"
+                                v-model="listQuery.endTime"
+                                type="date"
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"
+                                placeholder="选择结束日期">
+                        </el-date-picker>
+                    </div>
+                    <div id="newBtn">
+                        <el-button type="primary" @click="getList" round>查询</el-button>
+                        <el-button type="success" :disabled="disabled"  @click="downloadExportExcel" round>导出报表</el-button>
+                    </div>
+                </div>
+                <div class="main-content" v-if="list.length>0">
+                    <el-table
+                            :data="list"
+                            v-loading="listLoading"
+                            element-loading-text="Loading"
+                            border
+                            fit
+                            height="600px"
+                            highlight-current-row
+                            :header-cell-style="{background:'#E1E1E1',color:'#606266'}"
+                    >
+                        <el-table-column label="订单编号" align="center" prop="shopOrderNo" width="200"  fixed="left">
+                            <template slot-scope="{row}">
+                                {{ row.shopOrderNo}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="下单时间" align="center" prop="orderTime" width="200">
+                            <template slot-scope="{row}">
+                                {{ row.orderTime}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="买家" align="center" prop="name" width="200">
+                            <template slot-scope="{row}">
+                                {{ row.name}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品信息" align="center" prop="status" width="250">
+                            <template slot-scope="{row}">
+                                <p v-for="item in row.orderProductList">{{ item.name }}</p>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="订单金额" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.totalAmount | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="退款状态" align="center" prop="refundType" width="120">
+                            <template slot-scope="{row}">
+                                <el-tag v-if="row.refundStatus*1===1" type="info" size="small">无退款</el-tag>
+                                <el-tag v-else-if="row.refundStatus*1===2" type="warning" size="small">部分退款</el-tag>
+                                <el-tag v-else-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="退款金额" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.refundAmount | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="收款手续费" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.paymentCommission | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算手续费" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.prorateCommission | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算状态" align="center" prop="receiptStatus" width="120">
+                            <template slot-scope="{row}">
+                                <el-tag v-if="row.settlestatus*1===1" type="danger" size="small">待结算</el-tag>
+                                <el-tag v-if="row.settlestatus*1===2" type="warning" size="small">部分结算</el-tag>
+                                <el-tag v-if="row.settlestatus*1===3" type="success" size="small">已结算</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="总结算金额" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.shouldPayShopAmount | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="已结算金额" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ row.settleAmount  | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="未结算金额" align="center" prop="payTotalFee" width="200">
+                            <template slot-scope="{row}">
+                                ¥{{ (row.shouldPayShopAmount - row.settleAmount) | NumFormat }}
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div v-else class="empty">
+                    <img src="/img/order/icon-set.svg"/>
+                    <div class="msg"><p>暂无数据</p></div>
+                </div>
+                <div class="pagination">
+                    <el-pagination
+                            background
+                            :small="false"
+                            @current-change="handleCurrentChange"
+                            :current-page="listQuery.pageNum"
+                            :page-size="listQuery.pageSize"
+                            :layout="layout"
+                            :total="total"
+                    >
+                    </el-pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/settlement.js(v=${version})}"></script>
+</body>
+</html>

+ 2 - 2
src/main/resources/templates/supplier-center/shop/goods.html

@@ -133,8 +133,8 @@
                         </el-select>
                     </div>
                     <div id="newBtn">
-                        <el-button type="primary" @click="getList">查询</el-button>
-                        <el-button type="primary" :disabled="disabled"  @click="handleDownshelfAll">批量下架</el-button>
+                        <el-button type="primary" @click="getList" round>查询</el-button>
+                        <el-button type="primary" :disabled="disabled"  @click="handleDownshelfAll" round>批量下架</el-button>
                     </div>
                 </div>
                 <div class="goods-tips" v-if="isForbid">