1

application/api/controller/Common.php

@@ -7,6 +7,7 @@ use app\common\exception\UploadException;
 use app\common\library\Upload;
 use app\common\model\Area;
 use app\common\model\Category;
+use app\common\model\Selection;
 use app\common\model\Version;
 use fast\Random;
 use think\Config;
@@ -174,6 +175,7 @@ class Common extends Api
 
     /**
      * 获取openid
+     * @ApiParams (name="code")
      */
     function getOpenid($code_ = ''){
         $code = $code_;
@@ -191,4 +193,13 @@ class Common extends Api
         if($json_obj['openid'])return $json_obj['openid'];
         $this->error('0',$json_obj);
     }
+
+    /**
+     * 选择项
+     * @ApiParams  (name="type",description="1年龄 2身高")
+     */
+    public function selection(){
+        $this->success('',Selection::all(['type'=>input('type'),'status'=>1]));
+    }
+
 }

application/api/controller/User.php

@@ -332,96 +332,96 @@ class User extends Api
         $this->success();
     }
 
-    /**
-     * 第三方登录
-     *
-     * @ApiMethod (POST)
-     * @param string $platform 平台名称
-     * @param string $code     Code码
-     */
-    public function third()
-    {
-        $url = url('user/index');
-        $platform = $this->request->post("platform");
-        $code = $this->request->post("code");
-        $config = get_addon_config('third');
-        if (!$config || !isset($config[$platform])) {
-            $this->error(__('Invalid parameters'));
-        }
-        $app = new \addons\third\library\Application($config);
-        //通过code换access_token和绑定会员
-        $result = $app->{$platform}->getUserInfo(['code' => $code]);
-        if ($result) {
-            $loginret = \addons\third\library\Service::connect($platform, $result);
-            if ($loginret) {
-                $data = [
-                    'userinfo'  => $this->auth->getUserinfo(),
-                    'thirdinfo' => $result
-                ];
-                $this->success(__('Logged in successful'), $data);
-            }
-        }
-        $this->error(__('Operation failed'), $url);
-    }
+//    /**
+//     * 第三方登录
+//     *
+//     * @ApiMethod (POST)
+//     * @param string $platform 平台名称
+//     * @param string $code     Code码
+//     */
+//    public function third()
+//    {
+//        $url = url('user/index');
+//        $platform = $this->request->post("platform");
+//        $code = $this->request->post("code");
+//        $config = get_addon_config('third');
+//        if (!$config || !isset($config[$platform])) {
+//            $this->error(__('Invalid parameters'));
+//        }
+//        $app = new \addons\third\library\Application($config);
+//        //通过code换access_token和绑定会员
+//        $result = $app->{$platform}->getUserInfo(['code' => $code]);
+//        if ($result) {
+//            $loginret = \addons\third\library\Service::connect($platform, $result);
+//            if ($loginret) {
+//                $data = [
+//                    'userinfo'  => $this->auth->getUserinfo(),
+//                    'thirdinfo' => $result
+//                ];
+//                $this->success(__('Logged in successful'), $data);
+//            }
+//        }
+//        $this->error(__('Operation failed'), $url);
+//    }
 
-    /**
-     * 重置密码
-     *
-     * @ApiMethod (POST)
-     * @param string $mobile      手机号
-     * @param string $newpassword 新密码
-     * @param string $captcha     验证码
-     */
-    public function resetpwd()
-    {
-        $type = $this->request->post("type");
-        $mobile = $this->request->post("mobile");
-        $email = $this->request->post("email");
-        $newpassword = $this->request->post("newpassword");
-        $captcha = $this->request->post("captcha");
-        if (!$newpassword || !$captcha) {
-            $this->error(__('Invalid parameters'));
-        }
-        //验证Token
-        if (!Validate::make()->check(['newpassword' => $newpassword], ['newpassword' => 'require|regex:\S{6,30}'])) {
-            $this->error(__('Password must be 6 to 30 characters'));
-        }
-        if ($type == 'mobile') {
-            if (!Validate::regex($mobile, "^1\d{10}$")) {
-                $this->error(__('Mobile is incorrect'));
-            }
-            $user = \app\common\model\User::getByMobile($mobile);
-            if (!$user) {
-                $this->error(__('User not found'));
-            }
-            $ret = Sms::check($mobile, $captcha, 'resetpwd');
-            if (!$ret) {
-                $this->error(__('Captcha is incorrect'));
-            }
-            Sms::flush($mobile, 'resetpwd');
-        } else {
-            if (!Validate::is($email, "email")) {
-                $this->error(__('Email is incorrect'));
-            }
-            $user = \app\common\model\User::getByEmail($email);
-            if (!$user) {
-                $this->error(__('User not found'));
-            }
-            $ret = Ems::check($email, $captcha, 'resetpwd');
-            if (!$ret) {
-                $this->error(__('Captcha is incorrect'));
-            }
-            Ems::flush($email, 'resetpwd');
-        }
-        //模拟一次登录
-        $this->auth->direct($user->id);
-        $ret = $this->auth->changepwd($newpassword, '', true);
-        if ($ret) {
-            $this->success(__('Reset password successful'));
-        } else {
-            $this->error($this->auth->getError());
-        }
-    }
+//    /**
+//     * 重置密码
+//     *
+//     * @ApiMethod (POST)
+//     * @param string $mobile      手机号
+//     * @param string $newpassword 新密码
+//     * @param string $captcha     验证码
+//     */
+//    public function resetpwd()
+//    {
+//        $type = $this->request->post("type");
+//        $mobile = $this->request->post("mobile");
+//        $email = $this->request->post("email");
+//        $newpassword = $this->request->post("newpassword");
+//        $captcha = $this->request->post("captcha");
+//        if (!$newpassword || !$captcha) {
+//            $this->error(__('Invalid parameters'));
+//        }
+//        //验证Token
+//        if (!Validate::make()->check(['newpassword' => $newpassword], ['newpassword' => 'require|regex:\S{6,30}'])) {
+//            $this->error(__('Password must be 6 to 30 characters'));
+//        }
+//        if ($type == 'mobile') {
+//            if (!Validate::regex($mobile, "^1\d{10}$")) {
+//                $this->error(__('Mobile is incorrect'));
+//            }
+//            $user = \app\common\model\User::getByMobile($mobile);
+//            if (!$user) {
+//                $this->error(__('User not found'));
+//            }
+//            $ret = Sms::check($mobile, $captcha, 'resetpwd');
+//            if (!$ret) {
+//                $this->error(__('Captcha is incorrect'));
+//            }
+//            Sms::flush($mobile, 'resetpwd');
+//        } else {
+//            if (!Validate::is($email, "email")) {
+//                $this->error(__('Email is incorrect'));
+//            }
+//            $user = \app\common\model\User::getByEmail($email);
+//            if (!$user) {
+//                $this->error(__('User not found'));
+//            }
+//            $ret = Ems::check($email, $captcha, 'resetpwd');
+//            if (!$ret) {
+//                $this->error(__('Captcha is incorrect'));
+//            }
+//            Ems::flush($email, 'resetpwd');
+//        }
+//        //模拟一次登录
+//        $this->auth->direct($user->id);
+//        $ret = $this->auth->changepwd($newpassword, '', true);
+//        if ($ret) {
+//            $this->success(__('Reset password successful'));
+//        } else {
+//            $this->error($this->auth->getError());
+//        }
+//    }
 
     /**
      * 基本信息填写
@@ -434,7 +434,7 @@ class User extends Api
      * @param string $education  学历
      * @param string $school  毕业学校
      * @param string $work  工作
-     * @param string $work  收入
+     * @param string $max_income  收入
      * @param string $region_province  家乡所在省份
      * @param string $region_city  家乡所在市区
      * @param string $region_area  家乡所在区域
@@ -454,6 +454,7 @@ class User extends Api
             'education|学历'=>'require',
             'school|毕业学校'=>'require',
             'work|工作'=>'require',
+            'max_income|收入'=>'require',
             'region_province|家乡所在省份'=>'require',
             'region_city|家乡所在市区'=>'require',
             'region_area|家乡所在区域'=>'require',
@@ -709,19 +710,22 @@ class User extends Api
 
     /**
      * 狗粮充值
+     * @ApiParams (name='money')
+     * @ApiParams (name='openid')
      */
     public function addMoney(){
-        echo \addons\epay\library\Service::submitOrder("99.9", "订单号", "wechat", "订单标题", "回调地址", "返回地址", "支付方法");
+        $common = new \app\api\controller\Common();
         $params = [
-            'amount'=>"99.9",
-            'orderid'=>"订单号",
-            'type'=>"wechat",
-            'title'=>"订单标题",
-            'notifyurl'=>"回调地址",
-            'returnurl'=>"返回地址",
+            'amount'=>input('money'),
+            'orderid'=>$common->getOrderId(),
+            'type'=>'wechat',
+            'title'=>'狗粮充值',
+            'notifyurl'=>1,
+            'returnurl'=>1,
             'method'=>"mp",
-            'openid'=>"用户的OpenID"
+            'openid'=>input('openid')
         ];
+//        echo \addons\epay\library\Service::submitOrder("99.9", "订单号", "wechat", "订单标题", "回调地址", "返回地址", "支付方法");
         echo \addons\epay\library\Service::submitOrder($params);
     }
 

application/common/model/Selection.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+class Selection extends Model
+{
+    // 表名
+    protected $name = 'selection';
+
+}

public/assets/js/backend/category.js

@@ -32,8 +32,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 return value.toString().replace(/(&|&)nbsp;/g, ' ');
                             }
                         },
-                        {field: 'nickname', title: __('Nickname')},
-                        {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
+                        // {field: 'nickname', title: __('Nickname')},
+                        // {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'weigh', title: __('Weigh')},
                         {field: 'status', title: __('Status'), operate: false, formatter: Table.api.formatter.status},