From d6c989a5d9122e5cf969dd640a92b8e12caf8aa6 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 22 Apr 2021 11:18:28 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java | 4 +++-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html | 8 ++++++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
index d671aae..7c5df7e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
@@ -299,7 +299,9 @@
json.put("specialty", adi.getSpecialty());
json.put("service", adi.getService());
json.put("id", String.valueOf(adi.getId()));
- String distance = getDistance(Double.parseDouble(adi.getLatitude()), Double.parseDouble(adi.getLongitude()), lat, lon);
+ double lat1 = StringUtils.isNotBlank(adi.getLatitude()) ? Double.parseDouble(adi.getLatitude()) : 0d;
+ double lon1 = StringUtils.isNotBlank(adi.getLongitude()) ? Double.parseDouble(adi.getLongitude()) : 0d;
+ String distance = getDistance(lat1, lon1, lat, lon);
json.put("distance", distance);
ResultBody byId1 = doctorService.findById(adi.getDoctorId());
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
index 391aaaf..14ad392 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
@@ -197,6 +197,14 @@
});
data.field.appointment = arr_box;
+ if($("#price").val() <= 0){
+ layer.msg("价格请输入大于0的数字", {
+ icon: 2,
+ time: 3000
+ });
+ return false;
+ }
+
layer.load(2);
if($("#bindPhone").val() != "" && $("#bindPhone").val() != null){
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
index 5b96372..f514752 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
@@ -13,7 +13,7 @@
<select id="type" lay-filter="role_clients">
<option value="">服务类型</option>
<option value="1">图文</option>
- <option value="2">电话</option>
+ <option value="3">图文/电话</option>
</select>
<select id="status" lay-filter="role_clients">
<option value="">咨询状态</option>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
index d2dbe47..b48a533 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
@@ -161,7 +161,7 @@
var url = adisory.img.split(",");
for (var i = 0; i < url.length; i++) {
if(url[i] != ''){
- content += "<img src='" + url[i] + "' style='width: 25%;height: 100%;cursor:pointer;' onclick='tipImg(this,1)'/> ";
+ content += "<img src='" + url[i] + "' style='width: 25%;max-height: 120px;cursor:pointer;' onclick='tipImg(this,1)'/> ";
}
}
}
--
Gitblit v1.8.0