Merge branch 'master' of http://gits.hdlkeji.com:3000/xiegeng/beauti-no

application/api/controller/Common.php

@@ -8,6 +8,8 @@ use app\common\exception\UploadException;
 use app\common\library\Upload;
 use app\common\model\Ad;
 use app\common\model\Area;
+use app\common\model\Feedback;
+use app\common\service\SmsSend;
 use think\Cache;
 use think\Config;
 use think\File;
@@ -17,7 +19,7 @@ use think\File;
  */
 class Common extends Api
 {
-    protected $noNeedLogin = ['agreement','ads','area','area_sort','area_tree','config','get_area','upload'];
+    protected $noNeedLogin = ['agreement','ads','area','area_sort','area_tree','config','get_area','upload','feedback'];
     protected $noNeedRight="*";
     /**
      * 获取各种协议
@@ -115,26 +117,27 @@ class Common extends Api
     }
     /**
      * 意见反馈
-     * @ApiParams (name=type,description="类型")
-     * @ApiParams (name=body,description=内容)
-     * @ApiParams (name=contact,description=联系方式)
+     * @ApiParams (name=name,description="称呼")
+     * @ApiParams (name=phone,description=电话)
+     * @ApiParams (name=sms_code,description=验证码)
+     * @ApiParams (name=title,description=标题)
+     * @ApiParams (name=content,description=内容)
+     * @ApiParams (name=images,description=图片数组)
      */
     public function feedback(){
         $data=input();
         $this->validate($data,[
-            'type'=>['require','max:32'],
-            'body'=>['require','max:250'],
-            'contact'=>['require','max:50'],
+            'name'=>['require','max:10'],
+            'phone'=>['require','integer','length:11'],
+            'title'=>['require','max:10'],
+            'content'=>['require','max:120'],
+            'images'=>['require','array','max:3','min:1'],
+            'images.0'=>['require','url'],
         ]);
-        if($this->auth->getUser()->feedback()->whereTime('created_at','today')->count()>=1){
-            $this->error('您今日已反馈过了');
-        }
-        $this->auth->getUser()->feedback()->save([
-            'type'=>$data['type'],
-            'body'=>$data['body'],
-            'contact'=>$data['contact'],
-        ]);
-        $this->success();
+        SmsSend::setMobile($data['phone'])->setCode($data['sms_code']??'')->check();
+        $feedback=new Feedback();
+        $feedback->allowField(true)->save($data);
+        $this->success('',$feedback);
     }
     /**
      * 获取地区信息

application/api/controller/MobileController.php

@@ -9,6 +9,7 @@ use app\common\model\Area;
 use app\common\model\Mobile;
 use app\common\model\MobileInfo;
 use app\common\model\MobileOrder;
+use app\common\model\MobileOrderNo;
 use app\common\model\Payment;
 use app\common\service\Jdpay;
 use app\common\service\SmsSend;
@@ -335,7 +336,6 @@ class MobileController extends UserApi
 
         $this->success('',$config);
     }
-
     /**
      * 上传开卡资料
      * @ApiParams (name=id,description=订单id)
@@ -372,4 +372,30 @@ class MobileController extends UserApi
         }
         $this->success('');
     }
+    /**
+     * 预定号码
+     * @ApiParams (name=no,description=号码)
+     * @ApiParams (name=price_min,description=最低承受价格)
+     * @ApiParams (name=price_max,description=最高承受价格)
+     * @ApiParams (name=remark,description=备注)
+     * @ApiParams (name=name,description=姓名)
+     * @ApiParams (name=phone,description=联系电话)
+     * @ApiParams (name=county,description=区县ID)
+     * @ApiParams (name=address,description=详细地址)
+     */
+    public function order_no(){
+        $data=$this->_validate([
+            'no'=>['require','integer','length:3,8'],
+            'price_min'=>['require','integer','min:0'],
+            'price_max'=>['require','integer','min:0'],
+            'name'=>['require'],
+            'phone'=>['require','integer','length:11'],
+            'county'=>['require','integer'],
+            'address'=>['require','length:0,250'],
+        ]);
+        $no=new MobileOrderNo;
+        $data['city']=implode(',',Area::getTreeId($data['county']));
+        $no->allowField(true)->save($data);
+        $this->success('');
+    }
 }

application/common/model/Feedback.php

@@ -29,7 +29,9 @@ class Feedback extends Model
     protected $append = [
         'created_at_text'
     ];
-    
+    protected $type=[
+        'images'=>'array',
+    ];
 
     
 

application/common/model/MobileOrderNo.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+use Yansongda\Supports\Str;
+
+/**
+ * 配置模型
+ */
+class MobileOrderNo extends Model
+{
+
+
+
+
+
+
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = true;
+    protected $updateTime=false;
+}

application/index/controller/User.php

@@ -27,7 +27,7 @@ class User extends Frontend
         parent::_initialize();
         $auth = $this->auth;
 
-        if (!Config::get('fastadmin.usercenter')) {
+        if (1) {
             $this->error(__('User center already closed'));
         }