diff --git a/src/assets/market/tabhied.png b/src/assets/market/tabhied.png index 070888d..420f586 100644 Binary files a/src/assets/market/tabhied.png and b/src/assets/market/tabhied.png differ diff --git a/src/assets/market/tabhieds.png b/src/assets/market/tabhieds.png new file mode 100644 index 0000000..070888d Binary files /dev/null and b/src/assets/market/tabhieds.png differ diff --git a/src/components/market/Dundialog.vue b/src/components/market/Dundialog.vue index a86f70c..3eafc71 100644 --- a/src/components/market/Dundialog.vue +++ b/src/components/market/Dundialog.vue @@ -226,7 +226,7 @@ CHIP
- aoi-hero + aoi-hero
diff --git a/src/components/market/Herodialog.vue b/src/components/market/Herodialog.vue index 89e2cfa..08ec3af 100644 --- a/src/components/market/Herodialog.vue +++ b/src/components/market/Herodialog.vue @@ -299,7 +299,7 @@ CHIP
- aoi-hero + aoi-hero
diff --git a/src/components/market/ProgressCard.vue b/src/components/market/ProgressCard.vue index 39b6c68..1e00e1b 100644 --- a/src/components/market/ProgressCard.vue +++ b/src/components/market/ProgressCard.vue @@ -24,7 +24,11 @@ status="warning" > -
{{ min }}/{{ max }}
+
+ {{ min > 100 ? parseInt(min) : min > 10 ? parseFloat(min).toFixed(2) : min }}/{{ + max > 100 ? parseInt(max) : max > 10 ? parseFloat(max).toFixed(2) : max + }} +
@@ -36,9 +40,12 @@ export default { props: ["color", "definecolor", "max", "min", "progressImg"], computed: { curent() { - return (this.min % this.max) * 100; + return (( this.min / this.max).toFixed(2))*100 ; ; }, }, + created(){ + console.log( (( this.min / this.max).toFixed(2))*100 ,'selog'); + } };