From 1b42b5361ee549c06ca59f3abbc21ed8a8e0b691 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 18 Aug 2019 12:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/default/index/init.html | 24 ++++---- .../admin/view/default/payment/index.html | 2 +- .../admin/view/default/payment/save_info.html | 9 ++- application/service/ArticleService.php | 14 +++++ application/service/BrandService.php | 14 +++++ application/service/StatisticalService.php | 24 +++++--- application/tags.php | 16 +++++ config/shopxo.sql | 32 +++++----- extend/payment/Alipay.php | 5 +- extend/payment/AlipayMini.php | 5 +- extend/payment/BaiduMini.php | 15 ++++- extend/payment/CashPayment.php | 2 +- extend/payment/DeliveryPayment.php | 2 +- extend/payment/MafubaoAlipay.php | 2 +- extend/payment/MafubaoWeixin.php | 2 +- extend/payment/PayEase.php | 58 +++++------------- extend/payment/Weixin.php | 5 +- rsakeys/.gitignore | 2 + rsakeys/client.pfx | Bin 2573 -> 0 bytes rsakeys/server.cer | Bin 1073 -> 0 bytes rsakeys/test.cer | Bin 1073 -> 0 bytes 21 files changed, 145 insertions(+), 88 deletions(-) create mode 100644 rsakeys/.gitignore delete mode 100755 rsakeys/client.pfx delete mode 100755 rsakeys/server.cer delete mode 100755 rsakeys/test.cer diff --git a/application/admin/view/default/index/init.html b/application/admin/view/default/index/init.html index 24ee2394f..454db1b41 100755 --- a/application/admin/view/default/index/init.html +++ b/application/admin/view/default/index/init.html @@ -74,11 +74,11 @@ - +