Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/index/camp/Index.vue

src/views/index/camp/Index.vue

@@ -17,14 +17,14 @@
               :class="{ active: campindex_type === index }"
               @click="ToSignUp(index)"
             >
-              <img :src="item.image"/>
+              <img :src="item.image" />
               {{ item.desc }}
             </li>
           </ul>
         </div>
 
         <div class="camp_right" ref="rightBox">
-          <router-view/>
+          <router-view />
         </div>
       </div>
     </div>