From c3e23965e49e0c10e67690ba1b70862c22eb54f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 30 Mar 2023 11:02:14 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 91 ++++++----------------
pages/appointmenttime/appointmenttime.scss | 22 ++++--
pages/appointmenttime/appointmenttime.vue | 37 ++++++++-
3 files changed, 76 insertions(+), 74 deletions(-)
diff --git a/pages.json b/pages.json
index 37e1504..1b477d5 100644
--- a/pages.json
+++ b/pages.json
@@ -9,20 +9,24 @@
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
+ }, {
+ "path": "pages/appointmenttime/appointmenttime",
+ "style": {
+ "navigationBarTitleText": "预约时间",
+ "enablePullDownRefresh": false
+ }
}, {
"path": "pages/medicine/medicine",
"style": {
"navigationBarTitleText": "齐鲁名医",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff",
"disableScroll": true
}
}, {
"path": "pages/integral/integral",
"style": {
"navigationBarTitleText": "积分",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/confirmation/confirmation",
@@ -35,22 +39,19 @@
"path": "pages/information/information",
"style": {
"navigationBarTitleText": "完善个人信息",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
"enablePullDownRefresh": false
}
}, {
"path": "pages/CommodityDetails/CommodityDetails",
"style": {
"navigationBarTitleText": "商品详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/coupon/coupon",
"style": {
"navigationBarTitleText": "优惠券",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -59,28 +60,24 @@
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff",
"navigationStyle": "custom"
}
}, {
"path": "pages/modify/modify",
"style": {
"navigationBarTitleText": "修改信息",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/ProjectDetails/ProjectDetails",
"style": {
"navigationBarTitleText": "护理项目详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/modifyAddress/modifyAddress",
"style": {
"navigationBarTitleText": "修改地址",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
"enablePullDownRefresh": true //设置参数为true
}
},
@@ -88,30 +85,19 @@
"path": "pages/lookrate/lookrate",
"style": {
"navigationBarTitleText": "查看评价",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/ServiceDetails/ServiceDetails",
"style": {
"navigationBarTitleText": "服务详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/goodsorderRate/goodsorderRate",
"style": {
"navigationBarTitleText": "发表评价",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
- }
- },
- {
- "path": "pages/appointmenttime/appointmenttime",
- "style": {
- "navigationBarTitleText": "预约时间",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/paysuccess/paysuccess",
@@ -132,7 +118,6 @@
"path": "pages/shopping/shopping", //商城
"style": {
"navigationBarTitleText": "医路优品",
- "navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -140,7 +125,6 @@
"path": "pages/CommodityOrder/CommodityOrder",
"style": {
"navigationBarTitleText": "商品订单",
- "navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -149,7 +133,6 @@
"path": "pages/orderDetails/orderDetails",
"style": {
"navigationBarTitleText": "订单详情",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -157,7 +140,6 @@
"path": "pages/payorderDetails/payorderDetails",
"style": {
"navigationBarTitleText": "订单详情",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -165,23 +147,20 @@
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/cancelorder/cancelorder",
"style": {
"navigationBarTitleText": "取消订单",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
"style": {
"navigationBarTitleText": "护理机构服务订单",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -190,15 +169,13 @@
"path": "pages/logistics/logistics",
"style": {
"navigationBarTitleText": "查看物流",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/Aftersalesdetails/Aftersalesdetails",
"style": {
"navigationBarTitleText": "售后详情",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -206,7 +183,6 @@
"path": "pages/Applforrefund/Applforrefund",
"style": {
"navigationBarTitleText": "申请退款",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -214,7 +190,6 @@
"path": "pages/refundType/refundType",
"style": {
"navigationBarTitleText": "选择退款类型",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -230,7 +205,6 @@
"style": {
"navigationBarTitleText": "泉医到家",
"navigationStyle": "custom",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
@@ -247,7 +221,6 @@
"path": "pages/disease/disease",
"style": {
"navigationBarTitleText": "疾病类型选择",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
"enablePullDownRefresh": false
}
},
@@ -255,15 +228,13 @@
"path": "pages/doctorslist/doctorslist",
"style": {
"navigationBarTitleText": "预约医生",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/ProductList/ProductList", //商品列表
"style": {
"navigationBarTitleText": "医路优品",
- "navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -272,7 +243,6 @@
"path": "pages/nursestation/nursestation",
"style": {
"navigationBarTitleText": "护理机构详情",
- "navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -282,7 +252,6 @@
"style": {
"navigationBarTitleText": "护理机构",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
@@ -291,16 +260,14 @@
"path": "pages/diseasemanagement/diseasemanagement",
"style": {
"navigationBarTitleText": "专病管理",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/utabs/u-tabs",
"style": {
"navigationBarTitleText": "",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
},
{
@@ -309,7 +276,6 @@
"navigationBarTitleText": "分类",
"enablePullDownRefresh": false,
"disableScroll": true
- // "navigationBarBackgroundColor": "#ffffff",
// "onReachBottomDistance": 50 //距离底部多远时触发 单位为px
// "enablePullDownRefresh": true //设置参数为true
}
@@ -317,50 +283,43 @@
"path": "pages/Healthknowledge/Healthknowledge",
"style": {
"navigationBarTitleText": "健康常识",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/Healthitem/Healthitem",
"style": {
"navigationBarTitleText": "健康常识",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/customerservice/customerservice",
"style": {
"navigationBarTitleText": "在线客服",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/materialbenefits/materialbenefits",
"style": {
"navigationBarTitleText": "新人福利",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/geriatricdisease/geriatricdisease",
"style": {
"navigationBarTitleText": "国家老年病中心",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/Healthrecords/Healthrecords",
"style": {
"navigationBarTitleText": "健康档案",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
}, {
"path": "pages/ConsultationDetails/ConsultationDetails",
"style": {
"navigationBarTitleText": "齐鲁名医",
- "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
}
@@ -368,7 +327,7 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#F8F8F8",
+ "navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {},
diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index e0ec932..bbf86b8 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -183,17 +183,20 @@
margin-top: 20rpx;
position: relative;
- span {
+ .span {
display: inline-block;
- width: 60%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ width: 20%;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
position: absolute;
top:50%;
transform: translateY(-50%);
}
-
+ .input-placeholder{
+ color: #C5C3C3;
+ font-size: 30rpx;
+ }
input {
position: absolute;
top: 50%;
@@ -350,7 +353,12 @@
border-radius: 20rpx;
margin-top: 20rpx;
position: relative;
-
+ .checkboxs{
+ margin-top: 30rpx;
+ ::v-deep .u-checkbox{
+ padding-right: 40rpx;
+ }
+ }
.detail {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 0682c35..d3018f8 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -73,8 +73,24 @@
+
+ 是否失能
+ *
+ (请选择)
+
+
+ {{item.name}}
+
+
+
+
@@ -157,6 +173,15 @@
orderChannel: '',
},
timeindex: 0,
+ checkboxlist: [{
+ name: '是',
+ checked: false,
+ },
+ {
+ name: '否',
+ checked: false,
+ }
+ ]
}
},
onShow() {
@@ -329,6 +354,7 @@
this.radio = 2;
this.maskshow = false
},
+ // 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
if (e.radio) {
this.orderlist.totalPrice = this.argSubtr(this.orderlist.totalPrice, e.consumablePrice)
@@ -336,6 +362,15 @@
this.orderlist.totalPrice = this.argAdd(this.orderlist.totalPrice, e.consumablePrice)
}
},
+ // 选中某个复选框时，由checkbox时触发
+ checkboxChangetwo(e) {
+ this.checkboxlist.forEach(e => {
+ e.checked = false
+ })
+ e.checked = true
+ },
+ // 选中任一checkbox时，由checkbox-group触发
+ checkboxGroupChangetwo(e) {},
argAdd(arg1, arg2) {
// 加法函数
var _this = this,
From f31d4dd07323dc0a44fe3587136ebd857a642906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 30 Mar 2023 16:23:15 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ConsultationDetails.vue | 16 +++++--
pages/homepage/homepage.vue | 44 ++++++++++++++++---
2 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/pages/ConsultationDetails/ConsultationDetails.vue b/pages/ConsultationDetails/ConsultationDetails.vue
index 8202649..3c2d31e 100644
--- a/pages/ConsultationDetails/ConsultationDetails.vue
+++ b/pages/ConsultationDetails/ConsultationDetails.vue
@@ -12,17 +12,27 @@
return {
imageurl: null,
imageurls: null,
+ goto: '',
};
},
onShow() {
this.imageurl = baseurl + '/profile/appletPicture/healthyOne.png'
this.imageurls = baseurl + '/profile/appletPicture/healthyDetails.png'
},
+ onLoad(options) {
+ this.goto = options.goto
+ },
methods: {
godetal() {
- uni.navigateBack({
- delta: 1
- })
+ if (this.goto == 'homepage') {
+ uni.navigateTo({
+ url: '/pages/medicine/medicine'
+ })
+ } else {
+ uni.navigateBack({
+ delta: 1
+ })
+ }
}
}
}
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 65614a6..525441a 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -133,14 +133,44 @@
this.swiperImglink.forEach(e => {
e.image = baseurl + e.posterPictureUrl
if (e.image == item) {
- if (e.jumpLink == '/pages/homepage/homepage' || e.jumpLink == '/pages/Personal/Personal') {
- uni.switchTab({
- url: e.jumpLink
- })
+ if (e.dictLabel == '专病管理') {
+ const phone = uni.getStorageSync('phone');
+ if (phone) {
+ uni.navigateToMiniProgram({
+ appId: 'wxa690d053c34ceebd',
+ path: '/pages/index/index',
+ extraData: {
+ 'from': 'qy',
+ 'phone': phone
+ },
+ success(res) {}
+ })
+ } else {
+ this.$refs.uToast.show({
+ title: '您未登录,请先登录',
+ type: 'error',
+ duration: '1000',
+ url: '/pages/login/login'
+ })
+ }
+ } else if (e.dictLabel == '新医象') {
+ this.goycjc();
} else {
- uni.navigateTo({
- url: e.jumpLink
- })
+ if (e.jumpLink == '/pages/ConsultationDetails/ConsultationDetails') {
+ const url = `/pages/ConsultationDetails/ConsultationDetails?goto=${'homepage'}`
+ uni.navigateTo({
+ url: url
+ })
+ } else if (e.jumpLink == '/pages/homepage/homepage' || e.jumpLink ==
+ '/pages/Personal/Personal') {
+ uni.switchTab({
+ url: e.jumpLink
+ })
+ } else {
+ uni.navigateTo({
+ url: e.jumpLink
+ })
+ }
}
}
})
From 0d1b56b781e6d19e0ff5a7da5e3a90a2d25e3dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 3 Apr 2023 16:57:00 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/appointmenttime/appointmenttime.vue | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index d3018f8..e395194 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -84,10 +84,10 @@
-
-
+