From 75d4fda92dfc58d278237ce5fa64204445bddaec Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 25 Jun 2021 17:31:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pc=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD=E3=80=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/package.json | 1 + buyer/src/pages/payment/PayMent.vue | 157 ++++++++++++++++++++-------- buyer/yarn.lock | 17 ++- 3 files changed, 129 insertions(+), 46 deletions(-) diff --git a/buyer/package.json b/buyer/package.json index ae2ec6e8..7a960738 100644 --- a/buyer/package.json +++ b/buyer/package.json @@ -14,6 +14,7 @@ "js-cookie": "^2.2.1", "less": "^3.12.2", "less-loader": "^5.0.0", + "mv-count-down": "^0.1.15", "psl": "^1.8.0", "qs": "^6.9.4", "swiper": "^6.4.1", diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue index 18f81c20..d14a534e 100644 --- a/buyer/src/pages/payment/PayMent.vue +++ b/buyer/src/pages/payment/PayMent.vue @@ -5,31 +5,68 @@
订单提交成功，请尽快付款！
请您尽快完成支付，否则订单会被自动取消
+
+ + +
-
应付金额 {{payDetail.price | unitPrice}}元
+
应付金额 {{ payDetail.price | unitPrice }}元
-
- - 支付宝 -
-
- - 微信 +
+
+ + 支付宝 +
+
+ + 微信 +
+
+ + 余额支付 + 当前剩余({{ walletValue|unitPrice('￥') }}) +
diff --git a/buyer/yarn.lock b/buyer/yarn.lock index 6dbcc1c8..afd75933 100644 --- a/buyer/yarn.lock +++ b/buyer/yarn.lock @@ -2051,7 +2051,7 @@ copy-webpack-plugin@^4.0.1: p-limit "^1.0.0" serialize-javascript "^1.4.0" -core-js@^2.4.0, core-js@^2.5.0: +core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5: version "2.6.12" resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1607216048810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw= @@ -5150,6 +5150,16 @@ mute-stream@0.0.7: resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= +mv-count-down@^0.1.15: + version "0.1.15" + resolved "https://registry.npmjs.org/mv-count-down/-/mv-count-down-0.1.15.tgz#a3f3c1677576e592c7710b441b2dda96acac2702" + integrity sha512-7poh86i27D/u4AvE9Ne8QHhy61p4MYAhSf4XAVyxzL0gXVCyccJ0NtJferEOxBP6C2q9jImknpKLGdwnEeJ7qQ== + dependencies: + core-js "^2.6.5" + vue "^2.6.10" + vue-router "^3.0.3" + vuex "^3.0.1" + nan@^2.12.1, nan@^2.13.2: version "2.14.2" resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591700047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" @@ -8315,6 +8325,11 @@ vue-router@^3.0.1: resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1607347231238&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66" integrity sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY= +vue-router@^3.0.3: + version "3.5.2" + resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c" + integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ== + vue-style-loader@^3.0.0, vue-style-loader@^3.0.1: version "3.1.2" resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a" From 0adbde45b9ba6d0ebfaf14a7c85fb186be8db45d Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 25 Jun 2021 18:30:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home/userCenter/MoneyManagement.vue | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index d9e8a317..f57011b3 100644 --- a/buyer/src/pages/home/userCenter/MoneyManagement.vue +++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue @@ -215,7 +215,7 @@ export default { color: 'green' } }, - params.row.money + this.$options.filters.unitPrice(params.row.money, '+ ¥') ) ]); } else if (params.row.money < 0) { @@ -227,7 +227,7 @@ export default { color: 'red' } }, - params.row.money + this.$options.filters.unitPrice(0 - params.row.money, '- ¥') ) ]); } @@ -252,7 +252,10 @@ export default { }, { title: '充值金额', - key: 'rechargeMoney' + key: 'rechargeMoney', + render: (h, params) => { + return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]); + } }, { title: '支付状态', @@ -281,7 +284,9 @@ export default { { title: '提现金额', key: 'applyMoney', - width: 120 + render: (h, params) => { + return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]); + } }, { title: '提现状态', @@ -392,9 +397,10 @@ export default { if (valid) { recharge(this.formData).then((res) => { if (res.message === 'success') { - // TODO 根据返回的值跳转到收银台进行支付,一下是输出sn - console.warn(res.result.rechargeSn); - this.modal = false; + this.$router.push({ + path: '/payment', + query: { orderType: 'RECHARGE', sn: res.result.rechargeSn } + }); } }); } From 31c585bcafeeeff44fde77f671b4738a62c049d4 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 25 Jun 2021 18:31:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/package.json | 2 +- buyer/src/assets/iconfont/icomoon.eot | Bin 2380 -> 3260 bytes buyer/src/assets/iconfont/icomoon.svg | 2 + buyer/src/assets/iconfont/icomoon.ttf | Bin 2216 -> 3096 bytes buyer/src/assets/iconfont/icomoon.woff | Bin 2292 -> 3172 bytes buyer/src/assets/iconfont/iconfont.css | 18 ++-- .../indexDecorate/modelList/seckill.vue | 2 +- buyer/src/pages/payment/PayMent.vue | 83 +++++++++++------- 8 files changed, 66 insertions(+), 41 deletions(-) diff --git a/buyer/package.json b/buyer/package.json index 7a960738..9f64b7fb 100644 --- a/buyer/package.json +++ b/buyer/package.json @@ -17,7 +17,7 @@ "mv-count-down": "^0.1.15", "psl": "^1.8.0", "qs": "^6.9.4", - "swiper": "^6.4.1", + "swiper": "^5.2.0", "uuid": "^8.3.2", "v-distpicker": "^1.0.17", "view-design": "^4.3.2", diff --git a/buyer/src/assets/iconfont/icomoon.eot b/buyer/src/assets/iconfont/icomoon.eot index 5a5b53d373f1261ad6934976642f5d4b111fe746..1155a87a0b218ca403925d4f0941eb704e047617 100644 GIT binary patch delta 1189 zcmZuxPe>F|82`R`JM(;F>$L99ny|X=Os$g9uCA_8N>T?S3p#9uh}5EM9<&yc5>gf_ zIz$$-Py|JXf-HgxgNQ6Tbm(B04$&c{h%QkOL=ae0-ik1U>`69DRodMzi^UDTCU&Db`wdmKPzlE&#m=$4U_cZS zkb<4i1qYxHMqmPpa04E~JiLeR$kC*_F-tQ8p>QhJoNf)Y#92tQV^*BhG?~ICw=Jy( zL*Z@MobJGuIJa91;aEAv`Okr zaTXL>Xe(?mCn_pLPWSsOGnukdfZao);P;Cm;rhOoR4~-i5~mDPa4wi~UlT%mfM^-v zu;DC{q*iDtjG`A6hI<6xs_BAnJk5pRMJ}9oab1&oT8eu@8CCIa1%{Hl@+IFOczoyX(<`J4rKM4ksg~jsmkX_FcgV|f)T%! zNLbjAuzsDfl1YnAScywL{lSPAIGl{N#*(*V$z<&JH5vF(QLhH8RF!@O zNTlfN@6AjeG}?baxsMDXfOkuMQ=~2Ll5??^S64@+%@=jkq`I>7;yzxtk#did(_1=~ bsfBrr;~iy$z46tOS$5Mg43)DN_%r+qL>$k0 delta 322 zcmdlZc}9rMhm(O}1;<1-GZw|eg^?2-$_0-zFfi-^;)LYf!~*fKOI;IB$kdnQNIYg> zV60$ZV7ZZznwTQ9N%A8D16u%4ommD@fc-G@DImWC$XCh8EvXP=WB{_+)&ThmIr+(n z%)6Mnfc!H+zEEyrMFE2V1Bm|sB%hay2r^EU$nJCMuRR*+v@!oUnFhHWYA7-om9I2j*}wh%m@8oMBXBT*Z_F6agva N0D6sm^FOYAi~y@}MJfOQ diff --git a/buyer/src/assets/iconfont/icomoon.svg b/buyer/src/assets/iconfont/icomoon.svg index a44989ac..780957bd 100644 --- a/buyer/src/assets/iconfont/icomoon.svg +++ b/buyer/src/assets/iconfont/icomoon.svg @@ -11,4 +11,6 @@ + + \ No newline at end of file diff --git a/buyer/src/assets/iconfont/icomoon.ttf b/buyer/src/assets/iconfont/icomoon.ttf index b63f6d43ced31f4d9052ebfee5e4fe8caf067d84..d89161b6aba46403a9920b2a9654b381732298ba 100644 GIT binary patch delta 1242 zcmZuxU1$_n6h3EeW^V2*n=#p)O&&HsJEI#>>29*grkI5K1Ew^Q7F;7Gh%RQ6JS4i1 zAQ2-gT6`!CB@I*s#Rn17BGh6)q%G`2AN9ot@gWI{_#*X51R*+l&ddgv&&VzvTw}(=lR)hYEJb%-7{KQng*f{+7Cjg8S&W-1%i!^T`%yaGd zNjegFg3(W#Z%KWB$P(z9mhe4zZS}0q5caF zqJD1(b-mO8ry(PL6bHeAR!Bhx_QL=iff1O5Iaq|7unZ638N5M>HjySA!>*6UGKtP? zcYRkDwl){C9le(Xw0w>uO0A0K9dcxfjF1w9$tm7B=j$R_rl zAUCMZa*yt=Czl+MTdE>rLv!BH(V{I41KEvd?v+S8?b58A1 z@^+ANU#ejxGn_|;UOT<}kL8+HQHC(ILkB%w|33MKJLm;8I!U_5Y$=mqPu0WgN74QT z(q+pIU3(ReMC0*jBp!BBDF?TwocBLC>9ix}oYb$wp>2(!sPgXM(MUW2%`5bxwSt>DMBSx=ud`{&UcG^!wboV^-f=2-T3|0Km%n$ULnob44@#A3$R-4Js1l zk7aSADElmYTX(i4jd zfV2RR5288Jb1KtHawHxD`4tQdEH^Sz6H{b1Nq%HtU<&}sn`Hn6*bg(G0`fb6e3gvc zk_s_K1|XYl4Un&plb`IE$h?aQXaU<9pnyqNI_m=Zt6@g&fg3S>_9GK zTS0zt3DBWHzyUH)fq|KM*2Dw$jLef5y&0J|`!KSyYJ&U&#F2%E732ABzA|vLfYdYG zIq_;2g8qMig>mvdPDx3SY6ccYkPZ~UF91^|J^x)Epy=4Qaklls{CjZS&_=tN-(086xyXK5Px`|Ma@nz6fN z*H`6}vGMOl3A;~FAIpF9!}m+Y!U%v#E|6ns>0bG%L?B_?$o`Z?J`u~MiJ6mx9VB}L zOKUs$5oswQpHuez=v*CVu zGll`ZS=*Cql6$c=*?U9ZFgC|Edb(4av7<_cm;~fvRWi}la3aEWZ02PXn_xk~x>u$I zHT2l(4V}4*pb)8`?uR&T%tq^T6Tnjr5bP2gT7w;QIC zn|_o^$%<6|!<1?8I>+j|GDdhd)B!^kr8*~7S;=2H!spDiC-&La2Oj?I)h>j#J7TVq zpU(SJwHEFO8)S!>{9kJ_5IH^vp?S7-h09#gG$!>0pH`Uq~)v+PHTUpv6t#kw}J2odOjPI|h*eew-=(hF#E zQ*@2FayH3G&BNC;U RL)gMpJO)OwwV9WqYgn+Pk*rl%Y z#A1-x9*`a=7D&&jOaqD?VPIgn0m3CY5|1-d6H^!%*yaG$n1Qg&CdrQ(KtZ6`6(C;) zgxL=>pUTKBsQ`-o0P+<;Sd5XOBPTx@sLqdF0w^E^!pysvx^fdMfEKgsfE0nT07F+^ zVs0u>%m-+B8wk(z;{08ZUt9uo8^{ufI%Xh?nR(V^9!7gc=E**c-i*wfXE3s|Ml%8> zfH<=7uwp#F%~u9)7N7tF!<`eab|L8h2Ur-H4*>Zb3``(VAOPxNKJfnl(5E01KqQz3 yv7vxtatxOO$cqdNTnr)%atvn})fiVX