Browse Source

Merge branch 'dev-config0913' into dev

dev
jiangyy 3 years ago
parent
commit
aba00f813d
  1. 2
      epmet-oper-web/.vscode/settings.json
  2. 5
      epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss
  3. 15
      epmet-oper-web/src/components/wx-index/score.vue

2
epmet-oper-web/.vscode/settings.json

@ -34,4 +34,4 @@
"source.fixAll.eslint": true
},
"git.enableSmartCommit": true
}
}

5
epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss

@ -396,7 +396,12 @@
}
}
}
.item_1{
padding:10px 10px;
}
}
.score_no_border {
padding: 0 20px;
}

15
epmet-oper-web/src/components/wx-index/score.vue

@ -13,11 +13,11 @@
<div v-if="item.configuration.title"
class="cpt-title-t">{{item.configuration.title}}</div>
<div v-else
class="cpt-title-t">积分排行1111111</div>
class="cpt-title-t">积分排</div>
</div>
<!-- <div class="info">
<div class="info">
<div class="card">
<div class="title">
<img class="avatar"
@ -61,11 +61,11 @@
</div>
</div>
</div>
</div> -->
</div>
<!-- <div class="score_list">
<div class="score_list ">
<div class="item"
<div class="item item_1"
:key="subindex"
v-for="(subitem,subindex) in item.demoData.list">
<div class="logo">
@ -88,7 +88,7 @@
<div class="name">{{ subitem.name }}</div>
<div class="score">{{ subitem.score }}</div>
</div>
</div> -->
</div>
</div>
<!-- <div class="score_rank_content">
@ -110,7 +110,6 @@
<div>当月积分</div>
</div>
<div class="score_list score_no_border">
<div class="item"
:key="subindex"
@ -161,7 +160,7 @@
<div v-if="item.configuration.title"
class="title">{{item.configuration.title}}</div>
<div v-else
class="title">积分排</div>
class="title">积分排名2.0</div>
<div class="single">
<div class="single_bc">

Loading…
Cancel
Save