|
|
@@ -5,7 +5,7 @@
|
|
|
<span v-for="num in nums" :class="num == ',' ? 'separator' : num == 0 ? 'zero num' : 'num'">{{ num }}</span>
|
|
|
<!-- <span v-if="nums.length < 7">个</span>
|
|
|
<span v-if="nums.length > 7">万</span>-->
|
|
|
- <span class="num">个</span>
|
|
|
+ <span v-text="isMore?'万':'个'"></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -33,10 +33,12 @@
|
|
|
if (num > 9999) {
|
|
|
this.isMore = true
|
|
|
let str = num.toString()
|
|
|
- console.log(str.charAt(str.length - 5))
|
|
|
- console.log(num / 10000)
|
|
|
+ num = Math.floor(num / 10000)
|
|
|
+ if (parseInt(str.charAt(str.length - 4)) > 4) {
|
|
|
+ num = num + 1
|
|
|
+ }
|
|
|
}
|
|
|
- num = (Array(10 - String(num).length).join(0) + num)
|
|
|
+ num = (Array(7 - String(num).length).join(0) + num)
|
|
|
while (re.test(num)) {
|
|
|
num = num.replace(re, '$1,$2')
|
|
|
}
|
|
|
@@ -61,7 +63,7 @@
|
|
|
|
|
|
.title {
|
|
|
display: inline-block;
|
|
|
- width: 60px;
|
|
|
+ width: 58px;
|
|
|
float: left;
|
|
|
font-weight: bold;
|
|
|
line-height: 40px;
|
|
|
@@ -99,6 +101,7 @@
|
|
|
span:last-child{
|
|
|
line-height: 30px;
|
|
|
color: #6cb7f3;
|
|
|
+ margin-left: 2px;
|
|
|
}
|
|
|
}
|
|
|
.num {
|