Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

This commit is contained in:
wangzhijiang
2022-08-16 14:25:26 +08:00
@@ -186,7 +186,6 @@
}) })
} }
if (content && content.length > 0) { if (content && content.length > 0) {
console.log(content)
content.forEach((res, index) => { content.forEach((res, index) => {
this.contentList[index + 1] = { name: res.lableName } this.contentList[index + 1] = { name: res.lableName }
this.contentList[index + 1].list = [] this.contentList[index + 1].list = []
@@ -228,7 +227,15 @@
} }
postAction(this.list, query).then((res) => { postAction(this.list, query).then((res) => {
if (res.success) { if (res.success) {
this.queryCountryList = res.result || [] this.queryCountryList = []
applyMarkets.split(',').forEach(val => {
res.result.forEach(ol => {
if (val == ol.applyMarket) {
this.queryCountryList.push(ol)
}
})
})
// this.queryCountryList = res.result || []
this.isTrue = false this.isTrue = false
this.$nextTick(() => { this.$nextTick(() => {
this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px'
@@ -350,13 +357,13 @@
border-bottom: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid;
.content-box-box-img { .content-box-box-img {
width: 70%; width: 238px;
height: 100%; height: 100%;
} }
.content-box-box-text { .content-box-box-text {
display: inline-block; display: inline-block;
width: 30%; width: calc(100% - 238px);
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
@@ -380,13 +387,13 @@
cursor: pointer; cursor: pointer;
.content-box-box-img { .content-box-box-img {
width: 70%; width: 238px;
height: 100%; height: 100%;
} }
.content-box-box-text { .content-box-box-text {
display: inline-block; display: inline-block;
width: 30%; width: calc(100% - 238px);
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;