20210222基本测试通过

bjyy-core/src/main/java/com/wmeimob/bjyy/interceptor/WxInterceptor.java

@@ -2,10 +2,16 @@ package com.wmeimob.bjyy.interceptor;
 
 import java.net.URLEncoder;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.wmeimob.bjyy.model.User;
+import com.wmeimob.bjyy.util.RedisUtil;
+import com.wmeimob.wechat.model.user.WxUserInfoBase;
+import com.wmeimob.wmcore.network.HttpUtil;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -31,6 +37,11 @@ public class WxInterceptor implements HandlerInterceptor {
 //		SessionUtil.setSession(SessionUtil.SESSION_WX_OPENID, "ot99rxBy43yhkPsa3TaQ3L8vtQvM");
 		String openId = SessionUtil.getValue(SessionUtil.SESSION_WX_OPENID);
 		log.debug("#############WxInterceptor preHandle###############openId:" + openId);
+
+//		//查找redis内是否有该openId
+//		User usr = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
+//		log.info("查找redis内的用户信息：" + usr);
+
 		if (Strings.isNullOrEmpty(openId)) {
 			StringBuilder sb = new StringBuilder();
 			sb.append(WeChatUtil.CALLBACK).append(contextPath).append("/home/start?backUrl=").append(uri);

bjyy-weixin/src/main/java/com/wmeimob/bjyy/controller/CoreController.java

@@ -53,6 +53,7 @@ public class CoreController {
 		String openId = SessionUtil.getValue(SessionUtil.SESSION_WX_OPENID);
 		log.info("获取openId:"+openId);
 		User user = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
+		log.info("获取key:" + RedisUtil.PREFIX_USER_INFO + openId);
 		log.info("读取redis内的信息:"+user);
 		if(user == null || StringUtils.isEmpty(user.getRegisterNo())){
 			mv.setViewName("/core/register");//跳转到注册码注册页面
@@ -84,6 +85,7 @@ public class CoreController {
 	@RequestMapping(value = "register")
 	@ResponseBody
 	public ResultVO register(String no) {
+		log.info("提交注册码：" + no);
 		ResultVO result = new ResultVO();
 		if(StringUtils.isEmpty(no)){
 			result.setCode(-1);
@@ -91,6 +93,7 @@ public class CoreController {
 			return result;
 		}
 		Register register=coreService.queryRegisterNo(no);
+		log.info("查找注册码是否存在：" + register);
 		if(register==null || !register.getStatus()){
 			result.setCode(-1);
 			result.setMessage("该注册码已失效");
@@ -99,17 +102,25 @@ public class CoreController {
 		
 		User user=new User();
 		user.setRegisterNo(no);
+		log.info("给user赋值：" + user);
 		List<User> queryUserByCondition=userService.queryUserByCondition(user);
+		log.info("查找使用该注册码的用户：" + queryUserByCondition);
 		if(null!=queryUserByCondition && queryUserByCondition.size()>0){
 			result.setCode(-1);
 			result.setMessage("该注册码已被绑定");
 			return result;
 		}
 		String openId = SessionUtil.getValue(SessionUtil.SESSION_WX_OPENID);
+		log.info("查找openId：" + openId);
 		User usr = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
+		log.info("查找redis内的用户信息：" + usr);
+		if(usr == null){
+			usr = new User();
+		}
 		usr.setRegisterNo(no);
 		usr.setUpdateAt(new Date());
 		int editUserInformation = userService.editUserInformation(usr);
+		log.info("修改用户信息：" + editUserInformation);
 		if(editUserInformation>0){
 			//更新redis里的user信息
 			RedisUtil.setValue(RedisUtil.PREFIX_USER_INFO + openId, usr);
@@ -118,6 +129,7 @@ public class CoreController {
 			register.setUpdatedAt(new Date());
 			coreService.updateRegister(register);
 			result.setCode(0);
+			log.info("更新注册码表的信息：" + editUserInformation);
 		}else{
 			result.setCode(-1);
 			result.setMessage("注册失败，请重试");

bjyy-weixin/src/main/java/com/wmeimob/bjyy/controller/DownloadController.java

@@ -0,0 +1,28 @@
+package com.wmeimob.bjyy.controller;
+
+import com.wmeimob.bjyy.model.MentalTest;
+import com.wmeimob.bjyy.service.MentalService;
+import com.wmeimob.bjyy.util.DateUtil;
+import com.wmeimob.bjyy.util.UploadFileUtil_Servlet3;
+import lombok.extern.log4j.Log4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+@Log4j
+@RestController
+@RequestMapping("/practice")
+public class DownloadController {
+    @Resource
+    private MentalService mentalService;
+
+    @RequestMapping("download")
+    public void download(HttpServletResponse response, String testId) throws Exception {
+        log.info("下载：{}" + testId);
+        MentalTest test = mentalService.getMentalTestById(testId);
+        UploadFileUtil_Servlet3.download(response, test.getPdfUrl(),
+                "脑益宝—老年脑健康认知训练方案" + DateUtil.format(test.getTestAt(), DateUtil.yyyyMMddDot) + ".pdf");
+    }
+}

bjyy-weixin/src/main/java/com/wmeimob/bjyy/service/impl/MentalServiceImpl.java

@@ -28,113 +28,113 @@ import com.wmeimob.bjyy.vo.ScoreVO;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class MentalServiceImpl implements MentalService{
-	
-	private Logger log = Logger.getLogger(this.getClass());
-	
-	@Autowired
-	private MentalTestMapper  mentalTestMapper;
-	
-	@Autowired
-	private HealthRecordMapper healthRecordMapper;
-	
-	@Autowired
-	private ScoreMapper scoreMapper;
-	
-	@Autowired
-	private PracticeMapper practiceMapper;
-	
-	@Autowired
-	private FollowUpMapper followUpMapper;
-	
-	@Autowired
-	private CareMapper careMapper;
- 
-	@Override
-	public MentalTest queryRecentMental(String userId) {
-		return mentalTestMapper.selectRecentMental(userId);
-	}
-
-	@Override
-	public int editHealthRecord(HealthRecord healthRecord) {
-		return healthRecordMapper.updateHealthRecord(healthRecord);
-	}
-
-	@Override
-	public MentalTest queryMentalRecordNewest(String userId) {
-		return mentalTestMapper.selectMentalRecordNewest(userId);
-	}
-
-	@Override
-	public List<MentalTest> queryMentalRecordTop(String userId) {
-		return mentalTestMapper.selectMentalRecordTop(userId);
-	}
-
-	@Override
-	public ScoreVO queryScoreSum(ArrayList<Integer> str) {
-		return scoreMapper.selectScoreSum(str);
-	}
-
-	@Override
-	public int addMentalRecord(MentalTest mentalTest) {
-		int flag=0;
-		try {
-			flag+=mentalTestMapper.insertSelective(mentalTest);
-			//添加健康档案
-			HealthRecord healthRecord=new HealthRecord();
-			healthRecord.setId(UUID.randomUUID().toString());
-			healthRecord.setMentalId(mentalTest.getId());
-			healthRecord.setUserId(mentalTest.getUserId());
-			//查询是否有最新随访记录
-			FollowUp followUp=followUpMapper.selectFollowUpByUserId(mentalTest.getUserId());
-			if(null!=followUp){
-				healthRecord.setFollowId(followUp.getId());
-			}
-			//查询是否有最新的ZBI照顾者记录
-			Care care=careMapper.selectZBICareNewest(mentalTest.getUserId());
-			if(null!=care){
-				healthRecord.setCareId(care.getId());
-			}
-			healthRecord.setRecordAt(new Date());
-			healthRecord.setCreateAt(new Date());
-			healthRecord.setUpdateAt(new Date());
-			healthRecord.setStatus(true);
-			flag+=healthRecordMapper.insertSelective(healthRecord);
-		} catch (Exception e) {
-			flag=0;
-			log.debug("############MentalServiceImpl  addMentalRecord#########e="+e.getMessage());
-		}
-		return flag;
-	}
-
-	@Override
-	public Practice queryPracticeNewest(String userId, String mentalId) {
-		return practiceMapper.selectPracticeNewest(userId,mentalId);
-	}
-
-	@Override
-	public int addPracticeRecord(PracticeVO practiceVO) {
-		return practiceMapper.insertSelective(practiceVO);
-	}
-
-	@Override
-	public HealthRecordVO queryHealthRecordNewest(String userId) {
-		return healthRecordMapper.selectHealthRecordNewest(userId);
-	}
-
-	@Override
-	public List<HealthRecord> queryHealthRecordList(String userId) {
-		return healthRecordMapper.selectHealthRecordList(userId);
-	}
-
-	@Override
-	public HealthRecordVO queryHealthRecordDetail(String userId, String id) {
-		return healthRecordMapper.selectHealthRecordDetail(userId,id);
-	}
-
-	@Override
-	public MentalTest getMentalTestById(String testId) {
-		return mentalTestMapper.selectByPrimaryKey(testId);
-	}
+public class MentalServiceImpl implements MentalService {
+
+    private Logger log = Logger.getLogger(this.getClass());
+
+    @Autowired
+    private MentalTestMapper mentalTestMapper;
+
+    @Autowired
+    private HealthRecordMapper healthRecordMapper;
+
+    @Autowired
+    private ScoreMapper scoreMapper;
+
+    @Autowired
+    private PracticeMapper practiceMapper;
+
+    @Autowired
+    private FollowUpMapper followUpMapper;
+
+    @Autowired
+    private CareMapper careMapper;
+
+    @Override
+    public MentalTest queryRecentMental(String userId) {
+        return mentalTestMapper.selectRecentMental(userId);
+    }
+
+    @Override
+    public int editHealthRecord(HealthRecord healthRecord) {
+        return healthRecordMapper.updateHealthRecord(healthRecord);
+    }
+
+    @Override
+    public MentalTest queryMentalRecordNewest(String userId) {
+        return mentalTestMapper.selectMentalRecordNewest(userId);
+    }
+
+    @Override
+    public List<MentalTest> queryMentalRecordTop(String userId) {
+        return mentalTestMapper.selectMentalRecordTop(userId);
+    }
+
+    @Override
+    public ScoreVO queryScoreSum(ArrayList<Integer> str) {
+        return scoreMapper.selectScoreSum(str);
+    }
+
+    @Override
+    public int addMentalRecord(MentalTest mentalTest) {
+        int flag = 0;
+        try {
+            flag += mentalTestMapper.insertSelective(mentalTest);
+            //添加健康档案
+            HealthRecord healthRecord = new HealthRecord();
+            healthRecord.setId(UUID.randomUUID().toString());
+            healthRecord.setMentalId(mentalTest.getId());
+            healthRecord.setUserId(mentalTest.getUserId());
+            //查询是否有最新随访记录
+            FollowUp followUp = followUpMapper.selectFollowUpByUserId(mentalTest.getUserId());
+            if (null != followUp) {
+                healthRecord.setFollowId(followUp.getId());
+            }
+            //查询是否有最新的ZBI照顾者记录
+            Care care = careMapper.selectZBICareNewest(mentalTest.getUserId());
+            if (null != care) {
+                healthRecord.setCareId(care.getId());
+            }
+            healthRecord.setRecordAt(new Date());
+            healthRecord.setCreateAt(new Date());
+            healthRecord.setUpdateAt(new Date());
+            healthRecord.setStatus(true);
+            flag += healthRecordMapper.insertSelective(healthRecord);
+        } catch (Exception e) {
+            flag = 0;
+            log.debug("############MentalServiceImpl  addMentalRecord#########e=" + e.getMessage());
+        }
+        return flag;
+    }
+
+    @Override
+    public Practice queryPracticeNewest(String userId, String mentalId) {
+        return practiceMapper.selectPracticeNewest(userId, mentalId);
+    }
+
+    @Override
+    public int addPracticeRecord(PracticeVO practiceVO) {
+        return practiceMapper.insertSelective(practiceVO);
+    }
+
+    @Override
+    public HealthRecordVO queryHealthRecordNewest(String userId) {
+        return healthRecordMapper.selectHealthRecordNewest(userId);
+    }
+
+    @Override
+    public List<HealthRecord> queryHealthRecordList(String userId) {
+        return healthRecordMapper.selectHealthRecordList(userId);
+    }
+
+    @Override
+    public HealthRecordVO queryHealthRecordDetail(String userId, String id) {
+        return healthRecordMapper.selectHealthRecordDetail(userId, id);
+    }
+
+    @Override
+    public MentalTest getMentalTestById(String testId) {
+        return mentalTestMapper.selectByPrimaryKey(testId);
+    }
 
 }

bjyy-weixin/src/main/java/com/wmeimob/bjyy/service/impl/UserServiceImpl.java

@@ -85,6 +85,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public ResultVO addInfoBasic(UserVO userVO) {
+		log.info("进入添加信息接口"+userVO);
 		ResultVO result=new ResultVO();
 		if(userVO==null){
 			result.setCode(-1);
@@ -103,15 +104,18 @@ public class UserServiceImpl implements UserService {
 		}
 		RedisUtil.setValue(RedisUtil.PREFIX_MOBILE_CODE + userVO.getMobile(), "");
 		try {
+			log.info("添加基本信息"+userVO);
 		    userVO.setId(user.getId());
 		    userVO.setSex(Integer.valueOf(userVO.getGender()==null?"0":userVO.getGender()));
 		    userVO.setBirthDate(new SimpleDateFormat("yyyy-MM-dd").parse(userVO.getBirthDay()));
 		    int updateByPrimaryKeySelective = userMapper.updateBySelective(userVO);
+			log.info("修改信息"+updateByPrimaryKeySelective);
 			if(updateByPrimaryKeySelective>0){
 				User selectByOpenId = userMapper.selectByOpenId(openId);
 				//将更新的user信息放进redis里
 				RedisUtil.setValue(RedisUtil.PREFIX_USER_INFO + openId, selectByOpenId);
 				result.setCode(0);
+				log.info("更新redis");
 			}
 		} catch (Exception e) {
 			result.setCode(-1);

bjyy-weixin/src/main/webapp/WEB-INF/pages/measure/care_index.jsp

@@ -90,7 +90,7 @@
 </div>
 
 <script src="${contextPath}/static/js/swiper.animate.min.js"></script>
-<%--<%--//<script src="${contextPath}/static/js/iscroll.js"></script>--%>--%>
+<%--<%--//<script src="${contextPath}/static/js/iscroll.js"></script>--%>
 <script src="${contextPath}/static/js/main.js"></script>
 
 

bjyy-weixin/src/main/webapp/WEB-INF/pages/measure/follow_up_add.jsp

@@ -17,6 +17,10 @@
 <script src="${contextPath}/static/js/swiper.min.js"></script>
 <link rel="stylesheet" href="${contextPath}/static/css/swiper.min.css">
 <link rel="stylesheet" type="text/css" href="${contextPath}/static/css/style.css"/>
+
+<link rel="stylesheet" href="${contextPath}/static/css/rui_date.css">
+<script src="${contextPath}/static/js/chooseDate.js"></script>
+<script src="${contextPath}/static/js/rui_date.js"></script>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
@@ -42,12 +46,19 @@
                                       <span class="nonetest">未作测评</span>
                                   </div>
                              </label>
-                             <label class="clearfix">
-                                  <div class="left">测评时间</div>
-                                  <div class="right">
-                                       <input type="date" name="testTime" />
-                                  </div>
-                             </label>
+<%--                             <label class="clearfix">--%>
+<%--                                  <div class="left">测评时间</div>--%>
+<%--                                  <div class="right">--%>
+<%--                                       <input type="date" name="testTime" />--%>
+<%--                                  </div>--%>
+<%--                             </label>--%>
+                           <label class="clearfix">
+                               <div class="left">测评时间</div>
+                               <div class="right">
+                                   <input id="demo1" type="text" data-toid-date="date" name="testTime" data-type="0"/></input>
+                                   <input type="hidden" id="date" name="date">
+                               </div>
+                           </label>
                              <label class="clearfix">
                                   <div class="left">Mmse得分</div>
                                   <div class="right">
@@ -229,5 +240,26 @@
         });
   
 </script>
+
+<script>
+
+    /* 公农历选择切换插件 */
+    var pcx = pcx || {};
+    pcx.dc = new Lunar(); // 天干地支年份计算
+
+    var date1 = new ruiDatepicker().init('#demo1');
+
+    // 可通过下面的说明自行添加多几个年份，BaseKanChih 这个没找到很好的计算方式，我都不随便写，没用到所以不影响
+    function tagLunarCal(d, i, w, k, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) {
+        this.BaseDays = d;         /* 1 月 1 日到正月初一的累计日 */
+        this.Intercalation = i;    /* 闰月月份. 0==此年沒有闰月 */
+        this.BaseWeekday = w;      /* 此年 1 月 1 日为星期减 1 */
+        this.BaseKanChih = k;      /* 此年 1 月 1 日之干支序号减 1 */
+        this.MonthDays = [m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13]; /* 此农历年每月之大小, 0==小月(29日), 1==大月(30日) */
+    }
+    /* new tagLunarCal( 24,  4, 2, 38, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1 ),
+    new tagLunarCal( 42,  0, 4, 44, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 ),
+    new tagLunarCal( 31,  0, 5, 49, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0 ) */
+</script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/practice.jsp

@@ -38,7 +38,7 @@
                        <h2 id="wholePeriod"><span></span></h2>
                        <p>
                            根据长者“脑力测评”，系统生成此训练方案，训练周期为2周，每周训练5天，每天训练时常40分钟左右，第二周训练内容重复第一周方案。
-                           <button type="button" class="btn green2" style="border: 0; float:right;" onclick="window.location.href='${contextPath}/wx/practice/download?testId=${testId}'">导出</button>
+                           <button type="button" class="btn green2" style="border: 0; float:right;" onclick="window.location.href='${contextPath}/practice/download?testId=${testId}'">导出</button>
                        </p>
                     </div>
                    <div class="follow mt" id="uldiv" >

bjyy-weixin/src/main/webapp/WEB-INF/pages/user/first_basic.jsp

@@ -17,6 +17,10 @@
 <script src="${contextPath}/static/js/swiper.min.js"></script>
 <link rel="stylesheet" href="${contextPath}/static/css/swiper.min.css">
 <link rel="stylesheet" type="text/css" href="${contextPath}/static/css/style.css"/>
+
+<link rel="stylesheet" href="${contextPath}/static/css/rui_date.css">
+<script src="${contextPath}/static/js/chooseDate.js"></script>
+<script src="${contextPath}/static/js/rui_date.js"></script>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
@@ -107,12 +111,19 @@
                                   <input type="hidden" value="" name="gender" required="required">
                              </label>
 
-                             <label class="clearfix">
-                                  <div class="left">出生日期：</div>
-                                  <div class="right">
-                                       <input type="date" placeholder="请点击选择" name="birthDay" required="required">
-                                  </div>
-                             </label>
+<%--                             <label class="clearfix">--%>
+<%--                                  <div class="left">出生日期：</div>--%>
+<%--                                  <div class="right">--%>
+<%--                                       <input type="date" placeholder="请点击选择" name="birthDay" required="required">--%>
+<%--                                  </div>--%>
+<%--                             </label>--%>
+                            <label class="clearfix">
+                                <div class="left">出生日期：</div>
+                                <div class="right">
+                                    <input id="demo1" type="text" data-toid-date="date" name="birthDay" required="required" placeholder="请点击选择" data-type="0"/></input>
+                                    <input type="hidden" id="date" name="date">
+                                </div>
+                            </label>
                              <label class="clearfix">
                                   <div class="left">身高：</div>
                                   <div class="right">
@@ -320,5 +331,23 @@
         });
   
 </script>
+
+
+<script>
+    /* 公农历选择切换插件 */
+    var pcx = pcx || {};
+    pcx.dc = new Lunar(); // 天干地支年份计算
+
+    var date1 = new ruiDatepicker().init('#demo1');
+
+    // 可通过下面的说明自行添加多几个年份，BaseKanChih 这个没找到很好的计算方式，我都不随便写，没用到所以不影响
+    function tagLunarCal(d, i, w, k, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) {
+        this.BaseDays = d;         /* 1 月 1 日到正月初一的累计日 */
+        this.Intercalation = i;    /* 闰月月份. 0==此年沒有闰月 */
+        this.BaseWeekday = w;      /* 此年 1 月 1 日为星期减 1 */
+        this.BaseKanChih = k;      /* 此年 1 月 1 日之干支序号减 1 */
+        this.MonthDays = [m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13]; /* 此农历年每月之大小, 0==小月(29日), 1==大月(30日) */
+    }
+</script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/WEB-INF/pages/user/first_basic_edit.jsp

@@ -21,6 +21,10 @@
 <script src="${contextPath}/static/js/swiper.min.js"></script>
 <link rel="stylesheet" href="${contextPath}/static/css/swiper.min.css">
 <link rel="stylesheet" type="text/css" href="${contextPath}/static/css/style.css"/>
+
+<link rel="stylesheet" href="${contextPath}/static/css/rui_date.css">
+<script src="${contextPath}/static/js/chooseDate.js"></script>
+<script src="${contextPath}/static/js/rui_date.js"></script>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
@@ -30,7 +34,7 @@
             <div class="wrapper" id="wrapperIndex">
                 <div class="scroller">
                     <!-- 头部 -->
-                    
+
                     <div class="header mt">
                       <div class="return"><img src="${contextPath}/static/images/return.png" width="100%"></div>
                       <div class="title">填写基本信息</div>
@@ -127,11 +131,19 @@
                                     <input type="hidden" value="" name="gender" required="required">
                                 </label>
 
+<%--                                <label class="clearfix">--%>
+<%--                                    <div class="left">出生日期：</div>--%>
+<%--                                    <div class="right">--%>
+
+<%--                                        <input type="date" placeholder="请点击选择" name="birthDay" value="<f:formatDate pattern='yyyy-MM-dd' value='${user.birthDate}'/>" required="required">--%>
+<%--                                    </div>--%>
+<%--                                </label>--%>
                                 <label class="clearfix">
                                     <div class="left">出生日期：</div>
                                     <div class="right">
-
-                                        <input type="date" placeholder="请点击选择" name="birthDay" value="<f:formatDate pattern='yyyy-MM-dd' value='${user.birthDate}'/>" required="required">
+                                        <input id="demo1" type="text" data-toid-date="date" name="birthDay" required="required"
+                                               data-type="0"  value="<f:formatDate pattern='yyyy-MM-dd' value='${user.birthDate}'/>"/></input>
+                                        <input type="hidden" id="date" name="date">
                                     </div>
                                 </label>
                                 <label class="clearfix">
@@ -230,11 +242,11 @@
           // },500);
 
           // $('body').click(function(){$('input').blur();})
-          
+
           $("select[name='clinicOffice']").find("option[value='${user.clinicOffice}']").attr("selected","selected");
           $(".gender").find("span[value='${user.sex}']").addClass("active");
           $(".gender").find("span[value='${user.sex}']").siblings().removeClass("active");
-          
+
           $(".radio").eq(0).find("li[value='${user.jobTitle}']").addClass("active");
           $(".radio").eq(0).find("li[value='${user.jobTitle}']").siblings().removeClass("active");
           if($(".radio").eq(0).find(".active").length==0){
@@ -242,7 +254,7 @@
    		      $(".radio").eq(0).find(".othercon").show();
    		      $(".radio").eq(0).find(".othercon").val('${user.jobTitle}');
           }
-          
+
           $(".radio").eq(1).find("li[value='${user.educateStatus}']").addClass("active");
           $(".radio").eq(1).find("li[value='${user.educateStatus}']").siblings().removeClass("active");
           if($(".radio").eq(1).find(".active").length==0){
@@ -250,11 +262,11 @@
    		      $(".radio").eq(1).find(".othercon").show();
    		      $(".radio").eq(1).find(".othercon").val('${user.educateStatus}');
           }
-          
+
           $(".radio").eq(2).find("li[value='${user.abodePlace}']").addClass("active");
           $(".radio").eq(2).find("li[value='${user.abodePlace}']").siblings().removeClass("active");
     });
-        
+
         //省切换
         $("select[name=hospitalProvinceId]").change(function(){
         	var pid= $(this).val();
@@ -293,23 +305,23 @@
         		}
         	});
         });
-        
-        
+
+
         //下一步
         $(".revise").click(function(){
-        	
+
         	if($(this).attr("disabled")=="disabled"){
                 return;
             }
             $(this).attr("disabled","disabled");
-        
+
         	if($("select[name='hospitalCityId']").hasClass("notShow")){
         		$("select[name='hospitalCityId']").html("");
         	}
         	if($("select[name='hospitalAddress']").hasClass("notShow")){
         		$("select[name='hospitalAddress']").html("");
         	}
-        	
+
         	var isOk=true;
         	$(".radio").each(function(){
         		var text=$(this).find(".active").html();
@@ -321,14 +333,14 @@
         			$(this).siblings("input[type='hidden']").val(text);
         		}
         	});
-        	
+
         	var gender=$(".gender .active").html();
         	if(gender=='男'){
         		$("input[name='gender']").val(1);
         	}else{
         		$("input[name='gender']").val(2);
         	}
-        	
+
         	$("input[required=required]").each(function(){
         		if ($(this).val()==""||$(this).val()==null||$(this).val()==undefined) {
     				alert("未完整填写信息，请检查");
@@ -338,8 +350,8 @@
     				return false;
     			}
         	});
-        	
-        	
+
+
         	if (!isOk) {
         		$(".revise").removeAttr("disabled");
     			return false;
@@ -358,7 +370,23 @@
         		}
         	});
         });
-  
+
+</script>
+<script>
+    /* 公农历选择切换插件 */
+    var pcx = pcx || {};
+    pcx.dc = new Lunar(); // 天干地支年份计算
+
+    var date1 = new ruiDatepicker().init('#demo1');
+
+    // 可通过下面的说明自行添加多几个年份，BaseKanChih 这个没找到很好的计算方式，我都不随便写，没用到所以不影响
+    function tagLunarCal(d, i, w, k, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) {
+        this.BaseDays = d;         /* 1 月 1 日到正月初一的累计日 */
+        this.Intercalation = i;    /* 闰月月份. 0==此年沒有闰月 */
+        this.BaseWeekday = w;      /* 此年 1 月 1 日为星期减 1 */
+        this.BaseKanChih = k;      /* 此年 1 月 1 日之干支序号减 1 */
+        this.MonthDays = [m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13]; /* 此农历年每月之大小, 0==小月(29日), 1==大月(30日) */
+    }
 </script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/WEB-INF/pages/user/second_basic.jsp

@@ -17,6 +17,10 @@
 <script src="${contextPath}/static/js/swiper.min.js"></script>
 <link rel="stylesheet" href="${contextPath}/static/css/swiper.min.css">
 <link rel="stylesheet" type="text/css" href="${contextPath}/static/css/style.css"/>
+
+<link rel="stylesheet" href="${contextPath}/static/css/rui_date.css">
+<script src="${contextPath}/static/js/chooseDate.js"></script>
+<script src="${contextPath}/static/js/rui_date.js"></script>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
@@ -34,18 +38,34 @@
                     <div class="center">
                           <form name="secondBasicForm" onsubmit="return false;">
                             <div class="message mt">
-                                 <label class="clearfix">
-                                      <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>
-                                      <div class="right" style="width: 4rem;">
-                                           <input type="month" name="startTime" required="required">
-                                      </div>
-                                 </label>
-                                 <label class="clearfix">
-                                      <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>
-                                      <div class="right" style="width: 4rem;">
-                                           <input type="month" name="firstTime" required="required">
-                                      </div>
-                                 </label>
+<%--                                 <label class="clearfix">--%>
+<%--                                      <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>--%>
+<%--                                      <div class="right" style="width: 4rem;">--%>
+<%--                                           <input type="month" name="startTime" required="required">--%>
+<%--                                      </div>--%>
+<%--                                 </label>--%>
+<%--                                 <label class="clearfix">--%>
+<%--                                      <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>--%>
+<%--                                      <div class="right" style="width: 4rem;">--%>
+<%--                                           <input type="month" name="firstTime" required="required">--%>
+<%--                                      </div>--%>
+<%--                                 </label>--%>
+                                <label class="clearfix">
+                                    <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>
+                                    <div class="right" style="width: 4rem;">
+                                        <input id="demo1" type="text" data-toid-date="date" name="startTime" required="required" data-type="0"/></input>
+                                        <input type="hidden" id="date" name="date">
+                                    </div>
+                                </label>
+                                <label class="clearfix">
+                                    <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>
+                                    <div class="right" style="width: 4rem;">
+                                        <input id="demo2" type="text" data-toid-date="date2" name="firstTime" required="required" data-type="0"/></input>
+                                        <input type="hidden" id="date2" name="date">
+                                    </div>
+                                </label>
+
+
                                   <label class="clearfix">
                                       <div class="left">诊断：</div>
                                       <div class="right diagnosis">
@@ -279,5 +299,23 @@
         });
         
 </script>
+
+<script>
+    /* 公农历选择切换插件 */
+    var pcx = pcx || {};
+    pcx.dc = new Lunar(); // 天干地支年份计算
+
+    var date1 = new ruiDatepicker().init('#demo1');
+    var date2 = new ruiDatepicker().init('#demo2');
+
+    // 可通过下面的说明自行添加多几个年份，BaseKanChih 这个没找到很好的计算方式，我都不随便写，没用到所以不影响
+    function tagLunarCal(d, i, w, k, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) {
+        this.BaseDays = d;         /* 1 月 1 日到正月初一的累计日 */
+        this.Intercalation = i;    /* 闰月月份. 0==此年沒有闰月 */
+        this.BaseWeekday = w;      /* 此年 1 月 1 日为星期减 1 */
+        this.BaseKanChih = k;      /* 此年 1 月 1 日之干支序号减 1 */
+        this.MonthDays = [m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13]; /* 此农历年每月之大小, 0==小月(29日), 1==大月(30日) */
+    }
+</script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/WEB-INF/pages/user/second_basic_edit.jsp

@@ -18,6 +18,10 @@
 <script src="${contextPath}/static/js/swiper.min.js"></script>
 <link rel="stylesheet" href="${contextPath}/static/css/swiper.min.css">
 <link rel="stylesheet" type="text/css" href="${contextPath}/static/css/style.css"/>
+
+<link rel="stylesheet" href="${contextPath}/static/css/rui_date.css">
+<script src="${contextPath}/static/js/chooseDate.js"></script>
+<script src="${contextPath}/static/js/rui_date.js"></script>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
@@ -35,18 +39,32 @@
                     <div class="center">
                           <form name="secondBasicForm" onsubmit="return false;">
                             <div class="message mt">
-                                 <label class="clearfix">
-                                      <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>
-                                      <div class="right" style="width: 4rem;">
-                                           <input type="month" name="startTime" required="required" value="<f:formatDate pattern='yyyy-MM' value='${user.appearTime}'/>">
-                                      </div>
-                                 </label>
-                                 <label class="clearfix">
-                                      <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>
-                                      <div class="right" style="width: 4rem;">
-                                           <input type="month" name="firstTime" required="required" value="<f:formatDate pattern='yyyy-MM' value='${user.diagnoseTime}'/>">
-                                      </div>
-                                 </label>
+<%--                                 <label class="clearfix">--%>
+<%--                                      <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>--%>
+<%--                                      <div class="right" style="width: 4rem;">--%>
+<%--                                           <input type="month" name="startTime" required="required" value="<f:formatDate pattern='yyyy-MM' value='${user.appearTime}'/>">--%>
+<%--                                      </div>--%>
+<%--                                 </label>--%>
+<%--                                 <label class="clearfix">--%>
+<%--                                      <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>--%>
+<%--                                      <div class="right" style="width: 4rem;">--%>
+<%--                                           <input type="month" name="firstTime" required="required" value="<f:formatDate pattern='yyyy-MM' value='${user.diagnoseTime}'/>">--%>
+<%--                                      </div>--%>
+<%--                                 </label>--%>
+                                <label class="clearfix">
+                                    <div class="left" style="width: 5.4rem;">请选择出现认知障碍时间(年/月)</div>
+                                    <div class="right" style="width: 4rem;">
+                                        <input id="demo1" type="text" data-toid-date="date" name="startTime" required="required" data-type="0"  value="<f:formatDate pattern='yyyy-MM' value='${user.appearTime}'/>"/></input>
+                                        <input type="hidden" id="date" name="date">
+                                    </div>
+                                </label>
+                                <label class="clearfix">
+                                    <div class="left"  style="width: 5.4rem;">请选择首次诊断痴呆时间(年/月)</div>
+                                    <div class="right" style="width: 4rem;">
+                                        <input id="demo2" type="text" data-toid-date="date2" name="firstTime" required="required" data-type="0"  value="<f:formatDate pattern='yyyy-MM' value='${user.diagnoseTime}'/>"/></input>
+                                        <input type="hidden" id="date2" name="date">
+                                    </div>
+                                </label>
                                   <label class="clearfix">
                                       <div class="left">诊断：</div>
                                       <div class="right diagnosis">
@@ -326,5 +344,22 @@
         });
         
 </script>
+<script>
+    /* 公农历选择切换插件 */
+    var pcx = pcx || {};
+    pcx.dc = new Lunar(); // 天干地支年份计算
+
+    var date1 = new ruiDatepicker().init('#demo1');
+    var date2 = new ruiDatepicker().init('#demo2');
+
+    // 可通过下面的说明自行添加多几个年份，BaseKanChih 这个没找到很好的计算方式，我都不随便写，没用到所以不影响
+    function tagLunarCal(d, i, w, k, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) {
+        this.BaseDays = d;         /* 1 月 1 日到正月初一的累计日 */
+        this.Intercalation = i;    /* 闰月月份. 0==此年沒有闰月 */
+        this.BaseWeekday = w;      /* 此年 1 月 1 日为星期减 1 */
+        this.BaseKanChih = k;      /* 此年 1 月 1 日之干支序号减 1 */
+        this.MonthDays = [m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13]; /* 此农历年每月之大小, 0==小月(29日), 1==大月(30日) */
+    }
+</script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/static/css/rui_date.css

@@ -0,0 +1,61 @@
+.gearDate {font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;font-size: 10px;background-color: rgba(0, 0, 0, 0.2);display: block;position: absolute;position: fixed;top: 0;left: 0;width: 100%;height: 100%;z-index: 2018917;overflow: hidden;-webkit-animation-fill-mode: both;animation-fill-mode: both;-webkit-transform: translateZ(0);}
+.date_ctrl {vertical-align: middle;background-color: #F0F0F0;color: #363837;margin: 0;height: auto;width: 100%;max-width: 600px;position: absolute;left: 0;right:0;bottom: 0;z-index: 9902;overflow: hidden;margin:0 auto;-webkit-transform: translateY(0);transform: translateY(0);-ms-transform: translateY(0);-moz-transform: translateY(0);}
+.slideInUp {animation: slideInUp .3s ease-in;-webkit-animation: slideInUp .3s ease-in;-ms-animation: slideInUp .3s ease-in;-moz-animation: slideInUp .3s ease-in}
+@-webkit-keyframes slideInUp {
+    0% {-webkit-transform: translateY(100%);transform: translateY(100%);-moz-transform: translateY(100%);-ms-transform: translateY(100%);-o-transform: translateY(100%)}
+    100% {-webkit-transform: translateY(0);transform: translateY(0);-moz-transform: translateY(0);-o-transform: translateY(0);-ms-transform: translateY(0)}
+}
+@keyframes slideInUp {
+    0% {-webkit-transform: translateY(100%);transform: translateY(100%);-moz-transform: translateY(100%);-ms-transform: translateY(100%);-o-transform: translateY(100%)}
+    100% {-webkit-transform: translateY(0);transform: translateY(0);-moz-transform: translateY(0);-o-transform: translateY(0);-ms-transform: translateY(0)}
+}
+@-moz-keyframes slideInUp {
+    0% {-webkit-transform: translateY(100%);transform: translateY(100%);-moz-transform: translateY(100%);-ms-transform: translateY(100%);-o-transform: translateY(100%)}
+    100% {-webkit-transform: translateY(0);transform: translateY(0);-moz-transform: translateY(0);-o-transform: translateY(0);-ms-transform: translateY(0)}
+}
+@-ms-keyframes slideInUp {
+    0% {-webkit-transform: translateY(100%);transform: translateY(100%);-moz-transform: translateY(100%);-ms-transform: translateY(100%);-o-transform: translateY(100%)}
+    100% {-webkit-transform: translateY(0);transform: translateY(0);-moz-transform: translateY(0);-o-transform: translateY(0);-ms-transform: translateY(0)}
+}
+.date_roll {position: relative;width: 100%;height: auto;overflow: hidden;font-weight: bold;background-color: transparent;-webkit-mask: -webkit-gradient(linear, 0% 50%, 0% 100%, from(#debb47), to(rgba(36, 142, 36, 0)));-webkit-mask: -webkit-linear-gradient(top, #debb47 50%, rgba(36, 142, 36, 0));}
+.date_roll>div{font-size: 1.6em;height: 10em;float: left;background-color: transparent;position: relative;overflow: hidden;width: 33.33%;}
+.date_roll_more>div{width: 25%;}
+.date_roll_minut>div{width: 20%;}
+.date_roll_mask {padding:0 1em;-webkit-mask: -webkit-gradient(linear, 0% 40%, 0% 0%, from(#debb47), to(rgba(36, 142, 36, 0)));-webkit-mask: -webkit-linear-gradient(bottom, #debb47 50%, rgba(36, 142, 36, 0));}
+.date_grid {position: relative;top: 4em;width: 100%;height: 2em;margin: 0;box-sizing: border-box;z-index: 0;background-color: #E8E8E8;border-top: 1px solid #d4d4d4;border-bottom: 1px solid #d4d4d4;}
+.date_grid>div {color: #000;position: absolute;right: 0;top: 0;font-size: .8em;line-height: 2.5em}
+
+.date_info_box{color: #363837;font-size: 1.8em;text-align: center;padding: .6em 0;text-align: center;border-bottom: 1px solid #d4d4d4;font-weight: 700;}
+.date_class_box{text-align: center;padding:1em 2em;}
+.date_class{display: inline-block;font-size: 1.4em;width:20%;padding:.2em 0;text-align: center;color: #809be6;border:1px solid #809be6;cursor: pointer;}
+.date_class_box .date_class:first-child{border-top-left-radius: .2em;border-bottom-left-radius: .2em}
+.date_class_box .date_class:last-child{border-top-right-radius: .2em;border-bottom-right-radius: .2em}
+.date_class_box .active{background-color: #809be6;color: #fff}
+/* .date_btn_box {overflow: hidden;position: relative;border-top:1px solid #d4d4d4;margin-top:1em;}
+.date_btn {color: #000;font-size: 1.6em;line-height: 1em;text-align: center;padding: .8em 1em;cursor: pointer;float: left;width: 49.9%;box-sizing: border-box;} */
+.lcalendar_cancel{float:left !important;}
+.lcalendar_finish{float:right !important;}
+.date_btn.lcalendar_cancel{border-right:1px solid #d4d4d4;}
+.gear {float: left;position: absolute;z-index: 9902;width: 5.5em;margin-top: -6em;cursor: pointer;padding:2em 0;}
+.date_roll>div .gear {width: 100%;color:#000;}
+.tooth {height: 2em;line-height: 2em;text-align: center;overflow: hidden;}
+                        
+.date_roll_more>div{width: 20%;}
+.date_roll_more>div:nth-of-type(4),.date_roll_more>div:nth-of-type(1){width: 30%;}
+.date_btn_box {overflow: hidden;position: relative;border-top:1px solid #d4d4d4;}
+.date_btn {color: #000;font-size: 1.6em;line-height: 1em;text-align: center;padding: .8em 1em;cursor: pointer;float: left;width: 49.9%;box-sizing: border-box;}
+.date_class_box{display: flex;align-items: center;justify-content: space-evenly;border-bottom: 1px solid #ccc;}
+.date_class_box>div:nth-of-type(2){flex:1}
+.date_class_box .date_btn{font-size: 1.4em;line-height: 1em;text-align: center;width: 2em;float: left;padding:0;border: none;height: 100%;}
+
+/* 
+'<div class="date_btn_box">' +
+                        '<div class="date_btn lcalendar_cancel">取消</div>' +
+                        '<div class="date_btn lcalendar_finish">确定</div>' +
+                        '</div>' + */
+
+@media screen and (min-width: 800px) {
+    body {
+        background-color:lightblue;
+    }
+}

bjyy-weixin/src/main/webapp/static/exam1/test26.html

@@ -30,7 +30,7 @@
                    </div>
                    <div class="resulttip">
                       <div class="basicinfo">
-                       <h2>26.烧水需要6分钟，找泡面要2分钟，泡面需要5分钟，您最快几分钟后可以喝到茶水？</h2>
+                       <h2>26.烧水需要6分钟，找泡面要2分钟，泡面需要5分钟，您最快几分钟后可以吃到泡面？</h2>
                        <ul>
                          <li class="right">11分钟</li>
                          <li>8分钟</li>
@@ -43,7 +43,6 @@
                 </div>
                  <button class="nextstep nextquestion">下一题</button>
              </div>
-            </div>
           </section>
        </div>
     </div>
@@ -88,5 +87,6 @@
              	}
    	   });
 </script>
+
 </body>
 </html>

bjyy-weixin/src/main/webapp/static/exam1/test28.html

@@ -37,7 +37,7 @@
                             <p>79－41＝？</p>
                         </div>
                     </div>
-                    <div class="resulttip" ><!--style="display: none;"-->
+                    <div class="resulttip" style="display: none;"><!--style="display: none;"-->
                         <div class="basicinfo">
                             <h2>刚才题目的答案是：</h2>
                             <ul>

bjyy-weixin/src/main/webapp/static/exam1/test29.html

@@ -33,11 +33,11 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">384</p>
+                             <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">384</p>
                           </div>
                    </div>
                   
-                   <div class="resulttip" ><!--style="display: none;"-->
+                   <div class="resulttip"  style="display: none;"><!--style="display: none;"-->
                       <div class="basicinfo">
                        <h2>请问，刚才出现的数字从小到大排列是：</h2>
                        <ul>

bjyy-weixin/src/main/webapp/static/exam1/test30.html

@@ -28,34 +28,22 @@
                       <div class="return"><img src="../images/return.png" width="100%"></div>
                       <div class="title">脑力测评</div>
                    </div>
-<!--                   <div class="resulttip">-->
-<!--                      <div class="basicinfo">-->
-<!--                       <h2>35.既不在正方形又不在长方形里的数字与既不在圆形又不在长方形里的数字相加之和是 ?</h2>-->
-<!--                       <ul>-->
-<!--                         <li>9</li>-->
-<!--                         <li>10</li>-->
-<!--                         <li>11</li>-->
-<!--                         <li class="right">12</li>-->
-<!--                         <li>13</li>-->
-<!--                       </ul>-->
-<!--                    </div>-->
-<!--                    <div class="img" style="top: 2.5rem;width: 66%;"><img src="../images/51.jpg" width="100%"></div>-->
-<!--                   </div>-->
+
                     <div class="question">
                         <div class="basicinfo">
                             <h2>30.请记住以下数字：</h2>
                         </div>
                         <div class="basicinfo">
-                            <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3715</p>
+                            <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">3715</p>
                         </div>
                     </div>
 
-                    <div class="resulttip" ><!--style="display: none;"-->
+                    <div class="resulttip" style="display: none;"><!--style="display: none;"-->
                         <div class="basicinfo">
-                            <h2>请问，刚才出现的数字从小到大排列是：</h2>
+                            <h2>请问，刚才出现的数字从大到小排列是：</h2>
                             <ul>
-                                <li class="right">1 3 5 7</li>
-                                <li>7 5 3 1</li>
+                                <li>1 3 5 7</li>
+                                <li class="right">7 5 3 1</li>
                                 <li>7 3 2 1</li>
                                 <li>9 7 5 3</li>
                             </ul>
@@ -63,7 +51,7 @@
                     </div>
                 </div>
                 <button class="nextstep answer">答题</button>
-                <button class="nextstep nextquestion"  style="display: none;">下一题</button>
+                <button class="nextstep nextquestion"  style="display: none;">查看测评结果</button>
                  
                   <form name="firstBasicForm" onsubmit="return false;">
                     <input type="hidden" name="chooseIds">
@@ -71,7 +59,6 @@
                 </form>
                 
              </div>
-            </div>
           </section>
        </div>
     </div>

bjyy-weixin/src/main/webapp/static/exam2/test28.html

@@ -38,7 +38,7 @@
                           </div>
                    </div>
                   
-                   <div class="resulttip"><!--style="display: none;"-->
+                   <div class="resulttip" style="display: none;"><!--style="display: none;"-->
                       <div class="basicinfo">
                        <h2>刚才题目的答案是：</h2>
                        <ul>

bjyy-weixin/src/main/webapp/static/exam2/test29.html

@@ -33,13 +33,13 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">186</p>
+                             <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">186</p>
                           </div>
                    </div>
                   
-                   <div class="resulttip"><!--style="display: none;"-->
+                   <div class="resulttip" style="display: none;"><!--style="display: none;"-->
                       <div class="basicinfo">
-                       <h2>请问，刚才出现的数字从大到小排列是：</h2>
+                       <h2>请问，刚才出现的数字从小到大排列是：</h2>
                        <ul>
                          <li class="right">1 6 8</li>
                          <li>1 6 6</li>

bjyy-weixin/src/main/webapp/static/exam2/test30.html

@@ -33,11 +33,11 @@
                                 <h2>30.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3846</p>
+                             <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">3846</p>
                           </div>
                    </div>
                   
-                   <div class="resulttip"><!--style="display: none;"-->
+                   <div class="resulttip" style="display: none;"><!--style="display: none;"-->
                       <div class="basicinfo">
                        <h2>请问，刚才出现的数字从大到小排列是：</h2>
                        <ul>
@@ -51,7 +51,7 @@
 
                 </div>
                 <button class="nextstep answer">答题</button>
-                 <button class="nextstep nextquestion" style="display: none;">下一题</button>
+                 <button class="nextstep nextquestion" style="display: none;">查看测评结果</button>
              </div>
             </div>
           </section>

bjyy-weixin/src/main/webapp/static/exam3/test29.html

@@ -33,13 +33,13 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">394</p>
+                             <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">394</p>
                           </div>
                    </div>
                   
                    <div class="resulttip" style="display: none;">
                       <div class="basicinfo">
-                       <h2>请问，刚才出现的数字从大到小排列是：</h2>
+                       <h2>请问，刚才出现的数字从小到大排列是：</h2>
                        <ul>
                          <li>1 4 6</li>
                          <li class="right">3 4 9</li>

bjyy-weixin/src/main/webapp/static/exam3/test30.html

@@ -33,7 +33,7 @@
                                 <h2>30.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">1926</p>
+                             <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">1926</p>
                           </div>
                    </div>
                   
@@ -51,7 +51,7 @@
 
                 </div>
                 <button class="nextstep answer">答题</button>
-                 <button class="nextstep nextquestion" style="display: none;">下一题</button>
+                 <button class="nextstep nextquestion" style="display: none;">查看测评结果</button>
 
               <form name="firstBasicForm" onsubmit="return false;">
                   <input type="hidden" name="chooseIds">

bjyy-weixin/src/main/webapp/static/exam4/test29.html

@@ -1,58 +1,61 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8"><meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /><meta http-equiv="Pragma" content="no-cache" /><meta http-equiv="Expires" content="0" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta content="black" name="apple-mobile-web-app-status-bar-style">
-<meta name="format-detection" content="telephone=no">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<title>北京燕园</title>
-<script src="../js/flexible.js"></script>
-<script src="../js/jquery.js"></script>
-<script src="../js/swiper.min.js"></script>
-<link rel="stylesheet" href="../css/swiper.min.css">
-<link rel="stylesheet" type="text/css" href="../css/style.css"/>
+    <meta charset="utf-8">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Expires" content="0"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>北京燕园</title>
+    <script src="../js/flexible.js"></script>
+    <script src="../js/jquery.js"></script>
+    <script src="../js/swiper.min.js"></script>
+    <link rel="stylesheet" href="../css/swiper.min.css">
+    <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
     <div class="swiper-wrapper">
-       <div class="swiper-slide">
-          <section class="sectionBox">
-            <div class="wrapper" id="wrapperIndex">
-                <div class="scroller">
-                    <!-- 头部 -->
-                    
-                    <div class="header mt">
-                      <div class="return"><img src="../images/return.png" width="100%"></div>
-                      <div class="title">脑力测评</div>
-                   </div>
-                   <div class="question">
-                          <div class="basicinfo">
+        <div class="swiper-slide">
+            <section class="sectionBox">
+                <div class="wrapper" id="wrapperIndex">
+                    <div class="scroller">
+                        <!-- 头部 -->
+
+                        <div class="header mt">
+                            <div class="return"><img src="../images/return.png" width="100%"></div>
+                            <div class="title">脑力测评</div>
+                        </div>
+                        <div class="question">
+                            <div class="basicinfo">
                                 <h2>29.请记住以下数字：</h2>
-                          </div>
-                          <div class="basicinfo">
-                              <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">371</p>
-                          </div>
-                   </div>
-                  
-                   <div class="resulttip" style="display: none;">
-                      <div class="basicinfo">
-                       <h2>请问，刚才出现的数字从小到大排列是：</h2>
-                       <ul>
-                         <li class="right">1 3 7</li>
-                         <li>3 5 7</li>
-                       </ul>
-                    </div>
-                   </div>
+                            </div>
+                            <div class="basicinfo">
+                                <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">371</p>
+                            </div>
+                        </div>
+
+                        <div class="resulttip" style="display: none;">
+                            <div class="basicinfo">
+                                <h2>请问，刚才出现的数字从小到大排列是：</h2>
+                                <ul>
+                                    <li class="right">1 3 7</li>
+                                    <li>3 5 7</li>
+                                </ul>
+                            </div>
+                        </div>
 
+                    </div>
+                    <button class="nextstep answer">答题</button>
+                    <button class="nextstep nextquestion" style="display: none;">下一题</button>
                 </div>
-                <button class="nextstep answer">答题</button>
-                 <button class="nextstep nextquestion" style="display: none;">下一题</button>
-             </div>
-          </section>
-       </div>
+            </section>
+        </div>
     </div>
 </div>
 
@@ -63,37 +66,37 @@
 
 <!-- 配置滚动条 -->
 <script type="text/javascript">
-        $(function(){
-         // setTimeout(function(){          //   loadedScroll("#wrapperIndex",false,true);            // },500);
-          if(sessionStorage.choose.indexOf("29")!=-1){
-        	  sessionStorage.choose=sessionStorage.choose.replace("29,","");
-           }
+    $(function () {
+        // setTimeout(function(){          //   loadedScroll("#wrapperIndex",false,true);            // },500);
+        if (sessionStorage.choose.indexOf("29") != -1) {
+            sessionStorage.choose = sessionStorage.choose.replace("29,", "");
+        }
+    });
+    $(".nextquestion").click(function () {
+        if ($(".basicinfo .active").length == 0) {
+            alert("请选择");
+            return;
+        } else {
+            if (typeof (Storage) !== "undefined") {
+                sessionStorage.num = 7;
+                if ($(".active").hasClass("right")) {
+                    if (sessionStorage.choose.indexOf("29,") == -1) {
+                        sessionStorage.choose = sessionStorage.num + "," + sessionStorage.choose;
+                    }
+                } else {
+                    if (sessionStorage.choose.indexOf("29") != -1) {
+                        sessionStorage.choose = sessionStorage.choose.replace("29,", "");
+                    }
+                    sessionStorage.choose = sessionStorage.choose;
+                }
+                console.log(sessionStorage.choose);
+                let a = Math.floor(Math.random() * 4) + 1;
+                window.location.href = "../exam" + a + "/test30.html";
+            } else {
+                document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
+            }
+        }
     });
-        $(".nextquestion").click(function(){
-  		   if($(".basicinfo .active").length==0){
-         		alert("请选择");
-         		return;
-         	  }else{
-  			  if(typeof(Storage) !== "undefined") {
-  				      sessionStorage.num=7;
-  				     if($(".active").hasClass("right")){
-  				    	 if(sessionStorage.choose.indexOf("29,")==-1){
-  		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
-  				    	 }
-  		       		  }else{
-  		       			if(sessionStorage.choose.indexOf("29")!=-1){
-  		            	   sessionStorage.choose=sessionStorage.choose.replace("29,","");
-  		                  }
-  		       			 sessionStorage.choose=sessionStorage.choose;
-  		       		  }
-  		       			 console.log(sessionStorage.choose);
-                  let a = Math.floor(Math.random()*4) + 1;
-                  window.location.href = "../exam"+a+"/test30.html";
-  			     }else{
-  			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
-  			    }
-            	}
-  	   });
 </script>
 </body>
 </html>

bjyy-weixin/src/main/webapp/static/exam4/test30.html

@@ -46,7 +46,7 @@
                             <h2>30.请记住以下数字：</h2>
                         </div>
                         <div class="basicinfo">
-                            <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3925</p>
+                            <p style="font-size: 60px;font-weight: bold;letter-spacing: 60px">3925</p>
                         </div>
                     </div>
 
@@ -63,7 +63,7 @@
                     </div>
                 </div>
                 <button class="nextstep answer">答题</button>
-                <button class="nextstep nextquestion"  style="display: none;">下一题</button>
+                <button class="nextstep nextquestion"  style="display: none;">查看测评结果</button>
                  
                   <form name="firstBasicForm" onsubmit="return false;">
                     <input type="hidden" name="chooseIds">

bjyy-weixin/src/main/webapp/static/exam4/test7.html

@@ -40,7 +40,7 @@
                              <p>2－1＝？</p>
                              <p>8－3＝？</p>
                              <p>6＋3＝？</p>
-                             <p>5＋2＝？</p>
+                             <p>5－2＝？</p>
                           </div>
                    </div>
                   

bjyy-weixin/src/main/webapp/static/js/chooseDate.js

@@ -0,0 +1,233 @@
+/**用法
+ * Lunar.toSolar(2016, 6, 3); 农历转化公历
+ * Lunar.toLunar(2016, 7, 6); 公历转化农历
+ */
+function Lunar (){
+    this.MIN_YEAR = 1891,
+    this.MAX_YEAR = 2100,
+    this.lunarInfo = [
+        [0,2,9, 21936], [6,1,30, 9656], [0,2,17, 9584], [0,2,6, 21168], [5,1,26,43344], [0,2,13,59728],
+        [0,2,2, 27296], [3,1,22,44368], [0,2,10,43856], [8,1,30,19304], [0,2,19,19168], [0,2,8, 42352],
+        [5,1,29,21096], [0,2,16,53856], [0,2,4, 55632], [4,1,25,27304], [0,2,13,22176], [0,2,2, 39632],
+        [2,1,22,19176], [0,2,10,19168], [6,1,30,42200], [0,2,18,42192], [0,2,6, 53840], [5,1,26,54568],
+        [0,2,14,46400], [0,2,3, 54944], [2,1,23,38608], [0,2,11,38320], [7,2,1, 18872], [0,2,20,18800],
+        [0,2,8, 42160], [5,1,28,45656], [0,2,16,27216], [0,2,5, 27968], [4,1,24,44456], [0,2,13,11104],
+        [0,2,2, 38256], [2,1,23,18808], [0,2,10,18800], [6,1,30,25776], [0,2,17,54432], [0,2,6, 59984],
+        [5,1,26,27976], [0,2,14,23248], [0,2,4, 11104], [3,1,24,37744], [0,2,11,37600], [7,1,31,51560],
+        [0,2,19,51536], [0,2,8, 54432], [6,1,27,55888], [0,2,15,46416], [0,2,5, 22176], [4,1,25,43736],
+        [0,2,13, 9680], [0,2,2, 37584], [2,1,22,51544], [0,2,10,43344], [7,1,29,46248], [0,2,17,27808],
+        [0,2,6, 46416], [5,1,27,21928], [0,2,14,19872], [0,2,3, 42416], [3,1,24,21176], [0,2,12,21168],
+        [8,1,31,43344], [0,2,18,59728], [0,2,8, 27296], [6,1,28,44368], [0,2,15,43856], [0,2,5, 19296],
+        [4,1,25,42352], [0,2,13,42352], [0,2,2, 21088], [3,1,21,59696], [0,2,9, 55632], [7,1,30,23208],
+        [0,2,17,22176], [0,2,6, 38608], [5,1,27,19176], [0,2,15,19152], [0,2,3, 42192], [4,1,23,53864],
+        [0,2,11,53840], [8,1,31,54568], [0,2,18,46400], [0,2,7, 46752], [6,1,28,38608], [0,2,16,38320],
+        [0,2,5, 18864], [4,1,25,42168], [0,2,13,42160], [10,2,2,45656], [0,2,20,27216], [0,2,9, 27968],
+        [6,1,29,44448], [0,2,17,43872], [0,2,6, 38256], [5,1,27,18808], [0,2,15,18800], [0,2,4, 25776],
+        [3,1,23,27216], [0,2,10,59984], [8,1,31,27432], [0,2,19,23232], [0,2,7, 43872], [5,1,28,37736],
+        [0,2,16,37600], [0,2,5, 51552], [4,1,24,54440], [0,2,12,54432], [0,2,1, 55888], [2,1,22,23208],
+        [0,2,9, 22176], [7,1,29,43736], [0,2,18, 9680], [0,2,7, 37584], [5,1,26,51544], [0,2,14,43344],
+        [0,2,3, 46240], [4,1,23,46416], [0,2,10,44368], [9,1,31,21928], [0,2,19,19360], [0,2,8, 42416],
+        [6,1,28,21176], [0,2,16,21168], [0,2,5, 43312], [4,1,25,29864], [0,2,12,27296], [0,2,1, 44368],
+        [2,1,22,19880], [0,2,10,19296], [6,1,29,42352], [0,2,17,42208], [0,2,6, 53856], [5,1,26,59696],
+        [0,2,13,54576], [0,2,3, 23200], [3,1,23,27472], [0,2,11,38608], [11,1,31,19176],[0,2,19,19152],
+        [0,2,8, 42192], [6,1,28,53848], [0,2,15,53840], [0,2,4, 54560], [5,1,24,55968], [0,2,12,46496],
+        [0,2,1, 22224], [2,1,22,19160], [0,2,10,18864], [7,1,30,42168], [0,2,17,42160], [0,2,6, 43600],
+        [5,1,26,46376], [0,2,14,27936], [0,2,2, 44448], [3,1,23,21936], [0,2,11,37744], [8,2,1, 18808],
+        [0,2,19,18800], [0,2,8, 25776], [6,1,28,27216], [0,2,15,59984], [0,2,4, 27424], [4,1,24,43872],
+        [0,2,12,43744], [0,2,2, 37600], [3,1,21,51568], [0,2,9, 51552], [7,1,29,54440], [0,2,17,54432],
+        [0,2,5, 55888], [5,1,26,23208], [0,2,14,22176], [0,2,3, 42704], [4,1,23,21224], [0,2,11,21200],
+        [8,1,31,43352], [0,2,19,43344], [0,2,7, 46240], [6,1,27,46416], [0,2,15,44368], [0,2,5, 21920],
+        [4,1,24,42448], [0,2,12,42416], [0,2,2, 21168], [3,1,22,43320], [0,2,9, 26928], [7,1,29,29336],
+        [0,2,17,27296], [0,2,6, 44368], [5,1,26,19880], [0,2,14,19296], [0,2,3, 42352], [4,1,24,21104],
+        [0,2,10,53856], [8,1,30,59696], [0,2,18,54560], [0,2,7, 55968], [6,1,27,27472], [0,2,15,22224],
+        [0,2,5, 19168], [4,1,25,42216], [0,2,12,42192], [0,2,1, 53584], [2,1,21,55592], [0,2,9, 54560]
+    ]
+    
+};
+//是否闰年
+Lunar.prototype.isLeapYear = function(year) {
+    return ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0));
+}
+//天干地支年
+Lunar.prototype.lunarYear = function(year) {
+    var gan = ['庚', '辛', '壬', '癸', '甲', '乙', '丙', '丁', '戊', '己'],
+        zhi = ['申', '酉', '戌', '亥', '子', '丑', '寅', '卯', '辰', '巳', '午', '未'],
+        str = year.toString().split("");
+        // console.log("天干地支"+str[3]+'--'+(year % 12))
+    return gan[str[3]] + zhi[year % 12];
+},
+//生肖年
+Lunar.prototype.zodiacYear = function(year) {
+    var zodiac = ['猴', '鸡', '狗', '猪', '鼠', '牛', '虎', '兔', '龙', '蛇', '马', '羊'];
+    return zodiac[year % 12];
+}
+//公历月份天数
+//@param year 阳历-年
+//@param month 阳历-月
+Lunar.prototype.solarMonthDays = function(year, month) {
+    var FebDays = this.isLeapYear(year) ? 29 : 28;
+    var monthHash = ['', 31, FebDays, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    return monthHash[month];
+}
+//农历月份天数
+Lunar.prototype.lunarMonthDays = function(year, month) {
+    var monthData = this.lunarMonths(year);
+    return monthData[month - 1];
+}
+//农历月份天数数组
+Lunar.prototype.lunarMonths = function(year) {
+    var yearData = this.lunarInfo[year - this.MIN_YEAR];
+    var leapMonth = yearData[0];
+    var bit = (+yearData[3]).toString(2);
+    var months = [];
+    for (var i = 0; i < bit.length; i++) {
+        months[i] = bit.substr(i, 1);
+    }
+ 
+    for (var k = 0, len = 16 - months.length; k < len; k++) {
+        months.unshift('0');
+    }
+ 
+    months = months.slice(0, (leapMonth == 0 ? 12 : 13));
+    for (var i = 0; i < months.length; i++) {
+        months[i] = +months[i] + 29;
+    }
+    return months;
+}
+//农历每年的天数
+//@param year 农历年份
+Lunar.prototype.lunarYearDays = function(year) {
+    var monthArray = this.lunarYearMonths(year);
+    var len = monthArray.length;
+    return (monthArray[len-1] == 0 ? monthArray[len-2] : monthArray[len-1]);
+}
+//
+Lunar.prototype.lunarYearMonths = function(year) {
+    var monthData = this.lunarMonths(year);
+    var res = [];
+    var temp = 0;
+    var yearData = this.lunarInfo[year - this.MIN_YEAR];
+    var len = (yearData[0] == 0 ? 12 : 13);
+    for (var i = 0; i < len; i++) {
+        temp = 0;
+        for (j = 0; j <= i; j++) {
+            temp += monthData[j];
+        }
+        res.push(temp);
+    }
+    return res;
+}
+//获取闰月
+//@param year 农历年份
+Lunar.prototype.leapMonth=function(year){
+    var yearData = this.lunarInfo[year - this.MIN_YEAR];
+    return yearData[0];
+}
+//计算农历日期与正月初一相隔的天数
+Lunar.prototype.betweenLunarDays = function(year, month, day) {
+    var yearMonth = this.lunarMonths(year);
+    var res = 0;
+    for (var i = 1; i < month; i++) {
+        res += yearMonth[i-1];
+    }
+    res += day - 1;
+    return res;
+},
+//计算2个阳历日期之间的天数
+//@param year 阳历年
+//@param month
+//@param day
+//@param l_month 阴历正月对应的阳历月份
+//@param l_day   阴历初一对应的阳历天
+Lunar.prototype.betweenSolarDays = function(year, month, day, l_month, l_day) {
+    var time1 = new Date(year +"-"+  month  +"-"+ day).getTime(),
+        time2 = new Date(year +"-"+ l_month +"-"+ l_day).getTime();
+    return Math.ceil((time1-time2)/24/3600/1000);
+},
+//根据距离正月初一的天数计算阴历日期
+//@param year 阳历年
+//@param between 天数
+Lunar.prototype.lunarByBetween = function(year, between) {
+    var lunarArray = [], yearMonth = [], t = 0, e = 0, leapMonth = 0, m = '';
+    if (between == 0) {
+        t = 1;
+        e = 1;
+        m = '正月';
+    } else {
+        year = between > 0 ? year : (year - 1);
+        yearMonth = this.lunarYearMonths(year);
+        leapMonth = this.leapMonth(year);
+        between   = between > 0 ? between : (this.lunarYearDays(year) + between);
+        for (var i = 0; i < 13; i++) {
+            if (between == yearMonth[i]) {
+                t = i + 2;
+                e = 1;
+                break;
+            } else if (between < yearMonth[i]) {
+                t = i + 1;
+                e = between - ((yearMonth[i-1]) ? yearMonth[i-1] : 0) + 1;
+                break;
+            }
+        }
+         
+        m = (leapMonth != 0 && t == leapMonth + 1)
+        ? ('闰'. this.chineseMonth(t-1))
+        : this.chineseMonth(((leapMonth != 0 && leapMonth + 1 < t) ? (t - 1) : t));
+    }
+    lunarArray.push(year, t, e); //年 月 日
+    lunarArray.push(this.lunarYear(year),
+                    this.zodiacYear(year),
+                    m,
+                    this.chineseNumber(e)); //天干地支年 生肖年 月份 日
+    lunarArray.push(leapMonth); //闰几月
+    return lunarArray;
+},
+//中文月份
+Lunar.prototype.chineseMonth = function(month,num) {
+    var monthHash = ['', '正月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '冬月', '腊月'];
+    if(num){
+        var txt = monthHash[num]
+        monthHash.splice(num+1,0,"闰"+txt)
+    }
+    return monthHash[month];
+},
+//中文日期
+Lunar.prototype.chineseNumber = function(num) {
+    var dateHash = ['', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十'];
+    if (num <= 10) {
+        res = '初'+ dateHash[num];
+    } else if (num > 10 && num < 20) {
+        res = '十'+ dateHash[num-10];
+    } else if (num == 20) {
+        res = "二十";
+    } else if (num > 20 && num < 30) {
+        res = "廿"+ dateHash[num-20];
+    } else if (num == 30) {
+        res = "三十";
+    }
+    return res;
+},
+//转换农历
+Lunar.prototype.toLunar = function(year, month, day) {
+    var yearData = this.lunarInfo[year - this.MIN_YEAR];
+    if (year == this.MIN_YEAR && month <= 2 && day <= 9) {
+        return [1891, 1, 1, '辛卯', '兔', '正月', '初一'];
+    }
+    return this.lunarByBetween(year, this.betweenSolarDays(year, month, day, yearData[1], yearData[2]));
+},
+//转换公历
+//@param year  阴历-年
+//@param month 阴历-月，闰月处理：例如如果当年闰五月，那么第二个五月就传六月，相当于阴历有13个月
+//@param date  阴历-日
+Lunar.prototype.toSolar = function(year, month, day) {
+    var yearData = this.lunarInfo[year - this.MIN_YEAR];
+    var between  = this.betweenLunarDays(year, month, day);
+    var ms = new Date(year +"-" + yearData[1] +"-"+ yearData[2]).getTime();
+    var s = ms + between * 24 * 60 * 60 * 1000;
+    var d = new Date();
+    d.setTime(s);
+    year  = d.getFullYear();
+    month = d.getMonth() + 1;
+    day   = d.getDate();
+    return [year, month, day];
+}