From 62db07a644f39245c59d9555e3e33683b31a9ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=87?= <hbycchenxiao@163.com>
Date: Thu, 20 Mar 2025 11:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=80=E5=90=AF=E5=95=86=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                          |   1 +
 app.json                             |   6 ++++
 assets/icon/help/qrcode.png          | Bin 0 -> 1526 bytes
 assets/icon/my/partner-community.png | Bin 1538 -> 1217 bytes
 assets/icon/shop/phone-black.png     | Bin 0 -> 1007 bytes
 components/modalView/index.js        |   1 +
 components/modalView/index.wxml      |   4 +--
 components/navbar/index.wxss         |   1 +
 components/shopItem/index.wxml       |   4 +--
 components/shopItem/index.wxss       |  11 +++---
 pages/login/login.wxss               |   1 +
 pages/my/index/index.js              |  18 ++++++++--
 pages/my/index/index.json            |   4 ++-
 pages/my/index/index.wxml            |  12 ++++---
 pages/my/index/index.wxss            |  34 ++++++++++++------
 pages/order/index/index.wxml         |   4 +--
 pages/shop/detail/index.js           |  13 +++++++
 pages/shop/detail/index.json         |   3 +-
 pages/shop/detail/index.wxml         |  16 ++++-----
 pages/shop/detail/index.wxss         |  14 ++++----
 pages/shop/index/index.wxml          |  52 ++++++++++++++-------------
 pages/shop/index/index.wxss          |   8 ++---
 22 files changed, 134 insertions(+), 73 deletions(-)
 create mode 100644 assets/icon/help/qrcode.png
 create mode 100644 assets/icon/shop/phone-black.png

diff --git a/api/user.js b/api/user.js
index cffeb5d..a5ca471 100644
--- a/api/user.js
+++ b/api/user.js
@@ -4,6 +4,7 @@ export default {
   genderKV:{
     MALE:'先生',FEMALE:'女士'
   },
+  shareQRCode:()=>request.get('/api/user/qr_code'),
   getPhoneByCode(code){
     return request.post('/api/user/send-code',{})
   },
diff --git a/app.json b/app.json
index c2546f8..7b62031 100644
--- a/app.json
+++ b/app.json
@@ -45,6 +45,12 @@
         "iconPath": "assets/icon/tabs/tab1.png",
         "selectedIconPath": "assets/icon/tabs/tab1-active.png"
       },
+      {
+        "pagePath": "pages/shop/index/index",
+        "text": "商家",
+        "iconPath": "assets/icon/tabs/tab2.png",
+        "selectedIconPath": "assets/icon/tabs/tab2-active.png"
+      },
       {
         "pagePath": "pages/order/index/index",
         "text": "订单",
diff --git a/assets/icon/help/qrcode.png b/assets/icon/help/qrcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7e50964e082ad38770ce9ee797aee7806fadb62
GIT binary patch
literal 1526
zcmV<S1qu3zP)<h;3K|Lk000e1NJLTq002|~002}71^@s69BUB400001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZuph-kQRCt{2on3O`I1tCXWvH6B@eNk7O%;#q36`8-
zGdCb7*vSbpoFLf~kQ+>Lg0LqT@|G%sOM3(6ErpSKA7Z8`A{pc~;AHiCl(5zLgT7kb
z3P2zb2m}HR0bLbRN*P7b6#&Esv<CnHh-hMr87igbwt6XLEQGj1M0r@t003Yvgcwez
z(}}IJWh?A-Iz6rR4<g#HX>R&Lh!_CQZIw|JeJ7&+vFy`Y_obA-E2Y$Cov=M%jJe#q
zRofXzDPQ#tDP>GV{Ug}3PAr75YGf4@j?m3*v|6p+W?8%4mPat<6|UjNC1_(IqDFk#
zE`p%USSO_l6e5n9ZHS5J%;)p23PijG0PD)2F6DSFcm2GVpolo0&1Tk_w=P+h^?d|I
zMCF>@+wJzn<Kv^^vJC(rP16w(4R-zfyX*2zCkV<+5R{o9C^JD&W_*`Tm8={pYqPdO
z#Nli<yWwo7E@_$$i0Bf^We_5cg%B4mM@JplexaRCrzeE?v9Sb_L^Mj0<QrEzbt#uW
zBUoEg5>a1keJ`by&IdhV6Vw<}<?6f4vaHY5mM`U6ci^aYIy&mWCMXfTa%8MyjH#^O
zCp)ywW*g_Ev~7?58)I9(Y_pBcKfo!d+EV{7V_RMzV&$Z>t=<PtLI19(Q^uGZ#<ske
z&1Sby@r5H|mF-@z37Y5mH2_>&s+2M2)O9{|D55C(0(MW-@agGk%+(I-IyBGoi!96T
zj4^!x_>71TO<99Zr_+g)@<a$RfS2+7r!nTnb}sZ5SOo<DD8KD7_j@@gdx@<Vu@SbO
z%mhK134$^c1ZBo|Qi{9XuH-bJC<?asEtgB#?RL3d2LJ#?QF!g5yaXkpv&CZJb3%Dg
zj4}6%#p0+ogf7oa5R{ol3)*V6)MnXoxny%>yb<eG+A1g!slA%A8xvd5Lb=;{Rel8S
zY=u@q^E^KXfFUr4wRoVSC~`)q2qDhlc(wrmT)TV}&Io3JmsrepyDe=2TDI=!gVs7;
zy_bk$M4STvAmV(NL$j4_Yu@<z>Kz>REtgBVvJFZHG$N|yaydD+=PVEi1U@QTC#6=a
z)gvNV7X2FdxdwdzfVKC75Mojkh1zA{mr}-`K7ER{)^QX?Z<;7vaiuE_0ABv)ZSkj0
zL6amI0l=WXiEm<VjIpMz005+EdRB(iu$-rtfyAedwl)K9=Kye%=lO;0^VW4}89Fnt
z)g6df2=U!kQKr?5fH641lNbQLCQ0(uR%sO!5&zh$NxRXr<tar`)Q1M7{UG9>w(_R$
z<!!&hql;NZqXm7B1VNecO{=+Wx7*g)tu94T^oYnh0li0j&y?oec|ci~NuR9ZsywA8
z5V|}wK~QFbpv(k8nPHE<E3en+!^`$@%o%&RFNi31B~|#Qld}q%B*~T5`qv)U7;~8<
z$tvJhakj-w&lq#>`HZp^vI$x`RBR3dDTKHOfD^8^TsZROW$7N2`)(hA_ZRwCMV(C3
zbg=JeW>>y^nL#(&XWJ`SCZ#ffta7YbcOrjeSOk53e%{4f{+Xk#D!6xXbzl*+Jg%rb
zOBX^|BP~7}Y-4B?Mdw=Ud$4!?>timTgb)+0^^p0syI<8-hv{@W>2x}$#+a)z?=vnN
zz033b8&^AZZG$a6hzr(rXlc0hu<QRq*m^P(1Z5@&%1jWH8Fp{ezNvGWV3uWlV~lm{
ziHMWgZ1%<R+?6rLn)Tv(&Nr>5pQb76p18)A)LYOk&Jk7dT<rUt?=MvPT&%Yz8XZ0S
z?#9sdu<s_)XhEAUo{c7_)j&}cYO}0Cc}mJw=(;7G+mTR*8(YxrA#P>Zfw>UEdhv^O
zQc_AODdou#|1rQnRSuOr&o7cB`MGP@B_b+tT-!lJ4;6MiSguH(YppNxJXgE49S8&h
cfxyxD52~kDSS=|rYybcN07*qoM6N<$f|(c1NB{r;

literal 0
HcmV?d00001

diff --git a/assets/icon/my/partner-community.png b/assets/icon/my/partner-community.png
index 34d6b0dcd22d4453a8fab58bd39cf750d5460ec9..c8ac91ef28aac6315e149b3351e63aa0f165f688 100644
GIT binary patch
delta 1204
zcmV;l1WWsZ48aK@iBL{Q4GJ0x0000DNk~Le0000y0000y2nGNE06P5Ha*-h)e*|ku
zL_t(&f$dw}Y7;>e{>BD25Fyb(ga~n4P*4yn_yF+<8lS-Q2^ycE%@eeJ0^<|3eFA$a
zC|D4@P|!6Og%l#&i$Vfh#*1ldvU4^&J99QE*6*&f^z3|d&Ya(kkWxzAAlzE?2Ih_b
zg#UFE=Jux3Lm&zv$AS8LsRB{-e}U2}P^ipp8~G9*^dNs90K<Lq@s+nMH-YLJM6I1W
zd6A2k9`qplUEorirYKZ^dIzGuksEPd!chqMeLYd5#_)WIr|*HH&$6va@DUybkY8SA
z*J=_96^O@s%G?>jLpY7B=L6*?M0M@TROKiD#=n#^J3UO^;PcPQu`z*#f3W=g95_4D
zA9y}QV-vX7o-N??P~CZoIJ0>>$6?v;(q!u$rJXdgfYScc_YjRO{n<EBet`*Y8jeE9
zPs>0QPOsNH5G&huGLLs4f4tF_#lyE|hnE5;4a?(Qoou;jPZm&zMQB>~yY@0C;G|*s
z;f_X_%gM-(%bFA9kZrHwe~VOc3bi(yM-`1tZA}gjoaI^*rd}@Yy>{Bn6sY(+BYc^{
zUc+(i0<7^8MPDaPMT3m6Cmesd=kw>kae34sX9S;y^GNoW2$`e6Nu)jDc;>@!`d07F
z2z$bDjdB$Ylc27RBkT!N4$8GGoJ17rgc<T_Yr>-ROk3lKlUK4%e|q{NL#gPNX;InG
zi=XbAh(c9?<sjRwS|U!Iqp~5}L*?dTO&XxnKb#%{E{Xo22ORI{@2c@+ac&we`U#cI
z7UZ|}?4hdPr7fh|Vkr#)u8s$BmjS45#iO_B&SrE`<WsqFp`z|CQ(`l}o>sL5l%A>P
zJMgzDKX{j%BNr;Ff4y_vdRhST=~^<A1vqC*MIYkH9-BC^yv<G);37N<Aiu4v*vSO>
zeO*}$Lk&C$cau(Ny0N0(Q6Z4QaoH0d1&}}AnB~u&uabsB<!=EHh3dYK0<(MXU0fMQ
zGq)pb;-D@kf_Gc#8B!Fg+<ADQJob$E?b@!*PWbEy^6RT)f3mf<GC$iiFbY*_Nn~4>
z5G&h2y<;Ul8{xAfrCCY?rb&h=Qm%|GX>-D}%$U)sXy|t#`&;BAn?AKM;iM2D8e0HW
zL~vrbuTsyrWmyc`jN)+8WN$8H0ifDav*I|$LFN%mI^ig!9Z0P`AF`JyH|go(NiS1t
zDV4D7cXd-Lf33O=%xuxvBpp?j#Ai0)1nr8I?YVwxH1+QKhTgp#2dZ&kfSH8l@vgpD
zZnA%OkqJeg9<-gjGy3<LUYZ<-ay01}VB0`U)-W{=Woo3c;QofTWTNFn!jkGjRM)a?
zDn|&*acZ)LsrhfMZN8(tQCiiVm%%tSneaTup{|H)f0-K3#E?ulet&QCw_BV+`ID5^
zFin`6!BVr@MZ<fbEy<MmF-`cKIHl|2ohKluJyCm~fO!*-IL(E_!l%%L;~voSA*wCQ
zUFC?<>a^qX{M1O2oM}ZN<ZvH256${g3xpi>jQ5$(7xC8^H||$0{|W!=_ycFQ1%k%^
SJpTXy3IG5}MNUMnLSTZJDNg?Y

delta 1527
zcmV<T1qk}V34#nEiBL{Q4GJ0x0000DNk~Le0000&0000&2nGNE0OM2u=#e2Ge+8^b
zL_t(|ob8%lQX@wU#(%O+inn!6kl7Oi9;skrpJ3qx3ny4O0dNA?6TqHe;RJTDDIRf7
zu+9nA`<4pE%7bSUJl#F+8I4V<;;)K_`D00ZqgJaW!5V9<u|^p38cMZK8>I;(2u*}H
zO!)&CQ)ei@FkH1wD<eYh*r&!jf1r($EO>p4aKn^ap6N-4@v`k(IuUxuAvI1T{&_!y
z5mU}(kLyYebJQ#e`ar@n-O>cO=uzWjS<9xj452#Um<f-OB#hI)MQAgns{@X0*7;Gn
zM`)ij;56rz9?GX|P}D9>Hfi$2KEgX-3up#poJ)(d%8aIBB6Pqp%0)oae>HW^WrtCe
ztS(J9I7NdVP$?Oe5uttBK-Z&TM4e770gl|fSfd=s9yev=W>E<d+NDW@FSxGUqrp*G
z5;F2X1MSSCF%7n@@}a6=xxoc42}33vRAHoa7&GAjabz`l&W%U$I;;Zpo-L+4W~7>y
zLr_;}nKXE7)n)gHsV6v2f8&E<5y;LgxpE#<;1wp12*ie-wCLE(TA+8p7so3m{AfwV
zZ649^?Dfh=lgt=QIdSgQ*|&(a5h1+K+!^ys&m=QOt#8Y$@vB9qjR<8cb7#1UlVXZ_
zGF)2<!AivZvXGV55q{5HCl+DWr7^F3R$N&P)bYH~xg-juiO>h{e-~KQvheB(*c64*
zL<I5#(^n}7SJ$7fwS8v4N{ye4^5Ws@8oyp1LB=bLk-HGG36&c&3c(sIhnefdBrg)$
zrAhWAYTU7GL`=DzyH*mt<Ip5C26YZ`Gum74yOFRF;mab04<?y0n3eLfwwMYuCL*N6
z7;(z%Tg&u{v=Y|Nf7~|rKJ3Tvy60G2<J7XJhoBE62v?p*t_=lYCPH=?IbNY8O!#b-
z?O?){r*?TGE&D;Qno`}&E3&S+rF}l95#9vt($s#iX6YWuOP~@WWQP&zHE5p=9xcm6
zA4u5X5j^z<sjd=MZC@kY+!+JIw3Zp)+nCiuyZBT0|7Ks~e>+ka&Z`y;rNwrntgrY<
zxRDkIW$X)KRUR>~v^CSKcN`+TLl`sV_GRTMt%rUM3*kg|xvaqKR9pqn2NEV+;RZ7w
zdeWj3AZ^awb-)#xo0Hry;i!tLn7yyDsQoXDP(C5NLHWjnOEzgT;fweEOphY%r=Aiz
z;?LwCS+`JIe>p#|={u9|ZT#vT`$!<q@boj&WpWIBAWVp9sg$o!^*PJ!d^dP2yMexE
zJ!jYOJd+M%X>mq_ZL&q%e+=RxU2dgN$|Hhbv_Pvbu>PZ(L)xc}c(csX9rD5+5zP0C
z_B)?A0nSlI2qT0`CUIM$wCGW%<7o;*jf*k~Tw#yUe?E_psYI1%`szJf{Ke>H#McLs
zLNY>uS{TVLZ)4@meo_EB;KDP(Qg}w;#nPG`<CSj+?@<zzqaqV@Ib>YQZu~hUnutJL
z7*nHDbkc1>eo#1TO!JsW+^SVHsqrzwS9#Ks<9^fJ#4GQa7r{fH+nWu`h<V97A5~%<
zLPY8ee^6t)48h)Ufyg0}IFInv2z>(^F^Fm3KbLF^7=}m|5}{q1&UzL`rALBm{2cL4
zsTRNNaqVoW%3;iQy4WLprSr1h0H6^uz|tu4+4i(p=fW7_<P9Zb14PD$?=Xx4Ik6(b
z=3I|R>y6p3Q@(%DDDb6=yz3%6M3OA3o#ro%e@)Mir_O*z5ww@|?mT=p{*WIh@`-rz
zd=+1QACJX>@?VsniSpU_Y$3uojx#YeTZ?$pZ>6>PZA|ihl21g%GYHb+42dY72-lVh
zb!uaw*^PW6-1GjZxLNZ^4?^MXSGbm4j;wkh;}r|G<YG%hs+pmb7H23&WWQQ<Bov;P
zO<3d+A2Zjc8HAURJ+7&}D6UjV0zkcD+qF+y2VCg=a>jzROH=P`<HJGO-)&!#{595C
dV~zhE{sw!U8G!r=kU{_e002ovPDHLkV1iW?+Drfd

diff --git a/assets/icon/shop/phone-black.png b/assets/icon/shop/phone-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dc43b9691e935ce169df533de4501defc4fa6d9
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001Wd001Wl1^@s6jH6LC00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZsnMp)JR9J=Wm``XNRT#j3-%K`Zqrnwi58^FaA!8bI
zQEVv*l(wLFYG!wX=ICC8B8Y;$xQ7a&2txG|FTr)2*_{*->Ph0C+JgrnhOldihYEs7
zt+4nf#trj659^w3GPBuacOpoC$M@d%_|5m`&3oU#ZT^Qyr_QOVseyDleb}<B2aGYx
zzVF`z^nl!=<#M^)<HndbRP`8O1HS`r0<ZbL9~^|79U*oi2!fA+!+`Zq^B^z<3_Fgq
zRIAlu&!DxvA(zYDZ;bJP;gInHoK@9a++q+S7X-mGs(NpSm;uYOF1W7yV2oZsh#c_f
zZb7Pg5Aa?-pHK8(X^SwqJG+cMUa!|D`zf=X9daV_OP8^>h#c*+&n<*y?%O@Y-|Ux2
z7-1V?2{2v6UN^@0{a4yzhuqlM*b1<+OWdEfZJ+Ud|L1tLnuMMZnM`IzRZCI*B66it
zsl>V&ApD&pl}ddiBG;mVR5cl&(iWj|b8~a+BJz4vkcf=W&d%N!pH`DlIRIl!Nkl#g
z>r>S`Ha0fS#i!Mz<CQ6!%|2p`xeDAJ(*2ul+moK>Eytr4aVu$2tyXV1j?(~6vGYNa
zs`|vl#Kgtb)z!b^kc(W_7LMb*4P1)oKGJA3F1oIJsJ~iGIxcGq*LBmtm%ziJlZbpU
zG&J<w{QUezKjk_uYl~W~wmv>S{+ThxCH!J=WOH+KbYx`Y^4i+kX20aR%3KTAbx(@O
zhpHNNbGd5U_N?c5-}kPzM>zo3b)Nz%z)<LfB0q}Ai{)~;Oj|MJy6zznc|}!^ipWo@
zT5%lba-mR&JjeGe2aw5R&Zz499Rv;VsWE2Ww(S*TObR#;v>$m2d|_GE%jI(UYeK5J
zeaQi2v)NO|m_@>Cjdp<s&3AhsV$3>l&T*Uz+q1ZDIe_Wu=@TNd0Hk}Fhvq}P3%t-?
zcJBI}>%`*X;*xFKr$yw49_0jhUPPX4Z|q49!1KK2WHLD^B4715m8j}Vw5?{(asb6*
z@p>YWI4vTV=<XIBMOt-hU-U%|pj0aTIyyR<6OpsPzRp?^`CLT)wd-j^L@_fn;{-wQ
zma3kl`vj~5$9&)arq$55%(b(yuux5<QcsJ>lfX50|1+f`@~ZFqx704NWUifjKA))9
z>(i<_3mgaT+BW2dWm)Gv&wHnRNe@J>MWIlzs@3W+@R(&;52@;ah<rCVIC!O4EdFs&
d9=G|=`5WfuDWNg$oO}QP002ovPDHLkV1h=(^3DJN

literal 0
HcmV?d00001

diff --git a/components/modalView/index.js b/components/modalView/index.js
index 9ec35c9..c006924 100644
--- a/components/modalView/index.js
+++ b/components/modalView/index.js
@@ -5,6 +5,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    width:String,
     titleText:{
       type:String,
       value:''
diff --git a/components/modalView/index.wxml b/components/modalView/index.wxml
index e8d0674..17e1112 100644
--- a/components/modalView/index.wxml
+++ b/components/modalView/index.wxml
@@ -2,7 +2,7 @@
 
 <page-container model:show="{{_show}}" wx:if="{{show}}" position="center" 
   class="custom-modal-view" bind:afterleave="afterLeave" 
-  custom-style="background-color:transparent;left:27px;width:calc(100vw - 54px);height:200px;{{dynamicsStyle}}">
+  custom-style="background-color:transparent;left:{{width?'calc((100vw - '+width+')/2)':'27px'}};width:{{width||'calc(100vw - 54px)'}};height:200px;{{dynamicsStyle}}">
   <view class="custom-modal-view-overlay" wx:if="{{!overlayClose}}"></view>
   <view class="modal-view-main" id="modalViewMain">
     <view class="title {{titleTextCenter?'center':''}}">
@@ -14,7 +14,7 @@
     <input wx:if="{{editable&&useInput}}" model:value="{{content}}" cursor-spacing="140px" 
         focus="{{show&&autoFocus}}" class="content-input" 
         placeholder="{{contentPlaceholder}}"/>
-    <textarea class="content-textarea {{contentMessage?'error':''}}" model:value="{{content}}" row="3" wx:elif="{{editable}}" focus="{{show&&autoFocus}}" 
+    <textarea class="content-textarea {{contentMessage?'error':''}}" model:value="{{content}}" row="3" wx:elif="{{editable}}" focus="{{show&&autoFocus}}" disable-default-padding 
       placeholder="{{contentPlaceholder}}" focus="{{contentFocus}}" animation="{{contentAnimation}}" cursor-spacing="200rpx"></textarea>
     <view class="content-text" wx:elif="{{content}}">{{content}}</view>
 
diff --git a/components/navbar/index.wxss b/components/navbar/index.wxss
index 5706c29..6cc5fad 100644
--- a/components/navbar/index.wxss
+++ b/components/navbar/index.wxss
@@ -50,6 +50,7 @@
 .nav-bar-content .share{
   width:30rpx;height:34rpx;
   padding:12rpx 28rpx;
+  vertical-align: middle;
 }
 .nav-bar-content .center{
   flex:1;
diff --git a/components/shopItem/index.wxml b/components/shopItem/index.wxml
index c8de064..0ff0de5 100644
--- a/components/shopItem/index.wxml
+++ b/components/shopItem/index.wxml
@@ -12,8 +12,8 @@
         <label class="detail">{{shop.gift_points_rate_text}}</label>
       </view>
     </view>
-    <view class="promation">
-      <view class="coupon" wx:if="{{shop.featured_product}}">
+    <view class="promation" wx:if="{{shop.featured_product}}">
+      <view class="coupon">
         <label class="tag">[{{shop.featured_product.promotion_text}}]</label>
         <label class="detail">{{shop.featured_product.product_name}}</label>
       </view>
diff --git a/components/shopItem/index.wxss b/components/shopItem/index.wxss
index a9bd0ab..a46344a 100644
--- a/components/shopItem/index.wxss
+++ b/components/shopItem/index.wxss
@@ -1,6 +1,9 @@
 .shop-item{
   display: flex;
 }
+.shop-item:first-child{
+  margin-top:0;
+}
 .shop-item .logo{
   width:180rpx;height:180rpx;
   border-radius: 18rpx;
@@ -11,12 +14,12 @@
 }
 .shop-item .line1{
   line-height: 1.4;
-  font-size:34rpx;
+  font-size:32rpx;
   font-weight: 600;
 }
 .shop-item .line2{
   line-height: 1.4;
-  font-size: 26rpx;
+  font-size: 24rpx;
   display: flex;
   color:#888888;
   margin-top:14rpx;
@@ -38,7 +41,7 @@
 }
 .shop-item .promation.buy .coupon::before{
   content: '买';
-  background-color:#ff0000;
+  background-color:#FF8C12;
 }
 .shop-item .promation .coupon::before{
   content: '券';
@@ -49,7 +52,7 @@
   color:#fff;
 }
 .shop-item .promation.buy .tag{
-  color:#ff0000;
+  color:#FF8C12;
 }
 .shop-item .promation .tag{
   font-weight: 500;
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index e30a7a1..a2ead47 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -44,4 +44,5 @@
   width:100%;
   text-align: center;
   color:#999999;
+  opacity: .1;
 }
\ No newline at end of file
diff --git a/pages/my/index/index.js b/pages/my/index/index.js
index 8c4a0ae..7fffb9f 100644
--- a/pages/my/index/index.js
+++ b/pages/my/index/index.js
@@ -1,4 +1,5 @@
 const app = getApp();
+import userApi from '../../../api/user';
 
 Page({
 
@@ -9,9 +10,12 @@ Page({
     userInfo:{},
     refresherTriggered:true,
     bgHeight:'100%',
-    appConfig:{}
-  },
+    appConfig:{},
 
+    isShowQRCode:false,
+
+    shareQRCodeUrl:''
+  },
   goToCouponList(){
     wx.navigateTo({
       url: '/pages/my/coupon/index',
@@ -50,6 +54,16 @@ Page({
   },
   shareFriend(){
     
+  },
+  showQRCode(){
+    userApi.shareQRCode().then((data)=>{
+      this.setData({
+        shareQRCodeUrl:data.url
+      })
+    })
+    this.setData({
+      isShowQRCode:true
+    })
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/my/index/index.json b/pages/my/index/index.json
index 965b8e8..5915203 100644
--- a/pages/my/index/index.json
+++ b/pages/my/index/index.json
@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "modal-view":"/components/modalView"
+  },
   "navigationStyle": "custom"
 }
\ No newline at end of file
diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml
index 74a8402..a5a177a 100644
--- a/pages/my/index/index.wxml
+++ b/pages/my/index/index.wxml
@@ -8,9 +8,7 @@
         <image class="avatar" src="{{userInfo.optimized_avatar||'/assets/icon/my/avatar.png'}}"/>
       </navigator>
       <view class="name">{{userInfo.nickname}}</view>
-      <navigator class="setting" url="/pages/my/setting/index/index">
-        <image src="/assets/icon/my/setting@2x.png" class="icon"/>
-      </navigator>
+      <image src="/assets/icon/help/qrcode.png" class="qrcode" bind:tap="showQRCode"/>
     </view>
   </view>
 
@@ -80,4 +78,10 @@
     </view>
   </view>
   <view class="scroll-view-dispatch"></view>
-</scroll-view>
\ No newline at end of file
+</scroll-view>
+
+<modal-view show="{{isShowQRCode}}" isShowCancel="{{false}}" isShowOk="{{false}}" class="modal-view-qrcode" width="256px">
+  <image class="qrcode" src="{{shareQRCodeUrl}}" show-menu-by-longpress/>
+  <view class="weui-loading"  wx:if="{{!shareQRCodeUrl}}"></view>
+  <view class="tips">邀请好友丨扫码体验</view>
+</modal-view>
\ No newline at end of file
diff --git a/pages/my/index/index.wxss b/pages/my/index/index.wxss
index a455233..927ec34 100644
--- a/pages/my/index/index.wxss
+++ b/pages/my/index/index.wxss
@@ -29,17 +29,8 @@
   flex:1;
   margin-left:30rpx;
 }
-.user-info .content .setting{
-  background: rgba(255, 255, 255, 0.9);
-  width:66rpx;height:66rpx;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  padding:18rpx 16rpx;
-  box-sizing: border-box;
-}
-.user-info .content .setting .icon{
-  width:36rpx;height:30rpx;
+.user-info .content .qrcode{
+  width:56rpx;height:56rpx;
 }
 
 .property{
@@ -99,3 +90,24 @@
 .cell.is-button:hover{
   background-color: #fff;
 }
+.modal-view-qrcode{
+  position: relative;
+}
+.modal-view-qrcode .modal-view-main{
+  padding:36rpx;
+}
+.modal-view-qrcode .qrcode{
+  width:220px;height: 220px;
+  vertical-align: middle;
+}
+.modal-view-qrcode .weui-loading{
+  position: absolute;
+  left:50%;top:44%;
+  margin-left: -0.5em;
+}
+.modal-view-qrcode .tips{
+  font-size:32rpx;
+  color: #222222;
+  text-align: center;
+  margin-top:26rpx;
+}
\ No newline at end of file
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 97600a3..6daa434 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -1,6 +1,6 @@
 <!-- <nav-bar class="nav-bar"/> -->
 
-<!-- <view class="tab-bar">
+<view class="tab-bar">
   <view class="item-container {{tabIndex==0?'current':''}}" bind:tap="changeTab" data-index="0">
     <view class="item">配送订单</view>
   </view>
@@ -10,7 +10,7 @@
   <view class="item-container {{tabIndex==2?'current':''}}" bind:tap="changeTab" data-index="2">
     <view class="item">商品订单</view>
   </view>
-</view> -->
+</view>
 <!-- <swiper  style="height:{{scrollViewHeight*2}}rpx"> -->
 
 <!--  跑腿列表   -->
diff --git a/pages/shop/detail/index.js b/pages/shop/detail/index.js
index 172b92c..6565feb 100644
--- a/pages/shop/detail/index.js
+++ b/pages/shop/detail/index.js
@@ -67,6 +67,19 @@ Page({
       });
     });
   },
+  navToMap(){
+    wx.openLocation({
+      name:this.data.detail.name,
+      address:this.data.detail.address,
+      latitude: this.data.detail.latitude,
+      longitude: this.data.detail.longitude,
+    })
+  },
+  makePhoneCall(){
+    wx.makePhoneCall({
+      phoneNumber:this.data.detail.phone,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/shop/detail/index.json b/pages/shop/detail/index.json
index 90bcbed..bb284c5 100644
--- a/pages/shop/detail/index.json
+++ b/pages/shop/detail/index.json
@@ -2,6 +2,5 @@
   "usingComponents": {
     "nav-bar":"/components/navbar",
     "merchant-order":"/components/merchantOrder"
-  },
-  "navigationStyle": "custom"
+  }
 }
\ No newline at end of file
diff --git a/pages/shop/detail/index.wxml b/pages/shop/detail/index.wxml
index 82db7a3..8b60d94 100644
--- a/pages/shop/detail/index.wxml
+++ b/pages/shop/detail/index.wxml
@@ -1,4 +1,4 @@
-<nav-bar background="#fff" share back></nav-bar>
+<!-- <nav-bar background="#fff" share back></nav-bar> -->
 <view class="page-container shop-info">
   <view class="head">
     <view class="left">
@@ -13,18 +13,18 @@
       <view class="l1">{{detail.address}}</view>
       <view class="l2" wx:if="{{detail.distance}}">距离{{detail.distance}}</view>
     </view>
-    <view class="right">
+    <view class="right" bind:tap="navToMap">
       <view class="icon-con">
         <image class="icon" src="/assets/icon/shop/location@2x.png"/>
       </view>
-      <view class="text">地图</view>
-    </view>
-    <view class="right">
-      <view class="icon-con">
-        <image class="icon" src="/assets/icon/shop/phone@2x.png"/>
-      </view>
       <view class="text">导航</view>
     </view>
+    <view class="right" bind:tap="makePhoneCall">
+      <view class="icon-con">
+        <image class="icon" src="/assets/icon/shop/phone-black.png"/>
+      </view>
+      <view class="text">电话</view>
+    </view>
   </view>
 </view>
 
diff --git a/pages/shop/detail/index.wxss b/pages/shop/detail/index.wxss
index dada3fe..2c33005 100644
--- a/pages/shop/detail/index.wxss
+++ b/pages/shop/detail/index.wxss
@@ -69,26 +69,28 @@
   text-overflow:ellipsis;
   overflow: hidden;
   margin-top:6rpx;
+  color:#555555;
 }
 .shop-info .address .l2{
-  font-size: 24rpx;
-  color: #888888;
+  font-size: 26rpx;
+  color: #222222;
   margin-top:40rpx
 }
 .shop-info .address .right{
-  font-size:22rpx;
-  color: #888888;
+  font-size:26rpx;
+  color: #555555;
   text-align: center;
   margin-left: 44rpx;
 }
 .shop-info .address .icon-con{
-  padding:8rpx;
+  padding:10rpx;
   background: rgba(153, 153, 153, 0.1);
   display: inline-block;
   border-radius: 50%;
 }
 .shop-info .address .icon{
-  width:30rpx;height:30rpx;
+  width:26rpx;height:26rpx;
+  vertical-align: middle;
 }
 .shop-info .address .right .text{
   margin-top:26rpx;
diff --git a/pages/shop/index/index.wxml b/pages/shop/index/index.wxml
index dd05a07..51ef9a6 100644
--- a/pages/shop/index/index.wxml
+++ b/pages/shop/index/index.wxml
@@ -1,26 +1,28 @@
-<nav-bar/>
-<navigator class="consume" url="/pages/my/money/index">
-  <view class="title">蜂蜜 (克)</view>
-  <view class="point">{{userInfo.points}}</view>
-  <view class="tips">取快递自动抵扣</view>
-</navigator>
-<view class="btns">
-  <button wx:for="{{categories}}" wx:key="index" class="item" size="mini" 
-    bind:tap="changeTab" data-index="{{index}}" data-cid="{{item.id}}" 
-    type="{{tabIndex==index?'primary':''}}">
-      {{item.name}}
-    </button>
-</view>
-
-<list-view class="shop-list" bind:refresh="refreshList" 
-    bind:loadMore="loadList" height="{{scrollViewHeight}}" 
-    refresher-triggered="{{pager.refreshTrigger}}" 
-    show-load-more="{{!(shopList.length==0&&pager.loadAll)}}"
-    loading="{{pager.loading}}" load-all="{{pager.loadAll}}">
-  <shop-item wx:for="{{shopList}}" shop="{{item}}" data-item="{{item}}" wx:key="index">
-    
-  </shop-item>
-  <view class="list-empty" wx:if="{{shopList.length==0&&pager.loadAll}}">
-    <view class="title">暂无该分类商铺</view>
+<view class="custom-scroll-view">
+  <view>
+    <nav-bar/>
+    <view class="consume" url="/pages/my/money/index">
+      <view class="title">蜂蜜 (克)</view>
+      <view class="point">{{userInfo.points}}</view>
+      <view class="tips">取快递自动抵扣</view>
+    </view>
+    <view class="btns">
+      <button wx:for="{{categories}}" wx:key="index" class="item" size="mini" 
+        bind:tap="changeTab" data-index="{{index}}" data-cid="{{item.id}}" 
+        type="{{tabIndex==index?'primary':''}}">
+          {{item.name}}
+        </button>
+    </view>
   </view>
-</list-view>
\ No newline at end of file
+  <list-view class="main shop-list" bind:refresh="refreshList" bind:loadMore="loadList" 
+      refresher-triggered="{{pager.refreshTrigger}}" 
+      show-load-more="{{!(shopList.length==0&&pager.loadAll)}}"
+      loading="{{pager.loading}}" load-all="{{pager.loadAll}}">
+    <shop-item wx:for="{{shopList}}" shop="{{item}}" data-item="{{item}}" wx:key="index">
+      
+    </shop-item>
+    <view class="list-empty" wx:if="{{shopList.length==0&&pager.loadAll}}">
+      <view class="title">暂无该分类商铺</view>
+    </view>
+  </list-view>
+</view>
\ No newline at end of file
diff --git a/pages/shop/index/index.wxss b/pages/shop/index/index.wxss
index 31874d7..53ceae1 100644
--- a/pages/shop/index/index.wxss
+++ b/pages/shop/index/index.wxss
@@ -4,15 +4,15 @@
   background: linear-gradient(270deg, #FFDB00 0%, #FFC300 60%);
   box-shadow: 0px 6px 6px 0px rgba(0, 0, 0, 0.06);
   margin:20rpx;
-  padding:40rpx 30rpx;
+  padding:34rpx 0 32rpx 30rpx;
   position:relative;
 }
 .consume .title{
-  font-size: 32rpx;
+  font-size: 34rpx;
 }
 .consume .point{
   font-size: 70rpx;
-  margin-top:40rpx;
+  margin-top:50rpx;
   font-weight: 600;
 }
 .consume .tips{
@@ -22,7 +22,7 @@
   background-color: var(--main-color);
   line-height: 40rpx;
   font-size: 22rpx;
-  padding:0 16rpx;
+  padding:0 12rpx 0 24rpx;
 }
 
 .btns{