Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

package.json

@@ -19,6 +19,7 @@
     "jspdf": "^1.4.1",
     "less-loader": "^5.0.0",
     "moment": "^2.22.2",
+    "pinyin": "^2.9.0",
     "register-service-worker": "^1.0.0",
     "sass-loader": "^8.0.2",
     "tinymce": "^5.1.6",

src/components/dev/index.vue

+<template>
+  <div class="dev-box">
+      <div class="c">
+          <i class="iconfont iconkaifazhong"></i>
+          <div>正在开发中，敬请期待</div>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+    .dev-box{
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-items: center;
+        align-items: center;
+    }
+    .dev-box .c{
+       text-align: center;
+       width: 200px;
+       height: 200px;
+        color: gray;
+        margin:0 auto;
+    }
+     .dev-box .c i{
+         font-size: 100px;
+         color: gray;
+     }
+     .dev-box .c div{
+         text-align: center;
+         font-size: 18px;
+         
+     }
+</style>
\ No newline at end of file

src/router.js

@@ -211,6 +211,14 @@ export default new Router({
             title: "资产"
           }
         },
+        {
+          path: "/deving",
+          name: "deving",
+          component: ()=>import('./components/dev/index.vue'),
+          meta: {
+            title: "资产"
+          }
+        },
         {
           path: "/roomStatistical",
           name: "roomStatistical",

src/views/login.vue

@@ -128,8 +128,8 @@ export default {
     var msg = {
       EmAccount: this.account,
       EmPassword: this.pwd,
-      Domain:'testerp.oytour.com'
-      // Domain: 'crmyx.oytour.com'
+      //Domain:'testerp.oytour.com'
+      Domain: 'crmyx.oytour.com'
     };
     this.apipost('/api/Login/UserLogin', msg, res=>{
       var jsonData = res.data;