Commit ea4d2a34 authored by youjie's avatar youjie

no message

parent a79d9ac4
......@@ -610,3 +610,7 @@ html, body{
.otherJourney-footer .edit_div {
display: none;
}
.featureDay-vToolBar{
left: 0;
top: 0;
}
......@@ -117,7 +117,7 @@
</div>
</div>
<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;">
<span class="travelDaysdetails-text0">温馨提示:</span>
<template v-if="getHtmlPlainText(t.content).text.length>0">
......@@ -172,24 +172,26 @@
getHtmlPlainText(html_str) {
//提取字符串中的文字
let re = new RegExp('<[^<>]+>', 'g')
let text = html_str.replace(re, '')
//或
//var text = html_str.replace(/<[^<>]+>/g, "");
var len = 0;
for (var i = 0; i < text.length; i++) {
var a = text.charAt(i);
//使用的正则表达式
if (a.match(/[^\x00-\xff]/ig) != null) {
len += 2;
} else {
if(html_str){
let text = html_str.replace(re, '')
//或
//var text = html_str.replace(/<[^<>]+>/g, "");
var len = 0;
for (var i = 0; i < text.length; i++) {
var a = text.charAt(i);
//使用的正则表达式
if (a.match(/[^\x00-\xff]/ig) != null) {
len += 2;
} else {
len += 1;
}
}
let obj = {
text: text,
len: len
}
}
}
let obj = {
text: text,
len: len
}
return obj
}
},
getFontSize(title){
let size = 30;
......
......@@ -21,7 +21,7 @@
<i class="el-icon-delete"></i>
</div>
</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>
</el-tooltip>
</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