添加默认登录

manage-server/app/Http/Controllers/HouseApplianceCleanOrderController.php

@@ -66,6 +66,6 @@ class HouseApplianceCleanOrderController extends Controller
      */
     public function list(Request $request)
     {
-        return HouseApplianceCleanOrder::paginate(20);
+        return HouseApplianceCleanOrder::orderBy('id', 'desc')->paginate(20);
     }
 }

manage-server/app/Http/Controllers/HouseCleanOrderController.php

@@ -78,6 +78,6 @@ class HouseCleanOrderController extends Controller
      */
     public function list(Request $request)
     {
-        return HouseCleanOrder::paginate(20);
+        return HouseCleanOrder::orderBy('id', 'desc')->paginate(20);
     }
 }

manage-server/app/Http/Controllers/HousekeeperOrderController.php

@@ -99,9 +99,9 @@ class HousekeeperOrderController extends Controller
     {
         $classify = $request->input("classify");
         if($classify) {
-            return HousekeeperOrder::where("classify", $classify)->paginate(20);
+            return HousekeeperOrder::where("classify", $classify)->orderBy('id', 'desc')->paginate(20);
         }
-        return HousekeeperOrder::paginate(20);
+        return HousekeeperOrder::orderBy('id', 'desc')->paginate(20);
     }
 
     public function classify() {

manage-server/app/Http/Controllers/MaternityMatronOrderController.php

@@ -91,9 +91,10 @@ class MaternityMatronOrderController extends Controller
                 ->orWhere("contact", "like",  "%{$keyword}%")
                 ->orWhere("phone", "like",  "%{$keyword}%")
                 ->orWhere("remark", "like",  "%{$keyword}%")
+                ->orderBy('id', 'desc')
                 ->paginate();
         } else {
-            $data = MaternityMatronOrder::paginate();
+            $data = MaternityMatronOrder::orderBy('id', 'desc')->paginate(20);
         }
         $data->appends(["keyword" => $keyword]);
         return $data;

manage-server/app/Http/Controllers/OptionOrderController.php

@@ -97,6 +97,7 @@ class OptionOrderController extends Controller
                 ->orWhere("classify", "like",  "%{$keyword}%")
                 ->orWhere("phone", "like",  "%{$keyword}%")
                 ->orWhere("remark", "like",  "%{$keyword}%")
+                ->orderBy('id', 'desc')
                 ->paginate();
         } else {
             $data = OptionOrder::paginate();

manage-server/app/Http/Controllers/ProductOrderController.php

@@ -98,6 +98,7 @@ class ProductOrderController extends Controller
                 ->orWhere("remark", "like",  "%{$keyword}%")
                 ->orWhere("info", "like",  "%{$keyword}%")
                 ->orWhere("phone", "like",  "%{$keyword}%")
+                ->orderBy('id', 'desc')
                 ->paginate();
         } else {
             $data = ProductOrder::with("products")->paginate();

miniapp/app/app.js

@@ -84,7 +84,7 @@ appInit();
 
 App({
     onLaunch: function () {
-        
+        controller.auth.login()
     },
-    globalData: {}
+    globalData: {},
 })

miniapp/app/base/libs/config.js

@@ -2,6 +2,6 @@ export default {
     ENV: 'dev',
     VERSION: '0.0.1',
     REQUEST_DEV_URL: 'https://wechat.oskey.cn/api/',
-    REQUEST_URL: 'https://sotype.com/api/',
+    REQUEST_URL: 'https://oskey.cn/api/',
     LAUNCH_PAGE: '/pages/launch/index'
 }

miniapp/app/base/libs/global.js

@@ -4,6 +4,7 @@ const auth = {
      * reload小程序（返回首页）
      */
     reload() {
+        console.log(global.config.LAUNCH_PAGE)
         return global.tools.router.goto({
             path: global.config.LAUNCH_PAGE,
             type: global.ROUTER_TYPE.CLOSE_ALL
@@ -46,19 +47,16 @@ const auth = {
     _loginToServer(wxRes) {
         return new Promise((resolve, reject) => {
             if (wxRes.code) {
-                $.request('default/token', 'POST', {
+                $.request('login', 'POST', {
                     'code': wxRes.code
                 }).then(res => {
-                    console.log('登录成功');
-                    res.data.code = wxRes.code;
+                    console.log(res.data)
                     auth.setSession(res.data);
                     resolve(res.data);
                 }).catch((err) => {
-                    console.log('后台登录失败');
                     reject(err);
                 });
             } else {
-                console.log('登录失败');
                 reject(wxRes);
             }
         });

miniapp/app/pages/launch/index.js

@@ -66,9 +66,9 @@ new $.Page({
     },
     doAuth() {
         auth.login()
-            .then((userInfo) => {
-                this.doRedirect(userInfo);
-            });
+        .then((userInfo) => {
+            this.doRedirect(userInfo);
+        });
     },
     doRedirect() {
         $.router.goto({