Commit 87c39158 authored by 黄奎's avatar 黄奎

页面修改

parent 149e8c04
......@@ -57,13 +57,15 @@
margin-bottom: 10px;
position: relative;
}
.diy-rubik .layout .rubik .delete {
position: absolute;
right: -16px;
top: -16px;
padding: 8px;
z-index: 14;
position: absolute;
right: -16px;
top: -16px;
padding: 8px;
z-index: 14;
}
</style>
<template>
<div :class="{'active':rubData.isCked}">
......@@ -89,13 +91,12 @@
icon="el-icon-close" circle @click.stop="deleteRubik(index)"></el-button>
</template>
<span v-if="!rubData.data.list[index].pic_url">{{rubikSize(index)}}</span>
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)"
style="width: 100%;visibility: hidden;">
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)" style="width: 100%;visibility: hidden;">
</div>
<div class="rubik" :style="emptyStyle(index)" v-if="rubData.data.style == 8" :key="index"></div>
<img v-if="rubData.data.list[index].pic_url && rubData.data.style == 0"
:src="getIconLink(rubData.data.list[index].pic_url)"
:key="index" style="width: 100%;visibility: hidden;display: block">
:src="getIconLink(rubData.data.list[index].pic_url)" :key="index"
style="width: 100%;visibility: hidden;display: block">
</template>
</div>
</div>
......@@ -143,9 +144,7 @@
<div flex style="flex-wrap: wrap;" v-if="rubData.data.list[rubik].pic_url">
<div flex="main:center cross:center" class="app-gallery-item"
style="height: 100px; width: 100px;">
<img
:src="getIconLink(rubData.data.list[rubik].pic_url)"
style="width:100%;height:100%;">
<img :src="getIconLink(rubData.data.list[rubik].pic_url)" style="width:100%;height:100%;">
</div>
</div>
</el-form-item>
......@@ -210,7 +209,7 @@
x: 0,
y: 0,
}, ],
icon: this.domainManager().ImageUrl+'/Static/rubik-0.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-0.png',
},
{
name: '2张图',
......@@ -230,7 +229,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-1.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-1.png',
},
{
name: '3张图',
......@@ -256,7 +255,7 @@
y: 6,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-2.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-2.png',
},
{
name: '4张图',
......@@ -288,7 +287,7 @@
y: 12,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-3.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-3.png',
},
{
name: '2张图平分',
......@@ -308,7 +307,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-4.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-4.png',
},
{
name: '3张图平分',
......@@ -334,7 +333,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-5.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-5.png',
},
{
name: '4张图左右平分',
......@@ -366,7 +365,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-6.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-6.png',
},
{
name: '4张图上下平分',
......@@ -398,7 +397,7 @@
y: 62,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-7.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-7.png',
},
{
name: '自定义魔方',
......@@ -437,7 +436,7 @@
y: 93,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-8.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-8.png',
},
]
};
......@@ -467,7 +466,9 @@
} else {
if (index === 0) {
this.rubData.data.height = 'auto';
return `height: ${this.rubData.data.list[0].pic_url ? 'auto' : '360px'}`;
if (this.rubData.data.list && this.rubData.data.list.length > 0) {
return `height: ${this.rubData.data.list[0].pic_url ? 'auto' : '360px'}`;
}
}
return `height: ${this.style_list[index] ? this.style_list[index].height : 360}px`;
}
......@@ -525,14 +526,12 @@
}
let style = JSON.parse(JSON.stringify(this.style_list[index]));
for (let i in style.list) {
style.list[i].link = [
{
PageUrl:'',
IsParameter:0,
ParameterValue:'',
PageName:''
}
];
style.list[i].link = [{
PageUrl: '',
IsParameter: 0,
ParameterValue: '',
PageName: ''
}];
}
this.rubData.data.height = style.height;
this.rubData.data.w = style.w;
......@@ -713,10 +712,10 @@
if (this.rubData.data.list.length <= 0) {
return '';
}
this.rubData.data.list[this.rubik].link[0].PageUrl=obj.PageUrl;
this.rubData.data.list[this.rubik].link[0].IsParameter=obj.IsParameter;
this.rubData.data.list[this.rubik].link[0].ParameterValue=obj.ParameterValue;
this.rubData.data.list[this.rubik].link[0].PageName=obj.PageName;
this.rubData.data.list[this.rubik].link[0].PageUrl = obj.PageUrl;
this.rubData.data.list[this.rubik].link[0].IsParameter = obj.IsParameter;
this.rubData.data.list[this.rubik].link[0].ParameterValue = obj.ParameterValue;
this.rubData.data.list[this.rubik].link[0].PageName = obj.PageName;
this.isShowLink = false;
},
......
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