Browse Source

添加默认登录

chenxiqiang 4 years ago
parent
commit
32cea88f7d

+ 1
- 1
manage-server/app/Http/Controllers/HouseApplianceCleanOrderController.php View File

66
      */
66
      */
67
     public function list(Request $request)
67
     public function list(Request $request)
68
     {
68
     {
69
-        return HouseApplianceCleanOrder::paginate(20);
69
+        return HouseApplianceCleanOrder::orderBy('id', 'desc')->paginate(20);
70
     }
70
     }
71
 }
71
 }

+ 1
- 1
manage-server/app/Http/Controllers/HouseCleanOrderController.php View File

78
      */
78
      */
79
     public function list(Request $request)
79
     public function list(Request $request)
80
     {
80
     {
81
-        return HouseCleanOrder::paginate(20);
81
+        return HouseCleanOrder::orderBy('id', 'desc')->paginate(20);
82
     }
82
     }
83
 }
83
 }

+ 2
- 2
manage-server/app/Http/Controllers/HousekeeperOrderController.php View File

99
     {
99
     {
100
         $classify = $request->input("classify");
100
         $classify = $request->input("classify");
101
         if($classify) {
101
         if($classify) {
102
-            return HousekeeperOrder::where("classify", $classify)->paginate(20);
102
+            return HousekeeperOrder::where("classify", $classify)->orderBy('id', 'desc')->paginate(20);
103
         }
103
         }
104
-        return HousekeeperOrder::paginate(20);
104
+        return HousekeeperOrder::orderBy('id', 'desc')->paginate(20);
105
     }
105
     }
106
 
106
 
107
     public function classify() {
107
     public function classify() {

+ 2
- 1
manage-server/app/Http/Controllers/MaternityMatronOrderController.php View File

91
                 ->orWhere("contact", "like",  "%{$keyword}%")
91
                 ->orWhere("contact", "like",  "%{$keyword}%")
92
                 ->orWhere("phone", "like",  "%{$keyword}%")
92
                 ->orWhere("phone", "like",  "%{$keyword}%")
93
                 ->orWhere("remark", "like",  "%{$keyword}%")
93
                 ->orWhere("remark", "like",  "%{$keyword}%")
94
+                ->orderBy('id', 'desc')
94
                 ->paginate();
95
                 ->paginate();
95
         } else {
96
         } else {
96
-            $data = MaternityMatronOrder::paginate();
97
+            $data = MaternityMatronOrder::orderBy('id', 'desc')->paginate(20);
97
         }
98
         }
98
         $data->appends(["keyword" => $keyword]);
99
         $data->appends(["keyword" => $keyword]);
99
         return $data;
100
         return $data;

+ 1
- 0
manage-server/app/Http/Controllers/OptionOrderController.php View File

97
                 ->orWhere("classify", "like",  "%{$keyword}%")
97
                 ->orWhere("classify", "like",  "%{$keyword}%")
98
                 ->orWhere("phone", "like",  "%{$keyword}%")
98
                 ->orWhere("phone", "like",  "%{$keyword}%")
99
                 ->orWhere("remark", "like",  "%{$keyword}%")
99
                 ->orWhere("remark", "like",  "%{$keyword}%")
100
+                ->orderBy('id', 'desc')
100
                 ->paginate();
101
                 ->paginate();
101
         } else {
102
         } else {
102
             $data = OptionOrder::paginate();
103
             $data = OptionOrder::paginate();

+ 1
- 0
manage-server/app/Http/Controllers/ProductOrderController.php View File

98
                 ->orWhere("remark", "like",  "%{$keyword}%")
98
                 ->orWhere("remark", "like",  "%{$keyword}%")
99
                 ->orWhere("info", "like",  "%{$keyword}%")
99
                 ->orWhere("info", "like",  "%{$keyword}%")
100
                 ->orWhere("phone", "like",  "%{$keyword}%")
100
                 ->orWhere("phone", "like",  "%{$keyword}%")
101
+                ->orderBy('id', 'desc')
101
                 ->paginate();
102
                 ->paginate();
102
         } else {
103
         } else {
103
             $data = ProductOrder::with("products")->paginate();
104
             $data = ProductOrder::with("products")->paginate();

+ 2
- 2
miniapp/app/app.js View File

84
 
84
 
85
 App({
85
 App({
86
     onLaunch: function () {
86
     onLaunch: function () {
87
-        
87
+        controller.auth.login()
88
     },
88
     },
89
-    globalData: {}
89
+    globalData: {},
90
 })
90
 })

+ 1
- 1
miniapp/app/base/libs/config.js View File

2
     ENV: 'dev',
2
     ENV: 'dev',
3
     VERSION: '0.0.1',
3
     VERSION: '0.0.1',
4
     REQUEST_DEV_URL: 'https://wechat.oskey.cn/api/',
4
     REQUEST_DEV_URL: 'https://wechat.oskey.cn/api/',
5
-    REQUEST_URL: 'https://sotype.com/api/',
5
+    REQUEST_URL: 'https://oskey.cn/api/',
6
     LAUNCH_PAGE: '/pages/launch/index'
6
     LAUNCH_PAGE: '/pages/launch/index'
7
 }
7
 }

+ 3
- 5
miniapp/app/base/libs/global.js View File

4
      * reload小程序(返回首页)
4
      * reload小程序(返回首页)
5
      */
5
      */
6
     reload() {
6
     reload() {
7
+        console.log(global.config.LAUNCH_PAGE)
7
         return global.tools.router.goto({
8
         return global.tools.router.goto({
8
             path: global.config.LAUNCH_PAGE,
9
             path: global.config.LAUNCH_PAGE,
9
             type: global.ROUTER_TYPE.CLOSE_ALL
10
             type: global.ROUTER_TYPE.CLOSE_ALL
46
     _loginToServer(wxRes) {
47
     _loginToServer(wxRes) {
47
         return new Promise((resolve, reject) => {
48
         return new Promise((resolve, reject) => {
48
             if (wxRes.code) {
49
             if (wxRes.code) {
49
-                $.request('default/token', 'POST', {
50
+                $.request('login', 'POST', {
50
                     'code': wxRes.code
51
                     'code': wxRes.code
51
                 }).then(res => {
52
                 }).then(res => {
52
-                    console.log('登录成功');
53
-                    res.data.code = wxRes.code;
53
+                    console.log(res.data)
54
                     auth.setSession(res.data);
54
                     auth.setSession(res.data);
55
                     resolve(res.data);
55
                     resolve(res.data);
56
                 }).catch((err) => {
56
                 }).catch((err) => {
57
-                    console.log('后台登录失败');
58
                     reject(err);
57
                     reject(err);
59
                 });
58
                 });
60
             } else {
59
             } else {
61
-                console.log('登录失败');
62
                 reject(wxRes);
60
                 reject(wxRes);
63
             }
61
             }
64
         });
62
         });

+ 3
- 3
miniapp/app/pages/launch/index.js View File

66
     },
66
     },
67
     doAuth() {
67
     doAuth() {
68
         auth.login()
68
         auth.login()
69
-            .then((userInfo) => {
70
-                this.doRedirect(userInfo);
71
-            });
69
+        .then((userInfo) => {
70
+            this.doRedirect(userInfo);
71
+        });
72
     },
72
     },
73
     doRedirect() {
73
     doRedirect() {
74
         $.router.goto({
74
         $.router.goto({

Loading…
Cancel
Save