From 985ec8f999d101d28b828baa4d2ea401b1879ade Mon Sep 17 00:00:00 2001 From: devil Date: Mon, 6 Jan 2020 21:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=91=98VIP=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/AppMiniService.php | 2 +- public/appmini/old/weixin/app.js | 17 +- public/appmini/old/weixin/app.json | 11 +- .../user-center-order-icon.png | Bin 0 -> 1824 bytes .../user-center-shouyi-icon.png | Bin 0 -> 4783 bytes .../user-center-tongji-icon.png | Bin 0 -> 2556 bytes .../user-center-tuiguang-icon.png | Bin 0 -> 2699 bytes .../coupon/index/index.js} | 0 .../coupon/index/index.json} | 0 .../coupon/index/index.wxml} | 0 .../coupon/index/index.wxss} | 0 .../coupon/user/user.js} | 0 .../coupon/user/user.json} | 0 .../coupon/user/user.wxml} | 0 .../coupon/user/user.wxss} | 0 .../membershiplevelvip/buy/buy.js} | 2 +- .../membershiplevelvip/buy/buy.json} | 0 .../membershiplevelvip/buy/buy.wxml} | 0 .../membershiplevelvip/buy/buy.wxss} | 0 .../membershiplevelvip/index/index.js} | 0 .../membershiplevelvip/index/index.json} | 0 .../membershiplevelvip/index/index.wxml} | 2 +- .../membershiplevelvip/index/index.wxss} | 0 .../plugins/membershiplevelvip/order/order.js | 410 ++++++++++++++++++ .../membershiplevelvip/order/order.json | 6 + .../membershiplevelvip/order/order.wxml | 74 ++++ .../membershiplevelvip/order/order.wxss | 60 +++ .../membershiplevelvip/user/user.js} | 13 +- .../membershiplevelvip/user/user.json} | 0 .../membershiplevelvip/user/user.wxml} | 14 +- .../membershiplevelvip/user/user.wxss} | 0 31 files changed, 585 insertions(+), 26 deletions(-) create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png rename public/appmini/old/weixin/pages/{coupon/coupon.js => plugins/coupon/index/index.js} (100%) rename public/appmini/old/weixin/pages/{coupon/coupon.json => plugins/coupon/index/index.json} (100%) rename public/appmini/old/weixin/pages/{coupon/coupon.wxml => plugins/coupon/index/index.wxml} (100%) rename public/appmini/old/weixin/pages/{coupon/coupon.wxss => plugins/coupon/index/index.wxss} (100%) rename public/appmini/old/weixin/pages/{user-coupon/user-coupon.js => plugins/coupon/user/user.js} (100%) rename public/appmini/old/weixin/pages/{user-coupon/user-coupon.json => plugins/coupon/user/user.json} (100%) rename public/appmini/old/weixin/pages/{user-coupon/user-coupon.wxml => plugins/coupon/user/user.wxml} (100%) rename public/appmini/old/weixin/pages/{user-coupon/user-coupon.wxss => plugins/coupon/user/user.wxss} (100%) rename public/appmini/old/weixin/pages/{membervip-buy/membervip-buy.js => plugins/membershiplevelvip/buy/buy.js} (98%) rename public/appmini/old/weixin/pages/{membervip-buy/membervip-buy.json => plugins/membershiplevelvip/buy/buy.json} (100%) rename public/appmini/old/weixin/pages/{membervip-buy/membervip-buy.wxml => plugins/membershiplevelvip/buy/buy.wxml} (100%) rename public/appmini/old/weixin/pages/{membervip-buy/membervip-buy.wxss => plugins/membershiplevelvip/buy/buy.wxss} (100%) rename public/appmini/old/weixin/pages/{membervip/membervip.js => plugins/membershiplevelvip/index/index.js} (100%) rename public/appmini/old/weixin/pages/{membervip/membervip.json => plugins/membershiplevelvip/index/index.json} (100%) rename public/appmini/old/weixin/pages/{membervip/membervip.wxml => plugins/membershiplevelvip/index/index.wxml} (93%) rename public/appmini/old/weixin/pages/{membervip/membervip.wxss => plugins/membershiplevelvip/index/index.wxss} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss rename public/appmini/old/weixin/pages/{user-membervip/user-membervip.js => plugins/membershiplevelvip/user/user.js} (83%) rename public/appmini/old/weixin/pages/{user-membervip/user-membervip.json => plugins/membershiplevelvip/user/user.json} (100%) rename public/appmini/old/weixin/pages/{user-membervip/user-membervip.wxml => plugins/membershiplevelvip/user/user.wxml} (86%) rename public/appmini/old/weixin/pages/{user-membervip/user-membervip.wxss => plugins/membershiplevelvip/user/user.wxss} (100%) diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php index 5068880a9..ef3231a5a 100755 --- a/application/service/AppMiniService.php +++ b/application/service/AppMiniService.php @@ -210,7 +210,7 @@ class AppMiniService if(is_array($data) && isset($data['plugins'])) { $data['plugins']['goodsSharePlugin'] = [ - 'version' => '3.2.0', + 'version' => '4.0.1', 'provider' => 'wx56c8f077de74b07c', ]; if(file_put_contents($file, JsonFormat($data)) === false) diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index ca5a8e449..77ee670da 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -29,10 +29,10 @@ App({ // tabbar页面 tabbar_pages: [ - "index", - "goods-category", - "cart", - "user", + "/pages/index/index", + "/pages/goods-category/goods-category", + "/pages/cart/cart", + "/pages/user/user", ], // 页面标题 @@ -65,6 +65,7 @@ App({ "extraction_address": "自提地址", "membervip": "会员VIP", "membervip_buy": "开通时长", + "membervip_order": "开通订单", }, // 请求地址 @@ -463,12 +464,12 @@ App({ is_tabbar_pages(url) { if (url.indexOf("?") == -1) { - var all = url.split("/"); + var value = url; } else { var temp_str = url.split("?"); - var all = temp_str[0].split("/"); + var value = temp_str[0]; } - if (all.length <= 0) + if ((value || null) == null) { return false; } @@ -476,7 +477,7 @@ App({ var temp_tabbar_pages = this.data.tabbar_pages; for (var i in temp_tabbar_pages) { - if (temp_tabbar_pages[i] == all[all.length-1]) + if (temp_tabbar_pages[i] == value) { return true; } diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index cb59c6222..9cf18dae1 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,6 +1,6 @@ { "pages": [ - "pages/user-membervip/user-membervip", + "pages/plugins/membershiplevelvip/order/order", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -27,11 +27,12 @@ "pages/user-goods-browse/user-goods-browse", "pages/user-orderaftersale/user-orderaftersale", "pages/user-orderaftersale-detail/user-orderaftersale-detail", - "pages/coupon/coupon", - "pages/user-coupon/user-coupon", "pages/extraction-address/extraction-address", - "pages/membervip/membervip", - "pages/membervip-buy/membervip-buy" + "pages/plugins/coupon/index/index", + "pages/plugins/coupon/user/user", + "pages/plugins/membershiplevelvip/index/index", + "pages/plugins/membershiplevelvip/buy/buy", + "pages/plugins/membershiplevelvip/user/user" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c48293ce441b6dd657b8ce77e86834dfed9ecd94 GIT binary patch literal 1824 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 JPDHLkV1mBn48H&X literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd44721f0eeaab69578f603656db6a123ce8cc99 GIT binary patch literal 2556 zcmV%ab-*v{t3?x^LzlGw%o4A2Yi%vpbLN z>z%(|cJ4Xn-tXs~d+*HLxkFG#TPZ+oRU1_qC?GBRC$MsZGj-Cw%D_hn@<$m2}noVE0MQQa#bQ5Ewk zZ=3QdfWJ_6>bQ1VT()on{Vz%g1tf}EK4n*~WbvWn@+bip)|_T>hf$!PMG2vRL{ZD9 ztd%QG*GSv%=Y{|~V`7X zFzyL*Ly~XK6!l+(4WodBRVoOG>HZeLCj#9t9ySWv(y(C^kg!Vmlv~%sQ>2tf>bhY3 z$tY-7gbkyBgjLFKx|?(6f@pIi7fkYoY(DjDqjKJP1tg40LETl(-3-Fq%G0zL;F;yW z5#hU;y!MSSp%joXD*1I+3wfeU$yY&`SaF)r1IF6Q-{=)1FRl&~N&yL@QiSeG*TrPV zk;kh|2=1pcR{F(8;S`WY3I)%u)&W>pahiFDQP5}GrhF0LYpYCG8kY9$M&T5YMhXQ2 zk$(XA<5fWJHVXQdzMOkM6CSJ@TlN{2xUNw+1*DNeKIe<3Gn+t9RGoTTl*A>A*3*fi z!IzRIU#m8i(w&woroHQyz(WCv0mL?)mjS9Aq#0X`f_C?)JKN`ik$@E$OIxFW#1K8m zq|bB=1{G`0GY@rFWk9|K;DM@c>lwomvlNgP0`bib@NW!D|73X>yPK~8%a^J{r=+-i zL6Ke!s*>umBESmD4gzQWo}t^Odl##O^Ll18d%`^AA={VRssq z_b(g(Bb%@$ItREC66udIyS z?Jfty@5*|$VQJqC>#k_HZnO<-US5FEk4JhNNLAAR`L*ner6|U*#(};rm8j`}$bGP(ZvJfTnx_;DBe{{G?&& zw~iHzvmS_TI*$SLW&du99ybc&&as4X)&d!RCy>A6cS~eMlrH0kD zu8@9-VQG)N7ckB$Aj7vp_yK@#3KCm_v$>eBGq(!hxS#f}?dEgRESE571;8H&5{|+1 zvzGp7tAvf~XIuj*n2sSpO8``^Ff3P#aRT5TqoDsJu86I)8<#-robx4+SW^93KK_ORrg!V%ju>*%jzQQ6TL8|QPU)8XDA ziKm0aEoJ{Sfz@E}E*9GA+**2mEbAIIRy`okHtK^%gE7Nf(Y;*=@jFMB4o|uuefX|k z@}4QQZ=-b5n3<4}H&-G?S1ku6ZP9FN(nvcn`F((3~)s<{#e{;U(%oosZ^Xe$!{(S2ieN!{_RY00hZ|?nkB?NmbQAQVH zpM<1OZ}~y|dt(Yn6F}xHcUKWn<>r^ny;~pDd>2xO38jF9Q7NE|0@8$dNth}iNvPU{ zPX(k2@scoAK$1|k37-l`6XGRds(>V+Y7;&ckS4@S!c+lCLe(aGo)JL2_qqwGEA%vW zE_jGeHqqWlrbXk_MI<_Igpdb~eEMJ{p{(nHtveYa~&9Xw}i@MvZ?)Iv?z4cN>Wr)gg@M{3q?00RbGCKq!s;Tc;Vg>K#U>3>%VvWmtNJ)-_|ux`jMZ zrlt3ZxH$my0N2O;erKSQ7@eRYy8$9P#mu2P)UZtmDCcQ0yj=&wVZs0b?{))C`mSsK zw-ny@j}#59XTD&N2QC@J+hqom1B@L2TSZAMtKKS6y{Dcetr)%)kQkyRY4U$PbxN@6 SQ!s}B00000PMq(;@y~UQwfmDK;8z% z`c|=8#R8|(B`*ZAlK?4Kt6NVa#ovR7I6~cNSaN?5TM3ZiK&F!7ksu;gty|#Mpbv}* zka9J9^t}}LMZ6rX-70c@ff$yMP4jdU&P`CbmEIBDm+XP5awe@-o zecWKfz+Slf4{%%|vgCU9Tv4*$ zYqb#{AbGvojT6pWT;*<3_T}mET1AYq{pbgh)lUM~BV6PPw*zH$t!v*=LMXL0dVx4` zVj)VWJK%kYnGvi2(RvA5tKHED#EBCN+&J+rz$_N6rohUeYZJAK8>ao}0+Q942-gAT zY1@?h5q?NoejP@fX0#a{K%6+S(0)R80`@ZqtFUBaGeoV$XL|#2;)Kban&*n}l6`rC zrC4&f7GavzwmpHEIB}S3+{@EATRfqM0?WwAo@R*|h2QoA;>3w>0_V7wr-woVXU@3$AE?1WfMJx@L=>0L7?7MEkMLEL&w%}@RGtSO z1fIZ>AB9rQi4$g4n768?Jc_V1Xa+|p-%W1hA4p#3P~bX*Ndfw79?WhfEhcHeyO=nU zVm`_=x3WoCTZSdw-i=2`4R0W8^;kOS0j>x+Jc2llLHT5Q4U4;zMbkn7$^24Hi%VGx@lKi zm4W2+HsHp(4@$Y+hGEIS>+Y*f91I7tPS2#@o*iZ_pu}V1cK8gHo20kwx`$(4Llu0?F!Rgy$MGlml4e zKO?X~oocq5p+NFF4durT>r_9-F;8A;n7=k~R1PGA(zw?YeN1M)nEl{MaTOQ}q+4$x z#o~skQ{V!+F2`aE^DYd!+~UV9m3Ze0K~X>9%Ty!HZxED)*zoP?WPitOArEWb`LQ^^D@!w z19$d<3ooN=rk^d$i}(Aj%5QtKx)EV!2%-HpnMQ%9NHGWOPw^6IRth)UGbSUy^lNN1 z)vF97ujiolc^^(zV6^2nEV+5WP~wTvqb6$vD}}IC_~b{So)4<;;1lsYm(b{yLT%<4b`a{R9POgZ(L% zKLDG7-li>Rb?eE%L{dz!_pmE_DX^Ef*uz43)7RKMDtTv}bn8?)*n$ouA%yY!IF_6r zxS{j**<8+MqXWru|Fpp(Bl&gm)kS-oJ=SWSY)@m0qlJcjafU>vw8_|6=G*CR)5NNHq1Oq2ffUdXM=XCYW53b z_IE08Mc6=E9+zqA=__Y-bNU2qGDHF!qAKctt;a{ZK zMW>j{N_|UKKZo!&;L9bBwz**L3GCdtJlzXS3EbAZ!O%O)5$cBr;@yeH)X3|{>{(;t z%;4!gPXQY^mi0`RL!KSU=@gV52xC0!hOJ<3=K{4en+vQK#HT!>Pn=p*_nPY?jyyN@|%r#&5*&FV)n9|_fgF)!h-Uw|M&qh542Go zC0;wuhp@ys4#X|-1Cmp-KgAqS(;DRsjw*dq97iC(ao^y!1`u$^12JI+`p$KWxVoq8b zDDeam&2LQA%5x8Ib3O~??uB{GNz#BWYPO64(StQJs3vloVIeDR+C#vIIz}LOC_b)}_hYUi$g{ z`;bMbWQO>a&50>D+na=<$Vw6Jqo0j*iP^~Gt0Xg|l1yv#XvWyTacIC4^Mic}igFOa zq^NETvy&LMEw}bzob2b0~002ovPDHLk FV1gtc8#Mp` literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/pages/coupon/coupon.js b/public/appmini/old/weixin/pages/plugins/coupon/index/index.js similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.js rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.js diff --git a/public/appmini/old/weixin/pages/coupon/coupon.json b/public/appmini/old/weixin/pages/plugins/coupon/index/index.json similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.json rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.json diff --git a/public/appmini/old/weixin/pages/coupon/coupon.wxml b/public/appmini/old/weixin/pages/plugins/coupon/index/index.wxml similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.wxml rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.wxml diff --git a/public/appmini/old/weixin/pages/coupon/coupon.wxss b/public/appmini/old/weixin/pages/plugins/coupon/index/index.wxss similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.wxss rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.wxss diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js b/public/appmini/old/weixin/pages/plugins/coupon/user/user.js similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.js rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.js diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.json b/public/appmini/old/weixin/pages/plugins/coupon/user/user.json similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.json rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.json diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml b/public/appmini/old/weixin/pages/plugins/coupon/user/user.wxml similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.wxml diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss b/public/appmini/old/weixin/pages/plugins/coupon/user/user.wxss similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.wxss diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js similarity index 98% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js index 66f888624..3d7511ddd 100644 --- a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js @@ -133,7 +133,7 @@ Page({ if (res.data.code == 0) { // 进入以后会员中心并发起支付 wx.redirectTo({ - url: '/pages/user-membervip/user-membervip', + url: '/pages/plugins/membershiplevelvip/user/user', }); } else { if (app.is_login_check(res.data, self, 'submit_event')) { diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxss similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxss diff --git a/public/appmini/old/weixin/pages/membervip/membervip.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js diff --git a/public/appmini/old/weixin/pages/membervip/membervip.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json diff --git a/public/appmini/old/weixin/pages/membervip/membervip.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml similarity index 93% rename from public/appmini/old/weixin/pages/membervip/membervip.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml index 0028c1225..e0894f693 100644 --- a/public/appmini/old/weixin/pages/membervip/membervip.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml @@ -4,7 +4,7 @@ {{data_base.banner_top_title}} - + diff --git a/public/appmini/old/weixin/pages/membervip/membervip.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxss similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxss diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js new file mode 100644 index 000000000..2e4acb539 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js @@ -0,0 +1,410 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + load_status: 0, + is_show_payment_popup: false, + payment_list: [], + payment_id: 0, + temp_pay_value: 0, + temp_pay_index: 0, + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待支付", value: "0" }, + { name: "已支付", value: "1" }, + { name: "已取消", value: "2" }, + { name: "已关闭", value: "3" }, + ], + nav_status_index: 0, + }, + + onLoad(params) { + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() { + wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order }); + }, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 参数 + var order_status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "order", "membershiplevelvip"), + method: "POST", + data: { + page: this.data.data_page, + status: order_status, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + + // 下订单支付处理 + if (this.data.load_status == 0) { + if ((this.data.params.is_pay || 0) == 1 && (this.data.params.order_id || 0) != 0) { + for (var i in temp_data_list) { + if (this.data.params.order_id == temp_data_list[i]['id']) { + this.pay_handle(this.data.params.order_id, i); + break; + } + } + } + } + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + load_status: 1, + payment_list: res.data.data.payment_list || [], + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + load_status: 1, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + load_status: 1, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + load_status: 1, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 支付 + pay_event(e) { + this.setData({ + is_show_payment_popup: true, + temp_pay_value: e.currentTarget.dataset.value, + temp_pay_index: e.currentTarget.dataset.index, + }); + }, + + // 支付弹窗关闭 + payment_popup_event_close(e) { + this.setData({ is_show_payment_popup: false }); + }, + + // 支付弹窗发起支付 + popup_payment_event(e) { + var payment_id = e.currentTarget.dataset.value || 0; + this.setData({ payment_id: payment_id }); + this.payment_popup_event_close(); + this.pay_handle(this.data.temp_pay_value, this.data.temp_pay_index); + }, + + // 支付方法 + pay_handle(order_id, index) { + var self = this; + // 加载loding + wx.showLoading({ title: "请求中..." }); + + wx.request({ + url: app.get_request_url("pay", "order"), + method: "POST", + data: { + id: order_id, + payment_id: this.data.payment_id, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + // 是否在线支付,非在线支付则支付成功 + if (res.data.data.is_online_pay == 0) { + // 数据设置 + self.order_item_pay_success_handle(index); + + app.showToast("支付成功", "success"); + } else { + wx.requestPayment({ + timeStamp: res.data.data.data.timeStamp, + nonceStr: res.data.data.data.nonceStr, + package: res.data.data.data.package, + signType: res.data.data.data.signType, + paySign: res.data.data.data.paySign, + success: function (res) { + // 数据设置 + self.order_item_pay_success_handle(index); + + // 跳转支付页面 + wx.navigateTo({ + url: "/pages/paytips/paytips?code=9000&total_price=" + + self.data.data_list[index]['total_price'] + }); + }, + fail: function (res) { + app.showToast('支付失败'); + } + }); + } + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + }, + + // 支付成功数据设置 + order_item_pay_success_handle(index) { + // 数据设置 + var temp_data_list = this.data.data_list; + switch (parseInt(temp_data_list[index]['order_model'])) { + // 销售模式 + case 0: + temp_data_list[index]['status'] = 2; + temp_data_list[index]['status_name'] = '待发货'; + break; + + // 自提模式 + case 2: + temp_data_list[index]['status'] = 2; + temp_data_list[index]['status_name'] = '待取货'; + break; + + // 虚拟模式 + case 3: + temp_data_list[index]['status'] = 3; + temp_data_list[index]['status_name'] = '待收货'; + break; + } + this.setData({ data_list: temp_data_list }); + }, + + // 取消 + cancel_event(e) { + wx.showModal({ + title: "温馨提示", + content: "取消后不可恢复，确定继续吗?", + confirmText: "确认", + cancelText: "不了", + success: result => { + if (result.confirm) { + // 参数 + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; + + // 加载loding + wx.showLoading({ title: "处理中..." }); + + wx.request({ + url: app.get_request_url("cancel", "order"), + method: "POST", + data: { id: id }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list[index]['status'] = 5; + temp_data_list[index]['status_name'] = '已取消'; + this.setData({ data_list: temp_data_list }); + + app.showToast(res.data.msg, "success"); + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + } + } + }); + }, + + // 收货 + collect_event(e) { + wx.showModal({ + title: "温馨提示", + content: "请确认已收到货物或已完成，操作后不可恢复，确定继续吗?", + confirmText: "确认", + cancelText: "不了", + success: result => { + if (result.confirm) { + // 参数 + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; + + // 加载loding + wx.showLoading({ title: "处理中..." }); + + wx.request({ + url: app.get_request_url("collect", "order"), + method: "POST", + data: { id: id }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list[index]['status'] = 4; + temp_data_list[index]['status_name'] = '已完成'; + this.setData({ data_list: temp_data_list }); + + app.showToast(res.data.msg, "success"); + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + } + } + }); + }, + + // 催催 + rush_event(e) { + app.showToast("催促成功", "success"); + }, + + // 导航事件 + nav_event(e) { + this.setData({ + nav_status_index: e.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, + + // 售后订单事件 + orderaftersale_event(e) { + var oid = e.currentTarget.dataset.oid || 0; + var did = e.currentTarget.dataset.did || 0; + if (oid == 0 || did == 0) { + app.showToast("参数有误"); + return false; + } + + // 进入售后页面 + wx.navigateTo({ + url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did + }); + }, + + // 订单评论 + comments_event(e) { + wx.navigateTo({ + url: "/pages/user-order-comments/user-order-comments?id=" + e.currentTarget.dataset.value + }); + }, +}); diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json new file mode 100644 index 000000000..7d179bfd5 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json @@ -0,0 +1,6 @@ +{ + "enablePullDownRefresh": true, + "usingComponents": { + "component-popup": "/components/popup/popup" + } +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml new file mode 100644 index 000000000..c7b81c87d --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml @@ -0,0 +1,74 @@ + + + + {{item.name}} + {{item.name}} + + + + + + + + + {{item.add_time_time}} + {{item.status_name}} + + + + + 开通单号 + {{item.payment_user_order_no}} + + + 开通时长 + {{item.period_value}} + {{item.period_unit}} + + + 订单金额 + {{item.price}} + 元 + + + 支付金额 + {{item.pay_price}} + 元 + + + 结算状态： + {{item.settlement_status_name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + + + + + 没有支付方式 + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss new file mode 100644 index 000000000..b394cac6a --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss @@ -0,0 +1,60 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 20%; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + +} +.data-list .item .base, +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 20rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} +.data-list .item .operation { + padding: 20rpx 10rpx; +} + +/** + * 支付方式 + */ +.payment-list { + padding: 40rpx 0; +} +.payment-list .item { + width: 50%; +} +.payment-list .item-content { + margin: 20rpx; + padding: 20rpx 10rpx; +} +.payment-list .item-content image { + width: 50rpx; + height: 50rpx !important; + vertical-align: middle; + margin-right: 10rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js similarity index 83% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js index 6972e4185..f7362d6ba 100644 --- a/public/appmini/old/weixin/pages/user-membervip/user-membervip.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js @@ -9,22 +9,27 @@ Page({ avatar: app.data.default_user_head_src, nickname: "用户名", + // 导航 nav_list: [ { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-order-icon.png", title: "开通订单", + url: "/pages/plugins/membershiplevelvip/order/order", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", title: "推广返利", + url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", title: "收益明细", + url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", title: "数据统计", + url: "/pages/plugins/membershiplevelvip/tongji/tongji", } ], }, diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json similarity index 100% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml similarity index 86% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml index f00b085a4..5e7a909ef 100644 --- a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml @@ -15,7 +15,7 @@ 会员已过期或未开通 - + @@ -29,7 +29,7 @@ - + @@ -43,10 +43,12 @@ - - - {{item.title}} - + + + + {{item.title}} + + diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss similarity index 100% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss