Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/home/home.ftl

@@ -66,7 +66,7 @@
         if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
             $('#ribao_trip')[0].style.display = '';
             $('#ribao_djgl')[0].style.display = 'none';
-            $('#ribao_jbqk')[0].style.display = 'none';
+            $('#ribao_jbqk')[0].style.display = '';
         } else {
             $('#ribao_trip')[0].style.display = 'none';
             $('#ribao_djgl')[0].style.display = '';

whepi-ui/templates/home/ribao.js

@@ -450,6 +450,7 @@ function insertlingyun() {
   var mdd = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
   var jrszq = $('#js_input_jrszq').val();
   var mddq = $('#js_input_mddq').val();
+  var cfdq = $('#js_input_cfdq').val();
   if (mdd != jrszd) {
     $.alert("目的地与今晚住地不一致");
     return;
@@ -458,8 +459,19 @@ function insertlingyun() {
     $.alert("目的地与今晚住地不一致");
     return;
   }
+  if(cfd == 4 && mdd ==4 ){
+    if(mddq == cfdq){
+        $.alert("出发地与目的地不能一致");
+        return;
+    }
+  }else if(cfd != 4 || mdd !=4){
+      if(cfd == mdd){
+          $.alert("出发地与目的地不能一致");
+          return;
+      }
+  }
   var cxfsq = $('#js_input_cxfsq').val();
-  var cfdq = $('#js_input_cfdq').val();
+
 
   for (var i = 0; i < listcx.length; i++) {
     if (listcx[i].tripTypeDesp == cxfsq && listcx[i].tripType == cxfs && listcx[i].startLocal == cfd && listcx[i].startLocalOther == cfdq && listcx[i].endLocal == mdd && listcx[i].endLocalOther == mddq) {