chengjunhui 1 napja%!(EXTRA string=óta)
szülő
commit
121a755687

+ 11 - 6
renren-admin/src/main/resources/statics/js/modules/qyh/chuangsai.js

@@ -15,7 +15,6 @@ $(function () {
                 width: 80,
                 formatter: function (cellvalue, options, rowObject) {
                     if (rowObject.status == 1) {
-                        var time = rowObject.endtime.split(' ')[0]
                         return "<span>显示</span>"
                     } else if (rowObject.status == 0) {
                         return "<span>隐藏</span>"
@@ -115,11 +114,11 @@ layui.use(['layer', 'form'], function () {
                 return false;
             }
             if (vm.formData.content == null) {
-                layer.alert("请上传封面");
+                layer.alert("请输入内容");
                 return false;
             }
             $.ajax({
-                type: "POST",
+                type: vm.formData.id != null ? 'PUT' : "POST",
                 url: baseURL + url,
                 contentType: "application/json",
                 data: JSON.stringify(vm.formData),
@@ -164,6 +163,12 @@ var vm = new Vue({
             ue.ready(function () {
                 ue.setContent('');
             });
+            if ($('#imgUrl1').val() != '') {
+                vm.formData.fileUrl = $('#imgUrl1').val();
+                $('#imgUrl1').val('');
+            }
+            $('#demo1').attr('src', '');
+            $('#demo1').hidden();
         },
         update: function (event) {
             var id = getSelectedRow();
@@ -191,7 +196,7 @@ var vm = new Vue({
                 if (!lock) {
                     lock = true;
                     $.ajax({
-                        type: "POST",
+                        type: "delete",
                         url: baseURL + "qyh/news/delete",
                         contentType: "application/json",
                         data: JSON.stringify(ids),
@@ -218,8 +223,8 @@ var vm = new Vue({
                         ue.setContent(vm.formData.content);
                     }
                 });
-                if (vm.formData.memberphoto) {
-                    $('#demo1').attr('src', vm.formData.memberphoto);
+                if (vm.formData.fileUrl) {
+                    $('#demo1').attr('src', vm.formData.fileUrl);
                     $('#demo1').show();
                 }
             });

+ 128 - 114
renren-admin/src/main/resources/templates/modules/qmgj/picture.html

@@ -1,136 +1,150 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>banner图片表</title>
     <#include "/header.html">
 </head>
+
 <body>
-<div id="rrapp" v-cloak>
-    <div v-show="showList">
-        <div class="grid-btn">
-            <#if shiro.hasPermission("qmgj:picture:save")>
-            <a class="btn btn-primary" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</a>
-            </#if>
-            <#if shiro.hasPermission("qmgj:picture:update")>
-            <a class="btn btn-primary" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
-            </#if>
-            <#if shiro.hasPermission("qmgj:picture:delete")>
-            <a class="btn btn-primary" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-            </#if>
+    <div id="rrapp" v-cloak>
+        <div v-show="showList">
+            <div class="grid-btn">
+                <#if shiro.hasPermission("qmgj:picture:save")>
+                    <a class="btn btn-primary" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                </#if>
+                <#if shiro.hasPermission("qmgj:picture:update")>
+                    <a class="btn btn-primary" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
+                </#if>
+                <#if shiro.hasPermission("qmgj:picture:delete")>
+                    <a class="btn btn-primary" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                </#if>
+            </div>
+            <table id="jqGrid"></table>
+            <div id="jqGridPager"></div>
         </div>
-        <table id="jqGrid"></table>
-        <div id="jqGridPager"></div>
-    </div>
 
-    <div v-show="!showList" class="panel panel-default">
-        <div class="panel-heading">
-            <input type="button" class="btn btn-warning" @click="reload" value="←"/>&nbsp;
-            {{title}}
-        </div>
-        <form class="form-horizontal layui-form" style="width: 80%">
-            <div class="form-group">
-                <div class="col-sm-2 control-label"><span style="color: red">*</span>图片名称</div>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" v-model="picture.name" placeholder="图片名称" lay-verify="required"/>
-                </div>
+        <div v-show="!showList" class="panel panel-default">
+            <div class="panel-heading">
+                <input type="button" class="btn btn-warning" @click="reload" value="←" />&nbsp;
+                {{title}}
             </div>
-<!--            <div class="form-group">-->
-<!--                <div class="col-sm-2 control-label"><span style="color: red">*</span>图片类型</div>-->
-<!--                <div class="col-sm-4">-->
-<!--                    <select class="form-control" v-model="picture.type">-->
-<!--                        <option value="" disabled hidden>&#45;&#45;图片类型&#45;&#45;</option>-->
-<!--                        <option v-for="item in dict.banner" :value="item.itemcode">{{item.itemname}}</option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <div class="col-sm-2 control-label">绑定区域</div>-->
-<!--                <div class="col-sm-3" style="width: 16.65%;">-->
-<!--                    <select class="form-control" v-model="picture.province" @change="province">-->
-<!--                        <option value="" disabled hidden>&#45;&#45;省&#45;&#45;</option>-->
-<!--                        <option v-for="item in location.province" :value="item.code">{{item.codename}}</option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--                <div class="col-sm-3" style="width: 16.65%;">-->
-<!--                    <select class="form-control" v-model="picture.city">-->
-<!--                        <option value="" disabled hidden>&#45;&#45;市&#45;&#45;</option>-->
-<!--                        <option v-for="item in location.city" :value="item.code">{{item.codename}}</option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-            <div class="form-group">
-                <div class="col-sm-2 control-label">图片地址</div>
-                <div class="col-sm-4">
-                    <div class="layui-upload">
-                        <button type="button" class="layui-btn" id="test1">上传图片</button>
-                        <div class="layui-upload-list">
-                            <table class="upload-table-img">
-                                <tr>
-                                    <td><img class="layui-upload-img" id="demo1" hidden></td>
-                                </tr>
-                            </table>
-                            <p id="demoText1"></p>
+            <form class="form-horizontal layui-form" style="width: 80%">
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"><span style="color: red">*</span>图片名称</div>
+                    <div class="col-sm-4">
+                        <input type="text" class="form-control" v-model="picture.name" placeholder="图片名称"
+                            lay-verify="required" />
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"><span style="color: red">*</span>图片类型</div>
+                    <div class="col-sm-4">
+                        <select class="form-control" v-model="picture.type" lay-verify="required">
+                            <option :value="null" disabled hidden>--图片类型--</option>
+                            <option v-for="item in dict.banner" :value="item.itemcode">{{item.itemname}}</option>
+                        </select>
+                    </div>
+                </div>
+                <!--            <div class="form-group">-->
+                <!--                <div class="col-sm-2 control-label"><span style="color: red">*</span>图片类型</div>-->
+                <!--                <div class="col-sm-4">-->
+                <!--                    <select class="form-control" v-model="picture.type">-->
+                <!--                        <option value="" disabled hidden>&#45;&#45;图片类型&#45;&#45;</option>-->
+                <!--                        <option v-for="item in dict.banner" :value="item.itemcode">{{item.itemname}}</option>-->
+                <!--                    </select>-->
+                <!--                </div>-->
+                <!--            </div>-->
+                <!--            <div class="form-group">-->
+                <!--                <div class="col-sm-2 control-label">绑定区域</div>-->
+                <!--                <div class="col-sm-3" style="width: 16.65%;">-->
+                <!--                    <select class="form-control" v-model="picture.province" @change="province">-->
+                <!--                        <option value="" disabled hidden>&#45;&#45;省&#45;&#45;</option>-->
+                <!--                        <option v-for="item in location.province" :value="item.code">{{item.codename}}</option>-->
+                <!--                    </select>-->
+                <!--                </div>-->
+                <!--                <div class="col-sm-3" style="width: 16.65%;">-->
+                <!--                    <select class="form-control" v-model="picture.city">-->
+                <!--                        <option value="" disabled hidden>&#45;&#45;市&#45;&#45;</option>-->
+                <!--                        <option v-for="item in location.city" :value="item.code">{{item.codename}}</option>-->
+                <!--                    </select>-->
+                <!--                </div>-->
+                <!--            </div>-->
+                <div class="form-group">
+                    <div class="col-sm-2 control-label">图片地址</div>
+                    <div class="col-sm-4">
+                        <div class="layui-upload">
+                            <button type="button" class="layui-btn" id="test1">上传图片</button>
+                            <div class="layui-upload-list">
+                                <table class="upload-table-img">
+                                    <tr>
+                                        <td><img class="layui-upload-img" id="demo1" hidden></td>
+                                    </tr>
+                                </table>
+                                <p id="demoText1"></p>
+                            </div>
                         </div>
+                        <input type="hidden" class="form-control" id="imgUrl1" placeholder="图片地址" />
                     </div>
-                    <input type="hidden" class="form-control" id="imgUrl1" placeholder="图片地址"/>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label"></div>
-                <div class="col-sm-4">
-                    <span style="color: red;">建议尺寸:690*265</span>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"></div>
+                    <div class="col-sm-4">
+                        <span style="color: red;">建议尺寸:690*265</span>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label">跳转类型</div>
-                <div class="col-sm-4">
-                    <select class="form-control" v-model="picture.jumpAddressType">
-                        <option :value="null" disabled hidden>--跳转类型--</option>
-                        <option  value="0">内部跳转</option>
-                        <option  value="1">公众号跳转</option>
-                    </select>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label">跳转类型</div>
+                    <div class="col-sm-4">
+                        <select class="form-control" v-model="picture.jumpAddressType">
+                            <option :value="null" disabled hidden>--跳转类型--</option>
+                            <option value="0">内部跳转</option>
+                            <option value="1">公众号跳转</option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label">跳转链接</div>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" v-model="picture.linkUrl" placeholder="跳转链接"/>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label">跳转链接</div>
+                    <div class="col-sm-4">
+                        <input type="text" class="form-control" v-model="picture.linkUrl" placeholder="跳转链接" />
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label"></div>
-                <div class="col-sm-4" style="color: red;">
-                    <p>活动详情页</p>
-                    <p>地址: /pages/home/index/activityDetail/</p>
-                    <p>参数: activityDetail?id 详情页ID - 必填</p>
-                    <p>例如: /pages/home/index/activityDetail/activityDetail?id=4</p>
-                    <p>备注:id=【数字】,数字是活动的编号。</p>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"></div>
+                    <div class="col-sm-4" style="color: red;">
+                        <p>活动详情页</p>
+                        <p>地址: /pages/home/index/activityDetail/</p>
+                        <p>参数: activityDetail?id 详情页ID - 必填</p>
+                        <p>例如: /pages/home/index/activityDetail/activityDetail?id=4</p>
+                        <p>备注:id=【数字】,数字是活动的编号。</p>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label"><span style="color: red">*</span>排序号</div>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" v-model="picture.sortno" placeholder="排序号" oninput="num(this)" lay-verify="required"/>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"><span style="color: red">*</span>排序号</div>
+                    <div class="col-sm-4">
+                        <input type="text" class="form-control" v-model="picture.sortno" placeholder="排序号"
+                            oninput="num(this)" lay-verify="required" />
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label"><span style="color: red">*</span>是否使用</div>
-                <div class="col-sm-4">
-                    <select class="form-control" v-model="picture.isUsed">
-                        <option value="" disabled hidden>--是否使用--</option>
-                        <option v-for="item in dict.yesno" :value="item.itemcode">{{item.itemname}}</option>
-                    </select>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"><span style="color: red">*</span>是否使用</div>
+                    <div class="col-sm-4">
+                        <select class="form-control" v-model="picture.isUsed">
+                            <option value="" disabled hidden>--是否使用--</option>
+                            <option v-for="item in dict.yesno" :value="item.itemcode">{{item.itemname}}</option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label"></div>
-                <input type="button" lay-submit lay-filter="go" class="btn btn-primary" value="确定"/>
-                &nbsp;&nbsp;<input type="button" class="btn btn-warning" @click="reload" value="返回"/>
-            </div>
-        </form>
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"></div>
+                    <input type="button" lay-submit lay-filter="go" class="btn btn-primary" value="确定" />
+                    &nbsp;&nbsp;<input type="button" class="btn btn-warning" @click="reload" value="返回" />
+                </div>
+            </form>
+        </div>
     </div>
-</div>
 
-<script src="${request.contextPath}/statics/js/modules/qmgj/picture.js?_${.now?long}"></script>
+    <script src="${request.contextPath}/statics/js/modules/qmgj/picture.js?_${.now?long}"></script>
 </body>
-</html>
+
+</html>

+ 9 - 3
renren-admin/src/main/resources/templates/modules/qyh/chuangsai.html

@@ -89,7 +89,7 @@
                     <div class="col-sm-2 control-label"><span style="color: #ff0000">*</span>创建时间</div>
                     <div class="col-sm-4">
                         <input type="text" class="form-control layui-input" id="publishTime"
-                            v-model="formData.publishTime" readonly placeholder="创建时间"  lay-verify="required"/>
+                            v-model="formData.publishTime" readonly placeholder="创建时间" lay-verify="required" />
                     </div>
                 </div>
 
@@ -111,11 +111,17 @@
                         </select>
                     </div>
                 </div>
-
+                <div class="form-group">
+                    <div class="col-sm-2 control-label"><span style="color: red">*</span>排序号</div>
+                    <div class="col-sm-4">
+                        <input type="text" class="form-control" v-model="formData.sortNo" placeholder="排序号"
+                            oninput="intnum(this)" lay-verify="required" />
+                    </div>
+                </div>
                 <div class="form-group">
                     <div class="col-sm-2 control-label"></div>
                     <input type="button" lay-submit lay-filter="go" class="btn btn-primary" id="btnSaveOrUpdate"
-                        data-loading-text="保存中..." value="确定"/>
+                        data-loading-text="保存中..." value="确定" />
                     &nbsp;&nbsp;<input type="button" class="btn btn-warning" @click="reload" value="返回" />
                 </div>
             </form>