Commit 85a8e504 authored by 沈良进's avatar 沈良进

页面修改

parent 9a36dc23
...@@ -215,7 +215,6 @@ ...@@ -215,7 +215,6 @@
watch: { watch: {
dataAll: { dataAll: {
handler(val, oldVal) { handler(val, oldVal) {
if (val && val.tripColor) { if (val && val.tripColor) {
this.backgroundColor = this.hexToRgb(val.tripColor, 0.2) this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
this.backgroundColor2 = this.hexToRgb(val.tripColor, 0.1) this.backgroundColor2 = this.hexToRgb(val.tripColor, 0.1)
......
...@@ -905,12 +905,13 @@ ...@@ -905,12 +905,13 @@
if (jin.length > 0) { if (jin.length > 0) {
details = jin details = jin
} else if (dadian.length > 0) { } else if (dadian.length > 0) {
if (dadian[0].img && dadian[0].img == '' && jiao[0].img && jiao[0].img != '') { if (dadian && dadian.length > 0 && jiao && jiao.length > 0) {
dadian[0].img = jiao[0].img; if (jiao[0].img) {
dadian[0].img = jiao[0].img;
}
} }
details = dadian; details = dadian;
} else if (jiao.length > 0) { } else if (jiao.length > 0) {
if (j == this.tripList.length - 1) { if (j == this.tripList.length - 1) {
let obj = { let obj = {
title: '温暖的家', title: '温暖的家',
......
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