Home Explore Help
Sign In
caimei365
/
caimei365-www
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

供应商整合

chao 4 years ago
parent
32da8294e1
commit
2f523965db
6 changed files with 16 additions and 79 deletions
Split View Show Diff Stats
  1. 14 2
      src/main/java/com/caimei/www/controller/RedirectController.java
  2. 0 11
      src/main/java/com/caimei/www/controller/unlimited/SupplierController.java
  3. 1 1
      src/main/resources/static/css/product/detail.pc.css
  4. 1 1
      src/main/resources/static/js/article/detail.js
  5. 0 25
      src/main/resources/static/js/supplier/product.js
  6. 0 39
      src/main/resources/templates/supplier/product.html

+ 14 - 2
src/main/java/com/caimei/www/controller/RedirectController.java
View File 

@@ -31,8 +31,8 @@ public class RedirectController {
 
 	 * 供应商商品页【旧】
 
 	 */
 
 	@GetMapping("/supplier/productlist-{id}.html")
 
-	public String toSupplierProduct(@PathVariable("id") Integer supplierId, @RequestParam("brandID") Integer brandId) {
 
-		return "redirect:/supplier/product.html?id=" + supplierId +"&brandId=" + brandId;
 
+	public String toSupplierProduct(@PathVariable("id") Integer supplierId) {
 
+		return "redirect:/supplier/index.html?id=" + supplierId;
 
 	}
 
 	/**
 
 	 * 二级页面（找产品/找仪器/找项目/正品联盟）【旧】
 
@@ -108,5 +108,17 @@ public class RedirectController {
 
         return "redirect:/flea-market/form.html";
 
     }
 
 
+    /**
 
+     * 商品搜索列表
 
+     */
 
+    @GetMapping("/product/search/list/0-0-0-1-0.html")
 
+    public String toSearchProduct(@RequestParam("wd") String keyword) {
 
+        return "redirect:/product/list.html?keyword=" + keyword;
 
+    }
 
+    @GetMapping("/product/search.shtml")
 
+    public String toSearchProduct2(@RequestParam("keyword") String keyword) {
 
+        return "redirect:/product/list.html?keyword=" + keyword;
 
+    }
 
+
 
 
 }

+ 0 - 11
src/main/java/com/caimei/www/controller/unlimited/SupplierController.java
View File 

@@ -25,7 +25,6 @@ public class SupplierController extends BaseController {
 
 
 	private static final String SUPPLIER_LIST_PATH = "supplier/list";
 
 	private static final String SUPPLIER_INDEX_PATH = "supplier/index";
 
-	private static final String SUPPLIER_PRODUCT_PATH = "supplier/product";
 
 
     private SupplierService supplierService;
 
     @Autowired
 
@@ -51,16 +50,6 @@ public class SupplierController extends BaseController {
 
         return SUPPLIER_INDEX_PATH;
 
     }
 
 
-    /**
 
-     * 供应商商品页
 
-     */
 
-    @GetMapping("/supplier/product.html")
 
-    public String product(final Model model, @RequestParam("id") Integer supplierId, @RequestParam("brandID") Integer brandId) {
 
-        SupplierDetail detail = supplierService.getSupplierById(supplierId);
 
-        model.addAttribute("supplier", detail);
 
-        return SUPPLIER_PRODUCT_PATH;
 
-    }
 
-
 
     /**
 
      * 供应商-轮播图片
 
      * @return

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

@@ -17,7 +17,7 @@ li{list-style:none;}
 
 .productBox .zoomImage{display:none;overflow:hidden;position:absolute;right:-466px;top:0;width:452px;height:452px;border:1px solid #e4e4e4;z-index:9999;background:#FFF}
 
 .productBox .zoomImage img{width:950px;height:950px;margin-right:10px;display:block}
 
 
-.productBox .detailBox .crumbs{height:28px;line-height:28px;font-size:14px;overflow:hidden;color:#93979F}
 
+.productBox .detailBox .crumbs{height:28px;line-height:28px;font-size:14px;overflow:hidden;color:#93979F;padding:0;}
 
 .productBox .detailBox .crumbs a{color:#93979F}
 
 .productBox .detailBox .crumbs a:hover{color:#E15616}
 
 .productBox .detailBox .title{font-size:18px;font-weight:bold;line-height:24px;padding:5px 0;color:#4A4F58}

+ 1 - 1
src/main/resources/static/js/article/detail.js
View File 

@@ -1,2 +1,2 @@
 
 // 获取相关阅读
 
-// "/article/labels"，{id:文章Id, labels: 文章标签，用，号隔开}
 
+// "/article/related"，{id:文章Id, labels: 文章标签，用，号隔开}

+ 0 - 25
src/main/resources/static/js/supplier/product.js
View File 

@@ -1,25 +0,0 @@
 
-var supplierHome = new Vue({
 
-    el: "#supplierHome",
 
-    data: {
 
-        userId: 0,
 
-        supplierId: 0,
 
-        brandId: 0,
 
-
 
-    },
 
-    computed: {
 
-
 
-    },
 
-    methods: {
 
-
 
-    },
 
-    created: function () {
 
-        this.supplierId = getUrlParam("id") ? getUrlParam("id") * 1 : 0;
 
-        this.brandId = getUrlParam("brandId") ? getUrlParam("brandId") * 1 : 0;
 
-    },
 
-    mounted: function () {
 
-        var _self = this;
 
-        $('body').on("click", '.showSearch', function(){
 
-            $('.supplierTit .search').show();
 
-        })
 
-    }
 
-});

+ 0 - 39
src/main/resources/templates/supplier/product.html
View File 

@@ -1,39 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-      xsi:schemaLocation="https://www.thymeleaf.org ">
 
-<head>
 
-    <title th:text="'采美365网-'+${supplier.name}">采美365网-供应商首页</title>
 
-    <template th:replace="components/head-link"></template>
 
-    <link th:href="@{/css/supplier/index.css(v=${version})}" rel="stylesheet" type="text/css">
 
-</head>
 
-<body>
 
-<!-- 引用头部 -->
 
-<template th:replace="components/header"></template>
 
-
 
-<!-- 供应商首页 -->
 
-<div id="supplierProduct">
 
-    <div class="supplierTit">
 
-        <div class="title">
 
-            <img th:src="${supplier.logo}">
 
-            <h1 th:text="${supplier.name}"></h1>
 
-            <a href="javascript:void(0);"><i class="icon mIcon shop"><em class="tips">点击查看授权牌照</em></i></a>
 
-        </div>
 
-        <div class="search">
 
-            <input class="keyword" type="text" placeholder="请输入商品名称（商铺内商品）">
 
-            <a class="searchBtn icon mIcon" href="javascript:void(0);"></a>
 
-        </div>
 
-    </div>
 
-
 
-    <!--主体内容-->
 
-    <div>
 
-
 
-    </div>
 
-
 
-</div>
 
-
 
-<!-- 引入底部 -->
 
-<template th:replace="components/footer"></template>
 
-<template th:replace="components/foot-link"></template>
 
-<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/product.js(v=${version})}"></script>
 
-</body>
 
-</html>