diff --git a/pages.json b/pages.json
index 2f234f8..5e72536 100644
--- a/pages.json
+++ b/pages.json
@@ -31,7 +31,7 @@
}, {
"path": "pages/medicine/medicine",
"style": {
- "navigationBarTitleText": "健康咨询",
+ "navigationBarTitleText": "齐鲁名医",
"enablePullDownRefresh": false,
"disableScroll": true
}
@@ -41,6 +41,12 @@
"navigationBarTitleText": "积分",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/confirmation/confirmation",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "预约时间"
+ }
}, {
"path": "pages/CommodityDetails/CommodityDetails",
"style": {
@@ -51,7 +57,6 @@
"path": "pages/coupon/coupon",
"style": {
"navigationBarTitleText": "优惠券",
- "enablePullDownRefresh": false,
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -226,7 +231,6 @@
"path": "pages/site/site",
"style": {
"navigationBarTitleText": "护理机构",
- "enablePullDownRefresh": false,
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -293,17 +297,14 @@
"navigationBarTitleText": "齐鲁名医",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/night/night",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
}
- ,{
- "path" : "pages/night/night",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
@@ -317,11 +318,11 @@
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
- "pagePath": "pages/homepage/homepage",
- "iconPath": "static/homepagew.png",
- "selectedIconPath": "static/homepagews.png",
- "text": "首页"
- },
+ "pagePath": "pages/homepage/homepage",
+ "iconPath": "static/homepagew.png",
+ "selectedIconPath": "static/homepagews.png",
+ "text": "首页"
+ },
{
"pagePath": "pages/Personal/Personal",
"iconPath": "static/userw.png",
diff --git a/pages/ServiceDetails/ServiceDetails.scss b/pages/ServiceDetails/ServiceDetails.scss
index 20e1d79..4aac457 100644
--- a/pages/ServiceDetails/ServiceDetails.scss
+++ b/pages/ServiceDetails/ServiceDetails.scss
@@ -1,9 +1,9 @@
- .app {
- height: 100%;
- padding: 0 2% 2%;
- font-size: 36rpx;
- padding-top: 10rpx;
- font-size: 34rpx;
+.app {
+ height: 100%;
+ padding: 0 2% 2%;
+ font-size: 36rpx;
+ padding-top: 10rpx;
+ font-size: 34rpx;
.masks{
image{
position: absolute;
@@ -57,230 +57,229 @@
font-size: 42rpx;
}
}
- .time{
- height: 80rpx;
- width: 95%;
- text-align: center;
- line-height: 80rpx;
- background-color: #fff;
- margin: 20rpx auto 0rpx;
- border-radius: 20rpx;
+ .time{
+ height: 80rpx;
+ width: 95%;
+ text-align: center;
+ line-height: 80rpx;
+ background-color: #fff;
+ margin: 20rpx auto 0rpx;
+ border-radius: 20rpx;
+ }
+ .OrderStatus{
+ text-align: center;
+ width: 300rpx;
+ height: 70rpx;
+ margin: 10rpx auto 0;
+ line-height: 70rpx;
+ background-color:#4C7BC9 ;
+ border-radius: 50rpx;
+ // color: #4C7BC9;
+ color: #FFFFFF;
+ border: 1rpx solid #4C7BC9;
+ }
+ // 服务商家
+ .detail {
+ margin: 30rpx 0 0 3%;
+ line-height: 31rpx;
+ font-size: 32rpx;
+ color: #666666;
+ line-height: 31rpx;
+ }
+
+ .name {
+ width: 95%;
+ height: 90rpx;
+ // margin-left: 3%;
+ line-height: 90rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ margin: 0 auto;
+ }
+
+ //按钮取消订单和评价
+ .evaluate {
+ width: 90%;
+ margin: 0 auto;
+ font-size: 32rpx;
+ position: relative;
+ height: 100rpx;
+ .price{
+ line-height: 100rpx;
+ color: red;
+ font-size: 46rpx;
}
- .OrderStatus{
+ .cancelorder {
+ width: 216rpx;
+ height: 68rpx;
+ background: #E1AE3C;
+ border-radius: 26rpx;
text-align: center;
- width: 300rpx;
- height: 70rpx;
- margin: 10rpx auto 0;
- line-height: 70rpx;
- background-color:#4C7BC9 ;
- border-radius: 50rpx;
- // color: #4C7BC9;
- color: #FFFFFF;
- border: 1rpx solid #4C7BC9;
+ color: #ffffff;
+ line-height: 68rpx;
+ position: absolute;
+ right:0%;
+ top:50%;
+ transform: translateY(-50%);
}
- // 服务商家
- .detail {
- margin: 30rpx 0 0 3%;
- line-height: 31rpx;
+ }
+
+ //备注
+ .remarks {
+ width: 95%;
+ margin: 20rpx auto;
+ padding: 3%;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ position: relative;
+
+ view {
+ display: inline-block;
+ width: 20%;
+ }
+
+ input {
+ display: inline-block;
+ width: 80%;
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ left: 20%;
+ color: #666666;
+ }
+ }
+
+ /* 耗材包 */
+ .Consumablespackage {
+ width: 95%;
+ margin: 20rpx auto;
+ padding: 3% 3% 50rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+
+ span {
+ font-size: 32rpx;
+ color: #D43953;
+ float: right;
+ }
+ }
+
+ /* 套餐 */
+ .Package {
+ width: 94%;
+ margin: 20rpx auto 0;
+ padding: 3% 3% 50rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+
+ span {
+ font-size: 32rpx;
+ color: #D43953;
+ float: right;
+ }
+ }
+
+ //服务项目和服务商家
+ .content {
+ width: 95%;
+ height: 100%;
+ background: #FFFFFF;
+ box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border-radius: 20rpx;
+ margin: 20rpx auto 0;
+ padding: 3% 3% 40rpx 3%;
+ line-height: 60rpx;
+
+ // 服务信息
+ .contacts {
+ margin-top: 1%;
+ font-size: 32rpx;
+ padding: 0 3% 0 3%;
+ color: #666666;
+ word-break:break-all;
+ // line-height: 38rpx;
+ }
+
+ .drug {
font-size: 32rpx;
color: #666666;
- line-height: 31rpx;
+ padding: 0 3% 0 3%;
}
- .name {
- width: 95%;
- height: 90rpx;
- // margin-left: 3%;
- line-height: 90rpx;
- border-bottom: 1rpx solid #D8D4D4;
- margin: 0 auto;
- }
-
- //按钮取消订单和评价
- .evaluate {
- width: 90%;
- margin: 0 auto;
- font-size: 32rpx;
- position: relative;
- height: 100rpx;
- .price{
- line-height: 100rpx;
- color: red;
- font-size: 46rpx;
+ .details {
+ .callme {
+ width: 150rpx;
+ height: 48rpx;
+ background: #D43953;
+ border-radius: 24px;
+ font-size: 21rpx;
+ color: #ffffff;
+ line-height: 48rpx;
+ text-align: center;
+ position: relative;
+ margin-top: 20rpx;
+ .icon{
+ position: absolute;
+ left:10%;
+ top:50%;
+ transform: translateY(-50%);
+ }
+ .text{
+ position: absolute;
+ top:50%;
+ right:10%;
+ transform: translateY(-50%);
+ }
}
- .cancelorder {
- width: 216rpx;
+
+ .detailslist {
+ position: relative;
+
+ image {
+ width: 182rpx;
+ height: 182rpx;
+ margin: 20rpx 0 0 20rpx;
+ }
+
+ .model {
+ position: absolute;
+ left:35%;
+ top:10%;
+ width: 65%;
+ .top,.bottom{
+ height: 60rpx;
+ view {
+ width: 100%;
+ font-size: 32rpx;
+ color: #000000;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ word-break:break-all;
+ }
+ }
+
+ .bottom {
+ view {
+ font-size: 25rpx;
+ color: #969394;
+ }
+ }
+ }
+ }
+
+ .submit {
+ width: 175rpx;
height: 68rpx;
- background: #E1AE3C;
+ line-height: 68rpx;
+ background: #4C7BC9;
border-radius: 26rpx;
text-align: center;
- color: #ffffff;
- line-height: 68rpx;
- position: absolute;
- right:0%;
- top:50%;
- transform: translateY(-50%);
- }
- }
-
- //备注
- .remarks {
- width: 95%;
- margin: 20rpx auto;
- padding: 3%;
- background: #FFFFFF;
- border-radius: 20rpx;
- position: relative;
-
- view {
- display: inline-block;
- width: 20%;
- }
-
- input {
- display: inline-block;
- width: 80%;
- position: absolute;
- top: 50%;
- transform: translateY(-50%);
- left: 20%;
- color: #666666;
- }
- }
-
- /* 耗材包 */
- .Consumablespackage {
- width: 95%;
- margin: 20rpx auto;
- padding: 3% 3% 50rpx;
- background: #FFFFFF;
- border-radius: 20rpx;
-
- span {
font-size: 32rpx;
- color: #D43953;
+ color: #FFFFFF;
float: right;
+ margin-right: 30rpx;
}
+
}
-
- /* 套餐 */
- .Package {
- width: 94%;
- margin: 20rpx auto 0;
- padding: 3% 3% 50rpx;
- background: #FFFFFF;
- border-radius: 20rpx;
-
- span {
- font-size: 32rpx;
- color: #D43953;
- float: right;
- }
- }
-
- //服务项目和服务商家
- .content {
- width: 95%;
- height: 100%;
- background: #FFFFFF;
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- border-radius: 20rpx;
- margin: 20rpx auto 0;
- padding: 3% 3% 40rpx 3%;
- line-height: 60rpx;
-
- // 服务信息
- .contacts {
- margin-top: 1%;
- font-size: 32rpx;
- padding: 0 3% 0 3%;
- color: #666666;
- word-break:break-all;
- // line-height: 38rpx;
- }
-
- .drug {
- font-size: 32rpx;
- color: #666666;
- padding: 0 3% 0 3%;
- }
-
- .details {
- .callme {
- width: 150rpx;
- height: 48rpx;
- background: #D43953;
- border-radius: 24px;
- font-size: 21rpx;
- color: #ffffff;
- line-height: 48rpx;
- text-align: center;
- position: relative;
- margin-top: 20rpx;
- .icon{
- position: absolute;
- left:10%;
- top:50%;
- transform: translateY(-50%);
- }
- .text{
- position: absolute;
- top:50%;
- right:10%;
- transform: translateY(-50%);
- }
- }
-
- .detailslist {
- position: relative;
-
- image {
- width: 182rpx;
- height: 182rpx;
- margin: 20rpx 0 0 20rpx;
- }
-
- .model {
- position: absolute;
- left:35%;
- top:10%;
- width: 65%;
- .top,.bottom{
- height: 30rpx;
- view {
- width: 100%;
- font-size: 32rpx;
- color: #000000;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- word-break:break-all;
- }
- }
-
- .bottom {
- height: 60rpx;
- view {
- font-size: 25rpx;
- color: #969394;
- }
- }
- }
- }
-
- .submit {
- width: 175rpx;
- height: 68rpx;
- line-height: 68rpx;
- background: #4C7BC9;
- border-radius: 26rpx;
- text-align: center;
- font-size: 32rpx;
- color: #FFFFFF;
- float: right;
- margin-right: 30rpx;
- }
-
- }
- }
- }
\ No newline at end of file
+ }
+}
diff --git a/pages/diagnosis/diagnosis.vue b/pages/diagnosis/diagnosis.vue
deleted file mode 100644
index 4794935..0000000
--- a/pages/diagnosis/diagnosis.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
- 医生建议
-
-
-
-
-
- 评价
-
-
-
-
-
-
-
-
-
-
-
- 满意
-
-
- 一般
-
-
- 不满意
-
-
-
- 提交
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/night/night.vue b/pages/night/night.vue
index 1bda5d2..ce36b0b 100644
--- a/pages/night/night.vue
+++ b/pages/night/night.vue
@@ -14,6 +14,9 @@
截止目前，平台在网用户已达30余万人，活跃用户4万余人，平台日呼入量近600人次，累计完成紧急援助近6000人次，累计提供各种服务近200万次，居民对服务的满意率达到99%。
2017年11月，公司被山东省质监局、山东省发改委正式授予“山东省服务标准化示范单位”称号。同时，先后多次被中国服务贸易协会授予
“健康养老最佳商业模式机构”、“最具成长型服务企业”、“健康养老品牌服务机构”、“服务贸易创新型企业”等荣誉称号。
+
+ 立即呼叫
+
@@ -28,6 +31,33 @@
return {
};
+ },
+ methods: {
+ phone() {
+ var that = this
+ uni.getSystemInfo({
+ success: function(res) {
+ console.log(res)
+ if (res.platform == 'ios') {
+ uni.makePhoneCall({
+ phoneNumber: '053196558' //仅为示例
+ });
+ } else {
+ uni.showActionSheet({
+ itemList: ['呼叫'],
+ success: function(res) {
+ if (res.tapIndex + 1 == 1) {
+ uni.makePhoneCall({
+ phoneNumber: '053196558' //仅为示例
+ });
+ }
+ },
+ fail: function(res) {}
+ });
+ }
+ }
+ });
+ }
}
}
@@ -36,9 +66,21 @@
.app {
padding-top: 10rpx;
+ .btn {
+ background-color: #4C7BC9;
+ text-align: center;
+ color: #FFFFFF;
+ width: 70%;
+ height: 80rpx;
+ line-height: 80rpx;
+ margin: 80rpx auto;
+ text-indent: 0em;
+ border-radius: 10rpx;
+ }
+
.concent {
width: 701rpx;
- height: 1500rpx;
+ height: 1700rpx;
background: #4C7BC9;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
@@ -47,7 +89,7 @@
.background {
position: relative;
width: 657rpx;
- height: 1450rpx;
+ height: 1650rpx;
background: #FFFFFF;
border-radius: 25rpx;
background-color: white;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index 1d041aa..2f86474 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -2,16 +2,16 @@
+ :interval="2000" :duration="1000" class="swiper-box" :circular='true' @change="swiperChange">
+ object-fit="fill" @play="play" @pause="pause" @ended="ended" auto-pause-if-navigate
+ show-play-btn :enable-progress-gesture='true' :show-center-play-btn='true' enable-play-gesture
+ auto-pause-if-open-native show-mute-btn>
@@ -91,7 +91,7 @@
+ :class="tabIndex == index?'active':''">
{{item.name}}
@@ -99,7 +99,7 @@
+ @click.stop='goProjectDetails(item)'>
{{item.nurseItemName}}
@@ -190,9 +190,9 @@
}], //分类标题
tabIndex: 0,
tabLists: [{
- name: '服务项目',
- id: 0,
- },
+ name: '服务项目',
+ id: 0,
+ },
{
name: '产品',
id: 1,
@@ -338,7 +338,7 @@
res.data.stationPictureUrl = baseurl + res.data.stationPictureUrl
if (res.data.agencyIntroduce) {
res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\![]()
![]()
![]()
{
e.name = e.classifyName
@@ -353,7 +353,7 @@
})
if (res.data.poserInfoList[0].video) {
res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0]
- .posterVideoUrl
+ .posterVideoUrl
this.Banners.push(res.data.poserInfoList[0].video)
}
} else {
@@ -416,7 +416,7 @@
});
} else {
uni.showActionSheet({
- itemList: ['呼叫', ],
+ itemList: ['呼叫'],
success: function(res) {
if (res.tapIndex + 1 == 1) {
uni.makePhoneCall({
diff --git a/pages/user/user.scss b/pages/user/user.scss
deleted file mode 100644
index e69de29..0000000