Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/UserController.class.php

@@ -832,7 +832,7 @@ class UserController extends BaseController
 
         #实例化用户接口
         $userApi = new MemberApi();
-        if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['account'])){
+        if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['account'])){
         	$this -> set_message(1027, "fail", "账号必须6-15位数字或字母组合");
         }
         

Application/Sdk/View/default/Spend/pay_way.html

@@ -28,7 +28,7 @@
     }
 
     .weui-cell {
-        height: 0.85rem;
+        height: 0.75rem;
         font-size: .28rem;
         color: #292929;
         padding: 0px .3rem;
@@ -66,12 +66,18 @@
             height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;bottom: 0px;
             position: fixed;left: 0;right: 0;
         }
+        .pay-info,.paylist{
+            margin-top: .3rem;
+        }
     } 
     @media screen and (orientation: landscape) {
     /*横屏 css*/
         .box{
-                padding:.3rem .5rem;
+                padding:.24rem .5rem;
             }
+        .pay-info,.paylist{
+            margin-top: .24rem;
+        }
 		.bottombutton{
             height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;
             width: 7.5rem;border-radius: .2rem;position: absolute;left: 50%;margin: .5rem 0 .5rem -3.75rem; 
@@ -89,7 +95,7 @@
            min-width: 30%;
            box-sizing: content-box;
            margin-left: 3%;
-           padding: .2rem .0rem;
+           padding: .16rem .0rem;
        }
        .paylist-box .weui-cell:before{
            content: none;
@@ -109,25 +115,7 @@
     .showotherpay{
         width: 100%;height: .9rem;background-color: #ffffff;font-size: .28rem;text-align: center;color: #A9A9A9;line-height: .9rem;margin-top: .3rem;
     }
-	@media screen and (orientation: portrait) {
-        .box{
-            padding:.3rem;
-        }
-        
-    } 
-    @media screen and (orientation: landscape) {
-    /*横屏 css*/
-        .box{
-            padding:.3rem .5rem;
-        }
-        .bottombutton{
-            height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;
-            width: 7.5rem;border-radius: .2rem;position: absolute;left: 50%;margin: .5rem 0 .5rem -3.75rem; 
-        }
-        body{
-            padding-bottom: .50rem;
-        }
-    }
+
     .noborder.weui-cell:before{
         height: 0px;
         border: 0px;
@@ -155,7 +143,7 @@
                 <!-- <div class="weui-cell__ft" style="color: #A9A9A9;">{$balance+$bind_balance}平台币</div> -->
             </div>
         </div>
-        <div class="weui-cells" style="margin-top: .3rem;">
+        <div class="weui-cells pay-info">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
                     <p>适用平台余额:</p>
@@ -169,8 +157,8 @@
                 <div data-pay_price="{$pay_price}" id="pay_price" class="weui-cell__ft" style="color: red">￥{$pay_price}</div>
             </div>
         </div>
-        <div class="weui-cells paylist" style="margin-top: .3rem;">
-            <div class="weui-cells__title" style="line-height: .85rem;color: #a9a9a9;font-size:.28rem;margin: 0px;">
+        <div class="weui-cells paylist">
+            <div class="weui-cells__title" style="line-height: .64rem;color: #a9a9a9;font-size:.24rem;margin: 0px;">
                 请选择支付方式</div>
             <div class="border-half-line" style="position: absolute;"></div>
             <div class="paylist-box">

Application/Sdk/View/default/WapPay/wap_shortcut_pay.html

@@ -529,8 +529,8 @@
         }
         if(isok){
             btnpay = true;
-            $("#wfform").submit();
             Tip.loadShow();
+            $("#wfform").submit();
         }
         
     })