Merge branch 'release-201831-wangcz'

# Conflicts:
#	pages/mobile/center/vendor/material.vue

Dockerfile

@@ -6,6 +6,7 @@ RUN chmod +x run.sh
 #RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
 #RUN cnpm install -g node-gyp
 #RUN cnpm install -g yarn
-RUN yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
-RUN yarn
+RUN rm -f /usr/local/bin/yarn
+RUN /opt/yarn-v1.5.1/bin/yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
+RUN /opt/yarn-v1.5.1/bin/yarn
 CMD [ "bash", "run.sh" ]

components/main/Nav.vue

@@ -45,7 +45,7 @@
         <span>PCB专区</span>
       </nuxt-link>
       <a class="item" href="https://zb.usoftchina.com/" target="_blank">
-        <span>U创网</span>
+        <span>闯客网</span>
       </a>
       <a class="item" href="https://bbs.usoftchina.com/" target="_blank">
         <span>U客论坛</span>

pages/help/helpList/_id.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="showAlone">
     <help-header></help-header>
   <div id="main">
     <div class="container" style="padding: 0; width: 1190px;">
@@ -48,6 +48,11 @@
   import { left, helpHeader } from '~components/help'
   export default {
     name: 'help',
+    data () {
+      return {
+        showAlone: false
+      }
+    },
     components: {
       left,
       helpHeader
@@ -59,9 +64,11 @@
         store.dispatch('loadHelpTitle', route.params)
       ])
     },
-    mounted () {
+    created () {
       if(this.helpList && this.helpList.length === 1) {
         this.$router.push(`/help/helpDetail/${this.helpList[0].num}`)
+      } else {
+        this.showAlone = true
       }
     },
     computed: {