dever 7 vuotta sitten
vanhempi
commit
3f69368ac8
3 muutettua tiedostoa jossa 37 lisäystä ja 21 poistoa
  1. 19 21
      src/Applet.php
  2. 15 0
      src/Lib/Base.php
  3. 3 0
      src/Reg.php

+ 19 - 21
src/Applet.php

@@ -31,8 +31,9 @@ class Applet extends Base
             Dever::alert($data);
         }
 
+        //YzJkOThpRFhwZ1lQTF9mZl9hLVZjZnFXemJVenlYcDQ3d3JWekk0b1I4NjBBQ0Naejg4a0VQa0U=
         //$data = '{"session_key":"aNAXk7nG\/DRYI\/G0KzJRsw==","openid":"oIZ895RZs2ZkywasoZIv6WavPZlQ"}';
-        $data = Dever::decode($data);
+        $data = Dever::json_decode($data);
 
         $user = $this->create($data);
 
@@ -117,21 +118,6 @@ class Applet extends Base
         return $result;
     }
 
-    /**
-     * 检测用户有效性
-     *
-     * @return mixed
-     */
-    private function check()
-    {
-    	$signature = Dever::input('signature');
-    	$user = Dever::loginResult($signature);
-    	if (!isset($user['uid'])) {
-    		Dever::alert('user error');
-    	}
-    	return $user['uid'];
-    }
-
     /**
      * 更新用户信息 手机号
      *
@@ -219,15 +205,27 @@ class Applet extends Base
 
         $info = Dever::load('passport/user-one', $uid);
         if ($info) {
-            $update['set_username'] = $name;
-            $update['set_sex'] = $this->saveSex($sex);
-            $update['set_avatar'] = $this->saveAvatar($pic);
+            if ($name) {
+                $update['set_username'] = $name;
+            }
+            
+            if ($sex) {
+                $update['set_sex'] = $this->saveSex($sex);
+            }
+            
+            if ($pic) {
+                $update['set_avatar'] = $this->saveAvatar($pic);
+            }
+            
             //$update['set_city'] = $city;
             //$update['set_mobile'] = $mobile;
             //$update['set_province'] = $province;
             //$update['set_country'] = $country;
-            //$update['where_id'] = $uid;
-            Dever::load('passport/user-update', $update);
+            $update['where_id'] = $uid;
+            if (isset($update) && $update) {
+                Dever::load('passport/user-update', $update);
+            }
+            
         } else {
             Dever::alert('无效的用户id,请重新登录');
         }

+ 15 - 0
src/Lib/Base.php

@@ -22,6 +22,21 @@ class Base
         $this->save = new Save(false, 'cookie');
     }
 
+    /**
+     * 检测用户有效性
+     *
+     * @return mixed
+     */
+    public function check()
+    {
+        $signature = Dever::input('signature');
+        $user = Dever::loginResult($signature);
+        if (!isset($user['uid'])) {
+            Dever::alert('user error');
+        }
+        return $user['uid'];
+    }
+
     public function getToken($request = array())
     {
         return http_build_query(Dever::token($request));

+ 3 - 0
src/Reg.php

@@ -80,6 +80,9 @@ class Reg extends Base
     private function checkMCode($mobile)
     {
         $code = Dever::input('mcode');
+        if (!$code) {
+            Dever::alert('请输入验证码');
+        }
         $code = $this->mcode($mobile, $code);
         if (!$code) {
             Dever::alert('验证码输入错误');