From 1ca08bbe557c47bcaafce10d8b205af2874a6bcf Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 16 Mar 2024 21:14:28 +0800 Subject: [PATCH] 1 --- addons/shopro/controller/Category.php | 28 ++++++++++++++++++ addons/shopro/controller/order/Order.php | 3 ++ application/admin/controller/Epay.php | 0 application/common.php | 4 +++ public/assets/addons/epay/css/common.css | 0 public/assets/addons/epay/images/alipay.png | Bin public/assets/addons/epay/images/expired.png | Bin .../assets/addons/epay/images/logo-alipay.png | Bin .../assets/addons/epay/images/logo-wechat.png | Bin public/assets/addons/epay/images/paid.png | Bin public/assets/addons/epay/images/scan.png | Bin .../addons/epay/images/screenshot-alipay.png | Bin .../addons/epay/images/screenshot-wechat.png | Bin public/assets/addons/epay/images/wechat.png | Bin public/assets/addons/epay/js/common.js | 0 .../addons/epay/js/jquery.qrcode.min.js | 0 public/assets/addons/epay/less/common.less | 0 .../addons/shopro/uniapp/order/all_order.png | Bin 710 -> 1533 bytes .../addons/shopro/uniapp/order/all_order1.png | Bin 0 -> 710 bytes .../addons/shopro/uniapp/order/completed.png | Bin 0 -> 1477 bytes .../addons/shopro/uniapp/order/no_pay.png | Bin 1067 -> 2945 bytes .../addons/shopro/uniapp/order/no_pay1.png | Bin 0 -> 1067 bytes .../addons/shopro/uniapp/order/no_sumbit.png | Bin 0 -> 2548 bytes .../addons/shopro/uniapp/order/no_take.png | Bin 1242 -> 1862 bytes .../addons/shopro/uniapp/order/no_take1.png | Bin 0 -> 1242 bytes 25 files changed, 35 insertions(+) mode change 100755 => 100644 application/admin/controller/Epay.php mode change 100755 => 100644 public/assets/addons/epay/css/common.css mode change 100755 => 100644 public/assets/addons/epay/images/alipay.png mode change 100755 => 100644 public/assets/addons/epay/images/expired.png mode change 100755 => 100644 public/assets/addons/epay/images/logo-alipay.png mode change 100755 => 100644 public/assets/addons/epay/images/logo-wechat.png mode change 100755 => 100644 public/assets/addons/epay/images/paid.png mode change 100755 => 100644 public/assets/addons/epay/images/scan.png mode change 100755 => 100644 public/assets/addons/epay/images/screenshot-alipay.png mode change 100755 => 100644 public/assets/addons/epay/images/screenshot-wechat.png mode change 100755 => 100644 public/assets/addons/epay/images/wechat.png mode change 100755 => 100644 public/assets/addons/epay/js/common.js mode change 100755 => 100644 public/assets/addons/epay/js/jquery.qrcode.min.js mode change 100755 => 100644 public/assets/addons/epay/less/common.less create mode 100755 public/assets/addons/shopro/uniapp/order/all_order1.png create mode 100755 public/assets/addons/shopro/uniapp/order/completed.png create mode 100755 public/assets/addons/shopro/uniapp/order/no_pay1.png create mode 100755 public/assets/addons/shopro/uniapp/order/no_sumbit.png create mode 100755 public/assets/addons/shopro/uniapp/order/no_take1.png diff --git a/addons/shopro/controller/Category.php b/addons/shopro/controller/Category.php index e581b18..677d6e9 100755 --- a/addons/shopro/controller/Category.php +++ b/addons/shopro/controller/Category.php @@ -3,6 +3,7 @@ namespace addons\shopro\controller; use app\admin\model\shopro\Category as CategoryModel; +use app\admin\model\shopro\goods\Goods; class Category extends Common { @@ -28,4 +29,31 @@ class Category extends Common $this->success('商城分类', $categories); } + + /** + * 商城列表 + * @return + */ + public function goodsList() { + $category = CategoryModel::where('parent_id', 0)->normal()->order('weigh', 'desc')->order('id', 'desc')->select(); + $category_ids = []; + foreach ($category as $item) { + $categories = CategoryModel::where('parent_id', $item['id'])->column('id'); + $category_ids = array_merge($category_ids, $categories); + } + $category = CategoryModel::where('id', 'in', $category_ids)->normal()->order('weigh', 'desc')->order('id', 'desc')->select(); + + foreach ($category as &$row) { + $row['image'] = formatImage($row['image']); + $row['goods_list'] = Goods::where('category_ids', 'in', $row['id'])->show()->select(); + foreach ($row['goods_list'] as $v) { + $v->image = formatImage($v->image); + $v->images = array_map('formatImage', $v->images); + } + } + $this->success('商城分类', $category); + } + + + } diff --git a/addons/shopro/controller/order/Order.php b/addons/shopro/controller/order/Order.php index 3ca15ca..f48cfbb 100755 --- a/addons/shopro/controller/order/Order.php +++ b/addons/shopro/controller/order/Order.php @@ -37,6 +37,9 @@ class Order extends Common case 'nocomment': $orders = $orders->paid()->nocomment(); break; + case 'completed': + $orders = $orders->paid()->completed(); + break; } $orders = $orders->order('id', 'desc')->paginate(request()->param('list_rows', 10))->toArray(); diff --git a/application/admin/controller/Epay.php b/application/admin/controller/Epay.php old mode 100755 new mode 100644 diff --git a/application/common.php b/application/common.php index 0259248..e1c5a84 100755 --- a/application/common.php +++ b/application/common.php @@ -560,3 +560,7 @@ EOT; return $icon; } } + + function formatImage($url) { + return request()->domain().$url; +} diff --git a/public/assets/addons/epay/css/common.css b/public/assets/addons/epay/css/common.css old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/alipay.png b/public/assets/addons/epay/images/alipay.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/expired.png b/public/assets/addons/epay/images/expired.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/logo-alipay.png b/public/assets/addons/epay/images/logo-alipay.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/logo-wechat.png b/public/assets/addons/epay/images/logo-wechat.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/paid.png b/public/assets/addons/epay/images/paid.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/scan.png b/public/assets/addons/epay/images/scan.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/screenshot-alipay.png b/public/assets/addons/epay/images/screenshot-alipay.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/screenshot-wechat.png b/public/assets/addons/epay/images/screenshot-wechat.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/images/wechat.png b/public/assets/addons/epay/images/wechat.png old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/js/common.js b/public/assets/addons/epay/js/common.js old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/js/jquery.qrcode.min.js b/public/assets/addons/epay/js/jquery.qrcode.min.js old mode 100755 new mode 100644 diff --git a/public/assets/addons/epay/less/common.less b/public/assets/addons/epay/less/common.less old mode 100755 new mode 100644 diff --git a/public/assets/addons/shopro/uniapp/order/all_order.png b/public/assets/addons/shopro/uniapp/order/all_order.png index d599baa5641e6ec984c8b04a3cb07af1b4718614..c8a2edacb845ae66ded3ef4ecb20f7f5457142f1 100755 GIT binary patch literal 1533 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 literal 1067 zcmV+`1l0S9P)NklU zU1*hc9KiAK@BjSIcFxY;j@#VX^E}E?B1h_aQOPXqDhzvrGK+4!5F-YGL>7S;b)y#r z-qgJ5rXnQBM1n3P%nL89Ku9J{p{X=iLpOADXJ_Y}=l^TiJno>*Jx9Cf^YMryk?qdx zY}%0=%#Uyv9t$OYd-JohN1mhGc+Dp!rkIztwCIMjv@< zv#7b_so-F6DV*|8`@8%lSY~uI`X7elet)J1A--HPv&#QCxDZZ-Lw;YT$8VsbX+`jJ zFy;3JZNy~T0>3vn6;6hu;i0ZgEg7mMvfF}7;l=P33=7x1D16yJ5{`uv!70DDy$i!F zIN`| z&qJc_H**82(DWX(Z;xgGb(kjg5lTfQ&ojEVck6*cpf+Zf)^{9D|wUH<{ zMK;P}*h^mXsUN35nHmC1EMcpAix*@%tu`sbO%V|-+ETRn#moNq{Ob*4mRL>SC$Q z=A{;YwbrX+4y$?Z=%QcRy5DIHCcd!5RCbNg=7v`vPiLJ_#bc6-_N3UHzB%1uiAh~u zGF+X`+LWW3hs8rsq}4rQiA(XkCMOO@HNl}=r$#I_5DbD)%^(P%%uq{Q0*(m5QO)5{ zZm`7Uxw6;anDi`4HA8_5L^NY?SYjy^QvHRe54ImR!c9T~DC3x>na4=s#1hNcMCSpo zwQY;GJA@k|#(*YLEM+}Ukf4ku9vwNo>Z5%_9q*Pi%&KFUolNsSYe-N}16q`GmbhI1 zNY5effoP)`W;jwLte1^U-Q`?fDG{j~@V>Ov;ON;6yGl(WTo*Cqmk(S`efGh|V@V3s zYpD>7T57O0Vw6!TmPb>i`o!R0x$`Kq4EMpPCt@X0hfrYvB|^Ce4bI@GW)VbE?Tw<; z$f%}O5QI6bmZV9yBv+ycwTUz%87-J1N`-a5nx*nQn^i@qi7JATv!wx)3R~Epx+Kq# lG>%${IvvzQBg6c!{R8D?Yp+8~C!7EP002ovPDHLkV1mT-`V;^F diff --git a/public/assets/addons/shopro/uniapp/order/no_pay1.png b/public/assets/addons/shopro/uniapp/order/no_pay1.png new file mode 100755 index 0000000000000000000000000000000000000000..0428fb56ec93c2732e4c4e8b98ef81b5928e8ee7 GIT binary patch literal 1067 zcmV+`1l0S9P)NklU zU1*hc9KiAK@BjSIcFxY;j@#VX^E}E?B1h_aQOPXqDhzvrGK+4!5F-YGL>7S;b)y#r z-qgJ5rXnQBM1n3P%nL89Ku9J{p{X=iLpOADXJ_Y}=l^TiJno>*Jx9Cf^YMryk?qdx zY}%0=%#Uyv9t$OYd-JohN1mhGc+Dp!rkIztwCIMjv@< zv#7b_so-F6DV*|8`@8%lSY~uI`X7elet)J1A--HPv&#QCxDZZ-Lw;YT$8VsbX+`jJ zFy;3JZNy~T0>3vn6;6hu;i0ZgEg7mMvfF}7;l=P33=7x1D16yJ5{`uv!70DDy$i!F zIN`| z&qJc_H**82(DWX(Z;xgGb(kjg5lTfQ&ojEVck6*cpf+Zf)^{9D|wUH<{ zMK;P}*h^mXsUN35nHmC1EMcpAix*@%tu`sbO%V|-+ETRn#moNq{Ob*4mRL>SC$Q z=A{;YwbrX+4y$?Z=%QcRy5DIHCcd!5RCbNg=7v`vPiLJ_#bc6-_N3UHzB%1uiAh~u zGF+X`+LWW3hs8rsq}4rQiA(XkCMOO@HNl}=r$#I_5DbD)%^(P%%uq{Q0*(m5QO)5{ zZm`7Uxw6;anDi`4HA8_5L^NY?SYjy^QvHRe54ImR!c9T~DC3x>na4=s#1hNcMCSpo zwQY;GJA@k|#(*YLEM+}Ukf4ku9vwNo>Z5%_9q*Pi%&KFUolNsSYe-N}16q`GmbhI1 zNY5effoP)`W;jwLte1^U-Q`?fDG{j~@V>Ov;ON;6yGl(WTo*Cqmk(S`efGh|V@V3s zYpD>7T57O0Vw6!TmPb>i`o!R0x$`Kq4EMpPCt@X0hfrYvB|^Ce4bI@GW)VbE?Tw<; z$f%}O5QI6bmZV9yBv+ycwTUz%87-J1N`-a5nx*nQn^i@qi7JATv!wx)3R~Epx+Kq# lG>%${IvvzQBg6c!{R8D?Yp+8~C!7EP002ovPDHLkV1mT-`V;^F literal 0 HcmV?d00001 diff --git a/public/assets/addons/shopro/uniapp/order/no_sumbit.png b/public/assets/addons/shopro/uniapp/order/no_sumbit.png new file mode 100755 index 0000000000000000000000000000000000000000..1b8c6da16fcafd3c6d326f7c239f29c8419be2d5 GIT binary patch literal 2548 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 KMNUMnLSTX@mCp45 literal 0 HcmV?d00001 diff --git a/public/assets/addons/shopro/uniapp/order/no_take.png b/public/assets/addons/shopro/uniapp/order/no_take.png index f27edc08270ea3c46739ce186488f30b0bab7e3e..87dad083f51968e5c9d7592a6f8b344001e47ca8 100755 GIT binary patch literal 1862 zcmV-M2f6r(P)Px+07*naRA@u(SbvOMRT(|!zWMRqY#AsvYG9EHEr~9o*)=9gFd9=em{g;*i9do` zt3sQublc^PX=$&rZRhQ7#@bZGs)eM$A8k@iXksIh5JE(P){U@9B`y^KHLbt8?as{3 zymvqIt#6yfY`0sT3^dvM@4VbO_k7>|&N-L3L>Dhn+*knK?#eANe#tU!tu;XqbOQ)Q z>Dw&< zzG~Gfue-Z@r7`Ay0DpJR^~G`g`&I$>JTGgExlOC7q=aF3O-q1VYklAM*OA-;;Bc*0 z>$leat5v{tpTWVw<<7aIBs;?}%(n`7E(n4R07?KJs?}=St+m=NEn5Qv1J`7;*~b7} z7lvW(Lcm$6R2EmO)yqUg`)t;g%jI$az6juJBJvP`?WI!bbjwf!D3{A`Bl&XxZ=aKK zof6q>_C22GZ6Nsp0NFW!C;>$Pc>wo|$i1%@a7Izo1E2!ny#W3RVDgO)oI7^x=*na= zy8+xHB2NOix7lpI{Dy9oojZ5lV2l|g`EdZxI_G*zrP2sV6@giowKkW}=QkK*^m0BT zBHP;9D#OFW*T!)?KvHMs^GTB2)o3)Hw${42E}FHrkWQ6;01vkncoaof0oWoUw*wdx zk-o{v$tNxZS`VaiJOzGtTNxi59DJ*D?i(cU0B~AFO7(jE2!J`6R?x*_QO3u|gCGd* z6p@W0@-WHvv`Q33Wf56J@=5^D05}Su3LrC&S*(Z4iO4Mg-Vb2E7NIRY9!1gL04&y# zN3!OeOGxT$zK}rax%ATNcY%n2kPV1RsxcW6QA>NH zi2Mk^x7x+Hipxt$l6((jXJv21bktE4_k{eU$|1HTEoO7Kd-zOp+#+UB)=pgRg%w;)OV8`RLDriBC@+)ukW?i>XQU!&77%n{yC20PmYX? zjCOT($)ZJzdXgkji+Y7BVZC1eiSPRp&bgd1=EEc-5z(l2r{{UUh~s#jF(y=7n}+4n z*4ozynYC7|wVv<$pCEZ(YB9n%j-N2bH0t$whwuBJA$gC8oF@7CTCMi$(a}-%^z__F z@~0wlRjE|^Ps%Ts%fAD#T+1&aM>3g=p7>)T@;MQC)bqTJ{r&wXr^^;a(PaR>DI)8Q zF^@av4g>f|>f@gjkplqqklxHbHO3?&QZUBoz8}(7BUui^@XYjgLqkJv7Lo5b=T?$@ z#29llj^hl;l>lzjs)u3t?kV6=6n#1E&(1Vks&VQ7pe?jL2!bE<_V&)qoGh2iy74{$ zmjgJPvR@#n-)VW(#=M5{G)1Wi(u1pgURx@a)IOg}SE|C*YV{71R$ZqOklrn=uB!S_ z7={l_ZLE`{*=%Z(|Fp(`l35YCUPP9V+eZ{0>Ag2^-rTWd$r6o#nh#ErR7G!!h+2}v z`F#HAzP`TNIY#t3LUTb!M@O#FXn2`S=2q<@058XJyk`0G<MmR$pdk+xxu0Q)X`#kzD|8(pE@QQC>tA zk^DoFB=;;^w(Ms!OFf?hs0s%`pqFjCh+L;xAiY}!06u_`G(P_7e3^Gn-<`g~b{k{X z0=QK~G}`F|c#P!!v9YnI&L`0qI)KW25Cj_czM>N;9R?~mk2>e}A3Jtz=B&ubfU9yb-8>Y4)YbSX};{X5v07*qoM6N<$f;`Wa A;Q#;t literal 1242 zcmV<01SR{4P)GA2ex9nl#3=O(P|dVrsPQ zCpB#)P(di6U`nkvYG@PqqA?a|f(1i)vo8t@EN>hS%WK1%rG8Q8pL_4-=FIQT{m+@X zXEmDt+fsv<;VS%rt+Q6p`q2({ z)h1hHGnPcfY~PAeb_Z(sb$$!1d^)*1r9F89CZey!#%r|Ov!XjZMKLNy7AN0`cAjkd zZJ=}}Mc`!OO;h3uG;A#^5?y`5l**Wqg2tZFUQsHZ7dVx)5{(|@v0{{~OwNy*9yo2H zb1gJ@49+L8S(w*Cdj^)OqUXUqi)cQTcrzwp5$)-Sqg__ag1cSl67eieW9ro()a`ma zQqa)td?;)#4bTHF2$R@nZ#eQWcst-~O1I`;N1H?g>8@y`^A{pc?4N09w|%e;D_Av7 z$BsWa^Nd)~(;``*NEi1+f1Af6)(3?bV28;W_g9=)Qj~x>u-#*@#w$K7Y47K^YG%F_ z)h^9m^F)kzjllN)ZEf^9A+6^fJ$8%L(rf9ln9bdmqQSVCy_5HB_GZsVOs&GZFR5#P z$LpO3EE$#z`@#0iqi31psph+f2h&yqdl>@5LyZCS!Qbf9wvYgBp;AJmcEp7l^26U=N^Qa%&OK!D$5s$R*Ghq zu?L25kd7X9Ns4ygRNTN?C5e||-)tm0uuD4UhZN}zS!jhigX*@V)fZ-S6AE#Z_d*#I zKsol&rv4Q(EP>SsY~!wN(+|{Zd>p#)3NOGaw4wt(3klI^F@tKnx(Ict#OhevTahCrs1{bhfqQxo6;c11i98cbE39sXqLs5b;kG900Tu>(?# z0sKv{LH!cgOx5OPJdL&JWEW9CZ;+l{LMPN>o_Z2a!6`g}pO9$|xPW>57Z}E~hQPT< zNybVXg&RcphOR$J@&fn@eHe$R%M=dsW0AgdcO!k_7XEJ4 zG4H)USbxxIc#BR^ol;@Y#LSZcJ&=uqK;upB3~Ih zPH)f{@to|h@zDqIgU~^<@dh&lhoavqD@(^*bA2Dqz#+e#AlFpAwFTbeKr za`>k-{xMeQoF1@tvl1g1sM02+xChiu_SN>KnN}_CMbK2A#@`J)UU05C8xG07*qoM6N<$ Ef;&4&4gdfE diff --git a/public/assets/addons/shopro/uniapp/order/no_take1.png b/public/assets/addons/shopro/uniapp/order/no_take1.png new file mode 100755 index 0000000000000000000000000000000000000000..f27edc08270ea3c46739ce186488f30b0bab7e3e GIT binary patch literal 1242 zcmV<01SR{4P)GA2ex9nl#3=O(P|dVrsPQ zCpB#)P(di6U`nkvYG@PqqA?a|f(1i)vo8t@EN>hS%WK1%rG8Q8pL_4-=FIQT{m+@X zXEmDt+fsv<;VS%rt+Q6p`q2({ z)h1hHGnPcfY~PAeb_Z(sb$$!1d^)*1r9F89CZey!#%r|Ov!XjZMKLNy7AN0`cAjkd zZJ=}}Mc`!OO;h3uG;A#^5?y`5l**Wqg2tZFUQsHZ7dVx)5{(|@v0{{~OwNy*9yo2H zb1gJ@49+L8S(w*Cdj^)OqUXUqi)cQTcrzwp5$)-Sqg__ag1cSl67eieW9ro()a`ma zQqa)td?;)#4bTHF2$R@nZ#eQWcst-~O1I`;N1H?g>8@y`^A{pc?4N09w|%e;D_Av7 z$BsWa^Nd)~(;``*NEi1+f1Af6)(3?bV28;W_g9=)Qj~x>u-#*@#w$K7Y47K^YG%F_ z)h^9m^F)kzjllN)ZEf^9A+6^fJ$8%L(rf9ln9bdmqQSVCy_5HB_GZsVOs&GZFR5#P z$LpO3EE$#z`@#0iqi31psph+f2h&yqdl>@5LyZCS!Qbf9wvYgBp;AJmcEp7l^26U=N^Qa%&OK!D$5s$R*Ghq zu?L25kd7X9Ns4ygRNTN?C5e||-)tm0uuD4UhZN}zS!jhigX*@V)fZ-S6AE#Z_d*#I zKsol&rv4Q(EP>SsY~!wN(+|{Zd>p#)3NOGaw4wt(3klI^F@tKnx(Ict#OhevTahCrs1{bhfqQxo6;c11i98cbE39sXqLs5b;kG900Tu>(?# z0sKv{LH!cgOx5OPJdL&JWEW9CZ;+l{LMPN>o_Z2a!6`g}pO9$|xPW>57Z}E~hQPT< zNybVXg&RcphOR$J@&fn@eHe$R%M=dsW0AgdcO!k_7XEJ4 zG4H)USbxxIc#BR^ol;@Y#LSZcJ&=uqK;upB3~Ih zPH)f{@to|h@zDqIgU~^<@dh&lhoavqD@(^*bA2Dqz#+e#AlFpAwFTbeKr za`>k-{xMeQoF1@tvl1g1sM02+xChiu_SN>KnN}_CMbK2A#@`J)UU05C8xG07*qoM6N<$ Ef;&4&4gdfE literal 0 HcmV?d00001