diff --git a/src/app.json b/src/app.json index 855a187..c98ca95 100644 --- a/src/app.json +++ b/src/app.json @@ -138,10 +138,6 @@ "text": "活动" }, { - "pagePath": "pages/story/index", - "text": "奇迹故事" - }, - { "pagePath": "pages/my/index", "text": "我的" } diff --git a/src/app.ts b/src/app.ts index 55c8f61..3f0aac3 100644 --- a/src/app.ts +++ b/src/app.ts @@ -439,20 +439,20 @@ App({ }) }, mpBehavior(data: { PageName: string; doctor?: boolean }) { - let url = '?r=zd/mp-behavior/add' - if (data.doctor) { - url = '?r=zd/doctor/mp-behavior/add' - } - delete data.doctor - wx.ajax({ - method: 'POST', - url, - data: data, - loading: false, - showMsg: false, - }).then((res) => { - console.log('res: ', res) - }) + // let url = '?r=zd/mp-behavior/add' + // if (data.doctor) { + // url = '?r=zd/doctor/mp-behavior/add' + // } + // delete data.doctor + // wx.ajax({ + // method: 'POST', + // url, + // data: data, + // loading: false, + // showMsg: false, + // }).then((res) => { + // console.log('res: ', res) + // }) }, // 更新用户信息 diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss index 118d83b..bee809f 100644 --- a/src/custom-tab-bar/index.scss +++ b/src/custom-tab-bar/index.scss @@ -1,5 +1,24 @@ /* custom-tab-bar/index.wxss */ +.circle { + display: block; + margin: 0 auto; + margin-top: -60rpx; + width: 100rpx; + height: 100rpx; + border-radius: 50%; + border: 3px solid #fff; + background: linear-gradient(10deg, #b384f4 0%, #5956e9 100%); + display: flex; + align-items: center; + justify-content: center; + position: relative; + z-index: 1; + .icon { + width: 60rpx; + height: 60rpx; + } +} .tab-item { .icon { @@ -7,12 +26,13 @@ height: 50rpx; } .name { + margin-top: 4rpx; font-size: 24rpx; - color: #CCCCCC; - &.active{ + color: #cccccc; + &.active { color: rgba(14, 182, 109, 1); } - &.drug-active{ + &.drug-active { color: rgba(89, 86, 233, 1); } } diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts index 065a4c0..f8bad98 100644 --- a/src/custom-tab-bar/index.ts +++ b/src/custom-tab-bar/index.ts @@ -21,6 +21,11 @@ Component({ iconActive: 'story-active', }, { + pagePath: '/pages/certReslove/index', + text: '突眼日记', + custom: true, + }, + { pagePath: '/pages/live/index', text: '活动', icon: 'gift', @@ -91,6 +96,9 @@ Component({ } else { wx.switchTab({ url: pagePath, + fail: () => { + wx.navigateTo({ url: pagePath }) + }, }) } }, diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index aae9c63..133410e 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -1,14 +1,18 @@ + + + + + 用药提醒 + - - {{item.text}} diff --git a/src/doctor/pages/d_invite/index.ts b/src/doctor/pages/d_invite/index.ts index 4504463..ef0a56b 100644 --- a/src/doctor/pages/d_invite/index.ts +++ b/src/doctor/pages/d_invite/index.ts @@ -47,68 +47,68 @@ Page({ doctorId: id, }, }).then((res) => { - res = { - info: { id: 'doctor_mini', title: '医生码海报', desc: '医生小程序码海报' }, - body: { - bgImg: - 'https://picsissiok-10049618.cos.ap-shanghai.myqcloud.com/c40aa612270160a657112c56a933d54e_17558553039736.png', - width: '750', - height: '1448', - }, - elements: [ - { - id: 'avatar', - desc: '医生头像', - type: 0, - picType: 'avatar', - src: 'https://picsissiok-10049618.cos.ap-shanghai.myqcloud.com/6e61b32196f54f20f66dd45c33ade450_17693963483779.png', - width: '128', - height: '128', - left: '70', - top: '256', - shape: 'circle', - }, - { - id: 'doctorName', - desc: '医生姓名', - type: 1, - text: '云南大学附属医院\n内分泌科医生', - font: '', - 'font-size': '40', - 'font-weight': 'bold', - width: '384', - color: 'rgba(33, 29, 46, 1)', - 'single-line': true, - left: '234', - top: '256', - }, - { - id: 'hospitalName', - desc: '医院名称', - type: 1, - text: '中南大学湘雅医院', - font: '', - 'font-size': '32', - color: 'rgba(115, 114, 121, 1)', - 'single-line': true, - left: '234', - width: '384', - top: '344', - lineHeight: '36', - }, - { - id: 'minicode', - desc: '医生小程序码', - type: 0, - picType: 'minicode', - src: '', - width: '238', - height: '238', - halign: 'center', - top: '640', - }, - ], - } + // res = { + // info: { id: 'doctor_mini', title: '医生码海报', desc: '医生小程序码海报' }, + // body: { + // bgImg: + // '替换为我发你的图片', + // width: '750', + // height: '1448', + // }, + // elements: [ + // { + // id: 'avatar', + // desc: '医生头像', + // type: 0, + // picType: 'avatar', + // src: 'https://picsissiok-10049618.cos.ap-shanghai.myqcloud.com/6e61b32196f54f20f66dd45c33ade450_17693963483779.png', + // width: '128', + // height: '128', + // left: '70', + // top: '256', + // shape: 'circle', + // }, + // { + // id: 'doctorName', + // desc: '医生姓名', + // type: 1, + // text: '云南大学附属医院\n内分泌科医生', + // font: '', + // 'font-size': '40', + // 'font-weight': 'bold', + // width: '384', + // color: 'rgba(33, 29, 46, 1)', + // 'single-line': true, + // left: '234', + // top: '256', + // }, + // { + // id: 'hospitalName', + // desc: '医院名称', + // type: 1, + // text: '中南大学湘雅医院', + // font: '', + // 'font-size': '32', + // color: 'rgba(115, 114, 121, 1)', + // 'single-line': true, + // left: '234', + // width: '384', + // top: '344', + // lineHeight: '36', + // }, + // { + // id: 'minicode', + // desc: '医生小程序码', + // type: 0, + // picType: 'minicode', + // src: '这块为医生的邀约码url', + // width: '238', + // height: '238', + // halign: 'center', + // top: '640', + // }, + // ], + // } this.setData({ params: res, }) diff --git a/src/images/1/man-active.png b/src/images/1/man-active.png index 6bc2a18..abbe2fd 100644 Binary files a/src/images/1/man-active.png and b/src/images/1/man-active.png differ diff --git a/src/images/1/man.png b/src/images/1/man.png index 7169049..434f0b7 100644 Binary files a/src/images/1/man.png and b/src/images/1/man.png differ diff --git a/src/images/1/woman-active.png b/src/images/1/woman-active.png index 92b97c9..a24e88b 100644 Binary files a/src/images/1/woman-active.png and b/src/images/1/woman-active.png differ diff --git a/src/images/1/woman.png b/src/images/1/woman.png index 99dcbe3..ff6214b 100644 Binary files a/src/images/1/woman.png and b/src/images/1/woman.png differ diff --git a/src/images/icon61.png b/src/images/icon61.png new file mode 100644 index 0000000..1412d14 Binary files /dev/null and b/src/images/icon61.png differ diff --git a/src/images/icon62.png b/src/images/icon62.png new file mode 100644 index 0000000..a5ada1d Binary files /dev/null and b/src/images/icon62.png differ diff --git a/src/images/icon63.png b/src/images/icon63.png new file mode 100644 index 0000000..6358c4b Binary files /dev/null and b/src/images/icon63.png differ diff --git a/src/images/icon64.png b/src/images/icon64.png new file mode 100644 index 0000000..c97733c Binary files /dev/null and b/src/images/icon64.png differ diff --git a/src/images/title3.png b/src/images/title3.png new file mode 100644 index 0000000..60d801c Binary files /dev/null and b/src/images/title3.png differ diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index dc65cb1..e8190fc 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -154,6 +154,11 @@ page { white-space: nowrap; text-overflow: ellipsis; } + .label { + margin-left: 16rpx; + width: 172rpx; + height: 36rpx; + } } .icon { margin-left: 4rpx; @@ -185,7 +190,7 @@ page { font-size: 22rpx; line-height: 1; color: #ffffff; - background: #ee951b; + background: linear-gradient( 270deg, #FFD454 0%, #FFA851 100%); line-height: 24rpx; border-radius: 8rpx 8rpx 8rpx 8rpx; } diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index 7cf9735..b887ba8 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -46,6 +46,7 @@ {{userInfo.ExclusiveDoctorName}} + 医生给您留言了,记得查看！ diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 59338aa..cf24ebc 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -24,11 +24,11 @@ - + 健康档案 - + 用药提醒 diff --git a/src/pages/repository/index.wxml b/src/pages/repository/index.wxml index 785d17b..b8e7cb7 100644 --- a/src/pages/repository/index.wxml +++ b/src/pages/repository/index.wxml @@ -58,7 +58,7 @@ - +