Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages.json

components/category-bar/category-bar.vue

@@ -59,7 +59,7 @@
                                 <li class="nav ">
                                     <a href="/">首页</a>
                                 </li>
-                                <li class="nav" @click="navTo('/pages/index/self-support/self-support')">
+                                <li class="nav" @click="navTo('/pages/index/self-support/self-support')" :class="[currentPage.includes('self-support') ? 'active' : '']">
                                     <a href="javascript:;">金久信自营</a>
                                 </li>
                                 <li @click="navTo('/pages/spot/goods/goods')" class="nav"
@@ -89,7 +89,7 @@
                                     :class="[currentPage.includes('article')  ? 'active' : '']">
                                     <a href="javascript:;">金久信学堂</a>
                                 </li>
-                                <li class="nav ">
+                                <li class="nav " @click="navTo('/pages/index/shop/shop')" :class="[currentPage.includes('shop')  ? 'active' : '']">
                                     <a href="javascript:;">特产商城</a>
                                 </li>
                             </ul>