bug修复

renren-admin/src/main/resources/statics/js/modules/qmgj/memberinfo.js

@@ -244,12 +244,11 @@ $(function () {
     /*省份的初始化*/
     $.ajax({
         type: "POST",
-        url: baseURL + "qmgj/areainfo/province",
+        url: baseURL + "api/region/provinceList",
         contentType: "application/json",
         success: function (r) {
-            ;
             if (r.code == 0) {
-                vm.location.province = r.list;
+                vm.location.province = r.data;
             } else {
                 layer.alert("读取省失败");
             }
@@ -739,12 +738,13 @@ var vm = new Vue({
                 /*区域选择*/
                 $.ajax({
                     type: "POST",
-                    url: baseURL + "qmgj/areainfo/city/" + vm.memberInfo.province,
+                    url: baseURL + "api/region/childList",
                     contentType: "application/json",
                     async: false,
+                    data: JSON.stringify({ id: vm.memberInfo.province }),
                     success: function (r) {
                         if (r.code == 0) {
-                            vm.location.region = r.list;
+                            vm.location.region = r.data;
                         } else {
                             layer.alert("读取市失败");
                         }
@@ -871,13 +871,14 @@ var vm = new Vue({
             vm.colleges = {};
             $.ajax({
                 type: "POST",
-                url: baseURL + "qmgj/areainfo/city/" + d,
+                url: baseURL + "api/region/childList",
                 contentType: "application/json",
                 async: true,
+                data: JSON.stringify({ id: d }),
                 success: function (r) {
                     ;
                     if (r.code == 0) {
-                        vm.location.region = r.list;
+                        vm.location.region = r.data;
                     } else {
                         layer.alert("读取市失败");
                     }

renren-admin/src/main/resources/statics/js/modules/qmgj/school.js

@@ -92,22 +92,22 @@ function handleDel(ids, type) {
 layui.use(['layer', 'form'], function () {
     var $ = layui.jquery, layer = layui.layer, form = layui.form;
     form.on('submit(go)', function (data) {
+        if (!vm.formData.province) {
+            layer.alert("请选择省");
+            return false;
+        }
+        if (!vm.formData.region) {
+            layer.alert("请选择市");
+            return false;
+        }
+        if (!vm.formData.schoolname) {
+            layer.alert("请输入学校名称");
+            return false;
+        }
         $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function () {
             var url = vm.formData.guid == null ? "qmgj/school/save" : "qmgj/school/update";
             // console.log(vm.formData);
             // if (vm.formData)
-            if (!vm.formData.province) {
-                layer.alert("请选择省");
-                return false;
-            }
-            if (!vm.formData.region) {
-                layer.alert("请选择市");
-                return false;
-            }
-            if (!vm.formData.schoolname) {
-                layer.alert("请输入学校名称");
-                return false;
-            }
             $.ajax({
                 type: vm.formData.guid != null ? 'POST' : "POST",
                 url: baseURL + url,
@@ -151,7 +151,11 @@ var vm = new Vue({
             province: [],
             city: []
         },
-        formData: {},
+        formData: {
+            schoolname: '',
+            province: '',
+            region: ''
+        },
     },
     methods: {
         query: function () {
@@ -222,6 +226,11 @@ var vm = new Vue({
         reload: function (event) {
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            if (event == 1) {
+                page = 1;
+            } else {
+                page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            }
             $("#jqGrid").jqGrid('setGridParam', {
                 page: page,
                 postData: vm.queryParam

renren-admin/src/main/resources/statics/js/modules/qmgj/two.js

@@ -106,12 +106,16 @@ function handleDel(ids, type) {
 layui.use(['layer', 'form'], function () {
     var $ = layui.jquery, layer = layui.layer, form = layui.form;
     form.on('submit(go)', function (data) {
+        if (!vm.formData.cityId) {
+            layer.alert("请选择所属区域");
+            return false;
+        }
+        if (!vm.formData.isHot) {
+            layer.alert("请选择是否热门");
+            return false;
+        }
         $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function () {
             var url = vm.formData.id == null ? "qyh/serviceCity/save" : "qyh/serviceCity/update";
-            if (!vm.formData.cityId) {
-                layer.alert("请选择市");
-                return false;
-            }
             // console.log(vm.location.city);
             let obj = vm.location.city.find(v => v.id == vm.formData.cityId) || null;
             // console.log(obj);
@@ -166,6 +170,7 @@ var vm = new Vue({
         formData: {
             cityId: '',
             provinceId: '',
+            isHot: '',
         },
         dict: {
             yesno: {}
@@ -173,7 +178,7 @@ var vm = new Vue({
     },
     methods: {
         query: function () {
-            vm.reload();
+            vm.reload(1);
         },
         add: function () {
             vm.showList = false;
@@ -238,8 +243,13 @@ var vm = new Vue({
             });
         },
         reload: function (event) {
-            vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            if (event == 1) {
+                page = 1;
+            } else {
+                page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            }
+            vm.showList = true;
             $("#jqGrid").jqGrid('setGridParam', {
                 page: page,
                 postData: vm.queryParam

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

@@ -199,7 +199,7 @@ var vm = new Vue({
     },
     methods: {
         query: function () {
-            vm.reload();
+            vm.reload(1);
         },
         add: function () {
             vm.showList = false;
@@ -277,6 +277,11 @@ var vm = new Vue({
         reload: function (event) {
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            if (event == 1) {
+                page = 1;
+            } else {
+                page = $("#jqGrid").jqGrid('getGridParam', 'page');
+            }
             $("#jqGrid").jqGrid('setGridParam', {
                 page: page,
                 postData: vm.queryParam

renren-admin/src/main/resources/templates/modules/qmgj/memberinfo.html

@@ -173,11 +173,11 @@
                 <div class="col-sm-7">
                     <select class="form-control both-select" v-model="memberInfo.province" id="province" @change="province($event)">
                         <option value="" disabled hidden>--省--</option>
-                        <option v-for="item in location.province" :value="item.areaid" title="省份">{{item.areaname}}</option>
+                        <option v-for="item in location.province" :value="item.id" title="省份">{{item.name}}</option>
                     </select>
                     <select id="region" class="form-control both-select" v-model="memberInfo.city" style="margin-left: 1rem" @change="region($event)">
                         <option value="" disabled hidden>--市--</option>
-                        <option v-for="item in location.region" :value="item.areaid">{{item.areaname}}</option>
+                        <option v-for="item in location.region" :value="item.id">{{item.name}}</option>
                     </select>
                     <select class="form-control both-select selectpicker" id="college" v-model="memberInfo.college"data-live-search="true"  title="--学校--" style="margin-left: 1rem">
                         <option v-for="item in colleges" :value="item.itemcode">{{item.itemname}}</option>

renren-admin/src/main/resources/templates/modules/qmgj/school.html

@@ -50,14 +50,14 @@
                     <div class="col-sm-1 control-label"><span style="color: red">*</span>所属区域</div>
                     <div class="col-sm-3" style="width: 16.65%;">
                         <!--                    @change="province"-->
-                        <select class="form-control" v-model="formData.province" @change="province(2)">
+                        <select class="form-control" v-model="formData.province" @change="province(2)" lay-verify="required">
                             <option value="" disabled hidden>--省--</option>
                             <!--<option value="" disabled hidden>湖北省</option>-->
                             <option v-for="item in location.province" :value="item.id">{{item.name}}</option>
                         </select>
                     </div>
                     <div class="col-sm-3" style="width: 16.65%;">
-                        <select class="form-control" v-model="formData.region">
+                        <select class="form-control" v-model="formData.region" lay-verify="required">
                             <option value="" disabled hidden>--市--</option>
                             <option v-for="item in location.city" :value="item.id + ''">{{item.name}}</option>
                         </select>
@@ -66,7 +66,7 @@
                 <div class="form-group">
                     <div class="col-sm-1 control-label"><span style="color: red">*</span>学校名称</div>
                     <div class="col-sm-4">
-                        <input type="text" class="form-control" v-model="formData.schoolname" placeholder="学校名称" />
+                        <input type="text" class="form-control" v-model="formData.schoolname" placeholder="学校名称" lay-verify="required"/>
                     </div>
                 </div>
                 <div class="form-group">

renren-admin/src/main/resources/templates/modules/qmgj/two.html

@@ -40,28 +40,28 @@
 
         <div v-show="!showList" class="panel panel-default">
             <div class="panel-heading">{{title}}</div>
-            <form class="form-horizontal" style="width: 100%;">
+            <form class="form-horizontal layui-form" style="width: 100%;">
                 <div class="form-group">
                     <div class="col-sm-1 control-label"><span style="color: red">*</span>所属区域</div>
                     <div class="col-sm-3" style="width: 16.65%;">
                         <!--                    @change="province"-->
-                        <select class="form-control" v-model="formData.provinceId" @change="province(2)">
+                        <select class="form-control" v-model="formData.provinceId" @change="province(2)" lay-verify="required" id="provinceId">
                             <option value="" disabled hidden>--省--</option>
                             <!--<option value="" disabled hidden>湖北省</option>-->
                             <option v-for="item in location.province" :value="item.id">{{item.name}}</option>
                         </select>
                     </div>
                     <div class="col-sm-3" style="width: 16.65%;">
-                        <select class="form-control" v-model="formData.cityId">
+                        <select class="form-control" v-model="formData.cityId" lay-verify="required" id="cityId">
                             <option value="" disabled hidden>--市--</option>
                             <option v-for="item in location.city" :value="item.id">{{item.name}}</option>
                         </select>
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="col-sm-1 control-label">是否热门</div>
+                    <div class="col-sm-1 control-label"><span style="color: red">*</span>是否热门</div>
                     <div class="col-sm-4">
-                        <select class="form-control" v-model="formData.isHot">
+                        <select class="form-control" v-model="formData.isHot" lay-verify="required" id="isHot">
                             <option value="" disabled hidden>--是否热门--</option>
                             <option v-for="item in dict.yesno" :value="item.itemcode">{{item.itemname}}</option>
                         </select>
@@ -70,8 +70,7 @@
                 <div class="form-group">
                     <div class="col-sm-1 control-label">排序</div>
                     <div class="col-sm-4">
-                        <input type="text" class="form-control" v-model="formData.sort" placeholder="排序"
-                            lay-verify="required" />
+                        <input type="text" class="form-control" v-model="formData.sort" placeholder="排序"/>
                     </div>
                 </div>
                 <div class="form-group">