Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Stock.php

@@ -23,7 +23,7 @@ class Stock extends Base
         $page = isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) : 1;
         $size = isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :10;
         $status = isset($this->post['status'])&&$this->post['status']!=="" ? intval($this->post['status']) :"";
-        $where=['a.is_del'=>0];
+        $where=['a.is_del'=>0,'d.is_del'=>0];
         if($status!==""){
             $where['a.status'] = $status;
         }

application/Admin/controller/User.php

@@ -31,7 +31,7 @@ class User extends Base
             $data['mobile']=$mobile;
         }
         $data['updatetime'] = date("Y-m-d H:i:s");
-        $result=Db::name('admin')->where(['id'=>$this->userinfo['id']])->save($data);
+        $result=Db::name('admin')->where(['id'=>$this->userinfo['id']])->update($data);
 
         $msg =isset($data['password'])? "修改密码为：{$pasword}":"";
         $msg .=isset($data['nickname'])? "修改昵称为：{$nickname}":"";

application/common.php

@@ -12,7 +12,7 @@ use think\Db;
 // 应用公共文件
 
 function makeSalt(){
-    $str =round(100000,999999);
+    $str =rand(100000,999999);
     return $str;
 }