zhengjinyi 1 год назад
Родитель
Сommit
eff3850c18
29 измененных файлов с 1323 добавлено и 1288 удалено
  1. 1 1
      src/main/resources/static/css/base/base.h5.css
  2. 1 1
      src/main/resources/static/css/base/base.pc.css
  3. 125 122
      src/main/resources/static/css/pay/caimei-paylist.css
  4. 2 2
      src/main/resources/static/css/product/detail.h5.css
  5. 1 1
      src/main/resources/static/css/product/detail.pc.css
  6. 69 69
      src/main/resources/static/css/supplier-center/order/delivery.css
  7. 116 116
      src/main/resources/static/css/supplier-center/order/logistics.css
  8. 3 3
      src/main/resources/static/css/supplier/index.css
  9. 22 22
      src/main/resources/static/css/user-center/account/account.css
  10. 6 4
      src/main/resources/static/css/user-center/account/beans.css
  11. 5 4
      src/main/resources/static/css/user-center/account/cards.css
  12. 77 74
      src/main/resources/static/css/user-center/account/coupon.css
  13. 3 0
      src/main/resources/static/css/user-center/address/list.css
  14. 15 12
      src/main/resources/static/css/user-center/dashboard.css
  15. 107 104
      src/main/resources/static/css/user-center/member/member-page.css
  16. 95 91
      src/main/resources/static/css/user-center/member/member-record.css
  17. 1 0
      src/main/resources/static/css/user-center/message.css
  18. 5 3
      src/main/resources/static/css/user-center/operation/list.css
  19. 203 201
      src/main/resources/static/css/user-center/order/detail.css
  20. 2 1
      src/main/resources/static/css/user-center/order/orderlist.css
  21. 48 46
      src/main/resources/static/css/user-center/order/remarks-add-pay.css
  22. 5 2
      src/main/resources/static/css/user-center/repair/list.css
  23. 69 68
      src/main/resources/static/css/user-center/setting/information.css
  24. 38 37
      src/main/resources/static/css/user-center/setting/password.css
  25. 41 40
      src/main/resources/static/css/user-center/setting/phone.css
  26. 0 1
      src/main/resources/static/js/mixins/cmSysMixins.js
  27. 3 3
      src/main/resources/templates/supplier-center/order/list.html
  28. 180 180
      src/main/resources/templates/user-center/order/list.html
  29. 80 80
      src/main/resources/templates/user-center/order/remarks-add-pay.html

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

@@ -272,7 +272,7 @@
 .cmbeans-alert-image{width: 87.2vw;height: 68.6vw;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;}
 .cmbeans-alert-image img{width: 87.2vw;height: 68.6vw;display: block;}
 .cmbeans-alert-image .mIcon{width:8vw;height:8vw;display: block;position: absolute;top: 45px;right: -3px;cursor: pointer;}
-.cmbeans-alert-image .mIcon:before{width:8vw;height:8vw;background-position:-34.1vw -77.9vw;}
+.cmbeans-alert-image .mIcon:before{width:8vw;height:8vw;background-position:-36.1vw -78.9vw;}
 .cmbeans-alert-content{width: 71vw;height: 92vw;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;padding-top: 54.6vw;background-size: cover;}
 .cmbeans-alert-content .mIcon{width:8vw;height:8vw;display: block;position: absolute;top: 45px;right: -35px;cursor: pointer;}
 .cmbeans-alert-content .mIcon:before{width:8vw;height:8vw;background-position:-34.1vw -77.9vw;}

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

@@ -94,7 +94,7 @@ iframe{width:320px !important;height: 280px !important}
 .baseHeadTop li.headmsg .msg-btn:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:1px 1px;margin-right:2px}
 .baseHeadTop li.headmsg .msg-btn em{color:#FF5B00;font-style:normal;margin-left:4px;}
 
-.baseHeadTop .cartData{display:none;position:absolute;right:0;top:40px;width:360px;box-sizing:border-box;background:#FFF;z-index:999;box-shadow:0px 3px 6px rgba(45,48,54,0.2);border-radius:8px}
+.baseHeadTop .cartData{display:none;position:absolute;right:0;top:40px;width:360px;box-sizing:border-box;background:#FFF;z-index:999;box-shadow:0px 3px 6px rgba(45,48,54,0.2);border-radius:8px;overflow: hidden;}
 .baseHeadTop .cartData .empty{padding:72px 10px;text-align:center;font-size:16px;line-height:26px;}
 .baseHeadTop .cartData .empty a{color:#FF5B00;margin:0 5px;border-bottom:1px solid #FF5B00}
 .baseHeadTop .cartData .empty img{display:block;margin:0 auto 28px auto;width:160px;height:136px}

+ 125 - 122
src/main/resources/static/css/pay/caimei-paylist.css

@@ -1,122 +1,125 @@
-/**
- * PC端
- */
-@media screen and (min-width:768px){
-    .pay-container {width: 100%;min-height: 436px;position: relative;margin-bottom: 60px;}
-    .pay-container .container{opacity:0;}
-    .pay-container .container.active{opacity: 1;}
-    .pay-content{width: 1184px;margin: 0 auto;height: 436px;box-sizing: border-box;}
-    .pay-content .pay-title{width: 100%;height: 52px;box-sizing: border-box;padding: 12px 0}
-    .pay-content .pay-title-le{float: left;line-height: 28px;font-size: 16px;color: #333333;font-weight: bold;}
-    .pay-content .pay-title-le span{line-height: 28px;font-size: 14px;color: #FF5B00;font-weight: normal;}
-    .pay-content .pay-title-btn{float: right;padding: 0 10px;background: #1890F9;height: 28px;line-height: 28px;text-align: center;border-radius: 4px;font-size: 12px;color: #FFFFFF;cursor: pointer;}
-    .pay-list-title{width: 100%;height: 56px;background-color: #FFFFFF;padding: 0 16px;box-sizing: border-box;margin-bottom: 10px;}
-    .pay-list-title .pay-list-view{float: left;line-height: 56px;font-size: 14px;color: #627386;text-align: left;}
-    .pay-list-title .pay-list-view.t1{width: 40%;}
-    .pay-list-title .pay-list-view.t2{width: 20%;}
-    .pay-list-title .pay-list-view.t3{width: 15%;}
-    .pay-list-title .pay-list-view.t4{width: 10%;}
-    .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 0 16px 20px 16px;background-color: #FFFFFF;margin-bottom: 10px;}
-    .pay-list-cell .list-cell-title{width: 100%;height:60px;box-sizing: border-box;padding:10px 0;border-bottom: 1px solid #E1E1E1;}
-    .pay-list-cell .list-cell-title .list-cell-logo{width: 40px;height: 40px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
-    .pay-list-cell .list-cell-title .list-cell-logo img{width: 39px;height: 39px;display: block;}
-    .pay-list-cell .list-cell-title .list-cell-name {float: left;margin-left: 16px;line-height: 40px;font-size: 16px;color: #333333;}
-    .pay-list-cell .list-cell-content{width: 100%;height: 134px;box-sizing: border-box;padding: 17px 0;}
-    .pay-list-cell .list-cell-pros{float: left;}
-    .pay-list-cell .list-cell-pros.p1{width: 40%;}
-    .pay-list-cell .list-cell-pros.p2{width: 20%;}
-    .pay-list-cell .list-cell-pros.p3{width: 15%;}
-    .pay-list-cell .list-cell-pros.p4{width: 10%;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 100px;height: 100px;float: left;margin-right: 16px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;position: relative;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image .tip{position:absolute;background:#ff4500;line-height:20px;height:20px;padding:0 10px;white-space:nowrap;font-size:12px;color:#FFF;top:0;left:0}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 300px;float: left;height: 100px;box-sizing: border-box;padding:30px 0;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-name p{width: 100%;font-size: 16px;line-height: 20px;color: #22272E;text-align: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
-    .pay-list-cell .list-cell-pros.p2,.pay-list-cell .list-cell-pros.p3,.pay-list-cell .list-cell-pros.p4{font-size: 16px;line-height: 100px;color: #22272E;text-align: left;}
-    .pay-list-cell .list-cell-button{height: 36px;margin-top:5px;float: right;}
-    .pay-list-cell .list-cell-button .list-cell-vleft {float: right;}
-    .pay-list-cell .list-cell-button .list-cell-btn{width: 90px;height: 36px;float: right;border-radius: 2px;line-height: 36px;font-size: 14px;text-align: center;background-color: #FF5B00;color: #FFFFFF;margin-left: 40px;cursor: pointer;}
-
-    .pay-list-cell .list-cell-button .list-cell-btn:hover{background-color: rgba(225,86,22,0.9);}
-
-    .pay-list-cell .list-cell-button .list-cell-msg{float: right;margin-left: 40px;line-height: 36px;font-size: 16px;color: #22272E;}
-    .pay-list-cell .list-cell-button .list-cell-msg span{font-weight: bold;}
-    .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
-
-    /*  弹窗  */
-    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;opacity: 0;}
-    .pay-alert-content.show{opacity: 1;}
-    .pay-alert-content .pay-big-alert{width: 440px;height: 402px;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
-    .pay-alert-content .pay-big-alert .title{width: 100%;height: 48px;box-sizing: border-box;font-size: 14px;line-height: 48px;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 14px;}
-    .pay-alert-content .pay-big-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-312px 0 no-repeat;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content{width: 100%;height: 225px;line-height: 24px;float: left;padding: 16px;box-sizing: border-box;}
-    .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
-    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 34px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 30px;}
-    .pay-alert-content .pay-big-alert .content-viw.none{text-align: center;}
-    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 132px;height: 132px;margin: 0 auto;display: block;}
-    .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
-    .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
-    .pay-alert-content .pay-big-alert .content-viw span.none{color: #999999;}
-    .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:20px;display:inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 64px;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 10px 16px;margin-top: 20px;}
-    .pay-alert-content .pay-big-alert .content-bot p{line-height: 22px;font-size: 14px;color: #666666;}
-
-
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    .pay-container {width: 100%;min-height: 40vw;position: relative;margin-bottom: 2vw;}
-    .pay-container .container{opacity:0;}
-    .pay-container .container.active{opacity: 1;}
-    .pay-content{width: 100%;margin: 0 auto;height: auto;box-sizing: border-box;}
-    .pay-content .pay-title{width: 100%;height: auto;box-sizing: border-box;padding:4vw 3.5vw;background-color: #FFFFFF;margin-bottom: 2vw;}
-    .pay-content .pay-title-t{width: 100%;line-height: 6vw;font-size: 3.4vw;color: #333333;font-weight: bold;}
-    .pay-content .pay-title-p{line-height: 4vw;font-size: 3vw;color: #FF5B00;font-weight: normal;}
-    .pay-content .pay-title-btn{width: 40vw;background: #1890F9;height: 11.2vw;line-height:11.2vw;text-align: center;font-size: 3.4vw;color: #FFFFFF;margin: 0 auto;margin-top: 5vw;}
-    .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 3.2vw;background-color: #FFFFFF;margin-bottom: 2vw;position: relative;}
-    .pay-list-cell .list-cell-title{width: 100%;height:12.8vw;box-sizing: border-box;padding:2.4vw 0;border-bottom: 1px solid #E1E1E1;}
-    .pay-list-cell .list-cell-title .list-cell-logo{width: 6.4vw;height: 6.4vw;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
-    .pay-list-cell .list-cell-title .list-cell-logo img{width: 100%;height: 100%;display: block;}
-    .pay-list-cell .list-cell-title .list-cell-name {float: left;margin-left:3vw;line-height: 6.4vw;font-size: 3.4vw;color: #333333;}
-    .pay-list-cell .list-cell-content{width: 100%;height: auto;box-sizing: border-box;padding: 2.4vw 0;}
-    .pay-list-cell .list-cell-pros{float: left;}
-    .pay-list-cell .list-cell-pros.p1{width: 100%;}
-    .pay-list-cell .list-cell-pros.p2,.pay-list-cell .list-cell-pros.p3,.pay-list-cell .list-cell-pros.p4{width: 33.33%;margin-top: 4vw;font-size: 3.4VW;line-height: 4vw;color: #22272E;text-align: left;}
-    .pay-list-cell .list-cell-pros.p2 span,.pay-list-cell .list-cell-pros.p3 span,.pay-list-cell .list-cell-pros.p4 span{font-size: 3vw;color: #627386;margin-bottom: 1vw;}
-    .pay-list-cell .list-cell-pros.p2 p,.pay-list-cell .list-cell-pros.p3 p,.pay-list-cell .list-cell-pros.p4 p{margin-top: 2vw;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 15vw;height: 15vw;float: left;margin-right: 2.6vw;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;position: relative;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image .tip{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}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 75vw;float: left;height: 15vw;box-sizing: border-box;padding:3vw 0;}
-    .pay-list-cell .list-cell-pros.p1 .cell-pros-name p{width: 100%;font-size: 3.4vw;line-height: 4vw;color: #22272E;text-align: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
-    .pay-list-cell .list-cell-button{width: 100%;height: 9.6vw;}
-    .pay-list-cell .list-cell-button .list-cell-vleft {float: right;}
-    .pay-list-cell .list-cell-button .list-cell-vleft.btn{width: 100%;}
-    .pay-list-cell .list-cell-button .list-cell-btn{width: 22.4vw;height: 9.6vw;float: right;border-radius: 2px;line-height: 9.6vw;font-size: 3.4vw;text-align: center;background-color: #FF5B00;color: #FFFFFF;margin-left: 40px;cursor: pointer;}
-    .pay-list-cell .list-cell-button .list-cell-btn:hover{background-color: rgba(225,86,22,0.9);}
-    .pay-list-cell .list-cell-button .list-cell-msg{float: left;line-height: 9.6vw;font-size: 3.4vw;color: #22272E;margin-right: 2vw;}
-    .pay-list-cell .list-cell-button .list-cell-msg span{font-weight: bold;}
-    .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
-
-    /*  弹窗  */
-    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.6);z-index: 9999;opacity: 0;}
-    .pay-alert-content.show{opacity: 1;}
-    .pay-alert-content .pay-big-alert{width: 74.8vw;height: 83.6vw;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
-    .pay-alert-content .pay-big-alert .title{width: 100%;height: 11vw;box-sizing: border-box;font-size: 3.6vw;line-height: 11vw;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 3.4vw;}
-    .pay-alert-content .pay-big-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-312px 0 no-repeat;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content{width: 100%;height: auto;line-height: 8vw;float: left;padding: 4vw;box-sizing: border-box;}
-    .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
-    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 8vw;font-weight: bold;font-size: 3.4vw;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 0;}
-    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 27.2vw;height: 27.2vw;margin: 0 auto;display: block;}
-    .pay-alert-content .pay-big-alert .content-viw.none{text-align: center;}
-    .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
-    .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
-    .pay-alert-content .pay-big-alert .content-viw span.none{color: #999999;}
-    .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:4vw;display:inline-block;width: 12.4vw;height: 5.2vw;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 5.2vw;text-align: center;font-size: 3vw;color: #FFF;margin-top: 6px;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 16vw;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 2.8vw;margin-top: 4vw;}
-    .pay-alert-content .pay-big-alert .content-bot p{line-height: 5vw;font-size:2.8vw;color: #666666;}
-
-}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .pay-container {width: 100%;min-height: 436px;position: relative;margin-bottom: 60px;}
+    .pay-container .container{opacity:0;}
+    .pay-container .container.active{opacity: 1;}
+    .pay-content{width: 1184px;margin: 0 auto;height: 436px;box-sizing: border-box;}
+    .pay-content .pay-title{width: 100%;height: 52px;box-sizing: border-box;padding: 12px 0}
+    .pay-content .pay-title-le{float: left;line-height: 28px;font-size: 16px;color: #333333;font-weight: bold;}
+    .pay-content .pay-title-le span{line-height: 28px;font-size: 14px;color: #FF5B00;font-weight: normal;}
+    .pay-content .pay-title-btn{float: right;padding: 0 10px;background: #1890F9;height: 28px;line-height: 28px;text-align: center;border-radius: 4px;font-size: 12px;color: #FFFFFF;cursor: pointer;}
+    .pay-list-title{width: 100%;height: 56px;background-color: #FFFFFF;padding: 0 16px;box-sizing: border-box;margin-bottom: 10px;}
+    .pay-list-title .pay-list-view{float: left;line-height: 56px;font-size: 14px;color: #627386;text-align: left;}
+    .pay-list-title .pay-list-view.t1{width: 40%;}
+    .pay-list-title .pay-list-view.t2{width: 20%;}
+    .pay-list-title .pay-list-view.t3{width: 15%;}
+    .pay-list-title .pay-list-view.t4{width: 10%;}
+    .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 0 16px 20px 16px;background-color: #FFFFFF;margin-bottom: 10px;}
+    .pay-list-cell .list-cell-title{width: 100%;height:60px;box-sizing: border-box;padding:10px 0;border-bottom: 1px solid #E1E1E1;}
+    .pay-list-cell .list-cell-title .list-cell-logo{width: 40px;height: 40px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
+    .pay-list-cell .list-cell-title .list-cell-logo img{width: 39px;height: 39px;display: block;}
+    .pay-list-cell .list-cell-title .list-cell-name {float: left;margin-left: 16px;line-height: 40px;font-size: 16px;color: #333333;}
+    .pay-list-cell .list-cell-content{width: 100%;height: 134px;box-sizing: border-box;padding: 17px 0;}
+    .pay-list-cell .list-cell-pros{float: left;}
+    .pay-list-cell .list-cell-pros.p1{width: 40%;}
+    .pay-list-cell .list-cell-pros.p2{width: 20%;}
+    .pay-list-cell .list-cell-pros.p3{width: 15%;}
+    .pay-list-cell .list-cell-pros.p4{width: 10%;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 100px;height: 100px;float: left;margin-right: 16px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;position: relative;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image .tip{position:absolute;background:#ff4500;line-height:20px;height:20px;padding:0 10px;white-space:nowrap;font-size:12px;color:#FFF;top:0;left:0}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 300px;float: left;height: 100px;box-sizing: border-box;padding:30px 0;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name p{width: 100%;font-size: 16px;line-height: 20px;color: #22272E;text-align: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+    .pay-list-cell .list-cell-pros.p2,.pay-list-cell .list-cell-pros.p3,.pay-list-cell .list-cell-pros.p4{font-size: 16px;line-height: 100px;color: #22272E;text-align: left;}
+    .pay-list-cell .list-cell-button{height: 36px;margin-top:5px;float: right;}
+    .pay-list-cell .list-cell-button .list-cell-vleft {float: right;}
+    .pay-list-cell .list-cell-button .list-cell-btn{width: 90px;height: 36px;float: right;border-radius: 2px;line-height: 36px;font-size: 14px;text-align: center;background-color: #FF5B00;color: #FFFFFF;margin-left: 40px;cursor: pointer;}
+
+    .pay-list-cell .list-cell-button .list-cell-btn:hover{background-color: rgba(225,86,22,0.9);}
+
+    .pay-list-cell .list-cell-button .list-cell-msg{float: right;margin-left: 40px;line-height: 36px;font-size: 16px;color: #22272E;}
+    .pay-list-cell .list-cell-button .list-cell-msg span{font-weight: bold;}
+    .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
+
+    /*  弹窗  */
+    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;opacity: 0;}
+    .pay-alert-content.show{opacity: 1;}
+    .pay-alert-content .pay-big-alert{width: 440px;height: 402px;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
+    .pay-alert-content .pay-big-alert .title{width: 100%;height: 48px;box-sizing: border-box;font-size: 14px;line-height: 48px;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 14px;}
+    .pay-alert-content .pay-big-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-312px 0 no-repeat;cursor: pointer;}
+    .pay-alert-content .pay-big-alert .content{width: 100%;height: 225px;line-height: 24px;float: left;padding: 16px;box-sizing: border-box;}
+    .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
+    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 34px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 30px;}
+    .pay-alert-content .pay-big-alert .content-viw.none{text-align: center;}
+    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 132px;height: 132px;margin: 0 auto;display: block;}
+    .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
+    .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
+    .pay-alert-content .pay-big-alert .content-viw span.none{color: #999999;}
+    .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:20px;display:inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
+    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 64px;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 10px 16px;margin-top: 20px;}
+    .pay-alert-content .pay-big-alert .content-bot p{line-height: 22px;font-size: 14px;color: #666666;}
+
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #payContainer{padding-top: 27vw;}
+    footer{display: none;}
+    .pay-container {width: 100%;min-height: 40vw;position: relative;margin-bottom: 2vw;}
+    .pay-container .container{opacity:0;}
+    .pay-container .container.active{opacity: 1;}
+    .pay-content{width: 100%;margin: 0 auto;height: auto;box-sizing: border-box;}
+    .pay-content .pay-title{width: 100%;height: auto;box-sizing: border-box;padding:4vw 3.5vw;background-color: #FFFFFF;margin-bottom: 2vw;font-weight: bold;}
+    .pay-content .pay-title-t{width: 100%;line-height: 6vw;font-size: 3.4vw;color: #333333;font-weight: bold;}
+    .pay-content .pay-title-p{line-height: 4vw;font-size: 3vw;color: #FF5B00;font-weight: normal;}
+    .pay-content .pay-title-btn{width: 40vw;background: #1890F9;height: 11.2vw;line-height:11.2vw;text-align: center;font-size: 3.4vw;color: #FFFFFF;margin: 0 auto;margin-top: 5vw;}
+    .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 3.2vw;background-color: #FFFFFF;margin-bottom: 2vw;position: relative;}
+    .pay-list-cell .list-cell-title{width: 100%;height:12.8vw;box-sizing: border-box;padding:2.4vw 0;border-bottom: 1px solid #E1E1E1;}
+    .pay-list-cell .list-cell-title .list-cell-logo{width: 6.4vw;height: 6.4vw;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
+    .pay-list-cell .list-cell-title .list-cell-logo img{width: 100%;height: 100%;display: block;}
+    .pay-list-cell .list-cell-title .list-cell-name {float: left;margin-left:3vw;line-height: 6.4vw;font-size: 3.4vw;color: #333333;}
+    .pay-list-cell .list-cell-content{width: 100%;height: auto;box-sizing: border-box;padding: 2.4vw 0;}
+    .pay-list-cell .list-cell-pros{float: left;}
+    .pay-list-cell .list-cell-pros.p1{width: 100%;}
+    .pay-list-cell .list-cell-pros.p2,.pay-list-cell .list-cell-pros.p3,.pay-list-cell .list-cell-pros.p4{width: 33.33%;margin-top: 4vw;font-size: 3.4VW;line-height: 4vw;color: #22272E;text-align: left;}
+    .pay-list-cell .list-cell-pros.p2 span,.pay-list-cell .list-cell-pros.p3 span,.pay-list-cell .list-cell-pros.p4 span{font-size: 3vw;color: #627386;margin-bottom: 1vw;}
+    .pay-list-cell .list-cell-pros.p2 p,.pay-list-cell .list-cell-pros.p3 p,.pay-list-cell .list-cell-pros.p4 p{margin-top: 2vw;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 15vw;height: 15vw;float: left;margin-right: 2.6vw;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;position: relative;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image .tip{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}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 75vw;float: left;height: 15vw;box-sizing: border-box;padding:3vw 0;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name p{width: 100%;font-size: 3.4vw;line-height: 4vw;color: #22272E;text-align: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+    .pay-list-cell .list-cell-button{width: 100%;height: 9.6vw;}
+    .pay-list-cell .list-cell-button .list-cell-vleft {float: right;}
+    .pay-list-cell .list-cell-button .list-cell-vleft.btn{width: 100%;}
+    .pay-list-cell .list-cell-button .list-cell-btn{width: 22.4vw;height: 9vw;float: right;border-radius: 5vw;line-height: 9vw;font-size: 3.4vw;text-align: center;background-color: #FF5B00;color: #FFFFFF;margin-left: 40px;cursor: pointer;}
+    .pay-list-cell .list-cell-button .list-cell-btn:hover{background-color: rgba(225,86,22,0.9);}
+    .pay-list-cell .list-cell-button .list-cell-msg{float: left;line-height: 9.6vw;font-size: 3.4vw;color: #22272E;margin-right: 2vw;}
+    .pay-list-cell .list-cell-button .list-cell-msg span{font-weight: bold;}
+    .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
+
+    /*  弹窗  */
+    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.6);z-index: 9999;opacity: 0;}
+    .pay-alert-content.show{opacity: 1;}
+    .pay-alert-content .pay-big-alert{width: 74.8vw;height: 83.6vw;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
+    .pay-alert-content .pay-big-alert .title{width: 100%;height: 11vw;box-sizing: border-box;font-size: 3.6vw;line-height: 11vw;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 3.4vw;}
+    .pay-alert-content .pay-big-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-312px 0 no-repeat;cursor: pointer;}
+    .pay-alert-content .pay-big-alert .content{width: 100%;height: auto;line-height: 8vw;float: left;padding: 4vw;box-sizing: border-box;}
+    .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
+    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 8vw;font-weight: bold;font-size: 3.4vw;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 0;}
+    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 27.2vw;height: 27.2vw;margin: 0 auto;display: block;}
+    .pay-alert-content .pay-big-alert .content-viw.none{text-align: center;}
+    .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
+    .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
+    .pay-alert-content .pay-big-alert .content-viw span.none{color: #999999;}
+    .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:4vw;display:inline-block;width: 12.4vw;height: 5.2vw;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 5.2vw;text-align: center;font-size: 3vw;color: #FFF;margin-top: 6px;cursor: pointer;}
+    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 16vw;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 2.8vw;margin-top: 4vw;}
+    .pay-alert-content .pay-big-alert .content-bot p{line-height: 5vw;font-size:2.8vw;color: #666666;}
+
+}

+ 2 - 2
src/main/resources/static/css/product/detail.h5.css

@@ -3,7 +3,7 @@
 * 移动端
 */
 li{list-style:none}
-.productBox{width:100%;background:#FFF;position: relative;}
+.productBox{width:100%;background:#FFF;position: relative;padding-top: 27vw;}
 .productBox .imageBox{width:100%;height:100vw;position:relative}
 #swiperImage .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center}
 #swiperImage .swiper-wrapper img{width:auto;height:100vw;display:block}
@@ -72,7 +72,7 @@ li{list-style:none}
 .productBox .detailBox .btnBox .buy.disable{background: rgba(225, 86, 22, 0.2);border-color: rgba(225, 86, 22, 0.2);}
 .productBox .detailBox .concatBox{height:20vw;padding-bottom:4vw}
 .productBox .detailBox .concatBox img{height:20vw;width:auto}
-.productBox .detailBox .upgrade{width:100%;background:#F94B4B;border-radius:2px;display:inline-block;text-align:center;height:11.2vw;line-height:11.2vw;font-size:3.4vw;color:#FFF;margin:1.7vw 0}
+.productBox .detailBox .upgrade{width:100%;background:#F94B4B;border-radius:5.6vw;display:inline-block;text-align:center;height:11.2vw;line-height:11.2vw;font-size:3.4vw;color:#FFF;margin:1.7vw 0}
 /*配套商品*/
 .product-supporting{width: 100%;height: 44vw;box-sizing: border-box;padding: 3.3vw;background-color: #FFFFFF;margin: 1.3vw 0;}
 .product-supporting-title{width: 100%;height: 6.2vw;line-height: 6.2vw;font-size: 3.6vw;color: #333333;text-align: left;font-weight: bold;}

+ 1 - 1
src/main/resources/static/css/product/detail.pc.css

@@ -315,7 +315,7 @@ input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appear
 /*去登陆*/
 .cm-goLogin{width:884px;height:56px;margin-left:-16px;margin-bottom: 16px;background:#FFE6DC;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 32px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
 .cm-goLogin span:nth-child(1){font-size:16px;color:#FF5B00;line-height:56px}
-.cm-goLogin span:nth-child(2){width:80px;height:35px;background:#FF5B00;border-radius:2px;color:#fff;font-size: 16px;text-align: center;line-height: 35px;cursor: pointer;}
+.cm-goLogin span:nth-child(2){width:80px;height:35px;background:#FF5B00;border-radius:18px;color:#fff;font-size: 16px;text-align: center;line-height: 35px;cursor: pointer;}
 .cm-database .cm-category .cm-category-title{padding-bottom:16px;font-size:16px;font-weight:bold;color:#4A4F58;border-bottom:1px solid #E2E7EF}
 .cm-database .cm-category .cm-content{margin:24px 0 40px}
 .cm-database .cm-category .cm-content .cm-section{margin-bottom:28px;padding-bottom:32px;border-bottom:1px solid #E2E7EF}

+ 69 - 69
src/main/resources/static/css/supplier-center/order/delivery.css

@@ -1,69 +1,69 @@
-@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;}
-    .goods-info{margin-top: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .protitle{font-size: 16px;margin: 15px 20px;color: #22272e}
-    .goods_img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left}
-    .goods_img img{width: 100%;height: 100%;}
-    .goods-list{overflow: hidden;height: 136px;background: #fff;padding-top: 10px}
-    .goods-btn{float: left;width: 40px;height: 100%;position: relative;margin-left: 20px;line-height: 136px}
-    .goods{float: left;margin-top: 15px;}
-    .goods_item{float: left;margin-left: 15px;}
-    .goods_item h3{color: #22272e;font-size: 16px;text-overflow: ellipsis;width: 500px;white-space: nowrap}
-    .goods_item p span{color: #627386;margin: 15px 30px 15px 0;display: inline-block}
-    .red{color: #f94b4b;}
-    .delivery-number{color: #627386;}
-    .sp-delivery-cal{width: 24px;height: 24px;line-height:24px;text-align: center;background-color: #fef6f3;border-radius: 2px;border: solid 1px #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
-    .del-num{line-height: 24px;width: 48px;height: 24px;margin: 0 -5px;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid 1px #ffe6dc;vertical-align: middle;color: #FF5B00;}
-    input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
-    input[type="number"]{-moz-appearance: textfield;}
-    .allcheck{height: 60px;background: #fff;font-size: 16px;color: #22272e;border-top: solid 1px #efefef}
-    .delivery-button{float: right;margin: 10px;}
-    .all-election{float: left;width: 60px;height: 100%;margin-left: 20px;line-height: 60px;}
-    .delivery-button button{width: 90px;height: 36px;line-height: 36px;text-align: center;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;color: #FF5B00;margin-right: 15px;cursor: pointer;}
-}
-
-
-
-/*移动端*/
-@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 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
-.info{height: 13.3vw;line-height: 13.3vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
-.comback{width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.5vw;border: solid 1px #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:nth-child(1){width: 100%;}
-.userinfo .user p span{color: #22272e;}
-.address{margin-bottom: 4vw;color: #627386;}
-.address span{color: #22272e;}
-.goods-info{box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
-.protitle{font-size: 3.7vw;margin: 3.3vw 5.3vw;color: #22272e}
-.goods_img{width: 24vw;height: 24vw;border: solid .27vw #e2e7ef;float: left;margin-top: 4vw}
-.goods_img img{width: 100%;height: 100%;}
-.goods-list{overflow: hidden;background: #fff;padding-bottom: 3.8vw;}
-.goods-btn{float: left;width: 8vw;height: 100%;position: relative;margin-left: 4vw;line-height: 41.6vw;}
-.goods{float: left;width: 85%;}
-.goods_item{width: 63%;float: left;margin-left: 2.7vw}
-.goods_item h3{color: #22272e;font-size: 3.7vw;padding-top: 3.5vw;}
-.goods_item p span:nth-child(1){width: 100%;}
-.goods_item p span{color: #627386;margin: 1.3vw 5.3vw 1.3vw 0;display: inline-block}
-.red{color: #f94b4b;}
-.delivery-number{color: #627386;}
-.sp-delivery-cal{width: 4.8vw;height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #fef6f3;border-radius: .53vw;border: solid .27vw #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
-.del-num{line-height: 24px;width: 10.2vw;height: 4.8vw;margin: 0 -1.3vw;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid .27vw #ffe6dc;vertical-align: middle;color: #FF5B00;font-size: 2.9vw;}
-input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
-input[type="number"]{-moz-appearance: textfield;}
-.allcheck{height: 16vw;background: #fff;color: #22272e;border-top: solid .27vw #efefef;margin-top: 3.8vw}
-.delivery-button{float: right;margin:2.7vw;}
-.all-election{float: left;width: 16vw;height: 100%;margin-left: 4vw;line-height: 16vw;color: #4a4f58}
-.delivery-button button{width: 22.4vw;height: 9.6vw;line-height: 9.6vw;text-align: center;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #FF5B00;color: #FF5B00;margin-right: 3.8vw;cursor: pointer;}
-.delivery-button button.delivery{background-color: #FF5B00;color: #fff;}
-}
+@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;}
+    .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;}
+    .goods-info{margin-top: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);border-radius: 8px;overflow: hidden;background: #FFFFFF;}
+    .protitle{font-size: 16px;margin: 15px 20px;color: #22272e}
+    .goods_img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left}
+    .goods_img img{width: 100%;height: 100%;}
+    .goods-list{overflow: hidden;height: 136px;background: #fff;padding-top: 10px;}
+    .goods-btn{float: left;width: 40px;height: 100%;position: relative;margin-left: 20px;line-height: 136px}
+    .goods{float: left;margin-top: 15px;}
+    .goods_item{float: left;margin-left: 15px;}
+    .goods_item h3{color: #22272e;font-size: 16px;text-overflow: ellipsis;width: 500px;white-space: nowrap}
+    .goods_item p span{color: #627386;margin: 15px 30px 15px 0;display: inline-block}
+    .red{color: #f94b4b;}
+    .delivery-number{color: #627386;}
+    .sp-delivery-cal{width: 24px;height: 24px;line-height:24px;text-align: center;background-color: #fef6f3;border-radius: 2px;border: solid 1px #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
+    .del-num{line-height: 24px;width: 48px;height: 24px;margin: 0 -5px;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid 1px #ffe6dc;vertical-align: middle;color: #FF5B00;}
+    input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
+    input[type="number"]{-moz-appearance: textfield;}
+    .allcheck{height: 60px;background: #fff;font-size: 16px;color: #22272e;border-top: solid 1px #efefef}
+    .delivery-button{float: right;margin: 10px;}
+    .all-election{float: left;width: 60px;height: 100%;margin-left: 20px;line-height: 60px;}
+    .delivery-button button{width: 90px;height: 36px;line-height: 36px;text-align: center;background-color: #ffe6dc;border-radius: 18px;border: solid 1px #FF5B00;color: #FF5B00;margin-right: 15px;cursor: pointer;}
+}
+
+
+
+/*移动端*/
+@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 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+.info{height: 13.3vw;line-height: 13.3vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+.comback{width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.5vw;border: solid 1px #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:nth-child(1){width: 100%;}
+.userinfo .user p span{color: #22272e;}
+.address{margin-bottom: 4vw;color: #627386;}
+.address span{color: #22272e;}
+.goods-info{box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+.protitle{font-size: 3.7vw;margin: 3.3vw 5.3vw;color: #22272e}
+.goods_img{width: 24vw;height: 24vw;border: solid .27vw #e2e7ef;float: left;margin-top: 4vw}
+.goods_img img{width: 100%;height: 100%;}
+.goods-list{overflow: hidden;background: #fff;padding-bottom: 3.8vw;}
+.goods-btn{float: left;width: 8vw;height: 100%;position: relative;margin-left: 4vw;line-height: 41.6vw;}
+.goods{float: left;width: 85%;}
+.goods_item{width: 63%;float: left;margin-left: 2.7vw}
+.goods_item h3{color: #22272e;font-size: 3.7vw;padding-top: 3.5vw;}
+.goods_item p span:nth-child(1){width: 100%;}
+.goods_item p span{color: #627386;margin: 1.3vw 5.3vw 1.3vw 0;display: inline-block}
+.red{color: #f94b4b;}
+.delivery-number{color: #627386;}
+.sp-delivery-cal{width: 4.8vw;height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #fef6f3;border-radius: .53vw;border: solid .27vw #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
+.del-num{line-height: 24px;width: 10.2vw;height: 4.8vw;margin: 0 -1.3vw;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid .27vw #ffe6dc;vertical-align: middle;color: #FF5B00;font-size: 2.9vw;}
+input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
+input[type="number"]{-moz-appearance: textfield;}
+.allcheck{height: 16vw;background: #fff;color: #22272e;border-top: solid .27vw #efefef;margin-top: 3.8vw}
+.delivery-button{float: right;margin:2.7vw;}
+.all-election{float: left;width: 16vw;height: 100%;margin-left: 4vw;line-height: 16vw;color: #4a4f58}
+.delivery-button button{width: 22.4vw;height: 9.6vw;line-height: 9.6vw;text-align: center;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #FF5B00;color: #FF5B00;margin-right: 3.8vw;cursor: pointer;}
+.delivery-button button.delivery{background-color: #FF5B00;color: #fff;}
+}

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

@@ -1,116 +1,116 @@
-@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;}
-    .product-info {margin-top: 20px;}
-    .price {overflow: hidden;}
-    .protitle {color: #22272e;font-size: 16px;padding: 15px;}
-    .product {background: #fff;padding: 10px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .product-title {border-bottom: solid 1px #e2e7ef;height: 54px;line-height: 54px}
-    .product-title li {display: inline-block;list-style: none;color: #627386;width: 11%;text-align: center;}
-    .product-title li:nth-child(1) {width: 42%;text-align: left}
-    .pro-information li {list-style: none;}
-    .pro-information li {width: 100%;padding: 10px 0;}
-    .pro-information li div {display: inline-block;width: 11%;text-align: center;color: #627386;}
-    .pro-information li div.product-img {width: 42%;text-align: left;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 img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
-    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;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}
-    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 10px;padding: 20px;color: #627386;}
-    .company-number{display: flex;width: 100%;}
-    .logist-right>div{margin-top: 5px;}
-    .company-number>div{width: 49%;display: inline-block;margin: 2px 0;flex: 2;}
-    .company{width: 210px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;color: #627386;padding-left: 10px;cursor: pointer;}
-    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;}
-    .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;}
-    .input-file{width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute;top: 0}
-    #uploadGoodsImages{overflow: hidden;float: left;width: 90%}
-    .release-from{overflow: hidden;}
-    .red-color{float: left;height: 80px;line-height: 80px;width: 85px;}
-    .upload-file img{width: 100%;height: 100%;}
-    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
-    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer; margin-top: 10px;}
-    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
-    .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: -15px;left:5px;}
-    .form-upload-tips:hover .wen-tips {display: block;}
-    .remarks textarea{width: 496px;height: 114px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;resize: none;padding: 10px;color: #9aa5b5;}
-    .remarks{margin-top: 25px;position: relative;}
-    .remarks .rema{height: 114px;line-height: 114px;display: inline-block;float: left;width: 85px;text-align: center}
-    .size-num {position: absolute;right: 350px;top: 109px;color: #9aa5b5}
-    .defineBtn button{width: 90px;height: 36px;line-height: 36px;text-align: center;color: #fff;background-color: #FF5B00;border-radius: 2px;border: solid 1px #FF5B00;cursor: pointer;margin-right: 15px}
-    .defineBtn{overflow: hidden;padding: 20px;}
-    .defineBtn>div{float: right;}
-    .icon.add-company:before{width: 20px;height: 25px;background-position: -316px -507px;}
-    .icon.sub-company:before{width: 20px;height: 25px;background-position: -346px -507px;}
-
-}
-
-/*移动*/
-@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:nth-child(1){width: 100%}
-    .userinfo .user p span {color: #22272e;}
-    .address {margin-bottom: 4vw;color: #627386;}
-    .address span {color: #22272e;}
-    .product-info {box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);background: #fff;margin-top: 2.7vw}
-    .price {overflow: hidden;}
-    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
-    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px .8vw 1.3vw 0px rgba(0, 0, 0, 0.07);height: 50vw}
-    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
-    .product-title li {display: inline-block;list-style: none;color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
-    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
-    .pro-information li {list-style: none;}
-    .pro-information li {width: 100%;padding: 2.7vw 0;}
-    .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
-    .pro-information li div.product-img {width: 100%;text-align: left;top: 0;position: relative;}
-    .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-img img {width: 18.7vw;height: 18.7vw;border: solid .27vw #e2e7ef;}
-    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;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}
-    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}
-    .company-number{width: 100%;}
-    .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}
-    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;
-    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;}
-    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
-    #uploadGoodsImages{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
-    .release-from{overflow: hidden;}
-    .upload-file img{width: 100%;height: 100%;}
-    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
-    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
-    .wen-tips {width: 67.2vw;height:9vw;background-color: #1890f9;box-shadow: 0px .8vw 1.3vw 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: left;line-height: 9vw;top:8.8vw;display: none;}
-    .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{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: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}
-}
+@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;}
+    .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;}
+    .product-info {margin-top: 20px;border-radius: 8px;overflow: hidden;background: #FFFFFF;}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px;}
+    .product {background: #fff;padding: 10px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .product-title {border-bottom: solid 1px #e2e7ef;height: 54px;line-height: 54px}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 42%;text-align: left}
+    .pro-information li {list-style: none;}
+    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li div {display: inline-block;width: 11%;text-align: center;color: #627386;}
+    .pro-information li div.product-img {width: 42%;text-align: left;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 img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;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}
+    .add-logistics{border-radius: 8px;overflow: hidden; height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 10px;padding: 20px;color: #627386;}
+    .company-number{display: flex;width: 100%;}
+    .logist-right>div{margin-top: 5px;}
+    .company-number>div{width: 49%;display: inline-block;margin: 2px 0;flex: 2;}
+    .company{width: 210px;height: 36px;background-color: #ffffff;border-radius: 18px;border: solid 1px #b8bfca;color: #627386;padding-left: 10px;cursor: pointer;}
+    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;}
+    .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;}
+    .input-file{width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute;top: 0}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 90%}
+    .release-from{overflow: hidden;}
+    .red-color{float: left;height: 80px;line-height: 80px;width: 85px;}
+    .upload-file img{width: 100%;height: 100%;}
+    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
+    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer; margin-top: 10px;}
+    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
+    .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: -15px;left:5px;}
+    .form-upload-tips:hover .wen-tips {display: block;}
+    .remarks textarea{width: 496px;height: 114px;background-color: #ffffff;border-radius: 8px;border: solid 1px #b8bfca;resize: none;padding: 10px;color: #9aa5b5;}
+    .remarks{margin-top: 25px;position: relative;}
+    .remarks .rema{height: 114px;line-height: 114px;display: inline-block;float: left;width: 85px;text-align: center}
+    .size-num {position: absolute;right: 350px;top: 109px;color: #9aa5b5}
+    .defineBtn button{width: 90px;height: 36px;line-height: 36px;text-align: center;color: #fff;background-color: #FF5B00;border-radius: 18px;border: solid 1px #FF5B00;cursor: pointer;margin-right: 15px}
+    .defineBtn{overflow: hidden;padding: 20px;}
+    .defineBtn>div{float: right;}
+    .icon.add-company:before{width: 20px;height: 25px;background-position: -316px -507px;}
+    .icon.sub-company:before{width: 20px;height: 25px;background-position: -346px -507px;}
+
+}
+
+/*移动*/
+@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:nth-child(1){width: 100%}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);background: #fff;margin-top: 2.7vw}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
+    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px .8vw 1.3vw 0px rgba(0, 0, 0, 0.07);height: 50vw}
+    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-title li {display: inline-block;list-style: none;color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
+    .pro-information li {list-style: none;}
+    .pro-information li {width: 100%;padding: 2.7vw 0;}
+    .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
+    .pro-information li div.product-img {width: 100%;text-align: left;top: 0;position: relative;}
+    .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-img img {width: 18.7vw;height: 18.7vw;border: solid .27vw #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;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}
+    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}
+    .company-number{width: 100%;}
+    .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}
+    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;
+    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;}
+    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
+    .release-from{overflow: hidden;}
+    .upload-file img{width: 100%;height: 100%;}
+    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
+    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
+    .wen-tips {width: 67.2vw;height:9vw;background-color: #1890f9;box-shadow: 0px .8vw 1.3vw 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: left;line-height: 9vw;top:8.8vw;display: none;}
+    .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{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: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}
+}

+ 3 - 3
src/main/resources/static/css/supplier/index.css

@@ -30,7 +30,7 @@ li{list-style:none}
     .supplierTit .search .searchBtn{position:absolute;right:0;top:0;font-size:0;padding:7px 12px;height:30px;line-height:30px}
     .supplierTit .search .searchBtn:before{width:30px;height:30px;background-position:4px 4px}
     .supplierInfo{width:1184px;margin:0 auto;}
-    .supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:0 auto 0;background:#FFF;border-bottom:1px solid #ffe6dc;font-size:16px;color:#93979F;border-radius: 0 0 8px 8px;margin-bottom: 10px;overflow: hidden;}
+    .supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:0 auto 0;background:#FFF;font-size:16px;color:#93979F;border-radius: 0 0 8px 8px;margin-bottom: 10px;overflow: hidden;}
     .supplierInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
     .supplierInfo .tabTit span:hover{color:#E15621}
     .supplierInfo .tabTit span:first-child{border-radius:0;}
@@ -146,7 +146,7 @@ li{list-style:none}
     #supplierBanner .swiper-pagination .swiper-pagination-bullet{display:block;width:2vw;border-width:1vw 1px;border-color:transparent;cursor:pointer;background:none;font-size:0;opacity:.2}
     #supplierBanner .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#FFF;border-radius:.3vw}
     #supplierBanner .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
-    .supplierTit{width:100%;background:#FFF;position:relative;box-sizing:border-box;padding:13.4vw 3.3vw 2vw 3.3vw;border-top:1px solid #F5F5F5;}
+    .supplierTit{width:100%;background:#FFF;position:relative;box-sizing:border-box;padding:27.4vw 3.3vw 2vw 3.3vw;border-top:1px solid #F5F5F5;}
     .supplierTit .title{box-sizing:border-box;min-height:13.4vw;padding:2.2vw 0;position:absolute;top:0;left:3.3vw}
     .supplierTit .title img{display:inline-block;height:9vw;margin-right:1vw;vertical-align:middle}
     .supplierTit .title h1{display:inline-block;max-width:70vw;max-height:9vw;overflow:hidden;line-height:4.5vw;vertical-align:middle;font-size:3.7vw;font-weight:bold}
@@ -203,7 +203,7 @@ li{list-style:none}
     .productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;margin-right: 1.3vw;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: .25vw;}
 
     /*新公司介绍样式*/
-    .infoBox-content{width: 100%;height: 1000px; box-sizing: border-box;background: #f6f6f6;padding: 4vw 0;display: block;}
+    .infoBox-content{width: 100%;height: 1000px; box-sizing: border-box;background: #f6f6f6;padding:0 0 4vw 0;display: block;}
     .infoBox-content-box{width: 100%;background: #FFF;border-radius: 8px;}
     .infoBox-content-info{ border-radius: 8px;background-color: #edebe8;padding: 10px;box-sizing: border-box;}
     .infoBox-content-info .infoBox-content-info-box{ border-radius: 8px;padding: 10px;background: linear-gradient(360deg, #f3f3f3, #fff);width: 100%;position: relative;box-sizing: border-box;}

+ 22 - 22
src/main/resources/static/css/user-center/account/account.css

@@ -1,22 +1,22 @@
-@charset "utf-8";
-li{list-style:none}
-/**
- * PC端
- */
-@media screen and (min-width:768px){
-    /*采美豆右侧*/
-    .crumbs{font-size: 16px;}
-    .user-header{width:100%;height:120px;box-sizing:border-box;padding:20px;background-color:#FFF;box-shadow:0px 3px 6px 0px rgba(0,0,0,0.07);position:relative}
-
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    .user-header{box-sizing:border-box;width:100%;padding:2.7vw;background:#fff;position:relative}
-
-
-
-}
-
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    /*采美豆右侧*/
+    .crumbs{font-size: 16px;}
+    .user-header{width:100%;height:120px;box-sizing:border-box;padding:20px;background-color:#FFF;box-shadow:0px 3px 6px 0px rgba(0,0,0,0.07);position:relative}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    .user-header{box-sizing:border-box;width:100%;padding:2.7vw;background:#fff;position:relative}
+
+
+
+}
+

+ 6 - 4
src/main/resources/static/css/user-center/account/beans.css

@@ -46,6 +46,9 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #beansPage{padding-top: 27vw;}
+    footer{display:none}
     .beans-header{width:100%;height:28vw;box-sizing:border-box;padding:4vw 8vw;background:url("/img/account/icon-beans-bg.png")no-repeat;background-size: cover;}
     .beans-header-l{float: left;line-height: 10vw;color: #FFFFFF;font-size:3.2vw;}
     .beans-header-l span{display: inline-block;width: 100%;height: 10vw;float: left;}
@@ -53,18 +56,18 @@ li{list-style:none}
     .beans-header-r{float: right;line-height:20vw;}
     .beans-header-r a{color: #FFFFFF;font-size: 3vw;}
     .beans-header-r a .icon{width:4vw;height:4vw;display: block;float: right;margin-left: 1vw;}
-    .beans-header-r a .icon:before{width:4vw;height:4vw;background-position:-44.6vw -78.3vw;}
+    .beans-header-r a .icon:before{width:4vw;height:4vw;background-position:-46.5vw -79.1vw;}
     .beans-container{width: 100%;min-height: 50vw;background-color: #FFFFFF;margin-top:2vw;}
     .beans-content-tabs{width: 100%;height: auto;box-sizing: border-box;padding:0 3.4vw;}
     .beans-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;padding-top: 6.4vw;position: relative;float: left;}
     .beans-content-tabs .time-template{width: 100%;height: 6.7vw;float: left;box-sizing: border-box;padding: 0 25vw;}
     .beans-content-tabs .time-template .time-pre{width: 6.7vw;height: 6.7vw;float: left;display: block;}
     .beans-content-tabs .time-template .time-pre .icon{width:6.7vw;height:6.7vw;display: block;}
-    .beans-content-tabs .time-template .time-pre .icon:before{width:6.7vw;height:6.7vw;background-position:-51.2vw -78.3vw}
+    .beans-content-tabs .time-template .time-pre .icon:before{width:6.7vw;height:6.7vw;background-position:-53.2vw -79.3vw;}
     .beans-content-tabs .time-template .time-text{width: 28.4vw;height: 6.7vw;float: left;line-height: 6.7vw;text-align: center;font-size: 3.4vw;color: #22272e;}
     .beans-content-tabs .time-template .time-next{width: 6.7vw;height: 6.7vw;float: left;display: block;}
     .beans-content-tabs .time-template .time-next .icon{width:6.7vw;height:6.7vw;display: block;}
-    .beans-content-tabs .time-template .time-next .icon:before{width:6.7vw;height:6.7vw;background-position:-60.4vw -78.3vw}
+    .beans-content-tabs .time-template .time-next .icon:before{width:6.7vw;height:6.7vw;background-position:-63.4vw -79.3vw;}
     .beans-content-tabs .time-tabs{width:100%;height:9.6vw;float: left;margin-top: 3.6vw;}
     .beans-content-tabs .time-tabs-cell{width: 33.3%;height: 100%;float: left;text-align: center;font-size: 4vw;color: #22272e;line-height: 9.6vw;display: block;}
     .beans-content-tabs .time-tabs-cell.active{color: #FF5B00;font-weight: bold;}
@@ -78,6 +81,5 @@ li{list-style:none}
     .beans-content-list .list-cell-right{width: 50%;height:10.7vw;float: right;text-align: right;}
     .empty{width: 100%;float: left;}
     .empty img{width: 36vw;height: 36vw;}
-
 }
 

+ 5 - 4
src/main/resources/static/css/user-center/account/cards.css

@@ -98,6 +98,7 @@ li{list-style:none}
 */
 @media screen and (max-width:768px){
     body{background: #FFFFFF;}
+    #cardsPage{padding-top: 27vw;}
     .cards-container{width: 100%;min-height: 100vw;background-color: #FFFFFF;margin-top: 0;box-sizing: border-box;padding: 4.8vw;}
     .cards-list{width: 100%;height:32.2vw;box-sizing: border-box;padding: 4vw;border-radius: 3.2vw;float: left;margin: 0 4.8vw 4.8vw 0;position: relative;}
     .cards-list.ABC{background-image: linear-gradient(90deg, #19B8B2 0%, #009C96 100%);}
@@ -131,7 +132,7 @@ li{list-style:none}
     .list-main .list-main-code{width: 100%;height: 10vw;line-height: 10vw;font-size: 3.8vw;color: #ffffff;}
     .list-btn{font-size: 3.4vw;color: #ffffff;height: 6vw;line-height: 6vw;position: absolute;right: 4vw;top: 4vw;cursor: pointer;}
     .model-cards-popup{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4);z-index: 99999;}
-    .model-cards-popup .model-content{width:100%;height:150vw;padding: 3.2vw 6vw; position:absolute;left:0;bottom:0;background-color:#FFFFFF;border-radius:2px;box-sizing:border-box}
+    .model-cards-popup .model-content{width:100%;height:150vw;padding: 3.2vw 6vw; position:absolute;left:0;bottom:0;background-color:#FFFFFF;border-radius:16px 16px 0 0;box-sizing:border-box}
     .model-content .title{width: 100%;height: 8vw;box-sizing: border-box;float: left;position: relative;margin-bottom: 6vw;}
     .model-content .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:0;top: 0;background: url("/img/base/icon.png")-315px 0 no-repeat;cursor: pointer;}
     .model-content .title .title-tabs{width: 100%;height: 8vw;float: left;box-sizing: border-box;}
@@ -143,7 +144,7 @@ li{list-style:none}
     .model-content .content .list.current{border-color: #FF2A2A;}
     .model-content .content .list.current:before{content: '';width: 20px;height: 20px;position: absolute;bottom: 0;right: -2px;background: url("/img/base/icon.png")-210px -252px no-repeat;}
     .model-content .button{width: 100%;height: 11vw;float: left;margin-top: 4.8vw;}
-    .model-content .button .button-btn{display: block;width: 60vw;height: 11vw;margin: 0 auto;box-sizing: border-box;border: 1px solid #FF5B00;background: #FF5B00;line-height: 11vw;text-align: center;font-size: 14px;color: #FFFFFF;}
+    .model-content .button .button-btn{display: block;width: 60vw;height: 11vw;margin: 0 auto;box-sizing: border-box;border: 1px solid #FF5B00;background: #FF5B00;line-height: 11vw;text-align: center;font-size: 14px;color: #FFFFFF;border-radius: 5.5vw;}
     .model-content .button .button-btn.disabled{border: 1px solid #B8BFCA;background: #B8BFCA;color: #FFFFFF;}
     .model-content .content .content-labe{width: 100%;height: 8vw;line-height: 8vw;float: left;font-size: 3.4vw;color: #333333;font-weight: bold;}
     .model-content .content .content-labe.sen{margin-top: 3vw;}
@@ -166,11 +167,11 @@ li{list-style:none}
     .model-content .content .content-form .form-label{width: 100%;height: 6vw;float: left;line-height: 6vw;text-align: left;font-size: 3.4vw;color: #666666;font-weight: bold;}
     .model-content .content .content-form .form-label.card{width: auto;}
     .model-content .content .content-form .form-label span{color: #F94B4B;}
-    .model-content .content .content-form .form-input{width: 100%;height: 10vw;float: left;color: #F94B4B;box-sizing: border-box;padding: 0 3vw;border:1px solid #B8BFCA;border-radius: 2px; }
+    .model-content .content .content-form .form-input{width: 100%;height: 10vw;float: left;color: #F94B4B;box-sizing: border-box;padding: 0 3vw;border:1px solid #B8BFCA;border-radius: 5vw; }
     .model-content .content .content-form .form-input input{width: 100%;height:9vw;float: left;line-height: 9vw;font-size: 3.4vw;color: #333333;border: none;font-style: normal;}
     .model-content .content .content-form .form-input.code{ width: 54.8vw; }
     .model-content .content .content-form .form-btn{width: 26vw;height: 10vw;float: left;margin-left: 20px;}
-    .model-content .content .content-form .form-btn a{display: block;width: 100%;height: 10vw;box-sizing: border-box;background: #FF5B00;line-height: 10vw;text-align: center;font-size: 3.4vw;color: #FFFFFF;}
+    .model-content .content .content-form .form-btn a{display: block;width: 100%;height: 10vw;box-sizing: border-box;background: #FF5B00;line-height: 10vw;text-align: center;font-size: 3.4vw;color: #FFFFFF;border-radius: 5vw;}
     .model-content .content .content-form .form-btn a.disabled{background: #B8BFCA;color: #FFFFFF;}
     .model-content .content .content-form .form-text{ line-height: 6vw; font-size: 3.4vw;color: #333333;float: left; }
     .model-content .content .content-error{ width: 100%;height: 6vw;float: left;line-height: 6vw;;text-align: left;font-size: 3.2vw;color: #FF0000; }

+ 77 - 74
src/main/resources/static/css/user-center/account/coupon.css

@@ -1,74 +1,77 @@
-@charset "utf-8";
-li{list-style:none}
-/**
- * PC端
- */
-@media screen and (min-width:768px){
-    /*采美豆右侧*/
-    .crumbs{font-size: 16px;}
-    .pageWrap{width: 968px;}
-    .navLayout{min-height: 500px;}
-    .coupon-container{width: 100%;min-height: 500px;background-color: #FFFFFF;}
-    .coupon-content-tabs{width: 100%;height: 64px;box-sizing: border-box;padding:0 24px;}
-    .coupon-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;padding:18px 0 0 0; position: relative;}
-    .coupon-content-tabs .time-tabs{height:46px;float: left}
-    .coupon-content-tabs .time-tabs-cell{width: 72px;height: 100%;float: left;text-align: center;font-size: 14px;color: #22272e;line-height: 46px;display: block;cursor: pointer;margin-right: 40px;}
-    .coupon-content-tabs .time-tabs-cell.active{color: #FF5B00;border-bottom: 1px solid #E15621;box-sizing: border-box;}
-    .coupon-content-tabs .time-btn{float: right;}
-    .coupon-content-tabs .time-btn a{display: inline-block;float: left;text-align: center;font-size: 14px;color: #627386;line-height: 46px;margin-left: 24px;}
-    .coupon-content-tabs .time-btn a:hover{color: #E15621;}
-    .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:24px 147px 24px 24px;}
-    .coupon-list-cell{width: 369px;height: 148px;float: left;margin: 0 24px 24px 0;position: relative;}
-    .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
-    .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
-    .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
-    .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
-    .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
-    .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;padding: 45px 47px;font-size: 16px;color: #FFF;cursor: pointer;}
-    .coupon-list-cell .coupon-list-ri.none{cursor: default;}
-    .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;}
-    .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}
-    .coupon-list-cell .coupon-tags.none{background-color: #dbdbdb;color: #FFF;}
-    .coupon-list-cell.used{background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
-    .coupon-list-cell.none{background: url("/img/account/icon-coupon-none@2x.png") no-repeat;background-size: cover;}
-    .empty{width: 100%;float: left;padding: 140px 0}
-    .empty img{width: 180px;height: 180px;}
-    .empty .msg{color: #999;}
-
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    .coupon-container{width: 100%;min-height: 50vw;background-color: #FFFFFF;margin-top:2vw;}
-    .coupon-content-tabs{width: 100%;height: 11.7vw;box-sizing: border-box;padding:4.2vw 0 0 0;}
-    .coupon-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;position: relative;}
-    .coupon-content-tabs .time-tabs{width: 100%;height:7.5vw;float: left;box-sizing: border-box;padding: 0 2.4vw;}
-    .coupon-content-tabs .time-tabs-cell{width: 33.3%;height: 100%;float: left;text-align: center;font-size: 4vw;color: #22272e;line-height:7.5vw;display: block;}
-    .coupon-content-tabs .time-tabs-cell.active{color: #FF5B00;border-bottom: 1px solid #E15621;box-sizing: border-box;}
-    .coupon-content-tabs .time-btn{float: right;}
-    .coupon-content-tabs .time-btn a{display: inline-block;float: left;text-align: center;font-size: 14px;color: #627386;line-height: 46px;margin-left: 24px;}
-    .coupon-content-tabs .time-btn a:hover{color: #E15621;}
-    .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:3.45vw;}
-    .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-    .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
-    .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
-    .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
-    .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
-    .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
-    .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 9.5vw 9.5vw;font-size:3.4vw;color: #FFF;cursor: pointer;}
-    .coupon-list-cell .coupon-list-ri.none{cursor: default;}
-    .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
-    .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}
-    .coupon-list-cell .coupon-tags.none{background-color: #dbdbdb;color: #FFF;}
-    .coupon-list-cell.used{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
-    .coupon-list-cell.none{background: url("/img/account/icon-coupon-none@h52x.png") no-repeat;background-size: cover;}
-    .empty{width: 100%;float: left;}
-    .empty img{width: 36vw;height: 36vw;}
-    .empty .msg{color: #999;}
-
-}
-
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    /*采美豆右侧*/
+    .crumbs{font-size: 16px;}
+    .pageWrap{width: 968px;}
+    .navLayout{min-height: 500px;}
+    .coupon-container{width: 100%;min-height: 500px;background-color: #FFFFFF;}
+    .coupon-content-tabs{width: 100%;height: 64px;box-sizing: border-box;padding:0 24px;}
+    .coupon-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;padding:18px 0 0 0; position: relative;}
+    .coupon-content-tabs .time-tabs{height:46px;float: left}
+    .coupon-content-tabs .time-tabs-cell{width: 72px;height: 100%;float: left;text-align: center;font-size: 14px;color: #22272e;line-height: 46px;display: block;cursor: pointer;margin-right: 40px;}
+    .coupon-content-tabs .time-tabs-cell.active{color: #FF5B00;border-bottom: 1px solid #E15621;box-sizing: border-box;}
+    .coupon-content-tabs .time-btn{float: right;}
+    .coupon-content-tabs .time-btn a{display: inline-block;float: left;text-align: center;font-size: 14px;color: #627386;line-height: 46px;margin-left: 24px;}
+    .coupon-content-tabs .time-btn a:hover{color: #E15621;}
+    .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:24px 147px 24px 24px;}
+    .coupon-list-cell{width: 369px;height: 148px;float: left;margin: 0 24px 24px 0;position: relative;}
+    .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
+    .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
+    .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
+    .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
+    .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
+    .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
+    .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;padding: 45px 47px;font-size: 16px;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri.none{cursor: default;}
+    .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;}
+    .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}
+    .coupon-list-cell .coupon-tags.none{background-color: #dbdbdb;color: #FFF;}
+    .coupon-list-cell.used{background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
+    .coupon-list-cell.none{background: url("/img/account/icon-coupon-none@2x.png") no-repeat;background-size: cover;}
+    .empty{width: 100%;float: left;padding: 140px 0}
+    .empty img{width: 180px;height: 180px;}
+    .empty .msg{color: #999;}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #beansPage{padding-top: 27vw;}
+    footer{display:none}
+    .coupon-container{width: 100%;min-height: 50vw;background-color: #FFFFFF;margin-top:2vw;}
+    .coupon-content-tabs{width: 100%;height: 11.7vw;box-sizing: border-box;padding:4.2vw 0 0 0;}
+    .coupon-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;position: relative;}
+    .coupon-content-tabs .time-tabs{width: 100%;height:7.5vw;float: left;box-sizing: border-box;padding: 0 2.4vw;}
+    .coupon-content-tabs .time-tabs-cell{width: 33.3%;height: 100%;float: left;text-align: center;font-size: 4vw;color: #22272e;line-height:7.5vw;display: block;}
+    .coupon-content-tabs .time-tabs-cell.active{color: #FF5B00;border-bottom: 1px solid #E15621;box-sizing: border-box;}
+    .coupon-content-tabs .time-btn{float: right;}
+    .coupon-content-tabs .time-btn a{display: inline-block;float: left;text-align: center;font-size: 14px;color: #627386;line-height: 46px;margin-left: 24px;}
+    .coupon-content-tabs .time-btn a:hover{color: #E15621;}
+    .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:3.45vw;}
+    .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
+    .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
+    .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
+    .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
+    .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
+    .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
+    .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
+    .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 9.5vw 9.5vw;font-size:3.4vw;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri.none{cursor: default;}
+    .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
+    .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}
+    .coupon-list-cell .coupon-tags.none{background-color: #dbdbdb;color: #FFF;}
+    .coupon-list-cell.used{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
+    .coupon-list-cell.none{background: url("/img/account/icon-coupon-none@h52x.png") no-repeat;background-size: cover;}
+    .empty{width: 100%;float: left;}
+    .empty img{width: 36vw;height: 36vw;}
+    .empty .msg{color: #999;}
+
+}
+

+ 3 - 0
src/main/resources/static/css/user-center/address/list.css

@@ -62,6 +62,9 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #orderPage{padding-top: 27vw;}
+    footer{display: none;}
     .order-header{line-height:7.4vw;background:#FFF;padding:3.3vw;margin:1.5vw auto;font-size:3.1vw;position:relative}
     .order-header p span{color:#FF5B00;margin:0 1vw}
     .header-button .btn-server{position:absolute;right:3.3vw;top:3vw}

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

@@ -117,16 +117,19 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    body{background: #FFFFFF;}
+    footer{display:none}
+    #dashboard{ padding-top: 27vw; }
     .user-header{box-sizing:border-box;width:100%;padding:2.7vw;background:#fff;position:relative}
-    .user-header .logo{width:26.7vw;height:19.4vw;border:solid 1px #f5f5f5;margin-right:2.7vw;position:relative}
-    .user-header .logo .logo-file{width:26.7vw;height:19.4vw;outline:none;opacity:0;position:absolute;top:0;left:0}
-    .user-header .logo .file{position:absolute;top:5vw;left:9vw;width:9vw;height:9vw}
-    .user-header .logo .file:before{width:9vw;height:9vw;background-position:-7.5vw -60.3vw}
+    .user-header .logo{width:19.4vw;height:19.4vw;border:solid 1px #f5f5f5;margin-right:2.7vw;position:relative}
+    .user-header .logo .logo-file{width:19.4vw;height:19.4vw;outline:none;opacity:0;position:absolute;top:0;left:0}
+    .user-header .logo .file{position:absolute;top:5vw;left:5vw;width:9vw;height:9vw}
+    .user-header .logo .file:before{width:9vw;height:9vw;background-position:-5.5vw -60.3vw;}
     .user-header .logo img{max-width:100%;max-height:100%;display:block;margin:0 auto;}
-    .user-header .account{width:64vw;height:auto;box-sizing:border-box;color:#9aa5b5;font-size:3.1vw;line-height:6.4vw;position:relative}
+    .user-header .account{width:70vw;height:auto;box-sizing:border-box;color:#9aa5b5;font-size:3.1vw;line-height:6.4vw;position:relative}
     .user-header .account .name{font-size:3.7vw;color:#22272e}
     .user-header .account em{font-style:normal;color:#FF5B00}
-    .user-header .account .name a,.user-header .account .msg a{display:inline-block;height:5.4vw;line-height:5.4vw;padding:0 2vw;color:#FFF;border-radius:2px;margin-left:2vw}
+    .user-header .account .name a,.user-header .account .msg a{display:inline-block;height:5.4vw;line-height:5.4vw;padding:0 2vw;color:#FFF;border-radius:2.7vw;margin-left:2vw}
     .user-header .account .name a{background-color:#FF5B00;position: relative;}
     .user-header .account .name a .name-tips{width: 11.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 12px;color: #FF5B00;position: absolute;right: -20px;top: -25px;z-index: 99;}
     .user-header .account .name a .name-tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
@@ -138,10 +141,10 @@ li{list-style:none}
     .user-header .account .user-info .update{position:relative;height:5.4vw;background:#FFE6DC;border:1px solid #FF5B00;opacity:1;border-radius:2px;color:#FF5B00;font-size:3.2vw;line-height:22px;text-align:center;margin-left:0}
     .user-header .account .user-info .update .name-tips{width:44px;height:19px;line-height:19px;text-align:center;border-radius:10px;background-color:#ffe6dc;font-size:12px;color:#FF5B00;position:absolute;right:0;top:-25px;z-index:99}
     .user-header .account .user-info .update .name-tips:before{content:'';width:6px;height:6px;background-color:#ffe6dc;position:absolute;bottom:-3px;left:12px;z-index:-1;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}
-    .user-header .account .user-info .agency{width:16vw;height:5.4vw;text-align:center;border-radius:2px;font-size:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
+    .user-header .account .user-info .agency{width:16vw;height:5.4vw;text-align:center;border-radius:2.7vw;font-size:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
     .user-header .account .user-info .agency.ordinary{background:#E7EAEF;border:1px solid #627386;color:#627386}
     .user-header .account .user-info .agency.vip{background:#FFF2D5;border:1px solid #FFD54F;color:#E4AA43}
-    .user-header .account .user-info .vip-icon{height:5.4vw;text-align:center;border-radius:2px;font-size:3.2vw;font-weight:400}
+    .user-header .account .user-info .vip-icon{height:5.4vw;text-align:center;border-radius:2.7vw;font-size:3.2vw;font-weight:400}
     .user-header .account .user-info .vip-icon.vip{width:8vw;color:#4E4539;background:#F0CB72}
     .user-header .account .user-info .vip-icon.svip{width:9vw;color:#F0CB72;background:#333333}
     .user-header .account .update a{position: relative;width: 32.6vw;height: 8.5vw;display: block; background-color:#ffe6dc;box-sizing: border-box;border: 1px solid #FF5B00;line-height: 8.5vw;text-align: center;color: #FF5B00;font-size: 3.4vw;border-radius: 4.25vw;}
@@ -152,7 +155,7 @@ li{list-style:none}
     .user-header .message .mIcon:before{width:8vw;height:8vw;background-position:-16.5vw -60.3vw}
     .user-header .message .ellipse,.user-header .message .circular{padding:.6vw;border-radius:3.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw;transform:scale(.7)}
     .user-header .message .circular{padding:0 1vw;}
-    .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF;padding-top: 2.4vw;margin-top: 2.4vw;}
+    .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF;padding-top: 2.4vw;margin-top: 2.4vw;border-bottom: 3vw solid #F5F5F5;}
     .user-content .section .user-main.account{height: 23vw;box-sizing: border-box;padding: 2vw 3.2vw;}
     .user-content .section .user-main.account .account-cell{line-height:9vw;font-size:3.4vw;color: #333333;float: left;margin-right: 10vw;display: block;}
     .user-content .section .user-main.account .account-cell .red{font-size:4.2vw;color: #f94b4b;font-weight: bold;}
@@ -160,8 +163,8 @@ li{list-style:none}
     .user-content .section .user-main.collec .account-collec{height: 20vw;box-sizing: border-box;width: 100%;display: block;}
     .user-content .section .user-main.collec .account-collec img{height: 6.4vw;width: 6.4vw;display: block;margin: 0 auto;margin-bottom: 1vw;}
     .user-content .section .user-main.collec .account-collec p{height: 4.4vw;line-height: 4.4vw;text-align: center;font-size: 3vw;color: #333333;}
-    .user-content .user-main .tabs-left{box-sizing:border-box;width:100vw;padding:.7vw 6vw 4vw 6vw}
-    .user-content .user-main .tabs-left .item{width:20.8vw;height:8.4vw;line-height:8.4vw;text-align:center;border-radius:4.2vw;border:1px solid #b8bfca;font-size:3.3vw;color:#627386;margin:3.3vw 4vw 0 4vw;position:relative}
+    .user-content .user-main .tabs-left{box-sizing:border-box;width:100vw;padding:4vw 2vw;}
+    .user-content .user-main .tabs-left .item{width:20.8vw;height:8vw;line-height:8vw;text-align:center;border-radius:4.2vw;border:1px solid #b8bfca;font-size:3.3vw;color:#627386;margin:2vw 1vw;position:relative;}
     .user-content .user-main .tabs-left .item .icon span{height:4.6vw;line-height:4.6vw;padding:0 .6vw;border-radius:2.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:1vw;top:-2vw}
     .user-content .title{box-sizing:border-box;padding:0 3.2vw;height:10.3vw;line-height:10.3vw;font-size:3.4vw;color:#22272e}
     .user-content .title.order{height:6vw;line-height:6vw;}
@@ -187,7 +190,7 @@ li{list-style:none}
     .svip-content .section div span:first-child{font-size:3.4vw;font-weight:400;color:#F0CB72}
     .svip-content .section div span.error{color: #FF2A2A}
     .svip-content .section div span:last-child{font-size:3.2vw;font-weight:400;color:#BCBCBC;margin-top: 1.6vw}
-    .svip-content .section a.btn{width:19.2vw;height:7.2vw;color:#4E4539;text-align:center;line-height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#FEE9BA),to(#F0CB72));background:-o-linear-gradient(right,#FEE9BA 0%,#F0CB72 100%);background:linear-gradient(270deg,#FEE9BA 0%,#F0CB72 100%);border-radius:2px}
+    .svip-content .section a.btn{width:19.2vw;height:7.2vw;color:#4E4539;text-align:center;line-height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#FEE9BA),to(#F0CB72));background:-o-linear-gradient(right,#FEE9BA 0%,#F0CB72 100%);background:linear-gradient(270deg,#FEE9BA 0%,#F0CB72 100%);border-radius:3.6vw;}
     .svip-content .section a.link{font-size:3.2vw;font-weight:400;color:#F0CB72}
 }
 

+ 107 - 104
src/main/resources/static/css/user-center/member/member-page.css

@@ -102,111 +102,114 @@
 
 /*h5端样式*/
 @media screen and (max-width:768px){
-    .right{padding-top: 17vw;}
-.section{background:#fff;margin: 2vw 0;overflow: hidden}
-.section .section-title{padding:4vw 0 5.2vw 3.3vw;font-size:3.4vw;font-weight:400;color:#22272E}
-.section .section-title span{font-size: 3.2vw;color: #E4AA43;margin-left: 2.4vw}
-.section .section-title a{font-size: 3.2vw;color: #E4AA43;float: right;margin-right: 3.3vw}
-.section .content{-webkit-box-sizing:border-box;box-sizing:border-box}
-/*会员标记*/
-.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
-.vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
-.vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
-.vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}
-.vip-bar .row1 span:last-child{margin-top:0;margin-left:2.4vw}
-.vip-bar .right-box{-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-.vip-bar .right-box a{display:block}
-.vip-bar .right-box a.link{font-size:2.8vw;color:#55331D}
-.vip-bar .right-box a.btn{width:19.2vw;height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:7.2vw;text-align:center;font-size:3.2vw;color:#F0CB72;margin-top:2.4vw}
-/*套餐价格*/
-.combo-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
-.combo-list > div:first-child{
-    width:93.2vw;
-    display:-webkit-box;
-    display:-ms-flexbox;
-    display:flex;
-    -webkit-box-pack:justify;
-    -ms-flex-pack:justify;
-    /*justify-content:space-between;*/
-    -webkit-box-align:center;
-    -ms-flex-align:center;
-    align-items:center;
-    column-gap:16px;
-}
-.copy-p{padding-top: 8vw;}
-.combo-list .combo{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:29vw;height:31.4vw;background:#FFFFFF;border:1px solid #F0F0F0;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}
-.combo-list .combo.recommend::after{content:"推荐";position:absolute;top:-1.4vw;left:-1px;z-index:9;width:10vw;height:4.8vw;text-align:center;line-height:4.8vw;background:#FF2A2A;color:#fff;font-size:2.8vw}
-.combo-list .combo.active{background:#FDF8EE;border:1px solid #F0CC8C}
-.combo-list .combo .how-mounts{font-size:3.6vw;font-weight:400;color:#22272E}
-.combo-list .combo .price{padding:2.6vw 0;font-size:5.6vw;font-weight:bold;color:#FF2A2A}
-.combo-list .combo .price > i{font-style:unset;font-size:3.7vw;font-weight:400;color:#FF2A2A}
-.combo-list .combo .average{font-size:3.2vw;font-weight:400;color:#627386}
-.combo-list > div:last-child{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:8vw;margin-bottom: 4.4vw}
-.combo-list .pay-btn{width:93.2vw;height:11.2vw;background:-webkit-gradient(linear,left top,right top,from(#FEE9BA),to(#F0CB72));background:-o-linear-gradient(left,#FEE9BA 0%,#F0CB72 100%);background:linear-gradient(90deg,#FEE9BA 0%,#F0CB72 100%);border-radius:5.6vw;font-size:4.3vw;font-weight:bold;line-height:21px;color:#55331D;}
-.combo-list .pay-btn.plain{margin-top:15px;background:transparent;border:1px solid #F0CB72;border-radius:5.6vw;font-weight:400;color:#55331D;-webkit-box-sizing:border-box;box-sizing:border-box}
-.combo-list .pay-btn > a{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:100%;color:inherit}
-.combo-list .pay-btn > a:hover{color:unset}
-/*特权服务*/
-.service-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}
-.service-list.two{display: block;}
-.service-list>div{width:25%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-bottom:4.8vw}
-.service-list>div img{display:block;width:11.8vw;height:11.8vw}
-.service-list>div .tit{font-size:3.2vw;font-weight:400;color:#333333;padding:2.4vw 0 1.2vw}
-.service-list>div .sub-tit{font-size:2.8vw;font-weight:400;color:#B8BFCA}
-/*优惠券*/
-.coupon-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 3.3vw}
-.coupon-list>div{position:relative;width:45vw;height:19.8vw;padding-left:4.9vw;margin-bottom:3.4vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:45vw 19.8vw}
-.coupon-list>div.un-received{background-image:url(/img/member/pc-cm-svip-coupon-able.png)}
-.coupon-list>div .type{position:absolute;left:0;top:0;z-index:9;width:11vw;height:3.9vw;font-size:2.4vw;text-align:center;line-height:3.9vw;background:#E4AA43;border-radius:2px 0px 2px 0px}
-.coupon-list>div .amount{padding-top:3.6vw;font-size:5.2vw;font-weight:bold;color:#55331D}
-.coupon-list>div .amount>i{font-size:2.8vw;font-weight:400;color:#55331D;font-style:unset}
-.coupon-list>div .condition{font-size:2.6vw;font-weight:400;color:#55331D}
-.coupon-list>div .receive-btn{width:10vw;height:100%;position:absolute;right:0;top:0;z-index:9;font-size:3vw;font-weight:400;color:#55331D;-webkit-writing-mode:vertical-lr;-ms-writing-mode:tb-lr;writing-mode:vertical-lr;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;cursor:pointer}
-/*商品列表*/
-.goods-list{width:100vw;overflow-x:scroll;white-space:nowrap;padding-bottom:4.8vw}
-.goods-list .goods a:hover{color:unset}
-.goods-list .goods{display:inline-block;width:34.9vw;margin-right:2.4vw}
-.goods-list .goods:first-child{margin-left:3.3vw}
+    #memberPage{padding-top: 27vw;}
+    footer{display:none}
+    .section{background:#fff;margin: 2vw 0;overflow: hidden}
+    .section .section-title{padding:4vw 0 5.2vw 3.3vw;font-size:3.4vw;font-weight:400;color:#22272E}
+    .section .section-title span{font-size: 3.2vw;color: #E4AA43;margin-left: 2.4vw}
+    .section .section-title a{font-size: 3.2vw;color: #E4AA43;float: right;margin-right: 3.3vw}
+    .section .content{-webkit-box-sizing:border-box;box-sizing:border-box}
+    /*会员标记*/
+    .vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
+    .vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
+    .vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
+    .vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}
+    .vip-bar .row1 span:last-child{margin-top:0;margin-left:2.4vw}
+    .vip-bar .right-box{-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .vip-bar .right-box a{display:block}
+    .vip-bar .right-box a.link{font-size:2.8vw;color:#55331D}
+    .vip-bar .right-box a.btn{width:19.2vw;height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:3.6vw;line-height:7.2vw;text-align:center;font-size:3.2vw;color:#F0CB72;margin-top:2.4vw}
+    /*套餐价格*/
+    .combo-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
+    .combo-list > div:first-child{
+        width:93.2vw;
+        display:-webkit-box;
+        display:-ms-flexbox;
+        display:flex;
+        -webkit-box-pack:justify;
+        -ms-flex-pack:justify;
+        /*justify-content:space-between;*/
+        -webkit-box-align:center;
+        -ms-flex-align:center;
+        align-items:center;
+        column-gap:16px;
+    }
+    .copy-p{padding-top: 8vw;}
+    .combo-list .combo{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:29vw;height:31.4vw;background:#FFFFFF;border:1px solid #F0F0F0;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}
+    .combo-list .combo.recommend::after{content:"推荐";position:absolute;top:-1.4vw;left:-1px;z-index:9;width:10vw;height:4.8vw;text-align:center;line-height:4.8vw;background:#FF2A2A;color:#fff;font-size:2.8vw}
+    .combo-list .combo.active{background:#FDF8EE;border:1px solid #F0CC8C}
+    .combo-list .combo .how-mounts{font-size:3.6vw;font-weight:400;color:#22272E}
+    .combo-list .combo .price{padding:2.6vw 0;font-size:5.6vw;font-weight:bold;color:#FF2A2A}
+    .combo-list .combo .price > i{font-style:unset;font-size:3.7vw;font-weight:400;color:#FF2A2A}
+    .combo-list .combo .average{font-size:3.2vw;font-weight:400;color:#627386}
+    .combo-list > div:last-child{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:8vw;margin-bottom: 4.4vw}
+    .combo-list .pay-btn{width:93.2vw;height:11.2vw;background:-webkit-gradient(linear,left top,right top,from(#FEE9BA),to(#F0CB72));background:-o-linear-gradient(left,#FEE9BA 0%,#F0CB72 100%);background:linear-gradient(90deg,#FEE9BA 0%,#F0CB72 100%);border-radius:5.6vw;font-size:4.3vw;font-weight:bold;line-height:21px;color:#55331D;}
+    .combo-list .pay-btn.plain{margin-top:15px;background:transparent;border:1px solid #F0CB72;border-radius:5.6vw;font-weight:400;color:#55331D;-webkit-box-sizing:border-box;box-sizing:border-box}
+    .combo-list .pay-btn > a{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:100%;color:inherit}
+    .combo-list .pay-btn > a:hover{color:unset}
+    /*特权服务*/
+    .service-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}
+    .service-list.two{display: block;}
+    .service-list>div{width:25%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-bottom:4.8vw}
+    .service-list>div img{display:block;width:11.8vw;height:11.8vw}
+    .service-list>div .tit{font-size:3.2vw;font-weight:400;color:#333333;padding:2.4vw 0 1.2vw}
+    .service-list>div .sub-tit{font-size:2.8vw;font-weight:400;color:#B8BFCA}
+    /*优惠券*/
+    .coupon-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 3.3vw}
+    .coupon-list>div{position:relative;width:45vw;height:19.8vw;padding-left:4.9vw;margin-bottom:3.4vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:45vw 19.8vw}
+    .coupon-list>div.un-received{background-image:url(/img/member/pc-cm-svip-coupon-able.png)}
+    .coupon-list>div .type{position:absolute;left:0;top:0;z-index:9;width:11vw;height:3.9vw;font-size:2.4vw;text-align:center;line-height:3.9vw;background:#E4AA43;border-radius:2px 0px 2px 0px}
+    .coupon-list>div .amount{padding-top:3.6vw;font-size:5.2vw;font-weight:bold;color:#55331D}
+    .coupon-list>div .amount>i{font-size:2.8vw;font-weight:400;color:#55331D;font-style:unset}
+    .coupon-list>div .condition{font-size:2.6vw;font-weight:400;color:#55331D}
+    .coupon-list>div .receive-btn{width:10vw;height:100%;position:absolute;right:0;top:0;z-index:9;font-size:3vw;font-weight:400;color:#55331D;-webkit-writing-mode:vertical-lr;-ms-writing-mode:tb-lr;writing-mode:vertical-lr;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;cursor:pointer}
+    /*商品列表*/
+    .goods-list{width:100vw;overflow-x:scroll;white-space:nowrap;padding-bottom:4.8vw}
+    .goods-list .goods a:hover{color:unset}
+    .goods-list .goods{display:inline-block;width:34.9vw;margin-right:2.4vw}
+    .goods-list .goods:first-child{margin-left:3.3vw}
 
-.goods-list .goods img{border: 1px dashed #f1f1f1; box-sizing: border-box;}
+    .goods-list .goods img{border: 1px dashed #f1f1f1; box-sizing: border-box;}
+
+    .goods-list .goods .goods-title{white-space:pre-wrap;height:9.2vw;margin-top:0.8vw;font-size:3.4vw;font-weight:400;line-height:4.7vw;color:#627386}
+    .goods-list .goods .goods-tag{margin:1.6vw 0}
+    .goods-list .goods .goods-tag .tag{line-height:4.2vw;font-size:2.8vw;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 0.5vw}
+    .goods-list .goods .goods-tag .tag.styl1{color:#F94B4B;background:#FFF1EB;border:1px solid #F94B4B}
+    .goods-list .goods .goods-tag .tag.styl2{color:#FF5B00;background:#FFF1EB;border:1px solid #F94B4B}
+    /*会员标签*/
+    .svip-tag{height:4.2vw;letter-spacing:0;overflow: hidden;display: inline-block;vertical-align: middle;}
+    .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:7.8vw;height:4.2vw;text-align:center;line-height:4.2vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:6.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.2vw;height: 4.2vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .svip-tag .svip-price span{color: #333}
+    .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+    .goods-list .good .goods-price del{color: #B8BFCA}
+
+    .pay-amount-bottom{display: none; opacity: 0}
+    /*续费弹窗*/
+    .renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:72.8vw;background:#fff;-webkit-box-shadow:0px 10px 20px rgba(0,0,0,0.16);box-shadow:0px 10px 20px rgba(0,0,0,0.16);opacity:1;border-radius:1.2vw;z-index:9999}
+    .renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4.8vw 4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:3.6vw;font-weight:bold;color:#4A4F58;opacity:1}
+    .renew-popup .popup-title .close{position:absolute;right:2.4vw;top:1vw;font-size:7vw;font-weight:normal;cursor:pointer}
+    .renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
+    .renew-popup .combo-list>div:first-child{-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;width:100%;margin-top:5.8vw}
+    .renew-popup .combo-list>div:last-child{width:100%;margin-top:8vw}
+    .renew-popup .combo-list .combo{width:20.6vw;height:22.4vw}
+    .renew-popup .combo-list .combo.recommend::after{width:8vw;height:4vw;line-height:4vw;top:-1.55vw}
+    .renew-popup .combo-list .combo .how-mounts{font-size:3.2vw}
+    .renew-popup .combo-list .combo .price{font-size:3.9vw;padding:1.2vw 0}
+    .renew-popup .combo-list .combo .price i{font-size:2.6vw}
+    .renew-popup .combo-list .combo .average{font-size:2.6vw}
+    .renew-popup .combo-list .pay-btn{width:66.6vw;height:9.9vw;font-size:3.2vw}
+    .renew-popup .combo-list .pay-btn.plain{margin-top:3.3vw}
+    /*遮罩*/
+    .mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
+    /*确认支付,立即支付弹窗*/
+    .payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:46vw;padding:4.4vw;background:#FFFFFF;opacity:1;border-radius:1.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
+    .payment-confirm-popup .popup-title{padding-bottom:3.2vw;padding-top:2.4vw;font-size:3.8vw;font-weight:bold;color:#4A4F58}
+    .payment-confirm-popup .popup-title .close{position:absolute;right:3.2vw;top:1.2vw;color:#d4d4d4;font-size:5.6vw;font-weight:400;cursor:pointer}
+    .payment-confirm-popup .content{font-size:3.6vw;font-weight:400;line-height:6.4vw;color:#22272E;opacity:1}
+    .payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:10.4vw}
+    .payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:66.6vw;height:9.9vw;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
 
-.goods-list .goods .goods-title{white-space:pre-wrap;height:9.2vw;margin-top:0.8vw;font-size:3.4vw;font-weight:400;line-height:4.7vw;color:#627386}
-.goods-list .goods .goods-tag{margin:1.6vw 0}
-.goods-list .goods .goods-tag .tag{line-height:4.2vw;font-size:2.8vw;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 0.5vw}
-.goods-list .goods .goods-tag .tag.styl1{color:#F94B4B;background:#FFF1EB;border:1px solid #F94B4B}
-.goods-list .goods .goods-tag .tag.styl2{color:#FF5B00;background:#FFF1EB;border:1px solid #F94B4B}
-/*会员标签*/
-.svip-tag{height:4.2vw;letter-spacing:0;overflow: hidden;display: inline-block;vertical-align: middle;}
-.svip-tag .svip-icon{position:relative;z-index:9;float: left; width:7.8vw;height:4.2vw;text-align:center;line-height:4.2vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
-.svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-.svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:6.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.2vw;height: 4.2vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
-.svip-tag .svip-price span{color: #333}
-.svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
-.goods-list .good .goods-price del{color: #B8BFCA}
 
-.pay-amount-bottom{display: none; opacity: 0}
-/*续费弹窗*/
-.renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:72.8vw;background:#fff;-webkit-box-shadow:0px 10px 20px rgba(0,0,0,0.16);box-shadow:0px 10px 20px rgba(0,0,0,0.16);opacity:1;border-radius:1.2vw;z-index:9999}
-.renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4.8vw 4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:3.6vw;font-weight:bold;color:#4A4F58;opacity:1}
-.renew-popup .popup-title .close{position:absolute;right:2.4vw;top:1vw;font-size:7vw;font-weight:normal;cursor:pointer}
-.renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
-.renew-popup .combo-list>div:first-child{-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;width:100%;margin-top:5.8vw}
-.renew-popup .combo-list>div:last-child{width:100%;margin-top:8vw}
-.renew-popup .combo-list .combo{width:20.6vw;height:22.4vw}
-.renew-popup .combo-list .combo.recommend::after{width:8vw;height:4vw;line-height:4vw;top:-1.55vw}
-.renew-popup .combo-list .combo .how-mounts{font-size:3.2vw}
-.renew-popup .combo-list .combo .price{font-size:3.9vw;padding:1.2vw 0}
-.renew-popup .combo-list .combo .price i{font-size:2.6vw}
-.renew-popup .combo-list .combo .average{font-size:2.6vw}
-.renew-popup .combo-list .pay-btn{width:66.6vw;height:9.9vw;font-size:3.2vw}
-.renew-popup .combo-list .pay-btn.plain{margin-top:3.3vw}
-/*遮罩*/
-.mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
-/*确认支付,立即支付弹窗*/
-.payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:46vw;padding:4.4vw;background:#FFFFFF;opacity:1;border-radius:1.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
-.payment-confirm-popup .popup-title{padding-bottom:3.2vw;padding-top:2.4vw;font-size:3.8vw;font-weight:bold;color:#4A4F58}
-.payment-confirm-popup .popup-title .close{position:absolute;right:3.2vw;top:1.2vw;color:#d4d4d4;font-size:5.6vw;font-weight:400;cursor:pointer}
-.payment-confirm-popup .content{font-size:3.6vw;font-weight:400;line-height:6.4vw;color:#22272E;opacity:1}
-.payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:10.4vw}
-.payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:66.6vw;height:9.9vw;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
 }

+ 95 - 91
src/main/resources/static/css/user-center/member/member-record.css

@@ -1,91 +1,95 @@
-
-/*pc端*/
-@media screen and (min-width:768px){
-#memberPage{position: relative;margin-bottom: 105px;}
-.right{width:968px;overflow:hidden}
-.pageWrap{width: 968px}
-/*会标标记*/
-.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(/img/member/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
-.vip-bar>div>span:first-child{font-size:16px;line-height:21px;color:#55331D}
-.vip-bar>div>span:last-child{font-size:14px;color:#55331D;opacity:1;margin-left:16px}
-.vip-bar>div>span.error{color:#FF2A2A}
-.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-.vip-bar>div>a{display:block;margin-left:16px}
-.vip-bar>div>a.link{font-size:14px;color:#55331D}
-.vip-bar>div>a.btn{width:104px;height:36px;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:36px;text-align:center;font-size:16px;color:#F0CB72}
-/*记录列表*/
-.record-list{width:100%;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 24px}
-.record-list .record{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;padding:24px 0;-webkit-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #E2E7EF}
-.record-list .record:first-child{border-top:0}
-.record-list .record .desc{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
-.record-list .record .desc>span:first-child{font-size:16px;font-weight:400;color:#22272E}
-.record-list .record .desc>span:last-child{font-size:14px;font-weight:400;color:#627386;margin-top:12px}
-.record-list .record .amount span{font-size:16px;font-weight:400;color:#FF5B00}
-/*续费弹窗*/
-.renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:540px;height:424px;background:#FFFFFF;opacity:1;border-radius:2px;z-index:9999}
-.renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:50px;padding:0 16px 0 24px;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:16px;font-weight:bold;color:#4A4F58;opacity:1;border-bottom:1px solid #E2E7EF}
-.renew-popup .popup-title .close{color: #d4d4d4;font-size:30px;font-weight:400;cursor:pointer}
-.renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
-.renew-popup .combo-list>div:first-child{margin-top:37px}
-.renew-popup .combo-list>div:last-child{margin-top:56px}
-/*遮罩*/
-.mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
-/*确认支付 立即支付弹窗*/
-.payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:338px;height:168px;padding:16px;background:#FFFFFF;opacity:1;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box}
-.payment-confirm-popup .popup-title{padding-bottom:16px;font-size:16px;font-weight:bold;color:#4A4F58}
-.payment-confirm-popup .popup-title .close{position:absolute;right:16px;top:4px;color:#d4d4d4;font-size:30px;font-weight:400;cursor:pointer}
-.payment-confirm-popup .content{font-size:14px;font-weight:400;line-height:24px;color:#22272E;opacity:1}
-.payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:48px}
-.payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:104px;height:32px;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
-}
-
-/*h5*/
-@media screen and (max-width:768px){
-/*会员标记*/
-.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
-.vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
-.vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
-.vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}
-.vip-bar .row1 span:last-child{margin-top:0;margin-left:2.4vw}
-.vip-bar .right-box{-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-.vip-bar .right-box a{display:block}
-.vip-bar .right-box a.link{font-size:2.8vw;color:#55331D}
-.vip-bar .right-box a.btn{width:19.2vw;height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:7.2vw;text-align:center;font-size:3.2vw;color:#F0CB72;margin-top:2.4vw}
-/*记录列表*/
-.record-list{padding:0 3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:#fff}
-.record-list .record{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;padding:3.2vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #B8BFCA}
-.record-list .record:first-child{border-top:0}
-.record-list .record:first-child{border-top:0}
-.record-list .record .desc{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
-.record-list .record .desc > span:first-child{font-size:3.6vw;font-weight:400;color:#22272E}
-.record-list .record .desc > span:last-child{font-size:2.8vw;font-weight:400;color:#627386;margin-top:2vw}
-.record-list .record .amount span{font-size:3.8vw;font-weight:400;color:#FF5B00}
-/*续费弹窗*/
-.renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:72.8vw;background:#fff;-webkit-box-shadow:0px 10px 20px rgba(0,0,0,0.16);box-shadow:0px 10px 20px rgba(0,0,0,0.16);opacity:1;border-radius:1.2vw;z-index:9999}
-.renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4.8vw 4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:3.6vw;font-weight:bold;color:#4A4F58;opacity:1}
-.renew-popup .popup-title .close{position:absolute;right:2.4vw;top:1vw;font-size:7vw;font-weight:normal;cursor:pointer}
-.renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
-.renew-popup .combo-list>div:first-child{-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;width:100%;margin-top:5.8vw}
-.renew-popup .combo-list>div:last-child{width:100%;margin-top:8vw}
-.renew-popup .combo-list .combo{width:20.6vw;height:22.4vw}
-.renew-popup .combo-list .combo.recommend::after{width:8vw;height:4vw;line-height:4vw;top:-1.55vw}
-.renew-popup .combo-list .combo .how-mounts{font-size:3.2vw}
-.renew-popup .combo-list .combo .price{font-size:3.9vw;padding:1.2vw 0}
-.renew-popup .combo-list .combo .price i{font-size:2.6vw}
-.renew-popup .combo-list .combo .average{font-size:2.6vw}
-.renew-popup .combo-list .pay-btn{width:66.6vw;height:9.9vw;font-size:3.2vw}
-.renew-popup .combo-list .pay-btn.plain{margin-top:3.3vw}
-/*遮罩*/
-.mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
-/*确认支付,立即支付弹窗*/
-.payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:46vw;padding:4.4vw;background:#FFFFFF;opacity:1;border-radius:1.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
-.payment-confirm-popup .popup-title{padding-bottom:3.2vw;padding-top:2.4vw;font-size:3.8vw;font-weight:bold;color:#4A4F58}
-.payment-confirm-popup .popup-title .close{position:absolute;right:3.2vw;top:1.2vw;color:#d4d4d4;font-size:5.6vw;font-weight:400;cursor:pointer}
-.payment-confirm-popup .content{font-size:3.6vw;font-weight:400;line-height:6.4vw;color:#22272E;opacity:1}
-.payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:10.4vw}
-.payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:66.6vw;height:9.9vw;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
-/*加载更多*/
-.show-more{width:100vw;margin:2.4vw 0;text-align:center}
-.show-more .more-btn{display:inline-block;width:20vw;height:6vw;font-size:3vw;line-height:6vw;border:1px solid #ccc}
-.show-more .more-btn::after{content:'';width:4vw;height:2.4vw;display:inline-block;background:url(/img/base/icon_m.png) no-repeat;background-size:100vw auto;background-position:-51.5vw -2vw}
-}
+
+/*pc端*/
+@media screen and (min-width:768px){
+#memberPage{position: relative;margin-bottom: 105px;}
+.right{width:968px;overflow:hidden}
+.pageWrap{width: 968px}
+/*会标标记*/
+.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(/img/member/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
+.vip-bar>div>span:first-child{font-size:16px;line-height:21px;color:#55331D}
+.vip-bar>div>span:last-child{font-size:14px;color:#55331D;opacity:1;margin-left:16px}
+.vip-bar>div>span.error{color:#FF2A2A}
+.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+.vip-bar>div>a{display:block;margin-left:16px}
+.vip-bar>div>a.link{font-size:14px;color:#55331D}
+.vip-bar>div>a.btn{width:104px;height:36px;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:36px;text-align:center;font-size:16px;color:#F0CB72}
+/*记录列表*/
+.record-list{width:100%;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 24px}
+.record-list .record{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;padding:24px 0;-webkit-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #E2E7EF}
+.record-list .record:first-child{border-top:0}
+.record-list .record .desc{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
+.record-list .record .desc>span:first-child{font-size:16px;font-weight:400;color:#22272E}
+.record-list .record .desc>span:last-child{font-size:14px;font-weight:400;color:#627386;margin-top:12px}
+.record-list .record .amount span{font-size:16px;font-weight:400;color:#FF5B00}
+/*续费弹窗*/
+.renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:540px;height:424px;background:#FFFFFF;opacity:1;border-radius:2px;z-index:9999}
+.renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:50px;padding:0 16px 0 24px;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:16px;font-weight:bold;color:#4A4F58;opacity:1;border-bottom:1px solid #E2E7EF}
+.renew-popup .popup-title .close{color: #d4d4d4;font-size:30px;font-weight:400;cursor:pointer}
+.renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
+.renew-popup .combo-list>div:first-child{margin-top:37px}
+.renew-popup .combo-list>div:last-child{margin-top:56px}
+/*遮罩*/
+.mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
+/*确认支付 立即支付弹窗*/
+.payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:338px;height:168px;padding:16px;background:#FFFFFF;opacity:1;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box}
+.payment-confirm-popup .popup-title{padding-bottom:16px;font-size:16px;font-weight:bold;color:#4A4F58}
+.payment-confirm-popup .popup-title .close{position:absolute;right:16px;top:4px;color:#d4d4d4;font-size:30px;font-weight:400;cursor:pointer}
+.payment-confirm-popup .content{font-size:14px;font-weight:400;line-height:24px;color:#22272E;opacity:1}
+.payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:48px}
+.payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:104px;height:32px;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
+}
+
+/*h5*/
+@media screen and (max-width:768px){
+    #memberRecord{padding-top: 27vw;}
+    body{background: #FFFFFF;}
+    footer{display:none}
+    /*会员标记*/
+    .vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
+    .vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
+    .vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
+    .vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}
+    .vip-bar .row1 span:last-child{margin-top:0;margin-left:2.4vw}
+    .vip-bar .right-box{-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .vip-bar .right-box a{display:block}
+    .vip-bar .right-box a.link{font-size:2.8vw;color:#55331D}
+    .vip-bar .right-box a.btn{width:19.2vw;height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:7.2vw;text-align:center;font-size:3.2vw;color:#F0CB72;margin-top:2.4vw}
+    /*记录列表*/
+    .record-list{padding:0 3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:#fff}
+    .record-list .record{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;padding:3.2vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #B8BFCA}
+    .record-list .record:first-child{border-top:0}
+    .record-list .record:first-child{border-top:0}
+    .record-list .record .desc{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
+    .record-list .record .desc > span:first-child{font-size:3.6vw;font-weight:400;color:#22272E}
+    .record-list .record .desc > span:last-child{font-size:2.8vw;font-weight:400;color:#627386;margin-top:2vw}
+    .record-list .record .amount span{font-size:3.8vw;font-weight:400;color:#FF5B00}
+    /*续费弹窗*/
+    .renew-popup{position:fixed;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:72.8vw;background:#fff;-webkit-box-shadow:0px 10px 20px rgba(0,0,0,0.16);box-shadow:0px 10px 20px rgba(0,0,0,0.16);opacity:1;border-radius:1.2vw;z-index:9999}
+    .renew-popup .popup-title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4.8vw 4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:3.6vw;font-weight:bold;color:#4A4F58;opacity:1}
+    .renew-popup .popup-title .close{position:absolute;right:2.4vw;top:1vw;font-size:7vw;font-weight:normal;cursor:pointer}
+    .renew-popup .combo-list{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}
+    .renew-popup .combo-list>div:first-child{-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;width:100%;margin-top:5.8vw}
+    .renew-popup .combo-list>div:last-child{width:100%;margin-top:8vw}
+    .renew-popup .combo-list .combo{width:20.6vw;height:22.4vw}
+    .renew-popup .combo-list .combo.recommend::after{width:8vw;height:4vw;line-height:4vw;top:-1.55vw}
+    .renew-popup .combo-list .combo .how-mounts{font-size:3.2vw}
+    .renew-popup .combo-list .combo .price{font-size:3.9vw;padding:1.2vw 0}
+    .renew-popup .combo-list .combo .price i{font-size:2.6vw}
+    .renew-popup .combo-list .combo .average{font-size:2.6vw}
+    .renew-popup .combo-list .pay-btn{width:66.6vw;height:9.9vw;font-size:3.2vw}
+    .renew-popup .combo-list .pay-btn.plain{margin-top:3.3vw}
+    /*遮罩*/
+    .mask{content:"";display:block;position:fixed;width:100vw;height:100vh;background:#333333;opacity:0.7;left:0;top:0;z-index:9998}
+    /*确认支付,立即支付弹窗*/
+    .payment-confirm-popup{position:fixed;top:50%;left:50%;z-index:99999;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:74.6vw;height:46vw;padding:4.4vw;background:#FFFFFF;opacity:1;border-radius:1.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
+    .payment-confirm-popup .popup-title{padding-bottom:3.2vw;padding-top:2.4vw;font-size:3.8vw;font-weight:bold;color:#4A4F58}
+    .payment-confirm-popup .popup-title .close{position:absolute;right:3.2vw;top:1.2vw;color:#d4d4d4;font-size:5.6vw;font-weight:400;cursor:pointer}
+    .payment-confirm-popup .content{font-size:3.6vw;font-weight:400;line-height:6.4vw;color:#22272E;opacity:1}
+    .payment-confirm-popup .popup-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:10.4vw}
+    .payment-confirm-popup .popup-btn .confirm-btn{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:66.6vw;height:9.9vw;background:#FF5B00;opacity:1;border-radius:2px;font-size:14px;font-weight:400;color:#FFFFFF}
+    /*加载更多*/
+    .show-more{width:100vw;margin:2.4vw 0;text-align:center}
+    .show-more .more-btn{display:inline-block;width:20vw;height:6vw;font-size:3vw;line-height:6vw;border:1px solid #ccc}
+    .show-more .more-btn::after{content:'';width:4vw;height:2.4vw;display:inline-block;background:url(/img/base/icon_m.png) no-repeat;background-size:100vw auto;background-position:-51.5vw -2vw}
+
+}

+ 1 - 0
src/main/resources/static/css/user-center/message.css

@@ -39,6 +39,7 @@ li{list-style:none}
 */
 @media screen and (max-width:768px){
     footer{display: none;}
+    #dashboard{ padding-top: 27vw; }
     .content{width: 100%;height: auto;background-color: #FFFFFF;box-sizing: border-box;padding:3.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;padding-bottom:10px;}
     .content .title{width: 100%;height: auto;line-height: 8.4vw;color: #22272e;font-size: 3.4vw;}
     .content .title .tabs-item.active a{color: #FF5B00;}

+ 5 - 3
src/main/resources/static/css/user-center/operation/list.css

@@ -53,13 +53,15 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #operationPage{padding-top: 27vw;}
+    footer{display: none;}
     .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;font-size:3.1vw;overflow: hidden;}
+    .search{float: left; width:50%;height: 10vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 10vw;font-size:3.1vw;overflow: hidden;border-radius: 5vw;}
     .search span.label{padding-left: 2.7vw;color: #627386}
     .search-input {height: -webkit-fill-available;width: 70vw;font-size:3.1vw;border: none;border-radius: .27vw}
     input::placeholder{color: #9aa5b5}
-    .header-button a{width: 35.3vw;height: 11.2vw;border: 1px solid #FF5B00;text-align: center;line-height: 11.2vw;background: #ffe6dc;
-    display: inline-block;color: #FF5B00;font-size: 3.7vw}
+    .header-button a{width: 35.3vw;height: 10vw;border: 1px solid #FF5B00;text-align: center;line-height: 10vw;background: #ffe6dc;display: inline-block;color: #FF5B00;font-size: 3.7vw;border-radius: 5vw;}
     .header-button .btn-serch{color: #fff;background: #FF5B00}
     .header-button{text-align:center;padding: 1.7vw 0;}
     .section .list{margin: 2.7vw 0;background: #fff;padding: 2.7vw 3.3vw;}

+ 203 - 201
src/main/resources/static/css/user-center/order/detail.css

@@ -1,201 +1,203 @@
-@charset "utf-8";
-li{list-style:none}
-/**
- * PC端
- */
-@media screen and (min-width:768px){
-    /*订单详情顶部信息*/
-    .navLayout{min-height: auto;}
-    .navLayout .right{float:right;width:968px}
-    .order-container{width: 100%;min-height:410px;}
-    .order-container .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
-    .order-container .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
-    .order-container .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
-    .order-container .title a .icon:before{width: 18px;height: 18px;background-position: -304px -32px;}
-    .order-container .section{width: 100%;height: auto;}
-    .order-container .section .section-info {margin-bottom: 8px;box-sizing:border-box;padding:10px 20px;background-color: #FFFFFF;}
-    .order-container .section .section-info .order-title{width:100%;box-sizing:border-box;height:40px;position:relative;padding-left:45px;margin-bottom: 0;}
-    .order-container .section .section-info .order-title .bag{display: block;position: absolute;left:0;top: 12px; width: 36px;height: 16px;background-image: linear-gradient(335deg,#FF5B00 0%,#ffb496 100%);border-radius: 2px;font-size: 10px;color: #FFFFFF;line-height: 16px;text-align: center;}
-    .order-container .section .section-info .order-title .title-name{line-height:  40px;font-size: 14px;color: #22272e;}
-    .order-container .section .section-info .order-title .title-name p{display:inline-block;margin-right:10px;}
-    .order-container .section .section-info .order-title .title-name p.state{color: #FF5B00;margin-left: 10px;font-weight: normal;}
-    .order-container .section .section-info .order-title .title-type{float:right;width:40px;height: 40px;background: url("/img/order/second.png")center center no-repeat;background-size: cover;}
-    .order-container .section .section-info .order-title .title-time{position:absolute;right:0;top:0;line-height:40px;font-size: 12px;color: #9aa5b5;}
-    .order-container .section .section-info .order-content{width:100%;height:auto;}
-    .order-container .section .section-info .order-content .order-item{width:100%;}
-    .order-container .section .section-info .order-content .order-item p{display:inline-block;margin-right:45px;line-height: 36px;color: #627386;font-size: 14px;}
-    .order-container .section .section-info .order-content .order-item p.org{}
-    .order-container .section .section-info .order-content .order-item p.copy{margin-left:20px;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
-    .order-container .section .section-info .order-content .order-item p span{margin-left: 5px;}
-    .order-container .section .section-info .order-content .order-item p .red{color: #f94b4b;}
-    .order-container .section .section-info .order-content .order-item p .org{color: #FF5B00;}
-    .order-container .section .section-info .order-content .order-item p .none{color:#22272e;}
-    /*商品信息*/
-    .order-container .section-list{margin-bottom: 10px;width: 100%;height: auto;box-sizing:border-box;}
-    .order-container .section-shopinfo{width: 100%;height: auto;margin-bottom: 5px;box-sizing: border-box;padding: 0;background-color: #FFFFFF;}
-    .order-container .section-shopinfo .title{width: 100%;height: 56px;box-sizing: border-box;padding: 8px 20px;border-bottom: 1px solid #e2e7ef;}
-    .order-container .section-shopinfo .title .logo{width: 39px;height: 39px;box-sizing: border-box;border: 1px solid #e2e7ef;float: left;display: block;margin-right: 5px;}
-    .order-container .section-shopinfo .title .name{line-height: 40px;float: left;font-size: 14px;color: #22272E;text-align: left;margin-right: 20px;}
-    .order-container .section-shopinfo .product{width: 100%;height: auto;box-sizing: border-box;padding: 0 20px;}
-    .order-container .section-shopinfo .section-prosinfo{width: 100%;height: 126px;padding: 16px 0 0;}
-    .order-container .section-shopinfo .product-t{width: 100%;min-height: 100px;float: left;}
-    .order-container .section-shopinfo .product-t .image{width: 98px;height: 98px;float: left;border: 1px solid #e2e7ef;margin-right: 10px;position: relative;}
-    .order-container .section-shopinfo .product-t .image img{width: 98px;height: 98px;display: block;}
-    .order-container .section-shopinfo .product-t .image .tip{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%);}
-    .order-container .section-shopinfo .product-t .text{width: 810px;float: left;}
-    .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
-    .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
-    .order-container .section-shopinfo .product-t .info>.col{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:25%}
-    .order-container .section-shopinfo .product-t .info>.col .red{color: #FF2A2A;}
-    .order-container .section-shopinfo .product-t .info>div.col{width: 40%;}
-    /*会员标签*/
-    .order-container .section-shopinfo .product-t .info>.col .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px;}
-    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
-    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:25px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
-    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price span{color: #333}
-
-    .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
-    .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
-    .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
-    .price-total span{color:#f94b4b}
-    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 8px 20px;}
-    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:50px;line-height: 34px;color: #627386;font-size: 14px;float: left;}
-    .order-container .section-shopinfo .shopinfo-bott .red{color: #f94b4b;}
-    .order-container .section-shopinfo .shopinfo-bott .org{color: #FF5B00;}
-    .order-container .section-shopinfo .shopinfo-bott .none{color:#22272e;}
-    .order-container .section-shopinfo .shopinfo-note{width: 100%;height: 30px;line-height: 30px;padding: 10px 20px 16px 20px;}
-    .order-container .section-shopinfo .shopinfo-note p{color: #22272E;}
-    /*发票信息*/
-    .section-showInfo{ width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;margin-bottom: 10px;}
-    .section-showInfo .title-name {color: #22272e;font-size: 14px;margin-bottom: 20px}
-    .section-showInfo .order-item {display: flex}
-    .section-showInfo .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 33%}
-    /*转账信息*/
-    .section-showInfo .vouch-list{ width: 100%;height: auto;box-sizing: border-box;padding: 16px 0; border-bottom: 1px solid #E2E7EF;}
-    .section-showInfo .refund-item-p{width: 100%;line-height: 30px;font-size: 14px;color: #666666;float: left;}
-    .section-showInfo .refund-item-imgs{width: 100%;height: auto;margin: 5px 0;float: left;}
-    .section-showInfo .refund-item-imgs .item-image{width: 100px;height: 100px;margin-right: 10px;border: 1px dashed #E1E1E1;float: left;}
-    .section-showInfo .refund-item-imgs .item-image a{width: 100px;height: 100px;display: block;}
-    .section-showInfo .refund-item-imgs .item-image a img{width: 100px;height: 100px;display: block;}
-    /*退款记录*/
-    .section-paymentlist{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;}
-    .section-paymentlist .record-title{width: 100%;height: 48px;line-height: 48px;float: left;font-size: 16px;color: #22272E;}
-    .section-paymentlist .record-title .record-title-l{float: left;}
-    .section-paymentlist .record-title .record-title-r{float: right;}
-    .section-paymentlist .record-title .record-title-r .red{color: #FF2A2A;}
-    .section-paymentlist .record-list{width: 100%;height: auto;}
-    .section-paymentlist .record-list .record-item{width: 100%;height: 40px;}
-    .section-paymentlist .record-list .item-time{width: 33.33%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
-    .section-paymentlist .record-list .item-time.mm{text-align: left;}
-    .section-paymentlist .record-list .item-time.tt{text-align: right;}
-    .section-paymentlist .record-list .item-rec{width: 50%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
-    .section-paymentlist .record-list .item-rec.mm{text-align: left;}
-    .section-paymentlist .record-list .item-rec.tt{text-align: right;}
-    .section-paymentlist .record-empty{width: 100%;height: 40px;font-size: 14px;color: #999999;text-align: left;float: left;line-height: 40px;}
-    /*底部按钮*/
-    .section-botton{width: 100%;height: 76px;box-sizing: border-box;float: left;padding:20px;background-color: #FFFFFF;}
-    /*.section-botton .inner{width: 1184px;margin: 0 auto;}*/
-    .section-botton .btn{height: 34px;padding: 0 10px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
-    .section-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
-    .section-botton .btn.primary{border-color: #FF5B00;background-color: #FF5B00;color: #FFFFFF;position: relative;}
-    .section-botton .btn.primary .tips{width: 44px;height: 19px;line-height: 19px;text-align: center;border-radius: 10px;background-color: #ffe6dc;font-size: 12px;color: #FF5B00;position: absolute;right:0px;top: -25px;z-index: 99;}
-    .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
-    .section-botton .btn.primary.confirm{line-height: 17px;}
-    .section-botton .shopinfo{float: right;height: 100%;margin-right: 10px;}
-    .section-botton .price-total{text-align: right;color: #22272e;font-size: 16px;float: right;padding-top: 0;line-height: 36px;}
-    .section-botton.fiexd{position: fixed;bottom: 0;right: 0;}
-    .section-botton.fiexd .inner{width: 1184px;margin: 0 auto;z-index: 9999;}
-    /* 特殊商品退货须知 */
-    .return-instructions{padding: 16px 24px;background: #FFFAF8; color: #FF5B00; font-size: 14px;margin-bottom: 8px;line-height: 24px}
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    .order-container { padding-bottom: 28vw;}
-    .order-container .section-info,
-    .order-container .section-invoice,
-    .order-container .section-payment{box-sizing:border-box;width:100%;background:#FFF;margin-top:1.5vw;padding:2vw 3.2vw 4vw 3.2vw;font-size:3.2vw;color:#627386;line-height:7vw}
-    .order-container .order-title{position:relative;height:16vw}
-    .order-container .order-title .title-name:nth-of-type(1){padding-left:11.6vw;color:#FF5B00;font-size:3.5vw;line-height:9vw}
-    .order-container .order-title .bag{position:absolute;left:0;top:2.6vw;width:9.6vw;height:4.2vw;line-height:4.2vw;text-align:center;color:#FFF;background-image:linear-gradient(90deg,#ffb427 0%,#f58e4d 100%);border-radius:2px}
-    .order-container .order-title .state{position:absolute;right:0;bottom:0;color:#FF5B00}
-    .order-container .order-title .title-time span,.order-container .order-content span{color:#22272e}
-    .order-container .order-item p{display:inline-block;width:49%}
-    .order-container .copy{width:auto!important;display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%);border-radius:2px;color:#FFF;margin-left:2vw}
-    .order-container .order-item p.org{width:auto}
-    .order-container .order-item p.org span{color:#FF5B00}
-    .order-container .order-item p.address{width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-    .section-shopinfo .title{border-bottom:1px solid #F7F7F7;height:7.4vw;line-height:7.4vw;padding:1.3vw 3.2vw;position:relative}
-    .section-shopinfo .logo{width:7.4vw;height:7.4vw;border:1px solid #F7F7F7;margin-right:2vw}
-    .section-shopinfo .name{display:inline-block;color:#9aa5b5}
-    .section-shopinfo .title .priceTag{width:22vw;height:6.4vw;position:absolute;right:0;top:2vw}
-    .section-shopinfo .title .priceTag .tag{top:0}
-    .section-shopinfo{width:100%;background:#FFF;color:#9aa5b5;font-size:3.4vw;margin-top:1.5vw;padding:2vw 0;box-sizing:border-box}
-    .section-shopinfo .product{padding:2vw 3.2vw;box-sizing:border-box}
-    .section-prosinfo{padding:1vw 0 1vw 32.2vw;position:relative;margin-top:2vw}
-    .section-prosinfo .image{width:28vw;position:absolute;left:0;top:0}
-    .section-prosinfo .image img{width:28vw;height:28vw}
-    .section-prosinfo .image .tip{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}
-    .section-prosinfo .text .tit{max-height:10.4vw;line-height:5.2vw;color:#22272e;font-size:3.7vw;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
-    .section-prosinfo .text .info{position:relative}
-    .section-prosinfo .text .info .priceTag .tag{position:absolute;right:0;top:auto;left:auto;}
-    .section-prosinfo .text .info>p{display:inline-block;min-width:48%;font-size:3.1vw;color:#627386;line-height: 6vw;}
-    .section-prosinfo .text .info>p .red{color:#FF2A2A}
-
-    /*会员标签*/
-    .section-prosinfo .text .svip-tag{height:4.74vw;letter-spacing:0;overflow: hidden;margin-left: 12vw;}
-    .section-prosinfo .text .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
-    .section-prosinfo .text .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-    .section-prosinfo .text .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
-    .section-prosinfo .text .svip-tag .svip-price span{color: #333}
-    .section-prosinfo .text .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
-    .section-prosinfo .text .price{font-size:3.4vw;color:#627386}
-    .section-prosinfo .text .price .red{color:#f94b4b}
-
-    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 2vw 3.2vw;}
-    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:8vw;line-height: 6.8vw;color: #627386;font-size: 3.4vw;float: left;}
-    .order-container .section-shopinfo .shopinfo-bott .red{color: #f94b4b;}
-    .order-container .section-shopinfo .shopinfo-bott .org{color: #FF5B00;}
-    .order-container .section-shopinfo .shopinfo-bott .none{color:#22272e;}
-    .order-container .section-shopinfo .shopinfo-note{width: 100%;height: auto;line-height: 6vw;padding: 3.2vw 3.2vw 0 3.2vw;box-sizing: border-box;}
-    .order-container .section-shopinfo .shopinfo-note p{width: 100%;color: #22272E;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
-
-    /*发票信息*/
-    .section-showInfo{ width: 100%;height: auto;box-sizing: border-box;float: left;padding:2vw 3.3vw;background-color: #FFFFFF;margin-bottom: 10px;}
-    .section-showInfo .title-name {color: #22272e;font-size: 3.4vw;margin-bottom: 2vw;}
-    .section-showInfo .order-item p {margin-bottom: 3vw;display: inline-block;color: #627386;width: 100%;}
-    /*转账信息*/
-    .section-showInfo .vouch-list{ width: 100%;height: auto;box-sizing: border-box;padding: 1.5vw 0; border-bottom: 1px solid #E2E7EF;}
-    .section-showInfo .refund-item-p{width: 100%;line-height: 8vw;font-size: 3.4vw;color: #666666;float: left;}
-    .section-showInfo .refund-item-imgs{width: 100%;height: auto;margin: 5px 0;float: left;}
-    .section-showInfo .refund-item-imgs .item-image{width: 15vw;height: 15vw;margin-right: 10px;border: 1px dashed #E1E1E1;float: left;}
-    .section-showInfo .refund-item-imgs .item-image a{width: 15vw;height: 15vw;display: block;}
-    .section-showInfo .refund-item-imgs .item-image a img{width: 15vw;height: 15vw;display: block;}
-
-    .price-total{padding:3vw;text-align:right;color:#22272e;font-size:3.4vw;float: left;}
-    .price-total span{color:#f94b4b}
-    .payment-transfer{color:#22272e}
-    .payment-transfer .label>p{font-size:3.4vw;color:#22272e;line-height:5vw;padding:1.6vw 0}
-    .payment-transfer .label .label-title{font-size:3.1vw;color:#FF5B00}
-    .payment-transfer .label .label-t{color:#627386}
-    .payment-transfer .label .label-c{color:#FF2A2A;font-size:3.1vw}
-    .payment-transfer .label>p .red{color:#FF5B00}
-    .record-title,.record-empty{width:100%;box-sizing:border-box;font-size:3.4vw;margin-top:1.5vw;padding:3.2vw;background:#FFF;color:#22272e}
-    .record-title span{color:#f94b4b}
-    .section-botton{width: 100%; margin-top:1.5vw;padding: 2.7vw 0;background: #fff;box-sizing: border-box;position: fixed;bottom: 0;left: 0;z-index: 999;}
-    .section-botton .inner{overflow: hidden}
-    .section-botton .btn{display:inline-block;padding:0 2.5vw;height:10vw;line-height:10vw;font-size:3.7vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:1px solid #FF5B00;margin:0 0 0 2.7vw;color:#FF5B00;float: left;}
-    .section-botton .primary{color:#FFF;Background:#FF5B00;position: relative;}
-    .section-botton .btn.primary.confirm{line-height: 4.5vw;}
-    .section-botton .btn.primary .tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #FF5B00;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
-    .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
-    /* 特殊商品退货须知 */
-    .return-instructions{padding: 4vw 3.3vw;background: #FFFAF8; color: #FF5B00; font-size: 3.4vw;margin-top: 1.5vw; line-height: 5.6vw;}
-
-    footer{display: none; }
-
-
-}
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    /*订单详情顶部信息*/
+    .navLayout{min-height: auto;}
+    .navLayout .right{float:right;width:968px}
+    .order-container{width: 100%;min-height:410px;}
+    .order-container .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
+    .order-container .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
+    .order-container .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
+    .order-container .title a .icon:before{width: 18px;height: 18px;background-position: -304px -32px;}
+    .order-container .section{width: 100%;height: auto;}
+    .order-container .section .section-info {margin-bottom: 8px;box-sizing:border-box;padding:10px 20px;background-color: #FFFFFF;}
+    .order-container .section .section-info .order-title{width:100%;box-sizing:border-box;height:40px;position:relative;padding-left:45px;margin-bottom: 0;}
+    .order-container .section .section-info .order-title .bag{display: block;position: absolute;left:0;top: 12px; width: 36px;height: 16px;background-image: linear-gradient(335deg,#FF5B00 0%,#ffb496 100%);border-radius: 2px;font-size: 10px;color: #FFFFFF;line-height: 16px;text-align: center;}
+    .order-container .section .section-info .order-title .title-name{line-height:  40px;font-size: 14px;color: #22272e;}
+    .order-container .section .section-info .order-title .title-name p{display:inline-block;margin-right:10px;}
+    .order-container .section .section-info .order-title .title-name p.state{color: #FF5B00;margin-left: 10px;font-weight: normal;}
+    .order-container .section .section-info .order-title .title-type{float:right;width:40px;height: 40px;background: url("/img/order/second.png")center center no-repeat;background-size: cover;}
+    .order-container .section .section-info .order-title .title-time{position:absolute;right:0;top:0;line-height:40px;font-size: 12px;color: #9aa5b5;}
+    .order-container .section .section-info .order-content{width:100%;height:auto;}
+    .order-container .section .section-info .order-content .order-item{width:100%;}
+    .order-container .section .section-info .order-content .order-item p{display:inline-block;margin-right:45px;line-height: 36px;color: #627386;font-size: 14px;}
+    .order-container .section .section-info .order-content .order-item p.org{}
+    .order-container .section .section-info .order-content .order-item p.copy{margin-left:20px;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
+    .order-container .section .section-info .order-content .order-item p span{margin-left: 5px;}
+    .order-container .section .section-info .order-content .order-item p .red{color: #f94b4b;}
+    .order-container .section .section-info .order-content .order-item p .org{color: #FF5B00;}
+    .order-container .section .section-info .order-content .order-item p .none{color:#22272e;}
+    /*商品信息*/
+    .order-container .section-list{margin-bottom: 10px;width: 100%;height: auto;box-sizing:border-box;}
+    .order-container .section-shopinfo{width: 100%;height: auto;margin-bottom: 5px;box-sizing: border-box;padding: 0;background-color: #FFFFFF;}
+    .order-container .section-shopinfo .title{width: 100%;height: 56px;box-sizing: border-box;padding: 8px 20px;border-bottom: 1px solid #e2e7ef;}
+    .order-container .section-shopinfo .title .logo{width: 39px;height: 39px;box-sizing: border-box;border: 1px solid #e2e7ef;float: left;display: block;margin-right: 5px;}
+    .order-container .section-shopinfo .title .name{line-height: 40px;float: left;font-size: 14px;color: #22272E;text-align: left;margin-right: 20px;}
+    .order-container .section-shopinfo .product{width: 100%;height: auto;box-sizing: border-box;padding: 0 20px;}
+    .order-container .section-shopinfo .section-prosinfo{width: 100%;height: 126px;padding: 16px 0 0;}
+    .order-container .section-shopinfo .product-t{width: 100%;min-height: 100px;float: left;}
+    .order-container .section-shopinfo .product-t .image{width: 98px;height: 98px;float: left;border: 1px solid #e2e7ef;margin-right: 10px;position: relative;}
+    .order-container .section-shopinfo .product-t .image img{width: 98px;height: 98px;display: block;}
+    .order-container .section-shopinfo .product-t .image .tip{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%);}
+    .order-container .section-shopinfo .product-t .text{width: 810px;float: left;}
+    .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
+    .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
+    .order-container .section-shopinfo .product-t .info>.col{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:25%}
+    .order-container .section-shopinfo .product-t .info>.col .red{color: #FF2A2A;}
+    .order-container .section-shopinfo .product-t .info>div.col{width: 40%;}
+    /*会员标签*/
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px;}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:25px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price span{color: #333}
+
+    .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
+    .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
+    .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
+    .price-total span{color:#f94b4b}
+    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 8px 20px;}
+    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:50px;line-height: 34px;color: #627386;font-size: 14px;float: left;}
+    .order-container .section-shopinfo .shopinfo-bott .red{color: #f94b4b;}
+    .order-container .section-shopinfo .shopinfo-bott .org{color: #FF5B00;}
+    .order-container .section-shopinfo .shopinfo-bott .none{color:#22272e;}
+    .order-container .section-shopinfo .shopinfo-note{width: 100%;height: 30px;line-height: 30px;padding: 10px 20px 16px 20px;}
+    .order-container .section-shopinfo .shopinfo-note p{color: #22272E;}
+    /*发票信息*/
+    .section-showInfo{ width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;margin-bottom: 10px;}
+    .section-showInfo .title-name {color: #22272e;font-size: 14px;margin-bottom: 20px}
+    .section-showInfo .order-item {display: flex}
+    .section-showInfo .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 33%}
+    /*转账信息*/
+    .section-showInfo .vouch-list{ width: 100%;height: auto;box-sizing: border-box;padding: 16px 0; border-bottom: 1px solid #E2E7EF;}
+    .section-showInfo .refund-item-p{width: 100%;line-height: 30px;font-size: 14px;color: #666666;float: left;}
+    .section-showInfo .refund-item-imgs{width: 100%;height: auto;margin: 5px 0;float: left;}
+    .section-showInfo .refund-item-imgs .item-image{width: 100px;height: 100px;margin-right: 10px;border: 1px dashed #E1E1E1;float: left;}
+    .section-showInfo .refund-item-imgs .item-image a{width: 100px;height: 100px;display: block;}
+    .section-showInfo .refund-item-imgs .item-image a img{width: 100px;height: 100px;display: block;}
+    /*退款记录*/
+    .section-paymentlist{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;}
+    .section-paymentlist .record-title{width: 100%;height: 48px;line-height: 48px;float: left;font-size: 16px;color: #22272E;}
+    .section-paymentlist .record-title .record-title-l{float: left;}
+    .section-paymentlist .record-title .record-title-r{float: right;}
+    .section-paymentlist .record-title .record-title-r .red{color: #FF2A2A;}
+    .section-paymentlist .record-list{width: 100%;height: auto;}
+    .section-paymentlist .record-list .record-item{width: 100%;height: 40px;}
+    .section-paymentlist .record-list .item-time{width: 33.33%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
+    .section-paymentlist .record-list .item-time.mm{text-align: left;}
+    .section-paymentlist .record-list .item-time.tt{text-align: right;}
+    .section-paymentlist .record-list .item-rec{width: 50%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
+    .section-paymentlist .record-list .item-rec.mm{text-align: left;}
+    .section-paymentlist .record-list .item-rec.tt{text-align: right;}
+    .section-paymentlist .record-empty{width: 100%;height: 40px;font-size: 14px;color: #999999;text-align: left;float: left;line-height: 40px;}
+    /*底部按钮*/
+    .section-botton{width: 100%;height: 76px;box-sizing: border-box;float: left;padding:20px;background-color: #FFFFFF;}
+    /*.section-botton .inner{width: 1184px;margin: 0 auto;}*/
+    .section-botton .btn{height: 34px;padding: 0 10px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
+    .section-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
+    .section-botton .btn.primary{border-color: #FF5B00;background-color: #FF5B00;color: #FFFFFF;position: relative;}
+    .section-botton .btn.primary .tips{width: 44px;height: 19px;line-height: 19px;text-align: center;border-radius: 10px;background-color: #ffe6dc;font-size: 12px;color: #FF5B00;position: absolute;right:0px;top: -25px;z-index: 99;}
+    .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
+    .section-botton .btn.primary.confirm{line-height: 17px;}
+    .section-botton .shopinfo{float: right;height: 100%;margin-right: 10px;}
+    .section-botton .price-total{text-align: right;color: #22272e;font-size: 16px;float: right;padding-top: 0;line-height: 36px;}
+    .section-botton.fiexd{position: fixed;bottom: 0;right: 0;}
+    .section-botton.fiexd .inner{width: 1184px;margin: 0 auto;z-index: 9999;}
+    /* 特殊商品退货须知 */
+    .return-instructions{padding: 16px 24px;background: #FFFAF8; color: #FF5B00; font-size: 14px;margin-bottom: 8px;line-height: 24px}
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    #orderPage{padding-top: 27vw;}
+    footer{display:none}
+    .order-container { padding-bottom: 28vw;}
+    .order-container .section-info,
+    .order-container .section-invoice,
+    .order-container .section-payment{box-sizing:border-box;width:100%;background:#FFF;margin-top:1.5vw;padding:2vw 3.2vw 4vw 3.2vw;font-size:3.2vw;color:#627386;line-height:7vw}
+    .order-container .order-title{position:relative;height:16vw}
+    .order-container .order-title .title-name:nth-of-type(1){padding-left:11.6vw;color:#FF5B00;font-size:3.5vw;line-height:9vw}
+    .order-container .order-title .bag{position:absolute;left:0;top:2.6vw;width:9.6vw;height:4.2vw;line-height:4.2vw;text-align:center;color:#FFF;background-image:linear-gradient(90deg,#ffb427 0%,#f58e4d 100%);border-radius:2px}
+    .order-container .order-title .state{position:absolute;right:0;bottom:0;color:#FF5B00}
+    .order-container .order-title .title-time span,.order-container .order-content span{color:#22272e}
+    .order-container .order-item p{display:inline-block;width:49%}
+    .order-container .copy{width:auto!important;display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%);border-radius:2px;color:#FFF;margin-left:2vw}
+    .order-container .order-item p.org{width:auto}
+    .order-container .order-item p.org span{color:#FF5B00}
+    .order-container .order-item p.address{width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+    .section-shopinfo .title{border-bottom:1px solid #F7F7F7;height:7.4vw;line-height:7.4vw;padding:1.3vw 3.2vw;position:relative}
+    .section-shopinfo .logo{width:7.4vw;height:7.4vw;border:1px solid #F7F7F7;margin-right:2vw}
+    .section-shopinfo .name{display:inline-block;color:#9aa5b5}
+    .section-shopinfo .title .priceTag{width:22vw;height:6.4vw;position:absolute;right:0;top:2vw}
+    .section-shopinfo .title .priceTag .tag{top:0}
+    .section-shopinfo{width:100%;background:#FFF;color:#9aa5b5;font-size:3.4vw;margin-top:1.5vw;padding:2vw 0;box-sizing:border-box}
+    .section-shopinfo .product{padding:2vw 3.2vw;box-sizing:border-box}
+    .section-prosinfo{padding:1vw 0 1vw 32.2vw;position:relative;margin-top:2vw}
+    .section-prosinfo .image{width:28vw;position:absolute;left:0;top:0}
+    .section-prosinfo .image img{width:28vw;height:28vw}
+    .section-prosinfo .image .tip{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}
+    .section-prosinfo .text .tit{max-height:10.4vw;line-height:5.2vw;color:#22272e;font-size:3.7vw;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .section-prosinfo .text .info{position:relative}
+    .section-prosinfo .text .info .priceTag .tag{position:absolute;right:0;top:auto;left:auto;}
+    .section-prosinfo .text .info>p{display:inline-block;min-width:48%;font-size:3.1vw;color:#627386;line-height: 6vw;}
+    .section-prosinfo .text .info>p .red{color:#FF2A2A}
+
+    /*会员标签*/
+    .section-prosinfo .text .svip-tag{height:4.74vw;letter-spacing:0;overflow: hidden;margin-left: 12vw;}
+    .section-prosinfo .text .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .section-prosinfo .text .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .section-prosinfo .text .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .section-prosinfo .text .svip-tag .svip-price span{color: #333}
+    .section-prosinfo .text .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+    .section-prosinfo .text .price{font-size:3.4vw;color:#627386}
+    .section-prosinfo .text .price .red{color:#f94b4b}
+
+    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 2vw 3.2vw;}
+    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:8vw;line-height: 6.8vw;color: #627386;font-size: 3.4vw;float: left;}
+    .order-container .section-shopinfo .shopinfo-bott .red{color: #f94b4b;}
+    .order-container .section-shopinfo .shopinfo-bott .org{color: #FF5B00;}
+    .order-container .section-shopinfo .shopinfo-bott .none{color:#22272e;}
+    .order-container .section-shopinfo .shopinfo-note{width: 100%;height: auto;line-height: 6vw;padding: 3.2vw 3.2vw 0 3.2vw;box-sizing: border-box;}
+    .order-container .section-shopinfo .shopinfo-note p{width: 100%;color: #22272E;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+
+    /*发票信息*/
+    .section-showInfo{ width: 100%;height: auto;box-sizing: border-box;float: left;padding:2vw 3.3vw;background-color: #FFFFFF;margin-bottom: 10px;}
+    .section-showInfo .title-name {color: #22272e;font-size: 3.4vw;margin-bottom: 2vw;}
+    .section-showInfo .order-item p {margin-bottom: 3vw;display: inline-block;color: #627386;width: 100%;}
+    /*转账信息*/
+    .section-showInfo .vouch-list{ width: 100%;height: auto;box-sizing: border-box;padding: 1.5vw 0; border-bottom: 1px solid #E2E7EF;}
+    .section-showInfo .refund-item-p{width: 100%;line-height: 8vw;font-size: 3.4vw;color: #666666;float: left;}
+    .section-showInfo .refund-item-imgs{width: 100%;height: auto;margin: 5px 0;float: left;}
+    .section-showInfo .refund-item-imgs .item-image{width: 15vw;height: 15vw;margin-right: 10px;border: 1px dashed #E1E1E1;float: left;}
+    .section-showInfo .refund-item-imgs .item-image a{width: 15vw;height: 15vw;display: block;}
+    .section-showInfo .refund-item-imgs .item-image a img{width: 15vw;height: 15vw;display: block;}
+
+    .price-total{padding:3vw;text-align:right;color:#22272e;font-size:3.4vw;float: left;}
+    .price-total span{color:#f94b4b}
+    .payment-transfer{color:#22272e}
+    .payment-transfer .label>p{font-size:3.4vw;color:#22272e;line-height:5vw;padding:1.6vw 0}
+    .payment-transfer .label .label-title{font-size:3.1vw;color:#FF5B00}
+    .payment-transfer .label .label-t{color:#627386}
+    .payment-transfer .label .label-c{color:#FF2A2A;font-size:3.1vw}
+    .payment-transfer .label>p .red{color:#FF5B00}
+    .record-title,.record-empty{width:100%;box-sizing:border-box;font-size:3.4vw;margin-top:1.5vw;padding:3.2vw;background:#FFF;color:#22272e}
+    .record-title span{color:#f94b4b}
+    .section-botton{width: 100%; margin-top:1.5vw;padding: 2.7vw 0;background: #fff;box-sizing: border-box;position: fixed;bottom: 0;left: 0;z-index: 999;}
+    .section-botton .inner{overflow: hidden}
+    .section-botton .btn{display:inline-block;padding:0 2.5vw;height:8vw;line-height:8vw;font-size:3.7vw;text-align:center;background-color:#ffe6dc;border-radius:4vw;border:1px solid #FF5B00;margin:0 0 0 2.7vw;color:#FF5B00;float: left;}
+    .section-botton .primary{color:#FFF;Background:#FF5B00;position: relative;}
+    .section-botton .btn.primary.confirm{line-height: 4.5vw;}
+    .section-botton .btn.primary .tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #FF5B00;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
+    .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
+    /* 特殊商品退货须知 */
+    .return-instructions{padding: 4vw 3.3vw;background: #FFFAF8; color: #FF5B00; font-size: 3.4vw;margin-top: 1.5vw; line-height: 5.6vw;}
+
+    footer{display: none; }
+
+
+}

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

@@ -93,6 +93,7 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    #orderPage{ padding-top: 27vw; }
     .order-container{width: 100%;min-height:120vw;background: #FFFFFF;}
     .order-header{width:100%;background:#FFF;margin-bottom:1.5vw}
     .header-tabs{padding:4vw 3.2vw;box-sizing:border-box;width:100%;overflow-y:hidden;overflow-x:scroll;white-space:nowrap;background:#FFF}
@@ -117,7 +118,7 @@ li{list-style:none}
     .user-main.order .order-content span.red{color: #f94b4b;}
     .user-main.order .order-item p{display:inline-block;width:49%}
     .user-main.order .order-botton{text-align:right;margin-top:2vw}
-    .user-main.order .order-botton .btn{display:inline-block;padding:0 2vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #FF5B00;color:#FF5B00;font-size:3.4vw;margin-left:2.6vw;vertical-align: text-top}
+    .user-main.order .order-botton .btn{display:inline-block;padding:0 2vw;height:8vw;line-height:8vw;text-align:center;background-color:#ffe6dc;border-radius:4vw;border:solid 1px #FF5B00;color:#FF5B00;font-size:3.4vw;margin-left:2.6vw;vertical-align: text-top}
     .user-main.order .order-botton .primary{background:#FF5B00;color:#FFF;position: relative;}
     .order-container .section .user-main .order-content .order-botton .btn.primary.confirm{line-height: 4.5vw;}
     .order-container .section .user-main .order-content .order-botton .btn.primary.confirm p{line-height: 5vw;}

+ 48 - 46
src/main/resources/static/css/user-center/order/remarks-add-pay.css

@@ -1,46 +1,48 @@
-@media screen and (min-width:768px) {
-    textarea::placeholder {color: #9aa5b5;}
-    .crumbs {font-size: 16px;color: #22272e}
-    .add-logistics{height: 600px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding:80px 160px;color: #627386;box-sizing: border-box;}
-    .add-pay-form{width: 100%;height: 100%;box-sizing: border-box;}
-    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 90px;display: block;background-size: 100px;}
-    .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 100px;height: 100px;border-radius: 2px;box-sizing: border-box;border: 1px dashed #B8BFCA;}
-    .input-file{width: 100px;height: 100px;opacity: 0;cursor: pointer;position: absolute;top: 0}
-    .release-input{overflow: hidden;float: left;width: 90%}
-    .release-from{overflow: hidden;}
-    .release-from-labe{width: 100%;height: 40px;line-height: 40px;float: left;}
-    .release-from-labe span{color: #f94b4b;}
-    .upload-file img{width: 100%;height: 100%;}
-    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
-    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer; margin-top: 10px;}
-    .wen-tips {width: 220px;height: 30px;background-color: #1890f9;color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: left;line-height: 30px;top: 33px;display: none;box-sizing: border-box;padding: 0 10px;}
-    .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: -15px;left:5px;}
-    .form-upload-tips:hover .wen-tips {display: block;}
-    .el-textarea{width: 580px !important;}
-    .release-from-btn{width: 100%;height: 40px;text-align: right; margin-top: 40px;box-sizing: border-box;padding: 0 60px;}
-
-}
-
-/*移动*/
-@media screen and (max-width:768px) {
-    body{background: #FFFFFF !important;}
-    .crumbs {font-size:3.4vw;color: #22272e}
-    .add-logistics{height: auto;background-color: #ffffff;margin-top: 2.7vw;padding: 20px;color: #627386;}
-    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 21vw;display: block;    background-size: 23vw;}
-    .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0;width: 23vw;height: 23vw;border-radius: .53vw;box-sizing: border-box;border: 1px dashed #B8BFCA;}
-    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
-    .release-input{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
-    .release-from{overflow: hidden;}
-    .release-from-labe{width: 100%;height: 10vw;line-height:10vw;float: left;}
-    .release-from-labe span{color: #f94b4b;}
-    .upload-file img{width: 100%;height: 100%;}
-    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
-    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
-    .wen-tips {width: 48vw;height:9vw;background-color: #1890f9;color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: left;line-height: 9vw;top:8.8vw;display: none;box-sizing: border-box;padding: 0 2vw;}
-    .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;}
-    .release-from-btn{width: 100%;height: 40px;text-align: right; margin-top: 40px;box-sizing: border-box;}
-    footer{display: none;}
-}
+@media screen and (min-width:768px) {
+    textarea::placeholder {color: #9aa5b5;}
+    .crumbs {font-size: 16px;color: #22272e}
+    .add-logistics{height: 600px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding:80px 160px;color: #627386;box-sizing: border-box;}
+    .add-pay-form{width: 100%;height: 100%;box-sizing: border-box;}
+    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 90px;display: block;background-size: 100px;}
+    .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 100px;height: 100px;border-radius: 2px;box-sizing: border-box;border: 1px dashed #B8BFCA;}
+    .input-file{width: 100px;height: 100px;opacity: 0;cursor: pointer;position: absolute;top: 0}
+    .release-input{overflow: hidden;float: left;width: 90%}
+    .release-from{overflow: hidden;}
+    .release-from-labe{width: 100%;height: 40px;line-height: 40px;float: left;}
+    .release-from-labe span{color: #f94b4b;}
+    .upload-file img{width: 100%;height: 100%;}
+    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
+    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer; margin-top: 10px;}
+    .wen-tips {width: 220px;height: 30px;background-color: #1890f9;color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: left;line-height: 30px;top: 33px;display: none;box-sizing: border-box;padding: 0 10px;}
+    .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: -15px;left:5px;}
+    .form-upload-tips:hover .wen-tips {display: block;}
+    .el-textarea{width: 580px !important;}
+    .release-from-btn{width: 100%;height: 40px;text-align: right; margin-top: 40px;box-sizing: border-box;padding: 0 60px;}
+
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    body{background: #FFFFFF !important;}
+    #globalHead{ display: none; }
+    .centerNav{ display: none; }
+    .crumbs {font-size:3.4vw;color: #22272e}
+    .add-logistics{height: auto;background-color: #ffffff;margin-top: 2.7vw;padding: 20px;color: #627386;}
+    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 21vw;display: block;    background-size: 23vw;}
+    .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0;width: 23vw;height: 23vw;border-radius: .53vw;box-sizing: border-box;border: 1px dashed #B8BFCA;}
+    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
+    .release-input{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
+    .release-from{overflow: hidden;}
+    .release-from-labe{width: 100%;height: 10vw;line-height:10vw;float: left;}
+    .release-from-labe span{color: #f94b4b;}
+    .upload-file img{width: 100%;height: 100%;}
+    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
+    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
+    .wen-tips {width: 48vw;height:9vw;background-color: #1890f9;color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: left;line-height: 9vw;top:8.8vw;display: none;box-sizing: border-box;padding: 0 2vw;}
+    .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;}
+    .release-from-btn{width: 100%;height: 40px;text-align: right; margin-top: 40px;box-sizing: border-box;}
+    footer{display: none;}
+}

+ 5 - 2
src/main/resources/static/css/user-center/repair/list.css

@@ -51,13 +51,16 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    body{ background: #FFFFFF; }
+    #orderPage{padding-top: 27vw;}
+    footer{display: none;}
     .header-bt{padding:2.6vw 3.2vw;background: #FFF;}
     .header-search .search:nth-child(1){width: 93.4vw;height: 11.7vw;line-height: 11.7vw;border: .27vw solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
     .header-search .search input{height: -webkit-fill-available;width: 75vw;border: none;}
     .header-search>div .label{color: #627386;margin-left: 1.7vw;line-height: 8vw}
     .header-search input::placeholder{color: #627386}
     .header-search .search .select{background: #fff;padding-left: 2vw;height: 11.7vw;width:100%;border: none;color: #627386;border: .27vw solid rgba(184,191,202,.5)}
-    .btn-server{width: 35.3vw;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #FF5B00;border: .27vw solid #FF5B00;background: #ffe6dc;margin:2.7vw auto;display: block;}
+    .btn-server{width: 35.3vw;height: 10vw;line-height: 10vw;border-radius: 5vw;text-align: center;color: #FF5B00;border: .27vw solid #FF5B00;background: #ffe6dc;margin:2.7vw auto;display: block;}
     #orderDate .search-input{display: inline-block;}
     #orderDate{position: relative}
     .header-search .search-input input{width:39vw;height: 11.8vw;line-height: 11.8vw;padding-left: 2.7vw;border: .27vw solid rgba(184,191,202,.5);color: #627386;}
@@ -71,6 +74,6 @@ li{list-style:none}
     .container .section .td>span{color:#9aa5b5;font-size:3.2vw;width:100%}
     .container .section .td.td-1{color:#FF5B00}
     .container .section .td-8 a{width:22.4vw;height:9.6vw;line-height:9.6vw;text-align:center;color:#1890f9;background-color:#e0f1ff;border-radius:5vw;border:solid 1px #1890f9;position:absolute;bottom:3.2vw;right:3.2vw}
-    .navLayout .link{display:block;margin:2vw auto;width:100%;height:11.2vw;line-height:11.2vw;background-color:#FF5B00;border-radius:.2vw;text-align:center;font-size:3.4vw;color:#FFF}
+    .navLayout .link{display:block;margin:2vw auto;width:90vw;height:11.2vw;line-height:11.2vw;background-color:#FF5B00;border-radius:5.5vw;text-align:center;font-size:3.4vw;color:#FFF;position: fixed;border-bottom: 0;left: 50%;margin-left: -45vw;}
     input::placeholder{color:  #9AA5B5}
 }

+ 69 - 68
src/main/resources/static/css/user-center/setting/information.css

@@ -44,73 +44,74 @@ input::placeholder,textarea::placeholder{color: #9aa5b5}
 * 移动端
 */
 @media screen and (max-width:768px){
-body{width:100%;height:100%;background:#FFF url(/img/account/register.png) no-repeat center bottom;background-size:100% auto;background-attachment: fixed;}
-footer{display:none}
-.container{padding:3.2vw;font-size:3.4vw;color:#627386;}
-.registerClub{padding: 20px 0;}
-.registerShop{padding: 20px 0;}
-.selectAccount{width:100%;height:90vh;text-align:center;}
-.selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:36vw}
-.selectAccount .cont{margin-top:10vw;}
-.selectAccount .cont span{display:inline-block;width:24.8vw;margin:0 6.7vw;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
-.selectAccount .cont img{display:inline-block;width:24.8vw;height:24.8vw;background-color:#c2d8fa;border-radius:12.4vw}
-.signAccount .title-tips{margin-bottom: 3.2vm;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%);}
-.signAccount .title-tips p{width: 100%;height:9.6vw;font-family: Microsoft YaHei;font-size:3.1vw;font-weight: normal;font-stretch: normal;line-height: 9.6vw;letter-spacing:0;color: #FF5B00;text-align: center;}
-.signAccount{width:100%;min-height:90vh;font-size:3.4vw;color:#627386;}
-.signAccount .advisory>.duv{float: right;line-height: 5.6vw;padding-right: 4vw;}
-.signAccount .advisory>.duv span{display: inline-block;float: left;}
-.signAccount .advisory>.duv>.mIcon{height:5.6vw;line-height:5.6vw;font-size:1.6vw;color:#1890f9;display: block;}
-.signAccount .advisory>.duv>.mIcon:before{width:5.6vw;height:5.6vw;background-position:-84.2vw -0vw;}
-.signAccount .title{height:6vw;line-height:6vw;font-weight:bold;font-size:4.2vw;color:#22272e;text-align:center;padding:5.2vw 0}
-.registerShop .tit{color:#22272e;font-size:3.7vw;font-weight:normal;margin:3vw 0}
-.signAccount form{width:93.4vw;margin:0 auto;}
-.supplierConfirm .cont{width:100%;min-height:90vw;box-sizing:border-box;padding:3.3vw;color:#333;font-size:3.4vw;}
-.supplierConfirm .cont h3{height:6vw;line-height:6vw;font-weight:bold;font-size:4.2vw;color:#22272e;text-align:center;}
-.supplierConfirm .cont p:first-of-type{color:#E36125;margin-top:3vw}
-.supplierConfirm .cont p:nth-of-type(2){color:#666;margin:5vw 0 3vw 0}
-.supplierConfirm .cont li{line-height:5vw;margin-bottom:2vw}
-.supplierConfirm .btnLine{margin-top:5vw;line-height:5vw;text-align:center;font-weight:bold;position:relative;}
-.supplierConfirm .btnLine p{color:#000;}
-.supplierConfirm .btnLine input{margin-right:1vw;}
-.supplierConfirm .btnLine button{display:block;font-size:3.4vw;margin:5vw auto;width:93.4vw;height:11.2vw;line-height:11.2vw;background:#FF5B00;color:#fff;}
-.formLine { width: 100%;position: relative;font-size: 3.4vw;float: left;}
-.formLine .business{height:auto;position:relative}
-.formLine .business input[type="text"] {width:66vw;display: block;float: left;margin-right: 3vw;}
-.formLine .business a {display: block;float: left; width:21.4vw;height: 10.5vw;line-height: 10.5vw;font-size:3.4vw;color: #FF5B00;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;}
+  #informationPage{ padding-top: 27vw; }
+  body{width:100%;height:100%;background:#FFF url(/img/account/register.png) no-repeat center bottom;background-size:100% auto;background-attachment: fixed;}
+  footer{display:none}
+  .container{padding:3.2vw;font-size:3.4vw;color:#627386;}
+  .registerClub{padding: 20px 0;}
+  .registerShop{padding: 20px 0;}
+  .selectAccount{width:100%;height:90vh;text-align:center;}
+  .selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:36vw}
+  .selectAccount .cont{margin-top:10vw;}
+  .selectAccount .cont span{display:inline-block;width:24.8vw;margin:0 6.7vw;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
+  .selectAccount .cont img{display:inline-block;width:24.8vw;height:24.8vw;background-color:#c2d8fa;border-radius:12.4vw}
+  .signAccount .title-tips{margin-bottom: 3.2vm;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%);}
+  .signAccount .title-tips p{width: 100%;height:9.6vw;font-family: Microsoft YaHei;font-size:3.1vw;font-weight: normal;font-stretch: normal;line-height: 9.6vw;letter-spacing:0;color: #FF5B00;text-align: center;}
+  .signAccount{width:100%;min-height:90vh;font-size:3.4vw;color:#627386;}
+  .signAccount .advisory>.duv{float: right;line-height: 5.6vw;padding-right: 4vw;}
+  .signAccount .advisory>.duv span{display: inline-block;float: left;}
+  .signAccount .advisory>.duv>.mIcon{height:5.6vw;line-height:5.6vw;font-size:1.6vw;color:#1890f9;display: block;}
+  .signAccount .advisory>.duv>.mIcon:before{width:5.6vw;height:5.6vw;background-position:-84.2vw -0vw;}
+  .signAccount .title{height:6vw;line-height:6vw;font-weight:bold;font-size:4.2vw;color:#22272e;text-align:center;padding:5.2vw 0}
+  .registerShop .tit{color:#22272e;font-size:3.7vw;font-weight:normal;margin:3vw 0}
+  .signAccount form{width:93.4vw;margin:0 auto;}
+  .supplierConfirm .cont{width:100%;min-height:90vw;box-sizing:border-box;padding:3.3vw;color:#333;font-size:3.4vw;}
+  .supplierConfirm .cont h3{height:6vw;line-height:6vw;font-weight:bold;font-size:4.2vw;color:#22272e;text-align:center;}
+  .supplierConfirm .cont p:first-of-type{color:#E36125;margin-top:3vw}
+  .supplierConfirm .cont p:nth-of-type(2){color:#666;margin:5vw 0 3vw 0}
+  .supplierConfirm .cont li{line-height:5vw;margin-bottom:2vw}
+  .supplierConfirm .btnLine{margin-top:5vw;line-height:5vw;text-align:center;font-weight:bold;position:relative;}
+  .supplierConfirm .btnLine p{color:#000;}
+  .supplierConfirm .btnLine input{margin-right:1vw;}
+  .supplierConfirm .btnLine button{display:block;font-size:3.4vw;margin:5vw auto;width:93.4vw;height:11.2vw;line-height:11.2vw;background:#FF5B00;color:#fff;}
+  .formLine { width: 100%;position: relative;font-size: 3.4vw;float: left;}
+  .formLine .business{height:auto;position:relative}
+  .formLine .business input[type="text"] {width:66vw;display: block;float: left;margin-right: 3vw;}
+  .formLine .business a {display: block;float: left; width:21.4vw;height: 10.5vw;line-height: 10.5vw;font-size:3.4vw;color: #FF5B00;background-color: #ffe6dc;border-radius: 5.5vw;border: solid 1px #FF5B00;text-align: center;}
 
-.advisory .mask{display: none;width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0,0,0,.5);z-index: 99;}
-.advisory .mask.active{display: block;}
-.advisoryInfo.active{display: block;}
-.advisoryInfo .icon-close{position:absolute;top:0;right: 0; padding: 1vw;width: 6.4vw;height: 6.4vw;text-align: center;}
-.advisoryInfo .icon-close:before {content: '\2715';font-size: 4.5vw;font-weight: bold;}
-.advisoryInfo{z-index: 999;box-sizing:border-box;width:74.7vw;background:#fff;box-shadow:0 10px 20px 0 rgba(0,0,0,0.16);padding:6.2vw;border-radius:1vw;display: none;position: absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);}
-.advisoryInfo form{width:100%}
-.advisoryInfo .formLine p{line-height:8vw}
-.advisoryInfo .info{margin-bottom:3vw;color:#1890f9;font-size:3.1vw}
-.advisoryInfo .btn{display:block;width:46vw;height:9.8vw;line-height:9.8vw;margin:3vw auto 0;font-size:3.4vw;background-color:#ffe6dc;border-radius:2px;border:solid 1px #FF5B00;color:#FF5B00;text-align:center}
-.formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 4vw;}
-.formLine .formLine-file{width: 36vw;height: 25.3vw;position: relative;}
-.formLine .form-upload-image{width: 36vw;height: 25.3vw;position: relative;}
-.formLine .form-upload-image .upload-img{width: 36vw;height: 25.3vw;display: block;}
-.formLine .form-upload-image .mIcon{width: 4vw;height:4vw;;display: block;position: absolute;left: 0;top: 0;cursor: pointer;}
-.formLine .form-upload-image .mIcon:before{width: 4vw;height: 4vw;background-position: -91vw -8.5vw;}
-.formLine .form-upload-tips{width: 4.8vw;height: 25.3vw;float: left;position: relative;}
-.formLine .form-upload-tips .mIcon{width: 4.8vw;height: 4.8vw;float: left;display: block;margin-top: 10vw;}
-.formLine .form-upload-tips .mIcon:before{width: 4.8vw;height: 4.8vw;background-position:-76.6vw -1.2vw;}
-.formLine .form-upload-tips .wen-tips{width: 36vw;height: 9.2vw;line-height: 9.2vw;text-align: center;color: #FFF;font-size: 2.4vw; background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: 0;left: -1vw;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: 36vw;height: 25.3vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
-.formLine .formLine-file .mIcon{width: 36vw;height: 25.3vw;display: block;}
-.formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;background-size: cover;}
-.formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;background-size: cover;}
-.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;background-size: cover;}
-.subLine{margin-top:2vw;float: left;}
-.subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #FF5B00;border-radius: 0.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
-.subLine .btn-upgrade.none{border: 1px solid #FF5B00;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #FF5B00;}
-.subLine .btn-upgrade.disabled{background-color: #999999;}
-.container{padding:3.3vw}
-.title{color: #22272e;font-size: 3.7vw}
-.formLine p{color: #627386}
-input::placeholder,textarea::placeholder{color: #9aa5b5}
+  .advisory .mask{display: none;width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0,0,0,.5);z-index: 99;}
+  .advisory .mask.active{display: block;}
+  .advisoryInfo.active{display: block;}
+  .advisoryInfo .icon-close{position:absolute;top:0;right: 0; padding: 1vw;width: 6.4vw;height: 6.4vw;text-align: center;}
+  .advisoryInfo .icon-close:before {content: '\2715';font-size: 4.5vw;font-weight: bold;}
+  .advisoryInfo{z-index: 999;box-sizing:border-box;width:74.7vw;background:#fff;box-shadow:0 10px 20px 0 rgba(0,0,0,0.16);padding:6.2vw;border-radius:1vw;display: none;position: absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);}
+  .advisoryInfo form{width:100%}
+  .advisoryInfo .formLine p{line-height:8vw}
+  .advisoryInfo .info{margin-bottom:3vw;color:#1890f9;font-size:3.1vw}
+  .advisoryInfo .btn{display:block;width:46vw;height:9.8vw;line-height:9.8vw;margin:3vw auto 0;font-size:3.4vw;background-color:#ffe6dc;border-radius:2px;border:solid 1px #FF5B00;color:#FF5B00;text-align:center}
+  .formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 4vw;}
+  .formLine .formLine-file{width: 36vw;height: 25.3vw;position: relative;}
+  .formLine .form-upload-image{width: 36vw;height: 25.3vw;position: relative;}
+  .formLine .form-upload-image .upload-img{width: 36vw;height: 25.3vw;display: block;}
+  .formLine .form-upload-image .mIcon{width: 4vw;height:4vw;;display: block;position: absolute;left: 0;top: 0;cursor: pointer;}
+  .formLine .form-upload-image .mIcon:before{width: 4vw;height: 4vw;background-position: -91vw -8.5vw;}
+  .formLine .form-upload-tips{width: 4.8vw;height: 25.3vw;float: left;position: relative;}
+  .formLine .form-upload-tips .mIcon{width: 4.8vw;height: 4.8vw;float: left;display: block;margin-top: 10vw;}
+  .formLine .form-upload-tips .mIcon:before{width: 4.8vw;height: 4.8vw;background-position:-76.6vw -1.2vw;}
+  .formLine .form-upload-tips .wen-tips{width: 36vw;height: 9.2vw;line-height: 9.2vw;text-align: center;color: #FFF;font-size: 2.4vw; background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: 0;left: -1vw;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: 36vw;height: 25.3vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+  .formLine .formLine-file .mIcon{width: 36vw;height: 25.3vw;display: block;}
+  .formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;background-size: cover;}
+  .formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;background-size: cover;}
+  .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;background-size: cover;}
+  .subLine{margin-top:2vw;float: left;}
+  .subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #FF5B00;border-radius: 5.5vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
+  .subLine .btn-upgrade.none{border: 1px solid #FF5B00;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #FF5B00;}
+  .subLine .btn-upgrade.disabled{background-color: #999999;}
+  .container{padding:3.3vw}
+  .title{color: #22272e;font-size: 3.7vw}
+  .formLine p{color: #627386}
+  input::placeholder,textarea::placeholder{color: #9aa5b5}
 }

+ 38 - 37
src/main/resources/static/css/user-center/setting/password.css

@@ -1,37 +1,38 @@
-@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);}
-    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{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: .53vw 0 0 .53vw;;line-height: 9.6vw;font-size:3.4vw;text-align: center;color: #627386;cursor: pointer;}
-    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
-}
+@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);}
+    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{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;line-height: 9.6vw;font-size:3.4vw;text-align: center;color: #627386;cursor: pointer;border-radius: 5vw;margin: 0 3vw;}
+    .right-header .header-tabs.current{background-color: #FF5B00;color: #FFFFFF;}
+}

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

@@ -1,40 +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: #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}
-    .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; font-size: 3.4vw;}
-    .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}
+
+}

+ 0 - 1
src/main/resources/static/js/mixins/cmSysMixins.js

@@ -56,7 +56,6 @@ var cmSysVitaMixins = function () {
                 //设置定时器
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
                 const partnerId = CAIMEI.Storage.getItem('partnerId')
-                console.log('partnerId',partnerId)
                 if(partnerId){ this.cmSysParams.partnerId = partnerId * 1  }
                 if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
                 if( this.handleProsId || this.handleShopId || this.handlearticleId || this.handleProsKey || this.handleShopKey ){

+ 3 - 3
src/main/resources/templates/supplier-center/order/list.html

@@ -104,7 +104,7 @@
                         </el-select>
                     </div>
                     <div id="newBtn">
-                        <el-button type="primary" @click="getList">查询</el-button>
+                        <el-button type="primary" @click="getList" round>查询</el-button>
                     </div>
                 </div>
                 <div class="order-content-main"  v-if="results.length>0">
@@ -171,9 +171,9 @@
                                 </div>
                             </div>
                             <div class="order-botton" style="text-align: right">
-                               <el-button type="primary" style="margin: 0 10px;" @click="handleDetail(order.shopOrderId)">查看详情</el-button>
+                               <el-button type="primary" style="margin: 0 10px;" @click="handleDetail(order.shopOrderId)" round>查看详情</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>

+ 180 - 180
src/main/resources/templates/user-center/order/list.html

@@ -1,180 +1,180 @@
-<!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/user-center/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
-    <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 我的订单 -->
-<div id="orderPage" v-cloak>
-    <div class="navLayout" v-cloak>
-        <div v-if="isPC" class="crumbs">
-            <span>我的交易</span>
-            <span>&gt;</span>
-            <span>我的订单</span>
-        </div>
-        <div class="wrap clear">
-            <!--左侧导航-->
-            <template th:replace="user-center/components/tableft"></template>
-            <div class="right">
-                <div class="order-header clear">
-                    <div class="header-tp">
-                        <div class="header-tabs">
-                            <div class="tabs-item"  v-for="(item, index) in orderTabBar" :key="index" @click="changeOrderFn(index,item.state)" :class="orderTabBarIndex == index ? 'active':''">
-                                <a href="javascript: void(0);">{{item.text}}<span v-if="index!=0">({{item.bages | NumBadge}})</span></a>
-                            </div>
-                        </div>
-                        <div v-if="isPC" class="header-ser">
-                            <a class="btn-server" href="/help/1019.html" target="_blank">联系客服</a>
-                        </div>
-                    </div>
-                    <div class="header-bt">
-                        <div class='form-row low'>
-                            <span v-if="isPC">订单编号:</span>
-                            <el-input
-                                    v-model="listQuery.orderNo"
-                                    class="state"
-                                    placeholder="输入订单编号进行搜索"
-                                    clearable
-                                    @keyup.enter.native="getList"
-                                    @clear="getList"
-                            ></el-input>
-                        </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 class="header-button">
-                            <el-button type="primary" @click="getList">查询</el-button>
-                        </div>
-                    </div>
-                </div>
-                <!--loading-->
-                <div v-if="isRequset" class="loading">
-                    <img src="/img/base/loading.gif">
-                </div>
-                <div class="order-container clear" v-else>
-                    <!--数据为空-->
-                    <div class="section" v-if="orderList.length > 0">
-                        <div class="user-main order" v-for="(order, index) in orderList" :key="index">
-                            <div class="order-title">
-                                <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</span>
-                                <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</span>
-                                <div class="title-name">
-                                    <p>订单编号:<span>{{order.shopOrderNo}}</span></p>
-                                    <p class="state">{{order.status | statusFilters}}</p>
-                                </div>
-                                <div class="title-type" v-if="order.secondHandOrderFlag == 1"></div>
-                                <div class="title-time">
-                                    <p>下单时间:<span>{{order.orderTime}}</span></p>
-                                </div>
-                            </div>
-                            <div class="order-content">
-                                <div class="order-item">
-                                    <p>订单总额:<span class="red">¥{{order.totalAmount | NumFormat}}</span> </p>
-                                </div>
-                                <div class="order-item">
-                                    <p>应付总额:<span class="red">¥{{order.needPayAmount | NumFormat}}</span> </p>
-                                    <p>已支付:<span class="red">¥{{order.receiptAmount | NumFormat}}</span> </p>
-                                    <p>待付金额:<span class="red">¥{{order.obligation | NumFormat}}</span> </p>
-                                </div>
-                                <div class="order-item">
-                                    <p v-if="order.couponAmount > 0">优惠券:<span class="red">¥{{order.couponAmount | NumFormat}}</span> </p>
-                                    <p v-if="order.promotionFullReduction > 0">促销满减:<span class="red">¥{{order.promotionFullReduction | NumFormat}}</span> </p>
-                                    <p v-if="order.presentNum > 0">赠品数:<span class="red">{{order.presentNum}}</span></p>
-                                </div>
-                                <div class="order-botton">
-<!--                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag== 10 " @click="hanldConfirmFn(order.userId,order.orderId)"><p>确认</p>打款供应商</a>-->
-                                    <a class="btn primary" href="javascript: void(0);" v-if="[11,12,13,21,22,23].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.shopOrderId)">支付订单</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="order.checkFlag === 2" @click="hanldAddPay(order,order.shopOrderId)">上传转账凭证</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="order.status === 0"  @click="hanldConfirmOrderFn(order.shopOrderId)">确认订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.shopOrderId)">订单详情</a>
-                                    <a class="btn cancel" href="javascript: void(0);" v-if="[0,11].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.shopOrderId)">取消订单</a>
-<!--                                    <a class="btn cancel" href="javascript: void(0);" v-if="[4].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderId)">删除订单</a>-->
-                                    <a class="btn cancel" href="javascript: void(0);"  v-if="[2,3,5,6,12,13,22,23,32,33].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.shopOrderId)">查看物流</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="order.status === 33 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.shopOrderId)">
-                                        确认收货
-                                        <div class="tips">采美豆</div>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div v-else class="empty">
-                        <img src="/img/common/empty.png">
-                        <div class="msg"><p>暂无数据</p></div>
-                    </div>
-                </div>
-                <!--分页-->
-                <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-                <div v-if="isPC && pageTotal>1" class="pageWrap clear">
-                    <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
-                    <template v-for="n in showPageBtn">
-                        <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-                        <span v-else>···</span>
-                    </template>
-                    <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
-                    <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-                    <span>跳至</span>
-                    <input v-model="pageInput" @blur="checkNum()"/>
-                    <span>页</span>&nbsp;
-                    <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- 采美豆弹窗 -->
-    <div class="cmbeans-alert-box" v-if="isShowBeansAlet" :class="isShowBeansAlet ? 'show' : 'hide'">
-        <div class="cmbeans-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
-            <div class="cmbeans-alert-content-text">恭喜您获得采美豆!</div>
-            <div class="cmbeans-alert-content-bean">
-                <div class="cmbeans-alert-main">
-                    <img v-if="isPC" class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
-                    <img v-else class="cmbeans-alert-icon" src="/img/account/bean-icon-h5@3x.png" mode="">
-                    <div class="cmbeans-alert-text">
-                        <span class="icon-add">+</span>
-                        <span class="icon-text">{{ beanNumber }}</span>
-                    </div>
-                </div>
-            </div>
-            <div class="cmbeans-alert-content-tips">
-                <div class="tips">采美豆可抵扣运费</div>
-            </div>
-            <i class="icon mIcon" @click.stop="handleClickCancel"></i>
-        </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/order.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/list.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/user-center/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 我的订单 -->
+<div id="orderPage" v-cloak>
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+        </div>
+        <div class="wrap clear">
+            <!--左侧导航-->
+            <template th:replace="user-center/components/tableft"></template>
+            <div class="right">
+                <div class="order-header clear">
+                    <div class="header-tp">
+                        <div class="header-tabs">
+                            <div class="tabs-item"  v-for="(item, index) in orderTabBar" :key="index" @click="changeOrderFn(index,item.state)" :class="orderTabBarIndex == index ? 'active':''">
+                                <a href="javascript: void(0);">{{item.text}}<span v-if="index!=0">({{item.bages | NumBadge}})</span></a>
+                            </div>
+                        </div>
+                        <div v-if="isPC" class="header-ser">
+                            <a class="btn-server" href="/help/1019.html" target="_blank">联系客服</a>
+                        </div>
+                    </div>
+                    <div class="header-bt">
+                        <div class='form-row low'>
+                            <span v-if="isPC">订单编号:</span>
+                            <el-input
+                                    v-model="listQuery.orderNo"
+                                    class="state"
+                                    placeholder="输入订单编号进行搜索"
+                                    clearable
+                                    @keyup.enter.native="getList"
+                                    @clear="getList"
+                            ></el-input>
+                        </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 class="header-button">
+                            <el-button type="primary" @click="getList" round>查询</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!--loading-->
+                <div v-if="isRequset" class="loading">
+                    <img src="/img/base/loading.gif">
+                </div>
+                <div class="order-container clear" v-else>
+                    <!--数据为空-->
+                    <div class="section" v-if="orderList.length > 0">
+                        <div class="user-main order" v-for="(order, index) in orderList" :key="index">
+                            <div class="order-title">
+                                <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</span>
+                                <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</span>
+                                <div class="title-name">
+                                    <p>订单编号:<span>{{order.shopOrderNo}}</span></p>
+                                    <p class="state">{{order.status | statusFilters}}</p>
+                                </div>
+                                <div class="title-type" v-if="order.secondHandOrderFlag == 1"></div>
+                                <div class="title-time">
+                                    <p>下单时间:<span>{{order.orderTime}}</span></p>
+                                </div>
+                            </div>
+                            <div class="order-content">
+                                <div class="order-item">
+                                    <p>订单总额:<span class="red">¥{{order.totalAmount | NumFormat}}</span> </p>
+                                </div>
+                                <div class="order-item">
+                                    <p>应付总额:<span class="red">¥{{order.needPayAmount | NumFormat}}</span> </p>
+                                    <p>已支付:<span class="red">¥{{order.receiptAmount | NumFormat}}</span> </p>
+                                    <p>待付金额:<span class="red">¥{{order.obligation | NumFormat}}</span> </p>
+                                </div>
+                                <div class="order-item">
+                                    <p v-if="order.couponAmount > 0">优惠券:<span class="red">¥{{order.couponAmount | NumFormat}}</span> </p>
+                                    <p v-if="order.promotionFullReduction > 0">促销满减:<span class="red">¥{{order.promotionFullReduction | NumFormat}}</span> </p>
+                                    <p v-if="order.presentNum > 0">赠品数:<span class="red">{{order.presentNum}}</span></p>
+                                </div>
+                                <div class="order-botton">
+<!--                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag== 10 " @click="hanldConfirmFn(order.userId,order.orderId)"><p>确认</p>打款供应商</a>-->
+                                    <a class="btn primary" href="javascript: void(0);" v-if="[11,12,13,21,22,23].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.shopOrderId)">支付订单</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="order.checkFlag === 2" @click="hanldAddPay(order,order.shopOrderId)">上传转账凭证</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="order.status === 0"  @click="hanldConfirmOrderFn(order.shopOrderId)">确认订单</a>
+                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.shopOrderId)">订单详情</a>
+                                    <a class="btn cancel" href="javascript: void(0);" v-if="[0,11].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.shopOrderId)">取消订单</a>
+<!--                                    <a class="btn cancel" href="javascript: void(0);" v-if="[4].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderId)">删除订单</a>-->
+                                    <a class="btn cancel" href="javascript: void(0);"  v-if="[2,3,5,6,12,13,22,23,32,33].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.shopOrderId)">查看物流</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="order.status === 33 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.shopOrderId)">
+                                        确认收货
+                                        <div class="tips">采美豆</div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div v-else class="empty">
+                        <img src="/img/common/empty.png">
+                        <div class="msg"><p>暂无数据</p></div>
+                    </div>
+                </div>
+                <!--分页-->
+                <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+                <div v-if="isPC && pageTotal>1" class="pageWrap clear">
+                    <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
+                    <template v-for="n in showPageBtn">
+                        <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
+                        <span v-else>···</span>
+                    </template>
+                    <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
+                    <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                    <span>跳至</span>
+                    <input v-model="pageInput" @blur="checkNum()"/>
+                    <span>页</span>&nbsp;
+                    <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 采美豆弹窗 -->
+    <div class="cmbeans-alert-box" v-if="isShowBeansAlet" :class="isShowBeansAlet ? 'show' : 'hide'">
+        <div class="cmbeans-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
+            <div class="cmbeans-alert-content-text">恭喜您获得采美豆!</div>
+            <div class="cmbeans-alert-content-bean">
+                <div class="cmbeans-alert-main">
+                    <img v-if="isPC" class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
+                    <img v-else class="cmbeans-alert-icon" src="/img/account/bean-icon-h5@3x.png" mode="">
+                    <div class="cmbeans-alert-text">
+                        <span class="icon-add">+</span>
+                        <span class="icon-text">{{ beanNumber }}</span>
+                    </div>
+                </div>
+            </div>
+            <div class="cmbeans-alert-content-tips">
+                <div class="tips">采美豆可抵扣运费</div>
+            </div>
+            <i class="icon mIcon" @click.stop="handleClickCancel"></i>
+        </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/order.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/list.js(v=${version})}"></script>
+</body>
+</html>

+ 80 - 80
src/main/resources/templates/user-center/order/remarks-add-pay.html

@@ -1,80 +1,80 @@
-<!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/user-center/order/remarks-add-pay.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="user-center/components/tableft"></template>
-      <div class="right">
-        <div class="add-logistics">
-          <div class="add-pay-form">
-            <div class="release-from ">
-                <div class="release-from-labe"><span>*</span>支付凭证图片:</div>
-                <div class="release-input" id="uploadGoodsImages">
-                  <div class="upload-file" v-for="(item, index) in imgList" :key="index">
-                    <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" @click="bigImage">
-                    <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
-                  </div>
-                  <div class="upload-file" v-show="imgList.length<5">
-                    <i class="icon mIcon add"></i>
-                    <input ref="goodsImages" type="file" name="file" value="" class="input-file"
-                           accept="image/png,image/jpeg,image/gif,image/jpg"
-                           @change="uploadGoodsImagesFn">
-                  </div>
-                  <div class="form-upload-tips">
-                    <i class="icon mIcon icon-wen"></i>
-                    <div class="wen-tips">请上传支付凭证图片,最多5张</div>
-                  </div>
-                </div>
-            </div>
-            <div class="release-from">
-              <div class="release-from-labe">备注:</div>
-              <el-input v-model="params.remarks"
-                        type="textarea"
-                        show-word-limit
-                        placeholder="请输入备注文字,200字以内"
-                        maxlength="200"
-                        :autosize="{ minRows: 5, maxRows: 6}">
-              </el-input>
-            </div>
-            <div class="release-from-btn">
-                <el-button plain  style="width: 100px; margin: 0 10px;" @click="history.go(-1)">返回</el-button>
-                <el-button type="primary" :disabled="disabled" style="width: 100px; margin: 0 10px;" @click="handleSave">保存</el-button>
-            </div>
-          </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/order.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/remarks-add-pay.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/user-center/order/remarks-add-pay.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="user-center/components/tableft"></template>
+      <div class="right">
+        <div class="add-logistics">
+          <div class="add-pay-form">
+            <div class="release-from ">
+                <div class="release-from-labe"><span>*</span>支付凭证图片:</div>
+                <div class="release-input" id="uploadGoodsImages">
+                  <div class="upload-file" v-for="(item, index) in imgList" :key="index">
+                    <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" @click="bigImage">
+                    <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
+                  </div>
+                  <div class="upload-file" v-show="imgList.length<5">
+                    <i class="icon mIcon add"></i>
+                    <input ref="goodsImages" type="file" name="file" value="" class="input-file"
+                           accept="image/png,image/jpeg,image/gif,image/jpg"
+                           @change="uploadGoodsImagesFn">
+                  </div>
+                  <div class="form-upload-tips">
+                    <i class="icon mIcon icon-wen"></i>
+                    <div class="wen-tips">请上传支付凭证图片,最多5张</div>
+                  </div>
+                </div>
+            </div>
+            <div class="release-from">
+              <div class="release-from-labe">备注:</div>
+              <el-input v-model="params.remarks"
+                        type="textarea"
+                        show-word-limit
+                        placeholder="请输入备注文字,200字以内"
+                        maxlength="200"
+                        :autosize="{ minRows: 5, maxRows: 6}">
+              </el-input>
+            </div>
+            <div class="release-from-btn">
+                <el-button plain  style="width: 100px; margin: 0 10px;" @click="history.go(-1)" round>返回</el-button>
+                <el-button type="primary" :disabled="disabled" style="width: 100px; margin: 0 10px;" @click="handleSave" round>保存</el-button>
+            </div>
+          </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/order.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/remarks-add-pay.js(v=${version})}"></script>
+</body>
+</html>