diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 013fb8311..faf20b1d1 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -196,6 +196,10 @@ THEN 'APP' WHEN 11 THEN 'Share Code' + WHEN 12 + THEN 'MICROAPP' + WHEN 13 + THEN 'Native QR Code' END AS gateway_label, ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)), 0) aud_fee FROM pmt_transactions l @@ -455,6 +459,10 @@ THEN 'APP' WHEN 11 THEN 'Share Code' + WHEN 12 + THEN 'MICROAPP' + WHEN 13 + THEN 'Native QR Code' END AS gateway_label, ifnull(COUNT(DISTINCT l.client_id), 0) partner_count FROM pmt_transactions l @@ -512,6 +520,12 @@ and o.gateway=11 + + and o.gateway=12 + + + and o.gateway=13 + and l.org_id=#{org_id} and l.org_id in #{org_id} @@ -595,6 +609,12 @@ and o.gateway=11 + + and o.gateway=12 + + + and o.gateway=13 + and ptran.org_id=#{org_id} and ptran.org_id in #{org_id} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 027f4ac1b..d4d2c9011 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -87,6 +87,8 @@ THEN 'APP' WHEN 12 THEN 'MICROAPP' + WHEN 13 + THEN 'Native QR Code' END AS gateway, p.client_moniker partner_code, p.short_name partner_name, diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html deleted file mode 100644 index 2006536b9..000000000 --- a/src/main/ui/merchant_application.html +++ /dev/null @@ -1,929 +0,0 @@ - - - - - - - RoyalPay | Merchant Application - - - - - - - - - - - - - - - - Partner Register - - - - - - - - - - - - -
-
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
- - - - - -
-
-
- -
- -
-
-
-
- - Account Information -
-
- - Company Information -
-
- - Bank Account -
-
- - Submit Materials -
-
- - Success -
-
-
-
- -
-
- - - -
-
- - Required Field -
- -
- - Required Field -
- -
- - Required Field -
- -
- - Required Field -
-
-
- - -
-

Required Field

-
-
-
- -
- - Required Field -
- -
-
- -
-

{{resError}}

-
-
-
-
-
-
- - - -
-
- - Required Field -
-
- - - -
-
- - Required Field -
- -
- - Required Field -
-
- - Required Field -
-
- - Required Field -
-
- - Required Field -
- -
-
- -
-

{{resError}}

-
-
-
-
-
-
- - Required Field -
- -
- - Required Field -
- -
- - Required Field -
- -
- - Required Field -
-
- - Required Field -
-
- - Required Field -
-
- - Required Field -
-
- - Required Field -
-
- - Required Field -
-
- - Required Field -
- -
-
- -
-

{{resError}}

-
-
-
-
-
-
- -
{{rateConfig}}
- Required Field -
- -
-
- -
%
-
- Required Field -
- -
-
- -
%
-
- Required Field -
- -
-
- -
%
-
- Required Field -
-
-
- -
%
-
- Required Field -
-
-
- -
%
-
- Required Field -
-
-
- -
-
-
-
- -
-

{{resError}}

-
-
-
-
- -
-
-
- -
-
-
恭喜注册成功
-
欢迎使用RoyalPay收单服务
-
-
-
-
-
注意事项：
-

1、需要完成 合规材料的提交，具体请查看appxx菜单xx功能；

-

2、在完成合规认证之前，不会对交易进行清算；

-

3、账户名和密码以及相关信息已发送至账户邮箱，请妥善保护自己的密码，及时进行修改。

-
-
-
- -
-

{{resError}}

-
-
-
-
-
-
-
- -
-
-
-
- -

Success

-
-
- Registered merchant application has been submitted successfully -
-
- -
-
-
-
- -
-
-
-
-
- CONTACT US -
- Level 14
- 383 Kent Street
- Sydney NSW 2000
-
- Level 11
- 15 William Street
- Melbourne VIC 3000
-
- 1300-10-77-50
- 03 9448 8865
- info@royalpay.com.au -
-
- SITE MAP -
-
- -
-

RoyalPay

-

Gateway API

-

Industry Solution

-

Marketing Service

-
-
-

About Us

-

News

-

Career

-

Downloads

-
-
-
-
- SUPPORT -
-
- -
- - RoyalPay WeChat Official Account -
-
- - Customer Service -
-
-
-
-
-
-
-
-
- © 2016 Tunnel Show Pty. Ltd. | Representative of AFSL licensee 448066 -
-
-
-
-
-
-
- - -
-
- - \ No newline at end of file diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index fb359860b..39837c2f2 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -542,7 +542,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '11': return 'Share Code'; case '12': - return 'MICROAPP' + return 'MICROAPP'; + case '13': + return 'Native QR Code' } } }); diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index f0850e4e8..b7cf22c8a 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -327,7 +327,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '11': return '账单码'; case '12': - return '小程序' + return '小程序'; + case '13': + return '原生二维码' } } }); diff --git a/src/main/ui/static/css/merchant_application.css b/src/main/ui/static/css/merchant_application.css deleted file mode 100644 index 49d16a26c..000000000 --- a/src/main/ui/static/css/merchant_application.css +++ /dev/null @@ -1,422 +0,0 @@ -body .progress_inner #step-5:checked + div + div + div + div > .box_base, body .progress_inner #step-4:checked + input + div + div + div + div > .box_base, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_base, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_base, body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div > .box_base { - top: 50%; - left: 0px; - opacity: 1; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_item, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_item, body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div > .box_item { - top: -30px; - left: 0px; - opacity: 0; -} - -body .progress_inner #step-5:checked + div + div + div + div > .box_lid, body .progress_inner #step-4:checked + input + div + div + div + div > .box_lid, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_lid { - top: -20px; - left: 0px; - opacity: 0; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_item { - top: -10px; - left: 0px; - opacity: 1; -} - -body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_item { - top: 10px; - left: 0px; - opacity: 1; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_lid, body .progress_inner #step-4:checked + input + div + div + div + div > .box_lid, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_lid { - top: -1px; - left: 0px; - opacity: 1; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_ribbon, body .progress_inner #step-4:checked + input + div + div + div + div > .box_ribbon, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_ribbon { - top: 70%; - left: 0px; - opacity: 0; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_bow, body .progress_inner #step-4:checked + input + div + div + div + div > .box_bow, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_bow { - top: 0px; - left: 0px; - opacity: 0; -} - -body .progress_inner #step-5:checked + div + div + div + div > .box_ribbon, body .progress_inner #step-4:checked + input + div + div + div + div > .box_ribbon { - top: 50%; - left: 0px; - opacity: 1; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_bow, body .progress_inner #step-4:checked + input + div + div + div + div > .box_bow { - top: -10px; - left: 0px; - opacity: 1; -} - -body .progress_inner #step-5:checked + div + div + div + div > .box_tag { - top: 10px; - left: 20px; - opacity: 1; -} -body .progress_inner #step-5:checked + div + div + div + div > .box_string { - top: 10px; - left: 20px; - opacity: 1; -} - -* { - box-sizing: border-box; -} - -body .progress_inner__step:before, body .progress_inner, body .progress_inner__status .box_base, body .progress_inner__status .box_item, body .progress_inner__status .box_ribbon, body .progress_inner__status .box_bow, body .progress_inner__status .box_bow__left, body .progress_inner__status .box_bow__right, body .progress_inner__status .box_tag, body .progress_inner__status .box_string { - position: absolute; - left: 0; - right: 0; - top:42%; - -webkit-transform: translateY(-50%); - transform: translateY(-50%); - margin: auto; -} - -body .progress_inner__bar, body .progress_inner__bar--set { - height: 6px; - left: 10%; - background: -webkit-repeating-linear-gradient(45deg, #1ea4ec, #1ea4ec 4px, #1f8bc5 4px, #1f8bc5 10px); - background: repeating-linear-gradient(45deg, #1ea4ec, #1ea4ec 4px, #1f8bc5 4px, #1f8bc5 10px); - -webkit-transition: width 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - transition: width 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - border-radius: 6px; - width: 0; - position: relative; - z-index: -1; -} - -body .progress_inner__step:before { - width: 30px; - height: 30px; - color: #70afd0; - background: white; - line-height: 30px; - border: 3px solid #a6cde2; - font-size: 12px; - top: 3px; - border-radius: 100%; - -webkit-transition: all .4s; - transition: all .4s; - cursor: pointer; - pointer-events: none; -} - -body .progress_inner__step { - width: 20%; - font-size: 14px; - padding: 0 10px; - -webkit-transition: all .4s; - transition: all .4s; - float: left; - text-align: center; - position: relative; -} -body .progress_inner__step label { - padding-top: 50px; - top: -20px; - display: block; - position: relative; - cursor: pointer; -} -/*body .progress_inner__step:hover { - color: white; -} -body .progress_inner__step:hover:before { - color: white; - background: #1ea4ec; -}*/ - -body { - font-family: "Nunito", sans-serif; - background: #a6cde2; - color: #2e6c8e; - text-align: center; - font-weight: 900; -} -body .progress_inner { - height: 200px; - width: 1000px; -} -body .progress_inner #step-5:checked + div { - width: 80%; -} -body .progress_inner #step-5:checked + div + div + div > .tab:nth-of-type(5) { - opacity: 1; - top: 0; -} -body .progress_inner #step-5:checked + div + div + div + div { - right: 10%; -} -body .progress_inner #step-4:checked + input + div { - width: 60%; -} -body .progress_inner #step-4:checked + input + div + div + div > .tab:nth-of-type(4) { - opacity: 1; - top: 0; -} -body .progress_inner #step-4:checked + input + div + div + div + div { - right: 30%; -} -body .progress_inner #step-3:checked + input + input + div { - width: 40%; -} -body .progress_inner #step-3:checked + input + input + div + div + div > .tab:nth-of-type(3) { - opacity: 1; - top: 0; -} -body .progress_inner #step-3:checked + input + input + div + div + div + div { - right: 50%; -} -body .progress_inner #step-2:checked + input + input + input + div { - width: 20%; -} -body .progress_inner #step-2:checked + input + input + input + div + div + div > .tab:nth-of-type(2) { - opacity: 1; - top: 0; -} -body .progress_inner #step-2:checked + input + input + input + div + div + div + div { - right: 70%; -} -body .progress_inner #step-1:checked + input + input + input + input + div { - width: 0%; -} -body .progress_inner #step-1:checked + input + input + input + input + div + div + div > .tab:nth-of-type(1) { - opacity: 1; - top: 0; -} -body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div { - right: 90%; -} -body .progress_inner__step:nth-of-type(1):before { - content: "1"; -} -body .progress_inner__step:nth-of-type(2):before { - content: "2"; -} -body .progress_inner__step:nth-of-type(3):before { - content: "3"; -} -body .progress_inner__step:nth-of-type(4):before { - content: "4"; -} -body .progress_inner__step:nth-of-type(5):before { - content: "5"; -} -body .progress_inner__step:nth-of-type(6):before { - content: "6"; -} -body .progress_inner__bar--set { - width: 80%; - top: -6px; - background: #70afd0; - position: relative; - z-index: -2; -} -body .progress_inner__tabs .tab { - opacity: 0; - position: absolute; - top: 40px; - text-align: center; - margin-top: 80px; - box-shadow: 0px 2px 1px #80b7d5; - padding: 30px; - background: white; - border-radius: 10px; - -webkit-transition: all .2s; - transition: all .2s; -} -body .progress_inner__tabs .tab h1 { - margin: 0; -} -body .progress_inner__tabs .tab p { - font-weight: 400; - opacity: 0.8; -} -body .progress_inner__status { - width: 40px; - height: 40px; - top: -65px; - -webkit-transition: right 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - transition: right 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - -webkit-transform: translateX(50%); - transform: translateX(50%); - position: absolute; -} -body .progress_inner__status div { - opacity: 0; - -webkit-transition: all 600ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - transition: all 600ms cubic-bezier(0.915, 0.015, 0.3, 1.005); - -webkit-transition-delay: 300ms; - transition-delay: 300ms; -} -body .progress_inner__status div { - position: absolute; -} -body .progress_inner__status .box_base { - background: -webkit-repeating-linear-gradient(45deg, #986c5d, #986c5d 2px, #775144 2px, #775144 4px); - background: repeating-linear-gradient(45deg, #986c5d, #986c5d 2px, #775144 2px, #775144 4px); - width: 36px; - height: 40px; - z-index: 1; - border-radius: 1px; -} -body .progress_inner__status .box_lid { - width: 40px; - height: 13.33333px; - background: #775144; - z-index: 2; - border-radius: 1px; - top: 0; -} -body .progress_inner__status .box_item { - width: 20px; - height: 20px; - background: #be69d2; - z-index: 0; - border-radius: 4px; - -webkit-transform: rotate(45deg); - transform: rotate(45deg); -} -body .progress_inner__status .box_ribbon { - width: 10px; - height: 42px; - background: #ee0f29; - z-index: 4; - border-radius: 1px; -} -body .progress_inner__status .box_bow__left, body .progress_inner__status .box_bow__right { - width: 6px; - height: 10px; - background: #be0c21; - position: absolute; - z-index: 3; - opacity: 1; - border-radius: 1px; -} -body .progress_inner__status .box_bow { - top: -6px; - z-index: 1; - -webkit-transition-delay: 500ms; - transition-delay: 500ms; -} -body .progress_inner__status .box_bow__left { - left: 6px; - -webkit-transform: rotate(45deg); - transform: rotate(45deg); -} -body .progress_inner__status .box_bow__right { - left: -4px; - -webkit-transform: rotate(-45deg); - transform: rotate(-45deg); -} -body .progress_inner__status .box_tag { - width: 20px; - height: 10px; - background: #487ac7; - z-index: 4; - -webkit-transform: rotate(-10deg) translateX(-40px) translateY(0px); - transform: rotate(-10deg) translateX(-40px) translateY(0px); - border-radius: 2px; - -webkit-transition-delay: 500ms; - transition-delay: 500ms; -} -body .progress_inner__status .box_string { - width: 17px; - height: 2px; - background: #343434; - z-index: 4; - -webkit-transform: rotate(-39deg) translateX(-22px) translateY(-12px); - transform: rotate(-39deg) translateX(-22px) translateY(-12px); -} -body .progress_inner input[type="radio"] { - display: none; -} -.step_header{ - text-align: left; - padding-left:7%; -} -.step_header img{ - height: 30px; - width: 30px; -} - -.success_wrapper{ - margin-top: 30px; - text-align: center; -} -.success_img{ - display: inline-block; -} -.success_img img{ - vertical-align: baseline; -} -.success_text{ - text-align: left; - display: inline-block; - margin-left: 14px; -} -.success_text2{ - font-family: PingFangSC-Regular; - font-size: 15px; - color: #8B919D; - letter-spacing: 0px; -} -.success_content{ - margin-top: 50px; - font-family: PingFangSC-Regular; - font-size: 15px; - color: #8B919D; - letter-spacing: 0px; -} -.content_align{ - margin:0 auto; - width:50%; - text-align:left; -} -.margin-bottom2{ - margin-top: 120px; -} -.agree-text{ - font-family: SanFranciscoText-Regular; - font-size: 15px; - color: #FF6600; - letter-spacing: 0px; -} -.agree-to{ - border: 1px solid #FF6600; - padding: 6px 8px 6px 8px; - color: grey; - cursor: pointer; -} -.agree_left{ - text-align: left; -} -body .dis_before:nth-child(1):before{ - background: #1ea4ec; -} -body .dis_before:nth-child(2):before{ - background: #1ea4ec; -} -body .dis_before:nth-child(3):before{ - background: #1ea4ec; -} -body .dis_before:nth-child(4):before{ - background: #1ea4ec; -} -body .dis_before:nth-child(5):before { - background: #1ea4ec; - } -/*.progress_inner__step:before{ - background: #1ea4ec; -} -.step_submit_color{ - color: white; - -}*/ - - diff --git a/src/main/ui/static/images/step/gou.png b/src/main/ui/static/images/step/gou.png deleted file mode 100644 index f4a81919a..000000000 Binary files a/src/main/ui/static/images/step/gou.png and /dev/null differ diff --git a/src/main/ui/static/images/step/num1_1.png b/src/main/ui/static/images/step/num1_1.png deleted file mode 100644 index e4a8e2496..000000000 Binary files a/src/main/ui/static/images/step/num1_1.png and /dev/null differ diff --git a/src/main/ui/static/images/step/num1_2.png b/src/main/ui/static/images/step/num1_2.png deleted file mode 100644 index c009a6baa..000000000 Binary files a/src/main/ui/static/images/step/num1_2.png and /dev/null differ diff --git a/src/main/ui/static/images/step/num1_3.png b/src/main/ui/static/images/step/num1_3.png deleted file mode 100644 index 93931e4be..000000000 Binary files a/src/main/ui/static/images/step/num1_3.png and /dev/null differ diff --git a/src/main/ui/static/images/step/num1_4.png b/src/main/ui/static/images/step/num1_4.png deleted file mode 100644 index e1b9e4028..000000000 Binary files a/src/main/ui/static/images/step/num1_4.png and /dev/null differ diff --git a/src/main/ui/static/images/step/num1_5.png b/src/main/ui/static/images/step/num1_5.png deleted file mode 100644 index 63524502e..000000000 Binary files a/src/main/ui/static/images/step/num1_5.png and /dev/null differ diff --git a/src/main/ui/static/images/step/send_code.png b/src/main/ui/static/images/step/send_code.png deleted file mode 100644 index 2c2f5546d..000000000 Binary files a/src/main/ui/static/images/step/send_code.png and /dev/null differ diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js deleted file mode 100644 index 3dc2f44da..000000000 --- a/src/main/ui/static/merchantapplication/merchant_application.js +++ /dev/null @@ -1,204 +0,0 @@ -angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval', function ($scope, $http,$interval) { - var countryMap = [{ - "label": "AUS", - "value": "AUS" - }, { - "label": "CHN", - "value": "CHN" - }]; - var stateMap = [ - { - "label": "ACT", - "value": "ACT" - }, - { - "label": "NSW", - "value": "NSW" - }, - { - "label": "NT", - "value": "NT" - }, - { - "label": "QLD", - "value": "QLD" - }, - { - "label": "SA", - "value": "SA" - }, - { - "label": "TAS", - "value": "TAS" - }, - { - "label": "VIC", - "value": "VIC" - }, - { - "label": "WA", - "value": "WA" - } - ]; - var industryMap = [ - { - "label": "综合商城 Integrated Store", - "value": 336 - }, - { - "label": "食品 Food", - "value": 335 - }, - { - "label": "化妆品 Cosmetics", - "value": 334 - }, - { - "label": "鞋包服饰 Clothes", - "value": 327 - }, - { - "label": "酒店行业 Hospitality industry", - "value": 328 - }, - { - "label": "数码电器 Electric appliances", - "value": 332 - }, - { - "label": "母婴 Baby and maternal products", - "value": 333 - }, - { - "label": "文具/办公用品 Office supplies", - "value": 337 - }, - { - "label": "机票行业 Airline tickets industry", - "value": 339 - }, - { - "label": "国际物流 International logistics", - "value": 330 - }, - { - "label": "教育行业 Education section", - "value": 329 - }, - { - "label": "其它服务行业 Other services industry", - "value": 331 - }, - { - "label": "其它货物贸易行业 Other goods trade industry", - "value": 338 - } - ]; - - function getQueryString(name) { - var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); - var r = window.location.search.substr(1).match(reg); - if (r != null)return unescape(r[2]); - return null; - } - - var from = getQueryString("from"); - - $scope.industries = angular.copy(industryMap); - $scope.states = angular.copy(stateMap); - $scope.countries = angular.copy(countryMap); - $scope.seconds = 6; - $scope.canClick=false; - $scope.description = "Send Code"; - - $scope.disabledArray = new Array(true, false, false, false, false); - $scope.chooseArray = new Array(true, false, false, false, false); - $scope.changeChoose = function (index) { - $scope.chooseArray = new Array(false, false, false, false, false); - $scope.chooseArray[index] = true; - $scope.disabledArray[index] = true; - }; - - $scope.goToLogin = function () { - $scope.seconds = $scope.seconds -1; - if ($scope.seconds == 0) { - location.href = '/login.html'; - } - }; - - $scope.partner = {}; - - if (from != null && from.toString().length == 1) { - $scope.partner.source = from; - } - $scope.validateForm = function (form,index) { - /* if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true; - } - }); - return; - }*/ - $scope.changeChoose(index); - - }; - - - $scope.getTestCode = function(){ - var second=59; - var timerHandler; - timerHandler =$interval(function(){ - if(second<=0){ - $interval.cancel(timerHandler); //当执行的时间59s,结束时，取消定时器 ，cancle方法取消 - second=59; - $scope.description="获取验证码"; - $scope.canClick=false; //因为 ng-disabled属于布尔值，设置按钮可以点击，可点击发送 - }else{ - $scope.description=second+"s后重发"; - second--; - $scope.canClick=true; - } - },1000) //每一秒执行一次$interval定时器方法 - }; - - $scope.sendVerificationCode = function () { - $scope.getTestCode(); - }; - - $scope.save = function (from,index) { - $scope.validateForm(from,index); - /* var timer = $interval(function(){ - $scope.goToLogin(); - },1000);*/ - } - - - - /* $scope.captchaImage = '/partners/application/captcha-image'; - $scope.changeCaptchaImage = function () { - $scope.captchaImage = '/partners/application/captcha-image?' + Math.floor(Math.random() * 100); - }; - $scope.save = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true; - } - }); - return; - } - $scope.partner.company_name = $scope.partner.short_name; - $('#login-btn').attr('disabled', true); - $http.post('partners/application', $scope.partner).then(function (resp) { - alert("Registered merchant application has been submitted successfully"); - location.href = 'partner_register_success.html'; - //commonDialog.alert({title: 'Success', content: 'Registered merchant application has been submitted successfully', type: 'success'}); - }, function (resp) { - alert(resp.data.message); - $scope.resError = resp.data.message; - $scope.changeCaptchaImage(); - $('#login-btn').attr('disabled', false); - }); - };*/ -}]); \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index 351050ba1..9f8c729f7 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -60,7 +60,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

@@ -155,6 +157,7 @@ + diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index 44741988a..7bd8e5ea3 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -122,7 +122,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index a73711411..28bee0ccd 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -160,7 +160,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

Client Order ID Order ID Amount