Browse Source

公告修改,加富文本

lizhen_gitee 3 days ago
parent
commit
8461486b0b

+ 4 - 2
application/admin/lang/en/messagesys.php

@@ -4,9 +4,11 @@ return [
     'Id'         => 'ID',
     'Title'      => 'Title',
     'Title_en'   => 'Title(en)',
-    'Info'       => 'Info',
-    'Info_en'    => 'Info(en)',
+    'Info'       => 'Push Info',
+    'Info_en'    => 'Push Info(en)',
     'Createtime' => 'Create time',
+    'Content'    => 'notice show content',
+    'Content_en' => 'notice show content(en)',
     'Is_index'   => 'Place to home',
     'Is_index 0' => 'no',
     'Is_index 1' => 'yes',

+ 4 - 2
application/admin/lang/zh-cn/messagesys.php

@@ -6,9 +6,11 @@ return [
     'Avatar'        => '头像',
     'Title'         => '消息标题',
     'Title_en'      => '消息标题(en)',
-    'Info'          => '消息内容',
-    'Info_en'       => '消息内容(en)',
+    'Info'          => '推送消息内容',
+    'Info_en'       => '推送消息内容(en)',
     'Sendtime'      => '发布时间',
+    'Content'       => '公告消息内容',
+    'Content_en'    => '公告消息内容(en)',
     'Is_index'      => '放到首页',
     'Is_index 0'    => '否',
     'Is_index 1'    => '是',

+ 13 - 0
application/admin/view/messagesys/add.html

@@ -51,6 +51,19 @@
         </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" name="row[content]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Content_en')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-content_en" class="form-control editor" rows="5" name="row[content_en]" cols="50"></textarea>
+        </div>
+    </div>
+
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_index')}:</label>
         <div class="col-xs-12 col-sm-8">
                         

+ 14 - 0
application/admin/view/messagesys/edit.html

@@ -50,6 +50,20 @@
             <input id="c-sendtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sendtime]" type="text" value="{:$row.sendtime?datetime($row.sendtime):''}">
         </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" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Content_en')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-content_en" class="form-control editor" rows="5" name="row[content_en]" cols="50">{$row.content_en|htmlentities}</textarea>
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_index')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 2
application/api/controller/Demo.php

@@ -188,12 +188,14 @@ class Demo extends Api
 
     public function getui(){
         $getui = new Getui();
-        $cid = 1;
+        $cid = '93b1899b909e112c0799524468d1c1b7';
         $title = '标题';
         $body = '内容';
+        //下面的富文本是不行的
+//        $body = '<p>老房间爱尔兰客服骄傲了几分爱乐维扣积分</p><p><img src="https://xiaoshan-1331914430.cos.ap-beijing.myqcloud.com/uploads/20250310/bb458e3ec671b658b4c92e49ac4e95fa.jpg" data-filename="filename" style="width: 469.984px;"><br></p><p>了阿尔及染发滤色镜反垃圾拉胯</p>';
         $ring_name = 'ringname';
         $type = 1;
-        $platform = 'android';
+        $platform = 'ios';
         $getui->push($cid,  $title,  $body, $ring_name, $type,  $platform);
 
     }