diff --git a/src/components/pickerArea/index.wxml b/src/components/pickerArea/index.wxml
index 4f2617c..780688e 100644
--- a/src/components/pickerArea/index.wxml
+++ b/src/components/pickerArea/index.wxml
@@ -37,7 +37,7 @@
data-name="{{item.label}}"
>
{{item.label}}
-
+
@@ -77,7 +77,7 @@
diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss
index 9b974b2..c0125d1 100644
--- a/src/components/popup/index.scss
+++ b/src/components/popup/index.scss
@@ -220,10 +220,10 @@
}
.title {
margin-top: 24rpx;
- font-size: 32rpx;
+ font-size: 38rpx;
color: #211d2e;
font-weight: bold;
- line-height: 40rpx;
+ line-height: 56rpx;
}
.btn {
margin: 36rpx auto 0;
diff --git a/src/gift/pages/dtpDurg/index.scss b/src/gift/pages/dtpDurg/index.scss
index 078f94e..dc39480 100644
--- a/src/gift/pages/dtpDurg/index.scss
+++ b/src/gift/pages/dtpDurg/index.scss
@@ -46,15 +46,16 @@
line-height: 70rpx;
font-size: 32rpx;
color: #b982ff;
- text-align: center;
border-radius: 60rpx 60rpx 60rpx 60rpx;
border: 1px solid #b982ff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.icon {
margin-right: 8rpx;
display: inline-block;
width: 36rpx;
height: 36rpx;
- vertical-align: middle;
}
}
.site {
@@ -63,14 +64,15 @@
font-size: 32rpx;
color: #ffffff;
border-radius: 60rpx;
- text-align: center;
background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
+ display: flex;
+ align-items: center;
+ justify-content: center;
.icon {
margin-right: 8rpx;
display: inline-block;
width: 32rpx;
height: 32rpx;
- vertical-align: middle;
}
}
}
diff --git a/src/gift/pages/dtpDurg/index.ts b/src/gift/pages/dtpDurg/index.ts
index dce7662..2cd744d 100644
--- a/src/gift/pages/dtpDurg/index.ts
+++ b/src/gift/pages/dtpDurg/index.ts
@@ -4,22 +4,108 @@ Page({
data: {
id: '',
detail: {} as any,
+
+ LNG: '' as number | string,
+ LAT: '' as number | string,
},
onLoad(options) {
this.setData({
id: options.id,
})
app.waitLogin({ type: [0, 1] }).then(() => {
+ this.handleToggleSite()
+ })
+ },
+ handleToggleSite() {
+ if (!this.data.LNG) {
+ wx.getSetting({
+ success: (res) => {
+ if (
+ res.authSetting['scope.userFuzzyLocation'] != undefined
+ && res.authSetting['scope.userFuzzyLocation'] == true
+ ) {
+ // 获取当前位置
+ this.getFuzzyLocation()
+ }
+ else if (res.authSetting['scope.userFuzzyLocation'] == undefined) {
+ // 获取当前位置
+ this.getFuzzyLocation()
+ }
+ else {
+ wx.showModal({
+ title: '请求授权当前位置',
+ content: '需要获取您的地理位置,请确认授权',
+ confirmColor: '#8c75d0',
+ success: (res) => {
+ if (res.cancel) {
+ // 取消授权
+ wx.showToast({
+ title: '拒绝授权',
+ icon: 'none',
+ duration: 1000,
+ })
+ this.getDetail()
+ }
+ else if (res.confirm) {
+ // 确定授权,通过wx.openSetting发起授权请求
+ wx.openSetting({
+ success: (res) => {
+ if (res.authSetting['scope.userFuzzyLocation'] == true) {
+ wx.showToast({
+ title: '授权成功',
+ icon: 'success',
+ duration: 1000,
+ })
+ // 再次授权,调用wx.getLocation的API
+ this.getFuzzyLocation()
+ }
+ else {
+ wx.showToast({
+ title: '授权失败',
+ icon: 'none',
+ duration: 1000,
+ })
+ this.getDetail()
+ }
+ },
+ })
+ }
+ },
+ })
+ }
+ },
+ })
+ }
+ else {
+ this.setData({
+ LNG: '',
+ LAT: '',
+ })
this.getDetail()
+ }
+ },
+ getFuzzyLocation() {
+ wx.getFuzzyLocation({
+ success: (res) => {
+ this.setData({
+ LNG: res.longitude,
+ LAT: res.latitude,
+ })
+ this.getDetail()
+ },
+ fail: () => {
+ this.getDetail()
+ },
})
},
-
getDetail() {
wx.ajax({
method: 'GET',
url: '?r=zd/dtp-pharmacy/detail',
data: {
Id: this.data.id,
+ lng: this.data.LNG,
+ lat: this.data.LAT,
},
}).then((res) => {
this.setData({
diff --git a/src/images/icon101.png b/src/images/icon101.png
index 16bdceb..bcd4c3a 100644
Binary files a/src/images/icon101.png and b/src/images/icon101.png differ
diff --git a/src/images/icon102.png b/src/images/icon102.png
new file mode 100644
index 0000000..16ebfe1
Binary files /dev/null and b/src/images/icon102.png differ
diff --git a/src/images/icon41.png b/src/images/icon41.png
index 35cf88e..2cec450 100644
Binary files a/src/images/icon41.png and b/src/images/icon41.png differ
diff --git a/src/images/icon42.png b/src/images/icon42.png
index 6a4be30..60e266d 100644
Binary files a/src/images/icon42.png and b/src/images/icon42.png differ
diff --git a/src/images/icon95.png b/src/images/icon95.png
index 74cc2b3..5078f52 100644
Binary files a/src/images/icon95.png and b/src/images/icon95.png differ
diff --git a/src/images/icon96.png b/src/images/icon96.png
index e367c56..6a8db31 100644
Binary files a/src/images/icon96.png and b/src/images/icon96.png differ
diff --git a/src/images/icon97.png b/src/images/icon97.png
index 8bef043..01956fd 100644
Binary files a/src/images/icon97.png and b/src/images/icon97.png differ
diff --git a/src/images/icon98.png b/src/images/icon98.png
index 4c54f51..c8c48ef 100644
Binary files a/src/images/icon98.png and b/src/images/icon98.png differ
diff --git a/src/pages/d_interactiveDoctor/index.scss b/src/pages/d_interactiveDoctor/index.scss
index f01dcbc..03d8c64 100644
--- a/src/pages/d_interactiveDoctor/index.scss
+++ b/src/pages/d_interactiveDoctor/index.scss
@@ -468,14 +468,15 @@ page {
padding: 32rpx 30rpx calc(32rpx + env(safe-area-inset-bottom));
box-sizing: border-box;
display: flex;
- gap: 10rpx;
+ gap: 20rpx;
border-radius: 32rpx 32rpx 0 0;
box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(40, 48, 49, 0.04);
border: 2rpx solid #ffffff;
background-color: #fff;
.send {
- padding: 0 12rpx 0 32rpx;
flex: 1;
+ padding: 0 12rpx 0 32rpx;
+ box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
@@ -485,6 +486,9 @@ page {
padding: 10rpx 0;
flex: 1;
color: #adacb2;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.btn {
flex-shrink: 0;
@@ -498,7 +502,25 @@ page {
border-radius: 111rpx 111rpx 111rpx 111rpx;
}
}
+ .short-send {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ color: rgba(40, 48, 49, 1);
+ height: 76rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(40, 48, 49, 0.04);
+ border-radius: 140rpx 140rpx 140rpx 140rpx;
+ border: 2rpx solid #f2f4f5;
+ .icon {
+ width: 36rpx;
+ height: 36rpx;
+ }
+ }
.send-date {
+ text-align: center;
flex-shrink: 0;
font-size: 24rpx;
color: #283031;
@@ -549,6 +571,7 @@ page {
box-sizing: border-box;
padding-bottom: 80rpx;
background-color: transparent;
+ font-size: 32rpx;
.ka-container {
padding: 30rpx 62rpx;
display: flex;
@@ -558,6 +581,9 @@ page {
.stat {
font-size: 28rpx;
color: #adacb2;
+ &.red {
+ color: #ef3939;
+ }
}
.send-btn {
width: 128rpx;
diff --git a/src/pages/d_interactiveDoctor/index.ts b/src/pages/d_interactiveDoctor/index.ts
index 47053cf..3cc7c8d 100644
--- a/src/pages/d_interactiveDoctor/index.ts
+++ b/src/pages/d_interactiveDoctor/index.ts
@@ -494,6 +494,8 @@ Page({
text: customMessage,
patientId,
},
+ loading: true,
+ loadingText: '发送中...',
}).then((res) => {
if (res.errcode == 10001) {
this.setData({
diff --git a/src/pages/d_interactiveDoctor/index.wxml b/src/pages/d_interactiveDoctor/index.wxml
index 4521b81..a4338bd 100644
--- a/src/pages/d_interactiveDoctor/index.wxml
+++ b/src/pages/d_interactiveDoctor/index.wxml
@@ -153,10 +153,11 @@