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

Application/Mobile/Controller/SsgController.class.php

@@ -20,7 +20,7 @@ class SsgController extends BaseController {
     const CODE_ERROR = -97;         //验证码错误
     const RETURN_SUCCESS = 1;
     const RETURN_FALSE = 2;
-    const signprice = 10; //充值金额
+    const signprice = 0.01; //充值金额
 
 
     public function login()

Application/Mobile/View/User/userpassword.html

@@ -16,7 +16,7 @@
     <div class="name">
         <!-- 子页公共头部 -->
         <div class="subpage-heard">修改密码
-            <a href="#" class="arrows"></a>
+            <a href="javascript:window.history.go(-1);" class="arrows"></a>
         </div>
         <form action="" id="form">
             <div class="login-box">

Application/Mobile/View/User/userset.html

@@ -84,7 +84,7 @@
         </div>
         <a href="{:U('usernick')}" class="right">{$user['nickname']}</a>
       </div>
-      <div class="setting-info arror">
+      <div class="setting-info arror" style="display: none">
         <div class="left">
           <img src="__IMG__/xingbie2.png" alt="">
           <span>性别</span>