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

src/assets/css/newTravelManager.css

@@ -49,7 +49,7 @@
   .TTwo{margin:0 105px 0 105px;}
   .Travel_TT{display: inline-block;padding:3px 8px;background-color: #333333;
       color:#fff;border-radius:4px;font-size:12px;margin-left:20px;}
-  .Travel_Line{display: inline-block;width:1016px;border-bottom:1px dashed #BFBFBF;}
+  .Travel_Line{display: inline-block;width:100%;border-bottom:1px dashed #BFBFBF;}
   .TCswitch{display: inline-block;margin-left:18px;}
   .ComSwitchTitle{display:inline-block;vertical-align:top;width:75px;text-align: right;margin-top:2px;color:#606266;}
   .LowNum .el-input__inner{
@@ -842,7 +842,7 @@
 		position: relative;
 		top:2px;
 		text-align: center;
-		line-height: 25px;
+		line-height: 22px;
 		color:#bbb;
 		border:1px solid #bbb;
 		border-radius:50%;
@@ -2899,4 +2899,4 @@
 .showOther{
 	display:none!important;
 }
-.el-popover{text-align: inherit}
\ No newline at end of file
+.el-popover{text-align: inherit}

src/assets/css/tripIndexNew.css

@@ -388,28 +388,31 @@ html, body{
 
 .travelDaysdetailsBJ {
     border-radius: 100px;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     padding: 20px 35px;
     -webkit-border-radius: 100px;
     -moz-border-radius: 100px;
     -ms-border-radius: 100px;
     -o-border-radius: 100px;
 }
-
+.travelDaysdetails-textBox{
+  flex: 1;
+}
 .travelDaysdetails-text {
-    flex-wrap: nowrap;
+    flex-wrap: wrap;
     margin-right: 46px;
 }
 
-    .travelDaysdetails-text span {
+    .travelDaysdetails-text0 {
         font-size: 21px;
         font-family: PingFang SC;
         font-weight: 800;
         color: #2A2A2A;
         line-height: 34px;
+        flex-shrink: 0;
     }
 
-    .travelDaysdetails-text div p {
+    .travelDaysdetails-text {
         font-size: 21px;
         font-weight: 100;
         color: #2A2A2A;
@@ -420,6 +423,21 @@ html, body{
         margin: 0;
         margin-right: 10px;
     }
+    .travelDaysdetails-text1{
+      font-size: 21px !important;
+      font-weight: 100 !important;
+      color: #2A2A2A;
+    }
+    .travelDaysdetails-textBox:last-child span{
+      float: left;
+    }
+    .travelDaysdetails-text p,.travelDaysdetails-text1 p{
+      padding: 0 !important;
+      margin: 0 !important;
+      margin-top: 0 !important;
+      margin-bottom: 0 !important;
+      float: left;
+    }
 
 .LeaveGroupDownload-form .travelControlTrip .module-title {
     text-align: center;

src/components/LeaveGroupDownload/travelDays.vue

@@ -96,24 +96,38 @@
       <div class="travelDaysdetails">
         <div class="travelDaysdetailsBJ row"
         :style="{'background':backgroundColor}">
-          <div class="travelDaysdetails-text row">
-            <span>早餐：</span>
-            <div><p>{{item.can.breakfirst}}</p></div>
-          </div>
-          <div class="travelDaysdetails-text row">
-            <span>午餐：</span>
-            <div><p>{{item.can.lanuch}}</p></div>
+          <div class="travelDaysdetails-textBox column">
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">早餐：</span>
+              {{item.can.breakfirst}}
+            </div>
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">午餐：</span>
+              {{item.can.lanuch}}
+            </div>
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">晚餐：</span>
+              {{item.can.dinner}}
+            </div>
           </div>
-          <div class="travelDaysdetails-text row">
-            <span>晚餐：</span>
-            <div><p>{{item.can.dinner}}</p></div>
+          <div class="travelDaysdetails-textBox">
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">住宿：</span>
+              <template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
+            </div>
           </div>
-          <div class="travelDaysdetails-text row">
-            <span>住宿：</span>
-            <div>
-              <p v-for="(j,i) in item.jiu2">{{j.name}} </p> 或同級
+          <template v-for="(t,i) in item.tips">
+          <div class="travelDaysdetails-textBox" :style="{'flex-grow':getHtmlPlainText(t.content).length>20?'2':''}">
+            <div class="travelDaysdetails-text" style="margin-right: 0;">
+              <span class="travelDaysdetails-text0">提示：</span>
+                <template v-if="getHtmlPlainText(t.content).length>0">
+                  {{getHtmlPlainText(t.content)}}
+                </template>
+                <!-- <div class="travelDaysdetails-text1" v-if="t.content!=''" v-html="t.content"></div> -->
+                <p v-else>暂无提示</p>
             </div>
           </div>
+          </template>
         </div>
       </div>
       <!-- otherJourney-footer -->
@@ -155,6 +169,15 @@
     },
 
     methods: {
+      getHtmlPlainText(html_str) {
+        //提取字符串中的文字
+        let re = new RegExp('<[^<>]+>', 'g')
+        let text = html_str.replace(re, '')
+        //或
+        //var text = html_str.replace(/<[^<>]+>/g, "");
+        console.log(text)
+        return text
+      },
       getFontSize(title){
         if(title.length>60){
           return 929/60 +'px'
@@ -243,6 +266,7 @@
     watch: {
       dataAll: {
         handler(val, oldVal) {
+
           if(val&&val.tripColor){
             this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
             let rgba = this.hexToRgb(val.tripColor, 1)
@@ -261,7 +285,7 @@
       },
       tripList: {
         handler(val, oldVal) {
-
+          console.log(val,'----------')
         },
         deep: true,
         immediate: true