Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-ui

.env.production

@@ -1,10 +1,10 @@
 VUE_APP_MODE=production
 VUE_APP_NODE_ENV=production
-VUE_APP_SCENE=/v1.0/datang/
-VUE_APP_BASE_URL=http://10.119.190.12:8000
-VUE_APP_API_URL=http://10.119.190.12:8000/v1.0
-VUE_APP_PROXY_URL=/v1.0
-VUE_APP_PUBLIC_PATH=/v1.0/datang
-VUE_APP_MSG_URL=wss://10.119.190.12:8000/websocket/message/v4.0/ws
+VUE_APP_SCENE=/datang/
+VUE_APP_BASE_URL=http://test.tall.wiki
+VUE_APP_API_URL=http://test.tall.wiki/datang/v1.0
+VUE_APP_PROXY_URL=/datang/v1.0
+VUE_APP_PUBLIC_PATH=/datang
+VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=大唐
 VUE_APP_DESCRIPTION=大唐

src/views/OtherPages/Department.vue

@@ -10,7 +10,7 @@
               <template v-if="code.length === 6 && (code.split('')[5] === '4' || code.split('')[5] === '6')">
                 <ListPage :code="code" @changeYear="changeYear" :content="content" @getData="getNumData" />
               </template>
-              <RichText :rich-obj="content" />
+              <RichText v-else :rich-obj="content" />
             </div>
           </div>
         </div>
@@ -18,6 +18,7 @@
     </div>
   </div>
 </template>
+
 <script>
 import { mapActions } from 'vuex';
 import LeftNav from '@/components/LeftNav/LeftNav.vue';