Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -7,9 +7,9 @@
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/home/ribao.ftl" /></div>
+        <#if uptownId != 1238790987234 && uptownId != 5 && uptownId != 100000002>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <#if uptownId != 1238790987234 && uptownId != 5>
         <div id="tab3" class="weui-tab__bd-item">
             <#include "/home/buy.ftl" /></div>
         </#if>
@@ -21,11 +21,11 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
         </a>
+        <#if uptownId != 1238790987234 && uptownId != 5 && uptownId != 100000002>
         <a id="jt2" href="#tab2" class="weui-tabbar__item" onclick="familyClick()">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <#if uptownId != 1238790987234 && uptownId != 5>
         <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>
@@ -70,13 +70,13 @@
         var uptownId = $("#uptownId").val();
         if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
             $('#ribao_trip')[0].style.display = '';
-            $('#ribao_djgl')[0].style.display = 'none';
+            // $('#ribao_djgl')[0].style.display = 'none';
             $('#ribao_jbqk')[0].style.display = '';
             $('#qz_nav1_t')[0].style.display = 'none';
             $('#qz_nav1')[0].style.display = 'none';
         } else {
             $('#ribao_trip')[0].style.display = 'none';
-            $('#ribao_djgl')[0].style.display = '';
+            // $('#ribao_djgl')[0].style.display = '';
             $('#ribao_jbqk')[0].style.display = '';
             $('#qz_nav1_t')[0].style.display = '';
             $('#qz_nav1')[0].style.display = '';
@@ -219,7 +219,7 @@
         var doorplate = $("#doorplateMsg").text();
         var newDoorplate = $("#newDoorplate").val().trim();
         if (!newDoorplate) {
-            $.alert("请输入工号")
+            $.alert("请输入工号或身份证号")
             return false;
         }
         if (doorplate == newDoorplate) {

whepi-ui/templates/home/ribao.ftl

@@ -7,7 +7,7 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
-            <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )>
+            <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 || uptownId == 100000002 )>
             <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
                 更改部门
             </a>
@@ -178,15 +178,15 @@
                                 </label>
                             </div>
                         </div>
-                        <div id="ribao_djgl">
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>
-                                <input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                            </div>
-                        </div>
+                        <#--<div id="ribao_djgl">-->
+                            <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">-->
+                                <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->
+                                <#--<input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"-->
+                                       <#--placeholder="请选择"-->
+                                       <#--maxlength="20"-->
+                                       <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
+                            <#--</div>-->
+                        <#--</div>-->
 
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                             <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">体温</div>

whepi-ui/templates/user/home.ftl

@@ -171,7 +171,7 @@
                         <div class="weui-cells">
                             <div class="weui-cell">
                                 <div class="weui-cell__bd">
-                                    <input class="weui-input" type="text" id="yaoqingma" placeholder="请输入LY邀请码"/>
+                                    <input class="weui-input" type="text" id="yaoqingma" placeholder="请输入邀请码"/>
                                 </div>
                             </div>
                         </div>
@@ -444,12 +444,12 @@
                     $("#uptownId").val(data[0].uptownId);
                     var uptownId = $("#uptownId").val();
                     // console.log("uptownId:"+uptownId);
-                    if (uptownId == '1238790987234') {
+                    if (uptownId == '1238790987234' || uptownId == '100000002') {
                         console.log("单位");
                         $("#yaoqingmaSS")[0].style.display = '';
                         $("#danweiTitle").text("单位");
                         $("#menpaiTitle").text("工号");
-                        $("#doorplate").attr("placeholder", "输入工号");
+                        $("#doorplate").attr("placeholder", "输入工号或身份证号");
 
                     } else {
                         console.log("小区");
@@ -477,7 +477,7 @@
                     var html = "";
                     for (var i = 0; i < data.length; i++) {
                         var uptownId = $("#uptownId").val();
-                        if (uptownId == '1238790987234') {
+                        if (uptownId == '1238790987234' || uptownId == '100000002') {
                             html += '<option value="' + data[i].unitId + '">' + data[i].ridgepole + data[i].unit + '</option>';
                         } else {
                             if (data[i].ridgepole == "") {
@@ -521,6 +521,13 @@
                 return false;
             }
         }
+        if (uptownId == '100000002') {
+            var yaoqingma = $("#yaoqingma").val();
+            if (yaoqingma != '071797') {
+                $.alert("请填写正确的邀请码！")
+                return false;
+            }
+        }
         var unitId = $("#unitId").val();
         var doorplate = $("#doorplate").val().trim();
         if (!unitId) {
@@ -544,7 +551,7 @@
                 "doorplate": doorplate,
             }, success: function (data) {
                 if (!data.success) {
-                    if (uptownId == '1238790987234') {
+                    if (uptownId == '1238790987234' || uptownId == '100000002') {
                         $.alert("该工号已经被占用，请输入身份证号码");
                         return false;
                     } else {

whepi-web/src/main/java/com/bofeng/service/MsTripService.java

@@ -274,7 +274,7 @@ public class MsTripService {
             //是领域
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
             if (unit != null) {
-                if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5 || unit.getUptownId() == 100000002L) {
                     Integer rezuitNum = msReportService.addReportLy(reportId,suspectedId,userCreate);
                     if (rezuitNum == 4)
                         reportId = 4L;

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

@@ -84,7 +84,7 @@ public class UserOpenController {
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
                 // 凌云集团的可以更改unit
-                if (uptown_id == 1238790987234L || uptown_id == 5L) {
+                if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
                     model.put("unit", unit.getUnit());
@@ -123,7 +123,7 @@ public class UserOpenController {
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
                 // 凌云集团的可以更改unit
-                if (uptown_id == 1238790987234L || uptown_id == 5L) {
+                if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
                     model.put("unit", unit.getUnit());
@@ -200,7 +200,7 @@ public class UserOpenController {
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
                 // 凌云集团的可以更改unit
-                if (uptown_id == 1238790987234L || uptown_id == 5L) {
+                if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
                     model.put("unit", unit.getUnit());