牟新芬 4 years ago
parent
commit
37a87ab435

+ 2 - 0
app/api/controller/v1/Index.php

@@ -52,6 +52,7 @@ class Index extends BaseController
         $storeInfo['description'] = preg_replace_callback('#<img.*?src="([^"]*)"[^>]*>#i', function ($imagsSrc) {
             return isset($imagsSrc[1]) && isset($imagsSrc[0]) ? str_replace($imagsSrc[1], str_replace('\\', '/', $imagsSrc[1]), $imagsSrc[0]) : '';
         }, $storeInfo['description']);
+        $data['storeInfo'] = $storeInfo;
         list($productAttr, $productValue) = ProductAttr::getProductAttrDetail($id, 0, 0);
         $data['productAttr'] = $productAttr;
         $prices = array_column($productValue, 'price');
@@ -60,6 +61,7 @@ class Index extends BaseController
         $productValue = array_combine($keys, $productValue);
         $data['productValue'] = $productValue;
         $data['priceName'] = 0;
+        $data['good_list'] = Product::getGoodList(18, 'image,store_name,price,id,ot_price');
         return app('json')->successful($data);
     }
 

+ 3 - 3
app/api/controller/v1/Login.php

@@ -40,13 +40,13 @@ class Login extends BaseController
             ['passWord','','empty','请输入登录密码']
         ],$request,true);
         //获取登录
-        $meberInfo = Member::login($userName,$passWord,$request->site['sassid']);
+        $meberInfo = Member::login($userName,$passWord);
         if(empty($meberInfo)) {
             return app('json')->fail(Member::getErrorInfo('用户名错误,请重新输入'));
         }
 
         //生成令牌
-        $token = Member::createToken($meberInfo, $request->site['secret_key']);
+        $token = Member::createToken($meberInfo, 'xxlm');
         if(empty($token)) {
             return app('json')->fail(Member::getErrorInfo());
         }
@@ -371,4 +371,4 @@ class Login extends BaseController
         return app('json')->success("找回成功!");
     }
 
-}
+}

+ 2 - 3
app/model/api/Member.php

@@ -91,8 +91,8 @@ class Member extends BaseModel
 
 
 
-    public static function login($userName,$passWord,$sassid) {
-        $info = self::where('mobile',$userName)->where('sassid',$sassid)->find();
+    public static function login($userName,$passWord) {
+        $info = self::where('mobile',$userName)->find();
         if(empty($info)) return self::setErrorInfo('请输入正确的账号和密码');
         if (!$info['status']) return self::setErrorInfo('账户被停用了!');
         if($info['password'] != md5($passWord)) {
@@ -113,7 +113,6 @@ class Member extends BaseModel
         $params['time'] = time();
         $params['token'] = base64_encode(crypto_encrypt($info->getData('uid'),$secret_key));
         $params['uid'] = $info->getData('uid');
-        $params['sassid'] = $info->getData('sassid');
         $token = JWT::encode($params, Env::get('app.app_key', 'default'));
         return $token;
     }

+ 8 - 1
app/model/api/Product.php

@@ -23,7 +23,7 @@ class Product extends Model
             $model = self::where('is_best', 1);
         }
         $model->order('sort DESC, add_time DESC');
-        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,image,price,cost,ot_price')->select();
+        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,image,price,cost,ot_price,IFNULL(sales,0) + IFNULL(ficti,0) as sales')->select();
         $list = count($list) ? $list->toArray() : [];
         return $list;
     }
@@ -35,4 +35,11 @@ class Product extends Model
         else return false;
     }
 
+    public static function getGoodList($limit = 18, $field = '*')
+    {
+        $list = self::where('is_best', 1)->order('sort desc,id desc')->limit($limit)->field($field)->select();
+        $list = count($list) ? $list->toArray() : [];
+        return $list;
+    }
+
 }