wupengfei 2 年之前
父節點
當前提交
8773208845

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/user/view/user_feedback/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/user_feedback/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/user_feedback/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/user_feedback/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -221,7 +222,7 @@
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
       <workItem from="1665276346161" duration="19728000" />
-      <workItem from="1665362529961" duration="10608000" />
+      <workItem from="1665362529961" duration="10820000" />
     </task>
     <servers />
   </component>

+ 4 - 2
application/user/controller/UserFeedback.php

@@ -70,8 +70,10 @@ class UserFeedback extends Controller
 
     protected function _form_filter(&$data)
     {
-        $send_user = \app\common\model\UserFeedback::where('id',$data['id'])->value('user_id');
-        UserMessage:: sendUserMessage($send_user,'feedback',1,0,0,$data['id']);
+        $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']) $data['over_time'] = date('Y-m-d H:i:s');
     }
 
 }

+ 1 - 1
application/user/view/user_feedback/index.html

@@ -25,7 +25,7 @@
             <td class='text-center nowrap'>{$vo.create_at}</td>
             <td class='text-center nowrap'>
                 {if !$vo.reply}
-                <span class="layui-btn layui-btn-sm layui-btn-warm"  data-modal='{:url("edit")}?id={$vo.id}'>回 复</span>
+                <span class="layui-btn layui-btn-sm layui-btn-warm"  data-modal='{:url("edit")}?id={$vo.id}'>反馈处理</span>
                 {else}
                 <span class="layui-btn layui-btn-sm "  data-modal='{:url("edit")}?id={$vo.id}'>查 看</span>
                 {/if}