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

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

@@ -22,6 +22,8 @@ public class ProductController extends BaseController {
 	private static final String PRODUCT_LIST_PATH = "product/list";
 	private static final String PRODUCT_DETAIL_PATH = "product/detail";
 	private static final String PROMOTIONS_LIST_PATH = "product/promotions";
+    private static final String INSTRUMENT_PAGE_PATH = "product/instrument";
+    private static final String INSTRUMENT_LIST_PATH = "product/instruelist";
 
     private ProductService productService;
     @Autowired
@@ -59,4 +61,19 @@ public class ProductController extends BaseController {
         return PRODUCT_DETAIL_PATH;
     }
 
+    /**
+     * 仪器页
+     */
+    @GetMapping("/product/instrument.html")
+    public String instrument(){
+        return INSTRUMENT_PAGE_PATH;
+    }
+
+    /**
+     * 仪器列表页
+     */
+    @GetMapping("/product/instruelist.html")
+    public String instruelist(){
+        return INSTRUMENT_LIST_PATH;
+    }
 }

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

@@ -9,8 +9,11 @@
     .ClassA {width: 128px;height: 40px;display: inline-block;text-align: center;line-height: 40px;font-size: 16px;cursor: pointer;color: #333333;border: 0;}
     .active {background: #ffe6dc;color: #e15616;}
     .activeImg{opacity: 0.5;}
-    .fabu {float: right;text-align: center;color: #e15616;border-bottom: 1px solid #e15616;height: 32px;margin-right: 30px}
-    .fabu a {line-height: 40px;color: #e15616}
+    .right-btn{width: 215px;float: right}
+    .fabu {float: right;text-align: center;height: 26px;margin-right: 30px;background: #e15616;width: 72px;line-height: 26px;margin-top: 7px;border-radius: 2px}
+    .fabu a {color: #fff}
+    .intro{border-bottom: 1px solid #e15616;float: left;margin-top: 10px; }
+    .intro a{color: #e15616;}
     .mainTab {background: #fff;width:1184px;height: 40px;float: left;}
     .Listitem:nth-of-type(4n) {margin-right: 0;}
     .mainTab li {height: 40px;line-height: 40px;text-align: center;color: #627386;cursor: pointer;width: 128px;float: left;}

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

@@ -0,0 +1,13 @@
+#container{
+width: 1184px;
+margin: auto;
+}
+.instrue-left{
+  width: 884px;
+    float: left;
+    margin-right: 16px;
+}
+.instrue-right{
+float: right;
+width: 284px;
+}

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

@@ -0,0 +1,15 @@
+ var instrueMent = new Vue({
+    el:'#instrueMent',
+    data:{
+        categorylist:[
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            {name:'中胚层产品'},
+            ]
+    }
+ })

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

@@ -621,6 +621,7 @@ var releaseContainer = new Vue({
             }
             if(_this.releaseParams.attribute == ''){
                 _this.vShow_attribute=true;
+                _this.fromMessage = '请选择商品属性';
                  _this.scrollIntoView();
                 setTimeout(function(){
                     _this.vShow_attribute = false;

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

@@ -27,9 +27,15 @@
                 <li class="ClassA icon" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'jqSelect':'']">
                     其他
                 </li>
-                <li class="fabu">
-                    <a href="/flea-market/form.html">我要发布</a>
-                <li/>
+                <div class="right-btn">
+                    <li class="intro">
+                        <a href="/flea-market/intro.html">二手市场介绍</a>
+                    <li/>
+                    <li class="fabu">
+                        <a href="/flea-market/form.html">我要发布</a>
+                    <li/>
+                </div>
+
             </ul>
             <ul class="secondTitle" v-else>
                 <li class="ClassA mIcon off" @click="handle('1')" :class="currentId == '1' ? 'active':''">

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

@@ -0,0 +1,17 @@
+<!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>采美365网-仪器</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/equipment/list.css(v=${version})}" rel="stylesheet" type="text/css">
+</head>
+<body>
+    <!-- 引用头部 -->
+    <template th:replace="components/header"></template>
+
+    <!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+</body>
+

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

@@ -0,0 +1,29 @@
+<!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>采美365网-仪器</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/product/instruement.css(v=${version})}" rel="stylesheet" type="text/css">
+</head>
+<body>
+    <!-- 引用头部 -->
+    <template th:replace="components/header"></template>
+    <div id="container">
+        <div id="instrueMent">
+            <div class="instrue-left">
+                <div class="top-category">
+                    <ul class="normal-nav clearfix">
+                        <li v-for="(item,index)in categorylist">{{item.name}}</li>
+                    </ul>
+                </div>
+            </div>
+            <div class="instrue-right"></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/product/instruement.js(v=${version})}"></script>
+</body>

src/main/resources/templates/supplier-center/shop/release.html

@@ -88,13 +88,13 @@
                                             <div class="option" v-for="x in classificationTwoList" :key="x.value" @click="ChangeClassificationTwo(x)">{{x.name}}</div>
                                         </div>
                                     </div>
-                                    <div class="select-main" :class="[isSelectActive == 3 ? 'border' : '']">
-                                        <input class="select" v-model="selectText.tinyTypeID" type="text" readonly="readonly" placeholder="请选择分类" @click.stop.prevent="showOption('three')">
-                                         <i class="mIcon selected"></i>
-                                        <div class="option-main" v-if="isSelectActive == 3">
-                                            <div class="option" v-for="x in classificationThreeList" :key="x.value" @click="ChangeClassificationThree(x)">{{x.name}}</div>
-                                        </div>
-                                    </div>
+<!--                                    <div class="select-main" :class="[isSelectActive == 3 ? 'border' : '']">-->
+<!--                                        <input class="select" v-model="selectText.tinyTypeID" type="text" readonly="readonly" placeholder="请选择分类" @click.stop.prevent="showOption('three')">-->
+<!--                                         <i class="mIcon selected"></i>-->
+<!--                                        <div class="option-main" v-if="isSelectActive == 3">-->
+<!--                                            <div class="option" v-for="x in classificationThreeList" :key="x.value" @click="ChangeClassificationThree(x)">{{x.name}}</div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                 </div>
                                 <div class="release-tips" v-show="vShow_TinyTypeID">{{fromMessage}}</div>
                             </div>