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

src/main/resources/static/js/encyclopedia/detail.js

@@ -17,7 +17,7 @@ $(function () {
     var timer = null; // 定时器
     var middleScreenWidth = 1450;
     // 生成导航
-    makeNavigate('.section h2', '.navigate');
+    makeNavigate('.section .title h2', '.navigate');
     if (windowWidth > 768) {
         offset = getScrollOffset('.navbar') + 10;
     } else {

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

@@ -28,7 +28,7 @@
                 </div>
                 <p v-if="isPC" class="result search-tip">
                     <span>为你找到相关文章<b v-text="listRecord"></b>条,</span>
-                    <span>同时为您找到相关产品<b v-text="productRecord"></b>条</span>
+                    <span>同时为您找到相关产品<b v-text="productRecord"></b>个</span>
                     <a target="_blank" :href="'/product/list.html?keyword=' + params.keyword" v-if="listRecord > 0">点击前往</a>
                 </p>
             </div>
@@ -37,7 +37,7 @@
             </p>
             <p v-if="params.keyword && !isPC" class="classify search-tip">
                 <span>为你找到相关文章<em v-text="listRecord"></em>条,</span>
-                <span>同时为您找到相关产品<em v-text="listRecord"></em>条</span>
+                <span>同时为您找到相关产品<em v-text="listRecord"></em>个</span>
                 <a target="_blank" :href="'/product/list.html?keyword=' + params.keyword" v-if="listRecord > 0">点击前往</a>
             </p>
             <div v-if="listData.length>0" class="dataRousce">

src/main/resources/templates/supplier-center/encyclopedia/instrument-list.html

@@ -81,7 +81,7 @@
                             <el-select v-model="listQuery.status" @change="getArticleList" class="mini-width" clearable>
                                 <el-option label="全部" value=""></el-option>
                                 <el-option label="已发布" :value="1"></el-option>
-                                <el-option label="保存草稿箱" :value="2"></el-option>
+                                <el-option label="保存草稿箱" :value="0"></el-option>
                             </el-select>
                         </div>
                         <!--筛选按钮-->

src/main/resources/templates/supplier-center/encyclopedia/product-list.html

@@ -81,7 +81,7 @@
                             <el-select v-model="listQuery.status"  @change="getArticleList" class="mini-width" clearable>
                                 <el-option label="全部" value=""></el-option>
                                 <el-option label="已发布" :value="1"></el-option>
-                                <el-option label="保存草稿箱" :value="2"></el-option>
+                                <el-option label="保存草稿箱" :value="0"></el-option>
                             </el-select>
                         </div>
                         <!--筛选按钮-->