0.2.0

niucloud/app/adminapi/controller/diy/Diy.php

@@ -82,7 +82,7 @@ class Diy extends BaseAdminController
             [ "type", "" ],
             [ 'template', '' ],
             [ 'mode', 'diy' ], // 页面展示模式，diy：自定义，fixed：固定
-            [ "value", "" ],
+            [ "value", "", false ],
             [ 'is_default', 0 ],
             [ 'is_change', '' ]
         ]);
@@ -102,9 +102,10 @@ class Diy extends BaseAdminController
         $data = $this->request->params([
             [ "title", "" ],
             [ "name", "" ],
-            [ "value", "" ],
+            [ "value", "", false ],
             [ 'is_change', '' ]
         ]);
+
         $this->validate($data, 'app\validate\diy\Diy.edit');
         ( new DiyService() )->edit($id, $data);
         return success('MODIFY_SUCCESS');
@@ -158,6 +159,7 @@ class Diy extends BaseAdminController
         $diy_service = new DiyService();
         return success($diy_service->getLink());
     }
+
     /**
      * 获取页面模板
      * @return Response

niucloud/app/adminapi/controller/login/Login.php

@@ -16,16 +16,16 @@ use app\service\admin\auth\ConfigService;
 use app\service\admin\auth\LoginService;
 use app\service\admin\upgrade\UpgradeService;
 use app\service\core\addon\CoreAddonDevelopBuildService;
+use app\service\core\addon\WapTrait;
 use app\service\core\menu\CoreMenuService;
 use app\service\core\upload\CoreFileService;
-use app\service\core\weapp\CoreWeappCloudService;
-use app\upgrade\v011\Upgrade;
 use core\base\BaseAdminController;
 use think\facade\Db;
 use think\Response;
 
 class Login extends BaseAdminController
 {
+
     /**
      * 登录
      * @return Response
@@ -69,6 +69,6 @@ class Login extends BaseAdminController
     }
 
     public function test(){
-        (new CoreWeappCloudService())->test();
+       
     }
 }

niucloud/app/adminapi/controller/member/MemberLabel.php

@@ -27,10 +27,9 @@ class MemberLabel extends BaseAdminController
     public function lists()
     {
         $data = $this->request->params([
-
-            ['label_name', ''],
+            [ 'label_name', '' ],
         ]);
-        return success((new MemberLabelService())->getPage($data));
+        return success(( new MemberLabelService() )->getPage($data));
     }
 
     /**
@@ -40,7 +39,7 @@ class MemberLabel extends BaseAdminController
      */
     public function info(int $id)
     {
-        return success((new MemberLabelService())->getInfo($id));
+        return success(( new MemberLabelService() )->getInfo($id));
     }
 
     /**
@@ -51,27 +50,27 @@ class MemberLabel extends BaseAdminController
     {
         $data = $this->request->params([
 
-            ['label_name', ''],
-            ['memo', ''],
-            ['sort', 0],
+            [ 'label_name', '' ],
+            [ 'memo', '' ],
+            [ 'sort', 0 ],
         ]);
         $this->validate($data, 'app\validate\member\MemberLabel.add');
-        $id = (new MemberLabelService())->add($data);
-        return success('ADD_SUCCESS', ['label_id' => $id]);
+        $id = ( new MemberLabelService() )->add($data);
+        return success('ADD_SUCCESS', [ 'label_id' => $id ]);
     }
 
     /**
-     * 菜单或接口更新
+     * 编辑会员标签
      */
     public function edit($id)
     {
         $data = $this->request->params([
-            ['label_name', ''],
-            ['memo', ''],
-            ['sort', 0],
+            [ 'label_name', '' ],
+            [ 'memo', '' ],
+            [ 'sort', 0 ],
         ]);
         $this->validate($data, 'app\validate\member\MemberLabel.edit');
-        (new MemberLabelService())->edit($id, $data);
+        ( new MemberLabelService() )->edit($id, $data);
         return success('EDIT_SUCCESS');
     }
 
@@ -82,8 +81,7 @@ class MemberLabel extends BaseAdminController
      */
     public function del(int $id)
     {
-
-        (new MemberLabelService())->del($id);
+        ( new MemberLabelService() )->del($id);
         return success('DELETE_SUCCESS');
     }
 
@@ -96,7 +94,7 @@ class MemberLabel extends BaseAdminController
      */
     public function getAll()
     {
-        return success((new MemberLabelService())->getAll());
+        return success(( new MemberLabelService() )->getAll());
     }
 
 }

niucloud/app/adminapi/controller/order/Recharge.php

@@ -1,119 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的saas管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud-admin.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author: Niucloud Team
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\controller\order;
-
-use app\service\admin\order\RechargeOrderRefundService;
-use app\service\admin\order\RechargeOrderService;
-use core\base\BaseAdminController;
-use think\Response;
-
-class Recharge extends BaseAdminController
-{
-    /**
-     * 充值订单列表
-     * @return Response
-     */
-    public function lists()
-    {
-        $data = $this->request->params([
-            ['order_no', ''],
-            ['order_status', ''],
-            ['order_from', ''],
-            ['create_time', []],
-            ['pay_time', []],
-            ['member_id', ''],
-            ['start_money', 0],
-            ['end_money', 0]
-        ]);
-        return success((new RechargeOrderService())->getPage($data));
-    }
-
-    /**
-     * 充值订单详情
-     * @param int $order_id
-     * @return Response
-     */
-    public function detail(int $order_id)
-    {
-        return success((new RechargeOrderService())->getDetail($order_id));
-    }
-
-    public function status()
-    {
-        return success((new RechargeOrderService())->getStatus());
-    }
-
-    public function refund($order_id)
-    {
-        $res = (new RechargeOrderRefundService())->create($order_id);
-        if ($res === true) return success();
-        return fail($res);
-    }
-
-    /**
-     * 退款列表
-     * @return Response
-     */
-    public function refundLists()
-    {
-        $data = $this->request->params([
-            ['create_time', []],
-            ['member_id', ''],
-            ['refund_no', ''],
-            ['status', ''],
-            ['keywords', ''],
-            ['order_no', ''],
-        ]);
-        return success((new RechargeOrderRefundService())->getPage($data));
-    }
-
-    /**
-     * 退款详情
-     * @param int $refund_id
-     * @return Response
-     */
-    public function refundDetail(int $refund_id)
-    {
-        return success((new RechargeOrderRefundService())->getDetail($refund_id));
-    }
-
-    /**
-     * 查询退款状态
-     * @return Response
-     */
-    public function refundStatus()
-    {
-        return success((new RechargeOrderRefundService())->getStatus());
-    }
-
-    /**
-     * 退款统计
-     */
-    public function refundStat()
-    {
-        return success((new RechargeOrderRefundService())->stat());
-    }
-
-    /**
-     * 充值统计
-     */
-    public function stat()
-    {
-        $data = $this->request->params([
-            ['member_id', ''],
-        ]);
-        $res = (new RechargeOrderService())->stat($data);
-        return success($res);
-    }
-
-
-}

niucloud/app/adminapi/controller/wechat/Template.php

@@ -31,7 +31,7 @@ class Template extends BaseAdminController
             ['keys', []]
         ]);
         $wechat_template_service = new WechatTemplateService();
-        return success($wechat_template_service->syncAll($data['keys']));
+        return success(data:$wechat_template_service->syncAll($data['keys']));
     }
 
     /**