1

app/api/controller/v1/Order.php

@@ -299,4 +299,19 @@ class Order extends BaseController
             return app('json')->fail('支付失败');
         }
     }
+
+    /**
+     * 获取订单列表
+     * @param Request $request
+     */
+    public function getOrderList(Request $request)
+    {
+        $where = UtilService::getMore([
+            ['type', ''],
+            ['page', 0],
+            ['limit', '']
+        ], $request);
+        $data = (new OrderModel)->getUserOrderList($request->user['uid'], $where);
+        return app('json')->success($data);
+    }
 }

app/api/controller/v1/User.php

@@ -641,54 +641,7 @@ class User extends AuthController
         }
     }
 
-    /**
-     * 获取订单数据
-     * @param Request $request
-     */
-    public function getOrderList(Request $request)
-    {
-        $pageSize        = 50;
-        $post            = UtilService::getMore(
-            [
-                ['page', 1],
-                ['order_id', ''],
-                ['mono', ''],
-                ['platform_id', ''],
-                ['data', []],
-                ['orderType', ''],
-                ['timeType', ''],
-                ['shop_id', ''],
-            ], $request
-        );
-        $where           = $post;
-        $where['sassid'] = $request->site['sassid'];
-        $where['uid']    = $request->user['uid'];
-        $order           = new Order;
-        list($pageCount, $data) = $order->getList($post['page'], $where, $pageSize, 'id desc');
-        $result = UtilService::getParam([
-            "id",
-            ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            "order_id",
-            "order_count",
-            "all_price",
-            "status",
-            "platfrom_name",
-            "pro_title",
-            "pro_img",
-            "mono",
-            "err_msg",
-        ], $data);
-        foreach ($result as $k=>$v) {
-            $imgAr =  explode(',',$v['pro_img']);
-            $result[$k]['pro_img'] = empty($imgAr) ? '' : $imgAr[0];
-        }
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
+
 
     /**
      * 订单列表-初始化数据

app/api/controller/v1/Weixin.php

@@ -6,7 +6,6 @@ use app\BaseController;
 use app\model\api\Member;
 use app\model\api\Order;
 use app\model\api\OrderInfo;
-use app\model\api\PayTrade;
 use app\model\api\Product;
 use app\model\api\Recharge;
 use app\Request;
@@ -20,6 +19,17 @@ use think\facade\Db;
 
 class Weixin extends BaseController
 {
+    public function jssdk(){
+        $config = [
+            'app_id' => config('weixin')['APPID'],
+            'secret' => config('weixin')['APPSECRET'],
+            // 指定 API 调用返回结果的类型：array(default)/collection/object/raw/自定义类名
+            'response_type' => 'array'
+        ];
+        $app = Factory::officialAccount($config);
+        $jssdk = $app->jssdk->buildConfig(array('updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage'), $debug = true, $beta = false, $json = false);
+        return $jssdk;
+    }
 
     public function getInfo(Request $request)
     {

app/api/route/order.php

@@ -19,6 +19,8 @@ Route::group('order',function () {
     Route::rule('wxPay', 'v1.weixin/pay');
     //余额支付
     Route::rule('balancePay','v1.order/balancePay');
+    //订单列表
+    Route::rule('getOrderList','v1.order/getOrderList');
 
 })->middleware([
     AllowOriginMiddleware::class,

app/api/route/user.php

@@ -29,8 +29,6 @@ Route::group('user',function () {
     Route::rule('warehouse', 'v1.user/warehouse');
     //getPayOrder
     Route::rule('getPayOrder','v1.user/getPayOrder');
-    //订单信息
-    Route::rule('getOrderList','v1.user/getOrderList');
     //取消订单
     Route::rule('cancelOrder','v1.user/cancelOrder');
     //查看订单详情

app/api/route/weixin.php

@@ -11,6 +11,8 @@ use think\Response;
  * 无需授权的接口
  */
 Route::group('weixin',function () {
+    //微信 sdk 配置
+    Route::rule('config', 'v1.weixin/jssdk');
     //用户登录
     Route::rule('result', 'v1.weixin/result');
     //微信支付回调

app/model/api/Order.php

@@ -1,5 +1,4 @@
 <?php
-declare (strict_types = 1);
 
 namespace app\model\api;
 
@@ -11,6 +10,12 @@ use think\Model;
  */
 class Order extends BaseModel
 {
+    public function getUserOrderList($uid, $where){
+        $list = $this->where('status', $where['type'])->where('uid', $uid)
+            ->order('time DESC')->page((int)$where['page'], (int)$where['limit'])->select()->toArray();
+        return $list;
+    }
+
     /**
      * 获取列表数据
      * @param $page
@@ -88,7 +93,4 @@ class Order extends BaseModel
         return [$data['total'],$data['data']];
     }
 
-
-
-
 }