wupengfei 2 lat temu
rodzic
commit
56f3ca0ebb

+ 5 - 4
.idea/workspace.xml

@@ -2,9 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/application/common/model/UserFeedback.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/FeedBack.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/FeedBack.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/UserFeedback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserFeedBack.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/FeedBack.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Feedback.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/UserFeedBack.php" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -138,10 +139,10 @@
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\zs\gaoyixia\application\common\model" />
+      <recent name="D:\zs\gaoyixia\application\api\controller" />
       <recent name="D:\zs\gaoyixia\application\nutrition\controller" />
       <recent name="D:\zs\gaoyixia\application\nutrition\view" />
       <recent name="D:\zs\gaoyixia\application\operate\controller" />
-      <recent name="D:\zs\gaoyixia\application\operate\view" />
     </key>
   </component>
   <component name="SvnConfiguration">
@@ -223,7 +224,7 @@
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
       <workItem from="1665276346161" duration="19728000" />
-      <workItem from="1665362529961" duration="12800000" />
+      <workItem from="1665362529961" duration="12978000" />
     </task>
     <servers />
   </component>

+ 9 - 9
application/api/controller/FeedBack.php → application/api/controller/Feedback.php

@@ -1,15 +1,15 @@
 <?php
 namespace app\api\controller;
-use app\common\model\UserFeedBack;
+use app\common\model\UserFeedback;
 use app\common\model\UserMessage;
 
 
 /**
  * @title 反馈
- * @controller FeedBack
+ * @controller Feedback
  * @group base
  */
-class FeedBack extends Base
+class Feedback extends Base
 {
     public function initialize()
     {
@@ -21,7 +21,7 @@ class FeedBack extends Base
      * @title 用户反馈
      * @desc  用户反馈
      * @author  qc
-     * @url /api/FeedBack/leaveFeedback
+     * @url /api/Feedback/leaveFeedback
      * @method POST
      * @header name:Authorization require:1 desc:Token
      * @param name:content type:string require:1 default:-- desc:反馈内容
@@ -35,7 +35,7 @@ class FeedBack extends Base
             'desc'=>input('desc'),
             'create_at'=>date('Y-m-d H:i:s')
         ];
-        $res =  UserFeedBack::create($insert_data);
+        $res =  UserFeedback::create($insert_data);
         $this->success('反馈成功',$res->id);
     }
 
@@ -43,7 +43,7 @@ class FeedBack extends Base
      * @title 用户反馈列表
      * @desc  用户反馈列表
      * @author  qc
-     * @url /api/Feed_back/getFeedbackList
+     * @url /api/Feedback/getFeedbackList
      * @method GET
      * @header name:Authorization require:1 desc:Token
      * @param name:page type:int default:0 desc:页数
@@ -58,7 +58,7 @@ class FeedBack extends Base
      */
     public function getFeedbackList()
     {
-        $list  = UserFeedBack::where(['user_id'=>$this->user_id])
+        $list  = UserFeedback::where(['user_id'=>$this->user_id])
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         $this->success('ok',['list'=>$list]);
@@ -68,7 +68,7 @@ class FeedBack extends Base
      * @title 用户反馈详情
      * @desc  用户反馈详情
      * @author  qc
-     * @url /api/Feed_back/getFeedbackInfo
+     * @url /api/Feedback/getFeedbackInfo
      * @method GET
      * @header name:Authorization require:1 desc:Token
      * @param name:id type:int default:0 desc:反馈记录id
@@ -83,7 +83,7 @@ class FeedBack extends Base
     public function getFeedbackInfo()
     {
         $id = input('get.id');
-        $detail  = UserFeedBack::where(['user_id'=>$this->user_id,'id'=>$id])->find()->toArray();
+        $detail  = UserFeedback::where(['user_id'=>$this->user_id,'id'=>$id])->find()->toArray();
         $this->success('ok',['detail'=>$detail]);
     }
 

+ 0 - 9
application/common/model/UserFeedBack.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 会员下载
-class UserFeedBack extends Model
-{
-    protected $name = 'UserFeedback';
-
-}

+ 9 - 0
application/common/model/UserFeedback.php

@@ -0,0 +1,9 @@
+<?php
+namespace app\common\model;
+use think\Model;
+// 会员反馈
+class UserFeedback extends Model
+{
+
+
+}

+ 1 - 1
application/user/controller/UserFeedback.php

@@ -70,7 +70,7 @@ class UserFeedback extends Controller
 
     protected function _form_filter(&$data)
     {
-        $info = \app\common\model\UserFeedBack::where('id',$data['id'])->find()->toArray();
+        $info = \app\common\model\UserFeedback::where('id',$data['id'])->find()->toArray();
         UserMessage:: sendUserMessage($info['user_id'],'feedback',1,0,0,$data['id']);
         if($data['status'] == 1 && $info['status'] != $data['status']) $data['dispose_time'] = date('Y-m-d H:i:s');
         if($data['status'] == 2 && $info['status'] != $data['status']) {