DuGuYang 3 лет назад
Родитель
Сommit
1a3da5ce5c

+ 1 - 0
Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -86,6 +86,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int MsgType = int.Parse(dic["MsgType"].ToString());
                 if (MsgType == 1) dic["MsgType"] = "文本";
                 if (MsgType == 2) dic["MsgType"] = "图片";
+                if (MsgType == 3) dic["MsgType"] = "动图";
                 if (MsgType == 0) dic["MsgType"] = "";
                 dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
                 //推送类型

+ 32 - 26
Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml

@@ -37,6 +37,7 @@
                                         <option value="">请选择</option>
                                         <option value="1" selected="selected">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                 </div>
                             </div>
@@ -91,46 +92,46 @@
                             @* <div class="layui-form-item">
                                 <label class="layui-form-label">推送类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushType" name="PushType" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">立即推送</option>
-                                        <option value="2">定时推送</option>
-                                    </select>
+                                <select id="PushType" name="PushType" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">立即推送</option>
+                                <option value="2">定时推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送标记</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushFlag" name="PushFlag" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">未推送</option>
-                                        <option value="2">已推送</option>
-                                    </select>
+                                <select id="PushFlag" name="PushFlag" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">未推送</option>
+                                <option value="2">已推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送参数</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
-                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
-                                        autocomplete="off" placeholder="请输入推送时间">
+                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                autocomplete="off" placeholder="请输入推送时间">
                                 </div>
-                            </div> *@
+                                </div> *@
                             @* <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">扩展字段</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
-                                        lay-verify="" placeholder="请输入扩展字段"></textarea>
+                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
+                                lay-verify="" placeholder="请输入扩展字段"></textarea>
                                 </div>
-                            </div> *@
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">跳转Url参数</label>
                                 <div class="layui-input-inline">
@@ -343,6 +344,11 @@
                     $('#BgPics').show();
                     $('#Button').hide();
                 }
+                else if (data.value == '3') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }
                 form.render();
             });
 

+ 1 - 0
Areas/Admin/Views/MainServer/MsgAlert/Edit.cshtml

@@ -42,6 +42,7 @@
                                         <option value="">请选择</option>
                                         <option value="1">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                     <script>$("#MsgType").val("@editData.MsgType");</script>
                                 </div>

+ 1 - 0
Areas/Admin/Views/MainServer/MsgAlert/Index.cshtml

@@ -51,6 +51,7 @@
                                 <option value="">全部...</option>
                                 <option value="1">文本</option>
                                 <option value="2">图片</option>
+                                <option value="3">动图</option>
                             </select>
                         </div>
                     </div>