会员权益

@@ -12,6 +12,7 @@ use addons\shopro\model\UserOauth;
 use addons\shopro\model\User as UserModel;
 use addons\shopro\model\UserStore;
 use app\api\model\PackageOrder;
+use app\api\model\Package;
 
 /**
  * 会员接口
@@ -105,25 +106,21 @@ class User extends Base
         "code": 1,
         "msg": "会员套餐",
         "time": "1608621344",
-        "data": {
-            "list": [{ //会员套餐列表
-                "id": 1, //套餐ID
-                "package_name": "季度会员", //套餐名称
-                "package_price": "150.00", //套餐价格
-                "month": 3 //会员持续月数
-            }],
-            "description": "富文本内容" //会员权益
-        }
+        "data": [{ //会员套餐列表
+            "id": 1, //套餐ID
+            "package_name": "季度会员", //套餐名称
+            "package_price": "150.00", //套餐价格
+            "month": 3, //会员持续月数
+            "content": "富文本内容" //会员权益
+        }],
     })
      */
     public function package()
     {
-        $list = Db::name('package')
-            ->field('id,package_name,package_price,month')
+        $data = Package::field('id,package_name,package_price,month,content')
             ->order('weigh desc')
             ->select();
-        $description = \addons\shopro\model\Richtext::get(1)['content'];
-        $this->success('会员套餐',compact('list','description'));
+        $this->success('会员套餐',$data);
     }
 
     /**