Merge remote-tracking branch 'remotes/origin/developer' into developerC

# Conflicts:
#	src/main/resources/static/js/product/instruement.js
#	src/main/resources/static/js/product/produce-list.js
#	src/main/resources/templates/supplier/list.html
#	target/www-0.0.1-SNAPSHOT.jar

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -18,20 +18,19 @@ public class RedirectController {
      */
     @GetMapping("/supplier/prolist-{id}.html")
     public String toSupplier(@PathVariable("id") Integer supplierId) {
-        return "redirect:/supplier/index.html?id=" + supplierId;
+        return "redirect:/supplier-"+ supplierId +".html";
     }
-
     @GetMapping("/web/supplier/view/supplierHomePage.jsp")
     public String toSupplier2(Integer shopId) {
-        return "redirect:/supplier/index.html?id=" + shopId;
+        return "redirect:/supplier-"+ shopId +".html";
     }
-
-    /**
-     * 供应商商品页【旧】
-     */
     @GetMapping("/supplier/productlist-{id}.html")
     public String toSupplierProduct(@PathVariable("id") Integer supplierId) {
-        return "redirect:/supplier/index.html?id=" + supplierId;
+        return "redirect:/supplier-"+ supplierId +".html";
+    }
+    @GetMapping("/supplier/index.html")
+    public String toSupplier3(@RequestParam("id") Integer supplierId) {
+        return "redirect:/supplier-"+ supplierId +".html";
     }
 
     /**
@@ -43,17 +42,25 @@ public class RedirectController {
         if (Integer.valueOf("189").equals(type)) {
             return "redirect:/flea-market/list.html";
         }
-        return "redirect:/topic.html?type=" + type;
+        return "redirect:/topic-"+type+".html";
+    }
+    @GetMapping("/topic.html")
+    public String toTopic2(@RequestParam("type") Integer type) {
+        return "redirect:/topic-"+type+".html";
     }
 
+
     /**
      * 项目仪器详情【旧】
      */
     @GetMapping("/cmpage/info-2-{id}.html")
     public String toequipment(@PathVariable("id") Integer equipmentId) {
-        return "redirect:/equipment/detail.html?id=" + equipmentId;
+        return "redirect:/equipment/"+equipmentId+".html";
+    }
+    @GetMapping("/equipment/detail.html")
+    public String toequipment2(@RequestParam("id") Integer equipmentId) {
+        return "redirect:/equipment/"+equipmentId+".html";
     }
-
     /**
      * 直播页面【旧】
      */
@@ -67,11 +74,15 @@ public class RedirectController {
      */
     @GetMapping("/cmpage/info-4-{id}.html")
     public String toFreePage(@PathVariable("id") Integer id) {
-        return "redirect:/page.html?id=" + id;
+        return "redirect:/page-"+id+".html";
+    }
+    @GetMapping("/page.html")
+    public String toFreePage2(Integer id) {
+        return "redirect:/page-"+id+".html";
     }
 
     /**
-     * 分类详情
+     * 产品仪器
      */
     @GetMapping("/cmpage/info-5-{id}.html")
     public String classificationDetails(@PathVariable("id") Integer id,String name) {
@@ -79,9 +90,12 @@ public class RedirectController {
         if (id == 301) {
             return "redirect:/product/temporary.html?id=" + id + "&name=" + name;
         }
-        return "redirect:/product/instrument.html?id=" + id+"&name="+name;
+        return "redirect:/product/type-"+id+".html?name="+name;
+    }
+    @GetMapping("/product/instrument.html")
+    public String classificationDetails2(Integer id) {
+        return "redirect:/product/type-"+id+".html";
     }
-
 
     /**
      * 活动专题

src/main/java/com/caimei/www/controller/authorized/document/DocumentAuthController.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -42,6 +42,7 @@ public class ArticleController extends BaseController {
         model.addAttribute("articleType", typeList);
         model.addAttribute("typeId", id);
         model.addAttribute("labelId", 0);
+        //model.addAttribute("pagePath", String.format("/info/center-%s-1.html", id));
         return ARTICLE_LIST_PATH;
     }
 
@@ -54,6 +55,7 @@ public class ArticleController extends BaseController {
         model.addAttribute("articleType", typeList);
         model.addAttribute("typeId", 0);
         model.addAttribute("labelId", id);
+        //model.addAttribute("pagePath", String.format("/info/label-%s-1.html", id));
         return ARTICLE_LIST_PATH;
     }
 
@@ -66,6 +68,7 @@ public class ArticleController extends BaseController {
         model.addAttribute("articleType", typeList);
         model.addAttribute("typeId", 0);
         model.addAttribute("labelId", 0);
+        //model.addAttribute("pagePath", "/info/search.html");
         return ARTICLE_LIST_PATH;
     }
 

src/main/java/com/caimei/www/controller/unlimited/EquipmentController.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -45,8 +46,8 @@ public class EquipmentController extends BaseController {
     /**
      * 项目仪器详情页
      */
-    @GetMapping("/equipment/detail.html")
-    public String home(final Model model, @RequestParam("id") Integer equipmentId) {
+    @GetMapping("/equipment/{id}.html")
+    public String home(final Model model, @PathVariable("id") Integer equipmentId) {
         PageContent detail = equipmentService.getEquipmentById(equipmentId);
         if(detail== null){
             return super.errorPath();

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -1,7 +1,6 @@
 package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
-import com.caimei.www.pojo.page.PageContent;
 import com.caimei.www.pojo.page.ProductDetail;
 import com.caimei.www.service.page.ProductService;
 import com.caimei.www.service.page.SinglePageService;
@@ -10,7 +9,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 商品（product）
@@ -49,7 +47,7 @@ public class ProductController extends BaseController {
     }
 
     /**
-     * 商品分类列表/搜索结果 页面
+     * 搜索结果 页面
      */
     @GetMapping("/product/list.html")
     public String list() {
@@ -81,12 +79,13 @@ public class ProductController extends BaseController {
     /**
      * 仪器页
      */
-    @GetMapping("/product/instrument.html")
-    public String instrument(Integer id) {
+    @GetMapping("/product/type-{id}.html")
+    public String instrument(final Model model, @PathVariable("id") Integer id) {
         Integer pageId = singlePageService.getInstrumentPageIdById(id);
         if (pageId == null) {
             return super.errorPath();
         }
+        model.addAttribute("pageId", id);
         return INSTRUMENT_PAGE_PATH;
     }
 
@@ -103,10 +102,10 @@ public class ProductController extends BaseController {
     }
 
     /**
-     * 仪器列表页
+     * 商品分类列表页面
      */
-    @GetMapping("/product/instruelist.html")
-    public String instruelist() {
+    @GetMapping("/product/classify{ids}.html")
+    public String instruelist(@PathVariable("ids") String ids) {
         return INSTRUMENT_LIST_PATH;
     }
 

src/main/java/com/caimei/www/controller/unlimited/SinglePageController.java

@@ -12,6 +12,7 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import reactor.core.publisher.Mono;
@@ -50,8 +51,8 @@ public class SinglePageController extends BaseController {
     /**
      * 二级页面（找产品/找仪器/找项目/正品联盟）
      */
-    @GetMapping("/topic.html")
-    public String topic(final Model model, @RequestParam("type") Integer id) {
+    @GetMapping("/topic-{id}.html")
+    public String topic(final Model model, @PathVariable("id") Integer id) {
         PageContent topicPage = singlePageService.getTopicPageById(id);
         if (topicPage == null){
             return super.errorPath();
@@ -71,8 +72,8 @@ public class SinglePageController extends BaseController {
     /**
      * 自由页面
      */
-    @GetMapping("/page.html")
-    public String freePage(final Model model, Integer id) {
+    @GetMapping("/page-{id}.html")
+    public String freePage(final Model model, @PathVariable("id") Integer id) {
         PageContent freePage = singlePageService.getFreePageById(id);
         if (freePage == null){
             return super.errorPath();

src/main/java/com/caimei/www/controller/unlimited/SupplierController.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
@@ -39,8 +40,8 @@ public class SupplierController extends BaseController {
     /**
      * 供应商首页
      */
-    @GetMapping("/supplier/index.html")
-    public String home(final Model model, @RequestParam("id") Integer supplierId) {
+    @GetMapping("/supplier-{id}.html")
+    public String home(final Model model, @PathVariable("id") Integer supplierId) {
         SupplierDetail detail = supplierService.getSupplierById(supplierId);
         if(detail== null){
             return super.errorPath();

src/main/java/com/caimei/www/service/page/impl/BaseServiceImpl.java

@@ -60,10 +60,15 @@ public class BaseServiceImpl implements BaseService {
         menuList.forEach(item -> {
             String link = item.getLink();
             if (!StringUtils.isEmpty(link)) {
-                if (link.contains("?")) {
-                    link = link + "&name=" + item.getName();
-                } else {
-                    link = link + "?name=" + item.getName();
+                boolean seoFlag = link.indexOf("/product/type") >= 0 || link.indexOf("/info/center") >= 0
+                              || link.indexOf("/flea-market") >= 0 || link.indexOf("/investment") >= 0
+                              || link.indexOf("/repair") >= 0;
+                if (!seoFlag) {
+                    if (link.contains("?")) {
+                        link = link + "&name=" + item.getName();
+                    } else {
+                        link = link + "?name=" + item.getName();
+                    }
                 }
                 item.setLinkType(AppletsLinkUtil.getLinkType(link));
                 item.setLinkParam(AppletsLinkUtil.getLinkParam(item.getLinkType(), link));

src/main/resources/static/js/activity/activityTopic.js

@@ -57,7 +57,7 @@ var activity = new Vue({
             }
         },
         toserch: function (item) {
-            window.location.href = '/product/instruelist.html?bigTypeID=' + item.bigTypeID + '&typeSort=' + this.typeSort + '&name=' + this.nav_linkName
+            window.location.href = '/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
         },
         //查看更多
         showMore: function (page) {

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

@@ -142,7 +142,7 @@ var globalHead = new Vue({
             });
         },
         pageLinkSupplier: function(){//预览商品
-            window.open('/supplier/index.html?id='+this.shopId);
+            window.open('/supplier-'+this.shopId+'.html');
         },
         // 退出登录
         userLogOut: function(){
@@ -200,6 +200,25 @@ var globalHead = new Vue({
         }
         console.log('hello')
         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
+        if(!_self.nav_linkName || _self.nav_linkName.length === 0 || _self.nav_linkName == "undefined") {
+             var paramsArr = window.location.pathname.split(".")[0].split("-");
+             if (paramsArr[0].indexOf('/product/type') >= 0) {
+                 var pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
+                 if (pageId*1 === 287) {
+                    _self.nav_linkName = "产品";
+                 } else if (pageId*1 === 286) {
+                    _self.nav_linkName = "仪器";
+                 }
+             } else if (paramsArr[0].indexOf('/info/center') >= 0){
+                _self.nav_linkName = "信息平台";
+             } else if (paramsArr[0].indexOf('/flea-market') >= 0 && (paramsArr.length>=1 && paramsArr[1].indexOf('market') >= 0)){
+                _self.nav_linkName = "二手市场";
+             } else if (paramsArr[0].indexOf('/investment') >= 0){
+                _self.nav_linkName = "品牌招商";
+             } else if (paramsArr[0].indexOf('/repair') >= 0){
+                _self.nav_linkName = "维修";
+             }
+        }
         // _self.nav_linkName = window.localStorage.getItem('name');
         setTimeout(function(){
             $('.navBox li').each(function () {

src/main/resources/static/js/document/list.js

@@ -61,7 +61,7 @@ var documentList = new Vue({
         },
         supplierDetails:function(id){//供应商主页
             if(id){
-                location.href = '/supplier/index.html?id='+id;
+                location.href = '/supplier-'+id+'.html';
             }
         },
         keyupSearch: function(event) {

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

@@ -81,7 +81,7 @@ var beautytopic = new Vue({
             }
         },
         gosupplier:function (id) {
-            window.location.href='/supplier/index.html?id='+id
+            window.location.href='/supplier-'+id+'.html';
         },
         bigImag:function (img) {
             this.image = img;

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

@@ -50,7 +50,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeId+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
+            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;
@@ -151,13 +151,20 @@
     },
     mounted: function(){
         var _self = this;
-         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-         console.log(_self.nav_linkName);
+         //_self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
          var userInfo = localStorage.getItem('userInfo');
          if(userInfo){
              this.params.userId = JSON.parse(userInfo).userId;
          }
-         this.params.pageId = getUrlParam('id');
+         //this.params.pageId = getUrlParam('id');
+         var paramsArr = window.location.pathname.split(".")[0].split("-");
+         this.params.pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
+         if (this.params.pageId*1 === 287) {
+            _self.nav_linkName = "产品";
+         } else if (this.params.pageId*1 === 286) {
+            _self.nav_linkName = "仪器";
+         }
+         console.log(_self.nav_linkName);
          this.GetHomeFloorData();
     }
  })

src/main/resources/static/js/product/produce-list.js

@@ -185,9 +185,17 @@ var productList = new Vue({
     mounted:function () {
         var _self = this;
         this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-        this.bigTypeID = getUrlParam('bigTypeID');
-        this.smallTypeID = getUrlParam('smallTypeID');
-        this.tinyTypeID = getUrlParam('tinyTypeID');
+        // this.bigTypeID = getUrlParam('bigTypeID');
+        // this.smallTypeID = getUrlParam('smallTypeID');
+        // this.tinyTypeID = getUrlParam('tinyTypeID');
+        // var typeSort =  getUrlParam('typeSort');
+        var paramsArr = window.location.pathname.split(".")[0].split("-");
+        var typeSort =  paramsArr.length>=1 ? paramsArr[1] : '';
+        this.bigTypeID = paramsArr.length>=2 ? paramsArr[2] : '';
+        this.smallTypeID = paramsArr.length>=3 ? paramsArr[3] : '';
+        this.tinyTypeID = paramsArr.length>=4 ? paramsArr[4] : '';
+        console.log( this.smallTypeID)
+        console.log( this.tinyTypeID)
         if(this.tinyTypeID==null &&  this.smallTypeID==null){
             this.params.id=this.bigTypeID;
             this.params.idType = 1;
@@ -201,7 +209,8 @@ var productList = new Vue({
             this.params.id=this.tinyTypeID;
             this.params.idType = 3;
         }
-        var typeSort =  getUrlParam('typeSort');
+
+
         PublicApi.GetProductClassify({typeSort:typeSort,source:'www'},function (res) {
                 if (res.code==0){
                     _self.classify = res.data;
@@ -260,4 +269,5 @@ var productList = new Vue({
             });
         }
     }
+
 })

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

@@ -49,7 +49,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
+            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;

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

@@ -37,7 +37,7 @@ var previewContainer = new Vue({
             this.tabIndex = index;
         },
         homePageFn: function(){
-            window.open('/supplier/index.html?id='+this.shopId);
+            window.open('/supplier-'+this.shopId+'.html');
         },
         toFixedFn: function(text){
             return Number(text).toFixed(2);

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

@@ -166,7 +166,9 @@ var supplierHome = new Vue({
         }
     },
     created: function () {
-        this.params.id = getUrlParam("id") ? getUrlParam("id") * 1 : 0;
+        // this.params.id = getUrlParam("id") ? getUrlParam("id") * 1 : 0;
+        var paramsArr = window.location.pathname.split(".")[0].split("-");
+        this.params.id =  paramsArr.length>=1 ? paramsArr[1]*1 : 0;
         if(this.params.id !== 0) {
             this.getShopInfo();
             this.getBanners();

src/main/resources/templates/article/components/article-footer.html

@@ -4,7 +4,7 @@
         <div class="logo"><img src="/img/info/foot-logo.png" /></div>
         <div class="dizhi">
             <p>Copyright©2015-2021 CAIMEI365.com All Rights Reserved.</p>
-            <p>深圳市采美网络信息有限公司版权所有<a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></p>
+            <p>深圳市采美网络信息有限公司版权所有<a href="https://beian.miit.gov.cn" target="_blank" rel="nofollow" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></p>
             <span>
                 <!-- CNZZ统计 start -->
                 <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>

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

@@ -65,7 +65,7 @@
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2021 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美网络信息有限公司</span></p>
                 <p>
-                    <span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span>
+                    <span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" rel="nofollow" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span>
                     <span>中华人民共和国增值电信业务经营许可证</span>
                     <span>
                         <!-- CNZZ统计 start -->
@@ -81,8 +81,8 @@
             <span class="phone icon mIcon">咨询热线</span>
             <div class="phoneHover mFixed">
                 <div>
-                    <p><a href="tel:075522907771">0755-22907771<i class="h5Only">点击咨询</i></a></p>
-                    <p><a href="tel:15338851365">153-3885-1365<i class="h5Only">点击咨询</i></a></p>
+                    <p><a href="tel:075522907771" rel="nofollow">0755-22907771<i class="h5Only">点击咨询</i></a></p>
+                    <p><a href="tel:15338851365" rel="nofollow">153-3885-1365<i class="h5Only">点击咨询</i></a></p>
                     <p><span>工作日</span></p>
                     <p>周一 ～ 周五 / 09:00～18:00</p>
                     <i class="close"></i>

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

@@ -37,12 +37,12 @@
                     <a class="cTab" href="javascript:void(0);" v-if="userIdentity == 3" v-text="userData.name"></a>
                     <a class="cTab" href="javascript:void(0);" v-else v-text="userData.name"></a>
                     <div class="cShow" v-if="userIdentity == 4 || userIdentity == 2">
-                        <a href="/user/dashboard.html">我的采美</a>
-                        <a href="/user/setting/information.html">机构资料</a>
+                        <a href="/user/dashboard.html" rel="nofollow">我的采美</a>
+                        <a href="/user/setting/information.html" rel="nofollow">机构资料</a>
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
                     <div class="cShow" v-if="userIdentity == 3">
-                        <a href="/supplier/dashboard.html">我的采美</a>
+                        <a href="/supplier/dashboard.html" rel="nofollow">我的采美</a>
                         <a href="javascript:void(0);" @click="pageLinkSupplier()">店铺管理</a>
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
@@ -63,9 +63,9 @@
                 <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
             </a>
             <div class="mf h5Only mUserCenter">
-                <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车"></a>
-                <a v-if="loginStatus" @click="showGlobalMenu()" class="mUserIcon mIcon" href="javascript:void(0);" title="个人中心"></a>
-                <a v-else class="mUserIcon mIcon toLogin" href="javascript:void(0);" title="个人中心"></a>
+                <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车" rel="nofollow"></a>
+                <a v-if="loginStatus" @click="showGlobalMenu()" class="mUserIcon mIcon" href="javascript:void(0);" title="个人中心" rel="nofollow"></a>
+                <a v-else class="mUserIcon mIcon toLogin" href="javascript:void(0);" title="个人中心" rel="nofollow"></a>
             </div>
             <div class="searchBox" id="topSearch">
                 <div class="search">
@@ -150,7 +150,7 @@
                                 <th:block th:if="${big.containsKey('smallTypeList')} and ${big.get('smallTypeList')!=null}">
                                 <div class="line" th:each="small : *{smallTypeList}" th:object="${small}">
                                     <div class="lft show">
-                                        <a th:href="'/product/instruelist.html?bigTypeId=' + *{bigTypeId} +'&smallTypeId='+*{smallTypeId} + '&typeSort=' + ${big.getString('typeSort')}" target="_blank">
+                                        <a th:href="'/product/classify-'+${big.getString('typeSort')}+'-' + *{bigTypeId} +'-'+*{smallTypeId} + '.html'" target="_blank">
                                             <span v-if="isPC"> > </span>
                                             <p th:text="*{name}"></p>
                                         </a>
@@ -158,14 +158,14 @@
                                     <div class="rgt mfw" >
                                         <th:block th:if="${small.containsKey('tinyTypeList')} and ${small.get('smallTypeList')!=null}">
                                             <th:block th:each="tiny : *{tinyTypeList}" th:object="${tiny}">
-                                            <a th:href="'/product/instruelist.html?bigTypeId=' + ${big.getString('bigTypeId')} +'&smallTypeId='+*{smallTypeId} + '&tinyTypeID=' + *{tinyTypeId} + '&typeSort=' + ${big.getString('typeSort')}" target="_blank">
+                                            <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ ${big.getString('bigTypeId')} +'-'+ *{smallTypeId} +'-'+ *{tinyTypeId} + '.html'" target="_blank">
                                                 <img v-if="!isPC" th:src="*{crmIcon}" alt="*{name}">
                                                 <p th:text="*{name}"></p>
                                             </a>
                                             </th:block>
                                         </th:block>
                                         <th:block th:unless="${small.containsKey('tinyTypeList')} and ${small.get('smallTypeList')!=null}">
-                                            <a th:href="'/product/instruelist.html?bigTypeId=' + *{bigTypeId} +'&smallTypeId='+*{smallTypeId} + '&typeSort=' + ${big.getString('typeSort')}" target="_blank">
+                                            <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ *{bigTypeId} +'-'+ *{smallTypeId} + '.html'" target="_blank">
                                                 <img v-if="!isPC" th:src="*{crmIcon}" alt="全部商品"><p>全部商品</p>
                                             </a>
                                         </th:block>
@@ -174,13 +174,13 @@
                                 </th:block>
                                 <div class="line" th:unless="${big.containsKey('smallTypeList')} and ${big.get('smallTypeList')!=null}">
                                     <div class="lft none">
-                                        <a th:href="'/product/instruelist.html?bigTypeId=' + *{bigTypeId} + '&typeSort=' + ${big.getString('typeSort')}" target="_blank">
+                                        <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ *{bigTypeId} +'.html'" target="_blank">
                                             <span v-if="isPC"> > </span>
                                             <p th:text="*{name}"></p>
                                         </a>
                                     </div>
                                     <div class="rgt mfw" >
-                                        <a th:href="'/product/instruelist.html?bigTypeId=' + *{bigTypeId} + '&typeSort=' + ${big.getString('typeSort')}" target="_blank">
+                                        <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ *{bigTypeId} +'.html'" target="_blank">
                                             <img v-if="!isPC" th:src="*{crmIcon}" alt="全部商品"><p>全部商品</p>
                                         </a>
                                     </div>

src/main/resources/templates/document/details.html

@@ -57,7 +57,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2021 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美网络信息有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" rel="nofollow" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>

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

@@ -58,7 +58,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2021 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美网络信息有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" rel="nofollow" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>

src/main/resources/templates/document/more-content.html

@@ -56,7 +56,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2021 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美网络信息有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" rel="nofollow" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>

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

@@ -28,7 +28,7 @@
     <div v-else class="equipmentList">
         <ul class="clear mfw">
             <li class="equipmentItem" v-for="ins in listData">
-                <a :href="'/equipment/detail.html?id='+ins.id" target="_blank">
+                <a :href="'/equipment/'+ins.id+'.html" target="_blank">
                     <img src="/img/base/placeholder.png" :data-original="ins.image">
                     <span class="name" v-html="ins.name"></span>
                 </a>

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

@@ -206,7 +206,7 @@
     </div>
     <div class="wrap clear">
         <div v-if="!isPC" class="mShopBox">
-            <a th:href="@{'/supplier/index.html?id=' + ${product.shopId}}">
+            <a th:href="@{'/supplier-'+${product.shopId}+'.html'}">
                 <span class="name"><em th:text="${product.shopTitle}"></em><i th:if="not${#strings.isEmpty(product.license)}" class="icon mIcon shop"></i></span>
                 <span>经营范围：<em th:text="${product.businessScope}"></em></span>
                 <span>所在地区：<em th:text="${product.shopAddress}"></em></span>
@@ -261,7 +261,7 @@
             <div class="shopBox">
                 <div class="hd">供应商信息</div>
                 <div class="bd">
-                    <a th:href="@{'/supplier/index.html?id=' + ${product.shopId}}">
+                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}">
                         <div class="name"><span th:text="${product.shopTitle}"></span><i th:if="not${#strings.isEmpty(product.license)}" class="icon shop"></i></div>
                     </a>
                     <template th:if="not${#strings.isEmpty(product.businessScope)}">
@@ -273,7 +273,7 @@
                         <div class="con" th:text="${product.shopAddress}"></div>
                     </template>
                     <div class="tit">满意度：<i th:each="i:${#numbers.sequence(1,5)}" class="icon heart"></i></div>
-                    <a th:href="@{'/supplier/index.html?id=' + ${product.shopId}}" class="btn">查看主页</a>
+                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn">查看主页</a>
                 </div>
             </div>
             <div class="contact">

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

@@ -98,7 +98,7 @@
                 <div class="content" v-html="cmContent" else></div>
             </div>
         </div>
-        <div class="float-zplm"><a target="_blank" href="https://www-b.caimei365.com/topic.html?type=6&name=%E6%AD%A3%E5%93%81%E8%81%94%E7%9B%9F"><img src="/img/quality/float-img.png"></a></div>
+        <div class="float-zplm"><a target="_blank" href="https://www-b.caimei365.com/topic-6.html?name=%E6%AD%A3%E5%93%81%E8%81%94%E7%9B%9F"><img src="/img/quality/float-img.png"></a></div>
 
         <!--授权图模态框-->
         <div class="sq-book-modal" @click="hideSqBookModal" v-show="isShowSqBookModal" id="sq-book-modal"></div>

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

@@ -49,7 +49,7 @@
                     <div class="c0">
                         <input class="check" type="checkbox" @change="ckeckSupplier($event, supplier.checked)" v-model="supplier.checked">
                     </div>
-                    <a  :href="'/supplier/index.html?id='+supplier.id" target="_blank">
+                    <a  :href="'/supplier-'+supplier.id+'.html'" target="_blank">
                         <img class="img" :src="supplier.logo">
                         <span class="name" v-text="supplier.name"></span>
                     </a>

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

@@ -305,7 +305,7 @@
         <div class="summary">
             <div v-if="isPC" class="left">
                 <div class="item">
-                    <a href="/shopping/cart.html" class="back"><i class="icon mIcon"></i>返回购物车</a>
+                    <a href="/shopping/cart.html" class="back" rel="nofollow"><i class="icon mIcon"></i>返回购物车</a>
                 </div>
             </div>
             <div class="right mfbt">

src/main/resources/templates/single-page/investment.html

@@ -40,14 +40,14 @@
                 <img src="/img/investment/pc_3.jpg">
                 <div class="btn">
                     <a href="javascript:void(0);" class="more" @click="showMore()"></a>
-                    <a href="https://www.caimei365.com/page.html?id=223" class="bank" target="_blank"></a>
+                    <a href="https://www.caimei365.com/page-223.html" class="bank" target="_blank"></a>
                 </div>
             </template>
             <template v-else>
                 <img src="/img/investment/pc_4.jpg">
                 <div class="btn">
                     <a href="javascript:void(0);" class="back" @click="goBack()"></a>
-                    <a href="https://www.caimei365.com/page.html?id=223" class="bank" target="_blank"></a>
+                    <a href="https://www.caimei365.com/page-223.html" class="bank" target="_blank"></a>
                 </div>
             </template>
         </div>
@@ -58,7 +58,7 @@
                 <img src="/img/investment/h5_3.jpg">
                 <div class="btn">
                     <a href="javascript:void(0);" class="more" @click="showMore()"></a>
-                    <a href="https://www.caimei365.com/page.html?id=223" class="bank"></a>
+                    <a href="https://www.caimei365.com/page-223.html" class="bank"></a>
                 </div>
             </template>
             <template v-else>
@@ -66,7 +66,7 @@
                 <img src="/img/investment/h5_5.jpg">
                 <div class="btn">
                     <a href="javascript:void(0);" class="back" @click="goBack()"></a>
-                    <a href="https://www.caimei365.com/page.html?id=223" class="bank"></a>
+                    <a href="https://www.caimei365.com/page-223.html" class="bank"></a>
                 </div>
             </template>
         </div>

src/main/resources/templates/supplier-center/components/tableft.html

@@ -12,7 +12,7 @@
     <div class="navList">
         <span class="tab">我的店铺</span>
         <div class="con" style="display:none">
-            <a :href="'/supplier/index.html?id='+GLOBAL_SHOP_ID">查看店铺</a>
+            <a :href="'/supplier-'+GLOBAL_SHOP_ID+'.html'">查看店铺</a>
             <a href="/supplier/decoration.html">装扮主页</a>
             <a href="/supplier/release.html">发布商品</a>
             <a href="/supplier/goods.html">我的商品</a>
@@ -52,7 +52,7 @@
             <div class="centerList">
                 <span class="tab mIcon sh">我的店铺</span>
                 <div class="con">
-                    <a :href="'/supplier/index.html?id='+GLOBAL_SHOP_ID">查看店铺</a>
+                    <a :href="'/supplier-'+GLOBAL_SHOP_ID+'.html'">查看店铺</a>
                     <a href="/supplier/decoration.html">装扮主页</a>
                     <a href="/supplier/release.html">发布商品</a>
                     <a href="/supplier/goods.html">我的商品</a>

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

@@ -28,10 +28,10 @@
     <ul v-else class="supplierList">
         <li class="supplierItem clear" v-for="shop in listData">
             <div class="left">
-                <a :href="'/supplier/index.html?id='+shop.shopId" target="_blank" class="logo">
+                <a :href="'/supplier-'+shop.id+'.html'" target="_blank" class="logo">
                     <img :src="shop.logo" onerror="javascript:this.src='/img/default/suppliver.jpg';">
                 </a>
-                <h5><a :href="'/supplier/index.html?id='+shop.shopId" :title="shop.name" target="_blank">
+                <h5><a :href="'/supplier-'+shop.id+'.html'" :title="shop.name" target="_blank">
                     <span v-html="shop.name"></span>
                 </a>
                 <a v-if="shop.license" :href="shop.license" target="_blank" class="icon mIcon shop"></a>
@@ -55,7 +55,7 @@
                     </template>
                     <li v-else-if="isPC" v-for="i in 3"></li>
                 </ul>
-                <a v-if="isPC" :href="'/supplier/index.html?id='+shop.shopId" target="_blank" class="four">进入本店铺>>></a>
+                <a v-if="isPC" :href="'/supplier-'+shop.id+'.html'" target="_blank" class="four">进入本店铺>>></a>
             </div>
         </li>
     </ul>