Merge branch 'oapush' into 'master'

Oapush

See merge request spfm-group/spfm-market-front!44

src/components/p-header.vue

@@ -15,6 +15,10 @@
     </div> -->
     <div class="bars">
       <div class="bars-item user-info">Hello，{{ username }}</div>
+<!--      <div class="bars-item" @click="handleGoToCalendar">-->
+<!--        <i class="el-icon-date"></i>-->
+<!--        日历-->
+<!--      </div>-->
 
       <div class="bars-item" @click="handleHelp">
         <i class="el-icon-time"></i>
@@ -72,6 +76,9 @@ export default {
     //this.menuClose();
   },
   methods: {
+      handleGoToCalendar(){
+        this.$router.push('calendar');
+      },
     handleCall() {
       this.$switchTab(this, { rountPath: "/knowledgetop", name: "知识库" },'knowledgetop');
     },

vue.config.js

@@ -135,7 +135,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://192.168.0.66:9600",
+                target: "http://192.168.0.90:9600",
                 changeOrigin: true,
             },
         },