From 5759fb9fd5370530e71b1e1af66c0595db4250f9 Mon Sep 17 00:00:00 2001
From: miko <136057505@qq.com>
Date: Tue, 13 Oct 2020 21:26:07 +0800
Subject: [PATCH] aa

---
 src/app.wpy            |   5 +-
 src/assets/cameraU.png | Bin 0 -> 10790 bytes
 src/assets/tab1.png    | Bin 0 -> 3302 bytes
 src/assets/tab1s.png   | Bin 0 -> 4749 bytes
 src/assets/tab2.png    | Bin 0 -> 1043 bytes
 src/assets/tab2s.png   | Bin 0 -> 2719 bytes
 src/pages/index.wpy    |  24 ++--
 src/pages/progress.wpy | 305 +++++++++++++++++++++++++++++++++++++++--
 8 files changed, 307 insertions(+), 27 deletions(-)
 create mode 100644 src/assets/cameraU.png
 create mode 100644 src/assets/tab1.png
 create mode 100644 src/assets/tab1s.png
 create mode 100644 src/assets/tab2.png
 create mode 100644 src/assets/tab2s.png

diff --git a/src/app.wpy b/src/app.wpy
index 70e025b..90ea9d3 100644
--- a/src/app.wpy
+++ b/src/app.wpy
@@ -90,7 +90,8 @@ wepy.app({
 {
     pages: [
       'pages/index',
-      'pages/progress'
+'pages/progress'
+
     ],
     window: {
       navigationStyle: "custom",
@@ -116,7 +117,7 @@ wepy.app({
 "text": "捎带快递",
 "iconPath": "assets/close.png",
 "selectedIconPath": "assets/close.png"
-},
+}
 ]
 }
 }
diff --git a/src/assets/cameraU.png b/src/assets/cameraU.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fb03f450c6c19abf4367bf8692d9455d95560f8
GIT binary patch
literal 10790
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

literal 0
HcmV?d00001

diff --git a/src/assets/tab1.png b/src/assets/tab1.png
new file mode 100644
index 0000000000000000000000000000000000000000..68939cd213193368787291f3da51fed7cdea0ef0
GIT binary patch
literal 3302
zcmV<C3>ou@P)<h;3K|Lk000e1NJLTq002+`002q|1^@s6EL_u200001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91P@n?<1ONa40RR91N&o-=02{EwYybcZP)S5VRCodHoO^IpM;*rrghwDy
z0y@|h_`^0uQBb6%4=E)US{iJ5Xj99`BfP;{U!7_HD7NY!+E&`p5yCU!5k@AN<`P;^
zff^p24sCU+Z2=QSh9;s^A-uwy#LxH6Id_(u^Sbxs0k`+e?ChT1-~M)g-}Bqw{?4AW
zo6+GKzE-bZ-Sf(oD<c~l8}pi)nnq`2WZXi0h%QG+N9NC;zrVe^pV8hOFxxLHE6YB9
z{P;+~i2_F1Z~*IM(wJ%JYPgR;QvsOoa^GZ@w?(>L0Tf^-PMr9vGz?)!1H^FR%wz-y
zynj(|6CpBa(4bv;d3l$U;ge{cHU)6qx^+FyojVr;jLzOpND43?LF*~s45*Plefn%G
zC@47RL!WeUs{$y%&YnGc551FyDcp{hB?{O9fT$wuB>WYdcprQwk-i^ZT}XRg(4B?g
z_k>8-u3cX*EG#_XSs}r~76owm^5xy>@I45bM?8+c3{4cUjvYJJFr?q0?#>=PdhDDw
zZQ939GL@E=_BwOs%y`Ns(Z)l>*-mt39(}sReHB5IQ02UN^Zsp?CzB2ZAT}%uqc081
zCkU`X2;*w>gLDwVuE1j#Kvn?crUeTY$hLW2TeoiQT31&$mIo)ze1!U+@~l81beeGX
z5=T09>J*thd-gy4>Nu4r1fT#rdGh4lbTAL$3ScO=A{1awowD;RA>W~miq4%oR|FA~
zK6W~G?AX2V5SSCGJJ9Cm6+`<0<q;lSWbWL#fAOL<%RB)rDJki8@#4k1?OBpW?xaJ$
zcE@ZWE?o<cx8U(MaW!R{c_$Iy8b{}ND<Pq;$jr>Fm@{Y2`;J6$nJZVW98Uiy5hhdg
z`M6@oTiQ89LDbg-%(u92bR;D6DgXu8`Sa)RqCy^J67Ejou5Oim@*CmvCN#Tws&9Ae
z*6kfPdxq^C0^MXw$e})bqs8z(NFqY0z?Nw!YDjusD^{$y4Vfle5A6=(tK@g7{4u;M
zrJ22Z_kM#J{h~>iv2^Lu9Be=_%!UvKP#8wTOy06HAHg%~oAvG6cMpwUxr)Hy1~6|S
zI|?TCrSU<8JOZuSsR-%=78MoU3@8(=hc=43LA--gw6leJFWSRA14c5^HxYtf|AfI#
z8kS}bhT)e33V96L*YqT@XWMWm&iggUtK3bOE?t@kowVjYVqYO?<2ZDi2^F|4+k>>T
zYSpSfOh6CQhGz5!sGCJ_y=dbiG7OzHYgTo}vSrH}{Q#gs9o(Mp(xuC`nKNhBnw<3{
zDW9Om$sbJ!B4h*fQQwTAy(NfmCLsay5!#Y18%zCe#D3Qq=zqsUt6-FELEzJV6)fNN
zLFm-Zc-rahR0qD_=k@Vd(m-F^VKI<RJ4o2b{bKCS$#}*aHf+c_efo6NH=}GEjdzcy
ziNA-Rd^0)85hjO9ggg>Y6MwH)KxW!}>PX0Z+UXfj<8Xfg`W*rj`pxwJe-1QPWnoS_
zlcD!=DaSX7W9|{Wo&mrY5&_U;-b6=gVW^qv1t*8p@(~|U<Ire$^f4JYrJ;i?Izw;L
zP{+>HIMJDT@&RjWYsbizQ9q~;C|kT6`d0@G7_cfoKmUTs(<#kJ{RMq{+AgE6D}b+1
z_zegLP{G%LLo1>6wy-5TJNxHTr%r9=kXBVyW!BWx+zXv-jBJ`FE8h#=`w3Cs47cUa
zeih^c*4Ni-LXgdr57^(Y4*dUw0*sIxUbKM$#Pg4WR#{ou^XSo|Phngihp}eHj$RF@
zOr7AWC*FZZytr`TLPw$LjNXZDM|ZFvU#na`<R(HSCnsmO-;56b4BVCxYKQs)G}o;i
zCWNoxq`&7@uKa`nG?`hp;0f|((2*|?eBVASFdL||8{4)R4f><W(@x7b18fPYAc1|g
z9=h0!j&HU-$Z89d&=)UXzAT$5Fuz1>UU?|aPBSAu9ST5`nFNGcApp%Ke;D_H{6^@{
zL%WyR@Hg1DS52OFT5bzM#%6TrWyC!%`0643fe?7Lh5qk?w}!fXB@Ljj%VD=*$8=b>
zqSy*jZ5i(;(4xD@bM>F-u-uN(n1s>H{F-^+Lo-(}bc!vW9jqC+h_WKyih5tTaN+Bu
zrI`;>zXx%%%gT>x7W9|sPeoQ%)_0~)pMI<vv6Vp`PkZN9&nZ7)0OOf3l~<6b(1D?z
zN8f%#7zHTV#BRe;nl%D#8-c*f0dzl_xu$>r{!8o`(ee#Tp)1vl&dT*z4Rv@vOkQ6?
zvx_qEeT+3oInxW95wt=^XaLPVF`HF!uh0RTGYo*9L8vi+nd1Sb?CB6RbMfKBhhGBB
zgMj(le*OCWa>9fOQODP^ahsvrY|pgtbDhy??+*2$Ev^;?(Cn}^t39T?_3PK)%HrqK
z2&N&~&jU=&^tpif<0D6oEJCC8)>F)b`3Z6KvSwfVK|QI}7U*ZgbG}XE!QUonvDnu&
zX^EEP8#2qyVYuJet5>fZ;VED9BZ8ML%3#P2Bs>q0+uizM`G>3B%3C|X)iltp<5Q+g
zIZD|N6@vPjfOwx9Kjkyzn=lt%B&}A~<^Y<KST^oC@}85giAH{x;W&eMFvHOFHO;ii
zqTSQ&3ZN-Hc22I%%L;(`IRHFhmS3ysHnD-%s_-q*uQY%mQA`7v1~4Q7A*-i^1~PNI
zy)wGN<GV=VRxv*Rnwf>;JC?|O5I@jb)GffLd<x#f65;Pfn-TzeX`p`6<YUyF>gww6
z;TjEe0)qwBI;Z>~c_{&)lb|e0=)3QefHx1|Zg8Tp@`{4|GU8T0RRPrZ>O%}yH(RGK
zjGGwxFYzwD*A1K?`KbzE7Fy>d|2cpwVIlXGFj{9aP6+@5Od|TfWeF?QOT1R9O<;ni
zQvyIHky9=LS7QfX=8uYXL4NUY;o+H`5&*K!_;)4^ef9gAq($4_1UT8Z*GM~#WlvNR
zC`<_eB`<)DBN|EkAApOl<nZ+`0Vt9qO&I{K<*=&cU`W1JO1#P?FMjx%X#hiFm<BKn
zU`PZ)R!?hS8o-bUgsh&{z%+m%5eQj5t$}F(Ln08edRhb10ER>$Wc9QLh6FHWR%1fq
z;98v@IQ#K!<=cEBi2f`ZPuL7V{#pJROXTIOsl6Xh{7JdjuXe~f9^eZ3?=YWqGn~ka
zZkAL*BOx}FLHb!LJqwW9W>xk{0uyZ;%IAUU05=ucKTUAEwC_$^D>`Iq`5Vwi#Z!`Z
z8+lPMSuU?8UB+r}ISZE`#M55S_u3%I|JzfLcLs{1V^~}-u+l$_TZw-P4u2D&0Q?s5
zuL;_y=eB8P5ao+_GK*|5`I=wGr@;@&zwR#N?1;8$+eG21Q>V0d&u>@$hu~Dwy?gi4
z_+9t0pK=)YH^5lCgdT-hyDZ(ni~$Cno<bSlS<71zO#PvXaONMXjr^n@`Zr(9QZ91o
z7vkx}H^&5VPSlgV5ffIzx0QFDN#f2-u!(Fix!1`Y+T835CUiO=r<`G4MuYooUdhBQ
z2_XAQbi9;)Dk?;dkv{#=9}C)3T*9WGh`s5@t4>S<-G~GxW!gIWC~;sgp^Z*J$$%La
zK>C^i4{fiV2_V`i?YK?MkXc)F*D#XS;(gQ^`MybC08I|szs4~r8s^f>F~q)_i2(bd
zD<>}F`|W;{pIbUv0I4^Swx$sZ;r&@R{#L$@11Q%J1++arw64Vo0cdg&m>iKZkxtl}
z>GmT}teU_SkOI^T%tQdxQ7vpT)P_V2(ff&GE?KN$D?!`($i4@<5{{KBXF_O*r%Cia
zX#mZJY%s|ypp(+fAYkr;Hfl5N58*b?AOPYGXqUM(?Qz=k`h87owOM;DVGZubLA#xn
zh+70evm@5Q6H%K<hXaEN58G)!;0B;xt8jGX<VxE-ce>NI_9yG?1<j&6xYr9qi(f4c
zpxHwkO!8zibzGgVW<n>QYd5s9?W){s=)F$fL&Q$6Rb<C5on%?enK2uK9H$bim1Lq-
z0W|w0FdG^gbcU5|W>7Fq7OrUkI|{g^me01&m9P~G+6+Lm?>a;WASW^$qnb&XpH`XG
zqiI0XYn6^+D#^{w-P%@1e#UpCT>vyYAuxFd)#mA_W>V$}Ccx<gw-SbEDW@p?*W}e6
z>2?Ru6ngF2wS75bRqv(+fHa2Kc1iSWZn5RFIUc2A@@dQTH3gt4IIhuWaN2)B-bqdu
kS{&rH%B-JGUndCsA8n!v&|ocFPXGV_07*qoM6N<$f*!3QF#rGn

literal 0
HcmV?d00001

diff --git a/src/assets/tab1s.png b/src/assets/tab1s.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b76b3688b006179287162d81f9bf677dcd93f4
GIT binary patch
literal 4749
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
bSb_fl;-23M-aM2w00000NkvXXu0mjfA$~4(

literal 0
HcmV?d00001

diff --git a/src/assets/tab2.png b/src/assets/tab2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c525541a4ab2f41f9c1283a5c897671282ec40
GIT binary patch
literal 1043
zcmV+u1nm2XP)<h;3K|Lk000e1NJLTq002G!002Y?1^@s6*?5NI00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91KA-~t1ONa40RR91L;wH)0G2`0l>h((eMv+?RCodHTRn>tK^VT>#HisQ
z1hEi3yyA-BZ?Fl7g$Q;53lq3}UMXTFXrYx}VWUY%iVJe0X#|Ua_%}pi6A5=|PLeLH
z=JMgQsg}*|=H1O~GP^s0aI-V-*YkeN%+5`uE#jxyY;F$*gU_?s>@HZsL^j^Y6iJdk
z7K_EaM76A1tv;Dfr-xK}p6O&+zAsY^M5J#}X?dpumK`#1-oe<l&vC6HT^^%W-r7~T
z3HnN<Qbv?ZTHV2pc&pXA*z5JKYCWQFkH_O}U0<wLt8r2Hu~_UZl}e3t_E|nkNP{#e
zsz`-PmXv%CDxpwlzfdTAGBQ)2>R8eaWB@+&IA|5?Wh}LCj6j?9sWony;%1Dz^&@z;
za4gK~NP|<}K$+Mh0qk{?v8CM$z)Pjl&QdN82-FF=+wJ~!YD!?2GXdOb%6OGeMBJ;9
zb85GUxKq!0l}|+6tC4eR_rlK2Oi-iIxS}Y^+FwJ%;qXZ=mm8Sb<+Ps!90!dBfPRm?
zamcA6r+hdEIEVf`PJ0?oWf<|1Y8<b8FE#;MH5hs?K>u?i<5%e;0f&O#DoPmeGS^Q^
z^++W0XfztV#w+Vh1|aN;=s@pNyG+aINx-w&>@Ns<uuPbj#;K|9B}^n+1#ps^d_*K7
z?xSFmpaeGJq~#1-#%tI?J%cNEN$zAz)QLu;uhQxC8B4Jw-~fG$Z<3{AJF<qu;U4Jk
z+2L76OHK7#%LKVR&RjnUIJS)MTn1(-9{-DHuAh|ZcqM#Uuh+j!CX==A)lp)<q5r3)
zXB-TYfU9zG81Mss)UPi-q*V6>QXL2ZT;~wqKay%3w;Ch;em{fRb?uWIR+J7VxDS}%
z&RIr-1RPg6kD&A+&c0acCd&f&+aTU2GY|+#H4cy8A;@x##0~u<;6T)J4HZE!N{qRF
zQmQ8siCnwg{tg>=33f6iQENONk2jeLg)kEEWHLDh?J;ZRo0LaQ^-bF7if#ei6}NIM
zR79NP;J9L%h`1|m<ya_b9p~77t!WY5OFz+eXxed2d*1XDaP>Ab`Kn4FYaDz3KS2ck
z4Vm%PPpSS7H>CFTwXA){%?>4#$@JAeKLOv$=kupppjPc5ruy6;3lT4u%QGua@iK;=
zWvpaMU?VQ$go9icE4kQxX0y$Up=K;;a={1SyZEKyfgwWCDLgRuz<;Fh=vU^iVS4}o
N002ovPDHLkV1o6K&AtEt

literal 0
HcmV?d00001

diff --git a/src/assets/tab2s.png b/src/assets/tab2s.png
new file mode 100644
index 0000000000000000000000000000000000000000..970e1342124d53ad54a1a22e4ee5303c5ed6d0da
GIT binary patch
literal 2719
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
Z{Xh3gN%B(!x;y{?002ovPDHLkV1lJFNCE%=

literal 0
HcmV?d00001

diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index 3ed68f3..4b3ff19 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -6,6 +6,7 @@
 
 
 .main {
+  margin-bottom: 161rpx;
   box-sizing: border-box;
   flex: 1;
   overflow-y: scroll;
@@ -515,19 +516,21 @@
 
 
 <!--    自定义tabbar-->
-    <van-tabbar active="{{ active }}" @change="onTabChange" class="mytabbar">
+    <van-tabbar
+      active-color="#FE991B"
+      active="{{ active }}" @change="onTabChange" class="mytabbar">
       <van-tabbar-item>
         <image
           slot="icon"
-          src="@/assets/close.png"
+          src="@/assets/tab1.png"
           mode="aspectFit"
-          style="width: 30px; height: 18px;"
+          style="width: 67rpx; height: 67rpx;"
         />
         <image
           slot="icon-active"
-          src="@/assets/close.png"
+          src="@/assets/tab1s.png"
           mode="aspectFit"
-          style="width: 30px; height: 18px;"
+          style="width: 67rpx; height: 67rpx;"
         />
         捎带快递
       </van-tabbar-item>
@@ -535,15 +538,15 @@
       <van-tabbar-item>
         <image
           slot="icon"
-          src="@/assets/close.png"
+          src="@/assets/tab2.png"
           mode="aspectFit"
-          style="width: 30px; height: 18px;"
+          style="width: 67rpx; height: 67rpx;"
         />
         <image
           slot="icon-active"
-          src="@/assets/close.png"
+          src="@/assets/tab2s.png"
           mode="aspectFit"
-          style="width: 30px; height: 18px;"
+          style="width: 67rpx; height: 67rpx;"
         />
         我的捎带
       </van-tabbar-item>
@@ -665,6 +668,7 @@ wepy.page({
         remark: remark,
         phone: this.address.phone,
         addressID: this.address.addressID,
+        receiverName: this.address.name,
         parcelInfo: this.messageText,
         courierCompany: this.messageComp,
         pickupCode: this.messagePacketCode
@@ -805,7 +809,7 @@ wepy.page({
     }
   },
 
-  created() {
+  onLoad() {
 
     //TODO 初始化学校 id
     wx.setStorageSync('schoolID', 2)
diff --git a/src/pages/progress.wpy b/src/pages/progress.wpy
index 7df242e..a627bbf 100644
--- a/src/pages/progress.wpy
+++ b/src/pages/progress.wpy
@@ -1,44 +1,290 @@
 <style lang="less" type="text/less" scoped>
   .list-item{
+    padding: 0 19rpx;
     margin-top: 18rpx;
-    border-radius: 5rpx;
+    border-radius: 10rpx;
     background: white;
     box-sizing: border-box;
-    height: 266rpx;
+    height: 265rpx;
     width: 100%;
+    .top{
+      justify-content: space-between;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 100rpx;
+      width: 100%;
+      .right{
+        label{
+          font-size: 30rpx;
+          font-weight: 400;
+        }
+      }
+    }
+    .middle{
+      position:relative;
+      //display: flex;
+      //flex-direction: row;
+      //align-items: center;
+      height: 60rpx;
+      width: 100%;
+      padding-top: 16rpx;
+      .cover{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        width: 100%;
+        position: absolute;
+        margin-top: -44rpx;height: 52rpx;
+      }
+      .p1{
+        border-radius: 26rpx;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        background: red;width: 52rpx;height: 52rpx;
+      }
+      label{
+        color: white;
+        font-size: 24rpx;
+      }
+    }
+    .bottom{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 90rpx;
+      width: 100%;
+
+    }
+
   }
 
   .main {
+    margin-bottom: 165rpx;
     width: 716rpx;
     flex: 1;
     overflow-y: scroll;
   }
+  .progress{
+    --progress-height: 36rpx;
+  }
+
+
+  .detail-sheet {
+    --action-sheet-header-font-size: 36rpx;
+    --action-sheet-header-height: 108rpx;
+    --font-weight-bold: 400;
+    --popup-round-border-radius: 15rpx;
+
+    .container {
+      padding: 0rpx 38rpx;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      background: white;
+      height: 910rpx;
+      width: 100%;
+    }
+    .middle{
+      position:relative;
+      //display: flex;
+      //flex-direction: row;
+      //align-items: center;
+      height: 60rpx;
+      width: 100%;
+      padding-top: 16rpx;
+      .cover{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        width: 100%;
+        position: absolute;
+        margin-top: -44rpx;height: 52rpx;
+      }
+      .p1{
+        border-radius: 26rpx;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        background: red;width: 52rpx;height: 52rpx;
+      }
+      label{
+        color: white;
+        font-size: 24rpx;
+      }
+    }
+    .item{
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      .left{
+        width: 193rpx;
+        font-weight: 400;
+        font-size: 30rpx;
+      }
+      .right{
+          color: #aaaaaa;
+          font-size: 30rpx;
+      }
+    }
+  }
 </style>
 
+<wxs module="m1" lang="babel">
+const getTime = (time) => {
+let date = getDate(time);
+let hour = date.getHours();
+let mins = date.getMinutes();
+let sec = date.getSeconds();
+let milli = date.getMilliseconds();
+return `${hour}-${mins}-${sec}.${milli}`;
+}
+module.exports.getTime = getTime;
+</wxs>
+
 <template>
   <div class="container" style="align-items: center">
     <header background="#FE991B " title_text="进度查询"/>
     <div class="main">
-      <div class="list-item">
+
+      <div v-for="(item,index) in list" class="list-item" @tap="itemClick(item)">
+        <div class="top">
+          <div class="right">
+            <span>{{item.courierCompany}}</span>
+            <span style="margin-left: 20rpx">{{item.pickupCode}}</span>
+          </div>
+          <span style="font-size: 23rpx;color: #BABABA">{{item.submitTime}}</span>
+        </div>
+
+        <div class="middle">
+          <van-progress
+              class="progress"
+              :percentage="item.percentage"
+              track-color="#B9b9b9"
+                          pivot-text=" "
+                          color="linear-gradient(to right, #FE9f1f, #FE991B)"
+                          stroke-width="" />
+          <div class="cover">
+            <span style="margin-left: 30rpx">取件点</span>
+            <span style="margin-left: 50rpx" >快到楼下</span>
+
+            <div class="p1" style="margin-left: 266rpx">
+              <van-icon color="white" name="photograph" />
+            </div>
+            <span style="margin-left: 100rpx" >楼内配送</span>
+            <span style="margin-left: 90rpx" >送达照片</span>
+
+            <div class="p1" style="margin-left: 637rpx">
+              <van-icon color="white"  name="photograph" />
+            </div>
+          </div>
+
+        </div>
+        <div class="bottom">
+          <van-icon name="info-o" color="#BABABA" size="36rpx"/>
+          <span style="margin-left: 9rpx;color: #bABABa">已送达，普通规格快递</span>
+        </div>
 
       </div>
     </div>
   </div>
 
+  <van-action-sheet
+    @close="closeDetailSheet"
+    class="detail-sheet"
+    @click-overlay="closeDetailSheet"
+    v-bind:show="showDetailSheet" title="订单详情">
+    <div class="container">
+      <div class="middle">
+        <van-progress
+          class="progress"
+          :percentage="item.percentage"
+          track-color="#B9b9b9"
+          pivot-text=" "
+          color="linear-gradient(to right, #FE9f1f, #FE991B)"
+          stroke-width="" />
+        <div class="cover">
+          <span style="margin-left: 30rpx">取件点</span>
+          <span style="margin-left: 50rpx" >快到楼下</span>
+
+          <div class="p1" style="margin-left: 266rpx">
+            <van-icon color="white" name="photograph" />
+          </div>
+          <span style="margin-left: 100rpx" >楼内配送</span>
+          <span style="margin-left: 90rpx" >送达照片</span>
+
+          <div class="p1" style="margin-left: 637rpx">
+            <van-icon color="white"  name="photograph" />
+          </div>
+        </div>
+
+      </div>
+      <div class="item" style="margin-top: 10rpx">
+        <div class="left">收件人姓名
+        </div>
+        <div class="right">{{currentItem.receiverName}}</div>
+      </div>
+      <div class="item">
+        <div class="left">收件人电话</div>
+        <div class="right">{{currentItem.phone}}</div>
+      </div>
+      <div class="item">
+        <div class="left">快递公司</div>
+        <div class="right">{{currentItem.courierCompany}}</div>
+      </div>
+      <div class="item">
+        <div class="left">取件码</div>
+        <div class="right">{{currentItem.pickupCode}}</div>
+      </div>
+
+      <div class="item">
+        <div class="left">寝室号</div>
+        <div class="right">{{currentItem.address}}</div>
+      </div>
+
+      <div class="item">
+        <div class="left">下单时间</div>
+        <div class="right">{{currentItem.submitTime}}</div>
+      </div>
+
+      <div class="item">
+        <div class="left">备注</div>
+        <div class="right">{{currentItem.remark}}</div>
+      </div>
+      <div class="item">
+        <div class="left">情况描述</div>
+        <div class="right">{{currentItem.remark}}</div>
+      </div>
+
+
+
+    </div>
+  </van-action-sheet>
+
   <!--    自定义tabbar-->
-  <van-tabbar active="{{ active }}" @change="onTabChange" class="mytabbar">
+  <van-tabbar
+    active-color="#FE991B"
+    active="{{ active }}" @change="onTabChange" class="mytabbar">
     <van-tabbar-item>
       <image
         slot="icon"
-        src="@/assets/close.png"
+        src="@/assets/tab1.png"
         mode="aspectFit"
-        style="width: 30px; height: 18px;"
+        style="width: 67rpx; height: 67rpx;"
       />
       <image
         slot="icon-active"
-        src="@/assets/close.png"
+        src="@/assets/tab1s.png"
         mode="aspectFit"
-        style="width: 30px; height: 18px;"
+        style="width: 67rpx; height: 67rpx;"
       />
       捎带快递
     </van-tabbar-item>
@@ -46,15 +292,15 @@
     <van-tabbar-item>
       <image
         slot="icon"
-        src="@/assets/close.png"
+        src="@/assets/tab2.png"
         mode="aspectFit"
-        style="width: 30px; height: 18px;"
+        style="width: 67rpx; height: 67rpx;"
       />
       <image
         slot="icon-active"
-        src="@/assets/close.png"
+        src="@/assets/tab2s.png"
         mode="aspectFit"
-        style="width: 30px; height: 18px;"
+        style="width: 67rpx; height: 67rpx;"
       />
       我的捎带
     </van-tabbar-item>
@@ -74,10 +320,21 @@ const app = getApp().$wepy.$options
 
 wepy.page({
     data:{
-      active: 1
+      active: 1,
+      list: [],
+      showDetailSheet: false,
+      currentItem: {},
 
     },
     methods: {
+      closeDetailSheet(){
+        this.showDetailSheet = false
+      },
+      itemClick(item){
+        this.currentItem = item
+        this.showDetailSheet = true
+      },
+
       onTabChange(event){
         this.active = event.detail
         if(this.active === 1){
@@ -89,10 +346,26 @@ wepy.page({
         }
 
       }
-
     },
-    created() {
+    onShow() {
+      http.post('/task/getSdHistory', { pageIndex: 1, pageSize: 1000, pageSorts: [{column: 'submittime',asc: false }] }).then(res => {
+        if(res.code === 200){
+          this.list = res.data.records
+          this.list.map(v=>{
+            if(v.status === 0){
+              v.percentage = 20
+            }else if(v.status === 1){
+              v.percentage = 40
+            }else if(v.status === 2){
+              v.percentage = 60
+            }else if(v.status === 3){
+              v.percentage = 100
+            }
 
+            return v
+          })
+        }
+      })
     }
   })
 </script>
@@ -108,6 +381,8 @@ header: '~@/components/header',
 'van-button': 'module:@vant/weapp/lib/button',
 "van-tabbar": "module:@vant/weapp/lib/tabbar/index",
 "van-tabbar-item": "module:@vant/weapp/lib/tabbar-item/index",
+"van-progress": "module:@vant/weapp/lib/progress/index",
+"van-icon": "module:@vant/weapp/lib/icon/index",
 "van-action-sheet": "module:@vant/weapp/lib/action-sheet/index"
 }
 }
-- 
2.24.1