diff --git a/Pages/index/index.wxss b/Pages/index/index.wxss index 8f99577..a665326 100644 --- a/Pages/index/index.wxss +++ b/Pages/index/index.wxss @@ -4,7 +4,7 @@ margin-left: 50rpx; margin-bottom: 100rpx; font-size: 50rpx; - font-family: "AlibabaPuHuiTi-2-75-SemiBold"; + /* font-family: "AlibabaPuHuiTi-2-75-SemiBold"; */ color: #333; } .item{ diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js index 1463245..ac6fef6 100644 --- a/Pages/mobile_login/index.js +++ b/Pages/mobile_login/index.js @@ -13,13 +13,33 @@ Page({ btn_msg: "获取验证码", btn_disabled: false, login_disabled: true, + btn_color: "#ccc" }, onChange(event) { this.setData({ checked: event.detail, }); }, + phone_change(e){ + let phone = this.data.phone; + if(phone != ""){ + this.setData({ + btn_color: "#3CC7C0" + }) + } + }, getCodePhone(e){ + let phone_reg = /^1[3-9]\d{9}$/; + let phone = this.data.phone; + //判断用户输入的真实姓名是否为空 + if(phone.length == 0){ + wx.showToast({title: '手机号不能为空', icon:'error'}) + return false; + }else if(!phone_reg.test(phone)){//检测姓名的格式是否匹配 + wx.showToast({title: '手机号输入有误', icon:'error'}) + return false; + } + if(!this.data.checked){ wx.showToast({ title: '请同意协议', @@ -48,6 +68,24 @@ Page({ }) }, mobileLogin(e){ + + let phone_reg = /^1[3-9]\d{9}$/; + let phone = this.data.phone; + let sms = this.data.sms; + //判断用户输入的真实姓名是否为空 + if(phone.length == 0){ + wx.showToast({title: '手机号不能为空', icon:'error'}) + return false; + }else if(!phone_reg.test(phone)){//检测姓名的格式是否匹配 + wx.showToast({title: '手机号输入有误', icon:'error'}) + return false; + } + + if(sms.length == 0){ + wx.showToast({title: '验证码不能为空', icon:'error'}) + return false; + } + if(!this.data.checked){ wx.showToast({ title: '请同意协议', diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml index 12c0ed4..2a0684a 100644 --- a/Pages/mobile_login/index.wxml +++ b/Pages/mobile_login/index.wxml @@ -3,26 +3,27 @@ - - - - {{btn_msg}} - - + + + + {{btn_msg}} + + 登录 diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss index 2dee842..ec68852 100644 --- a/Pages/mobile_login/index.wxss +++ b/Pages/mobile_login/index.wxss @@ -1,5 +1,5 @@ .logo{ - height: 500rpx; + margin-top: 150rpx; display: flex; align-items: center; justify-content: center; diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml index c13413b..f4164e1 100644 --- a/Pages/yaoshi/home/home.wxml +++ b/Pages/yaoshi/home/home.wxml @@ -46,7 +46,7 @@ 处方订单号：2023010510324649 - 查看病例 + 查看病例 @@ -68,7 +68,7 @@ 处方订单号：2023010510324649 - 查看病例 + 查看病例 @@ -90,7 +90,7 @@ 处方订单号：2023010510324649 - 查看病例 + 查看病例 diff --git a/Pages/yaoshi/info/info.wxss b/Pages/yaoshi/info/info.wxss index cb7329f..9149bd9 100644 --- a/Pages/yaoshi/info/info.wxss +++ b/Pages/yaoshi/info/info.wxss @@ -1,12 +1,16 @@ +page{ + background-color: #F4F4F4; +} .top{ width: 100vw; - background-color: cornflowerblue; + background-color: rgb(255, 255, 255); height: 370rpx; display: flex; justify-content: center; align-items: center; align-content: center; flex-direction: column; + margin-bottom: 20rpx; } .name{ color: white; @@ -15,4 +19,5 @@ text-justify:distribute-all-lines; text-align-last: justify; font-size: 28rpx; + width: 180rpx; } diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js index b1feb40..a140602 100644 --- a/Pages/yaoshi/my/my.js +++ b/Pages/yaoshi/my/my.js @@ -4,7 +4,7 @@ const app = getApp() Page({ data: { navbarData: { - showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 + showCapsule: 0, //是否显示左上角图标 1表示显示 0表示不显示 title: '个人中心', //导航栏 中间的标题 }, height: app.globalData.height, @@ -25,5 +25,30 @@ Page({ }).catch(errors => { console.error(errors); }) + }, + logOut(){ + console.log("退出登录"); + let usertype = wx.getStorageSync('usertype'); + wx.showModal({ + title: '确认退出登录', + content: '退出登录后您需要重新登录', + success (res) { + if (res.confirm) { + console.log('用户点击确定') + wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + wx.setStorageSync('user_id', ""); + wx.setStorageSync('client_user_id', ""); + app.go("/Pages/index/index"); + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }, + go(e){ + console.log(e) + let url = e.currentTarget.dataset.url; + app.go(url); } + }) \ No newline at end of file diff --git a/Pages/yaoshi/my/my.json b/Pages/yaoshi/my/my.json index b6f232d..35d8a0c 100644 --- a/Pages/yaoshi/my/my.json +++ b/Pages/yaoshi/my/my.json @@ -2,7 +2,9 @@ "component": true, "usingComponents": { "t-avatar": "tdesign-miniprogram/avatar/avatar", - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index", + "te-nav-bar": "/commpents/te_navbar" }, "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black", diff --git a/Pages/yaoshi/my/my.wxml b/Pages/yaoshi/my/my.wxml index ac21aba..66155ea 100644 --- a/Pages/yaoshi/my/my.wxml +++ b/Pages/yaoshi/my/my.wxml @@ -1,19 +1,18 @@ + {{info.user_name}} - - 个人中心 - + 个人中心 - - - - 实名认证 - + + + 实名认证 + + 退出登录 \ No newline at end of file diff --git a/Pages/yaoshi/my/my.wxss b/Pages/yaoshi/my/my.wxss index 7b6c197..b182a9f 100644 --- a/Pages/yaoshi/my/my.wxss +++ b/Pages/yaoshi/my/my.wxss @@ -12,9 +12,10 @@ color: white; margin-top: 30rpx; text-align: justify; - text-justify:distribute-all-lines; + text-justify: inter-word; text-align-last: justify; font-size: 28rpx; + width: 180rpx; } .my{ display: flex; diff --git a/Pages/yishi/bankcard/index.wxss b/Pages/yishi/bankcard/index.wxss index 0b5e953..a1f2acf 100644 --- a/Pages/yishi/bankcard/index.wxss +++ b/Pages/yishi/bankcard/index.wxss @@ -32,7 +32,7 @@ page{ font-size: 28rpx; color: #999999; width: 92vw; - margin: 0 auto; + margin: -20rpx auto; line-height: 50rpx; } .bankcard_list{ diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss index 50c7748..7036ca0 100644 --- a/Pages/yishi/bindcard/index.wxss +++ b/Pages/yishi/bindcard/index.wxss @@ -20,7 +20,7 @@ font-size: 28rpx; color: #999999; width: 92vw; - margin: 50rpx auto; + margin: 20rpx auto; line-height: 50rpx; } .t-tabs__item--active{ @@ -34,4 +34,7 @@ } .van-picker__confirm{ color: #3cc7c0 !important; +} +.van-cell { + padding: 32rpx !important; } \ No newline at end of file diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml index 7db1ca9..ea973f1 100644 --- a/Pages/yishi/cash/index.wxml +++ b/Pages/yishi/cash/index.wxml @@ -50,7 +50,7 @@ --> - 提取 + 提取 联系客服 diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss index 44d5df4..90b1ddb 100644 --- a/Pages/yishi/cash/index.wxss +++ b/Pages/yishi/cash/index.wxss @@ -58,12 +58,13 @@ page{ flex-direction: column; } .cash_top{ + margin-top: 20rpx; display: flex; flex: 3; } .cash_bottom{ border-top: 1px solid #E5E5E5; - flex: 1; + flex: 1.2; color: #3CC7C0; font-size: 32rpx; display: flex; diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml index 8b0f92e..72916cd 100644 --- a/Pages/yishi/identity/index.wxml +++ b/Pages/yishi/identity/index.wxml @@ -13,6 +13,7 @@ t-class="custom-tabs" theme="line" custom-style="font-size: 32rpx" + swipeable="{{false}}" > diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss index 6d9a117..29d8b6f 100644 --- a/Pages/yishi/identity/index.wxss +++ b/Pages/yishi/identity/index.wxss @@ -71,7 +71,7 @@ letter-spacing: 2rpx; } .t-cell__title-text{ - font-size: 30rpx !important; + font-size: 32rpx !important; } .t-input__wrap--suffix-icon{ padding-left: var(--td-spacer-1, 8rpx) !important; @@ -177,4 +177,34 @@ } .van-picker__confirm{ color: #3cc7c0 !important; +} +.van-cell:after { + border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); + bottom: 0; + box-sizing: border-box; + content: " "; + pointer-events: none; + position: absolute; + width: calc(100vw - 32rpx); + transform: scaleY(.5); + transform-origin: center; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); +} +.t-cell__note,.t-class-note,.note{ + font-size: 30rpx !important; +} +.van-cell { + padding: 32rpx !important; +} +.van-picker__cancel{ + font-size: 32rpx !important; +} +.van-picker__confirm{ + color: #3cc7c0 !important; + font-size: 32rpx !important; +} +.van-picker__title { + font-size: 34rpx !important; } \ No newline at end of file diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index 4edc999..1844c43 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -75,7 +75,7 @@ - + - + diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss index e4ab867..175dfca 100644 --- a/Pages/yishi/index/index.wxss +++ b/Pages/yishi/index/index.wxss @@ -172,11 +172,12 @@ .fun_box{ width: 90vw; margin: 30rpx auto 0 auto; - padding: 20rpx 0; + padding: 30rpx 0; box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1); display: flex; flex-wrap: wrap; - justify-content: space-around; + justify-content: space-evenly; + border-radius: 10rpx; } .fun_box_item{ width: 40vw; @@ -186,7 +187,6 @@ margin: 10rpx 0; display: flex; align-items: center; - padding-left: 20rpx; } .fun_box_item_img{ flex: 1; @@ -194,11 +194,12 @@ justify-content: center; } .fun_box_item_txt{ - flex: 2; - font-size: 30rpx; + flex: 2.5; + font-size: 34rpx; color: #333333; height: 70rpx; line-height: 70rpx; + display: flex; } .t-class-cancel{ color: #3CC7C0 !important; diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss index 8aa348a..d556c43 100644 --- a/Pages/yishi/kuaisusetup/index.wxss +++ b/Pages/yishi/kuaisusetup/index.wxss @@ -70,7 +70,7 @@ page{ position: relative; display: flex; justify-content: space-between; - margin: 20rpx; + margin: 20rpx 20rpx 20rpx 30rpx; align-items: center; } .price_steup_box_bottom_num{ @@ -101,7 +101,7 @@ page{ } .bottom{ width: 90vw; - margin: 0 auto; + margin: -20rpx auto; color: #999; letter-spacing: 2rpx; font-size: 28rpx; diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml index 6303acb..c31887b 100644 --- a/Pages/yishi/my/index.wxml +++ b/Pages/yishi/my/index.wxml @@ -35,7 +35,7 @@