From 80adc8cdea61eba16f1e5c08d7b6ffdb0edefbe3 Mon Sep 17 00:00:00 2001 From: kola-web Date: Tue, 23 Dec 2025 09:26:06 +0800 Subject: [PATCH] =?UTF-8?q?1v1=20&=20=E5=B0=B1=E8=AF=8A=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pickerArea/index.wxml | 4 +- src/components/popup/index.scss | 4 +- src/gift/pages/dtpDurg/index.scss | 10 +-- src/gift/pages/dtpDurg/index.ts | 88 +++++++++++++++++++++++- src/images/icon101.png | Bin 618 -> 1541 bytes src/images/icon102.png | Bin 0 -> 459 bytes src/images/icon41.png | Bin 1564 -> 1458 bytes src/images/icon42.png | Bin 1152 -> 1063 bytes src/images/icon95.png | Bin 483 -> 753 bytes src/images/icon96.png | Bin 348 -> 558 bytes src/images/icon97.png | Bin 566 -> 945 bytes src/images/icon98.png | Bin 388 -> 616 bytes src/pages/d_interactiveDoctor/index.scss | 30 +++++++- src/pages/d_interactiveDoctor/index.ts | 2 + src/pages/d_interactiveDoctor/index.wxml | 13 ++-- src/pages/d_invite/index.ts | 2 +- src/pages/d_invite/index.wxml | 1 + src/patient/pages/doctor/index.scss | 2 +- src/patient/pages/hospital/index.scss | 14 ++-- src/patient/pages/hospital/index.ts | 33 +++++---- src/patient/pages/hospital/index.wxml | 6 +- src/patient/pages/index/index.scss | 17 +++-- src/patient/pages/index/index.wxml | 6 +- src/patient/pages/infusionCenter/index.scss | 10 +-- src/patient/pages/infusionCenter/index.ts | 87 ++++++++++++++++++++++- src/patient/pages/interactivePatient/index.scss | 29 +++++--- src/patient/pages/interactivePatient/index.ts | 2 + src/patient/pages/interactivePatient/index.wxml | 10 +-- src/patient/pages/liveResult/index.wxml | 2 +- src/utils/request.ts | 29 +++++--- typings/index.d.ts | 1 + 31 files changed, 319 insertions(+), 83 deletions(-) create mode 100644 src/images/icon102.png diff --git a/src/components/pickerArea/index.wxml b/src/components/pickerArea/index.wxml index 4f2617c..780688e 100644 --- a/src/components/pickerArea/index.wxml +++ b/src/components/pickerArea/index.wxml @@ -37,7 +37,7 @@ data-name="{{item.label}}" > {{item.label}} - + @@ -77,7 +77,7 @@ diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 9b974b2..c0125d1 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -220,10 +220,10 @@ } .title { margin-top: 24rpx; - font-size: 32rpx; + font-size: 38rpx; color: #211d2e; font-weight: bold; - line-height: 40rpx; + line-height: 56rpx; } .btn { margin: 36rpx auto 0; diff --git a/src/gift/pages/dtpDurg/index.scss b/src/gift/pages/dtpDurg/index.scss index 078f94e..dc39480 100644 --- a/src/gift/pages/dtpDurg/index.scss +++ b/src/gift/pages/dtpDurg/index.scss @@ -46,15 +46,16 @@ line-height: 70rpx; font-size: 32rpx; color: #b982ff; - text-align: center; border-radius: 60rpx 60rpx 60rpx 60rpx; border: 1px solid #b982ff; + display: flex; + align-items: center; + justify-content: center; .icon { margin-right: 8rpx; display: inline-block; width: 36rpx; height: 36rpx; - vertical-align: middle; } } .site { @@ -63,14 +64,15 @@ font-size: 32rpx; color: #ffffff; border-radius: 60rpx; - text-align: center; background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + display: flex; + align-items: center; + justify-content: center; .icon { margin-right: 8rpx; display: inline-block; width: 32rpx; height: 32rpx; - vertical-align: middle; } } } diff --git a/src/gift/pages/dtpDurg/index.ts b/src/gift/pages/dtpDurg/index.ts index dce7662..2cd744d 100644 --- a/src/gift/pages/dtpDurg/index.ts +++ b/src/gift/pages/dtpDurg/index.ts @@ -4,22 +4,108 @@ Page({ data: { id: '', detail: {} as any, + + LNG: '' as number | string, + LAT: '' as number | string, }, onLoad(options) { this.setData({ id: options.id, }) app.waitLogin({ type: [0, 1] }).then(() => { + this.handleToggleSite() + }) + }, + handleToggleSite() { + if (!this.data.LNG) { + wx.getSetting({ + success: (res) => { + if ( + res.authSetting['scope.userFuzzyLocation'] != undefined + && res.authSetting['scope.userFuzzyLocation'] == true + ) { + // 获取当前位置 + this.getFuzzyLocation() + } + else if (res.authSetting['scope.userFuzzyLocation'] == undefined) { + // 获取当前位置 + this.getFuzzyLocation() + } + else { + wx.showModal({ + title: '请求授权当前位置', + content: '需要获取您的地理位置，请确认授权', + confirmColor: '#8c75d0', + success: (res) => { + if (res.cancel) { + // 取消授权 + wx.showToast({ + title: '拒绝授权', + icon: 'none', + duration: 1000, + }) + this.getDetail() + } + else if (res.confirm) { + // 确定授权，通过wx.openSetting发起授权请求 + wx.openSetting({ + success: (res) => { + if (res.authSetting['scope.userFuzzyLocation'] == true) { + wx.showToast({ + title: '授权成功', + icon: 'success', + duration: 1000, + }) + // 再次授权，调用wx.getLocation的API + this.getFuzzyLocation() + } + else { + wx.showToast({ + title: '授权失败', + icon: 'none', + duration: 1000, + }) + this.getDetail() + } + }, + }) + } + }, + }) + } + }, + }) + } + else { + this.setData({ + LNG: '', + LAT: '', + }) this.getDetail() + } + }, + getFuzzyLocation() { + wx.getFuzzyLocation({ + success: (res) => { + this.setData({ + LNG: res.longitude, + LAT: res.latitude, + }) + this.getDetail() + }, + fail: () => { + this.getDetail() + }, }) }, - getDetail() { wx.ajax({ method: 'GET', url: '?r=zd/dtp-pharmacy/detail', data: { Id: this.data.id, + lng: this.data.LNG, + lat: this.data.LAT, }, }).then((res) => { this.setData({ diff --git a/src/images/icon101.png b/src/images/icon101.png index 16bdcebdca6236ceac4eca08ee5d90b5ca5a61a0..bcd4c3a2c4a5cd3f7d32c41c22aec8355275e786 100644 GIT binary patch literal 1541 zcmV+g2KxDlP);}X8l#C(hM>kuUM3bs zF4QJMX`utuMwyBjX6E01YybCNX69ZnOykYj|2bzr)>`}g4~CBZ=iizIyw}T_cdzE( z*xd1}d1$SDtVzJpUT$0J=&PmFMAK-?qI4QTQ)?0N&;lTu?1p;Hk|I;lz>0`i2z_s1 zY#(aeSAfBe^m5WRKs?sVsRcpaXd*-KOUbB3qfO+U8{{K&!fTtch>aa%1-x@5dm&vT zc%zfL0YDzToXL^*n$%=l-#>9RstnS6zs&^q_njo+&^x zx%A1>v-h~%wcGbC5XbL*)`cJfeOr>bjZuhOh?t@gV*`J0j0hk!Pq6`tph%N@4Mh_4 z-f`aou+7_wam+>%IpK*oOF1rT6p!gPDJ#Y}0WK&2gJ7~zWuHv!wfasocxi$GVa<)3 zhMeIz#-MW57$?9dFc4uLb9i5CE}SN)06Ab(jA4iB)JSN>O1>S{J-PAe^Knb7ej@@- zO~-sg5{SMH;^qgWa_4}E2eI{MzeA$-V*^sH?@GI$L1bc$N|a9s*pV?Jz^@HpDkB|Y zHQ)^P{qDRK_`^I>YixK#I=(}C{aNYdEfiWH(-QXPPdW0jS|Q*qzHkeT{Hpobsw1Pq zR$U|;I`P|4`@XQs^LibfoBXNANo0^;xtyAOlG)K|H%MqWh60YDj#sKjyY-$s!$tVo zPH}h-s0ovkDRA}$zM-o)u~XU%xqX-Bq>FRy@dMx*8GCU_zq(Q2YLtK@Kj+M1N0%X( zpc7G`1jQuI^7@sniuI4SZuUWLFqdOJ$NoO#?%ef1%qcJa(TDLZ!0->AolRQOwYPhD z$k-(Sq7RW6BGFE`tzl?yJSV-nRXVu?5nX581NS{2bneI{h#?0KZ7ooXnxIG3iIq6n zQ{q`-37Y|MN~;`1D5UgPn?Xk5C~+9s4e6^Tsv~u`D1{{`rK0XQq;A zk|9BmWzxL(l>kVOcS3!cIARQDVlK|VNkW2jG@ zj$sj8JRk&JJRJH+{MbvM?}^!FQQOJ#KOg~u^W6c@O&w)ez{TI`l!za+k6&oXE$RY( z$IWKL=ZQk|Py>+%`0i=G8=C&?#W-VM3Gm{JeR2KnUF{&_CIVdS$uoCGJafwPoPx=m z4~fOeqUc`K`K#wQqt+-$A+`l^MG3jJ*g(EJuC^X&D8P={197tn9afN>cx+67L>X(7 z4Mdon&fzBD+#GgXK3@>pifRZ3&&ms_0oi7J!&<3eK`K4a9 zq{b(t?2C4;60#%_^V$=5=?2MPF-8PbG<=F!x=ck-eqZoe;BSA)Pk8&BWJ|^bA8Ya` zVt|1#w&kBWmlIwuw-Es|KjtLaL7h$QrAoplLZ^({lLi6HY&lsi8!Z4=r%9-Z?nXVK zRlgAdjzj8if;vPQ^`O+8=)sbt!BKlQxP7=~M!(LU%eX{GNgy3xZN^>c>uLgL7-V2w z0BYTzg9=1)ZHJGVR4uLgoJdH zPUXU&1oLUxe4lTjWa`Ym2%Bp=V34*Q%-zf*!#E>OJ0QIN<({}@n>`rw_I<~9fkmFNPl(*V>Hb`f+w&0ppVG`<4$0ABWfKh*1JSc#W{>aqqcn z9%R%%C_Fy)^?|s;cldB{J0f(uk!CDxeD;IAYZ73{vj<}K?Ect-J^9W4sDD`OUv2-j r{}%uN|NqUFu^9jW00v1!K~w_(>9;Cw7-bDU00000NkvXXu0mjf)xGQX literal 618 zcmV-w0+s!VP)}13Ze(Gh<`y*lUtM`Qt;p*Vzp`O52W}PXc1AVLWNLiL240c zbCN1FP>*`)&4UH?Xs@CvCOf`a*<-ca0TH?plfi&(ByRJ;u5c zO`pt2YriD&5ug36$*Y=_Xu6ukL2xbjN&U3VrB31z(D#-gHZlWiaDg`ghFOc#P=E7pRN$RHTQ(xbl{%E^;)t3dUpA z?rY++d_rBH(p&FoWU9|rrq9~&bjj|_lRdoC`B$Yh?A!@h<=X0RR7ClOhfP000I_L_t&o07%^*`u(A(LjV8(07*qoM6N<$ Ef};H)Gynhq diff --git a/src/images/icon102.png b/src/images/icon102.png new file mode 100644 index 0000000000000000000000000000000000000000..16ebfe11a0040b2250408d25c1f5e918f026136d GIT binary patch literal 459 zcmV;+0W|)JP)2s_u|MB|Ln-1*bkCBlsgpbKx{leL+sE>=^2B0JtptaTIu3I;%#5z-Q@E>1sOmg zB^DZ(!5l*3(tQ2;OxB?a<5n+AJh|u0Cjt2|&?wH7cqGD&(Lo{1$&Gk$Ayqyqs4Ir3 z(LjALJ3;GvJ%72=i)W?JIk8Lh#ju9ALmRVkNsWyFiam+d>#c75J$bV)hG4j!7sLSp zY*8Ho%QmQ?7?$&bj+NMcmAK{v8xd3r3~PBo95_{CX*RAa<~9PTR2bF?f;iX)l@i06 zJ3*YV3zZtfdQlK3g;0D^a@>Y_9fWpZJ13H~0&xv5iUU<7z;LP7AWjaV5@A@Q6Nops zsGq$mA%^RB2Jt4MK1&>alsFpt%y2z7+JM~oHoq{NC&OMyl=KEAs^3^9gBmTVUC14( zHKcKxJJe`N?ZP(z00960_~L9700006NklNzPMnO$l=e{~J#z$^3P?|W9 z#JTOri3v0gG!e?>FQEPfz`#co0uGIa!jPDVPLPSV2IXOGs7fUE-m{k9x6i#5(sOQa z+ld2i?qct~&faVN*0=V#CBy&ha}Q{(hHO}&xnnW7@Oh)Qcz<$v|H7%p;YHfb)11?{ zR?<$-*9~;#lSb|Or_I@ct<9fu$7~+iQO~2Ed(@jv%vgrAzn@wT!X3ML`t~r^`RN)+ zid^})aoU0q9<^qU?H)j$!y*jsZG*W3d_IxqJ#&kvme&Q=6%b*Dv%dUdINk_Ccme<+ zXmkj`lb>tCM1LEOKB_p8d(Z5(F4bBSNHCG*vrIZf0}~J=5MiOUOunE?P@3lik>3*- zq~dVa=nkqQ&_!NchYMynT&*yIWZ`XvII?B*Nf{$3rw)X-U=yVLh6o$V8hvM3;9#d~ z)e-3aX7d269b<8LE=!k?x4MRERXT0G!ZTM{DGI1%Hlno_%Uypt*lTKtCJ{z9HE( zgP7Xj4l2Ns`Q;nMIg`?N-(!Yt&zfy}#;pI*jD910a6~fhwFFN!H8yh`=%iAmLf*)0 zf+!SV@Bmu{CNqn$=-X}>db0;R$9k~+xeSA}9eXl7v9AX`0~z=641u**#=;OmU)V#v z{naXERe$oiXK$$@=fz}|tk&SHl0l<)tJ#y|8G0YUs*ik+zn+16v_IUD6y~`$Bnv_f z6`x8VR#c<4f)y}n&EK6JuNty`RDSgAk(ZK6JRfjY;w&tgRC0U1>ToI0#iKFkI#?*8 zfHGE=g%lXrX;tx7{9ASyte0J4dqZzsKx#1#+kfU5y!ufLt!%zyQVPW9gYG~uSaG3s zSpg~3_aJ|(xuKhH|HH;M885X)z62_gah-+Yc6o#2j7pR!PQ`R>l76I`2FluH@K;W6i$ zZ|(P0M=OCma7KqIJ2*!gIpKdb?Ao`$jqkwlWq;t$U;g9LeD15j&tF?8v5YbJb{TSR6Of0^ zKmB&^3FRoWN`*#wk1TA40m4^;fiRZV!PYHYLR|U`xG)pRE}sl6Tw<&ETa}U*s_=l$ z6~@E$GLW{f5=a|fdC!gn3vLH*y(Ol~c@K<#>3OFBjsy*OTSe#GVeNBHf3N_q=YL1u zsa8ihI|6A#G%(3POvc2{Dj8hsNOOdp92H{_rnE7g@1UVKYU@zjwsez))kO~>^Wo;1Uj!oIo08u2`xbs zDiDNF34;Idi`L#RUVhi66r&sK8c4xFd zwp;54XeHKY-In%F+b9#C(63vlB}^>EoUQTJTK9}l$7}D~E}dBk(8Xk3K!5FcLztQ( z5h+DPMD`Fxf<5$9rZYWA`49va;ZuR4`7xGIsTIsaK_5Z}7NSv+Uo*~(W9n7!+4_;=?-h1u6|LeEc+UMLG;X3==0BTf_Yk$s=ePxsSca<0Q?=G$G z>nyjQr44kJULNQyKis>scXFe^wdThR)V;0zNYD1tmNOSC=VHS*YO=``?W)$n{znFU zm&>*Ep6x8}I=81ZzgFN{{!s%R-F)G;6WdB#RM4e}o>N6LP2$+ZTf#sMsQB2BSF@*L z#jkz42DcaXT7PRTfRX-D0iD`nbMiOe^fS~!1hEo=!3jbLL1-0-V~82&*;aj!=$R|! z@(+DGZO+KxS>uL4$3L-IC5^jGakqoGRf91D0frDpMl%DAOvA9?yb1TtgjBlDd}gz< zAkx0NKwTeOzHGXW5VzAL4PcB@HJ=NR%udq60SP0)Vt>|I4Q)19{=y%IG{DGyU7#6S zd8eW_+gJ&us38g&pg05Z^hVRf{4NFKq|#@~#4uw@aOFCmQRJlk=^-34y}tKX}Lebt@nwvE{>#ac_b5B;7=Ye zKVXIg%G+R)$K}eZG(@^z8%XVOKDrdgbEkgFJ{sYmlQn*8)vEa z7l478Rkl2k@8_!n0Z8$!$H=nG4Ee&c*?(T1C=pCfXF-hp?n8!wV|-YAVTPUi!_aq_ zB_@a_r4nzIW7jmpry1LVt0quLhGcd>QD|8$F z{#xG4%7a*<)zjN^;y{R=@vkNj?@%Dj+kXzj z!4J$1Zc-fC3F|uo0&u+paINy*aJ?wA<85r%xUgepF@q(zY6AIerHIX}{ZZZpC<6qe zuri1e&UkVfls*F?yd|iQ-D0le{s3e2o64bo`;KpR?OIkB$g@PDRcfesfM5(_49p8E z%D!KCH3TST06wSmtNTdgEj9S2M}M)5%B%IVEfA6>JaH3ag_i`U9~rm|I8B4r@+)4NssLxDYO#^A>C z{V#K|?s(|++(y@GWTOIdkz9gSiC9IsiMh5F?r{_ik zG`#-B4k?~ihXP-k0m_tgUY-C#KxQ$#CZPCSi&*Ig85S5tXG}n@=TJ-6%L)eEz_HMX z1kwqOe|)_8Qrxg`t&AClT7TJJu0GMomUhUx$l$;H3KozY3g=m_r_(l0RR7zFrxwh000I_L_t&o0B{dbh4E;nGynhq07*qoLT93>nx8E~Qb6hhAOubq-z+sl%un=Id9Kupa5=|hF%aYavEzEgM zm0)pQ_Gx{~LNK>J-UMbI;sVd-+#H?P*UDecsgEgu*wDSyhzwb07zM)xQvsa`N7#y( zqmBZunE-EmAT4Iv3F`?0BSb`uEe@f<4@;#x1?bOqAb&R2t~Ce|R>RVHa7pc;Up~a# zZ$RkGbRZVq+$e8T@b_>)^Q;kl&cW!2nq6pb9Tfi-g!nLeChN%sW^DmM;Si6$8eVm+ zG=G`_(dG}-Z(npzwQu&8hI>7!eWC;Lz*`&AGQ*BJoIi|UAIbs6lN)rTTIp4qzkKd% zaeoN6Z+~iC{mwl88?i5 zL7y4`yiR{84O3jA8~d97G7>}x!mJfA3g*GFiMWH=%cJ>#GK@=(k0^57-|`i?E-s7Q zynkaV6c`Be99RS))PzugD(DWJzyk<@^~V*S86X~ygL&qP)VT2_<44JoAkT#YHh?hW zIKgm^tqmhK7>VZs7(Rb)Q?7Rf%MNVQ4N$~2gc1a^&0FDoa>RIk`h9dTa?J%0`<&-% zdiG;k?<;EN*q|#NTAvFB3?s(Qx54?}7Jtvt*e85$fPjcNUzg6xRk`ubrqo369vnZK zvi=0HR3hvgba4g~S7897`?555&Rvz&{|v7YWQmzCp52t?fE>Lq`X>Sq8%M0xWq;+G z?5xz~UW{kOi2}?LoSZvxfJwp0@k0Or0RR8gy>OcV000I_L_t&o073reU%-1Kq6`24 N002ovPDHLkV1lJr@g4vG delta 1132 zcmV-y1e5!x2!IKYBYy-nNkl}@9&;_zVCkL-1`dqkAMFYm{EauYq9W$SAXN`lf!XsWnaHCx#svw z$It6z)!GvHW_P)9<;wJZczL8mIR-07!_(-Z#l_+CFSzXUpZCTMogy)f!1z$38;GF< zTUI7>gju3bi4^DoyS$MaLsF;{B&HEarPT;x3E}b)9uNtbL1VZ@6suNtH8#x)0VPKU zY64OT14M#G5`TG~3HkP4_QsOAl9;AI35*j^pp-tc3X&fJXBj{RO8PLr`1d+Ccbq_^ z;x!OV7U7{jAXsRgl?mh6NzhcLH615_q8O&kC5-?^-3gSOfK5|FicBdLU~hGt!0OFD z9`N@B0?MsZt08k4LVb}fB8t!A%z`&MPCy9>yc3ikQ-7t%V~N4JlmUsQh#g&z`lRCL zV$+&X$xi)b`ziI80#*+|z?59FYb+}o3*J%eT&*pE^))ZeVtezn#`+uk!Rec(?{&kR zZ-B_RC7^}Vrxxr+vM;Kepi?8?0OR#kJ?x1?FUBgx&c$XVkX3;9>a-agyby3h)f?f9 z`DE`qIDZgVv=Y!WeP|%MKN*Z$TGv|VGZIkXjlDjSU?Y)1BR@(_GDa1`c{5f7;=_+# zDDPLifJX<)O-nC|qgLSU6nOveAP$ZVMvvCp**_A{hA@A)g#DIydNw9O&0!vyNU%S` zE;0D<$2;-Wg-hco<6fpRT}eT?WN{s%_l@l;Uw=RHd|aiRf48#|So@fN=iv`TSOdY6 zgP@5PObZW@0>5#6d5Y-LnBXR_8^m!Y9Z}p<7C12a+{E%(5m4~j$9+GN_Y*89u9DIl z@+mVh&vTLyI7luklKiH}jIm3waM4EPtn91`RDtWZ_>M5IAt$wF31I9CHvx&9Jb_7y z>VE`PLerYxIZp13TUOPmn1^s`bhz_7J!hR*;&q zHEmV|v}OI1zGpJ*dL|yLKzS-EVWyfR+%lK|!EZ3GxiQ{A=%hs@nzC6F(7v9h{FpcV z<^+2L@LxqlN^oq6Pc~>=JG+xpsy&Xho)?d+kN*JU?6 z?Qiz<``u@fT^g`;1?-yct$tH?pO3fh>6ikoi8a5k=BMx6<{#X?%|F$=oy{wOc7Uzl y=AA$*VC(!300030|M}XicG z6m4?^7Yt3n0HVrhR#Bp)fD%Oo0TKz00?eJJDIg>mAw&f0T>LLXx)j-_fF1xB0*nzL zDkyE*Qb4s>#tL*1Al!k&0P{lA6p&db2|n1}OBExoyE89a52H+=dMrZ$e80L&`>=I~ ze8~iwnhQ?glHbuecA15==K|fE;FwV=UfhDp&%h1fg3AT6#Vvw&D3;3F3SJePgtg`Z znVZ!K-aDhD*k!i%%IxOTrG-Eir3tX-a8hBm9^^q;)o}V&H}l%B`Yr@A<9bWF;@WY{ z)&}*Zqc5zFsev$q#}6Z1GScTfurGbe7AKH7pCo7!%C*4P6Yfl_oBI2DXdqzu!X!IC z8~JQyOCgvSP(7AW0(1<{rOet@+U#=hISAkXy4cpRh-TGOUO?vUc}r}^ncD01mD9W` z=v{T>4P+g+TCxX4d5MrvU*G5>^F7lbAnUZ%mPV;i=5#@Wfvm4VMT!_VAWH!m$J4fS zk_0tAmv*qy7nTOH&fI;&`w1SG87&_m8#`BPEa?73YlGW4sIa5c@sro`jraL=ZJ?Pa zMr*{>(Bw3FgYg4WB~EETSzt`2P5z&~#uOJn5~R+_(t!vty)0sO4l;Lb2vB7-W@q9F z(?j)NLm?S+nAjU+bpka!|quHyQbi0gFNg8hm* z9Bc`&Nc0e05cG0BId`=+jF>OPjc}JzlgjGnp*^O`Jnn35E@yRXQuBGzx{x1 zFl$7@)t;+O-MNnIvbBqG1q6hQe9IxuZ%An50^p75OFZ33KL?rWnFB|=8p6ZyA>Sy{^BieR-3Sww8VtdMO) zT}iSf26^j|#eboqkR7y^7>mi00@jolC^A0(b#zrSMpqTG1jBet?xQi8$>q?^c$-g7 z5_gVZp0VelguF}+6RxBvxE9@zK4OT~-jeqGUqarA3d1)500960Y>R+G00006Nkl3lV;;6+b8d66#!}9G<5WCCzpfg#61>v6{drT zB8Wmja5Z-#q9Tr^#=xxGsI;Cf$aWH-jRADYK(O_EtQY~=@3{{am`rGWA)=+t^C1(b`hQ|l!YKr5;S9tije<~$#KaN=tnu|+t7R7H1- wU4+=$e18A{0RR7d4^A@x000I_L_t&o07T!fK@5clDF6Tf07*qoM6N<$f;y%48UO$Q literal 348 zcmV-i0i*tjP)42E|XkMNZrXd!q4LGS_|z(x@CCTeeCVQHb**x2a}1Q9H31i?Z(6%;Hjg!Red zj&U7-mpn|8N!|?;&-vl=eLn^XY5huorhll=xPc{p{38Jhv(Tk!1y%TiJ?x$e&>&-$ zIL8!@pa?Mtt>wDz=|O-7J!YHg3`Ffjq6v->pwTv_)YusC_nlmLG$!HMm{Mb-9wudi z6oG9_(pH=D_epr;5ey0BRYjzXFR$F=oWdER*3b!=z(M2y6X-w<3XrC72HLg+eJ~aX znCQ`2L{h=(bnczNS{0kssoZUiI;ng;fmxlpe=DFTFsu7UV16yWTirDm953I1O&qDp uK_0Aj0RRC1|0Vr69{>OV21!IgR09CJ8(x9ZqTYp&j~HuoFW z4n2{@9b5J<8ZVl*JI z4%v<}7D|Y2MK|q(iUgd9I@ta?PUb1j7$eNa2|}#s-pXMtgq`Wcn$8%E)oLt2h~31B zq|^x)k(pDwjxw{@>b?M>ed}PFOmu?`!B8hJ*`LI;J$0lc{I6}EnFD`>Z;f(S)Pep4d!cIG`y zJ%0l~*VfxZQ#gh6DI*2_DCl-Yg}JzC-xV}P5J}gxtEij08gpTnrAElBQ!l2TslJRM zg@7ug)Vw-%^R`;46MzP1*+xoy5}OrLE=hs7oaE%%k9FXB6eVY=Q;lYGRce}M2oTC{ zTVD9))+4S-VbXq`!s-BVanrtu%};T+G&od%!qCN7Ie(!q&Q$0=xoe&`Tta=C#uI}V zqGbN_M_8$RiIrQ50o;OPXt|twDJ~)26zDwW=l>8P#k7a(6QWqEf)umf#<6F*L&EfK zhk<-TJh8Ib*C0eU%YflxGWd}M2n`6aYdOt_w0CMe(S9eoVWBh1n8%F;2=NA|9xKu~ zJyPTa#$YVM3G@?$c$XEeeC|prF-0+B<+7uU!C0*lN{E&CDtmLer_N#ab>g-RkV z$+j6IOd<(+%3Py*d-9i=82$MvS9I?@09Glj%WOl-W>^2MhmT?jdB>QT*3&aezIVyd z`Vt7(Kmh;qe literal 566 zcmV-60?GY}P)bx73cTTe6ngIqyx!p6t{>SYUxdoV#gN zKxc@PW$B4IRUw&#cN*hlj!~}}?ir0Is|sZZ!`y8c_qAL|C;if-Wjq;Gf~#0x+d$#X zhZH_`eM!?43ZkLURai_{lIYp5<=vK6qYpKL{}91MJ931AqWC= zylVGoZjnp$w8T;LUe2f~$<(~>#h)l|?bL$0-l|E2>Z0C7VjG6YL6ZU?}W>FZx;Xn0RR6AN|1;E000I_L_t&o0N`KA;JweyqyPW_07*qoM6N<$ Ef@BK<6#xJL diff --git a/src/images/icon98.png b/src/images/icon98.png index 4c54f5101a6bd1741061394235c5a05db8f691cb..c8c48efbbda02123d7b6d8f11e3cd4761f103c67 100644 GIT binary patch literal 616 zcmV-u0+;=XP)E#7Fx%}`#Rr$HD7^57M`*-=a2kg^P7_N|yL|Jv16r+C z6M`S3j?AsyZs(`~dZr;?#gH!sLxSOQxqRap8ZjVQfzr2rK##VxsRAm5Ep^C8zBq-t z3fzXhV<*AjTS)|xfq;3fR_mkZhBCnPUDy2}Z{oNLB=5yy;qCYP7H_rIJRrwTB^_I> z(HR%tXlK@RrseU&c6FozDT;U{>L)=_z!8A_B-~rJ*3d&IRk5u1l?z+yFajxBiIh-@ zH4jLGb(i~P0N4<_j`qzk%9{yDjww(w&j6cBiHOH~rp}z>G6N~#2dahcA*P}ImkUM- za{(y;s0|xkr*E!#lJM!~@{wO+>31n(< z*`cySrVg0wcejVW0RRC1|1WbX*Z=?k21!IgR09ClR5w_Y;}y^V0000$s+_1PH+^E3~!&r4-(Xu3L zgUjac4DTPNV=E@Pm-F16=bY#N+l#jHN53U#_(Q61hA|{l6vZTt;}3jO3M3BLXO?A$1OvQ* zd;n+YoY@pFkU%n$#j9$8WSXXFLGYM^K7N(!J-U+~O=Tw;`d0k{$yS0<6rBLL6)%!L z48v2|iT|li(06DK>;k|Q{ziJPbJSUVpymL8Yo6q?F+G2Spq{g>)jtM(0RRC1|N97f iX#fBK21!IgR09BEtdJ$&-vLno0000 { if (res.errcode == 10001) { this.setData({ diff --git a/src/pages/d_interactiveDoctor/index.wxml b/src/pages/d_interactiveDoctor/index.wxml index 4521b81..a4338bd 100644 --- a/src/pages/d_interactiveDoctor/index.wxml +++ b/src/pages/d_interactiveDoctor/index.wxml @@ -153,10 +153,11 @@ - - 输入文字 - 发送消息 + + {{customMessage || '输入文字'}} + 快捷回复 + 发送消息 出诊时间 @@ -182,13 +183,13 @@ confirm-type="send" adjust-keyboard-to="bottom" maxlength="{{500}}" - placeholder="输入您的问题" + placeholder="输入文字" bind:blur="bindblur" bindconfirm="handleConfirm" > - {{customMessage.length}}/500 + {{customMessage.length}}/500 发送 @@ -206,7 +207,7 @@ closeable > - 发送消息 + 快捷回复 { - app.mpBehavior({ doctor:true, PageName: 'PG_DoctorCode' }) + app.mpBehavior({ doctor: true, PageName: 'PG_DoctorCode' }) wx.showLoading({ title: '加载中', }) diff --git a/src/pages/d_invite/index.wxml b/src/pages/d_invite/index.wxml index 1fd0ca2..da540d9 100644 --- a/src/pages/d_invite/index.wxml +++ b/src/pages/d_invite/index.wxml @@ -4,3 +4,4 @@ + diff --git a/src/patient/pages/doctor/index.scss b/src/patient/pages/doctor/index.scss index 06593b8..1384a97 100644 --- a/src/patient/pages/doctor/index.scss +++ b/src/patient/pages/doctor/index.scss @@ -171,7 +171,7 @@ page { margin-top: 16rpx; margin-right: 22rpx; display: inline-block; - padding: 4rpx 16rpx 6rpx 16rpx; + padding: 4rpx 16rpx 4rpx 16rpx; line-height: 1; font-size: 22rpx; color: #b982ff; diff --git a/src/patient/pages/hospital/index.scss b/src/patient/pages/hospital/index.scss index 6a57a78..f83034a 100644 --- a/src/patient/pages/hospital/index.scss +++ b/src/patient/pages/hospital/index.scss @@ -7,7 +7,6 @@ .banner { padding: 44rpx 30rpx 0; display: flex; - align-items: center; .hosttipat-img { flex-shrink: 0; width: 180rpx; @@ -51,6 +50,7 @@ font-size: 32rpx; color: #211d2e; .icon { + margin-right: 10rpx; width: 36rpx; height: 36rpx; vertical-align: -8rpx; @@ -86,15 +86,16 @@ line-height: 70rpx; font-size: 32rpx; color: #b982ff; - text-align: center; border-radius: 60rpx 60rpx 60rpx 60rpx; border: 1px solid #b982ff; + display: flex; + align-items: center; + justify-content: center; .icon { margin-right: 8rpx; display: inline-block; width: 36rpx; height: 36rpx; - vertical-align: middle; } } .site { @@ -103,14 +104,15 @@ font-size: 32rpx; color: #ffffff; border-radius: 60rpx; - text-align: center; background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + display: flex; + align-items: center; + justify-content: center; .icon { margin-right: 8rpx; display: inline-block; width: 32rpx; height: 32rpx; - vertical-align: middle; } } } @@ -156,7 +158,7 @@ display: inline-block; width: 32rpx; height: 32rpx; - vertical-align: middle; + vertical-align: -6rpx; } } .p { diff --git a/src/patient/pages/hospital/index.ts b/src/patient/pages/hospital/index.ts index 412df9c..a3ed72c 100644 --- a/src/patient/pages/hospital/index.ts +++ b/src/patient/pages/hospital/index.ts @@ -28,27 +28,26 @@ Page({ }) }, handleToggleSite() { - const that = this if (!this.data.LNG) { wx.getSetting({ - success(res) { + success: (res) => { if ( res.authSetting['scope.userFuzzyLocation'] != undefined && res.authSetting['scope.userFuzzyLocation'] == true ) { // 获取当前位置 - that.getFuzzyLocation() + this.getFuzzyLocation() } else if (res.authSetting['scope.userFuzzyLocation'] == undefined) { // 获取当前位置 - that.getFuzzyLocation() + this.getFuzzyLocation() } else { wx.showModal({ title: '请求授权当前位置', content: '需要获取您的地理位置，请确认授权', confirmColor: '#8c75d0', - success(res) { + success: (res) => { if (res.cancel) { // 取消授权 wx.showToast({ @@ -56,12 +55,12 @@ Page({ icon: 'none', duration: 1000, }) - that.getDetail() + this.getDetail() } else if (res.confirm) { // 确定授权，通过wx.openSetting发起授权请求 wx.openSetting({ - success(res) { + success: (res) => { if (res.authSetting['scope.userFuzzyLocation'] == true) { wx.showToast({ title: '授权成功', @@ -69,7 +68,7 @@ Page({ duration: 1000, }) // 再次授权，调用wx.getLocation的API - that.getFuzzyLocation() + this.getFuzzyLocation() } else { wx.showToast({ @@ -77,7 +76,7 @@ Page({ icon: 'none', duration: 1000, }) - that.getDetail() + this.getDetail() } }, }) @@ -89,7 +88,7 @@ Page({ }) } else { - that.setData({ + this.setData({ LNG: '', LAT: '', }) @@ -97,18 +96,16 @@ Page({ } }, getFuzzyLocation() { - const that = this wx.getFuzzyLocation({ - success(res) { - console.log(res) - that.setData({ + success: (res) => { + this.setData({ LNG: res.longitude, LAT: res.latitude, }) - that.getDetail() + this.getDetail() }, - fail() { - that.getDetail() + fail: () => { + this.getDetail() }, }) }, @@ -201,3 +198,5 @@ Page({ }, onPageScroll() {}, }) + +export {} diff --git a/src/patient/pages/hospital/index.wxml b/src/patient/pages/hospital/index.wxml index 6da0fe7..478727f 100644 --- a/src/patient/pages/hospital/index.wxml +++ b/src/patient/pages/hospital/index.wxml @@ -31,9 +31,9 @@ 电话 - + - 地址{{detail.dist}} + 地址 {{detail.dist}} @@ -52,7 +52,7 @@ {{item.Name}} - + {{item.Introduce}} diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index f131725..03258e1 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -21,7 +21,6 @@ page { background: linear-gradient(195deg, #ffe3fc 0%, #ecddff 100%); .container { display: flex; - align-items: center; justify-content: space-between; border-radius: 21rpx; .avatar { @@ -79,19 +78,19 @@ page { } } } + } + .content { + margin-top: 16rpx; + font-size: 32rpx; + line-height: 38rpx; + color: #211d2e; .icon { - margin-left: 4rpx; + vertical-align: -4rpx; display: inline-block; width: 36rpx; height: 36rpx; } } - .content { - margin-top: 16rpx; - font-size: 26rpx; - line-height: 38rpx; - color: rgba(51, 51, 51, 1); - } .hostipal { margin-top: 16rpx; font-size: 28rpx; @@ -104,7 +103,7 @@ page { } .tag { display: inline-block; - padding: 4rpx 12rpx; + padding: 6rpx 12rpx 4rpx; font-size: 22rpx; line-height: 1; color: #ffffff; diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index b5c377a..3354d9a 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -22,10 +22,12 @@ {{zdUserInfo.ExclusiveDoctorName}} - - 医生给您留言了,记得查看！ + + 医生给您留言了,记得查看！ + + {{zdUserInfo.ExclusiveDoctorHospitalName}} { + this.handleToggleSite() + }) + }, + handleToggleSite() { + if (!this.data.LNG) { + wx.getSetting({ + success: (res) => { + if ( + res.authSetting['scope.userFuzzyLocation'] != undefined + && res.authSetting['scope.userFuzzyLocation'] == true + ) { + // 获取当前位置 + this.getFuzzyLocation() + } + else if (res.authSetting['scope.userFuzzyLocation'] == undefined) { + // 获取当前位置 + this.getFuzzyLocation() + } + else { + wx.showModal({ + title: '请求授权当前位置', + content: '需要获取您的地理位置，请确认授权', + confirmColor: '#8c75d0', + success: (res) => { + if (res.cancel) { + // 取消授权 + wx.showToast({ + title: '拒绝授权', + icon: 'none', + duration: 1000, + }) + this.getDetail() + } + else if (res.confirm) { + // 确定授权，通过wx.openSetting发起授权请求 + wx.openSetting({ + success: (res) => { + if (res.authSetting['scope.userFuzzyLocation'] == true) { + wx.showToast({ + title: '授权成功', + icon: 'success', + duration: 1000, + }) + // 再次授权，调用wx.getLocation的API + this.getFuzzyLocation() + } + else { + wx.showToast({ + title: '授权失败', + icon: 'none', + duration: 1000, + }) + this.getDetail() + } + }, + }) + } + }, + }) + } + }, + }) + } + else { + this.setData({ + LNG: '', + LAT: '', + }) this.getDetail() + } + }, + getFuzzyLocation() { + wx.getFuzzyLocation({ + success: (res) => { + this.setData({ + LNG: res.longitude, + LAT: res.latitude, + }) + this.getDetail() + }, + fail: () => { + this.getDetail() + }, }) }, - getDetail() { wx.ajax({ method: 'GET', url: '?r=xd/infusion-center/detail', data: { Id: this.data.id, + lng: this.data.LNG, + lat: this.data.LAT, }, }).then((res) => { this.setData({ diff --git a/src/patient/pages/interactivePatient/index.scss b/src/patient/pages/interactivePatient/index.scss index 5202b87..6e41925 100644 --- a/src/patient/pages/interactivePatient/index.scss +++ b/src/patient/pages/interactivePatient/index.scss @@ -13,7 +13,6 @@ page { margin: 0 30rpx; padding: 30rpx; display: flex; - align-items: center; justify-content: space-between; border-radius: 24rpx; background-color: #fff; @@ -32,8 +31,11 @@ page { } .content { margin-top: 8rpx; - font-size: 28rpx; - color: rgba(173, 172, 178, 1); + .c-name { + font-size: 28rpx; + color: rgba(173, 172, 178, 1); + margin-right: 10rpx; + } .tag { display: inline-block; font-size: 24rpx; @@ -463,7 +465,7 @@ page { } } .status { - margin-bottom: 32rpx; + margin: 0 0 32rpx; text-align: center; font-size: 28rpx; color: #adacb2; @@ -480,7 +482,7 @@ page { border-radius: 24rpx 24rpx 0 0; background-color: #fff; transition: all 0.3s; - height: calc(124rpx + env(safe-area-inset-bottom)); + height: 184rpx; box-sizing: border-box; .unread { position: absolute; @@ -513,14 +515,20 @@ page { align-items: center; justify-content: space-between; .custom-input { + flex-shrink: 0; + width: 424rpx; + box-sizing: border-box; text-indent: 40rpx; - flex: 1; + padding-right: 40rpx; height: 72rpx; background: #f6f8f9; line-height: 72rpx; border-radius: 98rpx; font-size: 32rpx; color: #adacb2; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; &.active { color: #211d2e; overflow: hidden; @@ -529,6 +537,7 @@ page { } } .shortcut { + flex: 1; width: 244rpx; height: 72rpx; background: #ffffff; @@ -632,8 +641,8 @@ page { transition: all 0.3s; .icon { position: relative; - width: 36rpx; - height: 36rpx; + width: 44rpx; + height: 44rpx; overflow: visible; &::after { content: ''; @@ -659,6 +668,7 @@ page { box-sizing: border-box; padding-bottom: 80rpx; background-color: transparent; + font-size: 32rpx; .ka-container { padding: 30rpx 62rpx; display: flex; @@ -668,6 +678,9 @@ page { .stat { font-size: 28rpx; color: #adacb2; + &.red { + color: #ef3939; + } } .send-btn { width: 128rpx; diff --git a/src/patient/pages/interactivePatient/index.ts b/src/patient/pages/interactivePatient/index.ts index ef39be9..66b2942 100644 --- a/src/patient/pages/interactivePatient/index.ts +++ b/src/patient/pages/interactivePatient/index.ts @@ -369,6 +369,8 @@ Page({ data: { text: customMessage, }, + loading: true, + loadingText: '发送中...', }).then((res) => { if (res.errcode == 10001) { this.setData({ diff --git a/src/patient/pages/interactivePatient/index.wxml b/src/patient/pages/interactivePatient/index.wxml index f4e70c8..5d42e7e 100644 --- a/src/patient/pages/interactivePatient/index.wxml +++ b/src/patient/pages/interactivePatient/index.wxml @@ -13,7 +13,7 @@ {{doctorDetail.doctorName}} - {{doctorDetail.hospitalName}} +
{{doctorDetail.hospitalName}}
{{doctorDetail.hospitalClassificationName}}{{doctorDetail.hospitalLevelName}} @@ -171,10 +171,12 @@ - 输入您的问题 + + {{customMessage || '输入您的问题'}} + - 快捷提问 + {{doctorDetail.isOpenOneToOne == 1 ? '快捷提问':'请选择您要咨询的问题'}} @@ -237,7 +239,7 @@ > - {{customMessage.length}}/500 + {{customMessage.length}}/500 发送 diff --git a/src/patient/pages/liveResult/index.wxml b/src/patient/pages/liveResult/index.wxml index f2b3f50..dcac9ae 100644 --- a/src/patient/pages/liveResult/index.wxml +++ b/src/patient/pages/liveResult/index.wxml @@ -17,7 +17,7 @@ 立即进入直播间 - + 关注公众号，活动提醒不错过 diff --git a/src/utils/request.ts b/src/utils/request.ts index 816f481..429c6d0 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -2,14 +2,21 @@ interface IGlobalParams { gUrl: string } -export const request = function ( - { gUrl }: IGlobalParams, - { url, method, data, header, showMsg = true, loading = false, isJSON = false, ...options }: IAgaxParams, -): Promise { +export function request({ gUrl }: IGlobalParams, { + url, + method, + data, + header, + showMsg = true, + loading = false, + loadingText = '加载中...', + isJSON = false, + ...options +}: IAgaxParams): Promise { return new Promise((resolve, reject) => { if (loading) { wx.showLoading({ - title: '加载中...', + title: loadingText, mask: true, }) } @@ -29,9 +36,11 @@ export const request = function ( const { code, data } = res.data if (isJSON) { resolve(res.data) - } else if (code === 0) { + } + else if (code === 0) { resolve(data) - } else if (showMsg) { + } + else if (showMsg) { const msg = errPicker(res.data) if (loading) { setTimeout(() => { @@ -40,14 +49,16 @@ export const request = function ( icon: 'none', }) }, 30) - } else { + } + else { wx.showToast({ title: msg, icon: 'none', }) reject(res) } - } else { + } + else { reject(res) } }, diff --git a/typings/index.d.ts b/typings/index.d.ts index 856a3c1..f937be3 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -52,6 +52,7 @@ interface IAppOption { interface IAgaxParams extends WechatMiniprogram.RequestOption { showMsg?: boolean loading?: boolean + loadingText?: string isJSON?: boolean }