From cb37f8fea208043bcf398759c8e82287fd82d6a9 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 22 Nov 2018 17:50:11 +0800 Subject: [PATCH] pay --- alipay/app.acss | 2 + alipay/app.js | 2 +- alipay/pages/buy/buy.acss | 47 ++- alipay/pages/buy/buy.axml | 28 +- alipay/pages/buy/buy.js | 120 +++---- alipay/pages/paytips/paytips.axml | 4 +- alipay/pages/paytips/paytips.js | 7 +- alipay/pages/user-order/user-order.js | 67 ++-- .../Controller/PaymentController.class.php | 4 +- .../Application/Admin/Lang/zh-cn/power.php | 2 +- .../Admin/View/Default/Payment/Index.html | 4 +- .../Admin/View/Default/Payment/SaveInfo.html | 2 +- .../Admin/View/Default/Power/Index.html | 4 +- .../Api/Controller/BuyController.class.php | 256 +------------- .../Api/Controller/OrderController.class.php | 107 +++--- service/Application/Common/Lang/zh-cn.php | 7 - .../Home/Controller/BuyController.class.php | 3 - .../Home/View/Default/Buy/Index.html | 22 -- .../Library/Payment/AlipayMini.class.php | 325 ++++++++++++++++++ .../Library/Payment/CashPayment.class.php | 2 +- .../Library/Payment/DeliveryPayment.class.php | 2 +- .../Application/Service/BuyService.class.php | 6 - .../Service/OrderService.class.php | 15 +- .../Service/ResourcesService.class.php | 26 +- service/Install/shopxo.sql | 52 +-- service/Public/Admin/Default/Css/Payment.css | 1 + service/Public/Admin/Default/Js/Order.js | 12 +- service/Public/Home/Default/Js/Buy.js | 24 +- service/core.php | 2 +- service/payment_order_alipaymini_notify.php | 21 ++ service/payment_order_alipaymini_respond.php | 21 ++ 31 files changed, 674 insertions(+), 523 deletions(-) create mode 100644 service/Application/Library/Payment/AlipayMini.class.php create mode 100644 service/payment_order_alipaymini_notify.php create mode 100644 service/payment_order_alipaymini_respond.php diff --git a/alipay/app.acss b/alipay/app.acss index 413304003..69ca242ed 100755 --- a/alipay/app.acss +++ b/alipay/app.acss @@ -53,6 +53,7 @@ textarea { .spacing { padding-top: 20rpx; } .spacing-10 { padding-top: 10rpx; } .spacing-mb { margin-bottom: 20rpx; } +.spacing-mt { margin-top: 20rpx; } /* 在线客服 */ .customer-service { @@ -77,6 +78,7 @@ textarea { /* 边框 */ +.br { border: solid 1rpx #efefef; } .br-b { border-bottom: solid 1rpx #efefef; } .br-t { border-top: solid 1rpx #efefef; } .br-l { border-left: solid 1rpx #efefef; } diff --git a/alipay/app.js b/alipay/app.js index 96d26b5fa..63e19ff24 100755 --- a/alipay/app.js +++ b/alipay/app.js @@ -47,7 +47,7 @@ App({ // 请求地址 request_url: "https://demo.shopxo.net/", - request_url: 'http://localhost/project/shopxo/service/', + //request_url: 'http://localhost/project/shopxo/service/', // 基础信息 application_title: "ShopXO电商系统", diff --git a/alipay/pages/buy/buy.acss b/alipay/pages/buy/buy.acss index c1c7204e5..8f6efe3e4 100755 --- a/alipay/pages/buy/buy.acss +++ b/alipay/pages/buy/buy.acss @@ -1,3 +1,10 @@ +.page { + padding-bottom: 120rpx; +} + +/** + * 地址 + */ .address { padding: 10rpx; } @@ -24,6 +31,9 @@ line-height: 85rpx; } +/** + * 商品 + */ .goods .goods-item:not(:last-child) { border-bottom: 1px dashed #efefef; } @@ -50,6 +60,9 @@ min-height: 160rpx; } +/** + * 导航 + */ .buy-nav { position: fixed; left: 0; @@ -71,6 +84,36 @@ .nav-submit button { border-radius: 0; } -.page { - padding-bottom: 120rpx; + +/** + * 支付方式 + */ +.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; +} + +/** + * 扩展数据 + */ +.extension-list { + background-color: #ffffeb; +} +.extension-list .item { + padding: 20rpx 10rpx; +} +.extension-list .item:not(:last-child) { + border-bottom: 1px dashed #ffe2cf; +} +.extension-list .item .text-tips { + color: #ff8f44; } \ No newline at end of file diff --git a/alipay/pages/buy/buy.axml b/alipay/pages/buy/buy.axml index 07a7d53d5..5ddd42038 100755 --- a/alipay/pages/buy/buy.axml +++ b/alipay/pages/buy/buy.axml @@ -1,4 +1,5 @@ + @@ -18,6 +19,7 @@ + @@ -33,14 +35,36 @@ ¥{{item.original_price}} - x{{item.buy_number}} + x{{item.stock}} -