From 323555e5090ded692d035bb6f92cf2a550b0bc27 Mon Sep 17 00:00:00 2001 From: Kiyan Date: Thu, 4 May 2017 16:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.json | 4 ++-- app/config.js | 16 ++++++++++++++++ app/images/default-image.png | Bin 0 -> 4787 bytes app/images/default.jpg | Bin 9337 -> 0 bytes app/images/map-marker.png | Bin 695 -> 0 bytes app/images/takeout_ic_account.png | Bin 0 -> 541 bytes app/images/takeout_ic_address.png | Bin 0 -> 768 bytes app/pages/mine/mine.wxml | 2 +- app/pages/shop/show.js | 2 +- app/pages/shop/show.wxml | 2 +- app/utils/util.js | 4 ++-- 11 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 app/config.js create mode 100644 app/images/default-image.png delete mode 100644 app/images/default.jpg delete mode 100644 app/images/map-marker.png create mode 100644 app/images/takeout_ic_account.png create mode 100644 app/images/takeout_ic_address.png diff --git a/app/app.json b/app/app.json index d88add6..2f7a1c2 100644 --- a/app/app.json +++ b/app/app.json @@ -1,14 +1,14 @@ { "pages": [ + "pages/mine/mine", "pages/shop/show", + "pages/index/index", "pages/order/show", "pages/order/quasi", "pages/order/list", - "pages/index/index", "pages/address/list", "pages/address/add", "pages/address/select", - "pages/mine/mine", "pages/index/address", "pages/shop/category", "pages/shop/search" diff --git a/app/config.js b/app/config.js new file mode 100644 index 0000000..54074d0 --- /dev/null +++ b/app/config.js @@ -0,0 +1,16 @@ +/** + * 小程序配置文件 + */ + +var host = "apitest.ipaotui.com" +// var host = "api.ipaotui.com" +const debug = wx.getStorageSync('debug') +if (debug) { + host = "apitest.ipaotui.com" +} + + +module.exports = { + host, + qqmapKey: 'FPOBZ-UT2K2-ZFYUC-CX67E-IOOYS-7XFQ6' +} diff --git a/app/images/default-image.png b/app/images/default-image.png new file mode 100644 index 0000000000000000000000000000000000000000..c4f976e2b890a33912cd2e9a1dc6e3e247ff1584 GIT binary patch literal 4787 zcmaJ_2{@E%`yb1Q5RyU%)5wx##@G#G9b`?C!B}Qu?99YqC`+~?60%2@gsf>~XPiRR zWH*hqY>6yca!T@_&UZTB|GK{KeDC$V@3UOL-|xQf=f1D!eXlpc%F>wosPIt$0Kjc> z9%;?!3xD41%#0^%^=25O6CxVg5ijB0i6Phk96-+ve+36J@xyxHtZ`Vk(5rnoEdYS! zjF*ia(aypg?uz$=V1HsDBtHU!4FG8AkO){;9~=>M1?S=Aj{tA9c7j1(ZU`_+#X`Y? zV1V=VIv*B*yA)<=;~M7Us^JFK(FSRe;0ysj91#m5`T6<>!bu45pSp0y_~$Yd4Ehs7 z^g)3C<&>R;703V|fCH&ORODS1V9Fph4G2sHrmPN=11T!Nl%NVqP?(ZDOcAc20f(u8 z{<^>nYXNTVaBHN|U$z)C1lW^EB*3B2kdP2ah!O-J-~okcXlOtc6rqZW@(hH0V5mP4 zOOp2w6#u1w#09zrcoB$Rcz@7OMeG%P5D@`pc>1pp{0M)``Un2CO^gkLlCT6Q45IKe zq+dV_i~kMv^ZOeeNVLZN+u#2x9B30tz(K8Xf%u>RS4QI8#ebS2zzqU$SRy{a29Njs zwTo7scp^T~6Hfpc7=WZvUjAYOjKl?a z1>@X|0`PvIKO=^F{i82xhX1Jd7uW3{eNi*|M=q4%4D@GS|6iVeEisDc=kV{UWla9A zdz?R`*aH|<9W1@f0|4+yn;`XUNE4s(eNg<=<8i%weC)gs;SI>aVWg?ut+RJA%#vrK zH$q=KSBzNNu%>-1D5&AFf1mqtrak2HZt1rnTCK}dx6cj*Eg+`*a{ti)mYM(208(ZE zsmg-t7t?LVDWV^DJ1ah#DRl&<90t=mO#!p~&HBciI&u$kBR(uG^+dP{wmy20dmz&3 zt%vrDs;-Tr&-bPE|h52y0K$-9CpspZwm6<7X?sDX^4)?KxXtv&o(E{!8{?%{a;InNlEop$| zQ%Q3I=`G%CkCiXR1rp&+%q$j7ZEdj)@7}L$>jYT7Jjl-VY=83PNpmyZQ&~4R@^|CS zl0@rfQ$S@_k(`s3Xv&corlvba;&2g+TtQgjmMa)yGcz$UL8mj}JNhuDT+THdhP((J zozAAF!rpFF$u4sGm))@5EHF#C+$kQ zZwKi!vy{Axl|a$4Qy8;YO4^>5N7;y84$$vw3|F?0+rR^z*~!WD{n}WaW5SqFM_s?h zNiC`Aqb;Hjj7?5;(OzXi6MkQ+(0Y(B6?OPhP(tA#;&5RB`6*R$UnCH~RikB6ITlUr zA0$}<->askZM{RA)8z*X^7DsWDl04Bb7>ZE%cZ2GByh~Mg+9+pY~iLAlG=`gLQ0=M z(210Mn8pGzw~FN*aBX+y+57xu4Go3@uM`JZ9poH&=@j*S=Oh30hvL%{(hCAkXFN2u zv|{@)zbz@Bw*$mT2OMdM>55wC)G=B-qqq0&9pGVdhhDe+3?LYh`B8Lv*gh*O3yge6 zZ+7ky40pG(l;r0g{6uTGo6GFz*=#*oQc_}Ch<;$BR5G~3 z2wGZc+16JzGP9QFrUA17wUxeEtwN#u9sn{l5s02hUe(x_z7A?kvN;}7-@3aSB#(Nz?-~E_4!|c=_
  • fvYD@dL^wBQ?T>p(!zbM3&pKSa=}^$^ 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 literal 0 HcmV?d00001 diff --git a/app/images/default.jpg b/app/images/default.jpg deleted file mode 100644 index e643e05f72cfb567bfff91c8d52016cc8085c645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9337 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 UO8 diff --git a/app/images/map-marker.png b/app/images/map-marker.png deleted file mode 100644 index 778231e5eb0217ee355d260e341bf352e9a84312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 695 zcmV;o0!aOdP)3_dN(C)f zrK<^K>rhA*t5ZVZ>5vnM(&m20d(J(j%?o!)zI@;FoSfX;n@H14^MA+1YzC}J`XK4O zq*s#O_@}-}`Y!3Sq=s|uYi{vzXb0>8ZR~0L*F;^w$G|TF%>eL+X#$J6;5UF?3HVWZ zz(&>ZHJ~2>ew02?s|tPz=thJer3);jhIf?P^F?Wr@`KIr%#k{KAxuHGKugkcvK1Pp z?VNjSEq)RJzZL-hNz$gI7yj7vk6E(pXT=S0Y}^7z6M7sOdmN__xG)TE82U5}eJ-qA z<}D=YwV~!?q#DaCNdX^X;8xOHLD{@>?yjKEoTS@=K6lQ!c?(y_JMc81wrtF^LIiq- znsQpQAxXzW`zZ)2V4#`7+$eH_eafm`W&ThYJfx5-Y&X82k;elA9}3q7MA@hxs1&uL`ga?C0i~ dW}1IFzX13bnbHME!Epcp002ovPDHLkV1jJ%FEIcB diff --git a/app/images/takeout_ic_account.png b/app/images/takeout_ic_account.png new file mode 100644 index 0000000000000000000000000000000000000000..061d7eeedcb0e5bc2d098359fcd8dfccf350ffc2 GIT binary patch literal 541 zcmV+&0^6G-5PSG&cSL z3^96!oK3D9h&wxr6erP{d(Tg2@7z28mbQ02saC6np;hP@x`sZWSLmE;c@^W;&nt8p z>OfyqAG)IYVqL|o7=vLFf+{o}K}V3S)?G0+_ePAZ$QVCh2YLy`J)BIOv17O|FcNd( z_+lEh5EGvzrv+vq-9n#G!YfqdCzyLTt>C65uJbQ$=t6}@gB}|?;1ed<24I^Wr#j#+ z?`X&X9HK{82RwvYexbsrr5cS6_(fG_0N{=;xD5>gIO@LcQO~Wo=60P-8%SIgi^L~d!)nG_eO~>NC$FX=Q#^Qm|SQO?(=*{&I7*g^fpkmg7cnCzHGW00Sf726l zqJHPG`Y#`ZVVe(wEcBn1ALh?l?zKg{$}M^Z^PAO$!5Ng%sOk)Joc#Kv?>!0HWP)m$ zTae}B9$U;E(5vZ&yAzxWeuh#342cxI#+5!1jEw>V-l3!^RQM+8sk{q6z^vXLH%mc5 z1-wM>o>T44Mp+b+H3P6E3a&f`t0pe)X*y`AfTzh&tcY6JC9+%!AL10t|URhu80JMSzPz!RTmY=m! zWAxHnmnsMhir}Xepe4r7ShNC(M=?5HxJ!1{8y9X`cvq zbka*aH+uzvFb`g{u{*+e8E6M%Ty|juv`H(T{EazXV?i;CDD^ugB z53;^r3t~3a8HYg|Yqvc%XCJlgj@oI~I<+9rD5`fDjIh?^5u}mYF-NVQwWnH;35u#6 z2IgSPdj!du$JJ4*W^F8L(BpfR^-EfijT8+lr|RqjO%B1uU}w1ljUJ=atSfiKn@9LW zgwa7TsT}c>N{I8+4Eelk3KTzAmfyVeUV`7?o9Mv><)ya>yrK7QpCI$WBQ|t}8jj(0 zou2pO%p>c;A2#j?5W=kT53nZggm#h5FTj!%Ay$A7+P*6nM4pC+H0VtjLdJuBdfb(t zJ?ZeglCwkPv{t6S*P6o3)Wun*Eb9_H>j17azoH7Ckzi; zVS1Ds;Vo*u%W7tI_ieGp0r|q*tas5pGi!itnO(y9h1;zG>M=OL)iPI*w_t6i{|&Ih ythU}sHvO(QZe~HObLJFy&s8|0ofDY_3C(|ft`vN|y`0$q0000{~hj literal 0 HcmV?d00001 diff --git a/app/pages/mine/mine.wxml b/app/pages/mine/mine.wxml index f837ef0..fc54ec1 100644 --- a/app/pages/mine/mine.wxml +++ b/app/pages/mine/mine.wxml @@ -2,7 +2,7 @@ - + 未登录 diff --git a/app/pages/shop/show.js b/app/pages/shop/show.js index c28a839..251bc4f 100644 --- a/app/pages/shop/show.js +++ b/app/pages/shop/show.js @@ -14,7 +14,7 @@ var initOrder = { Page({ data: { tabs: ["商品", "评价", "商家"], - activeIndex: 2, + activeIndex: 1, activeMenuIndex: 0, showCart: false, diff --git a/app/pages/shop/show.wxml b/app/pages/shop/show.wxml index c59863d..1585329 100644 --- a/app/pages/shop/show.wxml +++ b/app/pages/shop/show.wxml @@ -115,7 +115,7 @@ - + diff --git a/app/utils/util.js b/app/utils/util.js index fa32f08..b57f9bd 100644 --- a/app/utils/util.js +++ b/app/utils/util.js @@ -2,10 +2,10 @@ import timeago from './timeago.min' import QQMapWX from './qqmap-wx-jssdk.min' import { gcj02tobd09 } from './coordtransform' -// import { host } from '../config' +import { host, qqmapKey } from '../config' const qqmap = new QQMapWX({ - key: 'FPOBZ-UT2K2-ZFYUC-CX67E-IOOYS-7XFQ6' + key: qqmapKey }); function resolveAdInfo(adInfo) {