style

whepi-ui/templates/home/ribao.js

@@ -910,15 +910,17 @@ function ribao_cell(v) {
   var familyStatus = "";
   // if (v.familyStatus != 0)
   //   familyStatus = getFamilyStatus(v.familyStatus) + "；";
-  var medical = "";
-  if (v.medical != 0)
-    medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
+  var medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
   var isContact = "";
   if (v.isContact != 0)
     isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；<br/>";
   var isSuspected = "";
   if (v.isSuspected != 0)
     isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；<br/>";
+  var isContactHistory = '';
+  if(!isContact && !isSuspected){
+    isContactHistory = "新冠肺炎接触史：无；<br/>";
+  }
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
@@ -994,7 +996,7 @@ function ribao_cell(v) {
       '  <div class="weui-form-preview__bd">\n' +
       '    <div class="weui-form-preview__item">\n' +
       '      <label class="weui-form-preview__label">基本情况</label>\n' +
-      '      <span class="weui-form-preview__value" style="text-align: left;">'+ temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet+'</span>\n' +
+      '      <span class="weui-form-preview__value" style="text-align: left;">'+ temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContactHistory + isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet+'</span>\n' +
       '    </div>\n' +
       '  </div>\n' +
       '  <div class="weui-form-preview__ft">\n' +
@@ -1282,11 +1284,13 @@ function ribaoCommit() {
   }
   cantijiao = false
   // //判断是否获取到定位
+
   if (longitude == '' && latitude =='') {
     cantijiao = true;
     $.alert("请检查是否开启手机定位和微信定位");
     return;
   }
+
   // if (autoLocal == '') {
   //   cantijiao = true;
   //   $.alert("请先设置微信获取当前位置");
@@ -2024,9 +2028,7 @@ function helpValue1(v) {
   // if (v.familyStatus != 0)
   //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
 
-  var medical = "";
-  if (v.medical != 0)
-    medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
+  var medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
 
   var isContact = "";
   if (v.isContact != 0)
@@ -2035,6 +2037,12 @@ function helpValue1(v) {
   var isSuspected = "";
   if (v.isSuspected != 0)
     isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；<br/>";
+
+  var isContactHistory = '';
+  if(!isContact && !isSuspected){
+    isContactHistory = "新冠肺炎接触史：无；<br/>";
+  }
+
   var singleRoom = "";
 
   var uptownId = $("#uptownId").val();
@@ -2099,7 +2107,7 @@ function helpValue1(v) {
 
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <div style="height: auto">' + temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
+    '                                      <div style="height: auto">' + temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContactHistory +isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -2253,9 +2261,9 @@ function getSingleRoom(singleRoom) {
 
 function getIsTrip(isTrip) {
   if (isTrip == 0)
-    return "否";
+    return "无";
   else if (isTrip == 1)
-    return "是";
+    return "有";
   return "";
 }