登录

application/admin/view/agreement/add.html

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-title" class="form-control" name="row[title]" type="text">
+            <label for="c-title"></label><input id="c-title" class="form-control" name="row[title]" type="text">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
+            <label for="c-content"></label><textarea id="c-content" class="form-control editor" rows="20" name="row[content]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/agreement/edit.html

@@ -9,7 +9,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
+            <textarea id="c-content" class="form-control editor" name="row[content]" cols="50" rows="20">{$row.content|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/agreement/index.html

@@ -9,10 +9,10 @@
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('agreement/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('agreement/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('agreement/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-<!--
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('agreement/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
--->
+                        <!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('agreement/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+
+                                                <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('agreement/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+                        -->
 
                         <div class="dropdown btn-group {:$auth->check('agreement/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
@@ -25,8 +25,8 @@
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('agreement/edit')}" 
-                           data-operate-del="{:$auth->check('agreement/del')}" 
+                           data-operate-edit="{:$auth->check('agreement/edit')}"
+                           data-operate-del="{:$auth->check('agreement/del')}"
                            width="100%">
                     </table>
                 </div>

application/api/controller/Common.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\admin\model\Agreement;
 use app\common\controller\Api;
 use app\common\exception\UploadException;
 use app\common\library\Upload;
@@ -16,17 +17,32 @@ use think\Hook;
  */
 class Common extends Api
 {
-    protected $noNeedLogin = ['init'];
+    protected $noNeedLogin = ['agreement'];
     protected $noNeedRight = '*';
 
     /**
+     * 获取各种协议
+     * @param int id 1用户协议
+     * @ApiReturnParams(name=title,type=string,description=标题)
+     * @ApiReturnParams(name=content,type=string,description=内容)
+     */
+    public function agreement(){
+        $data=input();
+        $this->validate($data,[
+            'id'=>['require'],
+        ]);
+        $agreement=Agreement::find($data['id']);
+        $this->success('',$agreement);
+    }
+
+    /**
      * 加载初始化
      *
      * @param string $version 版本号
      * @param string $lng     经度
      * @param string $lat     纬度
      */
-    public function init()
+    /*public function init()
     {
         if ($version = $this->request->request('version')) {
             $lng = $this->request->request('lng');
@@ -59,7 +75,7 @@ class Common extends Api
         } else {
             $this->error(__('Invalid parameters'));
         }
-    }
+    }*/
 
     /**
      * 上传文件

application/api/controller/Index.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace app\api\controller;
-
-use app\common\controller\Api;
-
-/**
- * 首页接口
- */
-class Index extends Api
-{
-    protected $noNeedLogin = ['*'];
-    protected $noNeedRight = ['*'];
-
-    /**
-     * 首页
-     *
-     */
-    public function index()
-    {
-        $this->success('请求成功');
-    }
-}

application/api/controller/User.php

@@ -369,7 +369,7 @@ class User extends Api
             $ret = $this->auth->register(session_create_id(), '', '', $decryptedData['phoneNumber'], [
                 'openid'=>$session['openid'],
                 'type'=>$data['type'],
-                'unionid'=>$session['unionid'],
+                'unionid'=>$session['unionid']??'',
             ]);
             if ($ret) {
                 $data = ['userinfo' => $this->auth->getUserinfo()];
@@ -377,6 +377,10 @@ class User extends Api
             } else {
                 $this->error($this->auth->getError());
             }
+        }else{
+            $user['openid']=$session['openid'];
+            $user['unionid']=$session['unionid']??'';
+            $user->save();
         }
 
         $this->auth->direct($user['id']);

application/api/controller/UserOrder.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use app\service\Pet;
+
+/**
+ * 用户端订单接口
+ */
+class UserOrder extends Api
+{
+    protected $noNeedLogin = ['category','spec'];
+    protected $noNeedRight = '*';
+
+    /**
+     * 常用地址
+     * @ApiReturnParams (name=id,description=id)
+     * @ApiReturnParams (name=name,description=姓名)
+     * @ApiReturnParams (name=mobile,description=手机号)
+     * @ApiReturnParams (name=address,description=地址)
+     * @ApiReturnParams (name=city,description=城市)
+     */
+    public function address(){
+        $user=$this->auth->getUser();
+        $this->success('',$user->addres()->order('id','desc')->select());
+    }
+    /**
+     * 宠物类别
+     * @ApiReturnParams (name=id,description=id)
+     * @ApiReturnParams (name=name,description=名称)
+     */
+    public function category(Pet $pet){
+        $this->success('',$pet::category());
+    }
+    /**
+     * 宠物规格
+     * @ApiReturnParams (name=id,description=id)
+     * @ApiReturnParams (name=name,description=名称)
+     * @ApiReturnParams (name=weight,description=重量范围)
+     */
+    public function spec(Pet $pet){
+        $this->success('',$pet::spec());
+    }
+}

application/command.php

@@ -17,4 +17,5 @@ return [
     'app\admin\command\Min',
     'app\admin\command\Addon',
     'app\admin\command\Api',
+    \app\common\command\AreaCommand::class,
 ];

application/common/command/AreaCommand.php

@@ -0,0 +1,48 @@
+<?php
+namespace app\common\command;
+
+use app\common\model\Area;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Db;
+
+class AreaCommand extends Command{
+    protected function configure()
+    {
+        $this->setName('area')->setDescription('地区信息');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $this->make();
+    }
+    public function make()
+    {
+        $exists= Area::find(1);
+        if(!$exists){
+            Db::execute("truncate table area");
+            $arr=json_decode(file_get_contents(EXTEND_PATH.'/pcas-code.json'));
+            $this->circle($arr);
+        }
+    }
+
+    protected function circle($arr,$code=null){
+        foreach ($arr as $area){
+            if($code){
+                $temp=Area::where('code',$code)->find();
+            }else{
+                $temp=[];
+            }
+            Area::insert([
+                'pid'=>$temp['id']??0,
+                'name'=>$area->name,
+                'code'=>$area->code,
+                'level'=>($temp['level']??0)+1,
+            ]);
+            if(!empty($area->children)) {
+                $this->circle($area->children,$area->code);
+            }
+        }
+    }
+}

application/common/model/User.php

@@ -141,9 +141,8 @@ class User extends Model
             if ($user && $score != 0) {
                 $before = $user->score;
                 $after = $user->score + $score;
-                $level = self::nextlevel($after);
                 //更新会员信息
-                $user->save(['score' => $after, 'level' => $level]);
+                $user->save(['score' => $after]);
                 //写入日志
                 ScoreLog::create(['user_id' => $user_id, 'score' => $score, 'before' => $before, 'after' => $after, 'memo' => $memo]);
             }
@@ -152,21 +151,7 @@ class User extends Model
             Db::rollback();
         }
     }
-
-    /**
-     * 根据积分获取等级
-     * @param int $score 积分
-     * @return int
-     */
-    public static function nextlevel($score = 0)
-    {
-        $lv = array(1 => 0, 2 => 30, 3 => 100, 4 => 500, 5 => 1000, 6 => 2000, 7 => 3000, 8 => 5000, 9 => 8000, 10 => 10000);
-        $level = 1;
-        foreach ($lv as $key => $value) {
-            if ($score >= $value) {
-                $level = $key;
-            }
-        }
-        return $level;
+    public function addres(){
+        return $this->hasMany(UserAddress::class);
     }
 }

application/common/model/UserAddress.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\Db;
+use think\Model;
+
+/**
+ * 会员模型
+ */
+class UserAddress extends Model
+{
+    public function user(){
+        return $this->belongsTo(User::class);
+    }
+}

application/common/model/UserOrder.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+class UserOrder extends Model
+{
+    protected $type=[
+        'get_time'=>'array',
+        'has_cage'=>'boolean',
+    ];
+}

application/extra/site.php

@@ -4,7 +4,7 @@ return array (
   'name' => '宠365',
   'beian' => '',
   'cdnurl' => '',
-  'version' => '1.0.1',
+  'version' => '1.0.2',
   'timezone' => 'Asia/Shanghai',
   'forbiddenip' => '',
   'languages' => 

application/service/Pet.php

@@ -0,0 +1,24 @@
+<?php
+namespace app\service;
+
+class Pet{
+    public static function category(): array
+    {
+        return [
+            1=>['id'=>1,'name'=>'狗'],
+            2=>['id'=>2,'name'=>'猫'],
+            3=>['id'=>3,'name'=>'鸽子'],
+            4=>['id'=>4,'name'=>'其他'],
+        ];
+    }
+    public static function spec(): array
+    {
+        return [
+            1=>['id'=>1,'name'=>'48*30*32CM','weight'=>'10'],
+            2=>['id'=>1,'name'=>'58*37*37CM','weight'=>'20'],
+            3=>['id'=>1,'name'=>'66*48*53CM','weight'=>'20-40'],
+            4=>['id'=>1,'name'=>'81*58*68CM','weight'=>'40-60'],
+            5=>['id'=>1,'name'=>'91*64*75CM','weight'=>'60-80'],
+        ];
+    }
+}

public/assets/js/backend/agreement.js

@@ -8,9 +8,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'agreement/index' + location.search,
                     add_url: 'agreement/add',
                     edit_url: 'agreement/edit',
-                    del_url: 'agreement/del',
+                    //del_url: 'agreement/del',
                     multi_url: 'agreement/multi',
-                    import_url: 'agreement/import',
+                    //import_url: 'agreement/import',
                     table: 'agreement',
                 }
             });