diff --git a/api/coupon/index.js b/api/coupon/index.js
new file mode 100644
index 0000000..03c8692
--- /dev/null
+++ b/api/coupon/index.js
@@ -0,0 +1,9 @@
+import request from "../request.js"
+
+
+export function selectCoupon(pageNum, pageSize, patientId, couponstatus) {
+ return request({
+ url: `/nurseApplet/patientInfo/selectCoupon?pageNum=${pageNum}&pageSize=${pageSize}&patientId=${patientId}&useStatus=${couponstatus}`,
+ method: 'get',
+ })
+}
diff --git a/api/request.js b/api/request.js
index a0d6add..f99cde4 100644
--- a/api/request.js
+++ b/api/request.js
@@ -16,6 +16,9 @@ var request = function(config) {
success(res) {
if (res.data.code == 9999) {
uni.removeStorageSync('token');
+ uni.removeStorageSync('patientId');
+ uni.removeStorageSync('openid');
+ uni.removeStorageSync('phone');
let pages = getCurrentPages();
let path = pages[pages.length - 1].$page.fullPath
if (path == '/pages/user/user') {
diff --git a/pages.json b/pages.json
index 329abcf..92c89b4 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,16 @@
"style": {
"navigationBarTitleText": "优惠卷",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
+ "navigationBarBackgroundColor": "#ffffff",
+ "onReachBottomDistance": 40, //距离底部多远时触发 单位为px
+ "enablePullDownRefresh": true //设置参数为true
+ }
+ },{
+ "path": "pages/information/information",
+ "style": {
+ "navigationBarTitleText": "完善个人信息",
+ "navigationBarBackgroundColor": "#ffffff", //背景颜色
+ "enablePullDownRefresh": false
}
}, {
"path": "pages/Personal/Personal",
@@ -52,13 +61,6 @@
"navigationBarBackgroundColor": "#ffffff", //背景颜色
"enablePullDownRefresh": true //设置参数为true
}
- }, {
- "path": "pages/information/information",
- "style": {
- "navigationBarTitleText": "完善个人信息",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
- "enablePullDownRefresh": false
- }
},
{
"path": "pages/lookrate/lookrate",
diff --git a/pages/Personal/Personal.scss b/pages/Personal/Personal.scss
index aec3b1b..baf5a3e 100644
--- a/pages/Personal/Personal.scss
+++ b/pages/Personal/Personal.scss
@@ -142,7 +142,17 @@
padding-left: 10rpx;
}
}
-
+ .login{
+ position: absolute;
+ top: 220rpx;
+ left: 35%;
+ font-size: 36rpx;
+ width: 180rpx;
+ line-height: 70rpx;
+ border:1rpx solid #fff;
+ height: 70rpx;
+ border-radius: 20rpx;
+ }
.nickname {
position: absolute;
top: 265rpx;
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 5f5d770..471d9d9 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -1,6 +1,6 @@
-
+
@@ -16,6 +16,13 @@
+
+
+
+
+ 登录
+
+
@@ -96,14 +103,13 @@
护理站服务订单
-
- 设置
+
+ 退出账号
-
@@ -84,12 +149,14 @@
height: 240rpx;
margin: 20rpx auto 0;
border: 1rpx solid #f4f5f7;
+ border-radius: 10rpx;
.bottom {
font-size: 22rpx;
color: #969394;
line-height: 60rpx;
padding-left: 25rpx;
+ border-radius: 0 0 10rpx 10rpx;
}
.top {
@@ -98,6 +165,7 @@
background: #FDE9E8;
position: relative;
color: #F44B2F;
+ border-radius: 10rpx 10rpx 0 0;
.what {
width: 120rpx;
@@ -112,6 +180,17 @@
left: 40rpx;
}
+ .btngq {
+ width: 109rpx;
+ height: 180rpx;
+ background: #DFDEDE;
+ position: absolute;
+ top: 0;
+ right: 0;
+ text-align: center;
+ line-height: 180rpx;
+ }
+
.btn {
width: 98rpx;
height: 50rpx;
diff --git a/pages/information/information.scss b/pages/information/information.scss
index 1672bec..d133ae8 100644
--- a/pages/information/information.scss
+++ b/pages/information/information.scss
@@ -167,6 +167,15 @@
line-height: 120rpx;
border-bottom: 1rpx solid #D8D4D4;
position: relative;
+ ::v-deep .u-radio-group{
+ position: absolute;
+ top:50%;
+ transform: translateY(-50%);
+ left:170rpx;
+ }
+ ::v-deep .u-radio{
+ width: 150rpx !important;
+ }
.address {
position: absolute;
left:25%;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 194dff1..31e4111 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -4,27 +4,41 @@
- 姓名:
+ 姓名:
+
+ 性别:
+
+
+ {{item.name}}
+
+
+
+
+ 出生日期:
+
+ {{query.birthDate}}
+
+
- 身份证号:
-
+ 身份证号:
+
- 所属区域:
+ 所属区域:
{{address}}
- 详细地址:
+ 详细地址:
- 所在位置:
+ 所在位置:
{{query.locationName}}
@@ -84,6 +98,8 @@
+
+
@@ -105,6 +121,24 @@
},
data() {
return {
+ timeshow: false, //出生日期
+ params: {
+ year: true,
+ month: true,
+ day: true,
+ hour: false,
+ minute: false,
+ second: false
+ },
+ sexlist: [{
+ name: '男',
+ disabled: false
+ },
+ {
+ name: '女',
+ disabled: false
+ }
+ ],
radio: 1,
// chooseLocation: '', //地图选址
arealist: [], //区街道list
@@ -130,6 +164,8 @@
diseaseInfoList: [],
patientId: '',
locationName: '',
+ sex: '',
+ birthDate: '',
},
timer: null,
addresslength: null,
@@ -189,6 +225,18 @@
})
}
},
+ //性别
+ sexchange(e) {
+ if (e == '男') {
+ this.query.sex = 'MALE';
+ } else if (e == '女') {
+ this.query.sex = 'FEMALE';
+ }
+ },
+ //选择出生日期
+ timechange(e) {
+ this.query.birthDate = e.year + '-' + e.month + '-' + e.day
+ },
//获取所在位置
getAddress() {
var that = this;
@@ -296,6 +344,14 @@
// 从地图选点插件返回后,在页面的onShow生命周期函数中能够调用插件接口,取得选点结果对象
onShow() {
var that = this
+ const invitationPatientId = uni.getStorageSync('invitationPatientId')
+ if (invitationPatientId) {
+ that.query.source = 'FRIEND_INVITATION'
+ that.query.invitationPatientId = invitationPatientId
+ } else {
+ that.query.source = 'REGISTER_YOURSELF'
+ that.query.invitationPatientId = null
+ }
// const chooseLocation = requirePlugin('chooseLocation');
// const location = chooseLocation.getLocation(); // 如果点击确认选点按钮,则返回选点结果对象,否则返回null
// if (location) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cbc3d35..405e300 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -29,7 +29,6 @@
onShow() {
uni.removeStorageSync('openid');
uni.removeStorageSync('patientId');
- uni.removeStorageSync('token');
uni.removeStorageSync('phone');
},
//1.分享给朋友
@@ -86,7 +85,6 @@
})
}, 1500)
} else {
- uni.removeStorageSync('token');
this.$refs.uToast.show({
title: '登录失败',
type: 'error',
diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss
index e44ea48..7101bfd 100644
--- a/pages/modify/modify.scss
+++ b/pages/modify/modify.scss
@@ -80,8 +80,8 @@
.radio {
display: inline-block;
- width: 35rpx;
- height: 35rpx;
+ width: 40rpx;
+ height: 40rpx;
border-radius: 70%;
border: 2rpx solid #178ffb;
position: absolute;
@@ -169,7 +169,15 @@
border-bottom: 1rpx solid #D8D4D4;
position: relative;
font-size: 30rpx;
-
+ ::v-deep .u-radio-group{
+ position: absolute;
+ top:50%;
+ transform: translateY(-50%);
+ left:170rpx;
+ }
+ ::v-deep .u-radio{
+ width: 150rpx !important;
+ }
.address {
position: absolute;
left: 25%;
diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue
index 9f7c0cd..2aeaca4 100644
--- a/pages/modify/modify.vue
+++ b/pages/modify/modify.vue
@@ -6,26 +6,40 @@
- 姓名:
+ 姓名:
+
+ 性别:
+
+
+ {{item.name}}
+
+
+
+
+ 出生日期:
+
+ {{appPersonallist.birthDate}}
+
+
- 身份证号:
- 身份证号:
+
- 所属区域:
+ 所属区域:
{{address}}
- 详细地址:
+ 详细地址:
@@ -82,9 +96,10 @@
@funcValue="getpickerParentValue" pickerSize="4">
+
+
-