1111

app/Http/Controllers/MessageController.php

@@ -124,7 +124,7 @@ class MessageController extends Controller
         $paths = [["title" => "首页", "href" => '/database/']];
         $paths = [["title" => "首页", "href" => '/database/']];
         $username = $request->user->email;
         $username = $request->user->email;
         $useremail = $request->user->email;
         $useremail = $request->user->email;
-        $menuconfig = DB::table('config')->where('config_id', 3)->first();
+        $menuconfig = DB::table('config')->where('config_id', 4)->first();
         $menus = [];
         $menus = [];
         if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
         if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
             $menus = [];
             $menus = [];

public/js/Message/allhistorylist.js

@@ -17,5 +17,5 @@ $('#search-btn').click(function () {
     var search_sendtime = $('#Choice_start').val();
     var search_sendtime = $('#Choice_start').val();
     var search_channel = $('#search-msg-channel option:selected').val();
     var search_channel = $('#search-msg-channel option:selected').val();
     var search_status = $('#search-msg-status option:selected').val();
     var search_status = $('#search-msg-status option:selected').val();
-    window.location.href="/message/allhistoryList?search_id="+search_id+"&search_user="+search_user+"&search_sendtime="+search_sendtime+"&search_channel="+search_channel+"&search_status="+search_status;
+    window.location.href="/message/allhistorylist?search_id="+search_id+"&search_user="+search_user+"&search_sendtime="+search_sendtime+"&search_channel="+search_channel+"&search_status="+search_status;
 })
 })
\ No newline at end of file

public/js/Message/sendmanualmessage.js

@@ -35,18 +35,18 @@ $('#msg_tpl_submit').click(function()
     {
     {
         if($("#inner-tpl-type option:selected").val()==0)
         if($("#inner-tpl-type option:selected").val()==0)
         {
         {
-            Prompt('请选择消息类型',  5);
+            Prompt('请选择站内信类型',  5);
             return false;
             return false;
         }
         }
         if(!$('#inner-tpl-title').val())
         if(!$('#inner-tpl-title').val())
         {
         {
-            Prompt('请填写消息标题',  5);
+            Prompt('请填写站内信标题',  5);
             return false;
             return false;
         }
         }
         var ue = UE.getEditor('inner-tpl-content');
         var ue = UE.getEditor('inner-tpl-content');
         if(!ue.getContent())
         if(!ue.getContent())
         {
         {
-            Prompt('请填写消息内容',  5);
+            Prompt('请填写站内信内容',  5);
             return false;
             return false;
         }
         }
         if(!$("input[id='inner-tpl-op-url']").is(':checked') && !$("input[id='inner-tpl-op-open']").is(':checked'))
         if(!$("input[id='inner-tpl-op-url']").is(':checked') && !$("input[id='inner-tpl-op-open']").is(':checked'))