食堂及维修工单修改

nngkxxdp/src/main/java/com/example/nngkxxdp/NngkxxdpApplication.java

@@ -9,7 +9,6 @@ import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactor
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
@@ -18,8 +17,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @MapperScan({"com.example.nngkxxdp.dao", "com.example.nngkxxdp.program.dao"})
 public class NngkxxdpApplication {
 
-    @Value("${http.port}")
-    private Integer port;
+//    @Value("${http.port}")
+//    private Integer port;
 
 
 
@@ -28,16 +27,16 @@ public class NngkxxdpApplication {
     }
 
 //    前面基本一致,只不过注入了一个http端口,主要改下面
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-        tomcat.addAdditionalTomcatConnectors(createStandardConnector()); // 添加http
-        return tomcat;
-    }
-    // 配置http
-    private Connector createStandardConnector() {
-        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-        connector.setPort(port);
-        return connector;
-    }
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+//        tomcat.addAdditionalTomcatConnectors(createStandardConnector()); // 添加http
+//        return tomcat;
+//    }
+//    // 配置http
+//    private Connector createStandardConnector() {
+//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+//        connector.setPort(port);
+//        return connector;
+//    }
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/SmsMessageController.java

@@ -6,7 +6,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.example.nngkxxdp.entity.Wsms;
+import com.example.nngkxxdp.param.SmsVo;
 import com.example.nngkxxdp.service.WebsiteSmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,7 +30,7 @@ import cn.hutool.http.HttpRequest;
 @RestController
 @RequestMapping("smsmessage")
 public class SmsMessageController {
-	
+
 	@Value("${sms.custom}")
 	private String custom;
 
@@ -75,7 +78,7 @@ public class SmsMessageController {
 		boolean saveSendSuccess = smsMessageService.saveSendSuccess(list);
 		return SendUtil.send(true, null, saveSendSuccess);
 	}
-	
+
 	/**
 	 * 发送短信
 	 * @param phone
@@ -95,10 +98,10 @@ public class SmsMessageController {
 		map.put("phoneNumber", phone);
 		map.put("content", content);
 		String result = HttpRequest.post(custom)
-			    .header("_t", String.valueOf(time))
-			    .header("_yz", SecureUtil.md5(phone + "," + content + "," + time))
-			    .form(map)
-			    .execute().body();
+				.header("_t", String.valueOf(time))
+				.header("_yz", SecureUtil.md5(phone + "," + content + "," + time))
+				.form(map)
+				.execute().body();
 		if (!Blank.notBlank(result)) {
 			return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
 		}
@@ -115,15 +118,15 @@ public class SmsMessageController {
 		websiteSmsService.setWebsiteSms(wsms);
 		return SendUtil.send(obj.getBoolean("result"));
 	}
-	
+
 	/**
-	* @Title: getWechatSms 
-	* @Description: 获取微信公众号短信 
-	* @param @param page
-	* @param @param limit
-	* @param @return     
-	* @return Map<String,Object>   
-	* @throws
+	 * @Title: getWechatSms
+	 * @Description: 获取微信公众号短信
+	 * @param @param page
+	 * @param @param limit
+	 * @param @return
+	 * @return Map<String,Object>
+	 * @throws
 	 */
 	@GetMapping("getWechatSms")
 	public Map<String, Object> getWechatSms(Integer page, Integer limit) {
@@ -132,16 +135,32 @@ public class SmsMessageController {
 		}
 		return smsMessageService.getWechatSms(page, limit);
 	}
-	
+
+	@GetMapping("updateWechatSms")
+	public Map<String,Object> updateWechatSms(Integer id, String leadName, String leadPhone, String staffName, String staffPhone){
+
+		SmsVo smsVo = new SmsVo();
+		smsVo.setId(id);
+		smsVo.setLeadName(leadName);
+		smsVo.setLeadPhone(leadPhone);
+		smsVo.setStaffName(staffName);
+		smsVo.setStaffPhone(staffPhone);
+		System.out.println("sssssss"+smsVo);
+		if (ObjectUtil.isEmpty(smsVo.getId()) ) {
+			return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+		}
+		return SendUtil.send(true,"",smsMessageService.updateWechatSms(smsVo));
+	}
+
 	/**
-	 * 
-	* @Title: getWechatSmsDetail 
-	* @Description: 获取微信公众号短信-详情
-	* @param @param page
-	* @param @param limit
-	* @param @return     
-	* @return Map<String,Object>   
-	* @throws
+	 *
+	 * @Title: getWechatSmsDetail
+	 * @Description: 获取微信公众号短信-详情
+	 * @param @param page
+	 * @param @param limit
+	 * @param @return
+	 * @return Map<String,Object>
+	 * @throws
 	 */
 	@GetMapping("getWechatSmsDetail")
 	public Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id) {

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/SmsMessageDao.java

@@ -3,6 +3,7 @@ package com.example.nngkxxdp.dao;
 import java.util.List;
 import java.util.Map;
 
+import com.example.nngkxxdp.param.SmsVo;
 import org.apache.ibatis.annotations.Param;
 
 import com.example.nngkxxdp.entity.SmsMessage;
@@ -76,4 +77,6 @@ public interface SmsMessageDao {
 	Integer getCountInstitution(Map<String, Object> map);
 
 	List<Map<String, Object>> getInstitutionByPaging(Map<String, Object> map);
+
+	int updateWechatSms(SmsVo smsVo);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/param/SmsVo.java

@@ -0,0 +1,12 @@
+package com.example.nngkxxdp.param;
+
+import lombok.Data;
+
+@Data
+public class SmsVo {
+    Integer id;
+    String leadName;
+    String leadPhone;
+    String staffName;
+    String staffPhone;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/SmsMessageService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.example.nngkxxdp.entity.SmsMessage;
+import com.example.nngkxxdp.param.SmsVo;
 
 /**
  * 
@@ -27,4 +28,6 @@ public interface SmsMessageService {
 	Map<String, Object> getWechatSms(Integer page, Integer limit);
 	
 	Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id);
+
+	Boolean updateWechatSms(SmsVo smsVo);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/SmsMessageServiceImpl.java

@@ -3,6 +3,7 @@ package com.example.nngkxxdp.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.example.nngkxxdp.param.SmsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,4 +70,9 @@ public class SmsMessageServiceImpl implements SmsMessageService {
 		return SendUtil.layuiTable(count, smsMessageDao.getWechatSmsDetail((page - 1)*limit, limit, id));
 	}
 
+	@Override
+	public Boolean updateWechatSms(SmsVo smsVo) {
+		return smsMessageDao.updateWechatSms(smsVo)>0;
+	}
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/task/WxTask.java

@@ -54,19 +54,19 @@ public class WxTask {
 
 
     public static void main(String[] args) {
-//        String post = HttpUtil.post(MiniConstant.ACCESSTOKEN+"?grant_type=client_credential&appid="+MiniConstant.APPID+"&secret="+MiniConstant.SECRET,"");
-//        JSONObject jsonObject = new JSONObject(post);
-//        String accessToken = Convert.toStr(jsonObject.get("access_token"));
-//        System.out.println(accessToken);
-
-        CpuInfo cpuInfo = OshiUtil.getCpuInfo();
-        List<NetworkIF> networkIFs = OshiUtil.getNetworkIFs();
-        for (NetworkIF networkif:
-             networkIFs) {
-            System.out.println(networkif);
-        }
+        String post = HttpUtil.post(MiniConstant.ACCESSTOKEN+"?grant_type=client_credential&appid="+MiniConstant.APPID+"&secret="+MiniConstant.SECRET,"");
+        JSONObject jsonObject = new JSONObject(post);
+        String accessToken = Convert.toStr(jsonObject.get("access_token"));
+        System.out.println(accessToken);
 
-        System.out.println(cpuInfo);
+//        CpuInfo cpuInfo = OshiUtil.getCpuInfo();
+//        List<NetworkIF> networkIFs = OshiUtil.getNetworkIFs();
+//        for (NetworkIF networkif:
+//             networkIFs) {
+//            System.out.println(networkif);
+//        }
+//
+//        System.out.println(cpuInfo);
 
     }
 

nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -97,6 +97,7 @@
         ORDER BY b.send_time DESC
     </select>
 
+
     <select id="getCountWechatSmsDetail" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM w_ofa_sms
@@ -301,4 +302,23 @@
         ORDER BY create_time DESC
         LIMIT #{page}, #{limit}
     </select>
+
+    <update id="updateWechatSms">
+        UPDATE `w_ofa`
+        SET
+            <if test="leadName!=null and leadName !=''" >
+                `lead_name` = #{leadName},
+            </if>
+            <if test="leadPhone!=null and leadPhone !=''" >
+                `lead_phone` = #{leadPhone},
+            </if>
+            <if test="staffName!=null and staffName !=''" >
+                `staff_name` = #{staffName},
+            </if>
+            <if test="staffPhone!=null and staffPhone !=''" >
+                `staff_phone` = #{staffPhone},
+            </if>
+            update_time = now()
+            WHERE `id` = #{id};
+    </update>
 </mapper>

nngkxxdp/src/main/resources/static/natj/dataCenter/css/index.css

@@ -52,7 +52,7 @@
 }
 
 .content .year {
-    width: 180px;
+    width: 210px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -63,7 +63,7 @@
 }
 
 .content .year select {
-    width: 125px;
+    width: 140px;
     height: 34px;
     border: 1px solid #D5D5D5;
     border-radius: 4px;

nngkxxdp/src/main/resources/static/page/index.html

@@ -300,6 +300,12 @@
             width: 420px;
             padding: 20px;
         }
+
+        #wechatsms {
+            display: none;
+            width: 420px;
+            padding: 20px;
+        }
     </style>
 </head>
 <body>
@@ -361,9 +367,9 @@
                             </li>
 
 
-                            <li lay-id="main-mslm" class="">
-                                <span class="iconfont icon-a-minshenglanmuziyuan2"></span>民生栏目
-                            </li>
+<!--                            <li lay-id="main-mslm" class="">-->
+<!--                                <span class="iconfont icon-a-minshenglanmuziyuan2"></span>民生栏目-->
+<!--                            </li>-->
                             <li lay-id="main-bmjdgxqk" class="">
 										<span
                                                 class="iconfont icon-a-bumenjiezhengengxinqingkuangziyuan3"></span>部门街道更新情况
@@ -698,60 +704,60 @@
                                         src=""></iframe>
                             </div>
 
-                            <div class="layui-tab-item">
-                                <div class="boxContanier web-assessment">
-                                    <div class="layui-tab layui-tab-brief dataTab" lay-filter="docDemoTabBrief">
-                                        <ul class="layui-tab-title">
-                                            <li class="layui-this">总览</li>
-                                            <li id="mslm-update-tab">更新情况</li>
-                                        </ul>
-                                        <div class="layui-tab-content">
-                                            <div class="layui-tab-item layui-show">
-                                                <table class="layui-table" lay-skin="line" id="attentonTable">
-                                                    <colgroup>
-                                                        <col width="100">
-                                                        <col width="100">
-                                                        <col width="100">
-                                                        <col width="200">
-                                                    </colgroup>
-                                                    <thead>
-                                                    <tr>
-                                                        <th>栏目名称</th>
-                                                        <th>部门</th>
-                                                        <th>文章数</th>
-                                                        <th>最近更新时间</th>
-                                                    </tr>
-                                                    </thead>
-                                                    <tbody id="tileTable"></tbody>
-                                                </table>
-                                            </div>
-                                            <div class="layui-tab-item">
-                                                <div class="DistrictPortal" id="DistrictPortal"></div>
-                                                <div class="tableItem">
-                                                    <table class="layui-table" lay-even="" lay-skin="nob">
-                                                        <thead>
-                                                        <tr class="tHeader">
-                                                            <th rowspan="2">栏目名称</th>
-                                                            <th rowspan="2">所属部门</th>
-                                                            <th class="situation_border"></th>
-                                                            <th colspan="9" rowspan="2" class="situation_border">栏目名称
-                                                            </th>
-
-
-                                                            <th rowspan="2" colspan="3">总计</th>
-                                                            <th rowspan="2" colspan="3">最近更新情况</th>
-                                                        </tr>
-
-                                                        </thead>
-                                                        <tbody id="streetHeader">
-                                                        <tbody>
-                                                    </table>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+<!--                            <div class="layui-tab-item">-->
+<!--                                <div class="boxContanier web-assessment">-->
+<!--                                    <div class="layui-tab layui-tab-brief dataTab" lay-filter="docDemoTabBrief">-->
+<!--                                        <ul class="layui-tab-title">-->
+<!--                                            <li class="layui-this">总览</li>-->
+<!--                                            <li id="mslm-update-tab">更新情况</li>-->
+<!--                                        </ul>-->
+<!--                                        <div class="layui-tab-content">-->
+<!--                                            <div class="layui-tab-item layui-show">-->
+<!--                                                <table class="layui-table" lay-skin="line" id="attentonTable">-->
+<!--                                                    <colgroup>-->
+<!--                                                        <col width="100">-->
+<!--                                                        <col width="100">-->
+<!--                                                        <col width="100">-->
+<!--                                                        <col width="200">-->
+<!--                                                    </colgroup>-->
+<!--                                                    <thead>-->
+<!--                                                    <tr>-->
+<!--                                                        <th>栏目名称</th>-->
+<!--                                                        <th>部门</th>-->
+<!--                                                        <th>文章数</th>-->
+<!--                                                        <th>最近更新时间</th>-->
+<!--                                                    </tr>-->
+<!--                                                    </thead>-->
+<!--                                                    <tbody id="tileTable"></tbody>-->
+<!--                                                </table>-->
+<!--                                            </div>-->
+<!--                                            <div class="layui-tab-item">-->
+<!--                                                <div class="DistrictPortal" id="DistrictPortal"></div>-->
+<!--                                                <div class="tableItem">-->
+<!--                                                    <table class="layui-table" lay-even="" lay-skin="nob">-->
+<!--                                                        <thead>-->
+<!--                                                        <tr class="tHeader">-->
+<!--                                                            <th rowspan="2">栏目名称</th>-->
+<!--                                                            <th rowspan="2">所属部门</th>-->
+<!--                                                            <th class="situation_border"></th>-->
+<!--                                                            <th colspan="9" rowspan="2" class="situation_border">栏目名称-->
+<!--                                                            </th>-->
+
+
+<!--                                                            <th rowspan="2" colspan="3">总计</th>-->
+<!--                                                            <th rowspan="2" colspan="3">最近更新情况</th>-->
+<!--                                                        </tr>-->
+
+<!--                                                        </thead>-->
+<!--                                                        <tbody id="streetHeader">-->
+<!--                                                        <tbody>-->
+<!--                                                    </table>-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
                             <div class="layui-tab-item">
                                 <div class="boxContanier web-assessment">
                                     <div class="rightSameContent">
@@ -844,6 +850,44 @@
                                     <!--                                </div>-->
                                 </form>
                             </div>
+                            <div id="wechatsms">
+                                <form class="layui-form" id="wechatfrom" action="/websitesms/updateWebsiteSms" lay-filter="a">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" >分管领导</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" id="leadName" lay-verify="title" autocomplete="off"
+                                                       placeholder="请输入" class="layui-input"
+                                                       style="width:250px;height:40px;margin-left: 5px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="width: 120px">分管领导电话</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" id="leadPhone" lay-verify="title"
+                                                   autocomplete="off" placeholder="请输入" class="layui-input"
+                                                   style="width:250px;height:40px">
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">工作人员</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" id="staffName" lay-verify="title" autocomplete="off"
+                                                   placeholder="请输入" class="layui-input"
+                                                   style="width:250px;height:40px">
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="width: 120px">工作人员电话</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" id="staffPhone" lay-verify="title" autocomplete="off"
+                                                   placeholder="请输入" class="layui-input"
+                                                   style="width:250px;height:40px">
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
                             <!--							<div class="layui-tab-item">-->
                             <!--								<div class="boxContanier web-assessment web-assessmentde">-->
                             <!--									<div class="commonTitle">-->
@@ -1870,16 +1914,7 @@
                         // console.log($('.navtitle').height() + 'px', 'ccccc')
                     }, 300);
                     break;
-                // 民生栏目
-                case "main-mslm":
-                    if (sessionStorage.LOGIN_TOKEN) {
-                        getMslmTable();
-                    } else {
-                        $('.web-assessment').css('display', 'none');
-                        logout();
-                        tologin();
-                    }
-                    break;
+                // // 民生栏目
                 // 国民经济
                 case "main-gmjj":
                     $('#main-gmjj').attr('src', PATH + '/natj/enter_showStatis.html');

nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -679,7 +679,8 @@ function initSmsTable() {
             },
             {
                 title: '操作', templet: function (d) {
-                    return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + (d.wType + '-' + d.wName) + '\',\'' + d.id + '\')">详情</a>';
+                    return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + (d.wType + '-' + d.wName) + '\',\'' + d.id + '\')">详情</a>' +
+                        '&nbsp&nbsp&nbsp&nbsp<a style="color:#1276ff;cursor: pointer;" onclick="xg1(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + d.leadPhone + '\',\'' + d.staffPhone + '\',\'' + d.id + '\')">修改</a>';
                 }
             }
         ]]
@@ -789,6 +790,7 @@ function initSmsTable() {
 }
 
 function initSmsTableDetail(staffName, leadName, wechat, id) {
+    layer.closeAll();
     $('#w-sms-back').removeClass('layui-hide');
     $('.w-sms-wai-div').addClass('layui-hide');
     var smsContent = '您好,贵单位政务新媒体{wechat}已有{day}天未更新,有超期未更新风险,如不能按时更新,本月政务公开考核将扣分。如因未及时更新被市政府办公厅点名通报批评,会影响单位政务公开年终考核得分,请及时更新';
@@ -839,7 +841,8 @@ function reloadSmsTable() {
             },
             {
                 title: '操作', templet: function (d) {
-                    return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + (d.wType + '-' + d.wName) + '\',\'' + d.id + '\')">详情</a>';
+                    return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + (d.wType + '-' + d.wName) + '\',\'' + d.id + '\')">详情</a>' +
+                        '&nbsp&nbsp&nbsp&nbsp<a style="color:#1276ff;cursor: pointer;" onclick="xg1(\'' + d.staffName + '\',\'' + d.leadName + '\',\'' + d.leadPhone + '\',\'' + d.staffPhone + '\',\'' + d.id + '\')">修改</a>';
                 }
             }
         ]]
@@ -975,3 +978,73 @@ function xg(mainLeader, mainLeaderPhone, leaderperson, leaderphone, workperson,
     });
 }
 
+function xg1(staffName ,leadName, leadPhone, staffPhone,id ) {
+    //为空或者为undefined 清空内容
+    leadName = leadName != "undefined" ? leadName : '';
+    leadPhone = leadPhone != "undefined" ? leadPhone : '';
+    staffName = staffName != "undefined" ? staffName : '';
+    staffPhone = staffPhone != "undefined" ? staffPhone : '';
+
+    $('#leadName').attr('value', leadName);
+    $('#leadPhone').attr('value', leadPhone);
+    $('#staffName').attr("value", staffName);
+    $('#staffPhone').attr("value", staffPhone);
+
+
+
+
+    layer.open({
+        type: 1,
+        title: '短信发送的人员信息修改',
+        content: $('#wechatsms'),
+        area: ['450px', '490px'],
+        btn: ['立即修改', '取消'],
+        yes: function (index, layero) {
+            var lName = $('#leadName').val().trim();
+            var lPhone = $('#leadPhone').val().trim();
+            var sName = $('#staffName').val().trim();
+            var sPhone = $('#staffPhone').val().trim();
+            if (lName==null||lName===''){
+                return layer.msg("分管领导不得为空", {icon: 5});
+            }
+            if (lPhone==null||lPhone===''){
+                return layer.msg("分管领导电话不得为空", {icon: 5});
+            }
+            if (sName==null||sName===''){
+                return layer.msg("工作人员不得为空", {icon: 5});
+            }
+            if (sPhone==null||sPhone===''){
+                return layer.msg("工作人员电话不得为空", {icon: 5});
+            }
+            $.ajax({
+                url: PATH + '/smsmessage/updateWechatSms',
+                type: 'get',
+                data: {
+                    "id": id,
+                    'leadName': lName,
+                    'leadPhone': lPhone,
+                    "staffName": sName,
+                    "staffPhone": sPhone,
+                },
+                success: function (suc) {
+                    console.log(suc)
+                    if (suc.data == true) {
+                        layer.msg("修改成功", {icon: 1});
+                        reloadSmsTable();
+                        layer.close(index);
+                    } else {
+                        layer.msg("修改失败", {icon: 5});
+                    }
+                    $("#wechatfrom")[0].reset();
+                }
+            });
+        },
+        btn2: function (index, layero) {
+            $("#wechatfrom")[0].reset();
+            layui.form.render();
+        },cancel: function(){
+            $("#wechatfrom")[0].reset();
+        }
+    });
+}
+

nnzwminiapp/pages/index/index.wxml

@@ -5,7 +5,7 @@
 			<image class="init-rate" style="height: 76rpx;width: 76rpx;" src="images/onload-init-mini.png"></image>
 		</view>
 	</view>
-	<scroll-view style="height: {{scroll_height}}rpx;" scroll-y="true">
+	<scroll-view style="height: {{scroll_height-70}}rpx;" scroll-y="true">
 		<view class="top">
 			<video src="http://www.cq.gov.cn/masvod/public/2022/06/23/20220623_1818e6fa1b0_r1_1200k.mp4" loop muted controls="{{false}}" show-play-btn="{{false}}" show-center-play-btn="{{false}}" enable-progress-gesture="{{false}}" object-fit="cover" autoplay style="width:100%;height:409rpx"></video>
 			<image src="{{imgUrl}}toplogo.png" class="top-logo" style="top: {{navHeight}}rpx"></image>

nnzwminiapp/pages/myCenter/myCenter.wxml

@@ -1,5 +1,5 @@
 <!--pages/myCenter/myCenter.wxml-->
-<view class="bg" style="height: {{scroll_height}}rpx;">
+<view class="bg" style="height: {{scroll_height-70}}rpx;">
     <view class="head-bg" style="background-image:url({{imgUrl}}xaoji9.webp);">
         <block wx:if="{{!hasUserInfo}}">
             <image src="../images/sculpture.png" alt="" class="headPortrait"></image>

nnzwminiapp/pages/nais/nais.wxml

@@ -1,5 +1,5 @@
 <view >
-	<scroll-view style="height: {{scroll_height}}rpx;" scroll-y="true">
+	<scroll-view style="height: {{scroll_height-250}}rpx;" scroll-y="true">
 		<!-- 南岸概况 -->
 		<view style="position: relative;margin-top: 40rpx;">
 			<image style="width: 250rpx;height: 121rpx;position: absolute;right: -45rpx;top: -10rpx;" src="{{imgUrl}}nais-1-2022-banner.png" />

nnzwminiapp/pages/publics/index/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/publics/publics.wxml-->
 <wxs module="filter" src="./util.wxs"></wxs>
 <view style="background-color: #F5F5F5">
-	<scroll-view style="height: {{scroll_height}}rpx;" scroll-y="true">
+	<scroll-view style="height: {{scroll_height-70}}rpx;" scroll-y="true">
 		<!-- 顶部栏 -->
 		<view class="top">
 			<image src="{{imgUrl}}topbg.webp" style="width: 100%;height:519rpx"></image>

nnzwminiapp/pages/serve/serve.wxml

@@ -1,7 +1,7 @@
 <!--pages/serve/serve.wxml-->
 <!-- 头部 -->
 <view style="background-color: #EEEEEE;">
-	<scroll-view style="height: {{scroll_height}}rpx;" scroll-y="true">
+	<scroll-view style="height: {{scroll_height-70}}rpx;" scroll-y="true">
 	<view class="header" style="background-image: url({{imgUrl}}bgfw.webp)">
 		<image src="{{imgUrl}}map-logo.png" class="logo"></image>
 		<view class="search" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">

nnzwminiapp/pagesPublic/pages/work-order/work-order.wxml

@@ -10,7 +10,7 @@
             <hr class="{{1 == currentIndex ? 'lineBox' : 'notLineBox'}}" />
         </view>
     </view>
-    <swiper class="swiperBox" style="height: {{scroll_height}}rpx" bindchange="pagechange" current="{{currentIndex}}">
+    <swiper class="swiperBox" style="height: {{scroll_height-70}}rpx" bindchange="pagechange" current="{{currentIndex}}">
         <swiper-item class="swiperTtemBox">
             <form bindsubmit="submitWorkOrder">
                 <view class="formBox">
@@ -87,7 +87,7 @@
             <hr class="{{1 == currentIndex ? 'lineBox' : 'notLineBox'}}" />
         </view>
     </view>
-    <swiper class="swiperBox" style="height: {{scroll_height}}rpx" bindchange="pagechange" current="{{currentIndex}}">
+    <swiper class="swiperBox" style="height: {{scroll_height-70}}rpx" bindchange="pagechange" current="{{currentIndex}}">
         <swiper-item class="swiperTtemBox">
             <scroll-view class="viewBox">
                 <view class="item" wx:for="{{repairList}}" wx:for-item="item" wx:key="index" data-id="{{item.id}}" data-isuser="false" bindtap="toDetail">