Merge branch 'kuaiyingyong' of /home/python/git_res/zhuishuyun_wap with conflicts.

app/Http/Controllers/QuickApp/User/ShortcutController.php

@@ -36,15 +36,20 @@ class ShortcutController extends BaseController
      */
 
     function delete(Request $request){
-        $uid = $this->uid;
-        $data = [
-            'uid'=>$uid,
-            'status'=>0,
-            'created_at'=>date("Y-m-d H:i:s"),
-            'updated_at'=>date("Y-m-d H:i:s"),
+        $res = DB::table('quickapp_shortcuts')->where('uid',$this->uid)->first();
+        if($res){
+            $res->status = 0;
+            $res->save();
+        }else{
+            $data = [
+                'uid'=>$this->uid,
+                'status'=>0,
+                'created_at'=>date("Y-m-d H:i:s"),
+                'updated_at'=>date("Y-m-d H:i:s"),
 
-        ];
-        $res = DB::table('quickapp_shortcuts')->insert($data);
+            ];
+            $res = DB::table('quickapp_shortcuts')->insert($data);
+        }
         return response()->success();
     }
 
@@ -70,18 +75,23 @@ class ShortcutController extends BaseController
      */
 
 
-    function add(Request $request){
-        $uid = $this->uid;
-        $data = [
-            'uid'=>$uid,
-            'status'=>1,
-            'created_at'=>date("Y-m-d H:i:s"),
-            'updated_at'=>date("Y-m-d H:i:s"),
+    function add(Request $request)
+    {
+        $res = DB::table('quickapp_shortcuts')->where('uid', $this->uid)->first();
+        if ($res) {
+            $res->status = 1;
+            $res->save();
+        } else {
+            $data = [
+                'uid' => $this->uid,
+                'status' => 1,
+                'created_at' => date("Y-m-d H:i:s"),
+                'updated_at' => date("Y-m-d H:i:s"),
 
-        ];
-        $res = DB::table('quickapp_shortcuts')->insert($data);
+            ];
+            $res = DB::table('quickapp_shortcuts')->insert($data);
+        }
         return response()->success();
-    }
-
 
+    }
 }

app/Modules/BaseService.php

@@ -7,7 +7,7 @@ trait BaseService
 {
     private static $_instance;
 
-    public function __callStatic($name, $arguments)
+    public static function __callStatic($name, $arguments)
     {
         $name = preg_replace('/Static$/', '', $name);
         if (self::$_instance == null) {