Merge remote-tracking branch 'origin/develop' into develop

6 years ago · 02d2e6fd91
parent 1f976b3450 d6c7705e7e
commit 02d2e6fd91
3 changed files with 0 additions and 2 deletions
--- a/src/main/ui/static/lib/rpay/app_pay_2.js
+++ b/src/main/ui/static/lib/rpay/app_pay_2.js
@ -339,7 +339,6 @@ $(function () {
    function getUserId(){
        alert(12);
        window.RPayPlus.send("getUserId", null, function(data){
            alert(data);
        });
--- a/src/main/ui/static/lib/rpay/rpay_jssdk.js
+++ b/src/main/ui/static/lib/rpay/rpay_jssdk.js
@ -5,7 +5,6 @@ $(function (){
         window.RPayPlus = {
             // 向Native端发送消息，用于实现：JS->Native
             send: function(methodName, param, callback) {
                 alert(1);
                 var thisId = 0;
                 if(callback){
                     thisId = new Date().getTime();; // 获取唯一id
--- a/src/main/ui/static/lib/rpay/rrlogo.png
+++ b/src/main/ui/static/lib/rpay/rrlogo.png