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

src/assets/css/cssReset.css

@@ -543,12 +543,13 @@ vertical-align:middle
     bottom: 0;
     left: 50px;
     padding: 10px;
-    overflow: auto;
+    overflow: hidden;
     font-family: 'PingFangSc-Fine';
     z-index: 999;
     right: 0;
     background-color: #fff;
     border-top: 3px solid #38425d;
+    padding-bottom: 30px;
 }
 .bottom-box .btm-title{
     padding-left: 10px;
@@ -569,4 +570,46 @@ vertical-align:middle
 
 .page_ShoppingReimbursementDetails .avatar-uploader-icon {
     height: auto !important; 
-}
\ No newline at end of file
+}
+
+/************************** luochao 重新定义表格样式 BEGIN *******************************/
+.al-tab{
+    width: 100%;
+    border-collapse: collapse;
+    
+}
+.al-tab .center.th,.al-tab .center.td{
+    text-align: center !important;
+}
+.al-tab,.al-tab th, .al-tab td{
+    border:1px solid #ddd;
+}
+.al-tab caption{
+    font-size: 18px;
+    color: #333;
+    height: 40px;
+    line-height: 40px;
+    text-align: left;
+    padding-left: 12px;
+}
+.al-tab th{
+    background: #E6E6E6;
+    height: 40px;
+    line-height: 40px;
+    color: #333;
+    font-size: 16px;
+    font-weight: 300;
+    text-align: left;
+    padding-left:5px;
+}
+.al-tab td{
+    height: 40px;
+    line-height: 40px;
+    color: #333;
+    font-size: 12px;
+    font-weight: 300;
+    text-align: left;
+    padding-left:5px;
+}
+
+/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file

src/plug/index.js

@@ -115,13 +115,13 @@ export default {
       Vue.prototype.domainManager = function () {
       let domainUrl = '';
       let locationName = window.location.hostname;
-      domainUrl = "http://192.168.2.214:8082"; //214主域名
+      // domainUrl = "http://192.168.2.214:8082"; //214主域名
       // domainUrl = "http://192.168.2.88"; //王悦主域名
       //   domainUrl = "http://127.0.0.1"; //214主域名
-      // domainUrl = "http://192.168.2.16:8083"; //刘东主域名
+      // domainUrl = "http://192.168.2.16:8083"; //王悦主域名
       //   domainUrl = "http://127.0.0.1"; //214主域名
       // domainUrl = "http://192.168.2.65:8025"; //吴春主域名
-      // domainUrl = "http://192.168.2.106:8082"; //罗超主域名
+      domainUrl = "http://192.168.2.106:8082"; //罗超主域名
       if (locationName.indexOf('oytour')!==-1) {
         domainUrl = "https://reborn.oytour.com";
       }else if (locationName.indexOf('viitto')!==-1) {
@@ -525,7 +525,6 @@ export default {
 
     //价钱格式化，三位数逗号分隔，保留两位小数   duanjun
     Vue.prototype.moneyFormat = function (value) {
-        if(!value) return ('0.00')
         let nStr = Number(value).toFixed(2)
         nStr += '';
         let x = nStr.split('.');