Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -179,7 +179,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_5umd0wfprhv.css";
+  @import "//at.alicdn.com/t/font_635492_corysyogb8g.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/assets/css/Details.css

@@ -74,6 +74,10 @@
 .secondMenu .el-submenu__title i {
     color: #a3ace0;
     font-size: 18px;
+    margin-left: 16px;
+    margin-right: 16px;
+    min-width: 18px;
+    display: inline-block;
 }
 
 .el-menu--vertical .thridMenu {

src/components/Login2019.vue

@@ -267,7 +267,7 @@
           this.userInfo.name = "paulwu1657@gmail.com";
           this.userInfo.password = "123456";
         }
-        this.userInfo.Domain = 'ys.oytour.com'//window.location.hostname
+        this.userInfo.Domain = window.location.hostname
       },
       doLogin() {
         if (this.userInfo.name == "") {
@@ -423,7 +423,7 @@
         });
       },
       getGroup() { //获取集团
-        let Domain = 'ys.oytour.com'///window.location.hostname
+        let Domain = window.location.hostname
         this.apipost('admin_get_GetModelByDomain', {
           'Domain': Domain
         }, res => {

src/components/index.vue

@@ -4530,7 +4530,7 @@
     width: 24px;
     height: 24px;
     border-radius: 50%;
-    margin-top: 17px;
+    margin-top: 17px !important;
   }
 
   .nav {
@@ -4556,8 +4556,7 @@
     width: 36px;
     height: 36px;
     -webkit-border-radius: 36px;
-    margin: 0px 30px 0px 15px;
-
+    margin: 0px 30px 0px 15px !important;
   }
 
   .nav-left i.iconfont {

src/components/personalCenter.vue

@@ -24,7 +24,7 @@
           <span class="v">{{CurrentUserInfo.DepartName}}</span>
         </div>
       </div>
-      <div class="n-info" v-if="CurrentUserInfo.RB_Group_id==2 || EditBtn">
+      <div class="n-info" ><!-- v-if="CurrentUserInfo.RB_Group_id==2 || EditBtn" -->
         <div class="item" @click="changeBoard(0)">
           <i class="iconfont icon-yichuheimingdan"></i>
           <span class="n-name">个人首页</span>
@@ -164,15 +164,16 @@
         );
       },
       goUrlNav(url, index, name) {
-        let query = {
-          Conditon: index
-        };
-        query.tab = name;
-        query.blank = "y";
-        this.$router.push({
-          path: url,
-          query
-        });
+        // let query = {
+        //   Conditon: index
+        // };
+        // query.tab = name;
+        // query.blank = "y";
+        // this.$router.push({
+        //   path: "/"+url,
+        //   query
+        // });
+        window.location.href=`http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}`
       }
     }
   };
@@ -198,6 +199,11 @@
     border: 1px solid #2c2739;
   }
 
+  .red-theme .personal .u-box{
+    background: #FBFBFB;
+    border: none;
+  }
+
   .personal .m-box {
     position: absolute;
     left: 300px;
@@ -218,7 +224,18 @@
     margin: 15px;
     display: flex;
   }
-
+  .red-theme .personal .u-box .h-info-box{
+    background: #F4F4F4;
+    margin: 0;
+    padding: 20px 15px;
+  }
+  .red-theme .personal .u-box .u-info{
+    background: none;
+  }
+  .red-theme .personal .u-box .u-info .item .k{
+    color: #787A7D;
+    font-family: unset;
+  }
   .personal .u-box .h-info-box .h-info {
     flex: 1;
   }
@@ -233,7 +250,15 @@
     display: block;
     margin-top: 10px;
   }
-
+  .red-theme .personal .u-box .h-info-box .h-img{
+    border:1px dotted #EB3349;
+  }
+  .red-theme .personal .u-box .h-info-box .h-info .k {
+    font-family: unset;
+  }
+  .red-theme .personal .u-box .h-info-box .h-info .v {
+    color: #121315;
+  }
   .personal .u-box .h-info-box .h-info .v {
     color: #ddd;
     height: 20;
@@ -302,7 +327,20 @@
     margin: 20px 0;
     background: rgba(25, 19, 62, 0.56);
   }
-
+  .red-theme .personal .u-box .n-info{
+    background: #F4F4F4;
+  }
+  .red-theme .personal .u-box .n-info .item:hover{
+    background: #eaeaea;
+    
+  }
+  .red-theme .personal .u-box .n-info .item:hover *:not(.tips){
+    color: #33B3FF;
+  }
+  .red-theme .personal .u-box .n-info .item .n-name{
+    color: #333;
+    font-family: unset;
+  }
   .personal .u-box .n-info .item {
     align-items: center;
     display: flex;
@@ -384,7 +422,12 @@
     border-left: 3px solid #8a8894;
     border-bottom: 3px solid #8a8894;
   }
-
+  .red-theme .personal .left-point-samll::before,
+  .red-theme .personal .left-point-samll::after,
+  .red-theme .personal .right-point-samll::before,
+  .red-theme .personal .right-point-samll::after{
+    border-color: #EB3349;
+  }
   .personal .right-point::after {
     position: absolute;
     width: 9px;

src/components/work/mywork.vue

@@ -461,7 +461,7 @@ export default {
     addData() {
       this.addMsg.BeginTime = this.addMsg.TimeRanges[0];
       this.addMsg.EndTime = this.addMsg.TimeRanges[1];
-      if (this.addMsg.BeginTime != this.addMsg.EndTime) {
+      if (this.addMsg.BeginTime.split(' ')[0] != this.addMsg.EndTime.split(' ')[0]) {
         this.$message.error("只能添加当日工作计划，不能跨天计划");
       } else {
         this.addMsg.Tags =

src/plug/index.js

@@ -115,7 +115,7 @@ export default {
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
                 //domainUrl = "http://reborn.oytour.com";
-                domainUrl = "http://127.0.0.1:8082";
+                domainUrl = "http://localhost:13491";
 
                 let locationName = window.location.hostname;