项目仪器及页面结构调整

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

@@ -51,7 +51,7 @@ logging:
 # 服务域名
 caimei:
 #  spiServer: http://localhost:8008
-  spiServer: https://spi-b.caimei365.com
+  spiServer: https://spi.caimei365.com
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/css/instrument/search.css

@@ -0,0 +1,41 @@
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
+    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
+    .empty img{width:180px;height:180px;}
+    .empty a{color:#E15616;}
+    .instrumentList{width:1184px;margin:16px auto;}
+    .instrumentList>ul{width:1216px;}
+    .instrumentItem{float:left;width:284px;height:242px;background:#FFF;border-radius:2px;margin:0 16px 16px 0}
+    .instrumentItem a{display:block;width:100%;height:100%;overflow:hidden}
+    .instrumentItem a:hover{box-shadow:0 2px 6px #dedede}
+    .instrumentItem img{width:100%;height:190px}
+    .instrumentItem span{display:block;line-height:52px;height:52px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:16px;color:#93979F;text-align:center;padding:0 10px}
+    .instrumentItem span em,.instrumentItem span:hover{font-style:normal;color:#E15616}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    footer{display:none!important}
+    .loading{box-sizing:border-box;padding:20vw 0;text-align:center}
+    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
+    .empty img{width:40vw;height:40vw}
+    .empty a{color:#E15616}
+    .noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
+    .instrumentList{width:96vw;margin:2.6vw auto 0;overflow: hidden;}
+    .instrumentList>ul{width:100vw;}
+    .instrumentItem{width:45.4vw;height:40vw;background:#FFF;border-radius:2px;margin:0 1.3vw 2.6vw 1.3vw;}
+    .instrumentItem a{display:block;width:100%;height:100%;overflow:hidden}
+    .instrumentItem img{width:100%;height:30.3vw}
+    .instrumentItem span{display:block;line-height:9.7vw;height:9.7vw;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:3.1vw;color:#93979F;text-align:center;padding:0 .5vw;}
+    .instrumentItem span em{font-style:normal;color:#E15616}
+
+}
+

src/main/resources/static/css/instrument/search.h5.css

@@ -1,12 +0,0 @@
-@charset "utf-8";
-/**
-* 移动端
-*/
-li{list-style:none}
-footer{display:none!important}
-.loading{box-sizing:border-box;padding:20vw 0;text-align:center}
-.empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
-.empty img{width:40vw;height:40vw}
-.empty a{color:#E15616}
-.noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
-.instrumentList{width:100vw;margin:2.8vw auto 0;box-sizing:border-box;padding:2.6vw 3.3vw;background:#FFF;overflow:hidden}

src/main/resources/static/css/instrument/search.pc.css

@@ -1,10 +0,0 @@
-@charset "utf-8";
-/**
- * PC端
- */
-li{list-style:none;}
-.loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-.empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-.empty img{width:180px;height:180px;}
-.empty a{color:#E15616;}
-.instrumentList{width:1184px;margin:16px auto;background:#FFF}

src/main/resources/static/css/product/list.css

@@ -0,0 +1,52 @@
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .crumbs{width:1184px;margin:0 auto;box-sizing:border-box;padding:15px 0;font-size:16px}
+    .sortBox{width:1184px;margin:16px auto;box-sizing:border-box;padding:12px;font-size:0;text-align:center;background:#FFF}
+    .sortBox li{display:inline-block;width:128px;height:40px;line-height:40px;font-size:16px;background:#F5F5F5;color:#93979F;position:relative;margin:0 8px}
+    .sortBox li.on,.sortBox li.up,.sortBox li.down{background:#FFE6DC;color:#E15616}
+    .sortBox li:before,.sortBox li:after{position:absolute;right:35px;content:'';width:0;height:0;border-style:solid}
+    .sortBox li:before{border-width:0 5px 5px 5px;border-color:transparent transparent #BEC2C9 transparent;top:14px}
+    .sortBox li:after{border-width:5px 5px 0 5px;border-color:#BEC2C9 transparent transparent transparent;top:22px}
+    .sortBox li:first-child:before,.sortBox li:first-child:after{display:none}
+    .sortBox li.up:before{border-bottom-color:#E15616}
+    .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
+    .sortBox li.down:after{border-top-color:#E15616}
+    .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
+    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
+    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
+    .empty img{width:180px;height:180px;}
+    .empty a{color:#E15616;}
+    .productList{width:1200px;margin:0 auto;box-sizing:border-box}
+    .productList .productItem{margin-bottom:16px}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    footer{display:none!important;}
+    .sortBox{width:100%;margin:1px auto;box-sizing:border-box;background:#FFF;}
+    .sortBox li{width:15vw;height:11.6vw;line-height:11.6vw;text-align:center;font-size:3.4vw;color:#93979F;position:relative;margin:0 5vw}
+    .sortBox li.on,.sortBox li.up,.sortBox li.down{color:#E15616}
+    .sortBox li:before,.sortBox li:after{position:absolute;right:1vw;content:'';width:0;height:0;border-style:solid}
+    .sortBox li:before{border-width:0 .8vw .8vw .8vw;border-color:transparent transparent #BEC2C9 transparent;top:5vw}
+    .sortBox li:after{border-width:.8vw .8vw 0 .8vw;border-color:#BEC2C9 transparent transparent transparent;top:6.5vw}
+    .sortBox li:first-child:before,.sortBox li:first-child:after{display:none}
+    .sortBox li.up:before{border-bottom-color:#E15616}
+    .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
+    .sortBox li.down:after{border-top-color:#E15616}
+    .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
+    .loading{box-sizing:border-box;padding:20vw 0;text-align:center;}
+    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;}
+    .empty img{width:40vw;height:40vw;}
+    .empty a{color:#E15616;}
+    .noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
+    .productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
+
+}
+

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

@@ -1,26 +0,0 @@
-@charset "utf-8";
-/**
-* 移动端
-*/
-li{list-style:none;}
-footer{display:none!important;}
-.sortBox{width:100%;margin:1px auto;box-sizing:border-box;background:#FFF;}
-.sortBox li{width:15vw;height:11.6vw;line-height:11.6vw;text-align:center;font-size:3.4vw;color:#93979F;position:relative;margin:0 5vw}
-.sortBox li.on,.sortBox li.up,.sortBox li.down{color:#E15616}
-.sortBox li:before,.sortBox li:after{position:absolute;right:1vw;content:'';width:0;height:0;border-style:solid}
-.sortBox li:before{border-width:0 .8vw .8vw .8vw;border-color:transparent transparent #BEC2C9 transparent;top:5vw}
-.sortBox li:after{border-width:.8vw .8vw 0 .8vw;border-color:#BEC2C9 transparent transparent transparent;top:6.5vw}
-.sortBox li:first-child:before,.sortBox li:first-child:after{display:none}
-.sortBox li.up:before{border-bottom-color:#E15616}
-.sortBox li.up:after{border-top-color:#E15616;opacity:.3}
-.sortBox li.down:after{border-top-color:#E15616}
-.sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
-.productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
-.loading{box-sizing:border-box;padding:20vw 0;text-align:center;}
-.empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;}
-.empty img{width:40vw;height:40vw;}
-.empty a{color:#E15616;}
-.noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
-
-
-

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

@@ -1,23 +0,0 @@
-@charset "utf-8";
-/**
- * PC端
- */
-li{list-style:none;}
-.crumbs{width:1184px;margin:0 auto;box-sizing:border-box;padding:15px 0;font-size:16px}
-.sortBox{width:1184px;margin:16px auto;box-sizing:border-box;padding:12px;font-size:0;text-align:center;background:#FFF}
-.sortBox li{display:inline-block;width:128px;height:40px;line-height:40px;font-size:16px;background:#F5F5F5;color:#93979F;position:relative;margin:0 8px}
-.sortBox li.on,.sortBox li.up,.sortBox li.down{background:#FFE6DC;color:#E15616}
-.sortBox li:before,.sortBox li:after{position:absolute;right:35px;content:'';width:0;height:0;border-style:solid}
-.sortBox li:before{border-width:0 5px 5px 5px;border-color:transparent transparent #BEC2C9 transparent;top:14px}
-.sortBox li:after{border-width:5px 5px 0 5px;border-color:#BEC2C9 transparent transparent transparent;top:22px}
-.sortBox li:first-child:before,.sortBox li:first-child:after{display:none}
-.sortBox li.up:before{border-bottom-color:#E15616}
-.sortBox li.up:after{border-top-color:#E15616;opacity:.3}
-.sortBox li.down:after{border-top-color:#E15616}
-.sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
-.productList{width:1200px;margin:0 auto;box-sizing:border-box}
-.productList .productItem{margin-bottom:16px}
-.loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-.empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-.empty img{width:180px;height:180px;}
-.empty a{color:#E15616;}

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

@@ -0,0 +1,64 @@
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
+    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
+    .empty img{width:180px;height:180px;}
+    .empty a{color:#E15616;}
+    .supplierList{width:1184px;margin:16px auto;background:#FFF}
+    .supplierItem{box-sizing:border-box;padding:16px;border-top:1px solid #F5F5F5}
+    .supplierItem:first-child{border:none}
+    .supplierItem .right{float:right;width:576px;position:relative}
+    .supplierItem .left{float:left;width:560px;box-sizing:border-box;padding-left:152px;position:relative}
+    .supplierItem .left .logo{position:absolute;left:0;top:0;width:136px;height:124px}
+    .supplierItem .left .logo img{width:100%;max-height:100%}
+    .supplierItem .left h5{line-height:32px;font-weight:bold;font-size:20px;}
+    .supplierItem .left h5 span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align: middle;max-width:84%;}
+    .supplierItem .left p{line-height:26px;font-size:14px;color:#93979F;white-space:nowrap}
+    .supplierItem .left p>span{white-space:normal;height:auto;display:inline-block;vertical-align:top;max-width:82%}
+    .supplierItem .left .shop,.supplierItem .left .heart{vertical-align:middle;display:inline-block;height:25px}
+    .supplierItem .left .shop:before{width:30px;height:25px;background-position:5px -297px}
+    .supplierItem .left .heart:before{width:25px;height:25px;background-position:-35px -297px}
+    .supplierItem .left .tag{display:inline-block;height:20px;line-height:20px;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:10px;padding:0 5px}
+    .supplierItem .products{position:relative;height:124px}
+    .supplierItem .products li{float:left;width:100px;min-height:100px;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin-right:16px}
+    .supplierItem .products li img{width:100px;height:100px}
+    .supplierItem .products li span{display:block;padding-top:8px;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:#93979F}
+    .supplierItem .products a:hover span{color:#E15616;}
+    .supplierItem .right .four{position:absolute;right:0;top:38px;line-height:24px;font-size:16px;color:#E15616}
+    .supplierItem .right .four:hover{border-bottom:1px solid #E15616}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    footer{display:none!important}
+    .loading{box-sizing:border-box;padding:20vw 0;text-align:center}
+    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
+    .empty img{width:40vw;height:40vw}
+    .empty a{color:#E15616}
+    .noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
+    .supplierItem{width:100vw;margin:2.8vw auto 0;box-sizing:border-box;padding:2.6vw 3.3vw;background:#FFF;overflow:hidden}
+    .supplierItem .left{padding-left:13.6vw;position:relative}
+    .supplierItem .left .logo{position:absolute;left:0;top:0;width:12.2vw;height:12.2vw}
+    .supplierItem .left .logo img{width:100%;max-height:100%}
+    .supplierItem .left h5{line-height:6vw;font-weight:bold;font-size:3.7vw;position:relative}
+    .supplierItem .left h5 span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align:middle;max-width:84%}
+    .supplierItem .left h5 a:after{content:'\276F';position:absolute;right:2vw;top:2vw;font-weight:normal}
+    .supplierItem .left p{line-height:6vw;font-size:3.4vw;color:#93979F;white-space:nowrap}
+    .supplierItem .left p>span{white-space:normal;height:auto;display:inline-block;vertical-align:top;max-width:82%}
+    .supplierItem .left .tag{display:inline-block;height:4.4vw;line-height:4.4vw;font-size:2.6vw;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:2.2vw;padding:0 1vw}
+    .supplierItem .left .shop,.supplierItem .left .heart{vertical-align:middle;display:inline-block;height:5.5vw}
+    .supplierItem .left .shop:before{width:7.5vw;height:6vw;background-position:-1% 60%;margin-top:-1vw}
+    .supplierItem .left .heart:before{width:5.5vw;height:5.5vw;background-position:0% 36.5%}
+    .supplierItem .products{position:relative;margin-top:2.6vw}
+    .supplierItem .products li{width:29.4vw;min-height:29.4vw;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin:0 1.3vw}
+    .supplierItem .products li img{width:29.4vw;height:29.4vw}
+    .supplierItem .products li span{display:block;line-height:4vw;padding-top:2.6vw;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:3vw;color:#93979F}
+
+}

src/main/resources/static/css/supplier/search.h5.css

@@ -1,28 +0,0 @@
-@charset "utf-8";
-/**
-* 移动端
-*/
-li{list-style:none}
-footer{display:none!important}
-.loading{box-sizing:border-box;padding:20vw 0;text-align:center}
-.empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
-.empty img{width:40vw;height:40vw}
-.empty a{color:#E15616}
-.noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
-.supplierItem{width:100vw;margin:2.8vw auto 0;box-sizing:border-box;padding:2.6vw 3.3vw;background:#FFF;overflow:hidden}
-.supplierItem .left{padding-left:13.6vw;position:relative}
-.supplierItem .left .logo{position:absolute;left:0;top:0;width:12.2vw;height:12.2vw}
-.supplierItem .left .logo img{width:100%;max-height:100%}
-.supplierItem .left h5{line-height:6vw;font-weight:bold;font-size:3.7vw;position:relative}
-.supplierItem .left h5 span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align:middle;max-width:84%}
-.supplierItem .left h5 a:after{content:'\276F';position:absolute;right:2vw;top:2vw;font-weight:normal}
-.supplierItem .left p{line-height:6vw;font-size:3.4vw;color:#93979F;white-space:nowrap}
-.supplierItem .left p>span{white-space:normal;height:auto;display:inline-block;vertical-align:top;max-width:82%}
-.supplierItem .left .tag{display:inline-block;height:4.4vw;line-height:4.4vw;font-size:2.6vw;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:2.2vw;padding:0 1vw}
-.supplierItem .left .shop,.supplierItem .left .heart{vertical-align:middle;display:inline-block;height:5.5vw}
-.supplierItem .left .shop:before{width:7.5vw;height:6vw;background-position:-1% 60%;margin-top:-1vw}
-.supplierItem .left .heart:before{width:5.5vw;height:5.5vw;background-position:0% 36.5%}
-.supplierItem .products{position:relative;margin-top:2.6vw}
-.supplierItem .products li{width:29.4vw;min-height:29.4vw;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin:0 1.3vw}
-.supplierItem .products li img{width:29.4vw;height:29.4vw}
-.supplierItem .products li span{display:block;line-height:4vw;padding-top:2.6vw;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:3vw;color:#93979F}

src/main/resources/static/css/supplier/search.pc.css

@@ -1,30 +0,0 @@
-@charset "utf-8";
-/**
- * PC端
- */
-li{list-style:none;}
-.loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-.empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-.empty img{width:180px;height:180px;}
-.empty a{color:#E15616;}
-.supplierList{width:1184px;margin:16px auto;background:#FFF}
-.supplierItem{box-sizing:border-box;padding:16px;border-top:1px solid #F5F5F5}
-.supplierItem:first-child{border:none}
-.supplierItem .right{float:right;width:576px;position:relative}
-.supplierItem .left{float:left;width:560px;box-sizing:border-box;padding-left:152px;position:relative}
-.supplierItem .left .logo{position:absolute;left:0;top:0;width:136px;height:124px}
-.supplierItem .left .logo img{width:100%;max-height:100%}
-.supplierItem .left h5{line-height:32px;font-weight:bold;font-size:20px;}
-.supplierItem .left h5 span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align: middle;max-width:84%;}
-.supplierItem .left p{line-height:26px;font-size:14px;color:#93979F;white-space:nowrap}
-.supplierItem .left p>span{white-space:normal;height:auto;display:inline-block;vertical-align:top;max-width:82%}
-.supplierItem .left .shop,.supplierItem .left .heart{vertical-align:middle;display:inline-block;height:25px}
-.supplierItem .left .shop:before{width:30px;height:25px;background-position:5px -297px}
-.supplierItem .left .heart:before{width:25px;height:25px;background-position:-35px -297px}
-.supplierItem .left .tag{display:inline-block;height:20px;line-height:20px;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:10px;padding:0 5px}
-.supplierItem .products{position:relative;height:124px}
-.supplierItem .products li{float:left;width:100px;min-height:100px;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin-right:16px}
-.supplierItem .products li img{width:100px;height:100px}
-.supplierItem .products li span{display:block;padding-top:8px;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:#93979F}
-.supplierItem .right .four{position:absolute;right:0;top:38px;line-height:24px;font-size:16px;color:#E15616}
-.supplierItem .right .four:hover{border-bottom:1px solid #E15616}

src/main/resources/static/js/instrument/search.js

@@ -72,10 +72,10 @@ var instrumentList = new Vue({
     },
     created: function () {
         if(isPC){
-            this.params.size = getUrlParam("pageSize") ? getUrlParam("pageSize") * 1 : 10;
+            this.params.size = getUrlParam("pageSize") ? getUrlParam("pageSize") * 1 : 20;
             this.params.num = getUrlParam("pageNum") ? getUrlParam("pageNum") * 1 : 1;
         }else{
-            this.params.size = 10;
+            this.params.size = 20;
             this.params.num = 1;
         }
         this.params.keyword = getUrlParam("keyword") ? getUrlParam("keyword") : "";

src/main/resources/templates/components/headLink.html

@@ -7,6 +7,6 @@
     <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台，中国美业较大的光电美容干货信息平台，提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易，同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想，美启未来。">
     <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
     <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/base.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">

src/main/resources/templates/instrument/search.html

@@ -4,8 +4,7 @@
 <head>
     <title>采美365网-项目列表</title>
     <template th:replace="components/headLink"></template>
-    <link th:href="@{/css/instrument/search.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/instrument/search.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/instrument/search.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -26,11 +25,16 @@
         </div>
     </div>
     <!--列表-->
-    <ul v-else class="instrumentList">
-        <li class="instrumentItem clear" v-for="shop in listData">
-
-        </li>
-    </ul>
+    <div v-else class="instrumentList">
+        <ul class="clear mfw">
+            <li class="instrumentItem" v-for="ins in listData">
+                <a :href="'/instrument/detail.html?id='+ins.eid" target="_blank">
+                    <img :src="ins.equipmentimage">
+                    <span class="name" v-html="ins.equipmenttitle"></span>
+                </a>
+            </li>
+        </ul>
+    </div>
     <!--分页-->
     <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
     <div v-if="isPC && pageTotal>1" class="pageWrap clear">

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

@@ -4,8 +4,7 @@
 <head>
     <title>采美365网-商品列表</title>
     <template th:replace="components/headLink"></template>
-    <link th:href="@{/css/product/list.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/product/list.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/product/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->

src/main/resources/templates/supplier/search.html

@@ -4,8 +4,7 @@
 <head>
     <title>采美365网-供应商列表</title>
     <template th:replace="components/headLink"></template>
-    <link th:href="@{/css/supplier/search.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/supplier/search.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier/search.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->