From 3fd1fb48607dd729304a6062558c2d3930e7adef Mon Sep 17 00:00:00 2001
From: huangjinming <huangjinming@kingsome.cn>
Date: Mon, 19 Dec 2022 10:38:20 +0800
Subject: [PATCH] fix

---
 src/assets/market/tabhied.png          | Bin 1334 -> 815 bytes
 src/assets/market/tabhieds.png         | Bin 0 -> 1334 bytes
 src/components/market/Dundialog.vue    |   2 +-
 src/components/market/Herodialog.vue   |   2 +-
 src/components/market/ProgressCard.vue |  11 +++++++++--
 5 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/market/tabhieds.png

diff --git a/src/assets/market/tabhied.png b/src/assets/market/tabhied.png
index 070888d611a29277179ed00056ba5e767e1251ae..420f586db69dacecdc9dac085d528604fa883680 100644
GIT binary patch
delta 790
zcmV+x1L^#>3a<tsiBL{Q4GJ0x0000DNk~Le0003F0000m2nGNE0N}Qi%#k4{e*)1-
zL_t(|+U(s;YZE~n$MM;$CQ$9g)I%{9QPCnk<)MNX#e3;Rv53V(Jy;Yxi`R;H7R8$f
zL2RI<FQG3W1+OCXRDB65;^TkJ6yv%x*@+w5WWFExA+%7-Kg^HW$!-&!zp<opRFF(b
zE=d}aW0C`sJ(7|F&`+NwA0+Q3e{Uu0k~K+7@;%T0Xje`@ry{u{xh|RD^#is=$z-48
zl;pDc`ljTi<f-IcUOR+;Q8vHKhU6Zl0qjT<W_@m$^;+J};<ze#Be^Xp^4b79UeT;q
zy>4g!cX8;;n`e@yWQ^AW7&v;}E}3=Q({Y7wag0b-B@4_R7<db2J&*LWe>ikAy^>5b
zZ(wLln|1BA^YAH-Cz2WF3=Ewav%YgL4t<bvi}?aWORw*1c@{_6w~YV{B)!h}=T#gJ
z6z`q@A<#FDE#^@i2PHR|ClHKzv+kXu*4H1A?VES!n-5j{jxzw^c=Y)B?EP*#jyNr^
zTbsM(-#KOo1ZU2y|JW8?e;iR-nlIM%Q?3<e2n45M)_-J+E{<<$`SkJ2Mdk;DN!I@b
zTQ}%Lj=#sTtbRY13m_~jk}I}vy53be&g_6-IoH3dIL4VB5UlZDi({180l^yWr8sok
z@W*+8a1~v<4qI`YV{Sn3YQDwMU}gZt!Hxrfue0np0Q7aoaa6S*f3F1)wnNJDQ3?fi
z8vq=tS&L(eSpjfeu238RT<TehBUX+B5dd7Oq!q^r)&6980ML%8l-tjf#lgWSfMiEh
zyA=oL8vv4O6bArb&K*Zda+(<dNT|Dt<BZ}_dH{c$REbZtFL0Rxpo=(pHPTreyrTlZ
zre-S+9;F9hQ%x(5Y`x|>1^_beI2tP3C)WcA(@E9w=1FI90Dw)=l*b>%!TAP&%$F-$
z#ZhM_0DOvLOmdi+0O+FHSsa{i0LVh$1Qu@<2j?3Ave37kPqO0x;Op0U=uZI#02nb>
U=UxcybN~PV07*qoM6N<$g0-h+-2eap

delta 1313
zcmV++1>X9v2DS<ziBL{Q4GJ0x0000DNk~Le0003R0000@2nGNE0C`WVL6IRRe+1Y`
zL_t(|+U(uWZ<IwG$MKn`g;qrjP~4hAG)fT~YKW$GB{pblL@MEjU=t4LA7F_7Cz^2f
zphps;7rl5_qw$0!96jjKyT-cXXSN&CEW3SXW@ooQ=KV?@_CUIQ_PhCh@}1p2^Vr3k
zcg-l+%8l#c108G5*)w`PVw{=qfB$6wjDl0Q{iDaftaZQX(Kr8>u4UJU{fny+1k8et
z9~CZt>jizT<APr9jE+e{1{f*Z?mP9L@56RKsxN(i`aa#2L8B9&RchYTi}_hcQ!j3e
z_Zir6GtQXrPv57$Uwz;1nxN6ieyS6H&{-k@*bSMZe)WB;{{3u62aQf}e^RM<Unl#?
zD3)aa@(&;C-;aGC`+nYWL8FtJQX>AYV~+O<*!9!RobPAf*E=R?eDdj}?rFW(;4K37
zO4^u)@9P|sO_k|{e$_F}I|J;wu$gZ6_jU)3|KNz_60o<IQR?$M+ZHtbt1#EHw|Ogo
zJsvhK`;q$n)b>m?&U|C|e|8Bdf&XK_uSOm;O1CCUCZM<_R5K|repz=(mjT@V@a_-o
zzxV}E&RA2qpYD9Ib}stI^v_uA@!i+=CloRZlpQE+s!`wj{*TOzsxliFHbx!afBWE8
z=LrCmWvtWxF`3c+jOM@CWBuRO4eAY)N&SC4GBa8>X+Iik{%CLYe*mC7*8HjdKNj;N
zsoy#sq1r&PqWeEBXf}4n15l!b{!g7~*clHfdGR#tps|%ZOPztjlO{3;QYM-;$_y0m
z>ac@mi5dgNi^_rMpmENgrp7?olmk&$a>q|J&K#!9K=Ga)TF}_atr)&>0^rPe%&l2s
zCz>l%7(mChVFk@Oe`*V$<NQ#9#yNX}+5+e-pXRd%jn-rP^~6t6T>u+7V}tK}5;M_U
zqO<@uCCxq!AkX9uns=!zfG$CMQ-ueOGmF#|K$qpLL8JB9bJP?-S1<&9ARH7lT8ACf
z6Fxyz0dx%@K|Ae*PBhmkDS#eHGoe9bDp%0FLq!4fQM+YCe^}5s^D?yr(8pU@f=27G
z<J1yBpMa>{ZLc<HwEk+a899JK29c17<|d^Cutm~5u7Tvhph2@jB>~j9JXp{KtiJ#h
z@4`SqqxDyV8Um;ZidT|@M(eJV{t8X12%u&ld3KPAhI=>x2uYd)?LDg!gJziu0tj?5
zDQKLtbJPw%f1uU0iN=|u)DA$Ph3KHsdTY_7-7*(IfwTg8K4qd|YX|@lNn;LbKpBq>
znk6a+AcDV(?VC|SqcP|tbpsG-H8^NA{!|)+4pB1zkzR|LXx{FOK>!d;E1}t#pt(ZH
z0K_Lv@0C!$plMPu012$E-0ML>qw(hj>IERt<=UW8e;Q3{{CSdE0Z7ygnP~WY20${c
zh+Yf{npH{#AU$c!RDIAm^D31BFo4Qd?(CL9Q@2wV00g+&H)xbXhm|ysQ6m5YTH0!&
z;fiel19Q%v-YRG=QX&8u9PJ-8+`|b#mXXGc+se)M3>s(b3>5;9$+bs<M(J~0Nwc5Y
z0LbKgcdv<tdpH5exqO=M6*MbU20*@?vD1$PjdS)TN&_Hc((JR9o9Uit8dL^AX74==
z8l}z||8*2K0g&19=85Kg>H%N~%cuFxLGuO`0gyju?6HSI(|uh60Axy<30t|T{{<KT
X0tP!b0&<5E00000NkvXXu0mjf<mqgD

diff --git a/src/assets/market/tabhieds.png b/src/assets/market/tabhieds.png
new file mode 100644
index 0000000000000000000000000000000000000000..070888d611a29277179ed00056ba5e767e1251ae
GIT binary patch
literal 1334
zcmV-61<Cq}P)<h;3K|Lk000e1NJLTq009~R002!01^@s6c~7fB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$*hxe|RCwC#-Oq27MI6WRnWu$TMGR2f
znnE;65gKZUrgkMZXlq0&;fG)o4(K0Xi2f&<aQ2`_5~CNrcvqwGgd`k2=+V2zy5ncI
z8`3PheP(87w?F3nN*?w=x_$P$`F`@9-9Gc!#hZ7{DA>x4>)`_(YtGp-dOTvBnehK*
z0E~iDxBa8XzpQn?>Crd;m#$^khy9DI5d_SFjvo~+f9nN(uH%AU?u?E}LIxNq+wME{
zpYOwVKdLW%fBHV%l|iEupH*t!(~J38M^i6ujQ1JXaWl@C?@!;SzF&Rc?wX*{$$qL6
zf6!SX0oV<hqki>$tN#6LM+c2ga8jvwUnl#?D3)aa@(&;C-;aGC`+nYWL8FtJQX>AY
zV~+O<*!9!RobPAf*E=R?eDdj}?rFW(;4K37O4^u)@9P|sO_k|{e$_F}I|J;wu$gZ6
z_jU)3|KNz_60o<IQR?$M+ZHtbt1#EHw|OgoJsvhK`;q$n)b>m?&U|C|b_pnf|6{+e
zMjkXuw<b#_ptvPeGbt~AS$9d70o?xZ?hoz1_ythTSW~&5?tHO!F8asx&sgm7-PiXg
z6fz5x9Vl$7QQ!OikIam!G8-2*MjhXO``}jR2>_I3tkeH7nbH1?=D*lu{omFN>J5}h
z{eL|&Gg>xjKN@TPXm9lZpgh+6ss29}^CPL>Ivt_fK(V6xKP_lBcE$rxqJ;iWooLt@
z4=8!@H0+?Ul{-tFfx?p}G6zy7nl;J{6z}S=gJy{u1I3HVf#{%d&Yq^mK-rW7QCD)u
zPc+UPrp!R`o*r7z*vhRKzHtKJ%y`VLSz;%eD^wUj$F*Sv%{gidpyT{dg2p*}g4zP;
zET87H2aVQa`}M?6QC$EVIb(zGd=fL!T%xo9HYLqI4It0t4w`qVEPyUSdsBr6jWdhX
z6hN2dtU;so*mKkrKvysXeIOhZG+Kup)Du2IRRMGjAVE9rg-$frDJg&+Ni(5AWGYwC
zyhB9+^ijKIL|D)`^D?yr(8pU@f=27G<J1yBpMa>{ZLc<HwEk+a899JK29c17<|d^C
zutm~5u7Tvhph2@jB>~j9JXp{KtiJ#h@4`SqqxDyV8Um;ZidT|@M(eJV{t8X12%u&l
zd3KPAhI=>x2uYd)?LDg!gJziu0tj?5DQKLtbJPw%pw+aA#+jqk4nUxV=%CShYtf|L
zG8aIBv;ulQWujqg2mldDV-9LS8IKK`B`OCXg1?LHn^8fdG3X?90}yF7IA}EfR2qX0
zQ8NIMUW=J%-tLS+01!+oq1l+AxkAYR#3xPfl~BK+X;Lu&39PN$>p?-I@#h8V1t8Jo
z+MrPyO=|pkl3D>s)C`$u_<ROHGOdVS3<;W5N(CT2Y0Ol8&^Yrdl>#t;%2w{|mO)du
zQx*UOxY{>pltPD<G>=gu00UauYNFwaZ2$vv&Ys>XXf9GB02v(ZA2i&<2|$*S#*Ev_
z&Grl$XY33W0+7kIM}kJ_b6iQYpV|P(<b1D*hI=>x$hmx)?-evFR0cr4oUzl71dVg{
zB}xMzW76!im7D3FXc|-oKxXef3>u}*8UJ+@H35*>^5%)=ed+;V2+ODW%|Y`96#<Yx
sXY8?uLDPL*0sv%6nh9IEss9BS00IU(Hv)2p5&!@I07*qoM6N<$f-qEZwg3PC

literal 0
HcmV?d00001

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
         </div>
         <div v-else :class="isTabs ? 'hero-tab' : 'chip-tab'">
-          <img width="46px" src="../../assets/market/lock.png" alt="aoi-hero" />
+          <img width="33px" src="../../assets/market/lock.png" alt="aoi-hero" />
         </div>
       </div>
     </div>
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
         </div>
         <div v-else :class="isTabs ? 'hero-tab' : 'chip-tab'">
-          <img width="46px" src="../../assets/market/lock.png" alt="aoi-hero" />
+          <img width="33px" src="../../assets/market/lock.png" alt="aoi-hero" />
         </div>
       </div>
     </div>
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"
           ></el-progress>
         </div>
-        <div class="progress-number">{{ min }}/{{ max }}</div>
+        <div class="progress-number">
+          {{ min > 100 ? parseInt(min) : min > 10 ? parseFloat(min).toFixed(2) : min }}/{{
+            max > 100 ? parseInt(max) : max > 10 ?   parseFloat(max).toFixed(2) : max
+          }}
+        </div>
       </div>
     </div>
   </div>
@@ -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');
+  }
 };
 </script>