Yxo6+R(=r<$G$!o#!Ud=g;*kGxkbq$;B+#c!avlP
zT{vR#g{-af?~0zbQjCL-u>79ywC3)&R)pt!qP@FK+x{$RG|s@6TMOEHZc?vm#VZku
zKf=PR?qIA{_aL_z0OG^cEMgIGG%@;JS>1(9Pmscu-q#Ie39HCC_i7Qh037%SsaeD#
zULdZUr^F*0!wk`zmR&z<(!1^j<)
z%Re`(_s%_jx%xTNk^e`<+Z7^zPHx-hZ6}F1E509R#h)d!Vlv6@uj55N>sr6YOc>G&
zMdGdn)mjN{x-bqP(l}unt)VmDQL*Ne}9Pvv_6Y#p=bY
zsUALlXq=h~PXvs^<2lqUA{Qu1QEKS7L%kQhbSe0vxHT4*AxQ-}V<+*-u)&?Op+4RD
z&_v*-|2mlpwN#8RJEXUh
z;+f9ONtf~RQ!KyZX0oOzH7S%oPkB+7zz^^7==d8SojH8fLMGYO$9O17W-!6eR+b5~
zLymwmC(Gp`vr(m-nw?_`L*WFG*!5d7O}OrXaROISGIpkTC2gHoQ|mC|__Nd>Jrh+#
z#RlGf47F+p#k(!qE-rFYypnJRevCi+but5qOg&CIpP8>(a_&;Rc0W_T?9MYDiRszQ
z({Vq9;H-^W)noJFRFubcsV*A|>^}6o=kZVMG|hb7K&;t)2!}sw$|OKkn>()wyKs_c
zL)5h3x_~jZJ4DU$uo0`pE8`zk?j%f7?a(#}3io&Tx;U0dUE#LpoeoY2F@z|58h_UW
zb=3!eA$c5R6)82sNq7w&*a_Qn7i)i;S{7W7fwKcWSE7jTCQ~7|O3EcAJL6_FUf
z4mkT$>hc^8fTG~Tk$nC^e%YQkAX1GPnE=N%Rv)ON^Kcg*gIargVp9VT-!j0>IoNwP|y<}^1tdTe!}*!-SI#Bh8(g6lD`Bt6uRTPo|$(Xqb79n4h%=|1IXH~qyenK8UF)hX&k^f_y7v|y<{q!
z<{L#0jj_TDLuv~wymdf{_V9T-i-i_npq!Kw*{%H+0m~aJ)ZTOlJQ1*DA{l>JaBfzd
z%pAzcoJaY^{Lj8@8S>Ekj^QNWcrrD!Q0mTQnT@D;u2LqplWqjX`Tj`Xh-FSS9Zy0C
zNeGO8rsfpr8FMJIif686AeSKR;x)km17=ORM8{wMHeU2Eky%8Zw_5Y-cF1#PCtf^;
zt+R<&;+cRW{kyh<0pBOHh)R{XEMgg_*{z`iV>=^#qj!<1DFeB1gP!k8WKMzSOXhvu
z6tSFa+vSo`yxAxhSCHw5X9AW)V&m)ZU=EU5q`1)FFgYj}`2mzlsB;c~MNLfw$oT@E
zH%r=4IUk$NSJfb$j?#dQBNGfh&-->-bYq8SG4LeWWY-zML-vnb!kAdC(k-{&spf>b
zdU5C}3~qkQp~gE@#T3_FT2GG;_$6nmEG;)i-0BB!4+p3MraF)xMZnJiTWV$gPFcx
zRBkF!uQG-%yn^q-D>%@*yc!8((~3XH=0gwSd2_yl8Xb?^y(Z}VNs8x9j*_#?c>s*N
zV~NqL$SfP*1T2yHVOHSsF;0uA%QaBAhj6%C7wt=ZkGeE20gtn`%&XmZpeMH9kyQhD
z-V9XX7h`>?s)`Q!Dqx9vm|~l87tXMX55cPy{18T12>N5IN1vxIjRzcl_zHXj9gwBS
zUNzu(I~Wqi72)1pTdAvJd>8N}xxx6k1p~fVORZX&CSwMCHP)Z{A$4hdU}7M?jsyEA
z6mnJ1Qbys9q4e&EuvhOCiI-~H3tcw>PhxC%---E9tOqdm{|HAvxX`dyA^-pY07*qoM6N<$f;R-~;{X5v
literal 2078
zcmbW2`9Bkk1IIVV7~2SWn5*1pts2VlutJ;1=EyPeWJ^z
zIWn31?w|=9rbO46M3199zW>7a^Ll+g?;k%uzHhnVPD5qjG5`Poia|Sg>=FOJN`v;6
z%0M9ZAQ5&F<0-wDcc=U3SIn~TCi%awMhI4?ti;8fu^PXMZUi^)!kS-5Z-
zqN_WV8;D{zdi|hHG^irNbT+s_lAK2)u6n1K5xONH^kz62sHRWAv$+J>Nd&O_eJw~%
zLDaW7<_=iWy%^6IwOAX^&eyzDU%56P-F`k+TLU_K+%5vty`q(`c{Oh#Ou#swq!rlz
zA_4nyc)pRQ1oAkPQY3~=B>|N9{hYm>VkC-T(Nw439
z&9aKOHcq$LJv4Be&{*gkTQC;i$OW5ugP6s!T1@f7pX&~Kbu2z>rq$179rJbPE+wLyBZKx`aPD~WRb7*luQTy
zOUg}p(;JRey}JC`sH8Zld9fpUpnc|NmMlv#{VqL>dknM0!xx<8l#Il^eKqr4fAW@<
zM#3~!RfK4}Ossxq`|rQ+DpE3;Yw1~oo2~Et%^2QB;+3nDFYayNf}
zD#nwk<94k#o7-}HFHyBQ(^-*^$_@!kpG}J0ncS&q+yj8gP&N?{3Vdb%TVySsI2H3j
zlRWXKxV;~<@pFN6A~UmMkYp2cu6sOW)Jz0s@mWU&8tdBLIPs1`8+bk(L7K`Bd;HP;
zQ|t918YU&owFCAo+aSl-qiV@kqHUe`um}Ph7TB|>D@Pak3M=xn-wqM8TCPvM9zRdw
z#G0rVom08vkG_@$GYNbR9=Ho3tlmGCHy6f!F5fJC2!d8|8&jI%pZOAGFB~kXXKEt)^uMR$lGh}RyUMnE
zO&watg)79b8*=%q-@(K5#M>$9UN*Q^wZNMzIX}Rg&NIM_KM9i8IZHXxbZqK-z0#Op
zr)tsodohr?e`Yemr4X!2%?Ty9eaxZM9Dkel!NZwG(F>OP2i
z4O@!(m3PL*i9CRvaxF80!J;Pf1`#@q`jS23+`Fi?C+ow$8Akp}>ih>CyaXM{kUKj6
zYu+;yB^4xyM1eGemu2U|7mZSMgbU#n6rYnrYA99kv~;konl7xj@MM^EVL9Nz0>p&y
zcKR@XstRB86tqnT7o_)bEhS##VyZ8|VjJ@k5F}i&1zsbPPPwBY
zagh~XFoW(frbgR4%7U(>a9j14JBEO7*vpnjz@G9NhqY@X-yxoI&GkqoJAN?Vk7Mirt
z1==2bwH;OB-ua$wfBZ;GcQ_}zz4E@JJ4?ofdodPv^)10e`;Bgx!LWj}MP`6{V~0;E
zR(@8_f_=ed2<%PbTs!C_;!35mH^2IdmS^RCFJ7F>_SUQX(U}oy(NMAsQhrN{+x5{?
zUG;Ax@3+(I3q>XuJ0DmWEv8Zu=j7YNwu^a97W0nt2Q}}nx`AA}+R{`8aI>HDBsZer
zAUi*7w=b;4pw(e8Gzc$r(B@Fg^m!+o@-xK}loWla7;|XC-zm5uJ!qru^|;&hR7y39Jkv2wDkOt=Zz`d9*RU#h{a=z+9*m!Om&)=X?2a6
wxu6AeXKQXxa&Q9Bk8=a8q8w`ee@k&!N=I=Y!)_yW|DNyx7)P8#-AO|7f2VurTmS$7
diff --git a/static/img/logistics/WZ.png b/static/img/logistics/WZ.png
index e6388fbf38276d605cbc442be45f50cba69fd48f..d18c9695191d64ee7d33d847226ce57ce596b078 100644
GIT binary patch
literal 3803
zcmV<14kYo3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){
zsAK>D03mcmSad^jWnpw_Z*Cw|X>DZyGB7eTIxsjoGBY4CH99pjIxslzlgLc~01h)r
zL_t(|UhSO?a8%V5$IrQ&-Hng{N(C(r2<-rVg#>I7Y;6%sztp0RIx1CbzZ`Y6vLLn2
z6rFJ@ND`*vN2?tvwc}_}3dN~bg<36$K(YzQrwEk~5fD%k$nGZlPR|V|l_KQ5xBK3G
zZ^Qm(m_6r)N#48vd(QpX`|g7xMT!(DQlv+tU@>>{$7&XIsbxi$W>O_@uYDYw5C1gWgjTeQgf%b%nH%^5#{=RB
zDfSf>vYr4IpheFnXP&f4ibF@JL>qP&^}!+!`
zQXC3GA=-#3)YEFqB)F>Xa9?4h6sF#(B2Se3}!3`o-uu#XfL1T5Ze%fcy*wXr!|ecT0_$GB)!
zlhPF&Sx=i9T=<3V^Rk4uuBweErN|h@MB`z5G+Ul|5P>FfDp-;lsjNT!qt;WwEL7
z0Jcf7?-&tn#KhE43*j#;)_GFYrC{-rV9_tOuwMCuuFJ;hVexOF|P
z5Uvup2;zjQMCwuTJi{~5Sg`v!B^nt$6%t%0w^vR~{Zd>{@MIt|d}8WSPUH*4Epik*
zkKk7Q^n1hoYUiZlheaXELzDe
z$jJI-SAo-HYnI^LRkfuXrN}ioM_LKdoT6av;VO$p5N3;;6FG@inMmDqx0cSluI#+0K8smlTDDK0N`-Px}8`I+P~ZxnG^y>|9)hL2{t^_!zzZ3=l*X8Ni9<4tS*DAS$JVXZEUHywm43YsH|JWG{(3}bAoBUI~?HB^Tja;
zqV*#&9pNa_^crLQV0s_V&ALmG?_6AQxDtb45l7oA9CfD9yO*2NvEG|zDIVwA<0#VN
zO_?i93N~^u1}2zhEH{`7hU7lbaf`0ovRLLaacyyy9+AEymhTMe3vlHH!4AbWSBxa+
zf2ueJ;3hIoOk14xY2TMmUx}3f+&G3W%GE@~AM`c+@S6b9yuV0s%(vy!7TfBnOr*}{
z`Gk=+_q`DW-Aly@0lm0G7&}ZHpW!<0Uv+oOm&NTAThSCLZu|bDE68L&;*^Wd(d(Jw
z_za=q*tW-3Gz%;vtN9mKklvviI&^v*V`xJ=B5)J2$F`bK!B8=MrD8z%qO5~qXNuuJ
zj#iuO+cx#s=n-KdUOLAV4zp$`C9&>>F>_CgFH=K-w1Ni)+r{gk#o&J{Tzh2
z$EDN%5Q$`rROgVqP6RQ-(0*e02nR@H*a13S+~d-zXqZ);82snd9%6);lgq{MnG(#{
z{-sVuBkpR%^o?$@_UF1nPid4#l05nMn>JFmP1r^>%XiUw7+cZIpPmNtjzY{Y(iDR4
zW4i9~@DBBlru%XBpmrnqom!`&SwKx<`bKlAJ)%QThI3BZ^$x`xu;`Fj$E8!zvKDcb`p>6_!mrvV
zhE9UaMl9PC?>ZldSg~zl`pV{y!ao?%n_Z0%iSHKcxO6I7<8Sd3BKvU7m(?GL5n|SC
z^*1&z4OdJD{f^}kcioIx`M(f1%oqaqPdaY5M5b)AU
zVD1vr6MkALhAoanBOrs1BLK8y0Dkuhz$#<${TX`dF?*3-
z0+a%CcqH|Pc0XZWw0e0t?|&L>a5e)w;j#zM7ROk14gfU7A|)j!>gh=FW$
z8+01N^%q&tvztFDt2ssR+*=AZ>xtORuK{Z>|BD&c8b-!P+5O>{Kv~!+{9@M}oy-27*pmuOA;&KUW`4fgf;mg;lV2
z5MC0?F|I_jAiSa#Dm))_eH6Sa(IN-pf9G%xy4&tDa9y^PG{s*P*D~ZQhyY)NRAMyKZxm?oL6A0CZ#qb;6QPUxPVjR8lF(+
zd}>5ak)}Zla&9RnI!G$77XjuhT5Bx+1h*JRr=}J83_UkXrJ{4h&54{vlkLmCydSJ<
zgTG(@N6w;Y6hV!cMI69UW`T;%5I1M?60NSbbUj~)>t&b|7hDkdTb(pSk!mrE
z*pMZx6*Dh9*>q8rNWFuIUlq5=G2o1}oQL_IoXDJaq-jv8Nn#c`4qn!gC!*EQh`nVI
zEfTlLQRuqSbtG=ycp}ADfu6FiJG{$(Yx
zyST$Oad1OHz;!_op?k#j3{OR?n~qxvaF)152%btlTgyu9Z=z|k
z5WSD1EyTyVcnjZab6Z>VHgSE!SJ770sDp%XhqzrIqF=rHi1PjDGv5XxN5X@WXL(R^
zow!{Rjx_a+rAwd@Y
zg1dq(;`)w}^w>dHOp_MC!iMVj<>DH_NThX;wqkd1?%yeH!Nd3RQMM#@leoq(D%#qa
zYM+JbYQ9+`rziRe-vi%70TR%>Y5BV)
zMl{S)d!#6ELJ?^iy>^!+{1#VIXkN~xM~Yd3OTr|WCN!dHR@KInJdVDKD=Y976TXHN
zff~1}wsfNug@#axrfH}tec3|1Rop;e!Lmq^@m}u?_KMJnrfIB>KgFRoU0mZ>gg4dK
zM*ksh=m^a~a?dBKg~-+QdsxLi+z3yOjg
zO(V-)Z?SOwq$npiCBCyK8yiz-f@umOJsyc(?ouW3(VW(De(j|eEK9Mmg(#S&;3BPq
zs>#+DDVtfU6b_IgM|23Lx2#K1!BMcHX|!-)wWrEKQq(Ejht+2xc2OY9TP2BQzkZM(=2sBiVBv3>(h>gqh@zYG|KGC+1)ua=Qn5Ze#ura_uhPa
z=FEN0o;x@=AdfERyPE;
z#GgkA|FS_uJ5d4zE;_lx
zicNxrv*=|D5ni}t7rDzsG_O>}b0_}@r&5Sy
zK=dZ@A_{{lxK6xeCzvDZ4z%JU>O@pUrVprO1A@CWx#xls4I7LY5=^cQ%c#nbBfb?Q
zg1gL@YVjhXB1pP$y@)0Ciex<2?scd~^07gNRn$j^h;)%#Kls-5qtA_Nd6am_gm&6c
zO&2bTzh)`p?iA7OaiZz*)BnD`OZ5H|(TCkEwHyw^C$)MT+Ou%t2;oS5_F!YLV=^Y&^Ys$)edb
zsbFR-Aex`;ca!$Zy
zJdwp@>NXF9ie#6MC(>MV^%Bud*=>F*_ohVAJW}Z*bz@mdo^Uh^au`{vv9<)+SK`t1XS-hFS*mJ7;VXJ!bSCV%*dJ8
z3rEH`9IEeAhDde~z)eJ5DXAlN+au?bEk-k>O)$xBj@eQ)*HH&4(JLeH<6Q}~k#`nU
zaufy)BRvi1ao{4>_^OgslN@OwPd-r*lHJq1$cG^Gpd=M}wz^b{`9b&)T7hg>YCX14fJqRVDn}%lk{$lngFa&3_q3;z+gV{49$0B-|KD1fEWc^@{>)H(x
zZCWsm!s(|0qRk7YQ8{AfM9=g*3^zwXFj;=^CDA>WYh|D@4E_hU0Qh6S0K8-XUNQhL
w8Gx4zz)J?;B?Iu10eHy(ykr1gvNlBY2V$dt(XI@&9RL6T07*qoM6N<$f?eW3BLDyZ
diff --git a/store/modules/app.js b/store/modules/app.js
index 1f02c31..0d024c3 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -18,7 +18,7 @@ const mutations = {
uni.showModal({
content: '登录已过期,是否重新登录?',
success(e) {
- if(e.confirm)uni.redirectTo({
+ if(e.confirm) uni.reLaunch({
url:'/pages/oaLogin/oaLogin'
})
}
diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue
index 1c01c24..28a92a8 100644
--- a/subpkg/property/vehicle.vue
+++ b/subpkg/property/vehicle.vue
@@ -130,8 +130,8 @@
},
onLoad(options) {
this.task_id = options.task_id;
- this.initPosition();
this.locationFn();
+ this.initPosition();
},
methods: {
// 获取位置
@@ -160,52 +160,26 @@
},
// 位置
locationFn() {
- let that = this
- //#ifdef APP
+ let that = this;
uni.getLocation({
type: 'gcj02',
geocode: true,
isHighAccuracy: true,
success: function async (res) {
- that.markers[1].latitude = res.latitude
- that.markers[1].longitude = res.longitude
- that.getDriverLine()
- }
+ that.markers[1].latitude = res.latitude;
+ that.markers[1].longitude = res.longitude;
+ that.getDriverLine();
+ that.$u.sleep(500).then(()=>{
+ uni.hideLoading();
+ })
+ },
+ fail() {
+ that.$u.sleep(1000).then(()=>{
+ uni.hideLoading();
+ Toast('获取位置失败');
+ })
+ }
});
- //#endif
- },
-
- // 唤起高德
- test() {
- if (this.is_captain) return
- var packageName = 'com.autonavi.minimap';
- var main = plus.android.runtimeMainActivity();
- var packageManager = main.getPackageManager();
- var PackageManager = plus.android.importClass(packageManager)
- var packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
- if (packageInfo) {
- var Uri = plus.android.importClass("android.net.Uri");
- var url =
- `amapuri://route/plan?sourceApplication=maxuslife+
- &sid=A&slat=36.702558&slon=116.876678&sname=我的位置&did=B&dlat=${this.markers[0].latitude}&dlon=${this.markers[0].longitude}&dname=${this.goodsDetil.logistics.shop_name}&dev=0&t=0`;
- var Intent = plus.android.importClass('android.content.Intent');
- var intent = new Intent();
- intent.setAction(Intent.ACTION_VIEW);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
- var uri = Uri.parse(url);
- //将功能Scheme以URI的方式传入data
- intent.setData(uri);
- intent.setPackage("com.autonavi.minimap");
- var main = plus.android.runtimeMainActivity();
- main.startActivity(intent);
- } else {
- // alert('未安装' + packageName + '')
- uni.showToast({
- title: `只支持高德地图`,
- icon: 'none'
- })
- }
- console.log("唤醒高德线路规划")
},
showToast() {
this.$refs.uToast.show({