From 4655d047b590b84e05b9d6b5c7e45329a9fe9d45 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Tue, 22 Jun 2021 17:59:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 21 +++--
pages/goods/refuel-succes/refuel-succes.vue | 92 ++++++++++++++++++++
static/img/suline1.png | Bin 0 -> 1917 bytes
static/img/suline2.png | Bin 0 -> 1770 bytes
uni.scss | 15 ++++
5 files changed, 123 insertions(+), 5 deletions(-)
create mode 100644 pages/goods/refuel-succes/refuel-succes.vue
create mode 100644 static/img/suline1.png
create mode 100644 static/img/suline2.png
diff --git a/pages.json b/pages.json
index 9cba818..1d182c4 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,18 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
+ "path" : "pages/goods/refuel-succes/refuel-succes",
+ "style" :
+ {
+ // 支付成功
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": false
+ }
+
+ },{
"path": "pages/goods/refuel-confirm/refuel-confirm",
"style": {
"navigationBarTitleText": "确认订单",
@@ -14,7 +26,6 @@
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "black",
- // "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
@@ -32,7 +43,7 @@
}, {
"path": "pages/user/order_details/order_details",
"style": {
- // "navigationBarTitleText": "订单详情",
+ "navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
@@ -41,9 +52,8 @@
}, {
"path": "pages/goods/refuel-details/refuel-details",
"style": {
- // 加油站
"enablePullDownRefresh": false,
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "加油站",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
@@ -414,7 +424,8 @@
}
}
- ],
+
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/goods/refuel-succes/refuel-succes.vue b/pages/goods/refuel-succes/refuel-succes.vue
new file mode 100644
index 0000000..24b8d36
--- /dev/null
+++ b/pages/goods/refuel-succes/refuel-succes.vue
@@ -0,0 +1,92 @@
+
+
+
+
+ 已支付
+
+ ¥499.27
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/img/suline1.png b/static/img/suline1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ee4c4aab10046d885c0bb224c1b2558216ccefc
GIT binary patch
literal 1917
zcmbVLX;2eq7+!^XPyws;t{Q`N6iBkUAjuFE2ocl(0|;mYy4l^p3dzP~BLM}eM=;p2
z9)naA5h<-A0yZjEh#@?L0f*|MMAW1j`4L=Re6Gx2z&pFWr9pG;Y6&OQBkV+~A(c+LFMk;VxunI}Q!*K*l
zU3Cukfgp#~L}UyVBU>UuNfi^ZW0(e&2CyN>XTCv$ph-AIQ{V}NT1@Y)s-e>eOiYjF
z%V3!%08b=>(zJL)T1X_CmV^p1`g~uSk3j?kR5*pu460L%RE#W)7C>ro8lUOKK-pXY&0EN1^MwKq&y&W1*BuhwCufo+-utZD;H%yGcL|lac
z72sY1h5|*|455IBG7v8zhrwoZI0~Ucz(qL7kj|(0QaC`$lY03}xLgUF9q8}xC-4po
zg#9@@F4vFi&l%zdt92BjM)9H81c*Jz_4_PW6rjZsiquAuWb)7yge8&`sY@g^w15D6
z*S%?TqX{)ers(F`+w>u839cnpEntl;q(Y*>gea6S)a2oMDy
zJOtis3|4S?7)l@HWB<2)EMSUdAC~_N&(J3@k@n-qRRAv^mkC#c4bp;D>2jEK4Qyb3
zu*5IYaI@!D=;E)DZ)$DbyAQ_R2y)n7_Lcw1&1rC`Wy5+WpPbI(4VA;sH<=|BVPn6)
zS{Rh=>^eQo!H=rASwAs1N?!lhwo^Mqk4k4K^A6p{_vYtMNojd+>#yBV<#DmeCzmx}
zDV;OU)MfC=s5pN7Wnx4`v(0EUj=!Av;^zZ%8y&&6TMM>zW#=uPcbZvlGMNl=dE1*9
z&((2@Zqy$d4negw3tC^UC=4?kA#S$i%45c?ELRs7m$;S5
z$<>Mx)>$Fn0?GGYMr3Wr_3MUR=dgXRUc6W$pDElG=M?|&sHZkLxhIGudyfRo*6xb<
z5`r>oW*b_gqN96fk27Vtxw$=No~d$M>)IDs-v9F6y?YH^U0rSAO>=*p3Ut>swY0Qs
zvDs|X($mvBvR8Td)U{TuUtJSwjdIk8@}HU-?_avmC;oHZNMO7dn=GAGa4DW7h}52O
z)l2V3uUfl*Qtor}^mSL;+kLk$Dh}BbpVxiW0fO#$OM4g1*(pS&y+!VpM=j
ztB4JaYlM9MHI>x5cpmQ11{`FHx3;f!&k;4>zMVhuX>;t|an*G*PG^U{h;l4XXLx$9
zfVaH$l@GH6e`xm?<@;W{eA#xwebJ|o_1oGd?0KnR~nB~h)
z^_;9eV;y}byES{1X5`-Msg{lD{qJHqyQ`H^eeQD5hs-qdzV@-SwAfymS+7pLDL?Pm
zRPg%sYgS1~TCNJ{ED$fd^iVcuXLMjDQfl4p=+Sj%Ot&p*Sy54u>ra0Jh5h>?ms(Kg
zW%m2{ckT^4n1}h9Sw>?EPqwD+707M>jMBmq{)!2F7v=Ou4)&n-^(5lAn&bUc*_DV{
zot>T7!i0qGX(vVlD56rU+qX0*yaOxFm1(xbzFpH$RPki|odw>tdc8jVs=lAw24*X>
zLa9{lp!Z>|2d^A`fA?{C)A#$fpRic^vsJ**g2|`Kx=RZmsSi{xw~lb>aJPA^p!aoO
z;XM({zW`)7`)p)+!t*Fec?UaZfBe(U9VNw<>gv7tVc=k_@fTv|#!JpgRi^gXP37^E
zax=QLzn3RZ0C#m^OZks`mQ;>%nQEzWiU08s`KBOm&mK8CK$Lpz>8F?Y94U;_7xcM|
u8B=Or3OJ+CjEsy6H+IwOkF`Dv$Q%YKEi0epoi*CW843;zk(Bv=xBeef+xV9N
literal 0
HcmV?d00001
diff --git a/static/img/suline2.png b/static/img/suline2.png
new file mode 100644
index 0000000000000000000000000000000000000000..91b6136d9c1f53e18598d891a83238e0e1521584
GIT binary patch
literal 1770
zcmbVMSyU5O7>;X~?1}1TcVLL1dB)5VK623?!te96f@7
z$5xBDRt_o(DxlDch=4n#)Z+scS|w$%6gjb?QYvVH-mus{czozQ+_`iA@B6?1{>$V<
zgsqz6zSx~Yq0Eu5mMAF{mwK>Y^wtcpei&2O0bcKs(pWMQPa-WSfl)*nT!le$1DcE}
zF;tVjsR;|DP+ZfrQL$vKA{0^M20H4*(5(g&U{ff8K~@v0)?p;1!jiQ{A+^7@feL9g
zLTU_G0V_;mEJeH8MqrV)uqd@nrxs|aL7zZ@Rs=XOU?d7z4SJ&)u?nf4jg2ALvymD+bPbLbajA2Dh3??0B7!1yPjib$^68krd
z*P_i)=_ZV!#LRdqp$7Fx@|_}s+`U=I2?Ws~;e-|x1=UM%b*cd~l5&ZV3M_PuR)err
zd^H~n;L}uUHIpXbbJR36K)|9gnJkt{pyIPp7CPnUb$l5tmT_bOG6|b4VKSw`!6H6S
zDusht95!3T4rWbp!UB|raXB!JkE*y}
z;q#apSjFaO)YM77=Kto80fJ&Uo8>>vGj#+y(z$gF|_Fkwb8K?E3;bH%-bU;^Fc
z5>b@(-XnXRZXxP@H|#gjRA_5~bib2JZ@%iTNXd0XU%Lu!(TpB-CFfcHy!1;qo
zI9pccx1z4kULk+JqI`AeeI#NeZ?*mO6I%68CzQ4
zzO>u5Ehii2EUs%(0;MY+ik9-B&0!taW7gzLC*0mpF*~wL>$C8>gbiOU)$X2P7ezdL
z%-K<)2|9Z4;JT!P&LHMfcWJQ|_-xRp}v;evblIC&15ZHofoC=nY4D80YDC(*DQwb|d42vNXJ#
z-%J2N=dQl8wT^^&%bPSE2*}ig>}I0wUGODQ$|Yl{kF2wjgGr5
zJ1V|yTvC^X=5rM<{dc#-Zv~iLYi@bh9}>sv3XgKO^r*L4$V%DqO`Bk^%aNWv#p~MR
zEdUhy={@gji?hymdp4|^eojB)cdEA1px0|IR96@F5H&vCjUn+mC+@&${~t~Z^10bn
ztwX|(GskLOvj(McadEt;==BBI@E+@d-(G;qCc2OO@%-f-9*-B}u_IX5U*qbN#tx!<
zl!|>#^ukWN^nBq11W-DUJj^}0xy1}8)PYfSi?}W&uVUqIT#BKio2=SxG
literal 0
HcmV?d00001
diff --git a/uni.scss b/uni.scss
index 9ced561..64f2178 100644
--- a/uni.scss
+++ b/uni.scss
@@ -352,6 +352,14 @@ $uni-font-size-paragraph:30upx;
.height120{
height: 120px;
+}
+
+.height150{
+ height: 150px;
+}
+
+.height180{
+ height: 180px;
}
.height30 {
@@ -375,7 +383,14 @@ $uni-font-size-paragraph:30upx;
height: 20px;
line-height: 20px;
}
+.height25 {
+ height: 25px;
+}
+.height20 {
+ height: 20px;
+ line-height: 20px;
+}
.height50 {