Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/ceshi.js

@@ -64,7 +64,7 @@ define(function (require) {
                     var a = $form.formGet()
 
                     $.yvan.ajax({
-                      method: 'post',
+                      method: 'get',
                       url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
                       data: $form.formGet(),
                       success: function (data) {

admin-ui/app/whepi/mock/menu.json

@@ -34,6 +34,14 @@
           "children": []
         }
       ]
+    },
+    {
+      "id": "ENT10011",
+      "text": "授权测试",
+      "href": "/app/whepi/ceshi.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
     }
   ]
 }

whepi-ui/templates/home/buyClient.ftl

@@ -98,7 +98,7 @@
     <#--返回-->
     function buyBack() {
         // window.history.back();
-        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + "&show=tuangou";
+        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + "&show=tuangou"+"&type="+2;
     }
 
     /*撤销*/

whepi-ui/templates/home/home.ftl

@@ -8,8 +8,8 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <div id="tab3" class="weui-tab__bd-item">
-    <#include "/home/buy.ftl" /></div>
+       <#-- <div id="tab3" class="weui-tab__bd-item">
+    <#include "/home/buy.ftl" /></div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
@@ -22,10 +22,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
+      <#--  <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">商品团购</p>
-        </a>
+        </a>-->
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">我</p>-->
@@ -84,20 +84,20 @@
         });
 
 
-        function selectTab() {
-            $("#tab1").removeClass('weui-tab__bd-item--active');
-            $("#jt1").removeClass('weui-bar__item--on');
-            $("#tab3").addClass('weui-tab__bd-item--active');
-            $("#jt3").addClass('weui-bar__item--on');
-            buyGroup();
-        }
+        <#--function selectTab() {-->
+            <#--$("#tab1").removeClass('weui-tab__bd-item--active');-->
+            <#--$("#jt1").removeClass('weui-bar__item--on');-->
+            <#--$("#tab3").addClass('weui-tab__bd-item--active');-->
+            <#--$("#jt3").addClass('weui-bar__item--on');-->
+            <#--buyGroup();-->
+        <#--}-->
 
-        var show = ${show!'"-"'};
+        <#--var show = ${show!'"-"'};-->
 
-        if (show == 'tuangou') {
-            selectTab();
+        <#--if (show == 'tuangou') {-->
+            <#--selectTab();-->
 
-        }
+        <#--}-->
     })(jQuery);
 
 

whepi-ui/templates/home/ribao.js

@@ -308,7 +308,7 @@ function ribao_cell(v) {
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">'  + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -374,6 +374,11 @@ function ribaoCommit() {
   var userName = $("#js_input_user_name").val();
   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
   var age = $("#js_input_user_age").val();
+  //不能同时选择服用和未服用
+  if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
+    $.alert("心脑血管不能同时选择服用和未服用");
+    return;
+  }
   //家庭状态
   var familyStatus = "";
   if ($("input[name='checkbox1']:checked").val() == "on")
@@ -537,31 +542,31 @@ function updateSuspected(suspectedId) {
         if (suspected.familyStatus != "") {
           var familyStatusList = suspected.familyStatus.split(",");
           if (familyStatusList[0] == 1)
-            $("input[name='checkbox1']").prop("checked","checked");
+            $("input[name='checkbox1']").prop("checked", "checked");
           else
             $("input[name='checkbox1']").removeAttr("checked");
           if (familyStatusList[1] == 1)
-            $("input[name='checkbox2']").prop("checked","checked");
+            $("input[name='checkbox2']").prop("checked", "checked");
           else
             $("input[name='checkbox2']").removeAttr("checked");
           if (familyStatusList[2] == 1)
-            $("input[name='checkbox3']").prop("checked","checked");
+            $("input[name='checkbox3']").prop("checked", "checked");
           else
             $("input[name='checkbox3']").removeAttr("checked");
           if (familyStatusList[3] == 1)
-            $("input[name='checkbox4']").prop("checked","checked");
+            $("input[name='checkbox4']").prop("checked", "checked");
           else
             $("input[name='checkbox4']").removeAttr("checked");
           if (familyStatusList[4] == 1)
-            $("input[name='checkbox5']").prop("checked","checked");
+            $("input[name='checkbox5']").prop("checked", "checked");
           else
             $("input[name='checkbox5']").removeAttr("checked");
           if (familyStatusList[5] == 1)
-            $("input[name='checkbox6']").prop("checked","checked");
+            $("input[name='checkbox6']").prop("checked", "checked");
           else
             $("input[name='checkbox6']").removeAttr("checked");
           if (familyStatusList[6] == 1)
-            $("input[name='checkbox7']").prop("checked","checked");
+            $("input[name='checkbox7']").prop("checked", "checked");
           else
             $("input[name='checkbox7']").removeAttr("checked");
 
@@ -695,7 +700,7 @@ function helpValue1(v) {
     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">'  + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }

whepi-ui/templates/home/tuangouHome.ftl

@@ -1,8 +1,24 @@
 <#assign title="我的团购"/>
 <#include "/home/frag.head.ftl" />
 
-<#include "/home/buy.ftl" />
-
+<#--<#include "/home/buy.ftl" />-->
+<div class="weui-tab">
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
+    <div class="weui-tab__bd">
+        <div id="tab3" class="weui-tab__bd-item weui-tab__bd-item--active">
+    <#include "/home/buy.ftl" /></div>
+    </div>
+    <div class="weui-tabbar">
+        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
+            <p class="weui-tabbar__label">商品团购</p>
+        </a>
+    <#--<a href="#tab4" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">我</p>-->
+    <#--</a>-->
+    </div>
+</div>
 </body>
 
 <#include "/home/frag.foot.ftl" />
@@ -20,6 +36,22 @@
                 $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
             });
         });
+
+      /*  function selectTab() {
+           /!* $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#jt1").removeClass('weui-bar__item--on');*!/
+            $("#tab3").addClass('weui-tab__bd-item--active');
+            $("#jt3").addClass('weui-bar__item--on');
+            buyGroup();
+        }
+
+        var show = ${show!'"-"'};
+
+        if (show == 'tuangou') {
+            selectTab();
+        }*/
+        buyGroup();
+
     })(jQuery);
 
 </script>

whepi-ui/templates/yeweihui/home.ftl

@@ -12,7 +12,8 @@
             <#include "/yeweihui/ribaohuiz.ftl" />
         </div>
         <div id="tab2" class="weui-tab__bd-item">
-            <#include "/yeweihui/qiuzhu.ftl" /></div>
+            <#include "/yeweihui/qiuzhu.ftl" />
+        </div>
         <div id="tab3" class="weui-tab__bd-item">
             <#include "/yeweihui/tuangou.ftl" />
         </div>

whepi-ui/templates/yeweihui/tuangouHome.ftl

@@ -7,12 +7,12 @@
     <input id="uptownName" type="text" hidden="hidden" value=${uptown_name!}/>
 
     <div class="weui-tab__bd">
-        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
+        <div id="tab__1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/yeweihui/tuangou.ftl" />
         </div>
     </div>
     <div class="weui-tabbar">
-        <a id="tab1a" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
+        <a href="#tab__1" class="weui-tabbar__item weui-bar__item--on">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">团购</p>
         </a>

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -69,6 +69,15 @@ public class YeWeiHuiController {
     return new ModelAndView("/yeweihui/home.ftl", model);
   }
 
+  @GetMapping("/yeweihui/tuangouHome.html")
+  public ModelAndView yeweihuiTuangouHome(ModelMap model, @RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
+
+    model.put("user_id", "\"" + userId + "\"");
+    model.put("show", "\"" + show + "\"");
+
+    return new ModelAndView("/yeweihui/tuangouHome.ftl", model);
+  }
+
   @GetMapping("/yeweihui/qiuzhuDetail.html")
   public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 

whepi-web/src/main/resources/mapper/BuyMapper.xml

@@ -15,7 +15,7 @@
        from sys_user_role a
        INNER JOIN sys_uptown_house b on a.property_id=b.house_id
        INNER JOIN sys_uptown_unit c on b.unit_id=c.unit_id
-       where a.user_id=#{userId} and a.role_id=1) ORDER BY jt.tg_end_time DESC
+       where a.user_id=#{userId} and a.role_id=1 limit 1 ) ORDER BY jt.tg_end_time DESC
     </select>
 
     <select id="MyGroup" resultType="com.bofeng.entity.Buy">

whepi-web/src/main/resources/mapper/MsReport.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.MsReportMapper">
     <select id="selectByReportDate" resultType="com.bofeng.entity.MsReport">
-        select * from ms_report where report_date = #{reportDate} and  user_create = #{userCreate} and report_status=1
+        select * from ms_report where report_date = #{reportDate} and  user_create = #{userCreate}
         order by report_date desc
     </select>
 </mapper>