供应商

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/secondDetail.css

@@ -226,6 +226,7 @@
     .loginWithParam {
         color: #FC4444;
         font-size: 14px;
+        cursor: pointer;
     }
     .recommended-item div {
         width: 152px !important;
@@ -527,13 +528,13 @@
     }
 
     .infotag.sold {
-        border: solid 1px #9aa5b5;
+        border: solid .27vw #9aa5b5;
         color: #9aa5b5;
         background-color: #e3ebf7;
     }
 
     .infotag.other {
-        border: solid 1px #1890f9;
+        border: solid .27vw #1890f9;
         color: #1890f9;
         background-color: #e3ebf7;
     }
@@ -555,5 +556,10 @@
     .fave-text .big{
         font-size: 3.7vw;
     }
+    .loginWithParam {
+    color: #FC4444;
+    font-size: 3.2vw;
+    cursor: pointer;
+}
 
 }

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,9 +57,9 @@
                     <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>

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>