Commit ea4d2a34 authored by youjie's avatar youjie

no message

parent a79d9ac4
...@@ -610,3 +610,7 @@ html, body{ ...@@ -610,3 +610,7 @@ html, body{
.otherJourney-footer .edit_div { .otherJourney-footer .edit_div {
display: none; display: none;
} }
.featureDay-vToolBar{
left: 0;
top: 0;
}
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</div> </div>
</div> </div>
<template v-for="(t,i) in item.tips"> <template v-for="(t,i) in item.tips">
<div class="travelDaysdetails-textBox" :style="{'flex-grow':getHtmlPlainText(t.content).text.length>20?'2':''}"> <div class="travelDaysdetails-textBox" :style="{'flex-grow':t.content&&getHtmlPlainText(t.content).text.length>20?'2':''}">
<div class="travelDaysdetails-text" style="margin-right: 0;"> <div class="travelDaysdetails-text" style="margin-right: 0;">
<span class="travelDaysdetails-text0">温馨提示:</span> <span class="travelDaysdetails-text0">温馨提示:</span>
<template v-if="getHtmlPlainText(t.content).text.length>0"> <template v-if="getHtmlPlainText(t.content).text.length>0">
...@@ -172,24 +172,26 @@ ...@@ -172,24 +172,26 @@
getHtmlPlainText(html_str) { getHtmlPlainText(html_str) {
//提取字符串中的文字 //提取字符串中的文字
let re = new RegExp('<[^<>]+>', 'g') let re = new RegExp('<[^<>]+>', 'g')
let text = html_str.replace(re, '') if(html_str){
//或 let text = html_str.replace(re, '')
//var text = html_str.replace(/<[^<>]+>/g, ""); //或
var len = 0; //var text = html_str.replace(/<[^<>]+>/g, "");
for (var i = 0; i < text.length; i++) { var len = 0;
var a = text.charAt(i); for (var i = 0; i < text.length; i++) {
//使用的正则表达式 var a = text.charAt(i);
if (a.match(/[^\x00-\xff]/ig) != null) { //使用的正则表达式
len += 2; if (a.match(/[^\x00-\xff]/ig) != null) {
} else { len += 2;
} else {
len += 1; len += 1;
} }
} }
let obj = { let obj = {
text: text, text: text,
len: len len: len
} }
return obj return obj
}
}, },
getFontSize(title){ getFontSize(title){
let size = 30; let size = 30;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="尺寸" placement="top" v-if="x&&y"> <el-tooltip class="item" effect="dark" :content="'尺寸'+x+'*'+y" placement="top" v-if="x&&y">
<div class="cursorInitial fz14">{{x}} * {{y}}</div> <div class="cursorInitial fz14">{{x}} * {{y}}</div>
</el-tooltip> </el-tooltip>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment