Merge remote-tracking branch 'origin/developerB' into developerB

pom.xml

@@ -9,7 +9,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.caimei</groupId>
-    <artifactId>caimei365-www</artifactId>
+    <artifactId>www</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>www</name>
     <description>Demo project for Spring Boot</description>

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8009
+  port: 8100
 spring:
   application:
     # 指定服务名

src/main/resources/config/beta/application-beta.yml

@@ -41,7 +41,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
   level:
     root: info
 

src/main/resources/config/prod/application-prod.yml

@@ -41,7 +41,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
   level:
     root: info
 

src/main/resources/static/css/account/login.css

@@ -30,25 +30,13 @@ footer .footTop{display:none;}
 .loginForm .showPwd{position:absolute;right:22px;top:16px;width:22px;height:16px;cursor:pointer}
 .loginForm .showPwd:before{width:22px;height:20px;background-position:-240px -299px}
 .loginForm .showPwd.on:before{width:22px;height:20px;background-position:-205px -299px}
-#qrCodeWrap .model{
-        position: absolute;
-        width: 200px;
-        height: 200px;
-        top: 15px;
-        left: 98px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        background: rgba(255,255,255,1);
-        color: #999;
-        z-index: 99999;
-        cursor: pointer;
-        border: 1px solid #EBEBEB;
-}
-#qrCodeWrap .model .refresh{width: 21px;height: 21px;display: block;margin: 0 auto;margin-bottom: 3px;}
-#qrCodeWrap .model  .refresh-div{width: 100px;height: 64px;display: block;}
-#qrCodeWrap .model  .refresh-div p{text-align: center;font-size: 14px;line-height: 20px;}
-.baseHeadCenter.account .accountLogin{display: none;}
+#qrCodeWrap{position:relative}
+#qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,.9);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
+#qrCodeWrap .model .refresh{width:21px;height:21px;display:block;margin:0 auto 3px}
+#qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
+#qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}
+.baseHeadCenter.account .accountLogin{display:none}
+
 
 }
 

src/main/resources/static/css/flea-market/form.css

@@ -76,6 +76,7 @@ body{background: #fff}
      .gosecond {color: #1683E1;border-right: 1px solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 40px;height: 40px;line-height: 40px;text-align: center;cursor: pointer;font-size: 24px;}
      .bjmain .title{width: -webkit-fill-available;color: #627386;padding: 15px;display: inline-block;border: solid 1px #e2e7ef;font-size: 14px}
+     .unlogin-label{height: 26px}
  }
 
 /*移动端*
@@ -102,7 +103,7 @@ body{background: #fff}
      #shoplogoTwo {height: 36px;margin-top: 2.7vw;}
      .login-form input[type="text"] {width: 100% !important;height: 9.6vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 2.7vw;color: #9aa5b5;box-sizing: border-box}
      input[type="text"]::placeholder, textarea::placeholder {color: #9aa5b5;;}
-     .shrink-spacing {margin: 20px 0;}
+     .shrink-spacing {margin: 20px 0;position: relative;}
      .red-color {color: #f94b4b;}
      .address-input {width: 28.5vw;height: 10.7vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 6.7vw;color: #9aa5b5}
      .address-item i{position: relative;}
@@ -158,4 +159,12 @@ body{background: #fff}
      .paybtn .thegopay {border: 1px solid #E0E0E0;height: 8.5vw;line-height: 8.5vw;border-radius: .53vw;color: #333333;padding: 0 1.3vw 0 1.3vw}
      .gosecond {color: #1683E1;border-right: .27vw solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 10.7vw;height: 10.7vw;line-height: 10.7vw;text-align: center;cursor: pointer;font-size: 6.4vw;}
+    .selected.mIcon:before{
+    width: 5.3vw;
+    height: 5.3vw;
+    background-position: -51.2vw -.27vw;
+    position: absolute;
+    top: 9vw;
+    right: 2.7vw
+}
  }

src/main/resources/static/css/flea-market/intro.css

@@ -1,386 +1,75 @@
   @media screen and (min-width:768px) {
-
-      .body {
-          position: relative;
-          width: 1190px;
-          margin: 20px auto 0;
-          background-image: url("/img/flea-market/zuhe23.png");
-          background-position: 85px 40px;
-          background-repeat: no-repeat;
-      }
-      body {
-          background-image: linear-gradient(#FF7676, #E15616);
-      }
-      .second-hand-wrapper h1 {
-          color: #FFFFFF;
-          letter-spacing: 2px;
-      }
-      #second-hand-btn {
-          position: relative;
-          width: 1160px;
-          background: #FFFFFF;
-          border-radius: 20px;
-          margin-top: 40px;
-          padding: 20px 0 0 40px;
-          margin-bottom: 80px;
-          height: 273px;
-          border-bottom: 10px solid #f1ac90;
-          border-right: 10px solid #f1ac90;
-      }
-      #second-hand-btn button {
-          position: absolute;
-          width: 15%;
-          height: 40px;
-          background: linear-gradient(225deg, rgba(255, 107, 107, 1) 0%, rgba(247, 76, 0, 1) 100%);
-          border-radius: 5px;
-          color: #fff;
-          border: none;
-          top: 80px;
-          font-size: 17px;
-          outline: none;
-          cursor: pointer;
-          border-radius: 22px;
-      }
-      .top_title div:nth-child(2){
-            position: absolute;
-            top: 38px;
-      }
-      #second-hand-btn button:first-child {
-          left: 15%;
-      }
-
-      #second-hand-btn button:nth-child(2) {
-          left: 34%;
-      }
-
-      #second-hand-btn button:nth-child(3) {
-          left: 52%;
-      }
-
-      #second-hand-btn button:nth-child(4) {
-          left: 70%;
-      }
-
-      .top_title {
-          padding: 20px 0 20px 0;
-      }
+      .body {position: relative;width: 1190px;margin: 20px auto 0;background-image: url("/img/flea-market/zuhe23.png");background-position: 85px 40px;background-repeat: no-repeat;}
+      body {background-image: linear-gradient(#FF7676, #E15616);}
+      .second-hand-wrapper h1 {color: #FFFFFF;letter-spacing: 2px;}
+      #second-hand-btn {position: relative;width: 1160px;background: #FFFFFF;border-radius: 20px;margin-top: 40px;padding: 20px 0 0 40px;margin-bottom: 80px;height: 273px;border-bottom: 10px solid #f1ac90;border-right: 10px solid #f1ac90;}
+      #second-hand-btn button {position: absolute;width: 15%;height: 40px;background: linear-gradient(225deg, rgba(255, 107, 107, 1) 0%, rgba(247, 76, 0, 1) 100%);border-radius: 5px;color: #fff;border: none;top: 80px;font-size: 17px;outline: none;cursor: pointer;border-radius: 22px;}
+      .top_title div:nth-child(2){position: absolute;top: 38px;}
+      #second-hand-btn button:first-child {left: 15%;}
+      #second-hand-btn button:nth-child(2) {left: 34%;}
+      #second-hand-btn button:nth-child(3) {left: 52%;}
+      #second-hand-btn button:nth-child(4) {left: 70%;}
+      .top_title {padding: 20px 0 20px 0;}
       .top_title img{width: 80px}
-      .top_title span {
-          color: #FFFFFF;
-      }
-
-      .top_text {
-          font-size: 64px;
-          color: #FFFFFF;
-          font-style: oblique;
-          font-weight: bold;
-          margin-top: 40px;
-      }
-
-      .mian_text {
-          margin-top: 80px;
-          width: 700px;
-          color: #FFFFFF;
-          font-size: 18px;
-      }
+      .top_title span {color: #FFFFFF;}
+      .top_text {font-size: 64px;color: #FFFFFF;font-style: oblique;font-weight: bold;margin-top: 40px;}
+      .mian_text {margin-top: 80px;width: 700px;color: #FFFFFF;font-size: 18px;}
       .jioayi{ font-size: 24px;    color: #353C44;}
-
-      .mian_text h1 {
-          font-size: 36px;
-          font-weight: bold;
-          padding-bottom: 20px;
-      }
-
-      .mian_content {
-          margin-top: 80px;
-      }
-
-      .mian_content h1 {
-          font-size: 36px;
-          font-weight: bold;
-      }
-
-      .font_content {
-          width: 1160px;
-          background: #FFFFFF;
-          /*height: 590px;*/
-          border-radius: 20px;
-          margin-top: 40px;
-          padding: 20px;
-          font-weight: 400;
-          line-height: 32px;
-          color: rgba(109, 114, 120, 1);
-          opacity: 1;
-          position: relative;
-          border-bottom: 10px solid #f1ac90;
-          border-right: 10px solid #f1ac90
-      }
-
-      .content_list p {
-          font-size: 21px;
-          font-family: Source Han Sans CN;
-
-      }
-
-      .content_list span {
-          font-size: 18px;
-      }
-
-      .content_list {
-          margin-bottom: 20px;
-      }
-
-      .tishiyu {
-          background: #FFF8F8;
-          font-size: 16px;
-          font-family: Source Han Sans CN;
-          font-weight: 400;
-          line-height: 32px;
-          color: #FF7354;
-          opacity: 1;
-          padding: 10px;
-          border-radius: 10px;
-          margin-top: 60px;
-      }
-
-      .twobuy {
-          background: #EF5C3C;
-          border-radius: 10px;
-          font-size: 18px;
-          font-family: AlibabaPuHuiTiB;
-          opacity: 1;
-          padding: 3px;
-          color: #FFFFFF;
-          margin-bottom: 20px;
-          text-align: center;
-          width: 250px
-      }
-
-      .threebuy {
-          background: #EF5C3C;
-          border-radius: 5px;
-          font-size: 18px;
-          color: #fff;
-          padding: 3px;
-          width: 590px;
-          text-align: center;
-          margin-bottom: 20px;
-      }
-
-      .bluefont {
-          font-size: 24px;
-          color: #0091FF
-      }
-
-      .foot_font {
-          width: 712px;
-          height: 40px;
-          margin: auto;
-          text-align: center;
-          margin-top: 180px;
-          font-size: 24px;
-      }
-
-      .yellow_icon {
-          width: 300px;
-          height: 20px;
-          background: rgba(250, 185, 0, 1);
-          opacity: 1;
-          margin-top: -27px;
-      }
-      .yellow_icon.y{
-         width: 150px !important;
-      }
-
-      .top_title div {
-          display: inline-block;
-      }
-      .jiaoyi{
-        color: #353C44;
-        font-size: 24px
-      }
-      .jiaoyi_img{
-        display: none;
-      }
+      .mian_text h1 {font-size: 36px;font-weight: bold;padding-bottom: 20px;}
+      .mian_content {margin-top: 80px;}
+      .mian_content h1 {font-size: 36px;font-weight: bold;}
+      .font_content {width: 1160px;background: #FFFFFF; /*height: 590px;*/border-radius: 20px;margin-top: 40px;padding: 20px;font-weight: 400;line-height: 32px;color: rgba(109, 114, 120, 1);opacity: 1;position: relative;border-bottom: 10px solid #f1ac90;border-right: 10px solid #f1ac90}
+      .content_list p {font-size: 21px;font-family: Source Han Sans CN;}
+      .content_list span {font-size: 18px;}
+      .content_list {margin-bottom: 20px;}
+      .tishiyu {background: #FFF8F8;font-size: 16px;font-family: Source Han Sans CN;font-weight: 400;line-height: 32px;color: #FF7354;opacity: 1;padding: 10px;border-radius: 10px;margin-top: 60px;}
+      .twobuy {background: #EF5C3C;border-radius: 10px;font-size: 18px;font-family: AlibabaPuHuiTiB;opacity: 1;padding: 3px;color: #FFFFFF;margin-bottom: 20px;text-align: center;width: 250px}
+      .threebuy {background: #EF5C3C;border-radius: 5px;font-size: 18px;color: #fff;padding: 3px;width: 590px;text-align: center;margin-bottom: 20px;}
+      .bluefont {font-size: 24px;color: #0091FF}
+      .foot_font {width: 712px;height: 40px;margin: auto;text-align: center;margin-top: 180px;font-size: 24px;}
+      .yellow_icon {width: 300px;height: 20px;background: rgba(250, 185, 0, 1);opacity: 1;margin-top: -27px;}
+      .yellow_icon.y{width: 150px !important;}
+      .top_title div {display: inline-block;}
+      .jiaoyi{color: #353C44;font-size: 24px}
+      .jiaoyi_img{display: none;}
+      .top_title div:nth-child(1){margin-right: 10px}
   }
 
 
 
 /* 移动端*/
 @media screen and (max-width:768px){
-   #fleaMarket{
-      padding: 10px;
-     background-image: linear-gradient(#FF7676, #E15616);
-}
-     .title{letter-spacing: .2rem;font-size: 0.48rem}
-     .second-hand-wrapper img{
-            width: 100%;
-            display: block;
-            margin: 2.7vw auto;
-        }
-        #second-hand-btn button {
-                width: 37.3vw;
-                height: 12vw;
-                background: linear-gradient(225deg,rgba(255,107,107,1) 0%,rgba(247,76,0,1) 100%);
-                border-radius: 4vw;
-                color: #fff;
-                border: none;
-                font-size: 3.7vw;
-                outline: none;
-                margin-bottom: 2.7vw;
-                margin-right: 2.7vw
-        }
-         body{
-            position: relative;
-            margin: 20px auto 0;
-
-        }
-        .second-hand-wrapper{
-            background-image: url("/img/flea-market/bg22.png");
-            background-position: 50% 9%;
-            background-repeat: no-repeat;
-            background-size: 100%;
-        }
-       .second-hand-wrapper h1{
-            color: #FFFFFF;
-            letter-spacing: 2px;
-       }
-        #second-hand-btn {
-            position: relative;
-            background: #FFFFFF;
-            border-radius: 4vw;
-            margin-top: 4vw;
-            padding: 5.3vw 3vw 5vw 4vw;
-            margin-bottom: 2vw;
-            border-bottom: 1.3vw solid #f1ac90;
-            border-right: 1.3vw solid #f1ac90;
-            text-align: center;
-        }
-        .top_title{
-            padding: 20px 0 20px 0;
-            text-align: center;
-        }
-        .top_title h1{
-             letter-spacing: 3vw;
-             font-size: 5vw
-            }
-        .top_title img{width: 52px}
-        .top_title span{
-            color: #FFFFFF;
-            font-size: smaller;
-        }
-        .top_text{
-            font-size: 8vw;
-            color: #FFFFFF;
-            font-style: oblique;
-            font-weight: bold;
-            margin-top: 5.3vw;
-            text-align: center;
-        }
-        .mian_text{
-            margin-top: 10vw;
-            color: #FFFFFF;
-            font-size: 3vw;
-            padding: 0 4vw 0 4vw;
-            line-height: 5.3vw;
-            letter-spacing: .53vw
-        }
-        .mian_text h1{
-             font-size: 4.8vw;
-            font-weight: bold;
-            padding-bottom: 5vw
-        }
-        .mian_content.top{
-            margin-top: 66.7vw;
-        }
-        .mian_content h1{
-             font-size: 4.8vw;
-            font-weight: bold;
-        }
-        .mian_content{
-            margin-top: 10.7vw;
-        }
-        .font_content{
-             background: #FFFFFF;
-            border-radius: 5vw;
-            margin-top: 4vw;
-            padding: 2.5vw;
-            font-weight: 400;
-            line-height: 6vw;
-            color: rgba(109,114,120,1);
-            opacity: 1;
-            position: relative;
-            border-bottom: 1.3vw solid #f1ac90;
-            border-right: 1.3vw solid #f1ac90;
-        }
-        .content_list p{
-         font-size:4vw;
-        font-family:Source Han Sans CN;
-
-        }
-        .content_list span{
-         font-size: 3vw;
-        }
-        .content_list{
-         margin-bottom: 5vw;
-        }
-        .tishiyu{
-            background: #FFF8F8;
-            font-size: 3vw;
-            font-family: Source Han Sans CN;
-            font-weight: 400;
-            line-height: 5.3vw;
-            color: #FF7354;
-            opacity: 1;
-            padding: 2.6vw;
-            border-radius: 2.7vw
-        }
-        .twobuy{
-            background: #EF5C3C;
-            border-radius: 2vw;
-            font-size: 3.7vw;
-            font-family: AlibabaPuHuiTiB;
-            opacity: 1;
-            padding: .8vw;
-            color: #FFFFFF;
-            margin-bottom: 2.6vw;
-            text-align: center;
-            width: 48vw
-        }
-        .threebuy{
-            background: #EF5C3C;
-            border-radius: 1.3vw;
-            font-size: 3.2vw;
-            color: #fff;
-            padding: .8vw;
-            margin-bottom: 5vw
-        }
-        .bluefont{
-            font-size: .32rem !important;
-            color: #0091FF
-        }
-        .foot_font{
-            text-align: center;
-            font-size: 4.5vw;
-            line-height: 7vw
-        }
-        .yellow_icon{
-             width: 42vw;
-            height: 3vw;
-            background: rgba(250,185,0,1);
-            opacity: 1;
-            margin-top: -3vw
-        }
-        .yellow_icon.m{
-            width: 21.3vw;
-        }
-        .top_title div{
-            display: inline-block;
-        }
-        .jiaoyi{
-            font-size: 3.2vw;
-        }
-         .jiaoyi_pimg{
-           display: none !important;
-      }
+       #fleaMarket{padding: 2.7vw;background-image: linear-gradient(#FF7676, #E15616);}
+       .title{letter-spacing: .27vw;font-size: 0.48rem}
+       .second-hand-wrapper img{width: 100%;display: block;margin: 2.7vw auto 0;}
+        #second-hand-btn button {width: 37.3vw;height: 12vw;background: linear-gradient(225deg,rgba(255,107,107,1) 0%,rgba(247,76,0,1) 100%);border-radius: 4vw;color: #fff;border: none;font-size: 3.7vw;outline: none;margin-bottom: 2.7vw;margin-right: 2.7vw}
+        body{position: relative;margin: 5.3vw auto 0;}
+        .second-hand-wrapper{background-image: url("/img/flea-market/bg22.png");background-position: 50% 9%;background-repeat: no-repeat;background-size: 100%;}
+        .second-hand-wrapper h1{color: #FFFFFF;letter-spacing: .53vw;}
+        #second-hand-btn {position: relative;background: #FFFFFF;border-radius: 4vw;margin-top: 4vw;padding: 5.3vw 3vw 5vw 4vw;margin-bottom: 2vw;border-bottom: 1.3vw solid #f1ac90;border-right: 1.3vw solid #f1ac90;text-align: center;}
+        .top_title{padding: 5.3vw 0 5.3vw 0;text-align: center;}
+        .top_title h1{letter-spacing: 3vw;font-size: 5vw}
+        .top_title img{width: 13.9vw}
+        .top_title span{color: #FFFFFF;font-size: smaller;}
+        .top_text{font-size: 8vw;color: #FFFFFF;font-style: oblique;font-weight: bold;margin-top: 5.3vw;text-align: center;}
+        .mian_text{margin-top: 10vw;color: #FFFFFF;font-size: 3vw;padding: 0 4vw 0 4vw;line-height: 5.3vw;letter-spacing: .53vw}
+        .mian_text h1{font-size: 4.8vw;font-weight: bold;padding-bottom: 5vw}
+        .mian_content.top{margin-top: 66.7vw;}
+        .mian_content h1{font-size: 4.8vw;font-weight: bold;}
+        .mian_content{margin-top: 10.7vw;}
+        .font_content{background: #FFFFFF;border-radius: 5vw;margin-top: 4vw;padding: 2.5vw;font-weight: 400;line-height: 6vw;color: rgba(109,114,120,1);opacity: 1;position: relative;border-bottom: 1.3vw solid #f1ac90;border-right: 1.3vw solid #f1ac90;}
+        .content_list p{font-size:4vw;font-family:Source Han Sans CN;}
+        .content_list span{font-size: 3vw;}
+        .content_list{margin-bottom: 5vw;}
+        .tishiyu{background: #FFF8F8;font-size: 3vw;font-family: Source Han Sans CN;font-weight: 400;line-height: 5.3vw;color: #FF7354;opacity: 1;padding: 2.6vw;border-radius: 2.7vw}
+        .twobuy{background: #EF5C3C;border-radius: 2vw;font-size: 3.7vw;font-family: AlibabaPuHuiTiB;opacity: 1;padding: .8vw;color: #FFFFFF;margin-bottom: 2.6vw;text-align: center;width: 48vw}
+        .threebuy{background: #EF5C3C;border-radius: 1.3vw;font-size: 3.2vw;color: #fff;padding: .8vw;margin-bottom: 5vw}
+        .bluefont{font-size: 3.2vw !important;color: #0091FF}
+        .foot_font{text-align: center;font-size: 4.5vw;line-height: 7vw}
+        .yellow_icon{width: 42vw;height: 3vw;background: rgba(250,185,0,1);opacity: 1;margin-top: -3vw}
+        .yellow_icon.m{width: 21.3vw;}
+        .top_title div{display: inline-block;}
+        .jiaoyi{font-size: 3.2vw;}
+        .jiaoyi_pimg{display: none !important;}
+        .top_title div:nth-child(1){margin-right: 2.7vw}
 }

src/main/resources/static/css/flea-market/list.css

@@ -50,13 +50,13 @@
 @media screen and (max-width:768px){
 #fleaMarketList{width: 100%;overflow: hidden}
     .shopList{background: #fff}
-    .Listitem{height:33vw;padding: 10px;border-bottom: .24vw solid #F0F2F4}
+    .Listitem{height:33vw;padding: 2.7vw;border-bottom: .24vw solid #F0F2F4}
     .ListImg{width: 100%;height: 35.3vw}
     .ListImg img {width: 100%;height: 100%;}
     .secondTitle {width: 100%;height: 10vw;background-color: #ffffff;border-bottom: .24vw solid #F0F2F4;position: relative}
     .ClassA {width: 32vw;height: 10vw;display: inline-block;text-align: center;line-height: 10vw;font-size: 3.86vw;cursor: pointer;color: #9aa5b5;border: 0;position: relative;}
     .mainTab {background: #fff;width: 29vw;position: absolute;z-index: 1;}
-    .Listitem:nth-of-type(4n) {margin-right: 0;}
+    .Listitem:nth-of-type(4) {margin-right: 0;}
     .mainTab li {height: 9.6vw;line-height: 9.6vw;text-align: center;color: #627386;cursor: pointer;}
     .active {color: #E15621;}
     .line{width: 10vw;margin:0 auto;height: .48vw;background-color: #e15616;display: block}
@@ -65,25 +65,27 @@
     .activeImg{opacity: 0.5;}
     .itemImg img{width: 100%;height: 100%;}
     .ItemInfo{float: right;width: 60vw}
-    .infotag {font-size:  0.4vw;width: 11.6vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 .72vw}
-    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
-    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
-    .infotag.sold {border: solid 1px #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
-    .infotag.other {border: solid 1px #1890f9;color: #1890f9;background-color: #e3ebf7;}
-    .targetprice {font-size: 4vw;color: #f94b4b;cursor: pointer;}
-    .productname{color: #627386;letter-spacing: 1px;font-size: 4vw;margin: 1.2vw 0;display: block;}
+    .infotag {font-size: 3vw;padding: 0 2.7vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 .72vw}
+    .infotag.news {border: solid .27vw #f94b4b;color: #f94b4b;background-color: #fadbdb}
+    .infotag.brand {border: solid.27vw #f9a24b;color: #f9a24b;background-color: #faefdb;}
+    .infotag.sold {border: solid .27vw #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
+    .infotag.other {border: solid .27vw #1890f9;color: #1890f9;background-color: #e3ebf7;}
+    .targetprice {font-size: 3.4vw;color: #f94b4b;cursor: pointer;}
+    .productname{color: #627386;letter-spacing: .27vw;font-size: 3.4vw;margin: 1.2vw 0;display: block;overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap}
     .shijian {font-size: 3.46vw;color: #9aa5b5;text-align: justify;margin-bottom: 1.2vw ;position: relative;}
     .shijian div {display: inline-block;}
     .shijian div:nth-child(1) {margin-right:16vw;}
-    .dizhi {font-size:  3.46vw;color: #9aa5b5;margin-bottom: 1.2vw;position: relative;margin-right: 20px}
+    .dizhi {font-size: 3vw;color: #9aa5b5;margin-bottom: 1.2vw;position: relative;margin-right: 5.3vw}
     .mIcon.liulanliang:before {background-position: -28.8vw -15.5vw;width: 5.3vw;height: 5.3vw;}
-    .mIcon.shijian:before {background-position: -36.8vw -15.5vw;width: 4.9vw;height: 6vw;position: absolute;right: .24vw;top: -1.45vw;}
+    .mIcon.shijian:before {background-position: -36.8vw -15.8vw;width: 4.9vw;height: 6vw;position: absolute;right: .24vw;top: -1.7vw;}
     .mIcon.dizhi:before {background-position: -87.7vw -38.4vw;width: 5.3vw;height: 5.3vw;position: absolute;right: -6vw;top: -1.3vw}
     .mIcon.off:before{background-position: -68vw .53vw;width: 5.3vw;height: 5.3vw;position: absolute;right: 5vw;top: 1.7vw;}
     .mIcon.open:before{background-position: -60.3vw .53vw;width: 5.3vw;height: 5.3vw;position: absolute;right: 5vw;top: 1.7vw;}
     .no-content{padding:26.6vw 5.3vw;background-color: #fff;margin: auto;}
     .no-content img{width: 50%;display: block;margin: 0 auto;padding: 0.5rem 0;}
     .error-message{text-align: center;margin-top: 5.3vw;font-size: 3.7vw;color: #53504D}
-    .fabu{background: #e15616;height: 56px;width: 100%;text-align: center;line-height: 56px;font-size: 19px;position: fixed;bottom: 0;z-index: 1}
-    .fabu a{color: #fff}
+    .fabu{text-align: center;font-size: 3.7vw;padding: 3.3vw;background: #fff}
+    .fabu a{color: #fff;display: block;background: #e15616;height: 11.3vw;width: 100%;margin: auto;line-height: 11.3vw}
 }

src/main/resources/static/css/flea-market/secondDetail.css

@@ -1,559 +1,117 @@
 
 @media screen and (min-width:768px) {
-.recommendBox{margin-bottom:16px;overflow: hidden;}
-.recommendBox .hd{font-size:16px;color:#4A4F58;font-weight:bold;padding:16px 32px}
-#productRecommend{padding:10px;background: #fff}
-#productRecommend li{float:left;width:153px !important;height:205px;overflow:hidden;list-style: none;}
-#productRecommend li .item{width:153px;height:205px;margin:0 auto;line-height:22px}
-#productRecommend li .item a{display:block;width:100%;height:100%;color:#93979F}
-#productRecommend li .item a:hover{color:#E15616}
-#productRecommend li .item img{display:block;width:100%;height:100%}
-#productRecommend li .item span{max-height:44px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
-#productRecommend .swiper-wrapper{height:205px;}
-#productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
-#productRecommend .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
-#productRecommend .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#E15616;border-radius:2px}
-#productRecommend .swiper-pagination span.on{width:28px;opacity:1;}
-    .preview-container {
-        width: 100%;
-        height: auto;
-        background-color: #f6f6f6;
-        margin-bottom: 20px;
-    }
-
-    .preview-container-top {
-        width: 100%;
-        height: 80px;
-        background-color: #FFC684;
-        font-size: 30px;
-        color: #FFF;
-        line-height: 80px;
-        text-align: center;
-    }
-
-    .inner-container {
-        width: 1184px;
-        height: auto;
-        margin: 0 auto;
-    }
-
-    .preview-header {
-        padding: 12px;
-        background-color: #FFFFFF;
-        margin: 10px 0 20px 0;
-        overflow: hidden
-    }
-
-    .preview-header .preview-banner {
-        width: 452px;
-        height: 545px;
-        float: left;
-        position: relative;
-    }
-
-    .preview-header .preview-info {
-        width: 685px;
-        float: right;
-        opacity: 0;
-    }
-
-    .preview-header .preview-info.active {
-        opacity: 1;
-    }
-
-    .preview-header .preview-banner-big {
-        width: 452px;
-        height: 452px;
-        float: left;
-    }
-
-    .preview-header .preview-banner-big .preview-img {
-        width: 100%;
-        height: 100%;
-        display: block;
-    }
-
-    .preview-header .preview-banner-big span {
-        display: none;
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 215px;
-        height: 215px;
-        border: 1px solid #aaa;
-        background: rgba(255, 208, 22, 0.4);
-        opacity: .5;
-        filter: alpha(opacity:50);
-        cursor: move;
-    }
-
-    .preview-header .preview-banner-small {
-        width: 100%;
-        height: 98px;
-        padding: 10px;
-        float: left;
-    }
-
-    .preview-header .preview-banner-small .item {
-        width: 78px;
-        height: 78px;
-        margin-right: 9px;
-        float: left;
-        background-color: #fff;
-        cursor: pointer;
-        list-style: none;
-        opacity: .5;
-    }
-
-    .preview-header .preview-banner-small .item:last-child {
-        margin-right: 0;
-    }
-
-    .preview-header .preview-banner-small .item img {
-        width: 100%;
-        height: 100%;
-        display: block;
-        -moz-transition: .5s;
-        -webkit-transition: .5s;
-        transition: .5s;
-    }
-
-    .preview-header .preview-banner-small .item.item-cur {
-        border-color: #e15616;
-    }
-
-    .preview-header .preview-banner-small .item.item-cur img {
-        opacity: 1;
-    }
-
-    .preview-header .preview-box {
-        display: none;
-        overflow: hidden;
-        position: absolute;
-        right: -555px;
-        top: 0;
-        width: 548px;
-        height: 548px;
-        border: 1px solid #e4e4e4;
-        z-index: 9999;
-        background: #FFFFFF;
-    }
-
-    .preview-header .preview-box img {
-        width: 1096px;
-        height: 1096px;
-        margin-right: 10px;
-        display: block;
-    }
-
-    .preview-info .preview-info-title {
-        width: 100%;
-        height: auto;
-        float: left;
-        position: relative;
-    }
-
-    .preview-info .preview-info-title .info-p {
-        height: auto;
-        float: left;
-    }
-
-    .preview-info .preview-info-title .info-p.classly {
-        font-size: 14px;
-        color: #999;
-    }
-
-    .preview-info .preview-info-title .info-p.name {
-        font-size: 18px;
-        color: #333;
-        font-weight: bold;
-        line-height: 24px;
-        height: auto;
-        width: 100%;
-        margin: 10px 0;
-    }
-
-    .preview-info .preview-info-title .info-p.label .label-s {
-        font-size: 12px;
-        background: #A69DFE;
-        color: #fff;
-        padding: 5px 10px;
-        border-radius: 2px;
-        margin: 0 10px 5px 0;
-        display: inline-block;
-    }
-
-    .preview-info .preview-info-main {
-        padding: 16px 20px;
-        background-color: #f3f7fe;
-        border-radius: 2px;
-        float: left;
-        margin-top: 15px;
-    }
-
-    .preview-info .preview-info-main .info {
-        width: 50%;
-        height: 30px;
-        float: left;
-        margin-bottom: 5px;
-        line-height: 30px;
-    }
-
-    .preview-info .preview-info-main .info .label {
-        width: 70px;
-        height: 30px;
-        float: left;
-        display: block;
-        font-size: 14px;
-        line-height: 30px;
-        text-align: right;
-        color: #999;
-    }
-    .preview-info .preview-info-main .info p {
-        float: left;
-        height: 100%;
-        padding-left: 20px;
-        color: #4a4f58;
-    }
-    .preview-bottom .preview-left .preview-tabs-item.active {
-        background-color: #e15616;
-        color: #FFF;
-    }
-    .member-detail {
-        color: #999999;
-        font-size: 14px;
-    }
-    .loginWithParam {
-        color: #FC4444;
-        font-size: 14px;
-    }
-    .recommended-item div {
-        width: 152px !important;
-        height: 153px;
-        margin-top: 10px;
-    }
-    .recommended-item img {
-        width: 100%;
-        height: 100%;
-    }
-    .recommended-item p {
-        color: #666666;
-    }
-    .main {
-        width: 1184px;
-        margin: 20px auto 0;
-    }
-    .title {
-        line-height: 40px;
-        padding-left: 10px;
-        margin: 0 auto;
-        font-size: 16px;
-        color: #333333;
-        border-bottom: 1px solid #E15616;
-        font-weight: bold;
-    }
-    .mainContent {
-        width: 100%;
-        font-size: 0;
-    }
-    .mainContentLeft {
-        width: 100%;
-        display: inline-block;
-        background-color: #fff;
-        vertical-align: top;
-    }
-    .Disclaimer {
-        padding: 20px 10px;
-        background-color: #fff;
-    }
-    .Disclaimer h3 {
-        font-size: 14px;
-        margin-bottom: 20px;
-        color: #333333;
-    }
-    .Disclaimer p {
-        font-size: 14px;
-        color: #999999;
-        padding: 0 10px
-    }
-    .contentHtml {
-        font-size: 14px;
-        padding: 0 20px 10px;
-        text-align: left;
-        margin: auto;
-    }
-    .contentHtml div{
-        margin: 10px auto;
-    }
-    .contentHtml img {
-        display: block;
-        margin: 20px auto 0;
-        max-width: 100%;
-    }
-
-    .yishou_img {
-        position: absolute;
-        top: 0;
-        right: 0;
-        transform: translate(-9%, 7%);
-        width: 15%;
-        opacity: 0;
-    }
-    .iconLogo {
-        position: absolute;
-        left: 0;
-        top: 0;
-        color: #fff;
-        font-size: 14px;
-        padding: 5px 12px;
-        border-radius: 0 0 10px 0;
-    }
-    .brandMain {
-        position: absolute;
-        left: 30px;
-        top: 29px;
-        width: 90%;
-        padding: 15px;
-        border: 1px solid #F2F2F2;
-        border-radius: 10px;
-        background-color: #fff;
-        cursor: pointer;
-        line-height: 24px;
-        letter-spacing: 1.5px;
-    }
-    .Brand img {
-        vertical-align: -1px;
-        margin-left: 5px;
-    }
-    .zheng-graphics {
-        position: absolute;
-        left: 60px;
-        top: -9px;
-        width: 15px;
-        height: 15px;
-        background-color: #fff;
-        border: 1px solid rgba(234, 234, 234, 1);
-        /*box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);*/
-        transform: rotate(-45deg);
-        border-left: 0;
-        border-bottom: 0;
-        z-index: 1;
-    }
-    .brandMain:hover {
-        box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, .16);
-    }
-    .brandMain:hover .zheng-graphics {
-        box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);
-    }
-    .defaulImg div {
-        border: none;
-    }
-
-    .show {
-        opacity: 1 !important;
-    }
-
-    .ercode img {
-        opacity: 0;
-    }
-
-    .hoverBrand:hover .brandMain {
-        display: block;
-    }
-
-    .swiper-pagination {
-        bottom: 0 !important;
-    }
-
-    .preview-header .preview-banner-small .item.addImg {
-        border: 1px solid #e15616;
-        opacity:1;
-    }
-    .infotag {
-        font-size: 10px;
-        width: 58px;
-        height: 22px;
-        line-height: 22px;
-        text-align: center;
-        display: inline-block;
-        border-radius: 2px;
-        flex: auto;
-        margin: 0 10px
-    }
-
-    .ItemInfo tag {
-        display: flex;
-    }
-
-    .infotag.news {
-        border: solid 1px #f94b4b;
-        color: #f94b4b;
-        background-color: #fadbdb
-    }
-
-    .infotag.brand {
-        border: solid 1px #f9a24b;
-        color: #f9a24b;
-        background-color: #faefdb;
-    }
-
-    .infotag.sold {
-        border: solid 1px #9aa5b5;
-        color: #9aa5b5;
-        background-color: #e3ebf7;
-    }
-
-    .infotag.other {
-        border: solid 1px #1890f9;
-        color: #1890f9;
-        background-color: #e3ebf7;
-    }
-    .fave-text{
-        color: #f94b4b;
-        font-weight: bold;
-    }
-    .fave-text .big{
-        font-size: 20px;
-    }
+    .recommendBox{margin-bottom:16px;overflow: hidden;}
+    .recommendBox .hd{font-size:16px;color:#4A4F58;font-weight:bold;padding:16px 32px}
+    #productRecommend{padding:10px;background: #fff}
+    #productRecommend li{float:left;width:153px !important;height:205px;overflow:hidden;list-style: none;}
+    #productRecommend li .item{width:153px;height:205px;margin:0 auto;line-height:22px}
+    #productRecommend li .item a{display:block;width:100%;height:100%;color:#93979F}
+    #productRecommend li .item a:hover{color:#E15616}
+    #productRecommend li .item img{display:block;width:100%;height:100%}
+    #productRecommend li .item span{max-height:44px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
+    #productRecommend .swiper-wrapper{height:205px;}
+    #productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
+    #productRecommend .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
+    #productRecommend .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#E15616;border-radius:2px}
+    #productRecommend .swiper-pagination span.on{width:28px;opacity:1;}
+    .preview-container {width: 100%;height: auto;background-color: #f6f6f6;margin-bottom: 20px;}
+    .preview-container-top {width: 100%;height: 80px;background-color: #FFC684;font-size: 30px;color: #FFF;line-height: 80px;text-align: center;}
+    .inner-container {width: 1184px;height: auto;margin: 0 auto;}
+    .preview-header {padding: 12px;background-color: #FFFFFF;margin: 10px 0 20px 0;overflow: hidden}
+    .preview-header .preview-banner {width: 452px;height: 545px;float: left;position: relative;}
+    .preview-header .preview-info {width: 685px;float: right;opacity: 0;}
+    .preview-header .preview-info.active {opacity: 1;}
+    .preview-header .preview-banner-big {width: 452px;height: 452px;float: left;}
+    .preview-header .preview-banner-big .preview-img {width: 100%;height: 100%;display: block;}
+    .preview-header .preview-banner-big span {display: none;position: absolute;left: 0;top: 0;width: 215px;height: 215px;border: 1px solid #aaa;background: rgba(255, 208, 22, 0.4);opacity: .5;filter: alpha(opacity:50);cursor: move;}
+    .preview-header .preview-banner-small {width: 100%;height: 98px;padding: 10px;float: left;}
+    .preview-header .preview-banner-small .item {width: 78px;height: 78px;margin-right: 9px;float: left;background-color: #fff;cursor: pointer;list-style: none;opacity: .5;}
+    .preview-header .preview-banner-small .item:last-child {margin-right: 0;}
+    .preview-header .preview-banner-small .item img {width: 100%;height: 100%;display: block;-moz-transition: .5s;-webkit-transition: .5s;transition: .5s;}
+    .preview-header .preview-banner-small .item.item-cur {border-color: #e15616;}
+    .preview-header .preview-banner-small .item.item-cur img {opacity: 1;}
+    .preview-header .preview-box {display: none;overflow: hidden;position: absolute;right: -555px;top: 0;width: 548px;height: 548px;border: 1px solid #e4e4e4;z-index: 9999;background: #FFFFFF;}
+    .preview-header .preview-box img {width: 1096px;height: 1096px;margin-right: 10px;display: block;}
+    .preview-info .preview-info-title {width: 100%;height: auto;float: left;position: relative;}
+    .preview-info .preview-info-title .info-p {height: auto;float: left;}
+    .preview-info .preview-info-title .info-p.classly {font-size: 14px;color: #999;}
+    .preview-info .preview-info-title .info-p.name {font-size: 18px;color: #333;font-weight: bold;line-height: 24px;height: auto;width: 100%;margin: 10px 0;}
+    .preview-info .preview-info-title .info-p.label .label-s {font-size: 12px;background: #A69DFE;color: #fff;padding: 5px 10px;border-radius: 2px;margin: 0 10px 5px 0;display: inline-block;}
+    .preview-info .preview-info-main {padding: 16px 20px;background-color: #f3f7fe;border-radius: 2px;float: left;margin-top: 15px;}
+    .preview-info .preview-info-main .info {width: 50%;height: 30px;float: left;margin-bottom: 5px;line-height: 30px;}
+    .preview-info .preview-info-main .info .label {width: 70px;height: 30px;float: left;display: block;font-size: 14px;line-height: 30px;text-align: right;color: #999;}
+    .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 20px;color: #4a4f58;}
+    .preview-bottom .preview-left .preview-tabs-item.active {background-color: #e15616;color: #FFF;}
+    .member-detail {color: #999999;font-size: 14px;}
+    .loginWithParam {color: #FC4444;font-size: 14px;cursor: pointer;}
+    .recommended-item div {width: 152px !important;height: 153px;margin-top: 10px;}
+    .recommended-item img {width: 100%;height: 100%;}
+    .recommended-item p {color: #666666;}
+    .main {width: 1184px;margin: 20px auto 0;}
+    .title {line-height: 40px;padding-left: 10px;margin: 0 auto;font-size: 16px;color: #333333;border-bottom: 1px solid #E15616;font-weight: bold;}
+    .mainContent {width: 100%;font-size: 0;}
+    .mainContentLeft {width: 100%;display: inline-block;background-color: #fff;vertical-align: top;}
+    .Disclaimer {padding: 20px 10px;background-color: #fff;}
+    .Disclaimer h3 {font-size: 14px;margin-bottom: 20px;color: #333333;}
+    .Disclaimer p {font-size: 14px;color: #999999;padding: 0 10px}
+    .contentHtml {font-size: 14px;padding: 0 20px 10px;text-align: left;margin: auto;}
+    .contentHtml div{margin: 10px auto;}
+    .contentHtml img {display: block;margin: 20px auto 0;max-width: 100%;}
+    .yishou_img {position: absolute;top: 0;right: 0;transform: translate(-9%, 7%);width: 15%;opacity: 0;}
+    .iconLogo {position: absolute;left: 0;top: 0;color: #fff;font-size: 14px;padding: 5px 12px;border-radius: 0 0 10px 0;}
+    .brandMain {position: absolute;left: 30px;top: 29px;width: 90%;padding: 15px;border: 1px solid #F2F2F2;border-radius: 10px;background-color: #fff;cursor: pointer;line-height: 24px;letter-spacing: 1.5px;}
+    .Brand img {vertical-align: -1px;margin-left: 5px;}
+    .zheng-graphics {position: absolute;left: 60px;top: -9px;width: 15px;height: 15px;background-color: #fff;border: 1px solid rgba(234, 234, 234, 1); /*box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);*/transform: rotate(-45deg);border-left: 0;border-bottom: 0;z-index: 1;}
+    .brandMain:hover {box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, .16);}
+    .brandMain:hover .zheng-graphics {box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);}
+    .defaulImg div {border: none;}
+    .show {opacity: 1 !important;}
+    .ercode img {opacity: 0;}
+    .hoverBrand:hover .brandMain {display: block;}
+    .swiper-pagination {bottom: 0 !important;}
+    .preview-header .preview-banner-small .item.addImg {border: 1px solid #e15616;opacity:1;}
+    .infotag {font-size: 10px;padding: 0 10px;height: 22px;line-height: 22px;text-align: center;display: inline-block;border-radius: 2px;flex: auto;margin: 0 10px}
+    .ItemInfo tag {display: flex;}
+    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
+    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
+    .infotag.sold {border: solid 1px #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
+    .infotag.other {border: solid 1px #1890f9;color: #1890f9;background-color: #e3ebf7;}
+    .fave-text{color: #f94b4b;font-weight: bold;}
+    .fave-text .big{font-size: 20px;}
 
 }
 
 
 /* 移动端*/
 @media screen and (max-width:768px){
-.inner-container{width: 100%;overflow: hidden;}
-#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}
-#imgShown{width: 100%; height: 100vw;position: relative;background: #fff}
-.preview-info{
-    box-sizing: border-box;
-    padding: 0 3.3vw;
-    overflow: hidden;
-    background: #fff
-
-}
-.preview-info-main{
-    box-sizing: border-box;
-    padding: 2.8vw;
-    font-size: 3.4vw;
-    line-height: 7.5vw;
-    color: #93979F;
-    background: #f3f7fe;
-    border-radius: 2px;
-    position: relative;
-    margin: 3.5vw 0;
-    overflow: hidden
-}
-  .preview-info .preview-info-main .info {
-        width: 100%;
-        height: 30px;
-        float: left;
-        margin-bottom: 5px;
-        line-height: 30px;
-    }
-
-    .preview-info .preview-info-main .info .label {
-        width: 70px;
-        height: 30px;
-        float: left;
-        display: block;
-        font-size: 14px;
-        line-height: 30px;
-        text-align: right;
-        color: #999;
-    }
-
-    .preview-info .preview-info-main .info p {
-        float: left;
-        height: 100%;
-        padding-left: 20px;
-    }
-    .preview-info-title{
-        font-size: 16px;
-        color: #22272e;
-        padding-top: 15px
-    }
-    .ercode{
-        padding: 2.8vw;
-    }
-    .ercode img{
-        width: 100%;
-        height: 100%;
-    }
-    .main{
-        margin-top: 5vw;
-        padding: 2.8vw;
-        background: #fff
-    }
-    .Disclaimer span{
-       display: block;
-       padding: 1.7vw 0;
-       text-align: center;
-    }
-    .Disclaimer P{
-        line-height: 6.4vw;
-    }
-    .contentHtml div{
-        margin-top: 2.7vw;
-    }
-    .contentHtml img{
-        width: 100%;
-    }
-    .info-p.name{
-        color: #22272e;
-        font-size: 5.6vw;
-    }
-    .infotag {
-        font-size:  0.4vw;
-        width: 11.6vw;
-        height: 4.8vw;
-        line-height:  4.8vw;
-        text-align: center;
-        display: inline-block;
-        border-radius: .48vw;
-        flex: auto;
-        margin: 0 1.72vw
-    }
-    .infotag.news {
-        border: solid 1px #f94b4b;
-        color: #f94b4b;
-        background-color: #fadbdb
-    }
-
-    .infotag.brand {
-        border: solid 1px #f9a24b;
-        color: #f9a24b;
-        background-color: #faefdb;
-    }
-
-    .infotag.sold {
-        border: solid 1px #9aa5b5;
-        color: #9aa5b5;
-        background-color: #e3ebf7;
-    }
-
-    .infotag.other {
-        border: solid 1px #1890f9;
-        color: #1890f9;
-        background-color: #e3ebf7;
-    }
-    .Disclaimer{
-        background: #fef6f3;
-        border-radius: 2.7vw;
-        padding: 2.7vw;
-    }
-    .main .title{
-        padding: 2.7vw 0;
-        font-size: 4.27vw;
-        color: #22272e
-    }
+    .inner-container{width: 100%;overflow: hidden;}
+    #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}
+    #imgShown{width: 100%; height: 100vw;position: relative;background: #fff}
+    .preview-info{box-sizing: border-box;padding: 0 3.3vw;overflow: hidden;background: #fff}
+    .preview-info-main{box-sizing: border-box;padding: 2.8vw;font-size: 3.4vw;line-height: 7.5vw;color: #93979F;background: #f3f7fe;border-radius: 2px;position: relative;margin: 3.5vw 0;overflow: hidden}
+    .preview-info .preview-info-main .info {width: 100%;height: 30px;float: left;margin-bottom: 5px;line-height: 30px;}
+    .preview-info .preview-info-main .info .label {width: 70px;height: 30px;float: left;display: block;font-size: 14px;line-height: 30px;text-align: right;color: #999;}
+    .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 20px;}
+    .preview-info-title{font-size: 16px;color: #22272e;padding-top: 15px}
+    .ercode{padding: 2.8vw;}
+    .ercode img{width: 100%;height: 100%;}
+    .main{margin-top: 5vw;padding: 2.8vw;background: #fff}
+    .Disclaimer span{display: block;padding: 1.7vw 0;text-align: center;}
+    .Disclaimer P{line-height: 6.4vw;}
+    .contentHtml div{margin-top: 2.7vw;}
+    .contentHtml img{width: 100%;}
+    .info-p.name{color: #22272e;font-size: 5.6vw;}
+    .infotag {font-size:  0.4vw;width: 11.6vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 1.72vw}
+    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
+    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
+    .infotag.sold {border: solid .27vw #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
+    .infotag.other {border: solid .27vw #1890f9;color: #1890f9;background-color: #e3ebf7;}
+    .Disclaimer{background: #fef6f3;border-radius: 2.7vw;padding: 2.7vw;}
+    .main .title{padding: 2.7vw 0;font-size: 4.27vw;color: #22272e}
     .contentHtml{margin-top: 2.7vw}
-    .fave-text{
-            color: #f94b4b;
-            font-weight: bold;
-        }
-    .fave-text .big{
-        font-size: 3.7vw;
-    }
+    .fave-text{color: #f94b4b;font-weight: bold;}
+    .fave-text .big{font-size: 3.7vw;}
+    .loginWithParam {color: #FC4444;font-size: 3.2vw;cursor: pointer;}
 
 }

src/main/resources/static/css/index/index.pc.css

@@ -83,19 +83,8 @@ li{list-style:none;}
 #sideNav .item>a:before{content:'';position:absolute;width:70px;left:9px;top:0;border-top:1px solid #FEF6F3}
 #sideNav .item>a:first-child:before{display:none}
 #sideNav .item>a.on{background:#FEF6F3;color:#E15616}
-
-/*
-.btnBox{
-    background:#E15616;
-    height: 55px;
-    line-height: 55px;
-    position: absolute;
-    width: 100%;
-    bottom: 0
+/* 中屏导航与广告显示 */
+@media screen and (max-width:1420px){
+    #sideNav,#scrollTop{right:10px;margin-right:0;opacity:.9;}
+    #advertising{left:10px;margin-left:0;opacity:.9;}
 }
-.btnBox a{
-    color: #fff;
-    font-size: 12px;
-    text-align: center
-}
-*/

src/main/resources/static/css/product/detail.h5.css

@@ -39,6 +39,7 @@ li{list-style:none}
 .productBox .detailBox .btnBox .buy{background:#E15616;color:#FFF}
 .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}
 
 .recommendBox{margin-top:2vw;width:100%;background:#FFF}
 .recommendBox .hd{font-size:3.4vw;color:#E15621;font-weight:bold;padding:2.7vw;text-align:center}
@@ -65,18 +66,7 @@ li{list-style:none}
 .productInfo .tabCon td:nth-of-type(1){width:20%;color:#93979F}
 .productInfo .tabCon td:nth-of-type(2){width:80%;color:#4A4F58}
 .productInfo .comment{color:#93979F;padding:5vw 0}
-a.upgrade{
-    width: 40vw;
-    height: 9vw;
-    background: #F94B4B;
-    opacity: 1;
-    border-radius: 2px;
-    display: inline-block;
-    text-align: center;
-    line-height: 36px;
-    color: #FFFFFF;
-    margin: 1.7vw 1.1vw
-}
+
 .productBox .detailBox .row .l{
     display: inline-block;
     min-width: 14.5vw;

src/main/resources/static/css/product/detail.pc.css

@@ -56,6 +56,7 @@ li{list-style:none;}
 .productBox .detailBox .detail .btn:hover,.productBox .detailBox .btnBox .cart:hover,.productBox .detailBox .btnBox .buy:hover{opacity:.8}
 .productBox .detailBox .concatBox{height:120px;padding:15px}
 .productBox .detailBox .concatBox img{height:120px;width:auto}
+.productBox .detailBox .upgrade{background:#F94B4B;border-radius:2px;display:inline-block;text-align:center;color:#FFFFFF;height:40px;line-height:40px;padding:0 30px;font-size:16px}
 
 .recommendBox{margin-bottom:16px;overflow: hidden;}
 .recommendBox .hd{font-size:16px;color:#4A4F58;font-weight:bold;padding:16px 32px}
@@ -99,183 +100,33 @@ li{list-style:none;}
 .wrap>.rgt .contact .bd div:nth-child(1){font-weight: bold;font-size: 14px;}
 .wrap>.rgt .contact .bd div{margin-bottom: 12px}
 
-.row img{width: 12px;height: 12px;display: inline-block;margin: -3px 5px}
-.row .fuwu{margin-right: 15px}
-    input[type="number"]{
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    }
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    }
-a.member-detail{
-     cursor: pointer;
-    margin-top: 5px;
-    color: #fff;
-    font-size: 14px;
-    width: 153px;
-    height: 36px;
-    background: #E15616;
-    text-align: center;
-    line-height: 36px;
-    border-radius: 2px;
-    float: left;
-}
-.Boxtext{
-    text-align: left;
-    line-height: 25px;
-    color: #333333;
-    padding-bottom: 5px;
-}
-.item-tips{
-    width: 312px;
-    height: auto;
-    padding: 12px;
-    border: 1px solid rgba(225,86,22,0.30196078431372547);
-    background: #ffffff;
-    position: absolute;
-    top: 28px;
-    left: 93px;
-}
-.tip-tr{
-    width: 100%;
-    height: 42px;
-    border-bottom: 1px solid rgba(225,86,22,0.30196078431372547);
-}
-.tips-content{
-    width: 294px;
-    height: auto;
-    border: 1px solid rgba(225,86,22,0.30196078431372547);
-    border-radius: 5px;
-    margin: auto;
-}
-.tip-td{
-    width: 146px;
-    height: 100%;
-    float: left;
-    line-height: 42px;
-    font-size: 14px;
-    color: #E15616;
-    text-align: center;
-}
-.tip-tr:last-child{
-    border-bottom: none;
-}
-.tip-td:nth-child(1){
-    border-right: 1px solid rgba(225,86,22,0.30196078431372547);
-}
-a.upgrade{
-    width: 154px;
-    height: 36px;
-    background: #F94B4B;
-    opacity: 1;
-    border-radius: 2px;
-    display: inline-block;
-    text-align: center;
-    line-height: 36px;
-    color: #FFFFFF;
-}
-.activepro{
-    width: 312px;
-    overflow: hidden;
-    cursor: pointer;
-}
-.activeimg{
-    width: 68px;
-    height: 68px;
-    float: left;
-    line-height: 68px
-}
-.activeimg img{
-    width: 100%;
-    height: 100%
-}
-.activeright{
-    float: right;
-    width: 230px
-}
-.activeright p{
-        text-align: left;
-    line-height: 20px;
-    font-size: 12px
-}
-.loginWithParam{
-    color: rgb(225, 86, 22);
-    width: 100%;
-    text-align: left
-}
-.vip-tips{
-    width: 114px;
-    height: 30px;
-    background-color: #666;
-    border-radius: 2px;
-    line-height: 30px;
-    font-size: 12px;
-    color: #FFF;
-    text-align: center;
-    position: absolute;
-    top: -29px;
-    left: 81%;
-    display: inline-block;
-     opacity: 0;
-    transition: all 1s;
-    z-index: 999
-}
-.vip-tips:before {
-    content: "";
-    width: 10px;
-    height: 10px;
-    background: #666;
-    position: absolute;
-    bottom: -3px;
-    left: 17px;
-    transform: rotate(45deg);
-}
-.icon.shop:hover .vip-tips{
-     opacity: 1;
-}
-.row .pricedeail{
-    font-weight: bold;
-}
-.original-price{
-    text-decoration:line-through;
-}
-.modalForm{
-    opacity: 0
-}
-.show{
-    opacity: 1;
-}
-.modal-back{
-    display: block;
-}
-.activityBox{
-left: 93px;
-}
-.commtext{
-    width: 700px;
-    height: 40px;
-    background-color: #ffffff;
-    border-radius: 2px;
-    border: solid 1px #b8bfca;
-    padding-left: 15px;
-    font-size: 16px
-}
-.pingjia{
-    margin-top: 25px;
-    text-align: left;
-}
-.pingjia button{
-    width: 128px;
-	height: 40px;
-	background-color: #4a4f58;
-	box-shadow: 0px 3px 6px 0px
-		rgba(147, 151, 159, 0.17);
-	border-radius: 2px;
-	color: #ffe6dc;
-}
-.comment-right{
-    float: right;
-    color: #93979f
-}
+.row img{width:12px;height:12px;display:inline-block;margin:-3px 5px}
+.row .fuwu{margin-right:15px}
+input[type="number"]{-moz-appearance:none;-webkit-appearance:none}
+input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appearance:none}
+.Boxtext{text-align:left;line-height:25px;color:#333333;padding-bottom:5px}
+.item-tips{width:312px;height:auto;padding:12px;border:1px solid rgba(225,86,22,0.30196078431372547);background:#ffffff;position:absolute;top:28px;left:93px}
+.tip-tr{width:100%;height:42px;border-bottom:1px solid rgba(225,86,22,0.30196078431372547)}
+.tips-content{width:294px;height:auto;border:1px solid rgba(225,86,22,0.30196078431372547);border-radius:5px;margin:auto}
+.tip-td{width:146px;height:100%;float:left;line-height:42px;font-size:14px;color:#E15616;text-align:center}
+.tip-tr:last-child{border-bottom:none}
+.tip-td:nth-child(1){border-right:1px solid rgba(225,86,22,0.30196078431372547)}
+.activepro{width:312px;overflow:hidden;cursor:pointer}
+.activeimg{width:68px;height:68px;float:left;line-height:68px}
+.activeimg img{width:100%;height:100%}
+.activeright{float:right;width:230px}
+.activeright p{text-align:left;line-height:20px;font-size:12px}
+.loginWithParam{color:rgb(225,86,22);width:100%;text-align:left}
+.vip-tips{width:114px;height:30px;background-color:#666;border-radius:2px;line-height:30px;font-size:12px;color:#FFF;text-align:center;position:absolute;top:-29px;left:81%;display:inline-block;opacity:0;transition:all 1s;z-index:999}
+.vip-tips:before{content:"";width:10px;height:10px;background:#666;position:absolute;bottom:-3px;left:17px;transform:rotate(45deg)}
+.icon.shop:hover .vip-tips{opacity:1}
+.row .pricedeail{font-weight:bold}
+.original-price{text-decoration:line-through}
+.modalForm{opacity:0}
+.show{opacity:1}
+.modal-back{display:block}
+.activityBox{left:93px}
+.commtext{width:700px;height:40px;background-color:#ffffff;border-radius:2px;border:solid 1px #b8bfca;padding-left:15px;font-size:16px}
+.pingjia{margin-top:25px;text-align:left}
+.pingjia button{width:128px;height:40px;background-color:#4a4f58;box-shadow:0px 3px 6px 0px rgba(147,151,159,0.17);border-radius:2px;color:#ffe6dc}
+.comment-right{float:right;color:#93979f}

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

@@ -81,6 +81,6 @@
     .order-item.pay span {color: #e15616;}
     .sett-re {margin-top:5.3vw}
     .sett-re div:nth-child(1) {color: #22272e;font-size:3.4vw;padding: 4vw}
-    .sett-re div:nth-child(2) {background: #fff;line-height: 8vw;padding-left: 4vw;color: #22272e}
+    .sett-re div:nth-child(2) {background: #fff;line-height: 8vw;padding-left: 4vw;color: #22272e;font-size: 3.2vw;}
     .sett-re div:nth-child(2) p {display: inline-block;margin-right: 2.7vw}
 }

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

@@ -29,6 +29,8 @@ input::placeholder{color: #9aa5b5;font-size: 12px;}
 .userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
 .userinfo p{display: inline-block;margin: 10px 55px 10px 0;}
 .userinfo .blcak{color: #22272e;}
+.empty{background: #fff;margin-top: 10px;}
+.navLayout{min-height: auto;}
 }
 
 /*移动*/
@@ -37,9 +39,9 @@ input::placeholder{color: #9aa5b5;font-size: 12px;}
 .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%;}  .new-s-item>form{overflow: hidden;background: #fff;padding: 2.7vw 2.7vw 4.5vw 2.7vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)}
 .new-s-item>form>div{font-size: 3.4vw;color: #627386;width: 93.4vw;margin-bottom: 2.6vw;display: inline-block}
-.new-s-item>form>div.order-border{border: 1px solid #b8bfca;}
+.new-s-item>form>div.order-border{border: .27vw solid #b8bfca;}
 .new-s-item>form>div.order-border span{padding-left: 2.7vw;}
-.new-s-item>form>label{float: left;margin-bottom: 2.6vw;font-size: 3.4vw;color: #627386;border: 1px solid #b8bfca;height: 11.8vw;padding-left: 2.7vw;line-height: 11.8vw}
+.new-s-item>form>label{float: left;margin-bottom: 2.6vw;font-size: 3.4vw;color: #627386;border: .27vw solid #b8bfca;height: 11.8vw;padding-left: 2.7vw;line-height: 11.8vw}
 .Buyer{height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: 0;cursor: pointer;width: 72vw}
 .state{width: 93.4vw;height: 11.7vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;color: #627386;cursor: pointer;margin-top: 2.6vw}
 input::placeholder{color: #9aa5b5;}
@@ -50,13 +52,13 @@ input::placeholder{color: #9aa5b5;}
 .title-name{color: #e15616;margin-bottom: 3.8vw;}
 .title-time{color: #9aa5b5;margin-bottom:3.8vw;}
 .order-item{overflow:hidden ;}
-.order-item p{margin-bottom: 5.3VW;width: 50%;float: left;}
+.order-item p{margin-bottom: 5.3vw;width: 50%;float: left;}
 .order-item.pay span{color: #e15616;}
 .red{color: #f94b4b;}
 .order-botton{width: 100%;overflow: hidden;height: 16vw;line-height: 16vw;}
 .order-botton div{float: right;}
-.order-botton a{margin-left: 2.7vw;width: 22.4vw;height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid 1px #e15616;text-align: center;line-height: 9.6vw;color: #e15616;display: inline-block}
-.order-botton .deatil{border: 1px solid #1890f9;line-height: 7.2vw;right: 5.7vw;position: absolute;top: 10vw;width: 22.4vw;height: 7.2vw;border-radius: 3.6vw;color: #1890f9;background: #e0f1ff}
+.order-botton a{margin-left: 2.7vw;width: 22.4vw;height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #e15616;text-align: center;line-height: 9.6vw;color: #e15616;display: inline-block}
+.order-botton .deatil{border: .27vw solid #1890f9;line-height: 7.2vw;right: 5.7vw;position: absolute;top: 10vw;width: 22.4vw;height: 7.2vw;border-radius: 3.6vw;color: #1890f9;background: #e0f1ff}
 .order-product .product-img{width: 28VW;height: 28VW;border: solid 1px #e2e7ef;float: left;}
 .product-info .num:nth-child(1){float: left;}
 .product-info .num:nth-child(2){float: right;}
@@ -64,8 +66,8 @@ input::placeholder{color: #9aa5b5;}
 .order-product .product-info{float: right;width: 65%;}
 .order-product{overflow: hidden;margin-bottom: 1.9vw;}
 .product-info p{color: #627386;margin-top: 7px;overflow: hidden;}
-.userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
-.product-info h3{font-size: 3.7VW;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.userinfo{background-color: #f0f3f7;box-shadow: 0px .8vw 1.3vw 0px rgba(0, 0, 0, 0.07);padding: 2.7vw 5.3vw;color: #627386;}
+.product-info h3{font-size: 3.7vw;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .userinfo p{display: inline-block;margin-bottom: 2.7vw;}
 .username p:nth-child(1){width: 100%;}
 .username p:nth-child(2){float: left;}

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

@@ -32,13 +32,14 @@
     .record-button {float: right;padding: 20px}
     .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
     .no-delivery-record {width: 968px;height: 423px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);position: relative;}
-    .no-delivery-record img {position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
-    .no-delivery-record p{position: absolute;top: 62%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
+    .no-delivery-record img {position: absolute;top: 10%;left: 50%;transform: translate(-50%,50%);width: 220px;}
+    .no-delivery-record p{position: absolute;top: 68%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
     .no-delivery-record span{color: #e15616;}
 }
 
 /*移动*/
 @media screen and (max-width:768px) {
+    .right{width: 100%;overflow: hidden}
     .userinfo { padding: 1.3vw 3.2vw; background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
     .info { height: 13vw; line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
     .comback { width: 22.4vw; height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid 1px #e15616; float: right;line-height: 7.2vw; margin-top: 2.7vw;cursor: pointer;  color: #e15616}
@@ -72,4 +73,5 @@
     .no-delivery-record img {width:48vw;position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
     .no-delivery-record p{position: absolute;top: 65%;left: 24%;font-size: 3.2vw;color: #4a4f58}
     .no-delivery-record span{color: #e15616;}
+
 }

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

@@ -26,7 +26,8 @@
     .status-yellow{color: #f9a94b;}
     .air{position: relative;min-height: 600px}
     .air img{position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto; width: 221px;height: 180px}
-
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
  }
 
 /* 移动*/

src/main/resources/static/css/supplier-center/shop/brand.css

@@ -55,6 +55,8 @@
    margin-right: 10px;color: #22272e; cursor: pointer;}
   .box-btn .btn-cancel{background-color: #e15616;color: #fff; border: 1px solid #e15616;}
   .icon.add:before { width: 25px;height: 25px;background-position: -168px -374px; position: relative; top: 15px; right: -15px}
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
   }
 
 

src/main/resources/static/css/supplier-center/shop/decoration.css

@@ -41,7 +41,8 @@
   .saveBtn{ text-align: center;float: right;width: 68px;height: 32px; background-color: #e15616; border-radius: 2px;line-height: 32px;
     color: #ffffff;cursor: pointer;}
   .Note{float: left}
-
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
 }
 
 /*移动端*/
@@ -53,9 +54,9 @@
   .banner-title{vertical-align: middle;overflow: hidden;text-overflow: ellipsis;width: 100%;color: #22272e;font-size: 3.4vw;white-space: nowrap}
   .advertisement-pic{width: 20vw;height: 20vw}
   .operate div{width: 22.4vw;height:9.6vw;background-color: #e0f1ff;border-radius: 4.8vw;border: solid 1px #1890f9;line-height: 9.6vw;text-align: center;color: #1890f9;cursor: pointer;display: inline-block;margin-right: 2.7vw;}
-  .title-list{padding-top: 2.7vw;background: #fff;padding-left: 3.3vw;color: #9aa5b5}
+  .title-list{padding-top: 2.7vw;background: #fff;color: #9aa5b5}
   .shopBanner ul  .title-color{color: #9aa5b5;}
-  .title-list span{display: inline-block;width: 21%}
+  .title-list span{display: inline-block;width: 23%}
   .shopBanner ul{background: #fff;margin-bottom: 1.3vw;padding: 0 3.3vw 3.3vw;overflow: hidden}
   .shopBanner ul li{list-style: none;display: inline-block;padding-top: 10px;color: #22272e;width: 75%;float: left}
   .shopBanner ul li:nth-child(1){}

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

@@ -25,7 +25,7 @@ li{list-style: none}
   .tbodyle ul li:nth-child(2){width: 25%;}
   .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
   .tbody ul li:last-child{width: 20%}
-  .goods-main .checkbox { height: 90px;overflow: hidden; cursor: pointer;line-height: 90px}
+  .goods-main .checkbox {overflow: hidden; cursor: pointer;}
   .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
   .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
   .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
@@ -34,21 +34,25 @@ li{list-style: none}
   .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
   .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
   .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
-  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
+  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 50px;right: 0;bottom: 0;margin: auto;height: fit-content}
   .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
-  .goods-container .good-footer{width: 100%;height: 56px;float: left;padding: 10px 0;}
-  .goods-container .good-footer .footer-left{float: left;margin-left: 20px}
-  .goods-container .good-footer .checkbox {line-height: 36px;}
-  .goods-container .good-footer .checkbox .box{line-height: 40px;float: left;}
+  .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
+  .goods-container .good-footer .footer-left{float: left;}
+  .goods-container .good-footer .checkbox {line-height: 70px;}
+  .goods-container .good-footer .checkbox .box{line-height: 74px;float: left;}
   .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
-  .goods-container .good-footer .footer-right{float: right;}
-  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;margin-right: 30px;color: #FFF;}
+  .goods-container .good-footer .footer-right{float: right;margin-top: 20px;}
+  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
   .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
   .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
   .bg-gouxuan{background-color: #f0f3f7;}
   .good-price p {display: inline-block}
   .priceTag{position: absolute;    top: 60px; right: 45px}
   .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
+  .styleborder{border-top: 1px solid #e2e7ef}
+  .checkbox.checklist{line-height: 90px}
   }
 
 /*移动*/

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

@@ -153,12 +153,12 @@ input::placeholder{color: #9aa5b5}
  input::placeholder{color: #9aa5b5;}
 .release-from{margin-bottom: 4vw;line-height: 8.5vw}
 .release-from .text{line-height: 6.4vw;color: #e15616;width: 87vw;margin: auto;font-size: 3.1vw}
-.release-from .select-main .select{border: .27vw solid rgba(184,191,202,.5);height: 11.7vw;width: -webkit-fill-available;margin-bottom: 2.7vw;padding-left: 2.7vw;color: #9aa5b5;}
+.release-from .select-main .select{border: .27vw solid rgba(184,191,202,.5);height: 11.7vw;width: -webkit-fill-available;padding-left: 2.7vw;color: #9aa5b5;}
 .release-from .release-input .input.tags{width: 52vw;height: 11.7vw;}
 .release-from .release-input .add-btn{width: 33.4vw;border-radius: .53vw;border: .27vw solid #e15616;display: inline-block;margin-left:2.7vw;text-align: center;line-height: 11.7vw;background-color: #ffe6dc;color: #e15616;}
 .release-from .release-input .input.keyword{margin-bottom: 2.7vw;}
 .release-from .p{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
-.release-from .release-input .release-param{width: 100%;height: auto;border: 1px solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
+.release-from .release-input .release-param{ position: relative;width: 100%;height: auto;border: 1px solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
 .release-from .release-input .release-param .param-input:first-child {border-bottom: 1px solid #f0f3f7;}
 .release-from .release-input .release-param .param-input{width: -webkit-fill-available;border-radius: .27vw;padding-left: 2.7vw;height: 11.8vw;border: none;}
 .release-from .release-input .add{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
@@ -222,4 +222,21 @@ input[type="radio"]{opacity:0;}
 .release-from .secondbtn .btn.next{width: 25.2vw}
 .release-from .tags-main .item-tags {padding: 0 2.7vw;line-height: 8vw;background: #ffe6dc;text-align: center;font-size: 3.2vw;color: #e15616;margin: 1.3vw;border-radius: .53vw;float: left;position: relative;}
 .mIcon.del-tags:before{width: 4.3vw;height: 4.3vw;background-position: -26.4vw -9vw;position: absolute;top: -2vw;}
+.mIcon.del-btn:before{width: 5.3vw;background-position: -98.4vw -9.3vw;height: 5.3vw;position: absolute;top: 0;right: 0}
+.select-main {margin-bottom: 2.7vw; position: relative}
+.select-main  .option-main{
+    border: .27vw solid rgba(184,191,202,.5)
+}
+.select-main  .option-main  .option{
+        padding:0 2.7vw;
+        color: #9aa5b5
+}
+.selected.mIcon:before{
+    width: 5.3vw;
+    height: 5.3vw;
+    background-position: -51.2vw -.27vw;
+    position: absolute;
+    top: 4vw;
+    right: 2.7vw
+}
 }

src/main/resources/static/css/supplier/index.css

@@ -46,7 +46,8 @@ li{list-style:none}
 .supplierInfo .productList{width:1200px;margin-left:-8px;margin-bottom:18px;}
 .supplierInfo .productBox .title{color:#4A4F58;font-size:20px;height:54px;line-height:54px}
 .supplierInfo .productItem {margin-bottom: 16px;}
-
+.empty{background: #fff;margin-top: 10px;}
+.navLayout{min-height: auto;}
 
 }
 

src/main/resources/static/css/user-center/order/logistics.css

@@ -31,6 +31,8 @@ li {list-style: none; }
      .status-time-latest {text-align: left;margin-left: 25px;color: #0278D8;font-size: 10px;margin-top: 5px;}
      .package-status .status-list>li div{display: inline-block;color: #22272e;}
      .status-list li .status-date{margin: 0 15px;color: #22272e;font-weight: bold;}
+     .navLayout{min-height: auto;}
+     .empty img{width: 100%}
  }
 
  @media screen and (max-width:768px){
@@ -62,4 +64,5 @@ li {list-style: none; }
      .status-time-before {text-align: left;margin-left: 5.5vw;}
      .package-status .status-list>li div{display: inline-block;color: #9aa5b5;font-size: 3vw;line-height: 6.4vw;}
      .status-list li .status-date{margin: 0 4vw;}
+     .empty img{width: 100%}
  }

src/main/resources/static/css/user-center/repair/detail.css

@@ -39,9 +39,9 @@ li{list-style:none}
     .process>div span{color:#9aa5b5;    position: absolute;bottom: 10px;right: 10px;font-size: 12px }
     .process>div{position: relative}
     .from-button{width: 232px;height: 50px;cursor:pointer;line-height: 50px;text-align: center;color: #fff;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;font-size: 18px;margin: 15px auto;}
-    .mainconten{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 20px 0}
+    .mainconten{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 20px 0;margin-bottom: 8px}
     .mainconten form{width: 500px;margin: auto}
-    .sencondCont{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 32px 0;margin-top: 10px;}
+    .sencondCont{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 32px 0;}
     .sencondCont form{width: 500px;margin: auto}
     .sencondCont p{color: #627386;font-size: 14px;margin-bottom: 32px}
     .sencondCont p span{color: #22272e;}
@@ -52,6 +52,7 @@ li{list-style:none}
     .icon.stance:before{width: 25px;height: 25px;background-position: -273px -513px;cursor: pointer;}
     .icon.changestance:before{   width: 25px;height: 25px;background-position: -240px -513px}
     .sencondCont p.Image{width: 530px}
+    .grade{position: absolute;margin-top: -6px}
 }
 
 /**
@@ -86,7 +87,8 @@ li{list-style:none}
     .mIcon.stance:before{width: 6.3vw;height: 7.3vw;background-position:-24.8vw  -68.5vw;cursor: pointer;margin-left: 1.3vw}
     .mIcon.changestance:before{ width: 6.3vw;height: 7.3vw;background-position: -16.5vw -68.5vw}
     .process p label{display: block}
-
+    .grade{position: absolute;margin-top: 0.3vw}
+    .process p:nth-child(2){height: 13vw}
 
 }
 

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

@@ -13,7 +13,7 @@ li{list-style:none}
     .order-header .header-bt .search{height: 38px;float: left;}
     .order-header .header-bt .search .label{display: inline-block;float: left;height: 38px;line-height:38px;font-size: 12px;color: #627386;}
     .order-header .header-bt .search .search-input{width: 210px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 36px;border: 1px solid #b8bfca;border-radius: 2px; }
-    .order-header .header-bt .search .select{width:114px;height:38px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 38px;border: none;border-radius: 2px;border: 1px solid #b8bfca;color: #627386;}
+    .order-header .header-bt .search .select{background: #fff;width:114px;height:38px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 38px;border: none;border-radius: 2px;border: 1px solid #b8bfca;color: #627386;}
     .order-header .header-bt .search-time{float: left;margin:0 15px;}
     .order-header .header-bt .search-time .label{display: inline-block;float: left;height: 38px;line-height:38px;font-size: 12px;color: #627386;}
     .order-header .header-bt .search-time .search-main{float: left;height: 38px;}
@@ -56,7 +56,7 @@ li{list-style:none}
     .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{height: 11.7vw;width:100%;border: none;color: #627386;border: .27vw solid rgba(184,191,202,.5)}
+    .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: #e15616;border: .27vw solid #e15616;background: #ffe6dc;margin:2.7vw auto;display: block;}
     #orderDate .search-input{display: inline-block;}
     #orderDate{position: relative}

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

@@ -7,8 +7,8 @@ li{list-style:none}
 .container{width: 100%;min-height:900px;box-sizing: border-box;padding: 20px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
 .container .title{width: 100%;height: 54px;line-height: 54px;text-align: left;font-size: 24px;color: #22272e;float: left;}
 .container .formLine p span.mm{color: #22272e;}
-.subLine{margin-top: 20px;float: left;}
-.subLine .btn-upgrade {cursor: pointer;display: block;width: 232px;height: 50px;line-height: 50px;background-color: #e15616;border-radius: 2px;text-align: center;font-size: 18px;color: #FFF;float: left;margin-right: 15px;}
+.subLine{margin-top: 20px;float: left; width: 100%;}
+.subLine .btn-upgrade {cursor: pointer;display: block;width: 232px;height: 50px;line-height: 50px;background-color: #e15616;border-radius: 2px;text-align: center;font-size: 18px;color: #FFF;margin: auto;}
 .subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
 .formLine{width: 100%;float: left;margin-bottom: 10px;}
@@ -22,21 +22,24 @@ li{list-style:none}
 .formLine .form-upload-tips:hover .wen-tips{display: block;}
 .formLine .file{width: 128px;height: 90px;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
 .formLine .formLine-file .icon{width: 128px;height: 90px;display: block;}
-.formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;}
-.formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;}
-.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+.formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
+.formLine .formLine-file .file-door{background: url("/img/account/icon-door.svg") no-repeat;}
+.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.svg") no-repeat;}
 .formLine .form-upload-image{width: 128px;height: 90px;position: relative;}
 .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
 .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
-.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -116px -140px;}
+.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width: 324px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
 .formLine p{color: #627386}
 input::placeholder,textarea::placeholder{color: #9aa5b5}
-
+  .formLine .errTips.show{display: block}
+  .formLine .errTips{display: none}
+  .formLine .address.info textarea{margin-top: 0}
 }
 
+
 /**
 * 移动端
 */

src/main/resources/static/css/user-center/setting/upgrade.css

@@ -44,7 +44,6 @@ li{list-style:none}
 
 
 
-
 }
 
 /**

src/main/resources/static/img/account/icon-door.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="90" viewBox="0 0 128 90">
+  <g id="组_5793" data-name="组 5793" transform="translate(-964 -753)">
+    <g id="矩形_4466" data-name="矩形 4466" transform="translate(964 753)" fill="#fff" stroke="#b8bfca" stroke-width="1">
+      <rect width="128" height="90" rx="2" stroke="none"/>
+      <rect x="0.5" y="0.5" width="127" height="89" rx="1.5" fill="none"/>
+    </g>
+    <text id="门头拍照" transform="translate(999 820.563)" fill="#9aa5b5" font-size="14" font-family="MicrosoftYaHei, Microsoft YaHei" letter-spacing="0.048em"><tspan x="0" y="0">门头拍照</tspan></text>
+    <rect id="矩形_5635" data-name="矩形 5635" width="4" height="24" rx="2" transform="translate(1026 771)" fill="#b8bfca"/>
+    <rect id="矩形_5636" data-name="矩形 5636" width="4" height="24" rx="2" transform="translate(1040 781) rotate(90)" fill="#b8bfca"/>
+  </g>
+</svg>

src/main/resources/static/img/account/icon-zizhi.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="90" viewBox="0 0 128 90">
+  <g id="组_5793" data-name="组 5793" transform="translate(-964 -753)">
+    <g id="矩形_4466" data-name="矩形 4466" transform="translate(964 753)" fill="#fff" stroke="#b8bfca" stroke-width="1">
+      <rect width="128" height="90" rx="2" stroke="none"/>
+      <rect x="0.5" y="0.5" width="127" height="89" rx="1.5" fill="none"/>
+    </g>
+    <text id="医疗执业许可证" transform="translate(977 820.563)" fill="#9aa5b5" font-size="14" font-family="MicrosoftYaHei, Microsoft YaHei" letter-spacing="0.048em"><tspan x="0" y="0">医疗执业许可证</tspan></text>
+    <rect id="矩形_5635" data-name="矩形 5635" width="4" height="24" rx="2" transform="translate(1026 771)" fill="#b8bfca"/>
+    <rect id="矩形_5636" data-name="矩形 5636" width="4" height="24" rx="2" transform="translate(1040 781) rotate(90)" fill="#b8bfca"/>
+  </g>
+</svg>

src/main/resources/static/img/order/icon-dianpu.svg

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 180 180" style="enable-background:new 0 0 180 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFE6DC;}
+	.st1{fill:#FFEDDE;}
+	.st2{fill:#3F3D56;}
+	.st3{fill:#FFE7DC;}
+	.st4{fill:#FFCEB8;}
+	.st5{fill:#F29A71;}
+	.st6{fill:#E15616;}
+	.st7{fill:#FFFFFF;}
+	.st8{opacity:0.1;}
+	.st9{fill:#1A1A1A;}
+	.st10{opacity:0.5;fill:#FFCBB4;enable-background:new    ;}
+	.st11{fill:none;stroke:#FFFFFF;}
+	.st12{fill:none;stroke:#707070;}
+	.st13{fill:#E6E6E6;}
+	.st14{opacity:0.2;enable-background:new    ;}
+	.st15{fill:#FFB8B8;}
+	.st16{fill:#F28F31;}
+	.st17{fill:#2F2E41;}
+</style>
+<g>
+	<ellipse id="椭圆_759" class="st0" cx="90" cy="152" rx="86" ry="11"/>
+	<g id="组_1591" transform="translate(2.004 22.673)">
+		<g id="组_1590" transform="translate(0 0)">
+			<ellipse id="椭圆_697" class="st1" cx="36.4" cy="98.8" rx="8.4" ry="17.1"/>
+			<path id="路径_3016" class="st2" d="M37.2,126.7c-3.3-20.1,0-40.1,0-40.3l0.7,0.1c0,0.2-3.3,20.1,0,40.1L37.2,126.7z"/>
+			
+				<rect id="矩形_2735" x="35.9" y="97.1" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -41.1908 30.4668)" class="st2" width="8.6" height="0.7"/>
+			
+				<rect id="矩形_2736" x="31.9" y="95.1" transform="matrix(0.4719 -0.8816 0.8816 0.4719 -70.6571 80.8985)" class="st2" width="0.7" height="8.6"/>
+			<ellipse id="椭圆_699" class="st3" cx="16.4" cy="72.4" rx="16.4" ry="33.4"/>
+			<path id="路径_3020" class="st2" d="M18.2,127c-6.5-39.2-0.1-78.4,0-78.7l0.7,0.1c-0.1,0.4-6.5,39.4,0,78.5L18.2,127z"/>
+			
+				<rect id="矩形_2743" x="15.3" y="69.5" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -30.1226 19.4118)" class="st2" width="16.8" height="0.7"/>
+			
+				<rect id="矩形_2744" x="7.7" y="65.4" transform="matrix(0.4719 -0.8816 0.8816 0.4719 -60.7787 46.0546)" class="st2" width="0.7" height="16.8"/>
+			<ellipse id="椭圆_700" class="st4" cx="55.1" cy="52.4" rx="22.4" ry="45.7"/>
+			<path id="路径_3021" class="st2" d="M43.5,127c-8.9-53.7-0.1-107.2,0-107.7l0.7,0.1c-0.1,0.5-8.9,53.9,0,107.5L43.5,127z"/>
+			
+				<rect id="矩形_2745" x="38" y="48.4" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -17.1361 29.1017)" class="st2" width="23" height="0.7"/>
+			
+				<rect id="矩形_2746" x="43.4" y="42.7" transform="matrix(0.4718 -0.8817 0.8817 0.4718 -24.6548 67.1666)" class="st2" width="0.7" height="23"/>
+			<rect id="矩形_2764" x="17.1" y="18.9" class="st5" width="139.9" height="107.7"/>
+			<g id="组_1585" transform="translate(2.442 36.291)">
+				<ellipse id="椭圆_719" class="st6" cx="12" cy="12.1" rx="12" ry="12.1"/>
+				<ellipse id="椭圆_720" class="st7" cx="36.2" cy="12.1" rx="12" ry="12.1"/>
+				<ellipse id="椭圆_721" class="st6" cx="60.4" cy="12.1" rx="12" ry="12.1"/>
+				<ellipse id="椭圆_722" class="st7" cx="84.6" cy="12.1" rx="12" ry="12.1"/>
+				<ellipse id="椭圆_723" class="st6" cx="108.8" cy="12.1" rx="12" ry="12.1"/>
+				<ellipse id="椭圆_724" class="st7" cx="133" cy="12.1" rx="12" ry="12.1"/>
+				<path id="路径_3104" class="st6" d="M169.2,12c-0.1,6.6-5.5,11.9-12.1,11.8c-6.6-0.1-11.9-5.5-11.8-12.1
+					c0.1-6.6,5.4-11.8,12-11.8C163.9,0,169.2,5.4,169.2,12z"/>
+			</g>
+			<g id="组_1586" transform="translate(2.442 36.291)" class="st8">
+				<g id="组_1588" transform="translate(0 0)">
+					<ellipse id="椭圆_725" class="st9" cx="12" cy="12.1" rx="12" ry="12.1"/>
+					<ellipse id="椭圆_726" class="st9" cx="36.2" cy="12.1" rx="12" ry="12.1"/>
+					<ellipse id="椭圆_727" class="st9" cx="60.4" cy="12.1" rx="12" ry="12.1"/>
+					<ellipse id="椭圆_728" class="st9" cx="84.6" cy="12.1" rx="12" ry="12.1"/>
+					<ellipse id="椭圆_729" class="st9" cx="108.8" cy="12.1" rx="12" ry="12.1"/>
+					<ellipse id="椭圆_730" class="st9" cx="133" cy="12.1" rx="12" ry="12.1"/>
+					<path id="路径_3105" class="st9" d="M169.2,12c-0.1,6.6-5.5,11.9-12.1,11.8c-6.6-0.1-11.9-5.5-11.8-12.1
+						c0.1-6.6,5.4-11.8,12-11.8C163.9,0,169.2,5.4,169.2,12z"/>
+				</g>
+			</g>
+			<g id="组_1587" transform="translate(2.469)">
+				<path id="路径_3106" class="st6" d="M23.9,47.6H0L10.2,2.8C10.6,1.1,12.1,0,13.8,0h18.1L23.9,47.6z"/>
+				<path id="路径_3107" class="st7" d="M48.1,47.4l-24.2,0.3l8-47.7h21L48.1,47.4z"/>
+				<path id="路径_3108" class="st6" d="M72.4,47.4l-23.9,0L53,0h21L72.4,47.4z"/>
+				<path id="路径_3109" class="st7" d="M96.7,47.4H72.4L74,0h21L96.7,47.4z"/>
+				<path id="路径_3110" class="st6" d="M120.8,47.3H96.9L95.1,0h21L120.8,47.3z"/>
+				<path id="路径_3111" class="st7" d="M145.3,47.4H121L116.1,0h21.1L145.3,47.4z"/>
+				<path id="路径_3112" class="st6" d="M169.1,47.4h-23.8L137.2,0h18.1c1.7,0,3.2,1.2,3.6,2.8L169.1,47.4z"/>
+			</g>
+			<path id="路径_3113" class="st10" d="M92.7,126.6H65.2V80.1c0-7.6,6.2-13.8,13.8-13.8l0,0c7.6,0,13.8,6.2,13.8,13.8L92.7,126.6
+				z"/>
+			<rect id="矩形_2766" x="88.1" y="65.6" class="st10" width="54.4" height="34.1"/>
+			<line id="直线_34" class="st11" x1="78.6" y1="66.2" x2="78.6" y2="126.6"/>
+			<g id="椭圆_731" transform="translate(79.451 93.85)">
+				<circle class="st7" cx="0.6" cy="0.6" r="0.6"/>
+				<circle class="st12" cx="0.6" cy="0.6" r="0.1"/>
+			</g>
+			<g id="组_1519" transform="translate(76.474 76.518)">
+				<g id="组_1518" transform="translate(0 0)">
+					<g id="undraw_shopping_app_flsj">
+						<path id="路径_2982" class="st13" d="M18.7,26.2h-0.8c-0.1,0-0.1,0-0.1,0.1v0v0.4c0,0.1,0,0.1,0.1,0.1h0H18v0.6h0.6v-0.6
+							h0.1c0.1,0,0.1,0,0.1-0.1v0v-0.4C18.9,26.3,18.8,26.2,18.7,26.2z"/>
+						<path id="路径_2984" class="st14" d="M18.6,26.4c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2c0,0,0,0,0,0"/>
+						<path id="路径_2990" class="st15" d="M2.5,11.8l2.1-0.2L6,8.4L3.6,7.1L2.5,11.8z"/>
+						<path id="路径_2991" class="st15" d="M21.8,20.8L21.8,20.8c0.2-0.6-0.1-1.3-0.7-1.5c-0.1,0-0.2-0.1-0.4-0.1l-3.3-0.2
+							L17,20.5l3.4,0.9C21,21.6,21.6,21.3,21.8,20.8z"/>
+						<path id="路径_2992" class="st16" d="M18.3,21.5l0-3L11,17.3l-5.6-6.4c-0.6-0.7-1.6-0.8-2.4-0.3l0,0
+							c-0.8,0.6-1.1,1.7-0.5,2.5c0.1,0.1,0.1,0.2,0.2,0.3l4.6,5.7L18.3,21.5z"/>
+						<path id="路径_2993" class="st17" d="M0.9,55.2h1.9l4.7-21.4l4.9,6.6l2.9,14.3h1.8l-0.4-15.4l-6.4-16.4H4.1
+							C2.3,26,1,29.3,2.5,32.6L0.9,55.2z"/>
+						<path id="路径_2994" class="st17" d="M14.2,56.5c-0.1,0.3,0.1,0.5,0.3,0.6c0,0,0,0,0.1,0l4.7,0.8c0.4,0.1,0.8-0.2,0.9-0.5
+							l0,0c0.1-0.4,0-0.7-0.4-0.9c-1-0.5-1.9-1.3-2.6-2.2c-0.5,0.4-1.2,0.5-1.7,0.1l-0.6,0.1L14.2,56.5z"/>
+						<path id="路径_2995" class="st17" d="M0,56.5c-0.1,0.3,0.1,0.5,0.3,0.6c0,0,0,0,0.1,0L5.1,58C5.5,58,5.8,57.8,6,57.4l0,0
+							c0.1-0.4,0-0.7-0.4-0.9c-1-0.5-1.9-1.3-2.6-2.2c-0.5,0.4-1.2,0.5-1.7,0.1l-0.6,0.1L0,56.5z"/>
+						<ellipse id="椭圆_685" class="st15" cx="6" cy="6.9" rx="2.7" ry="2.7"/>
+						<path id="路径_2996" class="st16" d="M3.6,23.6l7-0.2l-2-6.4c1.3-2,0-4.1-1.8-6.1l-1.4-1L3,9.7l0,0c-1,1.1-1.5,2.5-1.5,3.9
+							C1.5,17.1,2.2,20.5,3.6,23.6z"/>
+						<path id="路径_2997" class="st15" d="M19.6,28L19.6,28c0.5-0.5,0.5-1.2,0-1.7c-0.1-0.1-0.2-0.2-0.3-0.2l-2.9-1.5l-1.1,1.3
+							l2.7,2.2C18.5,28.4,19.2,28.4,19.6,28z"/>
+						<path id="路径_2998" class="st16" d="M16.1,27.3l1.1-2.8l-6.2-3.9l-2.6-8.1c-0.3-0.9-1.2-1.4-2.1-1.2l0,0
+							c-1,0.2-1.7,1.1-1.5,2.1c0,0.1,0,0.2,0.1,0.3l2,7L16.1,27.3z"/>
+						<path id="路径_2999" class="st17" d="M1.6,5.9c0.1,1.3,0.6,2.5,1.5,3.3C3.7,9.7,4.5,9.7,4.8,9c0.7-1.3,1.8-2.4,3.2-3.2
+							c2.4-1.3-0.9-3.5-3.2-3.2C3.1,2.8,1.7,4.2,1.6,5.9z"/>
+						<ellipse id="椭圆_686" class="st17" cx="3.2" cy="2.5" rx="1.9" ry="1.9"/>
+						<path id="路径_3000" class="st17" d="M5.4,1.9c0-1-0.8-1.8-1.8-1.9c0,0,0.1,0,0.1,0c1.1,0,1.9,0.9,1.9,1.9S4.9,3.8,3.8,3.8
+							l0,0c0,0-0.1,0-0.1,0C4.7,3.7,5.4,2.9,5.4,1.9z"/>
+						<ellipse id="椭圆_687" class="st15" cx="6.1" cy="7.3" rx="0.4" ry="0.6"/>
+						<path id="路径_3001" class="st2" d="M60.5,52h-30l-6.4-30h-5.4v-1.3h6.5l6.4,30h28.9L60.5,52z"/>
+						<ellipse id="椭圆_688" class="st2" cx="34.8" cy="55" rx="2.9" ry="2.9"/>
+						<ellipse id="椭圆_689" class="st2" cx="56.2" cy="55" rx="2.9" ry="2.9"/>
+						<path id="路径_3002" class="st2" d="M59.6,51.1H30.7l-5.1-25.2h38.8c0.8,0,1.4,0.6,1.4,1.4c0,0.1,0,0.1,0,0.2L61,49.9
+							C60.9,50.6,60.3,51.1,59.6,51.1z M31,50.7h28.6c0.5,0,0.9-0.4,1-0.8l4.8-22.5c0.1-0.5-0.3-1-0.8-1.1c-0.1,0-0.1,0-0.2,0H26.1
+							L31,50.7z"/>
+						<path id="路径_3003" class="st2" d="M36.3,51L33,26.1l0.4-0.1l3.3,24.9L36.3,51z"/>
+						<path id="路径_3004" class="st2" d="M54.9,50.8l-0.4-0.1L57.8,26l0.4,0.1L54.9,50.8z"/>
+						<rect id="矩形_2722" x="45.7" y="26" class="st2" width="0.4" height="24.9"/>
+						
+							<rect id="矩形_2723" x="45.8" y="14.5" transform="matrix(2.426004e-03 -1 1 2.426004e-03 12.9606 78.8976)" class="st2" width="0.4" height="36.9"/>
+						
+							<rect id="矩形_2724" x="29.4" y="44.6" transform="matrix(1 -6.841637e-03 6.841637e-03 1 -0.3055 0.3135)" class="st2" width="32.5" height="0.4"/>
+						<ellipse id="椭圆_690" class="st2" cx="19.4" cy="21.1" rx="2.1" ry="1.1"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

src/main/resources/static/img/order/icon-empt.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 180 180" style="enable-background:new 0 0 180 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFC233;}
+	.st1{fill:#FFE7AE;}
+	.st2{fill:#E15621;}
+	.st3{fill:#2D3036;}
+	.st4{fill:#FFB8B8;}
+	.st5{fill:#4A4F58;}
+	.st6{fill:#2F2E41;}
+	.st7{fill:#F9954B;}
+</style>
+<path id="路径_4168" class="st0" d="M24.2,22.5l38.4,10.3L45.1,49.6L50,79.9L33.2,93.7L7,86.7L24.2,22.5z"/>
+<path id="路径_4169" class="st0" d="M79.2,106L40.9,95.8l16.9-14.5l-5.2-29l17.7-17.4l26.3,7L79.2,106z"/>
+<path id="路径_4170" class="st1" d="M51.5,62.4l32,3.6l1.6-4.7l-13-29.5c0,0,2.4,13.7-1,17s-8,11.1-15.5,11.3S51.5,62.4,51.5,62.4
+	z"/>
+<ellipse id="椭圆_761" class="st2" cx="82.4" cy="162.9" rx="79.4" ry="4"/>
+<path id="路径_4147" class="st3" d="M155.9,156.5l18.7-27.8l-18.7,30.8v3.1c-1.4,0-2.7,0-4.1-0.1l0.9-40.3v-0.3v-0.1l0.1-3.8
+	l-20.5-29.8l20.5,26.9l0.1,0.8l0.7-30.4L136,54.8l17.8,25.5l-0.2-63V17v0.2l1.2,49.7l16.1-20.2l-16.1,24.5l0.4,27.2L170,71.9
+	l-14.8,30.6l0.2,15.1l21.6-37l-21.5,42.3L155.9,156.5z"/>
+<path id="路径_4156" class="st4" d="M67.3,106.9l0.3,2.5c0,0-2,7.3,1,6.8s2-6.8,2-6.8l-0.5-2L67.3,106.9z"/>
+<path id="路径_4157" class="st4" d="M99.7,107.2l-0.3,2.5c0,0,2,7.3-1,6.8s-2-6.8-2-6.8l0.5-2L99.7,107.2z"/>
+<path id="路径_4158" class="st4" d="M74.5,154.9l-0.8,5.3l5.3-0.5l-0.8-5.3L74.5,154.9z"/>
+<path id="路径_4159" class="st4" d="M102.6,154.9l0.8,5.3l-5.3-0.5l0.8-5.3L102.6,154.9z"/>
+<path id="路径_4160" class="st5" d="M73.7,104.4c0,0-1.3,0.5,0,19.7l0.5,31.3h5.1l2-27.8l2.8-16.9l7.8,22l6.3,23.5l5.1-1.3
+	l-6.6-30.1c0,0,1.3-17.4-3.3-20.5S73.7,104.4,73.7,104.4z"/>
+<path id="路径_4161" class="st3" d="M74.9,158.5c0,0-0.1-2.3-0.6-2.4s-3.7,2.7-3.7,2.7c-1.5-0.3-3,0.7-3.3,2.2
+	c-0.1,0.4-0.1,0.7,0,1.1c0.3,3.8,5.3,2.5,5.3,2.5s1,2.3,3,2.3s5.1,0,5.3-1.5s-1.3-8.3-1.8-8.1c-0.6,0.1-1.2,0.1-1.8,0L74.9,158.5z"
+	/>
+<path id="路径_4162" class="st3" d="M102.2,158.5c0,0,0.1-2.3,0.6-2.4s3.7,2.7,3.7,2.7c1.5-0.3,3,0.7,3.3,2.2
+	c0.1,0.4,0.1,0.7,0,1.1c-0.3,3.8-5.3,2.5-5.3,2.5s-1,2.3-3,2.3s-5.1,0-5.3-1.5s1.3-8.3,1.8-8.1c0.6,0.1,1.2,0.1,1.8,0L102.2,158.5z"
+	/>
+<circle id="椭圆_762" class="st4" cx="83.5" cy="61.2" r="4.8"/>
+<path id="路径_4163" class="st4" d="M86.8,62c0,0,0.3,6.8,1.5,7.6s-7.6,0-7.6,0l1-5.8L86.8,62z"/>
+<path id="路径_4164" class="st2" d="M88.8,68.8c0,0-4.5-2.3-8.8-0.8c-2.3,0.8-4.6,1.9-6.6,3.3L76.2,86c0,0-5.3,19.2-3.8,19.7
+	s19.5-1.5,21.2,0s1.8-1.8,1.8-1.8s-2.5-6.3-2-11.6s0.5-7.1,0.5-7.1l2.8-11.9L88.8,68.8z"/>
+<path id="路径_4165" class="st2" d="M75.2,71.3h-1.8c0,0-2.8,1.8-2.8,4.3S68.1,92,68.1,92l-1.5,15.7l4.3,0.8l3.8-20.7l2.8-5.6
+	L75.2,71.3z"/>
+<path id="路径_4166" class="st2" d="M91.9,73.3h4.8c1.2,1.5,2,3.2,2.3,5.1c0.8,3.5,1.5,17.4,1.5,17.4l-0.5,12.6h-3.8L95.6,92
+	l-2.5-10.6L91.9,73.3z"/>
+<path id="路径_4167" class="st6" d="M79.4,60.9l1,2.6c0.3,1.1,1,2.1,1.9,2.8c1.3,0.6,2.8,0.5,4-0.4c2.8-1.9,3.6-5.8,1.6-8.6
+	c-1-1.5-2.6-2.5-4.4-2.7v0.9l-1.1-0.9c-0.3,0.5-0.9,0.7-1.4,0.4c-0.1,0-0.1-0.1-0.2-0.1c0.2,0.6,0,1.3-0.5,1.7
+	c-0.6,0.5-2.2,1.2-2.1,2.2C78.2,59.3,79.2,60.2,79.4,60.9z"/>
+<path class="st1" d="M52.6,52.3l1.9,10.4c11.3-0.3,20.4-9.6,20.4-21c0-2-0.3-4-0.8-5.8l-3.8-1L52.6,52.3z"/>
+<path class="st1" d="M47,61.5l-1.9-11.9l17.5-16.8l-23.2-6.2c-4,3.8-6.5,9.2-6.5,15.1C32.9,50.9,38.8,58.7,47,61.5z"/>
+<g>
+	<path class="st7" d="M53.9,62.7c-1.8,0-3.7-0.2-5.5-0.7c-5.4-1.5-9.9-4.9-12.8-9.8s-3.5-10.5-2.1-15.9c1.5-5.4,4.9-9.9,9.8-12.8
+		c4.9-2.8,10.5-3.5,15.9-2.1c5.4,1.5,9.9,4.9,12.8,9.8s3.5,10.5,2.1,15.9c-1.5,5.4-4.9,9.9-9.8,12.8C61.1,61.7,57.5,62.7,53.9,62.7z
+		 M53.8,26.7c-2.5,0-5.1,0.6-7.5,2c-7.2,4.1-9.6,13.3-5.5,20.5c2,3.5,5.2,6,9.1,7s7.9,0.5,11.4-1.5c7.2-4.1,9.6-13.3,5.5-20.5
+		C64.1,29.4,59,26.7,53.8,26.7z"/>
+</g>
+</svg>

src/main/resources/static/img/order/icon-goods.svg

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 180 180" style="enable-background:new 0 0 180 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFEDDE;}
+	.st1{fill:#3F3D56;}
+	.st2{fill:url(#椭圆_699_1_);}
+	.st3{fill:url(#椭圆_700_1_);}
+	.st4{fill:#FFE6DC;}
+	.st5{fill:#CA6106;}
+	.st6{fill:#DF9C58;}
+	.st7{fill:#F0DDC3;}
+	.st8{fill:#E9DCBE;}
+	.st9{fill:#E15616;}
+	.st10{fill:#E6E6E6;}
+	.st11{opacity:0.2;enable-background:new    ;}
+	.st12{fill:#FFB8B8;}
+	.st13{fill:#F28F31;}
+	.st14{fill:#2F2E41;}
+</style>
+<g id="组_1591" transform="translate(6774.679 378.145)">
+	<g id="组_1590" transform="translate(0 0)">
+		<ellipse id="椭圆_697" class="st0" cx="-6726.3" cy="-257.8" rx="9.1" ry="18.6"/>
+		<path id="路径_3016" class="st1" d="M-6725.5-227.4c-3.6-21.9,0-43.7,0-43.9l0.7,0.1c0,0.2-3.6,21.9,0,43.6L-6725.5-227.4z"/>
+		
+			<rect id="矩形_2735" x="-6726.9" y="-259.7" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -672.3972 -3201.2673)" class="st1" width="9.3" height="0.7"/>
+		
+			<rect id="矩形_2736" x="-6731.3" y="-261.8" transform="matrix(0.4719 -0.8816 0.8816 0.4719 -3327.9204 -6070.1113)" class="st1" width="0.7" height="9.3"/>
+		
+			<linearGradient id="椭圆_699_1_" gradientUnits="userSpaceOnUse" x1="-7618.769" y1="246.6737" x2="-7618.769" y2="245.6737" gradientTransform="matrix(35.6 0 0 -72.638 264479.9688 17595.1016)">
+			<stop  offset="0" style="stop-color:#FFE6DC"/>
+			<stop  offset="1" style="stop-color:#E15616"/>
+		</linearGradient>
+		<ellipse id="椭圆_699" class="st2" cx="-6748.2" cy="-286.5" rx="17.8" ry="36.3"/>
+		<path id="路径_3020" class="st1" d="M-6746.2-227.1c-7.1-42.7-0.1-85.3,0-85.7l0.7,0.1c-0.1,0.4-7.1,42.9,0,85.5L-6746.2-227.1z
+			"/>
+		
+			<rect id="矩形_2743" x="-6749.4" y="-289.7" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -660.3503 -3213.2993)" class="st1" width="18.3" height="0.7"/>
+		
+			<rect id="矩形_2744" x="-6757.6" y="-294.2" transform="matrix(0.4719 -0.8816 0.8816 0.4719 -3317.1677 -6108.0361)" class="st1" width="0.7" height="18.3"/>
+		
+			<linearGradient id="椭圆_700_1_" gradientUnits="userSpaceOnUse" x1="-7625.3413" y1="248.3379" x2="-7625.3413" y2="247.3379" gradientTransform="matrix(48.716 0 0 -99.4 364770.0625 24326.7676)">
+			<stop  offset="0" style="stop-color:#FFE6DC"/>
+			<stop  offset="1" style="stop-color:#E15616"/>
+		</linearGradient>
+		<ellipse id="椭圆_700" class="st3" cx="-6706" cy="-308.3" rx="24.4" ry="49.7"/>
+		<path id="路径_3021" class="st1" d="M-6703.2-227.1c-9.7-58.4-0.1-116.7,0-117.2l0.7,0.1c-0.1,0.6-9.7,58.7,0,117L-6703.2-227.1
+			z"/>
+		
+			<rect id="矩形_2745" x="-6707.6" y="-312.6" transform="matrix(0.8818 -0.4717 0.4717 0.8818 -644.2081 -3194.7429)" class="st1" width="25" height="0.7"/>
+		
+			<rect id="矩形_2746" x="-6718.8" y="-318.9" transform="matrix(0.4718 -0.8817 0.8817 0.4718 -3278.321 -6085.3433)" class="st1" width="0.7" height="25"/>
+		<g id="空_1_" transform="translate(17.68 41.868)">
+			<path id="路径_3114" class="st4" d="M-6766-273.6c0,7.6,24.8,13.8,55.3,13.8s55.4-6.2,55.4-13.8v0c0-7.6-24.8-13.8-55.3-13.8
+				S-6766-281.2-6766-273.6z"/>
+			<path id="路径_3121" class="st5" d="M-6713.9-327.8v43.8l42.3,8.4v-47.9l-42.3-5"/>
+			<path id="路径_3122" class="st6" d="M-6713.5-328.5v44.1l-34.9,10.3v-47L-6713.5-328.5z"/>
+			<path id="路径_3123" class="st6" d="M-6708.1-315.8v50.7l36.5-10.5v-47.6L-6708.1-315.8z"/>
+			<path id="路径_3124" class="st5" d="M-6707.8-265l-41.4-8v-47.3l41.4,4.9"/>
+			<path id="路径_3125" class="st7" d="M-6707.7-315.8l11.7,20.1c0,0,0.1,1.1,1.9,0.3l34.3-10.8c0,0,0.9-0.5,0-1.6l-11.7-15.8
+				L-6707.7-315.8z"/>
+			<path id="路径_3126" class="st8" d="M-6707.4-316.1l-41.4-4.9l-9.3,17.6l41.4,7.4L-6707.4-316.1z"/>
+			<path id="路径_3115" class="st9" d="M-6687.4-330.2l-0.1,0.3l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1
+				C-6687.3-330.4-6687.4-330.3-6687.4-330.2z M-6687.7-329.6c-0.1,0.2-0.3,0.4-0.4,0.5l-0.2-0.1c0.1-0.2,0.3-0.4,0.4-0.5
+				L-6687.7-329.6z M-6687.1-330.8l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0.1C-6687-331.2-6687.1-331-6687.1-330.8z M-6686.9-331.8
+				l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.7l0.2,0.1C-6686.7-332.2-6686.8-332-6686.9-331.8z M-6688.4-328.8c-0.2,0.2-0.4,0.3-0.6,0.4
+				l-0.1-0.2c0.2-0.1,0.4-0.3,0.5-0.4L-6688.4-328.8L-6688.4-328.8z M-6686.6-332.8l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0
+				C-6686.6-333.2-6686.6-333-6686.6-332.8z M-6686.5-333.8l-0.2,0c0-0.2,0-0.5,0.1-0.7l0.2,0
+				C-6686.5-334.3-6686.5-334-6686.5-333.8L-6686.5-333.8z M-6689.3-328.2c-0.2,0.1-0.5,0.2-0.7,0.2l-0.1-0.2c0.2,0,0.4-0.1,0.7-0.2
+				L-6689.3-328.2z M-6686.4-334.8l-0.2,0c0-0.3,0-0.5,0-0.7l0.2,0C-6686.4-335.3-6686.4-335.1-6686.4-334.8z M-6686.4-335.9l-0.2,0
+				c0-0.4,0-0.7,0-0.7l0.2,0C-6686.4-336.6-6686.4-336.3-6686.4-335.9L-6686.4-335.9z M-6690.3-327.9c-0.3,0-0.5,0-0.8,0l0-0.2
+				c0.2,0,0.5,0,0.7,0L-6690.3-327.9z M-6691.4-327.9c-0.2,0-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L-6691.4-327.9z
+				 M-6703.7-303.4l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1C-6703.5-303.8-6703.6-303.6-6703.7-303.4L-6703.7-303.4z
+				 M-6703.8-303.1c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6L-6703.8-303.1z M-6703.2-304.3l-0.2-0.1
+				c0.1-0.2,0.2-0.4,0.2-0.6l0.2,0.1C-6703.1-304.7-6703.2-304.5-6703.2-304.3L-6703.2-304.3z M-6704.3-302.2
+				c-0.1,0.2-0.2,0.4-0.4,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.4-0.6L-6704.3-302.2z M-6702.9-305.3l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6
+				l0.2,0.1C-6702.7-305.7-6702.8-305.5-6702.9-305.3L-6702.9-305.3z M-6704.9-301.4c-0.1,0.2-0.3,0.4-0.4,0.5l-0.2-0.1
+				c0.1-0.2,0.3-0.4,0.4-0.5L-6704.9-301.4z M-6702.6-306.2l-0.2-0.1l0.2-0.6l0.2,0.1C-6702.4-306.7-6702.5-306.5-6702.6-306.2
+				L-6702.6-306.2z M-6705.5-300.5c-0.1,0.2-0.3,0.3-0.5,0.5l-0.1-0.1c0.2-0.1,0.3-0.3,0.5-0.5L-6705.5-300.5z M-6702.3-307.2
+				l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.7l0.2,0.1C-6702.2-307.7-6702.2-307.4-6702.3-307.2L-6702.3-307.2z M-6702-308.2l-0.2-0.1
+				l0.1-0.7l0.2,0.1L-6702-308.2z M-6706.2-299.8c-0.2,0.2-0.3,0.3-0.5,0.5l-0.1-0.1c0.2-0.1,0.3-0.3,0.5-0.4L-6706.2-299.8z
+				 M-6701.8-309.2l-0.2-0.1c0-0.2,0.1-0.4,0.1-0.7l0.2,0.1C-6701.7-309.7-6701.8-309.4-6701.8-309.2L-6701.8-309.2z M-6692.6-328.2
+				c-0.1,0-0.3-0.1-0.4-0.2c-0.1,0-0.2-0.1-0.3-0.1l0.1-0.2c0.1,0,0.2,0.1,0.3,0.1c0.1,0.1,0.3,0.1,0.4,0.2L-6692.6-328.2z
+				 M-6707-299.2c-0.2,0.1-0.4,0.3-0.6,0.4l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.4L-6707-299.2z M-6701.6-310.2l-0.2,0
+				c0-0.2,0.1-0.5,0.1-0.7l0.2,0C-6701.6-310.7-6701.6-310.4-6701.6-310.2L-6701.6-310.2z M-6701.5-311.2l-0.2,0
+				c0-0.2,0.1-0.5,0.1-0.7l0.2,0C-6701.4-311.7-6701.4-311.5-6701.5-311.2L-6701.5-311.2z M-6707.9-298.6c-0.2,0.1-0.4,0.2-0.6,0.3
+				l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L-6707.9-298.6z M-6701.3-312.2l-0.2,0c0-0.2,0.1-0.5,0.1-0.7l0.2,0L-6701.3-312.2z
+				 M-6693.5-328.8l-0.1,0.2c-0.2-0.1-0.5-0.3-0.6-0.4l0.1-0.1C-6693.9-329.1-6693.7-329-6693.5-328.8z M-6701.2-313.3l-0.2,0
+				c0-0.2,0-0.5,0.1-0.7l0.2,0C-6701.2-313.7-6701.2-313.5-6701.2-313.3L-6701.2-313.3z M-6708.9-298.2c-0.2,0.1-0.5,0.1-0.7,0.2
+				l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.2L-6708.9-298.2z M-6701.1-314.3l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+				C-6701.1-314.7-6701.1-314.5-6701.1-314.3z M-6701.1-315.3l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+				C-6701.1-315.8-6701.1-315.5-6701.1-315.3L-6701.1-315.3z M-6694.4-329.4l-0.1,0.1c-0.2-0.2-0.4-0.3-0.5-0.5l0.2-0.1
+				C-6694.7-329.8-6694.6-329.6-6694.4-329.4L-6694.4-329.4z M-6709.9-297.9c-0.2,0.1-0.5,0.1-0.7,0.1l0-0.2c0.2,0,0.5-0.1,0.7-0.1
+				L-6709.9-297.9z M-6701-316.3l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C-6701-316.8-6701-316.6-6701-316.3z M-6701-317.4l-0.2,0
+				c0-0.2,0-0.5,0-0.7l0.2,0C-6701-317.8-6701-317.6-6701-317.4L-6701-317.4z M-6695.1-330.3l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.7
+				l0.2,0C-6695.3-330.7-6695.2-330.4-6695.1-330.3L-6695.1-330.3z M-6711-297.8c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0
+				L-6711-297.8z M-6701-318.4l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C-6701-318.9-6701-318.6-6701-318.4L-6701-318.4z M-6701-319.4l-0.2,0
+				c0-0.2,0-0.5,0-0.7l0.2,0C-6701-319.9-6701-319.7-6701-319.4z M-6695.5-331.2l-0.2,0c-0.1-0.2-0.1-0.5-0.1-0.7l0.2,0
+				C-6695.6-331.6-6695.6-331.4-6695.5-331.2z M-6701-320.5l-0.2,0c0-0.3,0-0.5,0-0.7l0.2,0C-6701-320.9-6701-320.7-6701-320.5
+				L-6701-320.5z M-6712.1-297.8c-0.2,0-0.5,0-0.7-0.1l0-0.2c0.3,0,0.5,0.1,0.7,0.1L-6712.1-297.8z M-6695.7-332.2l-0.2,0
+				c0-0.2,0-0.4,0-0.7l0.2,0C-6695.7-332.6-6695.7-332.4-6695.7-332.2z M-6701-321.5l-0.2,0c0-0.3,0-0.5,0-0.5l0.1-0.1l0.1,0.1
+				C-6701-321.9-6701-321.7-6701-321.5L-6701-321.5z M-6695.7-333.2l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0
+				C-6695.7-333.7-6695.7-333.5-6695.7-333.2z M-6713.3-297.9L-6713.3-297.9c-0.3,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0.1,0.7,0.1
+				l0,0L-6713.3-297.9z M-6695.7-334.3l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C-6695.7-334.7-6695.7-334.5-6695.7-334.3z M-6695.7-335.3
+				l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C-6695.7-335.8-6695.7-335.5-6695.7-335.3L-6695.7-335.3z M-6714.3-298.1c-0.2,0-0.5-0.1-0.7-0.1
+				l0-0.2c0.2,0,0.5,0.1,0.7,0.1L-6714.3-298.1z M-6695.7-336.3l-0.2,0c0-0.2,0-0.5-0.1-0.7l0.2,0
+				C-6695.8-336.8-6695.7-336.6-6695.7-336.3L-6695.7-336.3z M-6695.9-337.4l-0.2,0c0-0.2-0.1-0.5-0.1-0.7l0.2,0
+				C-6695.9-337.9-6695.9-337.6-6695.9-337.4L-6695.9-337.4z M-6715.4-298.3c-0.3,0-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2
+				L-6715.4-298.3z M-6696.1-338.4l-0.2,0c-0.1-0.2-0.1-0.5-0.2-0.7l0.2,0C-6696.2-338.9-6696.1-338.6-6696.1-338.4L-6696.1-338.4z
+				 M-6696.4-339.4l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.7l0.2,0C-6696.6-339.9-6696.5-339.7-6696.4-339.4L-6696.4-339.4z M-6716.5-298.6
+				l-0.7-0.2l0-0.2l0.7,0.2L-6716.5-298.6z M-6696.8-340.4l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1
+				C-6697.1-340.9-6696.9-340.6-6696.8-340.4L-6696.8-340.4z M-6717.6-298.9c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2
+				c0.2,0.1,0.5,0.1,0.7,0.2L-6717.6-298.9z M-6697.4-341.4l-0.2,0.1c-0.1-0.2-0.3-0.4-0.4-0.6l0.1-0.1
+				C-6697.6-341.8-6697.5-341.6-6697.4-341.4z M-6718.7-299.2c-0.3-0.1-0.5-0.2-0.7-0.2l0.1-0.2l0.7,0.2L-6718.7-299.2z
+				 M-6698-342.3l-0.2,0.1c-0.1-0.2-0.3-0.4-0.4-0.6l0.2-0.1C-6698.3-342.7-6698.1-342.5-6698-342.3z M-6719.8-299.6
+				c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2c0.2,0.1,0.5,0.2,0.7,0.3L-6719.8-299.6z M-6698.7-343.2l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.6
+				l0.1-0.1C-6699-343.5-6698.8-343.4-6698.7-343.2L-6698.7-343.2z M-6720.8-300c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2
+				c0.2,0.1,0.4,0.2,0.7,0.3L-6720.8-300z M-6699.4-344l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.5l0.1-0.1
+				C-6699.7-344.3-6699.6-344.2-6699.4-344L-6699.4-344z M-6700.2-344.8l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.5l0.1-0.1
+				C-6700.5-345.1-6700.4-344.9-6700.2-344.8L-6700.2-344.8z M-6721.9-300.4L-6721.9-300.4c-0.3-0.1-0.5-0.2-0.7-0.3l0.1-0.2
+				c0.2,0.1,0.4,0.2,0.6,0.3l0.1,0L-6721.9-300.4z M-6701-345.5l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.5l0.1-0.1
+				C-6701.4-345.8-6701.2-345.7-6701-345.5z M-6722.8-301.1l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1
+				C-6723.2-301.3-6723-301.2-6722.8-301.1z M-6701.9-346.2l-0.1,0.1l-0.6-0.5l0.1-0.1C-6702.3-346.5-6702.1-346.4-6701.9-346.2
+				L-6701.9-346.2z M-6723.7-301.7l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C-6724.1-302-6723.9-301.8-6723.7-301.7z
+				 M-6718.6-314.3c-0.1,0.2-0.2,0.3-0.3,0.5l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1L-6718.6-314.3z M-6718.4-314.8l-0.2-0.1
+				c0.1-0.2,0.1-0.4,0.1-0.7l0.2,0C-6718.3-315.3-6718.3-315-6718.4-314.8L-6718.4-314.8z M-6702.8-346.9l-0.1,0.1
+				c-0.2-0.2-0.4-0.3-0.6-0.4l0.1-0.1C-6703.2-347.2-6703-347-6702.8-346.9L-6702.8-346.9z M-6719.1-313.6c-0.2,0.2-0.3,0.3-0.5,0.5
+				l-0.1-0.1c0.2-0.1,0.3-0.3,0.5-0.5L-6719.1-313.6z M-6724.6-302.3l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.5l0.1-0.1
+				C-6725-302.6-6724.8-302.5-6724.6-302.3z M-6718.3-315.8l-0.2,0c0-0.2,0-0.5-0.1-0.7l0.2,0
+				C-6718.3-316.3-6718.3-316.1-6718.3-315.8L-6718.3-315.8z M-6719.9-312.9c-0.1,0.1-0.2,0.1-0.3,0.2c-0.1,0.1-0.2,0.1-0.4,0.1
+				l-0.1-0.2c0.1,0,0.2-0.1,0.3-0.1c0.1-0.1,0.2-0.1,0.3-0.1L-6719.9-312.9z M-6718.5-316.9l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6
+				l0.1-0.1C-6718.7-317.3-6718.5-317.1-6718.5-316.9L-6718.5-316.9z M-6703.7-347.5l-0.1,0.1l-0.6-0.4l0.1-0.1
+				C-6704.1-347.8-6703.9-347.7-6703.7-347.5L-6703.7-347.5z M-6725.5-303.1l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.5l0.1-0.1
+				C-6725.8-303.4-6725.6-303.2-6725.5-303.1z M-6720.9-312.5c-0.2,0-0.5,0.1-0.8,0l0-0.2c0.2,0,0.5,0,0.7,0L-6720.9-312.5z
+				 M-6719-317.8l-0.1,0.1c-0.2-0.2-0.3-0.3-0.6-0.5l0.1-0.1C-6719.4-318.2-6719.2-318-6719-317.8L-6719-317.8z M-6726.2-303.9
+				l-0.2,0.1c-0.2-0.2-0.3-0.4-0.4-0.6l0.1-0.1C-6726.5-304.3-6726.3-304.1-6726.2-303.9L-6726.2-303.9z M-6722-312.5
+				c-0.3,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0.1,0.5,0.1,0.7,0.1L-6722-312.5z M-6704.6-348.2l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1
+				C-6705.1-348.4-6704.9-348.3-6704.6-348.2z M-6720-318.4c-0.2-0.1-0.4-0.2-0.7-0.2l0-0.2c0.3,0,0.5,0.1,0.7,0.2L-6720-318.4z
+				 M-6726.8-304.7l-0.2,0.1c-0.1-0.2-0.3-0.4-0.4-0.6l0.2-0.1C-6727.1-305.2-6727-304.9-6726.8-304.7z M-6723.1-312.7
+				c-0.2-0.1-0.5-0.2-0.7-0.2l0.1-0.2c0.2,0.1,0.5,0.2,0.7,0.2L-6723.1-312.7z M-6705.6-348.7l-0.1,0.1c-0.2-0.1-0.4-0.3-0.7-0.4
+				l0.1-0.2C-6706.1-349-6705.8-348.9-6705.6-348.7L-6705.6-348.7z M-6727.3-305.7l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.7l0.2,0
+				C-6727.5-306.1-6727.5-305.9-6727.3-305.7z M-6721.1-318.7c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0
+				C-6721.1-318.8-6721.1-318.6-6721.1-318.7L-6721.1-318.7z M-6724.2-313.1c-0.2-0.1-0.4-0.2-0.7-0.3l0.1-0.2
+				c0.2,0.1,0.5,0.2,0.7,0.3L-6724.2-313.1z M-6706.6-349.3l-0.1,0.2l-0.7-0.3l0.1-0.1L-6706.6-349.3z M-6727.8-306.7l-0.2,0.1
+				c-0.1-0.2-0.1-0.4-0.2-0.7l0.2,0C-6727.9-307.1-6727.8-306.9-6727.8-306.7L-6727.8-306.7z M-6722.1-318.6L-6722.1-318.6
+				c-0.3,0-0.5,0.1-0.7,0.1l-0.1-0.2c0.2-0.1,0.4-0.1,0.6-0.1l0.1,0L-6722.1-318.6z M-6728.1-307.7l-0.2,0l-0.1-0.3
+				c0-0.1-0.1-0.2-0.1-0.3l0.2,0c0,0.1,0.1,0.2,0.1,0.3L-6728.1-307.7z M-6725.1-313.7l-0.1,0.2c-0.2-0.1-0.5-0.2-0.7-0.4l0.1-0.1
+				C-6725.6-314-6725.4-313.9-6725.1-313.7z M-6707.7-349.6c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2c0.2,0.1,0.5,0.2,0.7,0.3
+				L-6707.7-349.6z M-6723.2-318.4c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.7-0.3L-6723.2-318.4z M-6728.4-308.7
+				l-0.2,0c0,0,0-0.1,0-0.1c-0.1-0.2-0.1-0.4-0.1-0.6l0.2,0c0,0.2,0.1,0.4,0.1,0.5C-6728.4-308.8-6728.4-308.7-6728.4-308.7z
+				 M-6724.1-318c-0.2,0.1-0.4,0.2-0.6,0.4l-0.1-0.1c0.2-0.1,0.4-0.3,0.6-0.4C-6724.2-318.1-6724.1-318-6724.1-318L-6724.1-318z
+				 M-6726.1-314.3l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C-6726.5-314.5-6726.3-314.4-6726.1-314.3L-6726.1-314.3z
+				 M-6708.7-350l-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L-6708.7-350z M-6728.6-309.7l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+				C-6728.6-310.1-6728.6-309.9-6728.6-309.7z M-6725-317.4c-0.2,0.1-0.3,0.3-0.5,0.4l-0.1-0.1c0.2-0.2,0.3-0.3,0.5-0.5L-6725-317.4
+				z M-6728.5-310.7l-0.2,0c0-0.2,0.1-0.5,0.1-0.7l0.2,0.1C-6728.5-311.1-6728.5-310.9-6728.5-310.7z M-6725.7-316.7
+				c-0.2,0.2-0.3,0.3-0.4,0.5l-0.2-0.1c0.1-0.2,0.3-0.3,0.5-0.5L-6725.7-316.7z M-6728.4-311.7l-0.2-0.1c0-0.2,0.1-0.4,0.2-0.7
+				l0.2,0.1C-6728.2-312.1-6728.3-311.9-6728.4-311.7z M-6726.3-315.9l-0.4,0.5l-0.2-0.1c0.1-0.2,0.3-0.4,0.4-0.6L-6726.3-315.9z
+				 M-6728.1-312.7l-0.2-0.1c0.1-0.2,0.2-0.4,0.2-0.6l0.2,0.1C-6727.9-313.1-6728-312.9-6728.1-312.7L-6728.1-312.7z M-6726.9-315.1
+				c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0-0.1,0.1-0.2,0.1-0.2c-0.2-0.1-0.4-0.2-0.5-0.3l0.1-0.1c0.2,0.1,0.3,0.2,0.5,0.3
+				c0-0.1,0.1-0.1,0.1-0.2L-6726.9-315.1z M-6727.7-313.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1
+				C-6727.5-314-6727.6-313.8-6727.7-313.6L-6727.7-313.6z M-6709.8-350.3c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0,0.5,0.1,0.7,0.2
+				L-6709.8-350.3z M-6710.9-350.6c-0.2,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0.1,0.7,0.1L-6710.9-350.6z M-6728-315.5l-0.1,0.1
+				c-0.2-0.2-0.4-0.3-0.6-0.4l0.1-0.1C-6728.4-315.8-6728.2-315.7-6728-315.5L-6728-315.5z M-6712-350.7c-0.2,0-0.5,0-0.7,0l0-0.2
+				c0.2,0,0.5,0,0.7,0L-6712-350.7z M-6728.9-316.2l-0.1,0.1c-0.3-0.3-0.5-0.4-0.5-0.4l-0.1,0l0.1-0.1l0.1,0
+				C-6729.4-316.6-6729.2-316.4-6728.9-316.2L-6728.9-316.2z M-6721.7-331.7l-0.1,0.2l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1
+				C-6721.6-332-6721.7-331.9-6721.7-331.7L-6721.7-331.7z M-6722-331.3c-0.1,0.2-0.3,0.4-0.4,0.5l-0.1-0.1c0.2-0.1,0.3-0.3,0.4-0.5
+				L-6722-331.3z M-6721.4-332.5l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.7l0.2,0C-6721.3-333-6721.4-332.7-6721.4-332.5L-6721.4-332.5z
+				 M-6721.2-333.5l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0C-6721.2-334-6721.2-333.7-6721.2-333.5L-6721.2-333.5z M-6722.7-330.5
+				c-0.2,0.1-0.4,0.3-0.6,0.4l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3C-6722.8-330.6-6722.7-330.5-6722.7-330.5z M-6713.1-350.7
+				c-0.2,0-0.5,0-0.7,0.1l0-0.2c0.2,0,0.5-0.1,0.7-0.1L-6713.1-350.7z M-6729.8-316.9l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.5l0.1-0.1
+				C-6730.2-317.2-6730-317-6729.8-316.9L-6729.8-316.9z M-6721.2-334.5l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+				C-6721.2-335-6721.2-334.8-6721.2-334.5L-6721.2-334.5z M-6723.7-330c-0.2,0.1-0.5,0.1-0.7,0.1l0-0.2c0.2,0,0.5-0.1,0.7-0.1
+				L-6723.7-330z M-6721.2-335.6l-0.2,0c0-0.2-0.1-0.5-0.1-0.7l0.2,0C-6721.3-336.1-6721.3-335.8-6721.2-335.6L-6721.2-335.6z
+				 M-6714.1-350.5c-0.2,0.1-0.5,0.1-0.7,0.2l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.2L-6714.1-350.5z M-6730.6-317.6l-0.1,0.1
+				c-0.2-0.2-0.4-0.3-0.6-0.5l0.1-0.1C-6731-317.9-6730.8-317.8-6730.6-317.6z M-6721.4-336.6l-0.2,0c-0.1-0.2-0.1-0.4-0.2-0.7
+				l0.2,0C-6721.5-337.1-6721.5-336.8-6721.4-336.6L-6721.4-336.6z M-6724.8-329.8c-0.3,0-0.5,0-0.8-0.1l0-0.2
+				c0.2,0,0.5,0.1,0.7,0.1L-6724.8-329.8z M-6715.1-350.2c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.7-0.3L-6715.1-350.2
+				z M-6721.7-337.7l-0.2,0c-0.1-0.2-0.2-0.5-0.2-0.7l0.2,0C-6721.9-338.1-6721.8-337.9-6721.7-337.7L-6721.7-337.7z M-6731.5-318.3
+				l-0.1,0.1c-0.2-0.2-0.4-0.4-0.5-0.5l0.1-0.1C-6731.8-318.7-6731.6-318.5-6731.5-318.3L-6731.5-318.3z M-6716.1-349.8
+				c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L-6716.1-349.8z M-6725.9-330c-0.2-0.1-0.5-0.1-0.7-0.2l0.1-0.2
+				c0.3,0.1,0.5,0.2,0.7,0.2L-6725.9-330z M-6722.1-338.7l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1
+				C-6722.3-339.1-6722.2-338.9-6722.1-338.7L-6722.1-338.7z M-6717-349.3c-0.2,0.1-0.4,0.3-0.6,0.4l-0.1-0.1
+				c0.2-0.1,0.4-0.3,0.6-0.4L-6717-349.3z M-6717.8-348.7c-0.2,0.1-0.3,0.3-0.5,0.4l-0.1-0.1c0.2-0.2,0.3-0.3,0.5-0.5L-6717.8-348.7
+				L-6717.8-348.7z M-6732.2-319.1l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.5l0.1-0.1C-6732.6-319.5-6732.4-319.3-6732.2-319.1
+				L-6732.2-319.1z M-6727-330.4c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2c0.2,0.1,0.5,0.2,0.7,0.3L-6727-330.4z M-6722.6-339.6l-0.2,0.1
+				c0-0.1-0.1-0.1-0.1-0.2c-0.1,0.1-0.2,0.2-0.3,0.3l-0.1-0.1c0.2-0.1,0.3-0.2,0.3-0.3c-0.1-0.1-0.1-0.2-0.2-0.3l0.1-0.1
+				c0,0.1,0.1,0.1,0.1,0.2l0.2,0c0,0.1,0,0.1,0,0.2C-6722.7-339.8-6722.6-339.7-6722.6-339.6z M-6718.6-348
+				c-0.2,0.2-0.3,0.3-0.4,0.5l-0.2-0.1c0.1-0.2,0.3-0.3,0.5-0.5L-6718.6-348z M-6719.2-347.2c-0.1,0.2-0.3,0.4-0.4,0.5l-0.2-0.1
+				c0.1-0.2,0.3-0.4,0.4-0.5L-6719.2-347.2z M-6722.6-340.3l-0.2,0c0-0.2,0.1-0.4,0.2-0.7l0.2,0.1
+				C-6722.5-340.8-6722.6-340.6-6722.6-340.3L-6722.6-340.3z M-6722.3-341.3l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0.1
+				C-6722.2-341.7-6722.3-341.5-6722.3-341.3z M-6719.8-346.4c-0.1,0.2-0.3,0.4-0.4,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.4-0.6
+				L-6719.8-346.4z M-6723.4-339.2c-0.2,0.1-0.4,0.3-0.5,0.4l-0.1-0.1c0.2-0.1,0.4-0.3,0.5-0.4L-6723.4-339.2z M-6722-342.3
+				l-0.2-0.1c0.1-0.2,0.2-0.4,0.2-0.6l0.2,0.1C-6721.8-342.7-6721.9-342.5-6722-342.3L-6722-342.3z M-6720.4-345.6
+				c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6L-6720.4-345.6z M-6721.6-343.2l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6
+				l0.2,0.1C-6721.4-343.6-6721.5-343.4-6721.6-343.2L-6721.6-343.2z M-6733-319.9l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.6l0.2-0.1
+				C-6733.3-320.3-6733.2-320.1-6733-319.9z M-6720.9-344.7c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6
+				L-6720.9-344.7z M-6723.2-340.5l-0.2,0.1c-0.1-0.2-0.3-0.4-0.5-0.6l0.1-0.1C-6723.5-340.9-6723.3-340.7-6723.2-340.5z
+				 M-6728-330.7c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L-6728-330.7z M-6724.2-338.6c-0.2,0.1-0.4,0.3-0.6,0.4
+				l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.4L-6724.2-338.6z M-6725.1-338c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.1c0.2-0.1,0.4-0.2,0.6-0.3
+				L-6725.1-338z M-6733.7-320.8l-0.2,0.1c-0.2-0.2-0.3-0.4-0.4-0.6l0.2-0.1C-6734-321.2-6733.8-321-6733.7-320.8z M-6723.9-341.4
+				l-0.1,0.1c-0.2-0.2-0.4-0.3-0.5-0.5l0.1-0.1C-6724.3-341.7-6724.1-341.6-6723.9-341.4z M-6729.1-331c-0.2-0.1-0.5-0.1-0.7-0.1
+				l0-0.2c0.2,0,0.5,0.1,0.7,0.2L-6729.1-331z M-6726-337.5c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L-6726-337.5
+				z M-6734.3-321.7l-0.2,0.1l0-0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1C-6734.5-322.1-6734.4-321.9-6734.3-321.7
+				C-6734.3-321.7-6734.3-321.7-6734.3-321.7z M-6727-337.1c-0.2,0.1-0.5,0.2-0.7,0.2l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.2L-6727-337.1
+				z M-6724.7-342.1l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.4l0.1-0.1C-6725.2-342.4-6725-342.3-6724.7-342.1L-6724.7-342.1z
+				 M-6730.2-331.2c-0.3,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0,0.7,0.1L-6730.2-331.2z M-6734.8-322.6l-0.2,0.1
+				c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0C-6735-323-6734.9-322.8-6734.8-322.6z M-6728-336.8c-0.2,0-0.5,0.1-0.8,0l0-0.2
+				c0.2,0,0.5,0,0.7,0L-6728-336.8z M-6731.3-331.3c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L-6731.3-331.3z M-6725.7-342.8
+				l-0.1,0.2l-0.2-0.1c-0.2-0.1-0.3-0.1-0.5-0.2l0.1-0.2c0.2,0.1,0.3,0.1,0.5,0.2L-6725.7-342.8z M-6735.3-323.6l-0.2,0
+				c-0.1-0.2-0.2-0.5-0.3-0.7l0.2,0C-6735.5-324-6735.4-323.8-6735.3-323.6L-6735.3-323.6z M-6729.2-336.8c-0.3,0-0.5-0.1-0.7-0.2
+				l0.1-0.2c0.2,0.1,0.5,0.2,0.7,0.2L-6729.2-336.8L-6729.2-336.8z M-6732.3-331.3c-0.2,0-0.5,0.1-0.7,0.1l-0.1-0.2
+				c0.2-0.1,0.5-0.1,0.7-0.1L-6732.3-331.3z M-6735.7-324.6l-0.2,0c-0.1-0.2-0.1-0.5-0.2-0.7l0.2,0
+				C-6735.8-325-6735.7-324.8-6735.7-324.6L-6735.7-324.6z M-6726.8-343.1c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2
+				L-6726.8-343.1z M-6730.1-337.4l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.5l0.1-0.1C-6730.5-337.6-6730.4-337.5-6730.1-337.4
+				L-6730.1-337.4z M-6736-325.6l-0.2,0c-0.1-0.2-0.1-0.5-0.1-0.7l0.2,0C-6736.1-326-6736-325.8-6736-325.6z M-6733.4-331
+				c-0.2,0.1-0.4,0.2-0.6,0.2l-0.1-0.2c0.2-0.1,0.4-0.2,0.7-0.3L-6733.4-331z M-6727.9-343.3c-0.2,0-0.5-0.1-0.7-0.1l0-0.2
+				c0.2,0,0.5,0.1,0.8,0.1L-6727.9-343.3z M-6736.1-326.6l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C-6736.2-327-6736.1-326.8-6736.1-326.6z
+				 M-6734.3-330.6c-0.2,0.1-0.4,0.2-0.5,0.4l-0.1-0.1c0.2-0.2,0.4-0.3,0.6-0.4L-6734.3-330.6z M-6730.9-338.1l-0.2,0.1l-0.1-0.1
+				c-0.1-0.2-0.2-0.3-0.3-0.5l0.2-0.1C-6731.2-338.5-6731.1-338.3-6730.9-338.1C-6731-338.1-6731-338.1-6730.9-338.1z
+				 M-6736.1-327.6l-0.2,0c0-0.2,0.1-0.5,0.1-0.7l0.2,0.1C-6736.1-328.1-6736.1-327.8-6736.1-327.6z M-6735.1-330
+				c-0.2,0.2-0.3,0.3-0.4,0.5l-0.2-0.1c0.1-0.2,0.3-0.4,0.4-0.5L-6735.1-330z M-6735.9-328.6l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6
+				l0-0.1l0.2,0.1l0,0.1C-6735.8-329-6735.9-328.8-6735.9-328.6z M-6729-343.4c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0
+				L-6729-343.4z M-6731.5-339l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0C-6731.8-339.4-6731.6-339.2-6731.5-339L-6731.5-339z
+				 M-6730-343.4c-0.2,0-0.5,0.1-0.7,0.2l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.2L-6730-343.4z M-6732-340l-0.2,0
+				c-0.1-0.2-0.2-0.4-0.2-0.7l0.2,0C-6732.1-340.4-6732.1-340.2-6732-340L-6732-340z M-6731.1-343.1c-0.2,0.1-0.4,0.2-0.6,0.3
+				l-0.1-0.1c0.2-0.1,0.4-0.3,0.6-0.4L-6731.1-343.1z M-6732.3-340.9l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+				C-6732.3-341.4-6732.3-341.2-6732.3-340.9z M-6731.8-342.5c-0.1,0.2-0.3,0.4-0.3,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.4-0.6
+				L-6731.8-342.5z M-6729-324.8c-0.3,0.6-1.1,0.8-1.7,0.5c0,0,0,0,0,0c-0.6-0.2-0.9-0.9-0.7-1.5c0.2-0.6,0.9-0.9,1.5-0.7
+				c0.1,0,0.2,0.1,0.2,0.1C-6729-326.2-6728.7-325.4-6729-324.8z M-6731-325.8c-0.3,0.4-0.1,1,0.3,1.3c0.4,0.3,1,0.1,1.3-0.3
+				c0.3-0.4,0.1-1-0.3-1.3c0,0-0.1,0-0.1,0C-6730.2-326.4-6730.8-326.2-6731-325.8z"/>
+		</g>
+		<g id="组_1519" transform="translate(105.94 86.717)">
+			<g id="组_1518" transform="translate(0)">
+				<g id="undraw_shopping_app_flsj">
+					<path id="路径_2982" class="st10" d="M-6725.3-335.3h0.7c0.1,0,0.1,0,0.1,0.1v0.3c0,0.1,0,0.1-0.1,0.1h-0.1v0.5h-0.5v-0.5
+						h-0.1c-0.1,0-0.1,0-0.1-0.1v-0.3C-6725.4-335.3-6725.4-335.3-6725.3-335.3C-6725.3-335.3-6725.3-335.3-6725.3-335.3z"/>
+					<path id="路径_2984" class="st11" d="M-6725.2-335.2c0,0.1,0.1,0.2,0.2,0.2c0.1,0,0.2-0.1,0.2-0.2"/>
+					<path id="路径_2990" class="st12" d="M-6711.3-347.7l-1.8-0.2l-1.2-2.8l2.1-1.2L-6711.3-347.7z"/>
+					<path id="路径_2991" class="st12" d="M-6728-340L-6728-340c-0.2-0.5,0-1.1,0.6-1.3c0.1,0,0.2-0.1,0.3-0.1l2.8-0.2l0.4,1.4
+						l-2.9,0.8C-6727.3-339.3-6727.8-339.6-6728-340z"/>
+					<path id="路径_2992" class="st13" d="M-6725-339.4l0-2.6l6.3-1l4.8-5.5c0.5-0.6,1.4-0.7,2.1-0.3l0,0c0.7,0.5,0.9,1.5,0.5,2.2
+						c-0.1,0.1-0.1,0.2-0.2,0.2l-4,4.9L-6725-339.4z"/>
+					<path id="路径_2993" class="st14" d="M-6709.9-310.3h-1.7l-4.1-18.5l-4.2,5.7l-2.5,12.4h-1.6l0.3-13.3l5.5-14.2h5.4
+						c1.5,2.7,2.7,5.5,1.3,8.3L-6709.9-310.3z"/>
+					<path id="路径_2994" class="st14" d="M-6721.4-309.2c0.1,0.2-0.1,0.5-0.3,0.5c0,0,0,0-0.1,0l-4,0.7c-0.3,0.1-0.7-0.1-0.8-0.5
+						l0,0c-0.1-0.3,0-0.6,0.3-0.8c0.9-0.5,1.7-1.1,2.2-1.9c0.4,0.4,1,0.4,1.5,0.1l0.6,0.1L-6721.4-309.2z"/>
+					<path id="路径_2995" class="st14" d="M-6709.2-309.2c0.1,0.2-0.1,0.5-0.3,0.5c0,0,0,0-0.1,0l-4,0.7c-0.3,0.1-0.7-0.1-0.8-0.5
+						l0,0c-0.1-0.3,0-0.6,0.3-0.8c0.9-0.5,1.7-1.1,2.2-1.9c0.4,0.4,1,0.4,1.5,0.1l0.6,0.1L-6709.2-309.2z"/>
+					<ellipse id="椭圆_685" class="st12" cx="-6714.4" cy="-352" rx="2.3" ry="2.3"/>
+					<path id="路径_2996" class="st13" d="M-6712.3-337.6l-6-0.2l1.8-5.6c-1.1-1.8,0-3.5,1.6-5.3l1.2-0.8l2-0.2l0,0
+						c0.9,0.9,1.3,2.1,1.3,3.4C-6710.5-343.2-6711.1-340.3-6712.3-337.6z"/>
+					<path id="路径_2997" class="st12" d="M-6726.1-333.8L-6726.1-333.8c-0.4-0.4-0.4-1,0-1.4c0.1-0.1,0.2-0.1,0.3-0.2l2.5-1.3
+						l0.9,1.1l-2.4,1.9C-6725.2-333.4-6725.8-333.4-6726.1-333.8z"/>
+					<path id="路径_2998" class="st13" d="M-6723.1-334.4l-1-2.4l5.4-3.4l2.3-7c0.2-0.8,1-1.2,1.8-1.1l0,0c0.9,0.2,1.4,1,1.3,1.8
+						c0,0.1,0,0.2-0.1,0.3l-1.7,6.1L-6723.1-334.4z"/>
+					<path id="路径_2999" class="st14" d="M-6710.6-352.9c-0.1,1.1-0.5,2.1-1.3,2.9c-0.5,0.4-1.1,0.4-1.4-0.2
+						c-0.6-1.2-1.6-2.1-2.7-2.7c-2.1-1.1,0.7-3,2.7-2.7C-6711.8-355.5-6710.6-354.4-6710.6-352.9z"/>
+					<ellipse id="椭圆_686" class="st14" cx="-6712" cy="-355.8" rx="1.6" ry="1.6"/>
+					<path id="路径_3000" class="st14" d="M-6713.9-356.4c0-0.9,0.7-1.6,1.5-1.6c0,0-0.1,0-0.1,0c-0.9,0-1.6,0.7-1.6,1.7
+						c0,0.9,0.7,1.6,1.6,1.6c0,0,0.1,0,0.1,0C-6713.2-354.8-6713.9-355.5-6713.9-356.4z"/>
+					<ellipse id="椭圆_687" class="st12" cx="-6714.4" cy="-351.7" rx="0.4" ry="0.5"/>
+					<path id="路径_3001" class="st1" d="M-6761.5-313.1h25.9l5.5-25.9h4.7v-1.2h-5.6l-5.5,25.9h-25V-313.1z"/>
+					<ellipse id="椭圆_688" class="st1" cx="-6739.2" cy="-310.5" rx="2.5" ry="2.5"/>
+					<ellipse id="椭圆_689" class="st1" cx="-6757.7" cy="-310.5" rx="2.5" ry="2.5"/>
+					<path id="路径_3002" class="st1" d="M-6760.7-313.9h25l4.4-21.8h-33.5c-0.7,0-1.2,0.5-1.2,1.2c0,0.1,0,0.1,0,0.2l4.1,19.4
+						C-6761.8-314.3-6761.3-313.9-6760.7-313.9z M-6736-314.2h-24.7c-0.4,0-0.8-0.3-0.8-0.7l-4.1-19.4c-0.1-0.5,0.2-0.9,0.7-1
+						c0,0,0.1,0,0.1,0h33.1L-6736-314.2z"/>
+					<path id="路径_3003" class="st1" d="M-6740.5-313.9l2.9-21.5l-0.3-0.1l-2.9,21.5L-6740.5-313.9z"/>
+					<path id="路径_3004" class="st1" d="M-6756.6-314.1l0.3-0.1l-2.8-21.4l-0.3,0.1L-6756.6-314.1z"/>
+					<rect id="矩形_2722" x="-6749" y="-335.5" class="st1" width="0.3" height="21.5"/>
+					
+						<rect id="矩形_2723" x="-6764.9" y="-329.7" transform="matrix(1 -1.999996e-03 1.999996e-03 1 0.6455 -13.4985)" class="st1" width="31.9" height="0.3"/>
+					
+						<rect id="矩形_2724" x="-6748.8" y="-333.3" transform="matrix(6.999829e-03 -1 1 6.999829e-03 -6382.0967 -7065.4775)" class="st1" width="0.3" height="28"/>
+					<ellipse id="椭圆_690" class="st1" cx="-6725.9" cy="-339.8" rx="1.8" ry="1"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

src/main/resources/static/img/order/icon-list.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 180 180" style="enable-background:new 0 0 180 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFC233;}
+	.st1{fill:#FFE7AE;}
+	.st2{fill:#E15621;}
+	.st3{fill:#2D3036;}
+	.st4{fill:#FFB8B8;}
+	.st5{fill:#4A4F58;}
+	.st6{fill:#2F2E41;}
+	.st7{clip-path:url(#路径_4169_2_);}
+	.st8{clip-path:url(#路径_4168_2_);}
+	.st9{fill:#F9954B;}
+</style>
+<g>
+	<path id="路径_4168" class="st0" d="M24.2,22.5l38.4,10.3L45.1,49.6l4.9,30.3L33.2,93.7L7,86.7L24.2,22.5z"/>
+	<path id="路径_4169" class="st0" d="M79.2,106L40.9,95.8l16.9-14.5l-5.2-29l17.7-17.4l26.3,7L79.2,106z"/>
+</g>
+<path id="路径_4170" class="st1" d="M51.5,62.4l32,3.6l1.6-4.7l-13-29.5c0,0,2.4,13.7-1,17s-8,11.1-15.5,11.3S51.5,62.4,51.5,62.4
+	z"/>
+<ellipse id="椭圆_761" class="st2" cx="82.4" cy="162.9" rx="79.4" ry="4"/>
+<path id="路径_4147" class="st3" d="M155.9,156.5l18.7-27.8l-18.7,30.8l0,3.1c-1.4,0-2.7,0-4.1-0.1l0.9-40.3l0-0.3l0-0.1l0.1-3.8
+	l-20.5-29.8l20.5,26.9l0.1,0.8l0.7-30.4L136,54.8l17.8,25.5l-0.2-63V17l0,0.2l1.2,49.7l16.1-20.2l-16.1,24.5l0.4,27.2L170,71.9
+	l-14.8,30.6l0.2,15.1l21.6-37l-21.5,42.3L155.9,156.5z"/>
+<path id="路径_4156" class="st4" d="M67.3,106.9l0.3,2.5c0,0-2,7.3,1,6.8s2-6.8,2-6.8l-0.5-2L67.3,106.9z"/>
+<path id="路径_4157" class="st4" d="M99.7,107.2l-0.3,2.5c0,0,2,7.3-1,6.8s-2-6.8-2-6.8l0.5-2L99.7,107.2z"/>
+<path id="路径_4158" class="st4" d="M74.5,154.9l-0.8,5.3l5.3-0.5l-0.8-5.3L74.5,154.9z"/>
+<path id="路径_4159" class="st4" d="M102.6,154.9l0.8,5.3l-5.3-0.5l0.8-5.3L102.6,154.9z"/>
+<path id="路径_4160" class="st5" d="M73.7,104.4c0,0-1.3,0.5,0,19.7l0.5,31.3h5.1l2-27.8l2.8-16.9l7.8,22l6.3,23.5l5.1-1.3
+	l-6.6-30.1c0,0,1.3-17.4-3.3-20.5S73.7,104.4,73.7,104.4z"/>
+<path id="路径_4161" class="st3" d="M74.9,158.5c0,0-0.1-2.3-0.6-2.4s-3.7,2.7-3.7,2.7c-1.5-0.3-3,0.7-3.3,2.2
+	c-0.1,0.4-0.1,0.7,0,1.1c0.3,3.8,5.3,2.5,5.3,2.5s1,2.3,3,2.3s5.1,0,5.3-1.5s-1.3-8.3-1.8-8.1c-0.6,0.1-1.2,0.1-1.8,0L74.9,158.5z"
+	/>
+<path id="路径_4162" class="st3" d="M102.2,158.5c0,0,0.1-2.3,0.6-2.4s3.7,2.7,3.7,2.7c1.5-0.3,3,0.7,3.3,2.2
+	c0.1,0.4,0.1,0.7,0,1.1c-0.3,3.8-5.3,2.5-5.3,2.5s-1,2.3-3,2.3s-5.1,0-5.3-1.5s1.3-8.3,1.8-8.1c0.6,0.1,1.2,0.1,1.8,0L102.2,158.5z"
+	/>
+<circle id="椭圆_762" class="st4" cx="83.5" cy="61.2" r="4.8"/>
+<path id="路径_4163" class="st4" d="M86.8,62c0,0,0.3,6.8,1.5,7.6s-7.6,0-7.6,0l1-5.8L86.8,62z"/>
+<path id="路径_4164" class="st2" d="M88.8,68.8c0,0-4.5-2.3-8.8-0.8c-2.3,0.8-4.6,1.9-6.6,3.3L76.2,86c0,0-5.3,19.2-3.8,19.7
+	s19.5-1.5,21.2,0s1.8-1.8,1.8-1.8s-2.5-6.3-2-11.6s0.5-7.1,0.5-7.1l2.8-11.9L88.8,68.8z"/>
+<path id="路径_4165" class="st2" d="M75.2,71.3h-1.8c0,0-2.8,1.8-2.8,4.3S68.1,92,68.1,92l-1.5,15.7l4.3,0.8l3.8-20.7l2.8-5.6
+	L75.2,71.3z"/>
+<path id="路径_4166" class="st2" d="M91.9,73.3h4.8c1.2,1.5,2,3.2,2.3,5.1c0.8,3.5,1.5,17.4,1.5,17.4l-0.5,12.6h-3.8L95.6,92
+	l-2.5-10.6L91.9,73.3z"/>
+<path id="路径_4167" class="st6" d="M79.4,60.9l1,2.6c0.3,1.1,1,2.1,1.9,2.8c1.3,0.6,2.8,0.5,4-0.4c2.8-1.9,3.6-5.8,1.6-8.6
+	c-1-1.5-2.6-2.5-4.4-2.7l0,0.9l-1.1-0.9c-0.3,0.5-0.9,0.7-1.4,0.4c-0.1,0-0.1-0.1-0.2-0.1c0.2,0.6,0,1.3-0.5,1.7
+	c-0.6,0.5-2.2,1.2-2.1,2.2C78.2,59.3,79.2,60.2,79.4,60.9z"/>
+<g>
+	<defs>
+		<path id="路径_4169_1_" d="M79.2,106L40.9,95.8l16.9-14.5l-5.2-29l17.7-17.4l26.3,7L79.2,106z"/>
+	</defs>
+	<clipPath id="路径_4169_2_">
+		<use xlink:href="#路径_4169_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g class="st7">
+		<circle class="st1" cx="53.9" cy="41.7" r="21"/>
+	</g>
+</g>
+<g>
+	<defs>
+		<path id="路径_4168_1_" d="M24.2,22.5l38.4,10.3L45.1,49.6l4.9,30.3L33.2,93.7L7,86.7L24.2,22.5z"/>
+	</defs>
+	<clipPath id="路径_4168_2_">
+		<use xlink:href="#路径_4168_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g class="st8">
+		<circle class="st1" cx="53.9" cy="41.7" r="21"/>
+	</g>
+</g>
+<g>
+	<path class="st9" d="M53.9,62.7c-1.8,0-3.7-0.2-5.5-0.7c-5.4-1.5-9.9-4.9-12.8-9.8s-3.5-10.5-2.1-15.9c1.5-5.4,4.9-9.9,9.8-12.8
+		c4.9-2.8,10.5-3.5,15.9-2.1c5.4,1.5,9.9,4.9,12.8,9.8s3.5,10.5,2.1,15.9c-1.5,5.4-4.9,9.9-9.8,12.8C61.1,61.7,57.5,62.7,53.9,62.7z
+		 M53.8,26.7c-2.5,0-5.1,0.6-7.5,2c-7.2,4.1-9.6,13.3-5.5,20.5c2,3.5,5.2,6,9.1,7c3.9,1,7.9,0.5,11.4-1.5c7.2-4.1,9.6-13.3,5.5-20.5
+		C64.1,29.4,59,26.7,53.8,26.7z"/>
+</g>
+</svg>

src/main/resources/static/img/order/icon-logsitics.svg

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1920 1080" style="enable-background:new 0 0 1920 1080;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E2E2E2;}
+	.st1{fill:#F77552;}
+	.st2{fill:#333333;}
+	.st3{fill:#E15616;}
+	.st4{fill:#A8A8A8;}
+	.st5{opacity:0.1;fill:#E15616;enable-background:new    ;}
+	.st6{fill:#3ACC6C;}
+	.st7{fill:#535461;}
+	.st8{fill:#44EA76;}
+	.st9{fill:#F5F5F5;}
+	.st10{opacity:0.9;fill:#E15616;}
+	.st11{fill:#E15616;enable-background:new    ;}
+	.st12{fill:#E8E3E2;}
+	.st13{fill:#2F2E41;}
+	.st14{fill:#FFFFFF;}
+	.st15{opacity:0.1;enable-background:new    ;}
+	.st16{opacity:0.2;enable-background:new    ;}
+	.st17{fill:#FFD037;}
+	.st18{fill:#65617D;}
+	.st19{fill:#9D9CB5;}
+</style>
+<path class="st0" d="M1446,528.6c0,0-29.1-181-115.6-133.2c-86.5,47.8-203.7,22.8-216.2,12.5c-12.5-10.2-166.3-97.9-212.1-2.3
+	s-25.8,123-25.8,123H1446z"/>
+<path class="st1" d="M1287.5,337.6c-2.2-17,4.6-34.4,0.6-51.1c-3.1-12.8-12.3-23.6-15.3-36.4c-4.4-19.1,5.7-38.6,18.7-53.3
+	c8.9-10.1,20.1-19.2,33.4-21.1c8.2-1.2,16.7,0.6,24.3,4c15.6,7,27.6,20.2,33.1,36.4c1.8,5.2,2.8,10.7,4.9,15.7
+	c3.7,8.7,10.5,15.7,14.8,24.2c5.7,11.6,6.3,25.1,1.5,37.1c-4.9,12.3-15.2,22.5-16.7,35.6c-1.1,9.5,2.4,19.8-2.2,28.1
+	c-3.5,6.3-10.6,9.5-17.4,11.8c-15.8,5.5-37.8,14.4-53.6,5.9C1299.8,367.3,1289.5,353.3,1287.5,337.6z"/>
+<g>
+	<g>
+		<path class="st2" d="M1332.3,351.1l-1.1-2.8c8.8-3.5,23.4-10.5,25.4-14c2.3-4.1,5.7-27.2,6.8-35.8l3,0.4
+			c-0.4,3.2-4.2,31.5-7.2,36.8C1356.1,341.4,1334.7,350.1,1332.3,351.1z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="1330" y="291.2" class="st2" width="3" height="201.9"/>
+	</g>
+</g>
+<path class="st3" d="M1167.6,290.1c-2.5-20,5.4-40.5,0.7-60.1c-3.6-15.1-14.5-27.7-18-42.8c-5.2-22.4,6.7-45.4,22-62.6
+	c10.5-11.9,23.6-22.6,39.3-24.8c9.7-1.4,19.6,0.8,28.6,4.7c18.4,8.2,32.5,23.7,39,42.8c2.1,6.1,3.3,12.5,5.8,18.5
+	c4.4,10.2,12.4,18.5,17.4,28.4c6.7,13.6,7.4,29.5,1.8,43.6c-5.8,14.4-17.9,26.5-19.7,41.9c-1.3,11.1,2.9,23.3-2.5,33.1
+	c-4.1,7.4-12.5,11.1-20.5,13.9c-18.5,6.5-44.4,17-63,7C1182,325,1170,308.5,1167.6,290.1z"/>
+<g>
+	<g>
+		<path class="st2" d="M1220.8,297.3l-1.1-2.8c9.3-3.8,34.3-14.9,37.6-20.8c3.3-5.9,8.1-37.1,10.1-52.8l3,0.4
+			c-0.2,1.9-6.1,45.9-10.5,53.8C1255.5,283.1,1224.3,295.9,1220.8,297.3z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="1218.5" y="210" class="st2" width="3" height="296.5"/>
+	</g>
+</g>
+<path class="st4" d="M1382,540c0,0-34.1-152.1-62.4-102.9s-126.4,26.8-144.7,24.6c-18.3-2.2-252.8,78.3-252.8,78.3L1382,540z"/>
+<ellipse class="st5" cx="921.8" cy="687.8" rx="659.8" ry="213.2"/>
+<path class="st6" d="M1381.2,473.1c0,0,19.4,19.4,8.5,48.2c-11,28.8,18.8,76.8,18.8,76.8l-0.9-0.2c-39.9-7-59.7-52.7-37.5-86.5
+	C1378.3,498.8,1385,484,1381.2,473.1z"/>
+<g>
+	<path class="st7" d="M1408.3,598.6c-13.4-3.6-21.2-16.3-25.4-26.3c-8.1-19.3-9-44-2.1-56.2c10.7-19,0.1-42.5,0-42.8l0.9-0.4
+		c0.1,0.2,11,24.3,0,43.7c-6.7,11.8-5.7,36.6,2.2,55.4c5.8,13.8,14.6,22.9,24.8,25.7L1408.3,598.6z"/>
+</g>
+<path class="st8" d="M1346.6,551.7c0,0,22.2-3.5,24.2,16.3s42.6,22.6,42.6,22.6l-0.8,0.5c-33.5,22-65.6,14-60.7-15.2
+	C1353.7,565.1,1353.6,554.2,1346.6,551.7z"/>
+<g>
+	<path class="st7" d="M1393.8,596.6c-6.9,0-13.6-1.9-19.7-5.8c-8.1-5.1-12.9-12.9-12.3-19.8c1.4-15-14.7-18.7-15.4-18.9l0.2-1
+		c0.2,0,17.6,4.1,16.2,20c-0.6,6.5,4,13.9,11.8,18.8c11.6,7.4,26,7.5,38.4,0.2l0.5,0.9C1407.4,594.7,1400.6,596.6,1393.8,596.6z"/>
+</g>
+<polygon class="st9" points="1304.5,677.8 1256.6,674.3 627.3,674.3 627.3,582.1 1304.5,582.1 "/>
+<path class="st10" d="M1329.9,537.8v140.7l-46.2-0.6c0-1,0.1-2,0.1-2.9c0-50.3-40.7-91-91-91s-91,40.7-91,91l0,0c0,0.2,0,0.4,0,0.6
+	l-46.1-0.6H817c0-3.3-0.2-6.7-0.6-10c-0.2-1.6-0.4-3.2-0.7-4.7c-0.6-4-1.6-8-2.7-11.9c-0.5-1.6-1-3.2-1.6-4.7
+	c-1.5-4.1-3.3-8-5.3-11.8c-0.9-1.6-1.8-3.2-2.7-4.7c-2.6-4.2-5.5-8.1-8.7-11.8c-1.4-1.6-2.9-3.2-4.4-4.7
+	c-35.5-35.5-93.1-35.5-128.6,0c-1.5,1.5-3,3.1-4.4,4.7c-3.2,3.7-6.1,7.7-8.7,11.8c-1,1.5-1.9,3.1-2.7,4.7c-2.1,3.8-3.8,7.8-5.3,11.8
+	c-0.6,1.6-1.1,3.1-1.6,4.7c-1.2,3.9-2.1,7.8-2.7,11.8c-0.3,1.6-0.5,3.1-0.6,4.7c-0.4,3.3-0.6,6.7-0.6,10h-91V364.1h641.8l63.7,138.8
+	l79.1,34.3L1329.9,537.8z"/>
+<polygon class="st11" points="1055.1,674.3 986.6,674.3 986.6,363.5 1121.3,363.5 1121.3,578.6 "/>
+<rect x="646" y="393" class="st12" width="231" height="136"/>
+<path class="st12" d="M1022.1,386.5h67.3c8.8,0,16,7.2,16,16v105.1c0,8.8-7.2,16-16,16h-67.3c-8.8,0-16-7.2-16-16V402.5
+	C1006.1,393.7,1013.2,386.5,1022.1,386.5z"/>
+<rect x="1086.4" y="535.4" class="st13" width="13" height="28.4"/>
+<path class="st12" d="M1145.5,406v97.9c0,3,2.5,5.5,5.5,5.5l0,0h60.3c3,0,5.5-2.5,5.5-5.5c0-1-0.3-2-0.8-2.9l-60.3-97.9
+	c-1.6-2.6-5-3.4-7.6-1.8C1146.5,402.3,1145.5,404.1,1145.5,406z"/>
+<polygon class="st14" points="1038,386.5 1006.1,414.9 1006.1,429.7 1051.6,386.5 "/>
+<polygon class="st14" points="1006.1,446.8 1006.1,463.9 1081.7,386.5 1066.9,386.5 "/>
+<polygon class="st14" points="677.9,393 646,421.4 646,436.1 691.5,393 "/>
+<polygon class="st14" points="646,453.3 646,470.4 721.6,393 706.9,393 "/>
+<polygon class="st14" points="1165.5,419 1145.5,446.8 1145.5,457.4 1172.1,429.7 "/>
+<polygon class="st14" points="1181.2,446.8 1145.5,477.2 1145.5,485.8 1189.2,457.4 "/>
+<circle class="st13" cx="726" cy="674.9" r="63.8"/>
+<circle class="st14" cx="726" cy="674.9" r="35.5"/>
+<circle class="st13" cx="725.4" cy="674.3" r="9.5"/>
+<circle class="st13" cx="1192.8" cy="674.9" r="63.8"/>
+<circle class="st14" cx="1192.8" cy="674.9" r="35.5"/>
+<circle class="st13" cx="1193.4" cy="674.3" r="9.5"/>
+<rect x="543.4" y="577.4" class="st15" width="443.2" height="4.7"/>
+<polyline class="st15" points="1321.6,582.1 1118.9,582.1 1121.3,578.6 1121.3,577.4 1321.6,577.4 "/>
+<polyline class="st15" points="1321.6,562 1121.3,562 1121.3,557.3 1321.6,557.3 "/>
+<polyline class="st15" points="1321.6,541.9 1121.3,541.9 1121.3,537.2 1320.3,537.2 "/>
+<path class="st15" d="M684.3,593.9c-2.8,1.4-5.5,3-8.1,4.7H543.4v-4.7H684.3z"/>
+<path class="st15" d="M986.6,593.9v4.7H775.7c-2.6-1.7-5.3-3.3-8.1-4.7H986.6z"/>
+<path class="st15" d="M661.7,610.5c-1.5,1.5-3,3.1-4.4,4.7H543.4v-4.7H661.7z"/>
+<path class="st15" d="M986.6,610.5v4.7H794.7c-1.4-1.6-2.9-3.2-4.4-4.7H986.6z"/>
+<path class="st15" d="M648.5,627c-1,1.5-1.9,3.1-2.7,4.7H543.4V627H648.5z"/>
+<path class="st15" d="M986.6,627v4.7H806.1c-0.9-1.6-1.8-3.2-2.7-4.7H986.6z"/>
+<path class="st15" d="M640.5,643.6c-0.6,1.6-1.1,3.1-1.6,4.7h-24.6v-4.7H640.5z"/>
+<path class="st15" d="M986.6,643.6v4.7H813c-0.5-1.6-1-3.2-1.6-4.7H986.6z"/>
+<path class="st15" d="M636.2,660.1c-0.3,1.6-0.5,3.1-0.7,4.7h-21.2v-4.7H636.2z"/>
+<path class="st15" d="M986.6,660.1v4.7H816.4c-0.2-1.6-0.4-3.2-0.7-4.7H986.6z"/>
+<rect x="620.8" y="549.6" class="st15" width="290.8" height="3.6"/>
+<path class="st4" d="M1431.3,594.4c0,0-13.9-2.8-17.7-6.5c-3.7-3.7-20.4-10.2-22.3-5.6c-1.9,4.6-25.1,20.4-9.3,23.2
+	c15.8,2.8,37.2,3.7,41.8,1.9C1428.5,605.6,1431.3,594.4,1431.3,594.4z"/>
+<path class="st16" d="M1382.1,603.8c15.8,2.8,37.2,3.7,41.8,1.9c3.5-1.4,6-8.2,7-11.4l0.5,0.1c0,0-2.8,11.2-7.4,13
+	c-4.6,1.9-26,0.9-41.8-1.9c-4.6-0.8-5.9-2.7-5.4-5.1C1377.1,602,1378.7,603.2,1382.1,603.8z"/>
+<g>
+	<path class="st7" d="M1485,733.7l-1.9-0.6c0.1-0.4,12.9-44.9-2.4-77.2c-6.7-13.9-8.8-29.9-5.8-45.1c1.5-7.2,3.6-14.3,6.3-21.1
+		l1.9,0.8c-2.7,6.7-4.8,13.6-6.2,20.7c-2.9,14.7-0.9,30.3,5.7,43.8C1498.1,688,1485.1,733.2,1485,733.7z"/>
+</g>
+<path class="st3" d="M1472.3,569.3c0,5.5,10,21.4,10,21.4s10-16,10-21.4c-0.5-5.5-5.4-9.5-10.9-9
+	C1476.6,560.7,1472.9,564.5,1472.3,569.3L1472.3,569.3z"/>
+<path class="st3" d="M1455.9,599.8c3,4.6,20,12.6,20,12.6s-0.3-18.8-3.3-23.4c-2.6-4.9-8.6-6.8-13.5-4.2c-4.9,2.6-6.8,8.6-4.2,13.5
+	C1455.1,598.8,1455.5,599.3,1455.9,599.8L1455.9,599.8z"/>
+<path class="st3" d="M1456.6,651.8c4.9,2.5,23.6,0.8,23.6,0.8s-9.8-16.1-14.7-18.5c-4.7-2.9-10.9-1.4-13.8,3.3s-1.4,10.9,3.3,13.8
+	C1455.5,651.3,1456,651.6,1456.6,651.8L1456.6,651.8z"/>
+<path class="st3" d="M1466,691.1c4.4,3.3,23.2,4.8,23.2,4.8s-6.9-17.5-11.3-20.8c-4.7-2.8-10.9-1.3-13.7,3.4
+	C1461.7,682.6,1462.4,687.8,1466,691.1L1466,691.1z"/>
+<path class="st3" d="M1496.7,613.4c-3.9,3.8-22.3,7.8-22.3,7.8s4.5-18.3,8.4-22.1c3.6-4.2,9.9-4.7,14.1-1.1
+	c4.2,3.6,4.7,9.9,1.1,14.1C1497.7,612.6,1497.2,613,1496.7,613.4z"/>
+<path class="st3" d="M1507.2,659.5c-4.9,2.5-23.6,0.8-23.6,0.8s9.8-16.1,14.7-18.5c5.1-2.1,10.9,0.4,13,5.5
+	C1513.1,651.7,1511.4,656.9,1507.2,659.5L1507.2,659.5z"/>
+<path class="st3" d="M1511.2,705.6c-4.4,3.3-23.2,4.8-23.2,4.8s6.9-17.5,11.3-20.8c4.7-2.8,10.9-1.3,13.7,3.4
+	C1515.5,697.1,1514.7,702.4,1511.2,705.6L1511.2,705.6z"/>
+<path class="st4" d="M1512.7,729c0,0-24.2-4.8-30.6-11.3s-35.4-17.7-38.6-9.7s-43.5,35.4-16.1,40.3s64.4,6.4,72.4,3.2
+	S1512.7,729,1512.7,729z"/>
+<path class="st16" d="M1427.4,745.3c27.4,4.8,64.4,6.4,72.4,3.2c6.1-2.5,10.4-14.2,12.1-19.7l0.8,0.2c0,0-4.8,19.3-12.9,22.5
+	s-45.1,1.6-72.4-3.2c-7.9-1.4-10.2-4.7-9.3-8.8C1418.7,742.2,1421.5,744.3,1427.4,745.3z"/>
+<g>
+	<path class="st7" d="M447.7,724.7l-1.9-0.6c0.2-0.7,20.8-72.1-3.9-124.1c-10.7-22.2-14-47.7-9.3-71.9c2.3-11.5,5.7-22.8,10.1-33.6
+		l1.9,0.8c-4.3,10.7-7.7,21.9-10,33.3c-4.7,23.7-1.4,48.8,9.1,70.6C468.7,651.8,448,724,447.7,724.7z"/>
+</g>
+<path class="st3" d="M428.1,461.5c0,8.8,16,34.4,16,34.4s16-25.6,16-34.4c-0.8-8.8-8.7-15.3-17.5-14.4c-7.6,0.7-13.7,6.8-14.4,14.4
+	H428.1z"/>
+<path class="st3" d="M401.7,510.3c4.8,7.4,32,20.2,32,20.2s-0.5-30.1-5.3-37.5c-4.1-7.8-13.8-10.9-21.6-6.8
+	c-7.8,4.1-10.9,13.8-6.8,21.6C400.5,508.7,401.1,509.5,401.7,510.3L401.7,510.3z"/>
+<path class="st3" d="M402.9,593.7c7.9,4,37.9,1.2,37.9,1.2s-15.6-25.7-23.5-29.7c-7.5-4.7-17.4-2.3-22.1,5.2s-2.3,17.4,5.2,22.1
+	C401.1,593,401.9,593.4,402.9,593.7L402.9,593.7z"/>
+<path class="st3" d="M417.9,656.6c7.1,5.2,37.1,7.6,37.1,7.6s-11.1-28-18.1-33.3c-7.6-4.5-17.4-2.1-22,5.5
+	C411,643,412.3,651.5,417.9,656.6L417.9,656.6z"/>
+<path class="st3" d="M467.2,532.2c-6.3,6.1-35.8,12.5-35.8,12.5s7.2-29.2,13.5-35.4c5.7-6.7,15.9-7.5,22.6-1.8
+	c6.7,5.7,7.5,15.9,1.8,22.6C468.7,530.9,468,531.6,467.2,532.2z"/>
+<path class="st3" d="M484,606c-7.9,4-37.9,1.2-37.9,1.2s15.6-25.7,23.5-29.7c8.2-3.3,17.5,0.7,20.9,8.9
+	C493.4,593.6,490.7,601.9,484,606L484,606z"/>
+<path class="st3" d="M490.4,679.9c-7.1,5.2-37.1,7.6-37.1,7.6s11.1-28,18.1-33.3c7.6-4.5,17.4-2.1,22,5.5
+	C497.3,666.4,496,674.8,490.4,679.9L490.4,679.9z"/>
+<path class="st4" d="M492.9,717.4c0,0-38.7-7.7-49-18.1c-10.3-10.3-56.8-28.4-61.9-15.5c-5.2,12.9-69.7,56.8-25.8,64.5
+	c43.9,7.7,103.2,10.3,116.1,5.2C485.1,748.4,492.9,717.4,492.9,717.4z"/>
+<path class="st16" d="M356.1,743.5c43.9,7.7,103.2,10.3,116.1,5.2c9.8-3.9,16.6-22.8,19.3-31.6l1.3,0.3c0,0-7.7,31-20.6,36.1
+	c-12.9,5.2-72.2,2.6-116.1-5.2c-12.7-2.2-16.3-7.5-14.9-14.1C342.2,738.6,346.7,741.9,356.1,743.5z"/>
+<g>
+	<path class="st6" d="M584,689.6c0,0,5.9,7.8-2.7,19.5s-15.9,21.7-13,29c0,0,13.1-21.8,23.8-22.1S595.8,702.7,584,689.6z"/>
+	<path class="st15" d="M584,689.6c0.5,0.8,0.9,1.6,1.2,2.4c10.4,12.2,16,23.7,5.9,24c-9.3,0.3-20.5,16.9-23.2,21.2
+		c0.1,0.3,0.2,0.7,0.3,1c0,0,13.1-21.8,23.8-22.1C602.7,715.8,595.8,702.7,584,689.6z"/>
+	<path class="st17" d="M595.1,699.5c0,2.7-0.3,5-0.7,5c-0.4,0-0.7-2.2-0.7-5s0.4-1.5,0.8-1.5S595.1,696.8,595.1,699.5z"/>
+	<path class="st17" d="M598.9,702.8c-2.4,1.3-4.5,2.1-4.7,1.8c-0.2-0.3,1.6-1.7,4-3c2.4-1.3,1.4-0.4,1.6,0S601.3,701.5,598.9,702.8z
+		"/>
+	<path class="st6" d="M552.6,689.6c0,0-5.9,7.8,2.8,19.5c8.7,11.7,15.9,21.7,13,29c0,0-13.1-21.8-23.8-22.1S540.9,702.7,552.6,689.6
+		z"/>
+	<path class="st15" d="M552.6,689.6c-0.5,0.8-0.9,1.6-1.2,2.4c-10.4,12.2-16,23.7-5.9,24c9.3,0.3,20.5,16.9,23.2,21.2
+		c-0.1,0.3-0.2,0.7-0.3,1c0,0-13.1-21.9-23.8-22.2S540.9,702.7,552.6,689.6z"/>
+	<path class="st17" d="M541.6,699.5c0,2.7,0.3,5,0.7,5c0.4,0,0.7-2.2,0.7-5s-0.4-1.5-0.8-1.5C541.8,698,541.6,696.8,541.6,699.5z"/>
+	<path class="st17" d="M537.7,702.8c2.4,1.3,4.5,2.1,4.7,1.8s-1.6-1.7-4-3c-2.4-1.3-1.5-0.4-1.6,0S535.4,701.5,537.7,702.8z"/>
+	<ellipse class="st5" cx="568.3" cy="788.1" rx="62.2" ry="9.5"/>
+	<path class="st18" d="M600.3,727.6L600,730l-0.4,3.4l-0.2,1.4l-0.4,3.4l-0.2,1.4l-0.4,3.4l-4.8,39c-0.4,3.5-6.1,6.2-13,6.2h-24.7
+		c-6.9,0-12.6-2.7-13-6.2l-4.8-39l-0.4-3.4l-0.2-1.4l-0.4-3.4l-0.2-1.4l-0.4-3.4l-0.3-2.4c-0.2-2,2.8-3.6,6.7-3.6h50.6
+		C597.5,724,600.6,725.6,600.3,727.6z"/>
+	<polygon class="st19" points="600,730 599.6,733.5 537,733.5 536.6,730 	"/>
+	<polygon class="st19" points="599.4,734.9 599,738.3 537.6,738.3 537.2,734.9 	"/>
+	<polygon class="st19" points="598.8,739.8 598.4,743.2 538.2,743.2 537.8,739.8 	"/>
+</g>
+</svg>

src/main/resources/static/img/order/icon-recod.svg

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="_x35_9904e4f-d552-4f96-882a-6a294bb87dd0"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1155.4 796.5"
+	 style="enable-background:new 0 0 1155.4 796.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.1;fill:#E15616;enable-background:new    ;}
+	.st1{fill:#E15616;}
+	.st2{fill:#444053;}
+	.st3{opacity:0.7;}
+	.st4{opacity:0.1;enable-background:new    ;}
+	.st5{fill:#FFFFFF;}
+	.st6{opacity:0.3;fill:#E15616;enable-background:new    ;}
+	.st7{opacity:0.3;enable-background:new    ;}
+	.st8{fill:#FFB8B8;}
+	.st9{fill:#2F2E41;}
+	.st10{fill:#FFBDBD;}
+	.st11{fill:#65617D;}
+	.st12{fill:none;}
+	.st13{opacity:0.1;}
+	.st14{fill:#F7CDDD;}
+	.st15{fill:url(#SVGID_1_);}
+	.st16{fill:url(#SVGID_2_);}
+	.st17{fill:url(#SVGID_3_);}
+	.st18{fill:#5C5C8E;}
+	.st19{opacity:0.1;fill:#FFFFFF;enable-background:new    ;}
+	.st20{fill:#EFC8C4;}
+	.st21{fill:#727A9C;}
+	.st22{fill:#3ACC6C;}
+	.st23{fill:#FFD037;}
+	.st24{fill:#9D9CB5;}
+</style>
+<title>to do list</title>
+<path class="st0" d="M356.8,40.2C396,4.9,457.5-2.3,513.5,0.6c175.9,8.8,334.7,94.6,472.1,191.6c49.7,35.1,98.7,73,131,121.3
+	c65.7,98.5,46.2,234.8-45.2,315.9c-31.1,27.6-68.8,48.8-107.5,67.5c-68.8,33.3-143,60.1-221.1,67.7c-55.7,5.4-112,1-167.4-6.6
+	c-154.6-21.2-306.5-68-433.7-148.1C86,574.8,33.4,531.1,10.4,474.2S2.1,345.3,59.1,311.7c23.6-13.9,51.7-20.2,79.3-26.1
+	c40.6-8.7,81.9-17.3,118.5-34.9c37.9-18.2,82.7-53.5,75.2-93.9C324.1,113.5,317.6,75.4,356.8,40.2z"/>
+<path class="st1" d="M256.7,447.8c0,0,10.4-7.4,21.1-2.8c0,0-3,6.4-16.4,6.3L256.7,447.8z"/>
+<path class="st1" d="M255.4,448.2c0,0-2.8,12.5,5.7,20.5c0,0,4.7-5.3-0.6-17.5L255.4,448.2z"/>
+<path class="st1" d="M241.7,436.9c0,0,0.4-10.5,24.2-7.9c0,0,0.4,6.8-7.8,10.3C249.9,442.8,246,440.2,241.7,436.9z"/>
+<path class="st1" d="M240.2,436.9c0,0-9.9,3.6-0.1,25.5c0,0,6.5-1.7,7.4-10.6S244.7,439.9,240.2,436.9z"/>
+<path class="st1" d="M226.3,422.5c0,0-2-17.2,22.2-16.4c0,0,2.3,15.5-17.8,20.3L226.3,422.5z"/>
+<path class="st1" d="M209.5,403.7c0,0,2.6-19.7,27-14.8c0,0,0.7,16.9-22.8,19.3L209.5,403.7z"/>
+<path class="st1" d="M197.1,384c0,0,4.8-19.3,29-14.5c0,0-5,17.4-27.3,17.9L197.1,384z"/>
+<path class="st1" d="M185.2,364.8c0,0,4.7-20,28-14.9c0,0-7,19.1-26.4,18.2L185.2,364.8z"/>
+<path class="st1" d="M177.4,346.4c0,0,3.3-24.3,25-19.8c0,0-5.4,22.2-23.3,23.3L177.4,346.4z"/>
+<path class="st1" d="M169.8,324c0,0,4.1-24.5,26.1-18.3c0,0-7.7,23.4-24.5,21.6L169.8,324z"/>
+<path class="st1" d="M164.8,303.2c0,0,7-24.7,23.9-24.6c0,0-7.1,26-22.3,29.5L164.8,303.2z"/>
+<path class="st1" d="M161.4,282.8c0,0,7.5-29.7,21.4-27.9c0,0-5.1,22.6-20.7,32.5L161.4,282.8z"/>
+<path class="st1" d="M159,258.4c0,0,7.2-24.7,20.7-26.2c0,0-4.6,24.2-20.1,32.6L159,258.4z"/>
+<path class="st1" d="M156.5,235.7c0,0,9.2-24.9,18.1-25.8c0,0-3.5,24.3-17.1,29.7L156.5,235.7z"/>
+<path class="st1" d="M154.5,214.5c0,0,5.2-26.8,14.1-29.4c0,0-0.4,21.8-13.1,31.3L154.5,214.5z"/>
+<path class="st1" d="M150.1,186.9c0,0,5.7-21.4,12.9-24.9c0,0-0.5,25-11,30L150.1,186.9z"/>
+<path class="st1" d="M146.6,168.7l-2.8-37.3c0,0,14.6,27.7,4,43.8L146.6,168.7z"/>
+<path class="st1" d="M134.7,132c0,0-10.8-26.9-13.2-28.3c0,0,19.8,17,18.8,39.8L134.7,132z"/>
+<path class="st1" d="M225.6,422.4c0,0-17.3-1.6-15.8,22.6c0,0,15.6,1.9,19.9-18.3L225.6,422.4z"/>
+<path class="st1" d="M208.7,403.1c0,0-19.8,0.7-17.3,25.4c0,0,16.8,2.3,21.4-20.9L208.7,403.1z"/>
+<path class="st1" d="M196.9,385.6c0,0-18.3-7.8-29,14.5c0,0,16.9,6.4,30.7-11L196.9,385.6z"/>
+<path class="st1" d="M184.8,365c0,0-18.8-8.3-28.8,13.4c0,0,19.4,5.9,30.4-10.1L184.8,365z"/>
+<path class="st1" d="M177.6,346.9c0,0-18.4-16.3-31.9,1.4c0,0,18.6,13.2,32.8,2.3L177.6,346.9z"/>
+<path class="st1" d="M170.8,323.4c0,0-18.5-16.6-31.9,2c0,0,20.6,13.5,32.6,1.6L170.8,323.4z"/>
+<path class="st1" d="M166.6,302.4c0,0-14.6-21.1-30.6-15.7c0,0,15.1,22.4,30.6,20.8L166.6,302.4z"/>
+<path class="st1" d="M161.8,282.7c0,0-14.9-26.7-27.8-21.5c0,0,10.8,20.6,28.3,26L161.8,282.7z"/>
+<path class="st1" d="M159.9,257c0,0-15.1-20.9-28.3-17.8c0,0,12.5,21.3,29.9,23.9L159.9,257z"/>
+<path class="st1" d="M157.9,235.1c0,0-11.9-23.6-20.9-23.5c0,0,6.2,23.7,20.3,27.6L157.9,235.1z"/>
+<path class="st1" d="M154.9,214c0,0-13.2-23.9-22.4-23.6c0,0,7.1,20.6,22.1,25.8L154.9,214z"/>
+<path class="st1" d="M152.1,188.2c0,0-9.9-19.8-17.6-21.8c0,0,5.5,24.4,16.8,27.2L152.1,188.2z"/>
+<path class="st1" d="M145.5,168.1l-21.7-30.4c0,0,6.4,30.6,24.9,36.3L145.5,168.1z"/>
+<path class="st1" d="M130.1,134.7c0,0-24.4-15.5-25.4-18.2c0,0,13,22.6,35.7,25.8L130.1,134.7z"/>
+<path class="st1" d="M128.4,127.4c0,0-28.4-25.3-35.3-24.9c0,0,22.6,0.2,36,23.5L128.4,127.4z"/>
+<path class="st2" d="M152,192.2l-1,0.2c-6.7-40.1-15.1-63.5-23.7-66.2l0.3-1C136.7,128,145.2,151.2,152,192.2z"/>
+<path class="st2" d="M163.3,288.1l-1.5,0.2c-0.5-3.7-0.9-7.6-1.2-11.4c-2.7-33.2-6.1-63.7-9.9-86.6l0.8-1.1
+	c3.8,22.9,7.9,54.3,10.6,87.6C162.4,280.6,162.8,284.4,163.3,288.1z"/>
+<path class="st2" d="M285.5,465.9c-0.3-0.1-27.2-10.9-55.8-38.1c-16.7-15.9-30.9-34.4-41.8-54.7c-13.7-25.4-22.7-57-26.5-87.8
+	l1.6,0.7c8.5,69.2,41.9,115.4,68,140.3c28.3,26.9,55,37.7,55.3,37.8L285.5,465.9z"/>
+<g class="st3">
+	<path class="st1" d="M298.5,384.4c0,0,12.1-4,21,3.6c0,0-4.8,5.2-17.5,1.1L298.5,384.4z"/>
+	<path class="st1" d="M297.2,384.5c0,0-6.3,11.1-0.7,21.3c0,0,6-3.6,4.6-16.9L297.2,384.5z"/>
+	<path class="st1" d="M287.5,369.6c0,0,3.5-9.9,25.5-0.4c0,0-1.6,6.6-10.5,7.5S290.6,374,287.5,369.6z"/>
+	<path class="st1" d="M286.1,369.1c0,0-10.5,0.5-7.7,24.3c0,0,6.8,0.3,10.2-7.9S289.4,373.4,286.1,369.1z"/>
+	<path class="st1" d="M277,351.2c0,0,3.2-17,26.1-9c0,0-2.4,15.5-23,14.1L277,351.2z"/>
+	<path class="st1" d="M266.6,328.2c0,0,8.3-18,30.1-6.1c0,0-4.3,16.4-27.5,11.6L266.6,328.2z"/>
+	<path class="st1" d="M260.6,305.8c0,0,10.4-17,32-5.2c0,0-10,15.1-31.4,9L260.6,305.8z"/>
+	<path class="st1" d="M255,283.9c0,0,10.4-17.7,31.2-5.9c0,0-12.4,16.1-30.6,9.6L255,283.9z"/>
+	<path class="st1" d="M253,264c0,0,10.3-22.3,29.8-11.5c0,0-11.8,19.6-29.2,15.3L253,264z"/>
+	<path class="st1" d="M252.4,240.4c0,0,11.2-22.2,30.4-9.7c0,0-14.3,20-29.8,13.3L252.4,240.4z"/>
+	<path class="st1" d="M253.9,219.1c0,0,14-21.5,30.2-16.4c0,0-14.6,22.7-30.1,21.5L253.9,219.1z"/>
+	<path class="st1" d="M256.7,198.6c0,0,16-26.1,28.7-20.3c0,0-11.6,20.1-29.4,24.8L256.7,198.6z"/>
+	<path class="st1" d="M261.6,174.6c0,0,14.2-21.5,27.6-18.9c0,0-11.6,21.8-28.9,25.1L261.6,174.6z"/>
+	<path class="st1" d="M266,152.1c0,0,16.1-21,25-19.2c0,0-10.5,22.1-25.1,23.3L266,152.1z"/>
+	<path class="st1" d="M270.4,131.3c0,0,12.9-24,22.2-23.8c0,0-6.9,20.7-21.8,26L270.4,131.3z"/>
+	<path class="st1" d="M274.4,103.6c0,0,11.9-18.7,19.7-20c0,0-7.9,23.7-19.4,25.4L274.4,103.6z"/>
+	<path class="st1" d="M276.5,85.2l8.5-36.4c0,0,5.7,30.8-9.2,43L276.5,85.2z"/>
+	<path class="st1" d="M276,46.7c0,0-2.3-28.9-4.2-31c0,0,13.9,22.1,6.1,43.6L276,46.7z"/>
+	<path class="st1" d="M276.4,351c0,0-16-6.6-21.8,16.9c0,0,14.3,6.5,24.4-11.6L276.4,351z"/>
+	<path class="st1" d="M266,327.4c0,0-19.1-5.2-24.1,19.2c0,0,15.3,7.2,26.6-13.6L266,327.4z"/>
+	<path class="st1" d="M260,307.3c0,0-15.2-12.9-32,5.2c0,0,14.2,11.1,32.6-1.4L260,307.3z"/>
+	<path class="st1" d="M254.6,284c0,0-15.5-13.5-31.5,4.3c0,0,16.8,11.4,32-0.6L254.6,284z"/>
+	<path class="st1" d="M253.1,264.6c0,0-12.7-21-30.9-8.1c0,0,13.9,18.2,30.7,12L253.1,264.6z"/>
+	<path class="st1" d="M253.5,240.1c0,0-12.7-21.4-31-7.5c0,0,15.6,19,30.7,11.2L253.5,240.1z"/>
+	<path class="st1" d="M255.8,218.9c0,0-7.6-24.5-24.5-24c0,0,7.8,25.9,23.1,28.9L255.8,218.9z"/>
+	<path class="st1" d="M257.1,198.6c0,0-6.3-29.9-20.2-28.8c0,0,4.2,22.8,19.3,33.3L257.1,198.6z"/>
+	<path class="st1" d="M262.9,173.5c0,0-8.2-24.4-21.7-25.4c0,0,5.6,24.1,21.4,31.8L262.9,173.5z"/>
+	<path class="st1" d="M267.5,152c0,0-4.4-26.1-13-28.7c0,0-1.1,24.5,11.2,32.4L267.5,152z"/>
+	<path class="st1" d="M271,130.9c0,0-5.5-26.8-14.4-29.2c0,0,0.6,21.8,13.4,31.2L271,130.9z"/>
+	<path class="st1" d="M275.9,105.6c0,0-3.6-21.9-10.3-26.1c0,0-2,24.9,8,31L275.9,105.6z"/>
+	<path class="st1" d="M275.6,84.2l-11.7-35.5c0,0-3,31.1,13,42.1L275.6,84.2z"/>
+	<path class="st1" d="M270.8,47.9c0,0-18.7-22.1-18.9-24.9c0,0,5.7,25.4,26.4,35.2L270.8,47.9z"/>
+	<path class="st1" d="M271.4,40.4c0,0-19.6-32.5-26.3-34.3c0,0,21.5,6.9,27.3,33.2L271.4,40.4z"/>
+	<path class="st2" d="M274.6,109.2l-1-0.1c5.5-40.2,4.5-65.2-2.9-70.2l0.6-0.8C279.2,43.4,280.3,68.1,274.6,109.2z"/>
+	<path class="st2" d="M256.8,204.2l-1.5-0.3c0.7-3.7,1.4-7.5,2.3-11.2c7.3-32.6,13.1-62.7,16.3-85.6l1.1-0.8
+		c-3.2,23-8.6,54.1-15.9,86.8C258.3,196.7,257.5,200.5,256.8,204.2z"/>
+	<path class="st2" d="M320.7,410.3c-0.2-0.2-22.7-18.5-42-53c-11.3-20.2-19.2-42-23.7-64.7c-5.5-28.3-4.7-61.1,0.8-91.7l1.3,1.1
+		c-12.5,68.6,5.7,122.7,23.2,154.2c19,34.1,41.3,52.3,41.5,52.5L320.7,410.3z"/>
+</g>
+<path class="st1" d="M1014.4,754.1c0,0-42.3-2.5-37.3,27.1c0,0-1,5.2,3.8,7.6c0,0,0.1-2.2,4.3-1.5c1.5,0.3,3.1,0.3,4.6,0.2
+	c2.1-0.1,4-1,5.6-2.3l0,0c0,0,11.9-4.9,16.5-24.3c0,0,3.4-4.2,3.3-5.3l-7.1,3c0,0,2.4,5.2,0.5,9.4c0,0-0.2-9.2-1.6-9
+	c-0.3,0-3.7,1.8-3.7,1.8s4.2,9,1,15.5c0,0,1.2-11-2.3-14.8l-5,2.9c0,0,4.9,9.3,1.6,16.8c0,0,0.8-11.6-2.6-16.1l-4.5,3.5
+	c0,0,4.6,9.1,1.8,15.4c0,0-0.4-13.5-2.8-14.5c0,0-4,3.5-4.6,5c0,0,3.2,6.6,1.2,10.1c0,0-1.2-9-2.2-9c0,0-4,6-4.4,10
+	c0,0,0.2-6.1,3.4-10.6c-2.3,0.4-4.4,1.5-6.1,3.1c0,0,0.6-4.2,7-4.6c0,0,3.3-4.5,4.2-4.8c0,0-6.4-0.5-10.3,1.2c0,0,3.4-4,11.5-2.2
+	l4.5-3.7c0,0-8.4-1.2-12,0.1c0,0,4.1-3.5,13.2-1l4.9-2.9c0,0-7.2-1.5-11.5-1c0,0,4.5-2.4,12.9,0.2l3.5-1.6c0,0-5.3-1-6.8-1.2
+	s-1.6-0.6-1.6-0.6c3.3-0.6,6.8-0.2,9.9,1.1C1007,757.3,1014.5,754.6,1014.4,754.1z"/>
+<ellipse class="st0" cx="985.2" cy="791.4" rx="29.9" ry="5.1"/>
+<path class="st1" d="M1095.4,676c0,0-23.8-1.4-21,15.3c-0.3,1.7,0.6,3.5,2.1,4.3c0,0,0.1-1.2,2.4-0.8c0.9,0.1,1.7,0.2,2.6,0.1
+	c1.2-0.1,2.3-0.5,3.2-1.3l0,0c0,0,6.7-2.8,9.3-13.7c0,0,1.9-2.4,1.8-3l-4,1.7c0,0,1.4,2.9,0.3,5.3c0,0-0.1-5.2-0.9-5.1
+	c-0.2,0-2.1,1-2.1,1s2.4,5.1,0.6,8.7c0,0,0.7-6.2-1.3-8.4l-2.8,1.7c0,0,2.8,5.2,0.9,9.5c0,0,0.5-6.5-1.5-9.1l-2.6,2
+	c0,0,2.6,5.2,1,8.7c0,0-0.2-7.6-1.6-8.2c-1,0.8-1.8,1.8-2.6,2.8c0,0,1.8,3.7,0.7,5.7c0,0-0.7-5.1-1.2-5.1c0,0-2.2,3.4-2.5,5.7
+	c0.1-2.1,0.8-4.2,1.9-6c-1.3,0.2-2.5,0.9-3.4,1.8c0,0,0.3-2.4,4-2.6c0,0,1.8-2.5,2.3-2.7c0,0-3.6-0.3-5.8,0.7c0,0,1.9-2.2,6.5-1.2
+	l2.5-2.1c0,0-4.8-0.7-6.8,0.1c0,0,2.3-2,7.4-0.5l2.8-1.7c-2.1-0.5-4.3-0.7-6.5-0.6c0,0,2.6-1.4,7.3,0.1l2-0.9c0,0-3-0.6-3.8-0.7
+	s-0.9-0.3-0.9-0.3c1.9-0.3,3.8-0.1,5.6,0.6C1091.4,677.8,1095.5,676.3,1095.4,676z"/>
+<ellipse class="st0" cx="1079" cy="697.1" rx="16.9" ry="2.8"/>
+<path class="st1" d="M954.8,690.5c0,0-28.8-1.7-25.4,18.4c-0.4,2.1,0.7,4.2,2.5,5.2c0,0,0-1.5,3-1c1,0.2,2.1,0.2,3.1,0.2
+	c1.4-0.1,2.7-0.7,3.8-1.6l0,0c0,0,8.1-3.3,11.2-16.6c0,0,2.3-2.9,2.2-3.6l-4.8,2.1c0,0,1.7,3.5,0.3,6.4c0,0-0.2-6.3-1.1-6.1
+	c-0.2,0-2.5,1.2-2.5,1.2s2.8,6.1,0.7,10.5c0,0,0.8-7.5-1.6-10.1l-3.4,2c0,0,3.3,6.3,1.1,11.5c0,0,0.6-7.9-1.8-11l-3.1,2.4
+	c0,0,3.1,6.2,1.2,10.5c0,0-0.3-9.2-1.9-9.9c0,0-2.7,2.4-3.1,3.4c0,0,2.1,4.5,0.8,6.9c0,0-0.8-6.1-1.5-6.1c0,0-2.7,4-3,6.8
+	c0.1-2.6,0.9-5.1,2.3-7.2c-1.6,0.3-3,1-4.1,2.1c0,0,0.4-2.9,4.8-3.1c0,0,2.2-3.1,2.8-3.3c0,0-4.4-0.4-7,0.8c0,0,2.3-2.7,7.8-1.5
+	l3.1-2.5c0,0-5.7-0.8-8.2,0.1c0,0,2.8-2.4,9-0.7l3.3-2c0,0-4.9-1.1-7.8-0.7c0,0,3.1-1.7,8.8,0.1l2.4-1c0,0-3.6-0.7-4.6-0.8
+	s-1.1-0.4-1.1-0.4c2.3-0.4,4.6-0.1,6.7,0.8C949.8,692.8,954.9,690.9,954.8,690.5z"/>
+<ellipse class="st0" cx="934.9" cy="715.9" rx="20.4" ry="3.4"/>
+<path class="st4" d="M714.1,701l-100.3,38.8l-146.6,56.7c-5.5-10.3-13.7-24.3-23.8-41c-34.7-57.5-92.2-147.1-143.3-225.7
+	c-57.6-88.6-107.2-163.5-107.2-163.5l35.9-10.4L522,270.8L714.1,701z"/>
+<path class="st5" d="M716.1,694l-100.3,38.8l-146.6,56.7c-5.5-10.3-13.7-24.3-23.8-41c-34.7-57.5-92.2-147.1-143.3-225.7
+	c-57.6-88.6-107.2-163.5-107.2-163.5l35.9-10.4L524,263.8L716.1,694z"/>
+<path class="st4" d="M716.1,694l-100.3,38.8c-56,11.7-113.2,16.9-170.4,15.7c-34.7-57.5-92.2-147.1-143.3-225.7l-71.3-173.9
+	L524,263.8L716.1,694z"/>
+<path class="st1" d="M790.7,669.9c0,0-155.8,92.2-388.5,71.4L216.7,289l88.9-15.3L612.9,221l174.3,440.1L790.7,669.9z"/>
+<path class="st4" d="M787.2,661.1c-36.7,1.8-79.1,1.6-121.9-3.5c-46.2-5.4-92.7-16.6-132.6-37.2c-33.3-17.2-61.8-35.8-86.7-58.2
+	C381.5,504.1,341.5,421,305.6,273.8L612.9,221L787.2,661.1z"/>
+<path class="st5" d="M901.5,635.8c0,0-114.9,22.5-231.8,8.7c-46.2-5.5-92.7-16.6-132.6-37.2c-33.3-17.2-61.8-35.8-86.7-58.2
+	c-80-72-122.2-182.2-165.8-404.9c0,0,191,46.1,379.7-54.9C664.5,89.3,728.1,486.6,901.5,635.8z"/>
+<path class="st4" d="M669.8,644.5c-46.2-5.5-92.7-16.6-132.6-37.2c-33.3-17.2-61.8-35.8-86.7-58.2c68.1-5.5,77.9-42.8,77.9-42.8
+	C578.9,586.5,669.8,644.5,669.8,644.5z"/>
+<path class="st6" d="M383.6,225.9c0,0,102.6,11.7,198.6-42.3l6.6,21.1c0,0-91.9,45.8-205.2,45.8V225.9z"/>
+<path class="st7" d="M383.6,330.2c0,0,102-8.2,215.6-63.1l3.8,8.8c0,0-41.8,52.6-219.4,66.3V330.2z"/>
+<path class="st7" d="M395.6,370.9c0,0,102-8.2,215.5-63.1l3.8,8.8c0,0-41.8,52.6-219.4,66.4V370.9z"/>
+<path class="st7" d="M406.7,414.8c0,0,102-8.2,215.5-63.1l3.8,8.8c0,0-41.8,52.6-219.4,66.4V414.8z"/>
+<path class="st7" d="M419.8,452.3c0,0,102-8.2,215.5-63.1l3.8,8.8c0,0-41.8,52.6-219.4,66.4V452.3z"/>
+<path class="st4" d="M431.9,493.1c0,0,102-8.2,215.6-63.1l3.8,8.8c0,0-41.8,52.6-219.4,66.4L431.9,493.1z"/>
+<rect x="620" y="243.8" transform="matrix(0.9466 -0.3223 0.3223 0.9466 -49.5447 218.4749)" class="st6" width="30.2" height="30.1"/>
+<rect x="636.2" y="286.3" transform="matrix(0.9466 -0.3223 0.3223 0.9466 -62.3622 225.9729)" class="st6" width="30.2" height="30.1"/>
+<rect x="662.3" y="368" transform="matrix(0.9466 -0.3223 0.3223 0.9466 -87.3024 238.7201)" class="st6" width="30.2" height="30.1"/>
+<rect x="677.2" y="411.8" transform="matrix(0.9466 -0.3223 0.3223 0.9466 -100.6367 245.8725)" class="st6" width="30.2" height="30.1"/>
+<rect x="649.5" y="330.4" transform="matrix(0.9466 -0.3223 0.3223 0.9466 -75.871 232.5926)" class="st6" width="30.2" height="30.1"/>
+<path class="st8" d="M934.4,533.4c-3.9,6.9-8.2,13.6-13,19.9c-1.9,2-3.4,15.5-3.1,22s-2.5,36.4-13,51.9s-5.1,42.3-5.1,42.3
+	l-16.8,5.9h-20.2l-13.9-4.1l-3.7-10.1c0,0,4.9-0.8,17-3.6c6.9-1.4,12-7.2,12.5-14.3l8.5-59.4c0,0,2.5-15-1.6-25.4
+	c-2.4-5.9-1.9-12.6,1.4-18.1l0.3-0.4c0,0,13.1-10.4,26.5-16.9c11.8-5.7,23.9-8.4,27.3,1.7C938,526.1,936.5,529.4,934.4,533.4z"/>
+<path class="st4" d="M900.2,669.5l-16.8,5.9h-20.2l-13.9-4.2l-3.7-10.1c0,0,1.2-0.2,4-0.7c-0.4,3.8,2.1,7.3,5.8,8.2l7.9,0.3
+	c1.1,0,2.2,0.1,3.3,0.1c11.1,0,22.1-1.8,32.6-5.4C899.7,667.2,900.2,669.5,900.2,669.5z"/>
+<path class="st9" d="M863.4,670.5l-7.9-0.3c0,0-7.4-1.6-5.6-9.9c0,0-14.2-3.2-17.8-1.1s-1.9,13.9,8.4,16.8c10,2.8,47.5,6.9,58.2,5.3
+	l0.7-0.1c9.8-2,0-16,0-16l0,0C887.8,669.1,875.6,670.9,863.4,670.5z"/>
+<path class="st10" d="M912,535.7c-0.5,1.1-1.1,2.2-1.8,3.3c-5,9-12.9,20.3-14.3,21.8c-2.1,2.3-3.8,17.5-3.5,24.9
+	s-2.8,41.1-14.7,58.6c-6.1,9-7.4,21.3-7.3,31.1c0,3.3,0.2,6.7,0.6,10c0.4,4.1,1,6.6,1,6.6l-18.9,6.6h-22.8l-15.7-4.7l-4.1-11.4
+	c0,0,1.4-0.2,4.5-0.8s7.9-1.6,14.7-3.3c7.8-1.6,13.5-8.2,14.1-16.1l9.6-67.1c0,0,2.8-17-1.8-28.7c-1.8-4.3-2.1-9.1-1.1-13.7
+	c0.6-2.6,1.6-5,3-7.2c0,0,3.7-2.9,9.2-6.7c2.4-1.7,5.3-3.5,8.3-5.4c13.4-8.3,30.9-16.7,39.3-10.6c1.9,1.4,3.2,3.4,3.9,5.6
+	C914.5,529.8,913.6,532.4,912,535.7z"/>
+<path class="st4" d="M871.9,692l-18.9,6.6h-22.7l-15.7-4.7l-4.1-11.4c0,0,1.4-0.2,4.5-0.8c-0.4,2.8,0.6,5.5,2.7,7.4
+	c1.6,1.3,3.6,2.1,5.6,2.1l7.2,0.2c1.3,0,2.5,0.1,3.8,0.1c12.5,0,24.9-2.1,36.8-6.1C871.4,689.5,871.9,692,871.9,692z"/>
+<path class="st9" d="M830.4,693.2l-7.2-0.2c-2.1,0-4.1-0.8-5.7-2.1c-1.8-1.6-3.4-4.4-2.4-9.1c0,0-16-3.6-20.1-1.2
+	s-2.1,15.7,9.5,18.9c11.3,3.2,53.6,7.8,65.7,5.9l0.8-0.1c11-2.3,0-18.1,0-18.1l0,0C858,691.6,844.2,693.6,830.4,693.2z"/>
+<path class="st4" d="M934.4,533.4c-6.8,2.4-16.9,5.6-22.4,5.7c-0.6,0-1.1,0-1.7-0.1l0,0c-3.9-0.5-15.8,0.3-26.7,1.3
+	c-4.4,0.4-8.6,0.8-12.1,1.2c-5.2,0.5-8.8,0.9-8.8,0.9V539c2.4-1.7,5.3-3.5,8.3-5.4c13.4-8.3,30.9-16.7,39.3-10.6
+	c11.8-5.7,23.9-8.4,27.3,1.7C938,526.1,936.5,529.4,934.4,533.4z"/>
+<path class="st11" d="M967.3,454.6c-0.2,5.1-2.1,18.2-15.7,31.5c-17.4,17-10,41.3-10,41.3s-20.7,8.1-29.6,8.3c-0.6,0-1.1,0-1.7-0.1
+	c-5.4-0.8-26.6,1.2-38.9,2.5c-5.2,0.5-8.8,0.9-8.8,0.9v-72l95.9-23.3l8.7,8.6C967.3,453.1,967.3,453.8,967.3,454.6z"/>
+<path class="st12" d="M933.2,525.1"/>
+<g class="st13">
+	<path d="M864.2,538.2l-1.6,0.2v0.8c0,0,3.6-0.4,8.8-0.9c8.8-0.9,22.2-2.1,31.1-2.5C896.3,535.1,876,537,864.2,538.2z"/>
+	<path d="M967.2,452.4l-8.7-8.7l-5.8,1.5l7.3,7.3c0,0.7,0,1.4,0,2.2c-0.2,5.1-2.1,18.2-15.7,31.5c-17.4,16.9-10,41.3-10,41.3
+		s-17.1,6.7-26.9,8.1c0.9,0,1.9,0,2.8,0.2c0.6,0.1,1.1,0.1,1.7,0.1c8.9-0.2,29.6-8.3,29.6-8.3s-7.4-24.3,10-41.3
+		c13.6-13.3,15.5-26.5,15.7-31.5C967.3,453.9,967.3,453.2,967.2,452.4z"/>
+</g>
+<path class="st8" d="M775.6,403.7c0,0-29-20.1-31.1-2s31.1,15.5,31.1,15.5V403.7z"/>
+<path class="st14" d="M825.6,390.4c0,0-15.7,10.4-24.4,9.7c0,0-23.7,3.2-26.5,1.6s-4.4,23-4.4,23l39-2.8l25-3.8
+	c0,0,12.5-7.6,12.5-14.2S825.6,390.4,825.6,390.4z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="770.28" y1="407.535" x2="846.78" y2="407.535">
+	<stop  offset="0" style="stop-color:#F57860"/>
+	<stop  offset="1" style="stop-color:#FF2C12"/>
+</linearGradient>
+<path class="st15" d="M825.6,390.4c0,0-15.7,10.4-24.4,9.7c0,0-23.7,3.2-26.5,1.6s-4.4,23-4.4,23l39-2.8l25-3.8
+	c0,0,12.5-7.6,12.5-14.2S825.6,390.4,825.6,390.4z"/>
+<path class="st8" d="M802.6,442.7c0,0-35.3-1.5-27.4,15c7.9,16.5,34.6-3.5,34.6-3.5L802.6,442.7z"/>
+<path class="st11" d="M838,407.7c0,0-28.6-21.4-24.6-47.4s24.6,19.9,24.6,19.9V407.7z"/>
+<path class="st8" d="M830.1,289.6c0,9.4-3.7,18.4-10.2,25.1c-1.6,1.7-3.3,3.1-5.2,4.5c-3.6,2.5-7.6,4.4-11.9,5.5
+	c-1.7,0.4-3.4,0.7-5.1,0.9c-1.2,0.1-2.5,0.2-3.8,0.2c-4.1,0-8.1-0.7-11.9-2c-18.8-6.6-28.8-27.2-22.2-46s27.2-28.8,46-22.2
+	C820.4,260.6,830.1,274.3,830.1,289.6L830.1,289.6z"/>
+<path class="st4" d="M967.3,454.6c-3.2,0.6-7.2,1.7-7.2,3.4c0,2.8-45.2,18.1-45.2,18.1s1.7,3.9-2.8,10.7s-41.2,45.7-41.2,45.7
+	l0.1,1.2l0.5,4.5l2.2,21.5c0,0-14.1-5.1-18.6-4.5c-1.5,0.2-3-0.8-4.5-2.1c0.6-2.6,1.6-5,3-7.2c0,0,3.7-2.9,9.2-6.7v-72l95.9-23.3
+	l8.7,8.6C967.3,453.1,967.3,453.9,967.3,454.6z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="806.9901" y1="429.7076" x2="971.33" y2="429.7076">
+	<stop  offset="0" style="stop-color:#F57860"/>
+	<stop  offset="1" style="stop-color:#FF2C12"/>
+</linearGradient>
+<path class="st16" d="M971.3,450.6c0,0-11.3,1.1-11.3,4s-45.2,18.1-45.2,18.1s1.7,3.9-2.8,10.7s-41.2,45.8-41.2,45.8l2.8,27.1
+	c0,0-14.1-5.1-18.6-4.5c-2,0.3-4.3-1.6-6.1-3.8c-1.5-1.8-2.9-3.8-4.1-5.8c0,0,5.1-21.5-1.7-26.5s7.3-42.3,7.3-42.3
+	s6.4-26.5,4.5-37.9c-0.1-0.8-0.3-1.5-0.5-2.2c0-0.1,0-0.2-0.1-0.3c-4-10.9-47.4-102-47.4-102c0-2.6,0.2-5.2,0.5-7.7
+	c0.1-0.7,0.2-1.5,0.3-2.2c0.2-1.3,0.5-2.7,0.9-4c0.2-0.8,0.5-1.7,0.8-2.5c1.3-3.4,3.4-6.1,6.5-6.1c0,0,3.4-3.8,11.3-4.8
+	c5.8-0.8,14.1,0,25.4,4.8c26.5,11.3,32.8,11.9,32.8,11.9l13.3,17.5l2.7,3.6c10,13.1,19.1,26.9,27.2,41.3c4.4,8,10.7,17.3,18.3,22.9
+	C962.3,416.7,971.3,450.6,971.3,450.6z"/>
+<path class="st4" d="M872.4,385.3c0,0,37.7,9.3,52.3,32.8L872.4,385.3z"/>
+<path class="st4" d="M884,426.6c0,0,7.1,47.9,5.2,51.5S884,426.6,884,426.6z"/>
+<path class="st4" d="M881.5,451.1c-2.7,3.6-13.9,31.3-13.9,31.3l3.2,46.6l2.8,27.1c0,0-14.1-5.1-18.6-4.5c-2,0.3-4.3-1.6-6.1-3.8
+	c2.9-15.9,9.2-49.1,10.3-49.7c1.5-0.8,9.1-27.5,9.5-35s11-24.1,11-24.1S884.2,447.6,881.5,451.1z"/>
+<path class="st4" d="M870.8,405.4c-0.7,2.1-1.8,14.4-1.8,14.4c-0.8,10.8-9,14.4-14,15.5c-0.1-0.8-0.3-1.5-0.5-2.2
+	C851,423.5,807,330.9,807,330.9c0-4.7,0.6-9.4,1.8-13.9c9.6-2.8,24.8,1.5,24.8,1.5c4.4-0.6,18.7,27.9,18.7,27.9s9.5,21.8,10.6,24.8
+	s0,7.8,0.4,9.5s4.9,3.2,5.5,5.5s0.2,7,0.6,7.8S871.5,403.3,870.8,405.4z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="797.7368" y1="388.7457" x2="867.5798" y2="388.7457">
+	<stop  offset="0" style="stop-color:#F57860"/>
+	<stop  offset="1" style="stop-color:#FF2C12"/>
+</linearGradient>
+<path class="st17" d="M867.4,403.7c-0.7,2.1-1.8,14.4-1.8,14.4c-0.6,9-6.4,13-11.3,14.7c-2.2,0.8-4.5,1.2-6.8,1.4l-6.8,5.9
+	l-31.4,23.1c0,0-11.7-21.7-8.5-21.8s21.5-15.5,21.5-15.5c5.6-3,11.2-13,13.8-18.1c-0.2-0.6-0.3-1.2-0.3-1.9
+	c-1.1-9.6-24.8-46.3-24.8-46.3s-9.2-10.8-12.7-30.8c-0.1-0.5-0.2-0.9-0.3-1.4c-0.1-0.6-0.2-1.3-0.2-1.9c-0.4-7.7,5.2-10.5,11.8-11.1
+	l0,0c3.5-0.3,7-0.2,10.4,0.3c3.4,0.4,6.8,1.1,10.2,2c2.8-0.4,9.8,11.4,14.4,19.8l0,0c2.5,4.5,4.3,8.1,4.3,8.1s9.5,21.8,10.6,24.8
+	s0,7.9,0.4,9.5s4.9,3.2,5.5,5.5s0.2,7,0.6,7.8S868.1,401.6,867.4,403.7z"/>
+<path class="st4" d="M903.9,354.8c-6,6.1-15.7,6.1-23.5,3s-14.4-8.8-21.6-13.2c-4.7-2.9-9.6-5.2-14.3-8.1l0,0
+	c-0.7-0.4-1.3-0.9-2-1.3c-5.3-3.8-9.9-8.6-15.4-12c-3.7-2.5-8-3.8-12.4-4c-2,0-4.1,0.4-5.9,1.2c-0.3,0.1-0.7,0.3-1,0.5
+	c-1.8,1-3.5,2.3-5,3.8c-1.6,1.4-3,2.9-4.7,4.2c-0.1-0.5-0.2-0.9-0.3-1.4c-0.1-0.6-0.2-1.3-0.2-1.9c-1.2,0.1-2.5,0.2-3.8,0.2
+	c-4.1,0-8.1-0.7-11.9-2c0-0.1,0-0.3-0.1-0.5c-1.3-7.1-3.8-14.7-9.5-18.7c-3.3-2.3-8.6-3.3-13.2-5c-5.5-19.2,5.6-39.2,24.8-44.7
+	c19.2-5.5,39.2,5.6,44.7,24.8c2.3,7.9,1.8,16.3-1.4,23.9c5.8-0.8,14.1,0,25.4,4.8c26.5,11.3,32.8,11.9,32.8,11.9l13.3,17.5
+	c-1.4,2.2-3.1,4.4-3.2,6.9C895.3,349.3,899.9,352.6,903.9,354.8z"/>
+<path class="st9" d="M772.5,301.2c5.7,4,8.2,11.5,9.5,18.6c0.4,2.2,0.8,4.6,2.2,6.3c3,3.9,9.2,2.8,13.1,0s7.1-7.1,11.5-9.1
+	c5.9-2.7,12.8-0.7,18.3,2.7s10.1,8.3,15.4,12c5.2,3.6,10.9,6.2,16.3,9.5c7.2,4.4,13.8,10.1,21.6,13.2s17.5,3.1,23.5-3
+	c-4-2.2-8.6-5.5-8.3-10.3s5.8-8.3,5.5-13.2s-6.1-6.8-10.2-9.2c-8.6-5-12.3-16-14.1-26.1c-1.4-7.9-2.6-16.8-8.5-21.9
+	c-3.8-3.3-9-4.4-12.9-7.6c-3.7-3.1-5.7-7.8-8-12.1c-3.8-7.2-8.9-13.8-15.5-18.1s-15.1-6-22.4-3.1c-2.8,1.1-5.3,2.8-8.1,4
+	c-6.9,3-14.8,2.6-21.6,5.7c-8.4,3.9-13.8,12.4-18.8,20.5c-4.2,6.9-12.6,19.1-10.2,28.1C753.1,297.4,766.3,296.9,772.5,301.2z"/>
+<g class="st13">
+	<path d="M901.1,327.5c0-0.4-0.1-0.7-0.2-1.1c-1.5,2.4-3.4,4.7-3.6,7.5c0,0.6,0,1.3,0.2,1.9C899.1,333.1,901.3,330.6,901.1,327.5z"
+		/>
+	<path d="M882.1,347.2c-7.8-3.1-14.4-8.8-21.6-13.2c-5.4-3.3-11.1-5.9-16.3-9.5c-5.3-3.8-9.9-8.6-15.4-12s-12.4-5.4-18.3-2.7
+		c-4.4,2-7.5,6.3-11.5,9.1s-10.1,4-13.1,0c-1.4-1.8-1.8-4.1-2.2-6.3c-1.3-7.1-3.8-14.6-9.5-18.6c-6.2-4.4-19.4-3.9-21.8-13
+		c-0.4-1.6-0.5-3.3-0.3-5c-1.5,4.1-2.3,8.2-1.4,11.8c2.4,9.2,15.6,8.7,21.8,13c5.7,4,8.2,11.5,9.5,18.6c0.4,2.2,0.8,4.6,2.2,6.3
+		c3,3.9,9.2,2.8,13.1,0s7.1-7.1,11.5-9.1c5.9-2.6,12.8-0.7,18.3,2.7s10.1,8.3,15.4,12c5.2,3.6,10.9,6.2,16.3,9.5
+		c7.2,4.4,13.8,10.1,21.6,13.2s17.5,3.1,23.5-3c-1.5-0.8-3-1.8-4.4-2.9C894.1,350,887.6,349.4,882.1,347.2z"/>
+</g>
+<path class="st18" d="M705.1,415.6l80-29.9c3.9-1.5,8.3,0.5,9.8,4.4c0,0,0,0,0,0l0,0c1.5,3.9-0.5,8.3-4.5,9.8c0,0,0,0,0,0l-80,29.9
+	l-17.1-1.7L705.1,415.6z"/>
+<path class="st19" d="M792.5,387.8L792.5,387.8c1.5,3.9-0.5,8.3-4.5,9.8l-80,29.9l-12.9-1.3l-1.8,2l17.1,1.7l80-29.9
+	c3.9-1.5,5.9-5.9,4.5-9.8v0l0,0c-0.6-1.6-1.7-2.9-3.1-3.8C792.1,386.8,792.3,387.3,792.5,387.8z"/>
+<polygon class="st20" points="705.1,415.6 710.5,429.8 696.4,428.4 693.3,428.1 697.5,423.7 "/>
+<path class="st21" d="M697.5,423.7c0.3,0.2,0.6,0.5,0.8,0.9c0.3,0.4,0.3,1,0,1.4c-0.2,0.2-0.5,0.4-0.8,0.5c-0.7,0.4-1.1,1.1-1.1,1.9
+	l-3.1-0.3L697.5,423.7z"/>
+<path class="st22" d="M635.3,261.1l-13.5-6.6c-0.8-0.4-1.1-1.4-0.8-2.2c0,0,0,0,0,0l1.4-2.9c0.4-0.8,1.4-1.1,2.2-0.8c0,0,0,0,0,0
+	l9.1,4.4l9.5-19.5c0.4-0.8,1.4-1.1,2.2-0.8l2.9,1.4c0.8,0.4,1.1,1.4,0.8,2.2c0,0,0,0,0,0l-11.6,23.9
+	C637.1,261.1,636.1,261.5,635.3,261.1C635.3,261.1,635.3,261.1,635.3,261.1z"/>
+<path class="st22" d="M664.8,345.2l-13.5-6.6c-0.8-0.4-1.1-1.4-0.8-2.2c0,0,0,0,0,0l1.4-2.9c0.4-0.8,1.4-1.1,2.2-0.8l9.1,4.4
+	l9.5-19.5c0.4-0.8,1.4-1.1,2.2-0.8l2.9,1.4c0.8,0.4,1.2,1.4,0.8,2.2c0,0,0,0,0,0l-11.6,23.9C666.5,345.3,665.6,345.6,664.8,345.2
+	L664.8,345.2z"/>
+<path class="st22" d="M651.5,303.8l-13.5-6.6c-0.8-0.4-1.1-1.4-0.8-2.2l1.4-2.9c0.4-0.8,1.4-1.1,2.2-0.8c0,0,0,0,0,0l9.1,4.4
+	l9.5-19.5c0.4-0.8,1.4-1.1,2.2-0.8c0,0,0,0,0,0l2.9,1.4c0.8,0.4,1.1,1.4,0.8,2.2L653.7,303C653.3,303.8,652.3,304.1,651.5,303.8
+	C651.5,303.8,651.5,303.8,651.5,303.8L651.5,303.8z"/>
+<path class="st22" d="M677.6,383.2l-13.5-6.6c-0.8-0.4-1.1-1.4-0.8-2.2c0,0,0,0,0,0l1.4-2.9c0.4-0.8,1.4-1.1,2.2-0.8c0,0,0,0,0,0
+	l9.1,4.4l9.5-19.5c0.4-0.8,1.4-1.1,2.2-0.8l2.9,1.4c0.8,0.4,1.1,1.4,0.8,2.2c0,0,0,0,0,0l-11.6,23.9
+	C679.3,383.3,678.4,383.6,677.6,383.2z"/>
+<path class="st22" d="M173.2,641.6c0,0,5.9,7.8-2.7,19.5s-15.9,21.7-13,29c0,0,13.1-21.8,23.8-22.1S185,654.7,173.2,641.6z"/>
+<path class="st4" d="M173.2,641.6c0.5,0.8,0.9,1.6,1.2,2.4c10.4,12.2,16,23.7,5.9,24c-9.3,0.3-20.5,16.9-23.2,21.2
+	c0.1,0.3,0.2,0.7,0.3,1c0,0,13.1-21.8,23.8-22.1S185,654.7,173.2,641.6z"/>
+<path class="st23" d="M184.3,651.5c0,2.7-0.3,5-0.7,5s-0.7-2.2-0.7-5s0.4-1.5,0.8-1.5S184.3,648.8,184.3,651.5z"/>
+<path class="st23" d="M188.1,654.8c-2.4,1.3-4.5,2.1-4.7,1.8s1.6-1.7,4-3s1.4-0.4,1.6,0S190.5,653.5,188.1,654.8z"/>
+<path class="st22" d="M141.8,641.6c0,0-5.9,7.8,2.8,19.5s15.9,21.7,13,29c0,0-13.1-21.8-23.8-22.1S130.1,654.7,141.8,641.6z"/>
+<path class="st4" d="M141.8,641.6c-0.5,0.8-0.9,1.6-1.2,2.4c-10.4,12.2-16,23.7-5.9,24c9.3,0.3,20.5,16.9,23.2,21.2
+	c-0.1,0.3-0.2,0.7-0.3,1c0,0-13.1-21.9-23.8-22.2S130.1,654.7,141.8,641.6z"/>
+<path class="st23" d="M130.8,651.5c0,2.7,0.3,5,0.7,5s0.7-2.2,0.7-5s-0.4-1.5-0.8-1.5S130.8,648.8,130.8,651.5z"/>
+<path class="st23" d="M126.9,654.8c2.4,1.3,4.5,2.1,4.7,1.8s-1.6-1.7-4-3s-1.5-0.4-1.6,0S124.6,653.5,126.9,654.8z"/>
+<ellipse class="st0" cx="157.5" cy="740.1" rx="62.2" ry="9.5"/>
+<path class="st11" d="M189.5,679.6l-0.3,2.4l-0.4,3.4l-0.2,1.4l-0.4,3.4l-0.2,1.4l-0.4,3.4l-4.8,39c-0.4,3.5-6.1,6.2-13,6.2h-24.7
+	c-6.9,0-12.6-2.7-13-6.2l-4.8-39l-0.4-3.4l-0.2-1.4l-0.4-3.4l-0.2-1.4l-0.4-3.4l-0.3-2.4c-0.2-2,2.8-3.6,6.7-3.6h50.6
+	C186.7,676,189.8,677.6,189.5,679.6z"/>
+<polygon class="st24" points="189.2,682 188.8,685.5 126.2,685.5 125.8,682 "/>
+<polygon class="st24" points="188.6,686.9 188.2,690.3 126.8,690.3 126.4,686.9 "/>
+<polygon class="st24" points="188,691.8 187.6,695.2 127.4,695.2 127,691.8 "/>
+</svg>

src/main/resources/static/img/order/icon-reples.svg

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 179.9 180" style="enable-background:new 0 0 179.9 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFEDDE;}
+	.st1{fill:#3F3D56;}
+	.st2{fill:url(#椭圆_699_1_);}
+	.st3{fill:url(#椭圆_700_1_);}
+	.st4{fill:url(#椭圆_699-2_1_);}
+	.st5{fill:url(#椭圆_700-2_1_);}
+	.st6{fill:#FFE6DC;}
+	.st7{fill:#CA6106;}
+	.st8{fill:#DF9C58;}
+	.st9{fill:#F0DDC3;}
+	.st10{fill:#E9DCBE;}
+	.st11{fill:#E15616;}
+</style>
+<g>
+	<g id="组_1591" transform="matrix(0.951, -0.309, 0.309, 0.951, 0, 44.126)">
+		<g id="组_1590" transform="translate(0 0)">
+			
+				<ellipse id="椭圆_697" transform="matrix(-1 2.529012e-06 -2.529012e-06 -1 37.5177 180.0593)" class="st0" cx="18.8" cy="90" rx="6.1" ry="12.4"/>
+			<path id="路径_3016" class="st1" d="M19.3,110.3c-1.4-9.7-1.4-19.5,0-29.2l0.5,0.1c-1.4,9.6-1.4,19.4,0,29.1L19.3,110.3z"/>
+			
+				<rect id="矩形_2735" x="18.4" y="88.8" transform="matrix(-0.8818 0.4717 -0.4717 -0.8818 82.3973 157.4409)" class="st1" width="6.2" height="0.5"/>
+			
+				<rect id="矩形_2736" x="15.4" y="87.4" transform="matrix(-0.4719 0.8817 -0.8817 -0.4719 102.8853 119.4059)" class="st1" width="0.5" height="6.2"/>
+			
+				<linearGradient id="椭圆_699_1_" gradientUnits="userSpaceOnUse" x1="-975.3793" y1="285.0743" x2="-975.3793" y2="284.0743" gradientTransform="matrix(22.552 14.9513 7.3276 -46.0151 19912.043 27747.6426)">
+				<stop  offset="0" style="stop-color:#FFE6DC"/>
+				<stop  offset="1" style="stop-color:#E15616"/>
+			</linearGradient>
+			<path id="椭圆_699" class="st2" d="M4.2,46.8C10.7,46.8,16,57.6,16,71c0,13.4-5.3,24.2-11.9,24.2S-7.7,84.3-7.7,71
+				C-7.7,57.6-2.4,46.8,4.2,46.8z"/>
+			<path id="路径_3020" class="st1" d="M5.5,110.5c-4.7-28.5,0-56.8,0-57.1L6,53.5c0,0.3-4.7,28.6,0,56.9L5.5,110.5z"/>
+			
+				<rect id="矩形_2743" x="3.4" y="68.8" transform="matrix(-0.8818 0.4717 -0.4717 -0.8818 50.421 125.4246)" class="st1" width="12.2" height="0.5"/>
+			
+				<rect id="矩形_2744" x="-2.1" y="65.8" transform="matrix(-0.4719 0.8817 -0.8817 -0.4719 60.7107 107.4485)" class="st1" width="0.5" height="12.2"/>
+			
+				<linearGradient id="椭圆_700_1_" gradientUnits="userSpaceOnUse" x1="-984.0029" y1="286.3425" x2="-984.0029" y2="285.3425" gradientTransform="matrix(30.8619 20.4601 10.0277 -62.9695 27529.0781 38186.9531)">
+				<stop  offset="0" style="stop-color:#FFE6DC"/>
+				<stop  offset="1" style="stop-color:#E15616"/>
+			</linearGradient>
+			<path id="椭圆_700" class="st3" d="M32.3,23.3c9,0,16.2,14.8,16.2,33.1s-7.3,33.1-16.2,33.1S16.1,74.7,16.1,56.4
+				C16.1,38.1,23.3,23.3,32.3,23.3z"/>
+			<path id="路径_3021" class="st1" d="M34.2,110.5c-6.5-38.9-0.1-77.7,0-78.1l0.5,0.1c-0.1,0.4-6.5,39.1,0,77.9L34.2,110.5z"/>
+			
+				<rect id="矩形_2745" x="31.2" y="53.5" transform="matrix(-0.8818 0.4717 -0.4717 -0.8818 99.7386 82.5243)" class="st1" width="16.6" height="0.5"/>
+			
+				<rect id="矩形_2746" x="23.8" y="49.4" transform="matrix(-0.4718 0.8817 -0.8817 -0.4718 86.2567 63.7195)" class="st1" width="0.5" height="16.6"/>
+		</g>
+	</g>
+	<g id="组_1590-2" transform="translate(0 0)">
+		
+			<ellipse id="椭圆_697-2" transform="matrix(0.225 -0.9744 0.9744 0.225 -19.3501 209.8312)" class="st0" cx="122.2" cy="117.1" rx="16.1" ry="7.9"/>
+		<path id="路径_3016-2" class="st1" d="M117,143c1.2-19.2,8.5-37,8.6-37.1l0.6,0.2c-0.1,0.2-7.3,17.8-8.5,36.9L117,143z"/>
+		
+			<rect id="矩形_2735-2" x="121.9" y="116.3" transform="matrix(0.9653 -0.2612 0.2612 0.9653 -26.0909 36.9492)" class="st1" width="8.1" height="0.6"/>
+		
+			<rect id="矩形_2736-2" x="117.9" y="112.7" transform="matrix(0.6581 -0.7529 0.7529 0.6581 -47.5367 128.8965)" class="st1" width="0.6" height="8.1"/>
+		
+			<linearGradient id="椭圆_699-2_1_" gradientUnits="userSpaceOnUse" x1="-837.8569" y1="627.1649" x2="-837.8569" y2="626.1649" gradientTransform="matrix(30.1353 6.9573 14.1953 -61.4866 16462.6875 44449.3008)">
+			<stop  offset="0" style="stop-color:#FFE6DC"/>
+			<stop  offset="1" style="stop-color:#E15616"/>
+		</linearGradient>
+		<path id="椭圆_699-2" class="st4" d="M116.4,57.8c8.3,1.9,11.9,17.2,8,34.2s-13.8,29.2-22.2,27.3c-8.3-1.9-11.9-17.2-8-34.2
+			C98.2,68.1,108.1,55.9,116.4,57.8z"/>
+		<path id="路径_3020-2" class="st1" d="M99.4,139.2c2.3-37.6,16.6-72.2,16.7-72.5l0.6,0.2c-0.1,0.3-14.4,34.9-16.7,72.3
+			L99.4,139.2z"/>
+		
+			<rect id="矩形_2743-2" x="108.7" y="87.4" transform="matrix(0.9653 -0.2612 0.2612 0.9653 -18.8538 33.5029)" class="st1" width="15.9" height="0.6"/>
+		
+			<rect id="矩形_2744-2" x="101.1" y="80.1" transform="matrix(0.6581 -0.7529 0.7529 0.6581 -31.6039 106.4175)" class="st1" width="0.6" height="15.9"/>
+		
+			<linearGradient id="椭圆_700-2_1_" gradientUnits="userSpaceOnUse" x1="-846.1067" y1="628.1974" x2="-846.1067" y2="627.1974" gradientTransform="matrix(41.2373 9.5204 19.4254 -84.1407 22847.123 60948.4922)">
+			<stop  offset="0" style="stop-color:#FFE6DC"/>
+			<stop  offset="1" style="stop-color:#E15616"/>
+		</linearGradient>
+		<path id="椭圆_700-2" class="st5" d="M159,36.2c11.4,2.6,16.3,23.6,10.9,46.8c-5.4,23.2-18.9,39.9-30.3,37.3
+			c-11.4-2.6-16.3-23.6-10.9-46.8C134,50.3,147.6,33.6,159,36.2z"/>
+		<path id="路径_3021-2" class="st1" d="M135.8,147.6c3.2-51.4,22.7-98.8,22.9-99.2l0.6,0.2c-0.2,0.5-19.7,47.8-22.9,99
+			L135.8,147.6z"/>
+		
+			<rect id="矩形_2745-2" x="148.4" y="76.8" transform="matrix(0.9653 -0.2612 0.2612 0.9653 -14.6064 44.2748)" class="st1" width="21.7" height="0.6"/>
+		
+			<rect id="矩形_2746-2" x="138.1" y="66.7" transform="matrix(0.6581 -0.753 0.753 0.6581 -11.0551 130.7389)" class="st1" width="0.6" height="21.7"/>
+	</g>
+	<g id="空_1_" transform="translate(35.154 38.81)">
+		<path id="路径_3114" class="st6" d="M-15.7,106.1c0,6.3,30.9,11.4,69.1,11.4s69.1-5.1,69.1-11.4v0c0-6.3-30.9-11.4-69.1-11.4
+			S-15.7,99.8-15.7,106.1z"/>
+		<path id="路径_3121" class="st7" d="M50.2,53.7V96l40.9,8.1V57.9l-40.9-4.8"/>
+		<path id="路径_3122" class="st8" d="M50.6,53.1v42.6l-33.8,9.9V60.3L50.6,53.1z"/>
+		<path id="路径_3123" class="st8" d="M55.9,65.3v48.9l35.2-10.1v-46L55.9,65.3z"/>
+		<path id="路径_3124" class="st7" d="M56.2,114.4l-40-7.8V60.9l40,4.8"/>
+		<path id="路径_3125" class="st9" d="M56.2,65.3l11.3,19.4c0,0,0.1,1,1.8,0.3l33.1-10.4c0,0,0.8-0.5,0-1.5L91.1,57.9L56.2,65.3z"
+			/>
+		<path id="路径_3126" class="st10" d="M56.5,65l-40-4.8l-9,17l40,7.2L56.5,65z"/>
+		<path id="路径_3115" class="st11" d="M75.8,51.4l-0.1,0.3l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1
+			C75.9,51.2,75.9,51.3,75.8,51.4z M75.5,52c-0.1,0.2-0.3,0.4-0.4,0.5L75,52.4c0.1-0.2,0.3-0.3,0.4-0.5L75.5,52z M76.1,50.8
+			l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0C76.2,50.4,76.2,50.6,76.1,50.8z M76.4,49.8l-0.2,0c0.1-0.2,0.1-0.4,0.1-0.6l0.2,0
+			C76.5,49.4,76.4,49.7,76.4,49.8L76.4,49.8z M74.9,52.8c-0.2,0.2-0.3,0.3-0.5,0.4L74.2,53c0.2-0.1,0.4-0.2,0.5-0.4L74.9,52.8
+			L74.9,52.8z M76.6,48.9l-0.2,0c0-0.2,0.1-0.4,0.1-0.6l0.2,0C76.7,48.5,76.6,48.7,76.6,48.9L76.6,48.9z M76.7,47.9l-0.2,0
+			c0-0.2,0-0.4,0.1-0.7l0.2,0C76.8,47.5,76.7,47.7,76.7,47.9L76.7,47.9z M74,53.4c-0.2,0.1-0.4,0.2-0.7,0.2l-0.1-0.2
+			c0.2,0,0.4-0.1,0.6-0.2L74,53.4z M76.8,46.9l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C76.8,46.4,76.8,46.7,76.8,46.9z M76.8,45.9l-0.2,0
+			c0-0.4,0-0.7,0-0.7l0.2,0C76.8,45.2,76.8,45.5,76.8,45.9L76.8,45.9z M73,53.6c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L73,53.6
+			z M71.9,53.6c-0.2,0-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L71.9,53.6z M60.1,77.3L60,77.2c0.1-0.2,0.2-0.4,0.3-0.6
+			l0.2,0.1C60.3,76.9,60.2,77.1,60.1,77.3z M60,77.6c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6L60,77.6z
+			 M60.5,76.4l-0.2-0.1c0.1-0.2,0.2-0.4,0.2-0.6l0.2,0.1C60.7,76,60.6,76.2,60.5,76.4L60.5,76.4z M59.5,78.4
+			c-0.1,0.2-0.2,0.4-0.4,0.6L59,78.9c0.1-0.2,0.2-0.4,0.4-0.6L59.5,78.4z M60.9,75.5l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0.1
+			C61,75.1,61,75.3,60.9,75.5L60.9,75.5z M59,79.3c-0.1,0.2-0.3,0.4-0.4,0.5l-0.1-0.1c0.1-0.2,0.3-0.3,0.4-0.5L59,79.3z M61.2,74.5
+			L61,74.5l0.2-0.6l0.2,0C61.3,74.1,61.3,74.3,61.2,74.5L61.2,74.5z M58.4,80c-0.1,0.2-0.3,0.3-0.5,0.5l-0.1-0.1
+			c0.2-0.1,0.3-0.3,0.5-0.5L58.4,80z M61.5,73.6l-0.2,0c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0C61.6,73.2,61.5,73.4,61.5,73.6L61.5,73.6z
+			 M61.7,72.6l-0.2,0l0.1-0.6l0.2,0L61.7,72.6z M57.7,80.8c-0.2,0.1-0.3,0.3-0.5,0.4L57,81.1c0.2-0.1,0.3-0.3,0.5-0.4L57.7,80.8z
+			 M61.9,71.7l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0C62,71.2,62,71.5,61.9,71.7L61.9,71.7z M70.9,53.3c-0.1,0-0.3-0.1-0.4-0.2
+			c-0.1,0-0.2-0.1-0.3-0.1l0.1-0.1c0.1,0,0.2,0.1,0.3,0.1c0.1,0.1,0.3,0.1,0.4,0.1L70.9,53.3z M56.9,81.4c-0.2,0.1-0.4,0.3-0.6,0.4
+			l-0.1-0.1c0.2-0.1,0.4-0.2,0.6-0.4L56.9,81.4z M62.1,70.7l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0C62.2,70.3,62.1,70.5,62.1,70.7
+			L62.1,70.7z M62.2,69.7l-0.2,0c0-0.2,0.1-0.4,0.1-0.6l0.2,0C62.3,69.3,62.3,69.5,62.2,69.7L62.2,69.7z M56,81.9
+			c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L56,81.9z M62.4,68.8l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0L62.4,68.8z
+			 M69.9,52.7l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C69.5,52.5,69.7,52.6,69.9,52.7L69.9,52.7z M62.5,67.8l-0.2,0
+			c0-0.2,0-0.4,0.1-0.7l0.2,0C62.5,67.3,62.5,67.5,62.5,67.8L62.5,67.8z M55.1,82.3c-0.2,0.1-0.5,0.1-0.7,0.2l-0.1-0.2
+			c0.2-0.1,0.4-0.1,0.7-0.2L55.1,82.3z M62.6,66.8l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C62.6,66.3,62.6,66.6,62.6,66.8L62.6,66.8z
+			 M62.6,65.8l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C62.7,65.3,62.6,65.6,62.6,65.8L62.6,65.8z M69.1,52.1L69,52.2
+			c-0.2-0.2-0.3-0.3-0.5-0.5l0.1-0.1C68.7,51.8,68.9,52,69.1,52.1z M54.1,82.6c-0.2,0.1-0.5,0.1-0.7,0.1l0-0.2
+			c0.2,0,0.5-0.1,0.7-0.1L54.1,82.6z M62.7,64.8l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C62.7,64.3,62.7,64.6,62.7,64.8z M62.7,63.8l-0.2,0
+			c0-0.2,0-0.4,0-0.7l0.2,0C62.7,63.3,62.7,63.6,62.7,63.8L62.7,63.8z M68.4,51.3l-0.2,0.1C68.1,51.2,68,51,68,50.8l0.2,0
+			C68.2,50.9,68.3,51.2,68.4,51.3L68.4,51.3z M53,82.7c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L53,82.7z M62.7,62.8l-0.2,0
+			c0-0.2,0-0.5,0-0.7l0.2,0C62.7,62.4,62.7,62.6,62.7,62.8L62.7,62.8z M62.7,61.8l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+			C62.7,61.4,62.7,61.6,62.7,61.8L62.7,61.8z M68,50.4l-0.2,0c-0.1-0.2-0.1-0.4-0.1-0.7l0.2,0C67.9,50,68,50.2,68,50.4L68,50.4z
+			 M62.7,60.8l-0.2,0c0-0.3,0-0.5,0-0.7l0.2,0C62.7,60.4,62.7,60.6,62.7,60.8L62.7,60.8z M51.9,82.7c-0.2,0-0.5,0-0.7-0.1l0-0.2
+			c0.2,0,0.5,0.1,0.7,0.1L51.9,82.7z M67.9,49.5l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C67.8,49,67.8,49.2,67.9,49.5z M62.7,59.8l-0.2,0
+			c0-0.3,0-0.4,0-0.5l0.1-0.1l0.1,0.1C62.7,59.4,62.7,59.6,62.7,59.8z M67.8,48.4l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0
+			C67.8,48,67.8,48.2,67.8,48.4L67.8,48.4z M50.9,82.6L50.9,82.6c-0.3,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.4,0.1,0.7,0.1l0,0L50.9,82.6
+			z M67.8,47.5l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C67.9,47,67.8,47.2,67.8,47.5z M67.8,46.5l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0
+			C67.8,46,67.8,46.2,67.8,46.5L67.8,46.5z M49.8,82.4c-0.2,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0.1,0.7,0.1L49.8,82.4z M67.8,45.5
+			l-0.2,0c0-0.2,0-0.4-0.1-0.7l0.2,0C67.8,45,67.8,45.2,67.8,45.5L67.8,45.5z M67.7,44.4l-0.2,0c0-0.2-0.1-0.4-0.1-0.7l0.2,0
+			C67.6,44,67.6,44.2,67.7,44.4z M48.8,82.2c-0.2,0-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L48.8,82.2z M67.5,43.4l-0.2,0
+			c-0.1-0.2-0.1-0.4-0.2-0.6l0.2,0C67.3,43,67.4,43.2,67.5,43.4L67.5,43.4z M67.2,42.5l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0
+			C67,42,67.1,42.3,67.2,42.5L67.2,42.5z M47.7,81.9L47,81.8l0-0.2l0.7,0.2L47.7,81.9z M66.7,41.5l-0.2,0.1
+			c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1C66.5,41.1,66.6,41.3,66.7,41.5L66.7,41.5z M46.6,81.7c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2
+			c0.2,0.1,0.5,0.1,0.7,0.2L46.6,81.7z M66.2,40.6l-0.2,0.1c-0.1-0.2-0.3-0.4-0.4-0.6l0.1-0.1C66,40.2,66.1,40.4,66.2,40.6
+			L66.2,40.6z M45.6,81.3c-0.2-0.1-0.5-0.2-0.7-0.2L45,81l0.7,0.2L45.6,81.3z M65.6,39.7l-0.1,0.1c-0.1-0.2-0.3-0.4-0.4-0.6l0.1-0.1
+			C65.4,39.3,65.5,39.5,65.6,39.7L65.6,39.7z M44.6,81c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2c0.2,0.1,0.4,0.2,0.7,0.3L44.6,81z M65,38.9
+			L64.9,39c-0.2-0.2-0.3-0.4-0.5-0.5l0.1-0.1C64.7,38.5,64.8,38.7,65,38.9L65,38.9z M43.6,80.6c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.1
+			c0.2,0.1,0.4,0.2,0.7,0.3L43.6,80.6z M64.3,38.1l-0.1,0.1c-0.2-0.2-0.3-0.3-0.5-0.5l0.1-0.1C63.9,37.7,64.1,37.9,64.3,38.1
+			L64.3,38.1z M63.5,37.3l-0.1,0.1c-0.2-0.2-0.4-0.3-0.5-0.5l0.1-0.1C63.1,37,63.3,37.2,63.5,37.3L63.5,37.3z M42.6,80.2L42.6,80.2
+			c-0.3-0.1-0.5-0.2-0.6-0.3l0.1-0.1c0.2,0.1,0.4,0.2,0.5,0.3l0.1,0L42.6,80.2z M62.7,36.6l-0.1,0.1c-0.2-0.2-0.4-0.3-0.5-0.4
+			l0.1-0.1C62.3,36.3,62.5,36.4,62.7,36.6L62.7,36.6z M41.7,79.5l-0.1,0.1c-0.2-0.1-0.4-0.2-0.6-0.4l0.1-0.1
+			C41.3,79.3,41.5,79.4,41.7,79.5z M61.8,35.9L61.7,36l-0.6-0.4l0.1-0.1C61.5,35.6,61.7,35.8,61.8,35.9L61.8,35.9z M40.7,79
+			l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C40.4,78.7,40.6,78.8,40.7,79z M45.7,66.7c-0.1,0.1-0.2,0.3-0.3,0.4l-0.2-0.1
+			c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1L45.7,66.7L45.7,66.7z M45.9,66.3l-0.2-0.1c0.1-0.2,0.1-0.4,0.1-0.6l0.2,0
+			C46,65.8,46,66.1,45.9,66.3L45.9,66.3z M61,35.3l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C60.6,35,60.8,35.1,61,35.3L61,35.3z
+			 M45.2,67.4c-0.2,0.2-0.3,0.3-0.5,0.5l-0.1-0.1c0.2-0.1,0.3-0.3,0.5-0.4L45.2,67.4z M39.9,78.3l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.5
+			l0.1-0.1C39.5,78,39.7,78.2,39.9,78.3z M46,65.3l-0.2,0c0-0.2,0-0.4-0.1-0.7l0.2,0C46,64.8,46,65,46,65.3L46,65.3z M44.5,68.1
+			c-0.1,0.1-0.2,0.1-0.3,0.2c-0.1,0.1-0.2,0.1-0.4,0.1l-0.1-0.2c0.1,0,0.2-0.1,0.3-0.1c0.1,0,0.2-0.1,0.3-0.1L44.5,68.1z M45.8,64.3
+			l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6l0.1-0.1C45.6,63.8,45.8,64,45.8,64.3L45.8,64.3z M60.1,34.6L60,34.8l-0.6-0.4l0.1-0.1
+			C59.7,34.4,59.9,34.5,60.1,34.6L60.1,34.6z M39.1,77.6L39,77.7c-0.2-0.2-0.3-0.3-0.5-0.5l0.1-0.1C38.7,77.3,38.9,77.5,39.1,77.6z
+			 M43.5,68.5c-0.2,0-0.5,0.1-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L43.5,68.5z M45.3,63.3l-0.1,0.1c-0.2-0.2-0.3-0.3-0.5-0.4l0.1-0.1
+			C44.9,63,45.1,63.2,45.3,63.3L45.3,63.3z M38.4,76.8l-0.1,0.1c-0.2-0.2-0.3-0.4-0.4-0.6l0.1-0.1C38.1,76.5,38.2,76.7,38.4,76.8z
+			 M42.4,68.5c-0.2,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0.1,0.5,0.1,0.7,0.1L42.4,68.5z M59.2,34l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.4
+			l0.1-0.1C58.8,33.8,59,33.9,59.2,34L59.2,34z M44.3,62.8c-0.2-0.1-0.4-0.2-0.7-0.2l0-0.2c0.2,0,0.5,0.1,0.7,0.2L44.3,62.8z
+			 M37.8,76l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1C37.5,75.6,37.6,75.8,37.8,76z M41.3,68.3c-0.2-0.1-0.5-0.1-0.7-0.2l0.1-0.2
+			c0.2,0.1,0.4,0.2,0.7,0.2L41.3,68.3z M58.3,33.5l-0.1,0.1c-0.2-0.1-0.4-0.2-0.6-0.3l0.1-0.1C57.8,33.2,58,33.3,58.3,33.5z
+			 M37.3,75.1l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0C37.1,74.7,37.2,74.9,37.3,75.1z M43.3,62.6c-0.2,0-0.5,0-0.7,0l0-0.2
+			c0.2,0,0.5,0,0.7,0C43.3,62.4,43.3,62.6,43.3,62.6z M40.3,67.9c-0.2-0.1-0.4-0.2-0.7-0.3l0.1-0.1c0.2,0.1,0.4,0.2,0.7,0.3
+			L40.3,67.9z M57.3,33l-0.1,0.1l-0.7-0.3l0.1-0.1L57.3,33z M36.8,74.1l-0.2,0c-0.1-0.2-0.1-0.4-0.2-0.7l0.2,0
+			C36.7,73.7,36.8,73.9,36.8,74.1z M42.3,62.6L42.3,62.6c-0.3,0-0.5,0.1-0.7,0.1l-0.1-0.2c0.2-0.1,0.4-0.1,0.6-0.1l0.1,0L42.3,62.6z
+			 M36.5,73.2l-0.2,0l-0.1-0.3c0-0.1-0.1-0.2-0.1-0.3l0.2,0c0,0.1,0.1,0.2,0.1,0.3L36.5,73.2z M39.4,67.3l-0.1,0.1
+			c-0.2-0.1-0.4-0.2-0.6-0.3l0.1-0.1C38.9,67.1,39.2,67.2,39.4,67.3L39.4,67.3z M56.2,32.6c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2
+			c0.2,0.1,0.5,0.2,0.7,0.3L56.2,32.6z M41.3,62.8c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L41.3,62.8z
+			 M36.3,72.2l-0.2,0c0,0,0-0.1,0-0.1c-0.1-0.2-0.1-0.4-0.1-0.6l0.2,0c0,0.2,0.1,0.3,0.1,0.5C36.2,72.1,36.2,72.1,36.3,72.2
+			L36.3,72.2z M40.4,63.2c-0.2,0.1-0.4,0.2-0.5,0.4l-0.1-0.1c0.2-0.1,0.4-0.3,0.6-0.4C40.3,63.1,40.4,63.2,40.4,63.2L40.4,63.2z
+			 M38.4,66.8l-0.1,0.1c-0.2-0.1-0.4-0.2-0.6-0.4l0.1-0.1C38,66.5,38.2,66.6,38.4,66.8L38.4,66.8z M55.2,32.2L54.5,32l0-0.2
+			c0.2,0.1,0.5,0.1,0.7,0.2L55.2,32.2z M36.1,71.2l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C36.1,70.8,36.1,71,36.1,71.2z M39.6,63.8
+			c-0.2,0.1-0.3,0.3-0.5,0.4l-0.1-0.1c0.2-0.2,0.3-0.3,0.5-0.4L39.6,63.8z M36.1,70.2l-0.2,0c0-0.2,0.1-0.4,0.1-0.7l0.2,0
+			C36.2,69.8,36.1,70,36.1,70.2L36.1,70.2z M38.8,64.5c-0.2,0.2-0.3,0.3-0.4,0.5l-0.1-0.1c0.1-0.2,0.3-0.3,0.4-0.5L38.8,64.5z
+			 M36.3,69.3l-0.2,0c0-0.2,0.1-0.4,0.2-0.6l0.2,0.1C36.4,68.9,36.3,69.1,36.3,69.3L36.3,69.3z M38.2,65.2l-0.4,0.5l-0.2-0.1
+			c0.1-0.2,0.3-0.4,0.4-0.5L38.2,65.2z M36.6,68.3l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0.1C36.7,67.9,36.6,68.1,36.6,68.3z
+			 M37.7,66c-0.1,0.2-0.2,0.4-0.3,0.6l-0.2-0.1c0-0.1,0.1-0.2,0.1-0.2c-0.2-0.1-0.3-0.2-0.5-0.3l0.1-0.1c0.1,0.1,0.3,0.2,0.5,0.3
+			c0-0.1,0.1-0.1,0.1-0.2L37.7,66z M36.9,67.4l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1C37.1,67,37,67.2,36.9,67.4L36.9,67.4z
+			 M54.2,31.9c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0,0.5,0.1,0.7,0.2L54.2,31.9z M53.2,31.7c-0.2,0-0.5-0.1-0.7-0.1l0-0.2
+			c0.2,0,0.5,0.1,0.7,0.1L53.2,31.7z M36.6,65.6l-0.1,0.1c-0.2-0.2-0.4-0.3-0.6-0.4l0.1-0.1C36.2,65.3,36.4,65.4,36.6,65.6z
+			 M52.1,31.6c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L52.1,31.6z M35.8,64.9l-0.1,0.1c-0.3-0.2-0.5-0.4-0.5-0.4l-0.1,0l0.1-0.1
+			l0.1,0C35.3,64.5,35.4,64.7,35.8,64.9z M42.7,49.9l-0.1,0.2L42.4,50c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1
+			C42.8,49.6,42.7,49.8,42.7,49.9L42.7,49.9z M42.4,50.4c-0.1,0.2-0.3,0.4-0.4,0.5l-0.1-0.1c0.2-0.1,0.3-0.3,0.4-0.5L42.4,50.4
+			L42.4,50.4z M43,49.2l-0.2-0.1c0.1-0.2,0.1-0.4,0.1-0.6l0.2,0C43.1,48.7,43,49,43,49.2L43,49.2z M43.2,48.2l-0.2,0
+			c0-0.2,0-0.4,0.1-0.6l0.2,0C43.2,47.8,43.2,48,43.2,48.2L43.2,48.2z M41.7,51.1c-0.2,0.1-0.4,0.3-0.6,0.3l-0.1-0.2
+			c0.2-0.1,0.4-0.2,0.6-0.3C41.6,51,41.7,51.1,41.7,51.1L41.7,51.1z M51.1,31.6c-0.2,0-0.5,0-0.7,0.1l0-0.2c0.2,0,0.5-0.1,0.7-0.1
+			L51.1,31.6z M34.9,64.3l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.5l0.1-0.1C34.5,63.9,34.7,64.1,34.9,64.3L34.9,64.3z M43.2,47.2l-0.2,0
+			c0-0.2,0-0.4,0-0.7l0.2,0C43.2,46.8,43.2,47,43.2,47.2L43.2,47.2z M40.8,51.6c-0.2,0.1-0.5,0.1-0.7,0.1l0-0.2
+			c0.2,0,0.4-0.1,0.7-0.1L40.8,51.6z M43.2,46.2l-0.2,0c0-0.2-0.1-0.4-0.1-0.7l0.2,0C43.1,45.7,43.1,46,43.2,46.2L43.2,46.2z
+			 M50,31.8c-0.2,0.1-0.5,0.1-0.7,0.2l-0.1-0.2c0.2-0.1,0.4-0.1,0.7-0.2L50,31.8z M34.1,63.6L34,63.7c-0.2-0.2-0.4-0.3-0.5-0.5
+			l0.1-0.1C33.7,63.2,33.9,63.4,34.1,63.6L34.1,63.6z M43,45.2l-0.2,0c-0.1-0.2-0.1-0.4-0.2-0.7l0.2,0C42.9,44.7,42.9,45,43,45.2
+			L43,45.2z M39.8,51.7c-0.2,0-0.5,0-0.7-0.1l0-0.2c0.2,0,0.5,0.1,0.7,0.1L39.8,51.7z M49,32c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2
+			c0.2-0.1,0.4-0.2,0.6-0.2L49,32z M42.7,44.2l-0.2,0c-0.1-0.2-0.1-0.4-0.2-0.6l0.2,0C42.6,43.8,42.6,44,42.7,44.2L42.7,44.2z
+			 M33.3,62.8L33.2,63c-0.2-0.2-0.4-0.3-0.5-0.5l0.1-0.1C32.9,62.5,33.1,62.7,33.3,62.8L33.3,62.8z M48.1,32.4
+			c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.1c0.2-0.1,0.4-0.2,0.6-0.3L48.1,32.4z M38.7,51.6c-0.2-0.1-0.5-0.1-0.7-0.2l0.1-0.2
+			c0.2,0.1,0.5,0.2,0.7,0.2L38.7,51.6z M42.3,43.2l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6l0.2-0.1C42.1,42.8,42.2,43,42.3,43.2L42.3,43.2z
+			 M47.3,32.9c-0.2,0.1-0.4,0.3-0.5,0.4l-0.1-0.1c0.2-0.1,0.4-0.3,0.5-0.4L47.3,32.9z M46.5,33.5c-0.2,0.1-0.3,0.3-0.5,0.4l-0.1-0.1
+			c0.2-0.2,0.3-0.3,0.5-0.4L46.5,33.5L46.5,33.5z M32.5,62.1l-0.1,0.1c-0.2-0.2-0.3-0.3-0.5-0.5l0.1-0.1
+			C32.2,61.8,32.4,61.9,32.5,62.1L32.5,62.1z M37.6,51.2c-0.2-0.1-0.5-0.2-0.7-0.3l0.1-0.2c0.2,0.1,0.4,0.2,0.7,0.3L37.6,51.2z
+			 M41.9,42.3l-0.2,0.1c0-0.1-0.1-0.1-0.1-0.2c-0.1,0.1-0.2,0.2-0.3,0.2l-0.1-0.1c0.2-0.1,0.3-0.2,0.3-0.3c-0.1-0.1-0.1-0.2-0.2-0.3
+			l0.1-0.1c0,0.1,0.1,0.1,0.1,0.2l0.2,0c0,0,0,0.1,0,0.2C41.8,42.1,41.8,42.2,41.9,42.3z M45.7,34.2c-0.2,0.2-0.3,0.3-0.4,0.5
+			l-0.1-0.1c0.1-0.2,0.3-0.3,0.5-0.5L45.7,34.2z M45.1,34.9c-0.1,0.2-0.3,0.3-0.4,0.5l-0.1-0.1c0.1-0.2,0.3-0.4,0.4-0.5L45.1,34.9z
+			 M41.8,41.6l-0.2,0c0-0.2,0.1-0.4,0.2-0.6L42,41C41.9,41.2,41.9,41.4,41.8,41.6L41.8,41.6z M42.1,40.6l-0.2-0.1
+			c0.1-0.2,0.1-0.4,0.2-0.6l0.2,0.1C42.2,40.3,42.2,40.5,42.1,40.6L42.1,40.6z M44.5,35.7c-0.1,0.2-0.3,0.4-0.4,0.5L44,36.1
+			c0.1-0.2,0.2-0.4,0.4-0.5L44.5,35.7z M41.1,42.7c-0.2,0.1-0.4,0.3-0.5,0.4L40.4,43c0.2-0.1,0.4-0.3,0.5-0.4L41.1,42.7z M42.4,39.7
+			l-0.2-0.1c0.1-0.2,0.2-0.4,0.2-0.6l0.2,0.1C42.6,39.3,42.5,39.5,42.4,39.7z M44,36.5c-0.1,0.2-0.2,0.4-0.3,0.6L43.5,37
+			c0.1-0.2,0.2-0.4,0.3-0.6L44,36.5z M42.8,38.8l-0.2-0.1c0.1-0.2,0.2-0.4,0.3-0.6l0.2,0.1C43,38.4,42.9,38.6,42.8,38.8z M31.8,61.3
+			l-0.1,0.1c-0.2-0.2-0.3-0.4-0.5-0.5l0.1-0.1C31.5,61,31.6,61.1,31.8,61.3z M43.5,37.4c-0.1,0.2-0.2,0.4-0.3,0.6L43,37.9
+			c0.1-0.2,0.2-0.4,0.3-0.6L43.5,37.4z M41.3,41.4l-0.1,0.1c-0.1-0.2-0.3-0.4-0.4-0.5l0.1-0.1C41,41,41.1,41.2,41.3,41.4z
+			 M36.6,50.9c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L36.6,50.9z M40.3,43.3c-0.2,0.1-0.4,0.3-0.6,0.4l-0.1-0.1
+			c0.2-0.1,0.4-0.2,0.5-0.4L40.3,43.3z M39.4,43.8c-0.2,0.1-0.4,0.2-0.6,0.3L38.8,44c0.2-0.1,0.4-0.2,0.6-0.3L39.4,43.8z M31.1,60.5
+			L31,60.6c-0.2-0.2-0.3-0.4-0.4-0.6l0.2-0.1C30.8,60.1,31,60.3,31.1,60.5z M40.6,40.6l-0.1,0.1c-0.2-0.2-0.3-0.3-0.5-0.5l0.1-0.1
+			C40.2,40.2,40.4,40.4,40.6,40.6z M35.6,50.6c-0.2-0.1-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0.1,0.7,0.2L35.6,50.6z M38.5,44.3
+			c-0.2,0.1-0.4,0.2-0.6,0.3l-0.1-0.2c0.2-0.1,0.4-0.2,0.6-0.3L38.5,44.3z M30.6,59.6l-0.2,0.1l0-0.1c-0.1-0.2-0.2-0.4-0.3-0.5
+			l0.2-0.1C30.3,59.2,30.4,59.4,30.6,59.6C30.5,59.6,30.5,59.6,30.6,59.6z M37.6,44.7c-0.2,0.1-0.5,0.1-0.7,0.2l-0.1-0.2
+			c0.2,0,0.4-0.1,0.7-0.2L37.6,44.7z M39.8,39.9L39.7,40c-0.2-0.1-0.4-0.3-0.6-0.4l0.1-0.1C39.4,39.6,39.6,39.7,39.8,39.9L39.8,39.9
+			z M34.5,50.4c-0.2,0-0.5-0.1-0.7-0.1l0-0.2c0.2,0,0.5,0,0.7,0.1L34.5,50.4z M30,58.7l-0.2,0.1c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0
+			C29.8,58.3,29.9,58.5,30,58.7L30,58.7z M36.6,45c-0.2,0-0.5,0.1-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L36.6,45z M33.5,50.3
+			c-0.2,0-0.5,0-0.7,0l0-0.2c0.2,0,0.5,0,0.7,0L33.5,50.3z M38.8,39.3l-0.1,0.1l-0.2-0.1c-0.1-0.1-0.3-0.1-0.4-0.2l0.1-0.2
+			c0.2,0.1,0.3,0.1,0.5,0.2L38.8,39.3z M29.6,57.8l-0.2,0c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0C29.4,57.4,29.5,57.6,29.6,57.8L29.6,57.8z
+			 M35.5,45c-0.2,0-0.5-0.1-0.7-0.2l0.1-0.1c0.2,0.1,0.4,0.2,0.7,0.2C35.5,44.8,35.5,45,35.5,45z M32.4,50.4c-0.2,0-0.4,0.1-0.7,0.1
+			l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.1L32.4,50.4z M29.2,56.8l-0.2,0c-0.1-0.2-0.1-0.4-0.2-0.7l0.2,0C29.1,56.4,29.1,56.6,29.2,56.8z
+			 M37.8,39c-0.2-0.1-0.5-0.1-0.7-0.2l0-0.2c0.2,0.1,0.5,0.1,0.7,0.2L37.8,39z M34.5,44.5l-0.1,0.1c-0.2-0.1-0.4-0.3-0.6-0.5L34,44
+			C34.2,44.2,34.4,44.4,34.5,44.5z M28.9,55.9l-0.2,0c-0.1-0.2-0.1-0.4-0.1-0.7l0.2,0C28.8,55.4,28.9,55.7,28.9,55.9z M31.4,50.6
+			c-0.2,0.1-0.4,0.2-0.6,0.2l-0.1-0.2c0.2-0.1,0.4-0.2,0.7-0.3L31.4,50.6L31.4,50.6z M36.7,38.7c-0.2,0-0.5-0.1-0.7-0.1l0-0.2
+			c0.2,0,0.5,0.1,0.7,0.1L36.7,38.7z M28.8,54.9l-0.2,0c0-0.2,0-0.4,0-0.7l0.2,0C28.7,54.4,28.7,54.7,28.8,54.9z M30.5,51
+			c-0.2,0.1-0.4,0.2-0.5,0.4l-0.1-0.1c0.2-0.1,0.4-0.3,0.6-0.4L30.5,51z M33.8,43.8l-0.1,0.1l-0.1-0.1c-0.1-0.2-0.2-0.3-0.3-0.5
+			l0.2-0.1C33.5,43.4,33.6,43.5,33.8,43.8C33.7,43.7,33.8,43.7,33.8,43.8L33.8,43.8z M28.8,53.9l-0.2,0c0-0.2,0-0.4,0.1-0.7l0.2,0
+			C28.8,53.5,28.8,53.7,28.8,53.9z M29.7,51.6c-0.1,0.1-0.3,0.3-0.4,0.5L29.2,52c0.1-0.2,0.3-0.4,0.4-0.5L29.7,51.6z M29,52.9
+			l-0.2-0.1c0.1-0.2,0.1-0.4,0.2-0.5l0-0.1l0.2,0.1l0,0.1C29.1,52.6,29,52.8,29,52.9L29,52.9z M35.7,38.6c-0.2,0-0.5,0-0.7,0l0-0.2
+			c0.2,0,0.5,0,0.7,0L35.7,38.6z M33.2,42.9L33.1,43c-0.1-0.2-0.2-0.4-0.3-0.6l0.2,0C33,42.5,33.1,42.7,33.2,42.9z M34.6,38.7
+			c-0.2,0-0.4,0.1-0.7,0.1l-0.1-0.2c0.2-0.1,0.5-0.1,0.7-0.2L34.6,38.7z M32.8,42l-0.2,0c-0.1-0.2-0.2-0.4-0.2-0.7l0.2,0
+			C32.6,41.6,32.7,41.8,32.8,42L32.8,42z M33.7,39c-0.2,0.1-0.4,0.2-0.5,0.3L33,39.2c0.2-0.1,0.4-0.3,0.6-0.4L33.7,39z M32.5,41
+			l-0.2,0c0-0.2,0-0.5,0-0.7l0.2,0C32.5,40.6,32.5,40.8,32.5,41z M32.9,39.5c-0.1,0.2-0.2,0.3-0.3,0.5L32.4,40
+			c0.1-0.2,0.2-0.4,0.3-0.6L32.9,39.5z M35.7,56.6c-0.3,0.6-1,0.8-1.6,0.5c0,0,0,0,0,0c-0.6-0.2-0.9-0.9-0.7-1.5
+			c0.2-0.6,0.9-0.9,1.5-0.7c0.1,0,0.2,0.1,0.2,0.1C35.7,55.3,35.9,56,35.7,56.6z M33.7,55.7c-0.3,0.4-0.1,1,0.3,1.3
+			c0.4,0.3,1,0.1,1.3-0.3c0.3-0.4,0.1-1-0.3-1.3c0,0-0.1,0-0.1,0C34.5,55.1,34,55.2,33.7,55.7z"/>
+	</g>
+</g>
+</svg>

src/main/resources/static/img/order/icon-set.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="_x30_3030b4a-9996-4111-83fa-29dc66776d7b"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000.8 738.8"
+	 style="enable-background:new 0 0 1000.8 738.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.1;fill:#E15616;enable-background:new    ;}
+	.st1{fill:none;stroke:#535461;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:#EC8C61;}
+	.st3{fill:#6C63FF;}
+	.st4{fill:#F6F7F9;}
+	.st5{opacity:0.4;}
+	.st6{fill:#E15616;}
+	.st7{opacity:0.8;}
+	.st8{fill:#FFC233;}
+	.st9{fill:none;stroke:#535461;stroke-miterlimit:10;}
+	.st10{fill:#E15621;enable-background:new    ;}
+	.st11{fill:#2D3036;}
+	.st12{fill:#FFB6B6;}
+	.st13{fill:#FFB9B9;}
+	.st14{opacity:0.1;enable-background:new    ;}
+	.st15{fill:#DB8B8B;}
+	.st16{fill:#3B424C;}
+	.st17{fill:#E15621;}
+	.st18{fill:#4A4F58;}
+	.st19{fill:#2F2E41;}
+	.st20{fill:#FFFFFF;}
+	.st21{opacity:0.4;fill:#B2B2B2;}
+</style>
+<title>roganize resume</title>
+<path class="st0" d="M27.7,463.9c-12,2-27,7.5-26.9,20.5c0.1,6.6,4.4,12.2,8.7,17c18.1,20.6,38.7,38.8,61.3,54.2
+	c10.8,7.3,22.4,14.3,29.6,25.7s9,25.8,9.6,39.5c1.4,32.5-2.4,65-11.3,96.3c35.2,6.7,74.5,12.6,103.9-8.6
+	c17.6-12.7,29.5-34,49.1-42.8c13.1-5.9,27.9-5.4,42.1-4.6c67.5,3.6,134.8,10.2,202,20c28.1,4.1,56.8,8.7,84.6,3.4
+	c27.8-5.3,55.2-22.6,65.5-50.6c1.6-4.3,3-9.1,6.5-11.7c3.2-2.3,7.4-2.3,11.3-2.1l235.1,8.1c12.9,0.4,26.2,0.8,38-4.5
+	c11.4-5.1,20.2-15,28.7-24.7c19.3-22.1,40.2-49.2,34.5-79.1c-4.6-24-24.9-40.8-45.1-52.5s-42.4-21.3-57.2-40.1
+	c-22.5-28.6-21.7-69.5-23.1-106.5c-1.3-33.6-5.4-67-12.3-99.8c-6.1-28.9-14.6-57.8-30.5-82.2S791.4,94.6,763.9,91
+	c-35.9-4.7-72.1,17.7-107.2,8.2c-29.7-8-50.1-36.4-74.8-56.1c-43.7-35-101.1-42.3-155.3-43c-57.5-0.7-116.5,5.1-167.8,32.1
+	c-11.7,6.2-23.2,13.7-31.4,24.6C215,73.5,212,96,203.8,115.6C171,194.4,64.2,211.4,29.5,289.4c-12.3,27.7-12.2,59.9-3.2,89
+	c9.6,31.3,36.8,48.5,47.6,75.8C62.3,461.7,41.7,461.6,27.7,463.9z"/>
+<path class="st1" d="M885.6,370.9c0,0,4.8-63.8,40.8-98.4c15.2-14.4,25.3-33.4,28.8-54.1c1.6-9.8,2.2-19.8,2-29.7"/>
+<path class="st2" d="M979.8,166.7c-2.7,7-23.1,22.6-23.1,22.6s-5-25.2-2.4-32.2c2.7-7,10.5-10.6,17.6-7.9
+	C979,151.8,982.5,159.7,979.8,166.7L979.8,166.7z"/>
+<path class="st2" d="M986.2,213.6c-6.1,4.5-31.7,6.4-31.7,6.4s9.5-23.9,15.5-28.4c6.1-4.5,14.6-3.2,19,2.9
+	C993.5,200.6,992.2,209.2,986.2,213.6L986.2,213.6z"/>
+<path class="st2" d="M960.1,279.8c-7.5,0.8-30.6-10.5-30.6-10.5s20.3-15.8,27.7-16.6c7.5-0.8,14.2,4.6,15,12.1
+	C973,272.3,967.5,279,960.1,279.8L960.1,279.8L960.1,279.8z"/>
+<path class="st2" d="M929.1,325.5c-7.2,2-31.9-5.1-31.9-5.1s17.3-19,24.5-21.1c7.2-2,14.8,2.2,16.8,9.4S936.3,323.5,929.1,325.5z"/>
+<path class="st2" d="M927.2,211.3c3.2,6.8,24.8,20.8,24.8,20.8s3.1-25.5-0.1-32.3c-3.2-6.8-11.3-9.7-18.1-6.5
+	C927,196.4,924,204.5,927.2,211.3z"/>
+<path class="st2" d="M891.6,265.2c5.1,5.5,29.8,12.4,29.8,12.4s-4.7-25.3-9.8-30.8c-5.1-5.5-13.7-5.9-19.2-0.8
+	C886.9,251,886.5,259.6,891.6,265.2L891.6,265.2z"/>
+<path class="st3" d="M864.2,322.3c4.1,6.3,27.3,17.3,27.3,17.3s-0.4-25.7-4.4-32c-4.1-6.3-12.5-8.1-18.8-4.1
+	S860.1,315.9,864.2,322.3L864.2,322.3z"/>
+<rect x="172" y="92.7" class="st4" width="725.2" height="35.2"/>
+<g class="st5">
+	<rect x="172" y="92.7" class="st6" width="725.2" height="35.2"/>
+</g>
+<rect x="174.6" y="127.9" class="st4" width="725.2" height="416"/>
+<circle class="st4" cx="189.4" cy="110.1" r="7.8"/>
+<circle class="st4" cx="210.2" cy="110.1" r="7.8"/>
+<circle class="st4" cx="231.1" cy="110.1" r="7.8"/>
+<g class="st7">
+	<rect x="665.4" y="265.7" class="st8" width="195.6" height="240.4"/>
+</g>
+<path class="st2" d="M15.6,643.8c0,0-57.7,34.8,48.6,88.3c0,0,23.4-43.5-2.5-78.9c-10.4-14.3-29.9-18.6-45.3-9.9L15.6,643.8z"/>
+<path class="st9" d="M16.3,643.1c0,0,49.3,37.8,48,89.1"/>
+<path class="st1" d="M67,732.8c0,0-18.1-61.4,3.4-106.5c9.1-18.9,11.9-40.2,7.8-60.8c-2-9.8-4.9-19.3-8.6-28.5"/>
+<path class="st3" d="M83,508.4c0,7.5-13.6,29.3-13.6,29.3s-13.6-21.8-13.6-29.3c0-7.5,6.1-13.6,13.6-13.6
+	C76.9,494.8,83,500.9,83,508.4L83,508.4L83,508.4z"/>
+<path class="st3" d="M105.5,550.1c-4.1,6.3-27.4,17.2-27.4,17.2s0.4-25.7,4.5-32c4.1-6.3,12.5-8.1,18.8-4S109.6,543.8,105.5,550.1
+	L105.5,550.1z"/>
+<path class="st3" d="M104.5,621.3c-6.7,3.4-32.3,1-32.3,1s13.3-22,20.1-25.4c6.7-3.4,14.9-0.7,18.3,6
+	C113.9,609.6,111.2,617.8,104.5,621.3L104.5,621.3L104.5,621.3z"/>
+<path class="st3" d="M91.7,674.9c-6,4.5-31.7,6.5-31.7,6.5s9.4-23.9,15.5-28.4c6-4.5,14.6-3.2,19,2.8S97.7,670.5,91.7,674.9
+	L91.7,674.9z"/>
+<path class="st3" d="M49.6,568.8c5.4,5.2,30.5,10.7,30.5,10.7s-6.1-25-11.6-30.2c-5.4-5.2-14-5.1-19.3,0.3S44.1,563.5,49.6,568.8
+	L49.6,568.8L49.6,568.8z"/>
+<path class="st3" d="M35.3,631.7c6.7,3.4,32.3,1,32.3,1s-13.3-22-20.1-25.4c-6.7-3.4-14.9-0.7-18.3,6
+	C25.9,620.1,28.6,628.3,35.3,631.7L35.3,631.7z"/>
+<path class="st3" d="M29.9,694.8c6,4.5,31.7,6.5,31.7,6.5s-9.4-23.9-15.5-28.4c-6-4.5-14.6-3.2-19,2.8
+	C22.5,681.8,23.8,690.4,29.9,694.8L29.9,694.8z"/>
+<path class="st10" d="M83,508.4c0,7.5-13.6,29.3-13.6,29.3s-13.6-21.8-13.6-29.3c0-7.5,6.1-13.6,13.6-13.6
+	C76.9,494.8,83,500.9,83,508.4L83,508.4L83,508.4z"/>
+<path class="st10" d="M105.5,550.1c-4.1,6.3-27.4,17.2-27.4,17.2s0.4-25.7,4.5-32c4.1-6.3,12.5-8.1,18.8-4S109.6,543.8,105.5,550.1
+	L105.5,550.1z"/>
+<path class="st10" d="M104.5,621.3c-6.7,3.4-32.3,1-32.3,1s13.3-22,20.1-25.4c6.7-3.4,14.9-0.7,18.3,6
+	C113.9,609.6,111.2,617.8,104.5,621.3L104.5,621.3L104.5,621.3z"/>
+<path class="st10" d="M91.7,674.9c-6,4.5-31.7,6.5-31.7,6.5s9.4-23.9,15.5-28.4c6-4.5,14.6-3.2,19,2.8S97.7,670.5,91.7,674.9
+	L91.7,674.9z"/>
+<path class="st10" d="M49.6,568.8c5.4,5.2,30.5,10.7,30.5,10.7s-6.1-25-11.6-30.2c-5.4-5.2-14-5.1-19.3,0.3S44.1,563.5,49.6,568.8
+	L49.6,568.8L49.6,568.8z"/>
+<path class="st10" d="M35.3,631.7c6.7,3.4,32.3,1,32.3,1s-13.3-22-20.1-25.4c-6.7-3.4-14.9-0.7-18.3,6
+	C25.9,620.1,28.6,628.3,35.3,631.7L35.3,631.7z"/>
+<path class="st10" d="M29.9,694.8c6,4.5,31.7,6.5,31.7,6.5s-9.4-23.9-15.5-28.4c-6-4.5-14.6-3.2-19,2.8
+	C22.5,681.8,23.8,690.4,29.9,694.8L29.9,694.8z"/>
+<path class="st1" d="M108.8,734c0,0-18.1-61.3,3.4-106.5c9.1-18.9,11.9-40.2,7.8-60.8c-2-9.8-4.9-19.3-8.6-28.5"/>
+<path class="st2" d="M124.8,509.6c0,7.5-13.6,29.3-13.6,29.3s-13.6-21.8-13.6-29.3c0-7.5,6.1-13.6,13.6-13.6
+	C118.7,496,124.8,502.1,124.8,509.6L124.8,509.6z"/>
+<path class="st2" d="M147.3,551.3c-4.1,6.3-27.4,17.2-27.4,17.2s0.4-25.7,4.5-32c4.1-6.3,12.5-8.1,18.8-4
+	C149.6,536.5,151.4,545,147.3,551.3L147.3,551.3z"/>
+<path class="st2" d="M146.3,622.4c-6.7,3.4-32.3,1-32.3,1s13.3-22,20.1-25.4c6.7-3.4,14.9-0.7,18.3,6
+	C155.8,610.8,153.1,619,146.3,622.4z"/>
+<path class="st2" d="M133.5,676.1c-6,4.5-31.7,6.5-31.7,6.5s9.4-23.9,15.5-28.4c6-4.5,14.6-3.2,19,2.8
+	C140.8,663.1,139.5,671.6,133.5,676.1L133.5,676.1z"/>
+<path class="st2" d="M91.4,569.9c5.4,5.2,30.5,10.7,30.5,10.7s-6.1-25-11.6-30.2c-5.4-5.2-14-5.1-19.3,0.3S86,564.7,91.4,569.9
+	L91.4,569.9L91.4,569.9z"/>
+<path class="st2" d="M77.1,632.9c6.7,3.4,32.3,1,32.3,1s-13.3-22-20.1-25.4c-6.7-3.4-14.9-0.7-18.3,6
+	C67.7,621.3,70.4,629.5,77.1,632.9L77.1,632.9L77.1,632.9z"/>
+<path class="st2" d="M71.7,696c6,4.5,31.7,6.5,31.7,6.5s-9.4-23.9-15.5-28.4c-6-4.5-14.6-3.2-19,2.8C64.3,683,65.6,691.5,71.7,696
+	L71.7,696z"/>
+<rect x="24.5" y="731.8" class="st11" width="953" height="7"/>
+<rect x="701.4" y="344.7" class="st6" width="195.6" height="240.4"/>
+<path class="st12" d="M548.1,706.3l-2.2,6.5l7.1,7.1l23.4,5.4l16.8-1.6l-1.1-6l0,0c-0.7-2.6-2.7-4.6-5.3-5.3
+	c-6.9-1.6-20.1-5.3-22.9-10.5L548.1,706.3z"/>
+<path class="st11" d="M587.8,722l-3.3-4.3l3.3-5c0,0,9.8,3.9,14.1,3.4c4.3-0.6,6.5,7.1-1.6,9.2c-8.2,2.2-54.3,0-54.3,0
+	s-8.2-3.8,0-14.1l7.1,5.4c0,0,12,6.5,17.9,5.4L587.8,722z"/>
+<path class="st13" d="M602.4,731.3l-16.8,1.6l-23.3-5.5l-7.1-7l0.6-1.7l0.8-2.4l0.8-2.4l15.8-4.3c0.8,1.3,1.9,2.4,3.2,3.2
+	c5.1,3.5,14.3,6,19.7,7.3c0.2,0.1,0.5,0.1,0.7,0.2c2.3,0.8,4.1,2.7,4.7,5.1L602.4,731.3z"/>
+<path class="st14" d="M602.4,731.3l-16.8,1.6l-23.3-5.5l-7.1-7l0.6-1.7l6.5,5c0,0,12,6.5,17.9,5.4H597l-3.3-4.3l2.9-4.5
+	c2.3,0.8,4.1,2.7,4.7,5.1L602.4,731.3z"/>
+<path class="st11" d="M597,729.6l-3.3-4.3l3.3-5c0,0,9.8,4,14.1,3.4c4.3-0.5,6.5,7.1-1.6,9.2c-8.2,2.2-54.3,0-54.3,0
+	s-8.2-3.8,0-14.1l7.1,5.4c0,0,12,6.5,17.9,5.4L597,729.6z"/>
+<path class="st15" d="M583.4,414.5c0,0-26.1,2.7-22.3-8.1c1.1-3.1,1.3-6.4,0.8-9.6c-0.7-4-2.3-7.8-4.6-11l24.5,3.8
+	c-1.5,2.4-2.6,5.1-3.3,7.9C575.6,408.9,583.4,414.5,583.4,414.5z"/>
+<path class="st16" d="M538.9,538.4c0,0,0.5,23.4,6,34.8l1.1,33.1c0,0-1.6,30.4-4.9,36.4c-3.3,6,7.1,56.5,7.1,56.5v8.7
+	c0,0,17.4,6.5,22.3-1.1l-4.9-64.7l2.2-89.6L538.9,538.4z"/>
+<path class="st17" d="M528,463.4l-3.3,8.7l-2.7,18.5c-0.7,5.2,1.1,10.5,4.9,14.1c6.5,6.5,15.2,20.1,15.2,20.1l10.3-31
+	c0,0-10.3-1.6-8.7-8.7s1.1-20.1,1.1-20.1L528,463.4z"/>
+<path class="st14" d="M576.3,712.7c-7,11-17.8,4.8-19.7,3.5l0.8-2.4l15.8-4.3C573.9,710.8,575,711.9,576.3,712.7z"/>
+<path class="st18" d="M598.1,559.6c-0.5,7.6-9.8,35.3-9.8,35.3l-6.5,22.8c-4.7,16.1-7.1,32.8-7.2,49.6c0,5.6-0.5,11.3-2.1,15.6
+	c-4.3,12,4.3,28.3,4.3,28.3c-7.6,13.6-20.6,4.3-20.6,4.3v-8.7c0,0-10.3-47.3-7.6-56.5s3.8-34.2,3.8-34.2V571
+	c-8.7-8.7-14-20.2-14.9-32.4c-0.1-1.8-0.2-3.7-0.3-5.6c-0.4-12.3,7.9-26.6,11.2-31.7c0.8-1.2,1.3-1.9,1.3-1.9l48,19h0.1v1.9v4.1
+	L598.1,559.6z"/>
+<path class="st14" d="M581.8,389.5c-1.5,2.4-2.6,5.1-3.3,7.9c-5.4,2-11.3,1.8-16.5-0.6c-0.7-4-2.3-7.8-4.6-11L581.8,389.5z"/>
+<circle class="st13" cx="570.9" cy="376.5" r="21.2"/>
+<path class="st14" d="M598.1,524.3h-0.2c-22.8,4.7-51.4-19.1-51.4-19.1c0.8-1.3,1.4-2.6,2-4c0.8-1.2,1.3-1.9,1.3-1.9l48,19l0.1,1.9
+	L598.1,524.3z"/>
+<path class="st17" d="M592.1,414c0,0-30.4-18.5-40.2-10.9l-13.6,17.4c0,0-8.7,2.7-7.1,20.1l-6.5,31.5l19.6,4.9
+	c0,0,11.4,10.9,2.2,26.6c0,0,28.8,23.9,51.6,19l-1.7-25.5c0,0-4.9-14.1,3.8-27.2s0.5-25.5-7.6-30.4
+	C592.7,439.5,588.8,418.9,592.1,414z"/>
+<path class="st13" d="M593.7,524.8c0,0,11.4,2.2,16.8,10.9c1.6,2.6,3.5,5,5.7,7.1c1.8,1.6,1.9,4.3,0.3,6.1c-0.3,0.3-0.6,0.6-1,0.8
+	c-4.3,2.6-11.3,4.2-20.2-3.1C580.2,534.1,593.7,524.8,593.7,524.8z"/>
+<path class="st14" d="M576.9,424.3c0,0-10.9-1.1-13.6,27.2s-7.1,34.8-7.1,34.8s-2.7,14.7,3.8,23.4c6.5,8.7,19,27.2,19,27.2
+	s13.6,3.8,16.3-9.8l-16.8-31.5c0,0-2.7-10.9,3.8-18.5S593.7,418.9,576.9,424.3z"/>
+<path class="st17" d="M578,422.7c0,0-10.9-1.1-13.6,27.2s-7.1,34.8-7.1,34.8s-2.7,14.7,3.8,23.4c6.5,8.7,19,27.2,19,27.2
+	s13.6,3.8,16.3-9.8l-16.8-31.5c0,0-2.7-10.9,3.8-18.4S594.8,417.2,578,422.7z"/>
+<path class="st14" d="M586.9,443.1c0,0,1.1,16.8-3.8,26.1s-4.9,21.2,0,27.7"/>
+<path class="st14" d="M589.7,422.4c0,0-4.3-4.4-16.8-4.9s-17.9-4.4-17.9-4.4"/>
+<path class="st19" d="M558.9,348c-3.3,0.4-7.1,1.5-8.3,4.6c-0.3,1.2-0.6,2.4-0.8,3.6c-1.2,4.8-6.6,7-9.9,10.6
+	c-2.9,3.2-4.2,7.5-5.1,11.8c-2.7,12.1-3.4,24.6-1.9,36.9c1.1,9,3.2,17.9,3.8,26.9s-0.5,18.6-5.5,26.2c-2.1,3.3-4.9,6.1-6.4,9.7
+	c3.1,2.5,7.4,2.9,11.4,3c4.7,0.2,9.3,0.2,14,0c2.5-0.1,5-0.2,7.1-1.5c1.6-1,2.9-2.4,3.7-4c2.7-4.5,3.3-10,3.2-15.3s-1-10.5-1-15.8
+	c0-2.9,0.2-5.9,1.8-8.3c1.2-1.7,3-2.8,4.5-4.2c5.8-5.1,7.8-13.4,8-21.2s-1.1-15.5-0.4-23.3c0.3-3,1.4-6.7,4.4-7.3
+	c1,0,1.9-0.2,2.8-0.4c2.4-0.9,2.2-4.3,2.8-6.8c0.8-2.8,3.1-4.9,3.8-7.7c1.6-6.6-6.8-14.4-12.3-16.7
+	C573.3,346.8,564.8,347.3,558.9,348z"/>
+<g class="st7">
+	<path class="st20" d="M750,413.2h17.6l31.5,58.4l31.5-58.4h17.6l-36.4,64h26.6v8.9h-31.5v17.5h31.5v8.9h-31.5v28h-15.7v-28H760
+		v-8.9h31.4V486H760v-8.9h26.4L750,413.2z"/>
+</g>
+<path class="st21" d="M558.5,204.6H208.2c-6.1,0-11-4.9-11-11v0c0-6.1,4.9-11,11-11h350.4c6.1,0,11,4.9,11,11v0
+	C569.5,199.7,564.6,204.6,558.5,204.6z"/>
+<path class="st21" d="M558.5,262.1H208.2c-6.1,0-11-4.9-11-11v0c0-6.1,4.9-11,11-11h350.4c6.1,0,11,4.9,11,11v0
+	C569.5,257.2,564.6,262.1,558.5,262.1z"/>
+<path class="st21" d="M558.5,319.6H208.2c-6.1,0-11-4.9-11-11v0c0-6.1,4.9-11,11-11h350.4c6.1,0,11,4.9,11,11v0
+	C569.5,314.7,564.6,319.6,558.5,319.6z"/>
+<path class="st21" d="M442.3,458H207.2c-5.5,0-10-4.5-10-10v0c0-5.5,4.5-10,10-10h235.2c5.5,0,10,4.5,10,10v0
+	C452.3,453.6,447.9,458,442.3,458z"/>
+<path class="st21" d="M442.3,416.2H207.2c-5.5,0-10-4.5-10-10l0,0c0-5.5,4.5-10,10-10h235.2c5.5,0,10,4.5,10,10l0,0
+	C452.3,411.7,447.9,416.2,442.3,416.2z"/>
+<path class="st21" d="M442.3,500.9H207.2c-5.5,0-10-4.5-10-10v0c0-5.5,4.5-10,10-10h235.2c5.5,0,10,4.5,10,10v0
+	C452.3,496.4,447.9,500.9,442.3,500.9z"/>
+<path class="st21" d="M850,204.6H676.4c-6.1,0-11-4.9-11-11v0c0-6.1,4.9-11,11-11H850c6.1,0,11,4.9,11,11v0
+	C861,199.7,856.1,204.6,850,204.6z"/>
+</svg>

src/main/resources/static/js/account/login.js

@@ -61,7 +61,7 @@ var loginPage = new Vue({
                     if(_self.maxtime == 0){
                         clearInterval(timer);
                         _self.maxtime = 60;
-                        $('#qrCodeWrap').append('<div class="model"><div class="refresh-div"><img class="refresh" src="/web/login/img/shua.png" alt=""><p>二维码已失效,点击刷新</p></div></div>');
+                        $('#qrCodeWrap').append('<div class="model"><div class="refresh-div"><img class="refresh" src="/img/base/shua.png" alt=""><p>二维码已失效,点击刷新</p></div></div>');
                         $('#qrCodeWrap .model').click(function () {
                             $(this).remove();
                             _self.toQrCodeLogin();
@@ -90,8 +90,9 @@ var loginPage = new Vue({
                         };
                         _self.setStorages( _self.userData);
                         // 登录成功页面跳转
-                        var loginBeforePath = getCookie("loginBeforePath");
-                        if (loginBeforePath) {
+                        var loginBeforePath = getBaseCookie("loginBeforePath");
+                        if (loginBeforePath && loginBeforePath!=='undefined') {
+                            delBaseCookie("loginBeforePath");
                             window.location.href = loginBeforePath;
                         } else if (_self.userData.userIdentity*1 === 3) {
                             location.href = '/supplier/dashboard.html';
@@ -151,8 +152,9 @@ var loginPage = new Vue({
                         };
                         _self.setStorages( _self.userData);
                         // 登录成功页面跳转
-                        var loginBeforePath = getCookie("loginBeforePath");
-                        if (loginBeforePath) {
+                        var loginBeforePath = getBaseCookie("loginBeforePath");
+                        if (loginBeforePath && loginBeforePath!=='undefined') {
+                            delBaseCookie("loginBeforePath");
                             window.location.href = loginBeforePath;
                         } else if (_self.userData.userIdentity*1 === 3) {
                             location.href = '/supplier/dashboard.html';

src/main/resources/static/js/base.js

@@ -8,19 +8,19 @@ var GLOBAL_SHOP_ID = 0;
 if(localStorage.getItem('userInfo')){
     globalUserData = JSON.parse(localStorage.getItem('userInfo'));
     GLOBAL_TOKEN = globalUserData.token;
-    GLOBAL_USER_ID = globalUserData.userId;
-    GLOBAL_USER_IDENTITY = globalUserData.userIdentity;
-    GLOBAL_SHOP_ID = globalUserData.shopId;
+    GLOBAL_USER_ID = globalUserData.userId*1;
+    GLOBAL_USER_IDENTITY = globalUserData.userIdentity*1;
+    GLOBAL_SHOP_ID = globalUserData.shopId*1;
 } else {
-    if(!getCookie("weChatAutoLogin")){
+    if(!getBaseCookie("weChatAutoLogin")){
         var userAgent = navigator.userAgent.toLowerCase();
         if (userAgent.match(/MicroMessenger/i)) {
             // 微信浏览器自动授权登录
             var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
             $.get(spiServer+'/user/authorizationLink?redirectUri='+urlForWeChat, function(r){
                 if(r.code===0 && r.data){
-                    setCookie("loginBeforePath", window.location.href);
-                    setCookie("weChatAutoLogin", 1);
+                    setBaseCookie("loginBeforePath", window.location.href);
+                    setBaseCookie("weChatAutoLogin", 1);
                     window.location.href = r.data;
                 }
             });
@@ -116,6 +116,7 @@ var globalHead = new Vue({
         // 退出登录
         userLogOut: function(){
             localStorage.removeItem('userInfo');
+            delBaseCookie("loginBeforePath");
             this.loginStatus = false;
             window.location.href = "/index.html";
         },
@@ -196,7 +197,7 @@ $(function(){
                     text: btnTxt,
                     btnClass: 'btn-confirm-login',
                     action: function(){
-                        setCookie("loginBeforePath", window.location.href);
+                        setBaseCookie("loginBeforePath", window.location.href);
                         window.location.href = '/login.html';
                     }
                 },
@@ -210,12 +211,13 @@ $(function(){
     // 去登录弹窗
     $('body').on("click", '.toLogin',function () {
         //loginAert('<span>你还未登录</span><span>请登录后再进行购买</span>', '去登录');
-        setCookie("loginBeforePath", window.location.href);
+        setBaseCookie("loginBeforePath", window.location.href);
         window.location.href = '/login.html';
     });
     // 退出登录
     $('body').on("click", '.toLogOut',function () {
         localStorage.removeItem('userInfo');
+        delBaseCookie("loginBeforePath");
         globalHead.loginStatus = false;
         window.location.href = "/index.html";
     });
@@ -324,7 +326,7 @@ $(function(){
 
 });
 // 公共方法
-function setCookie(cname,cvalue,exdays){
+function setBaseCookie(cname,cvalue,exdays){
     if (exdays) {
         var d = new Date();
         d.setTime(d.getTime()+(exdays*24*60*60*1000));
@@ -334,15 +336,27 @@ function setCookie(cname,cvalue,exdays){
         document.cookie = cname+"="+cvalue+"; path=/";
     }
 }
-function getCookie(cname){
-    var name = cname + "=";
-    var ca = document.cookie.split(';');
-    for(var i=0; i<ca.length; i++) {
-        var c = ca[i].trim();
-        if (c.indexOf(name)==0) { return c.substring(name.length,c.length); }
+function getBaseCookie(cname){
+    if (document.cookie) {
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for(var i=0; i<ca.length; i++) {
+            var c = ca[i].trim();
+            if (c && c.indexOf(name)===0) {
+                return c.substring(name.length,c.length);
+            }
+        }
     }
     return "";
 }
+function delBaseCookie(cname){
+    var exp = new Date();
+    exp.setTime(exp.getTime() - 1);
+    var cval=getBaseCookie(cname);
+    if(cval!=null) {
+        document.cookie= cname + "="+cval+";expires="+exp.toGMTString();
+    }
+}
 function getDateStr(dd, addCount) {
     dd.setDate(dd.getDate() + addCount);//获取addCount天后的日期
     var y = dd.getFullYear();
@@ -490,6 +504,7 @@ function tokenAjax(type, url, params, callback, errorBack){
         success : function (res) {
             if(res.code === -99){
                 localStorage.removeItem('userInfo');
+                delBaseCookie("loginBeforePath");
                 window.location.href ='/login.html';
             }else{
                 callback(res);
@@ -557,14 +572,15 @@ function setProductPrice(productList, productIds, userId, callback){
 }
 // 登录后返回登录前页面
 function toBeforePath(){
-    var beforePath = getCookie("loginBeforePath");
-    if (!beforePath) {
-        beforePath = '/index.html';
+    var loginBeforePath = getBaseCookie("loginBeforePath");
+    if (loginBeforePath && loginBeforePath!=='undefined') {
+        delBaseCookie("loginBeforePath");
+        window.location.href = loginBeforePath;
     }
-    window.location.href = beforePath;
+    window.location.href = '/index.html';
 }
 function toLogin() {//去登录
-    setCookie("loginBeforePath", window.location.href);
+    setBaseCookie("loginBeforePath", window.location.href);
     window.location.href = '/login.html';
 }
 function  upgrade () { //升级会员
@@ -572,6 +588,7 @@ function  upgrade () { //升级会员
 }
 function toLogOut() {//登出
     localStorage.removeItem('userInfo');
+    delBaseCookie("loginBeforePath");
     this.loginStatus = false;
     window.location.href = "/index.html";
 }

src/main/resources/static/js/center.js

@@ -0,0 +1,15 @@
+;
+$(function(){
+    jqMultipleShow("click", ".navList", ".tab", ".con");
+    //GLOBAL_USER_IDENTITY: 2-会员机构；3-供应商；4-普通机构
+    var pageFlag = window.location.pathname.split("/")[1];
+    if (pageFlag == "supplier" && GLOBAL_USER_IDENTITY!==3) {
+        window.location.href = "/user/dashboard.html";
+    }
+    if (pageFlag == "user" && GLOBAL_USER_IDENTITY===3) {
+        window.location.href = "/supplier/dashboard.html";
+    }
+});
+
+
+

src/main/resources/static/js/flea-market/list.js

@@ -27,8 +27,9 @@ var fleaMarketList = new Vue({
       productsList:[],
       tabchild:{},
       listRecord: 0,
-     pageInput: '1',
+      pageInput: '1',
       params:{},
+      noMore:false,
 
      },
      computed: {
@@ -130,6 +131,33 @@ var fleaMarketList = new Vue({
      },
      mounted:function () {
           var _this = this;
-          _this.gettabList()
+          _this.gettabList();
+                    if(!isPC){
+            //移动端上垃加载更多
+            $(window).on('scroll', function(){
+                var scrollTop = $(this).scrollTop();
+                var scrollHeight = $(document).height();
+                var windowHeight = window.innerHeight;
+                if (scrollTop + windowHeight >= scrollHeight) {
+                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
+                    var totalPage = Math.ceil(_this.listRecord / _this.listQuery.pageSize)?Math.ceil(_this.listRecord / _this.listQuery.pageSize):1;
+                    var next = _this.listQuery.pageNum+1;
+                    if(next <= totalPage){
+                        if (_this.requestFlag){
+                            _this.listQuery.pageNum = next;
+                            if (_this.isRequset) {
+                                // 获取列表数据
+                                _this.GetMyproductDataInfo();
+                            }
+                        }
+                        _this.requestFlag = false;
+                    }else{
+                        //到底了
+                        _this.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
       },
 });

src/main/resources/static/js/product/detail.js

@@ -152,7 +152,7 @@ var productDetail = new Vue({
             }
         },
         toLogin: function() {
-            setCookie("loginBeforePath", window.location.href);
+            setBaseCookie("loginBeforePath", window.location.href);
             window.location.href = '/login.html';
         },
 		addShopCart: function(){ //加入购物车

src/main/resources/static/js/shopping/confirm.js

@@ -110,6 +110,7 @@ var shoppingConfirm = new Vue({
                     _self.payInfo.orderShouldPayFee = r.data.totalPrice;
                     if(r.data.invoice){
                         _self.invoice =  r.data.invoice;
+                        _self.invoice.type = 0;
                     }
                     _self.getAddressList(_self.userId,20);
                 }else{

src/main/resources/static/js/supplier-center/dashboard.js

@@ -1,6 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
-var isPC = ($(window).width()>768);
-var dashboard = new Vue({
+;var dashboard = new Vue({
     el:'#dashboard',
     data:{
         isRequset:true,

src/main/resources/static/js/supplier-center/message.js

@@ -1,5 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
-var helpSuggestion = new Vue({
+;var helpSuggestion = new Vue({
     el: "#dashboard",
     data: {
         btnLoading: false,

src/main/resources/static/js/supplier-center/operation/list.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var operationPage = new Vue({
     el: "#operationPage",
     data: {

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width() > 768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var delivergoods = new Vue({
     el: '#delivergoods',
     data: {

src/main/resources/static/js/supplier-center/order/detail.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width()>768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var seeDetail = new Vue({
     el:'#seeDetail',
     data:{

src/main/resources/static/js/supplier-center/order/logistics-add.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width()>768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var addlogistics = new Vue({
     el:'#addlogistics',
     data:{
@@ -31,6 +30,9 @@ var addlogistics = new Vue({
          electShow:false,
     },
     methods:{
+     bigImage:function(){
+            var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
+        },
          uploadGoodsImagesFn: function(event){//上传商品图片
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
@@ -69,7 +71,7 @@ var addlogistics = new Vue({
          },
          subBtn:function (list) {
             var _this = this;
-             _this.kdlist.splice(_this.kdlist.indexOf(list), 1);
+             _this.logisticList.splice(_this.kdlist.indexOf(list), 1);
          },
          reduceBtn:function(item){
             var _this = this;

src/main/resources/static/js/supplier-center/order/logistics-detail.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var logisticsDetail  = new Vue({
     el:'#logisticsDetail',
     data:{
@@ -9,7 +9,11 @@ var logisticsDetail  = new Vue({
         userInfo:{},
         listData:[]
     },
-    methods:{},
+    methods:{
+        bigImage:function(){
+            var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
+        },
+    },
     mounted:function () {
     var _self=this;
      _self.params.logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');

src/main/resources/static/js/supplier-center/order/logistics.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width()>768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var logistics = new Vue({
     el:'#logistics',
     data:{
@@ -32,6 +31,9 @@ var logistics = new Vue({
          electShow:false,
     },
     methods:{
+        bigImage:function(){
+            var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
+        },
          uploadGoodsImagesFn: function(event){//上传商品图片
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
@@ -70,7 +72,7 @@ var logistics = new Vue({
          },
          subBtn:function (list) {
             var _this = this;
-             _this.kdlist.splice(_this.kdlist.indexOf(list), 1);
+             _this.logisticList.splice(_this.kdlist.indexOf(list), 1);
          },
          reduceBtn:function(item){
             var _this = this;

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width()>768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var orderList = new Vue({
     el:'#orderList',
     data:{

src/main/resources/static/js/supplier-center/order/record.js

@@ -1,5 +1,4 @@
-var isPC = ($(window).width()>768);
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var deliveryRecode = new Vue({
     el:'#deliveryRecode',
     data:{
@@ -38,6 +37,9 @@ var deliveryRecode = new Vue({
         }
     },
     methods:{
+     bigImage:function(){
+            var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
+        },
          toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
                 this.params.pageNum = pageNum;

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var settlement = new Vue({
     el:'#settlement',
     data:{

src/main/resources/static/js/supplier-center/setting/information.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
  var information = new Vue({
     el:'#information',
     data:{
@@ -91,6 +91,31 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
         townArray: [],//区
     },
     methods:{
+    //图片放大
+    showViewerbigImage:function(){
+        var viewer = new Viewer(document.getElementById('uploadImage'));
+    },
+    showViewerImageFn:function(){
+         var viewer = new Viewer(document.getElementById('businessImage'));
+    },
+    showViewerImageFn1:function(){
+        var viewer = new Viewer(document.getElementById('logoImage'));
+    },
+    showViewerImageFn2:function(){
+        var viewer = new Viewer(document.getElementById('zizhiImage'));
+    },
+    showViewerImageFn3:function(){
+        var viewer = new Viewer(document.getElementById('hygienicImage'));
+    },
+    showViewerImageFn4:function(){
+        var viewer = new Viewer(document.getElementById('taxImage'));
+    },
+    showViewerImageFn5:function(){
+        var viewer = new Viewer(document.getElementById('HonorImages'));
+    },
+    showViewerImageFn6:function(){
+        var viewer = new Viewer(document.getElementById('productImages'));
+    },
          shopInfo:function(){
             var _this = this;
              SupplierApi.shopInfo({userId:_this.params.userID},function(res){
@@ -357,21 +382,25 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
         },
         setNewMainpro:function(arr){//回显处理主营内容
             var newArr = [];
+            console.log(arr)
             arr.split('/').forEach(function(item){
                 newArr.push(item);
             });
             return newArr
         },
         setNewScope:function(arr) {//回显处理主营内容
-            if (arr==null){
-              var newArr = [];
-            }else{
               var newArr = [];
-                arr.split('/').forEach(function(item){
+              console.log(arr)
+              if(arr!=null){
+                 arr.split('/').forEach(function(item){
                     newArr.push(item);
                 });
+                 return newArr
+              }else {
                 return newArr
-          }
+              }
+
+
         },
     },
     mounted:function () {

src/main/resources/static/js/supplier-center/setting/password.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var passwordPage = new Vue({
     el: "#passwordPage",
     data: {

src/main/resources/static/js/supplier-center/setting/phone.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var phonePage = new Vue({
     el: "#phonePage",
     data: {

src/main/resources/static/js/supplier-center/shop/brand.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var Brandgoods =new Vue({
     el:'#Brandgoods',
     data:{

src/main/resources/static/js/supplier-center/shop/decoration.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var decoration = new Vue({
     el:'#decoration',
     data:{

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var myGoods = new Vue({
     el:"#myGoods",
     data: {
@@ -100,6 +100,7 @@ var myGoods = new Vue({
                         _this.productsList = NewProduct;
                     }else{
                         _this.productsList = data.results;
+                        _this.listRecord = data.totalRecord;
                     }
                 }else{
                     CAIMEI.Alert(response.msg, '确定');

src/main/resources/static/js/supplier-center/shop/release.js

@@ -1,7 +1,7 @@
 /**
  * Created by ZHJY on 2020/9/17.
  */
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
 $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(2).addClass("on");
 var releaseContainer = new Vue({

src/main/resources/static/js/user-center/address/list.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var orderPage = new Vue({
     el: "#orderPage",
     data: {

src/main/resources/static/js/user-center/dashboard.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var helpSuggestion = new Vue({
     el: "#dashboard",
     data: {

src/main/resources/static/js/user-center/message.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var helpSuggestion = new Vue({
     el: "#dashboard",
     data: {

src/main/resources/static/js/user-center/operation/form.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var operationPage = new Vue({
     el: "#operationPage",
     data: {

src/main/resources/static/js/user-center/operation/list.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var operationPage = new Vue({
     el: "#operationPage",
     data: {

src/main/resources/static/js/user-center/order/detail.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var orderPage = new Vue({
     el: "#orderPage",
     data: {

src/main/resources/static/js/user-center/order/list.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var orderPage = new Vue({
     el: "#orderPage",
     data: {
@@ -15,7 +15,7 @@ var orderPage = new Vue({
             {state: 5,text: '退货/款',bages:0}
         ],
         listQuery:{
-            searchNo:'',
+            keyword:'',
             orderState:0,
             userId:0,
             beginTime:'',
@@ -145,6 +145,7 @@ var orderPage = new Vue({
                     }else{
                         _self.orderList = [];
                         _self.orderList = data.results;
+                        _self.listRecord = data.totalRecord;
                     }
                     _self.isRequset = false;
                 }else{

src/main/resources/static/js/user-center/order/logistics.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var logistics = new Vue({
        el:'#logistics',
        data:{

src/main/resources/static/js/user-center/repair/detail.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var repairDetailPage = new Vue({
     el: "#repairDetailPage",
     data: {

src/main/resources/static/js/user-center/repair/form-user.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var addFormPage = new Vue({
     el: '#addFormPage',
     data: {

src/main/resources/static/js/user-center/repair/list.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var orderPage = new Vue({
     el: "#orderPage",
     data: {

src/main/resources/static/js/user-center/repair/repair.js

@@ -46,7 +46,8 @@ var repairForm = new Vue({
                   console.log(_self.postData)
                  UserApi.Maintenance(_self.postData,function (res) {
                         if(res.code==0){
-                         CAIMEI.dialog('提交成功, 客服会在1-2个工作日内与您联系，请保持电话畅通')
+                         CAIMEI.dialog('提交成功, 客服会在1-2个工作日内与您联系，请保持电话畅通');
+                          window.location.href="/user/repair/list.html";
                         }else {
                          CAIMEI.Alert(res.msg, '确定', false);
                         }

src/main/resources/static/js/user-center/setting/information.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var informationPage = new Vue({
     el: "#informationPage",
     data: {

src/main/resources/static/js/user-center/setting/password.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var passwordPage = new Vue({
     el: "#passwordPage",
     data: {

src/main/resources/static/js/user-center/setting/phone.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var phonePage = new Vue({
     el: "#phonePage",
     data: {

src/main/resources/static/js/user-center/setting/upgrade.js

@@ -1,4 +1,4 @@
-jqMultipleShow("click", ".navList", ".tab", ".con");
+;
 var upgradePage = new Vue({
     el: "#upgradePage",
     data: {

src/main/resources/templates/flea-market/detail.html

@@ -20,9 +20,6 @@
                     <img class="preview-img" :src="previewBigimage" >
                     <span class="mask"></span>
                 </div>
-<!--                  <div class="iconLogo"  v-if="detail.brandName==null||detail.brandName==''" ></div>-->
-<!--                  <div class="iconLogo"  v-else-if="detail.brandID==161&&detail.brandName"  style="background:rgba(225,86,22,0.5)" >{{detail.brandName}}</div>-->
-<!--                  <div class="iconLogo"  v-else style="background: rgba(22,116,225,0.5);">{{detail.brandName}}</div>-->
                 <div class="preview-banner-small" id="CM____pic_thumb" v-if="isPC">
                     <ul class="preview-thumb-ul">
                         <li class="item" v-for="(item, index) in previewThumb"  :class="current==index?'addImg':''" :key="index" :data-src="item" @click="ImgList(item,index)">
@@ -60,15 +57,15 @@
                     <div class="info price" style="width: 100%" >
                         <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价：</span>
                         <p>
-                            <span v-if="detail.detailTalkFlag==2&&userID==null" class="fave-text">价格详聊</span></span>
-                            <span v-else-if="userID==null"><a class="member-detail ladder-a loginWithParam" >登录查看价格></a></span>
-                            <span v-else-if="userID!=null&&detail.detailTalkFlag==2" class="fave-text">价格详聊</span></span>
+                            <span v-if="detail.detailTalkFlag==2&&userID==0" class="fave-text">价格详聊</span></span>
+                            <span v-else-if="userID==0"><a class="member-detail toLogin loginWithParam" >登录查看价格></a></span>
+                            <span v-else-if="userID!=0&&detail.detailTalkFlag==2" class="fave-text">价格详聊</span></span>
                             <span v-else class="fave-text">￥<span class="big">{{detail.price1Str}}</span></span>
 
                         </p>
                         <div class="tag">
                            <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
-                           <span class="infotag brand" v-if="detail.brandName!=null&&detail.brandName!=''">{{detail.brandName}}</span>
+                           <span class="infotag brand" v-if="detail.brandName!=null&&detail.brandName!=''&&detail.brandID !=161">{{detail.brandName}}</span>
                            <span class="infotag sold" v-if="detail.sold==1&&detail.newAdded==1||detail.sold==1&&detail.newAdded==0">已售</span>
                            <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
                          </div>

src/main/resources/templates/flea-market/form.html

@@ -44,7 +44,7 @@
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌：</div>
-                        <i class="icon selected"></i>
+                        <i class="icon selected mIcon"></i>
                         <div class="select" @click="showBrand">
                             <span class="placeholder" >{{brandname}}</span>
                             <ul v-show="selectBrand">

src/main/resources/templates/flea-market/intro.html

@@ -11,11 +11,11 @@
 <template th:replace="components/header"></template>
 
 <!-- 二手市场介绍 -->
-<div class="body">
+<div class="body" >
 <div id="fleaMarket">
       <div class="second-hand-wrapper">
             <div class="top_title">
-                <div style="margin-right: 10px"> <img src="/img/flea-market/logo.svg" alt="" ></div>
+                <div > <img src="/img/flea-market/logo.svg" alt="" ></div>
                 <div>
                     <h1>二手市场</h1>
                     <span>SECOND-HANDMARKET</span>

src/main/resources/templates/flea-market/list.html

@@ -27,9 +27,6 @@
                 <li class="ClassA  mIcon" v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'off':'']">{{item.name}}
                     <span class="line" v-if="currentId==item.value"></span>
                 </li>
-                <li class="fabu">
-                    <a href="/flea-market/form.html">我要发布</a>
-                <li/>
             </ul>
         </template>
         <ul class="mainTab" v-if="mainflag">
@@ -43,7 +40,7 @@
                 <div class="ItemInfo">
                     <div class="tag">
                         <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
-                        <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''">{{item.brandName}}</span>
+                        <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''&&item.brandID!=161">{{item.brandName}}</span>
                         <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
                         <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                     </div>
@@ -78,7 +75,11 @@
                 </div>
             </div>
         </div>
+            <div class="fabu" v-if="!isPC">
+                 <a href="/flea-market/form.html">我要发布</a>
+            </div>
     </div>
+    <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
     <div class="pageWrap clear" v-if="isPC">
         <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">

src/main/resources/templates/index.html

@@ -75,11 +75,11 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 && p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                                 <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
-                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <em>￥会员可见</em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">

src/main/resources/templates/product/detail.html

@@ -54,8 +54,8 @@
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
-                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity!=2">￥会员可见</em>
-                            <template v-else-if="priceObj.priceFlag==0 || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID)">
+                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">￥会员可见</em>
+                            <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID)">
                                 <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1" class="p">
                                     <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
                                 </em>
@@ -65,13 +65,13 @@
                         </template>
                         <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                     </div>
-                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && (priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
+                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                         <div class="row"> <span class="l">市场价</span><i>：</i>
                              <em><del>￥{{priceObj.normalPrice.toFixed(2)}}</del></em>
                         </div>
                     </template>
                     <div class="row" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
-                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && (priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                             <!-- 阶梯价 -->
                             <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">
                                 <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
@@ -154,17 +154,19 @@
                         <em class="ser icon mIcon">正品保证</em>
                     </div>
                 </div>
-               <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                   <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity!=2">
-                      <a class="upgrade" href="/user/setting/upgrade.html">升级会员查看价格</a>
-                   </div>
-                    <div class="btnBox" v-else-if="priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
+                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                    <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
+                        <a class="upgrade" href="/user/setting/upgrade.html">升级会员查看价格</a>
+                    </div>
+                    <div class="btnBox" v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()">立即购买</a>
                     </div>
                 </template>
                 <template v-else>
-                    <a href="javascript:void(0);" class="member-detail" @click="toLogin">登录查看价格</a>
+                    <div  class="btnBox">
+                        <a href="javascript:void(0);" class="upgrade" @click="toLogin">登录查看价格</a>
+                    </div>
                 </template>
             </div>
         </div>

src/main/resources/templates/product/list.html

@@ -118,11 +118,11 @@
                                 </div>
                             </template>
                             <template v-else>
-                                <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                     <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
-                                <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                     <em>￥会员可见</em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">

src/main/resources/templates/product/promotions.html

@@ -52,11 +52,11 @@
                                 </div>
                             </template>
                             <template v-else>
-                                <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                     <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
-                                <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                     <em>￥会员可见</em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">

src/main/resources/templates/shopping/cart.html

@@ -155,7 +155,7 @@
                 </div>
                 <div class="supplierBtn">
                     <span :class="supplier.reducedPrice>0?'priceTotal':'item'">合计：<em>¥{{ supplier.totalPrice | NumFormat}}</em>
-                        <span v-if="supplier.reducedPrice>0" class="dl"><del v-text="'¥'+toFloat(supplier.originalPrice)"></del><em>减{{'¥'+toFloat(supplier.reducedPrice)}}</em></span>
+                        <span v-if="supplier.reducedPrice>0" class="dl"><del>¥{{ supplier.originalPrice | NumFormat}}</del><em>减¥{{supplier.reducedPrice | NumFormat}}</em></span>
                     </span>
                 </div>
             </div>
@@ -199,8 +199,8 @@
                 <div class="item">商品数量：<em v-text="totalCount"></em></div>
             </div>
             <div class="right mfbt">
-                <div  :class="reducedPrice>0?'item priceTotal':'item'">合计：<em v-text="'¥'+toFloat(totalPrice)"></em>
-                    <span v-if="reducedPrice>0" class="dl"><del v-text="'¥'+toFloat(originalPrice)"></del><em>减{{'¥'+toFloat(reducedPrice)}}</em></span>
+                <div  :class="reducedPrice>0?'item priceTotal':'item'">合计：<em>¥{{totalPrice | NumFormat}}</em>
+                    <span v-if="reducedPrice>0" class="dl"><del>¥{{originalPrice | NumFormat}}</del><em>减¥{{reducedPrice | NumFormat}}</em></span>
                 </div>
                 <a class="submit" href="javascript:void(0);" @click="submitCart()">去结算</a>
             </div>

src/main/resources/templates/supplier-center/dashboard.html

@@ -125,6 +125,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/dashboard.js(v=${version})}"></script>

src/main/resources/templates/supplier-center/message/list.html

@@ -73,6 +73,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/message.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/operation/form.html

@@ -18,6 +18,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 
 </body>
 </html>

src/main/resources/templates/supplier-center/operation/list.html

@@ -102,7 +102,7 @@
                             </div>
                     </div>
                     <div class="empty" v-else>
-                        <img src="/img/common/empty.png">
+                        <img src="/img/order/icon-empt.svg">
                         <div class="msg"><p>暂无数据</p></div>
                     </div>
                 </div>
@@ -128,6 +128,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/operation/list.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -39,11 +39,8 @@
                 </div>
                 <div class="record-product">
                     <div class="protitle">发货记录</div>
-                    <div class="no-delivery-record" v-if="isShow">
-                        <img src="/img/order/kon.png" v-if="isPC">
-                        <img src="/img/order/H5kon.png" V-else>
-                        <p>此订单还没有发货记录，快去<span>补充</span>它吧</p>
-                    </div>
+
+                   <template v-if="results.length>0">
                     <div class="product" v-for="r in results">
                         <ul class="product-title">
                             <li>商品信息</li>
@@ -66,9 +63,9 @@
                             <p class="record-time">发货时间：{{r.deliveryTime}}</p>
                             <div class="img-remark">
                                 <span>图片备注：</span>
-                                <ul v-if="r.remarkImages!=null">
-                                    <li v-for="cmImg in r.remarkImages">
-                                        <img :src="cmImg">
+                                <ul v-if="r.remarkImages!=null" id="uploadGoodsImages">
+                                    <li v-for="cmImg in r.remarkImages" >
+                                        <img :src="cmImg" @click="bigImage">
                                     </li>
                                 </ul>
                                 <span v-else style="color: #22272e">暂无图片备注</span>
@@ -88,10 +85,17 @@
                             </button>
                         </div>
                     </div>
+                    </template>
+                    <template v-else>
+                       <div class="no-delivery-record">
+                            <img src="/img/order/icon-recod.svg">
+                            <p>此订单还没有发货记录，快去<span>补充</span>它吧</p>
+                        </div>
+                    </template>
                 </div>
 
                 <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-                <div class="pageWrap clear" v-if="isPC && pageTotal>=1">
+                <div class="pageWrap clear" v-if="isPC && pageTotal>1">
                     <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)"
                        href="javascript:void(0);"></a>
                     <template v-for="n in showPageBtn">
@@ -116,8 +120,8 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript"
-        th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/record.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/order/delivery.html

@@ -96,6 +96,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/delivergoods.js(v=${version})}"></script>

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

@@ -117,6 +117,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/detail.js(v=${version})}"></script>
 </body>

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

@@ -152,6 +152,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/orderlist.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -76,7 +76,7 @@
                                     <option :key="kdIndex" :name='kd.label' :value="kd.value" v-for="(kd,kdIndex) in kdlist">{{kd.label}}</option>
                                 </select>
                                 <button @click="addBtn()" class="add-company companyBtn"v-if="index==0">+</button>
-                                <button @click="subBtn(kd)" class="add-company companyBtn" v-else>-</button>
+                                <button @click="subBtn(item)" class="add-company companyBtn" v-else>-</button>
                             </div>
                             <div class="logist-right">
                                 <div :key="numIndex" v-for="(num,numIndex) in item.numList">
@@ -94,7 +94,7 @@
                             <span class="red-color">&nbsp;图片备注：</span>
                             <div class="release-input" id="uploadGoodsImages">
                                 <div :key="index" class="upload-file" v-for="(item, index) in GoodsImagesList">
-                                    <img :data-image="item" :data-original='item' :src="item" alt="" class="upload-img">
+                                    <img :data-image="item" :data-original='item' :src="item" alt="" class="upload-img" @click="bigImage">
                                     <i @click="removeGoodsImagesFn(index)" class="icon mIcon del"></i>
                                 </div>
                                 <div class="upload-file" v-show="GoodsImagesList.length<5">
@@ -129,7 +129,8 @@
 
     <!-- 引入底部 -->
     <template th:replace="components/footer"></template>
-    <template th:replace="components/foot-link"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
     <script charset="utf-8" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}" type="text/javascript"></script>
     <script charset="utf-8" th:src="@{/js/supplier-center/order/logistics-add.js(v=${version})}" type="text/javascript"></script>
 </body>

src/main/resources/templates/supplier-center/order/logistics-detail.html

@@ -61,9 +61,9 @@
                             <p class="record-time">发货时间：{{listData.deliveryTime}}</p>
                             <div class="img-remark">
                                 <span>图片备注：</span>
-                                <ul v-if="listData.remarkImages!=null">
+                                <ul v-if="listData.remarkImages!=null" id="uploadGoodsImages">
                                     <li v-for="cmImg in listData.remarkImages">
-                                        <img :src="cmImg">
+                                        <img :src="cmImg" @click="bigImage">
                                     </li>
                                 </ul>
                                 <span style="color: #22272e" v-else>暂无图片备注</span>
@@ -97,6 +97,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics-detail.js(v=${version})}"></script>

src/main/resources/templates/supplier-center/order/logistics.html

@@ -78,7 +78,7 @@
                                     </option>
                                 </select>
                                 <button class="add-company companyBtn" @click="addBtn()" v-if="index==0">+</button>
-                                <button class="add-company companyBtn" @click="subBtn(kd)" v-else>-</button>
+                                <button class="add-company companyBtn" @click="subBtn(item)" v-else>-</button>
                             </div>
                             <div class="logist-right">
                                 <div v-for="(num,numIndex) in item.numList" :key="numIndex">
@@ -99,7 +99,7 @@
                             <span class="red-color">&nbsp;图片备注：</span>
                             <div class="release-input" id="uploadGoodsImages">
                                 <div class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
-                                    <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img">
+                                    <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="GoodsImagesList.length<5">
@@ -134,7 +134,8 @@
 
     <!-- 引入底部 -->
     <template th:replace="components/footer"></template>
-    <template th:replace="components/foot-link"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
     <script charset="utf-8" type="text/javascript"
             th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
     <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics.js(v=${version})}"></script>

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

@@ -70,7 +70,7 @@
                     </div>
                 </div>
                 <div v-else class="empty">
-                    <img src="/img/order/air.png"/>
+                    <img src="/img/order/icon-set.svg"/>
                     <div class="msg"><p>暂无数据</p></div>
                  </div>
                      <template class="main-content" v-else>
@@ -121,6 +121,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/settlement.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/setting/information.html

@@ -139,8 +139,8 @@
                             <div class="formLine clear" v-if="params2.secondShopType == 3">
                                 <div class="form-upload">
                                     <p><em>*</em>资质：</p>
-                                    <div class="form-upload-image" v-if="params2.medicalPracticeLicenseImg1!=''">
-                                        <img class="upload-img" :src="params2.medicalPracticeLicenseImg1" alt="" id="medicalPracticeLicenseImg1" @click="showViewerImageFn()">
+                                    <div class="form-upload-image" id="uploadImage" v-if="params2.medicalPracticeLicenseImg1!=''">
+                                        <img class="upload-img" :src="params2.medicalPracticeLicenseImg1" alt="" id="medicalPracticeLicenseImg1" @click="showViewerbigImage()">
                                         <i class="icon mIcon" @click="deleteMedicalImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -204,8 +204,8 @@
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入正确的统一社会信用代码"></span>
                              </div>
-                             <div class="formLine clear">
-                                <div class="form-upload">
+                             <div class="formLine clear" >
+                                <div class="form-upload" id="businessImage">
                                     <p><em>*</em>营业执照图片：</p>
                                     <div class="form-upload-image" v-if="params3.businessLicenseImage!=''">
                                         <img class="upload-img" :src="params3.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
@@ -217,10 +217,10 @@
                                     </div>
                                     <span class="errTips icon mIcon"></span>
                                 </div>
-                                <div class="form-upload">
+                                <div class="form-upload" id="logoImage">
                                     <p><em>*</em>公司LOGO：</p>
                                     <div class="form-upload-image" v-if="params3.logo!=''">
-                                        <img class="upload-img" :src="params3.logo" alt="" id="logo" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="params3.logo" alt="" id="logo" @click="showViewerImageFn1()">
                                         <i class="icon mIcon" @click="deletelogoImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -232,9 +232,9 @@
                             </div>
                             <div class="formLine clear">
                                 <p><em>*</em>资质认证：</p>
-                                <div class="form-upload">
+                                <div class="form-upload" id="zizhiImage">
                                     <div class="form-upload-image" v-if="params3.productionLicence!=''">
-                                        <img class="upload-img" :src="params3.productionLicence" alt="" id="productionLicence" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="params3.productionLicence" alt="" id="productionLicence" @click="showViewerImageFn2()">
                                         <i class="icon mIcon" @click="deleteproducImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -243,9 +243,9 @@
                                     </div>
                                     <span class="errTips icon mIcon"></span>
                                 </div>
-                                <div class="form-upload">
+                                <div class="form-upload" id="hygienicImage">
                                     <div class="form-upload-image" v-if="params3.hygienicLicense!=''">
-                                        <img class="upload-img" :src="params3.hygienicLicense" alt="" id="hygienicLicense" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="params3.hygienicLicense" alt="" id="hygienicLicense" @click="showViewerImageFn3()">
                                         <i class="icon mIcon" @click="deletehygienicImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -254,9 +254,9 @@
                                     </div>
                                     <span class="errTips icon mIcon"></span>
                                 </div>
-                                <div class="form-upload">
+                                <div class="form-upload" id="taxImage">
                                     <div class="form-upload-image" v-if="params3.taxLicense!=''">
-                                        <img class="upload-img" :src="params3.taxLicense" alt="" id="taxLicense" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="params3.taxLicense" alt="" id="taxLicense" @click="showViewerImageFn4()">
                                         <i class="icon mIcon" @click="deletaxImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -268,9 +268,9 @@
                             </div>
                             <div class="formLine clear" >
                                 <p><em>*</em>荣誉证书：</p>
-                                <div class="form-upload list" >
+                                <div class="form-upload list" id="HonorImages">
                                     <div class="form-upload-image"  v-for="(item, index) in HonorImagesList" :key="index">
-                                        <img class="upload-img" :src="item" :data-image="item" alt="" id="Honor" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="item" :data-image="item" alt="" id="Honor" @click="showViewerImageFn5()">
                                         <i class="icon mIcon" @click="removeGoodsImagesFn(index)"></i>
                                     </div>
                                     <div class="formLine-file" v-show="HonorImagesList.length<5">
@@ -282,9 +282,9 @@
                             </div>
                             <div class="formLine clear" >
                                 <p><em>*</em>产品证书：</p>
-                                <div class="form-upload list" >
+                                <div class="form-upload list" id="productImages">
                                     <div class="form-upload-image"  v-for="(item, index) in productImagesList" :key="index">
-                                        <img class="upload-img" :src="item" :data-image="item" alt="" id="product" @click="showViewerImageFn()">
+                                        <img class="upload-img" :src="item" :data-image="item" alt="" id="product" @click="showViewerImageFn6()">
                                         <i class="icon mIcon" @click="removeproductImagesFn(index)"></i>
                                     </div>
                                     <div class="formLine-file" v-show="productImagesList.length<5">
@@ -308,6 +308,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/setting/information.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/setting/password.html

@@ -122,6 +122,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<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/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/setting/password.js(v=${version})}"></script>
 </body>