甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定
甲乙双方共同确定
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 0a7d8f1..404e145 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -88,10 +88,7 @@
data() {
return {
patientName: '',
- userinfo: {
- cityCode: "",
- },
-
+ userinfo: null,
region: '',
checkSign: null,
address: '',
@@ -103,9 +100,11 @@
},
onShow() {
this.address = uni.getStorageSync('location')
- this.userinfo = uni.getStorageSync('userinfo')
this.openid = uni.getStorageSync('openid');
- this.cityCode = this.userinfo.cityCode;
+ if (uni.getStorageSync('userinfo')) {
+ this.userinfo = uni.getStorageSync('userinfo')
+ this.cityCode = this.userinfo.cityCode;
+ }
if (this.address == '德州市') {
uni.setStorageSync("region", 1)
} else if (this.address == '东营市') {
@@ -114,12 +113,12 @@
uni.setStorageSync("region", 3)
}
this.region = uni.getStorageSync('region')
- if (this.userinfo && this.region!="3") {
+ if (this.userinfo && this.region != "3") {
this.patientName = this.userinfo.patientName
checkSignApply(this.userinfo.cardNo).then(res => {
- if(res.data){
- this.checkSign=res.data.code
- this.info=res.data.info
+ if (res.data) {
+ this.checkSign = res.data.code
+ this.info = res.data.info
}
// if (res.data.code == 0) {
@@ -174,14 +173,14 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
- if (this.checkSign=="0") {
+ if (this.checkSign == "0") {
this.$refs.uToast.show({
title: '未签约，请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
- } else if(this.checkSign=="01"){
+ } else if (this.checkSign == "01") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
@@ -189,8 +188,7 @@
})
- }
- else {
+ } else {
uni.navigateTo({
url: "/pagesB/mysigning/mysigning"
})
@@ -214,15 +212,14 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
- if (this.checkSign=="0") {
+ if (this.checkSign == "0") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
- }
- else if(this.checkSign=="01"){
+ } else if (this.checkSign == "01") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
@@ -230,8 +227,7 @@
})
- }
- else if(this.checkSign=="01"){
+ } else if (this.checkSign == "01") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
@@ -239,8 +235,7 @@
})
- }
- else {
+ } else {
uni.navigateTo({
url: '/pagesB/Behaviorpoints/Behaviorpoints'
})
@@ -314,34 +309,32 @@
// if (this.region == "3") {
// this.family()
// } else {
- // if (this.cityCode == "1" || this.cityCode == "2") {
- if (this.checkSign=="0") {
- this.$refs.uToast.show({
- title: '未签约，请先签约',
- type: 'error',
- duration: '1000',
- url: "/pagesC/Onlinesigning/Onlinesigning"
- })
- }
- else if(this.checkSign=="01"){
- this.$refs.uToast.show({
- title: this.info,
- type: 'error',
- duration: '2000',
+ // if (this.cityCode == "1" || this.cityCode == "2") {
+ if (this.checkSign == "0") {
+ this.$refs.uToast.show({
+ title: '未签约，请先签约',
+ type: 'error',
+ duration: '1000',
+ url: "/pagesC/Onlinesigning/Onlinesigning"
+ })
+ } else if (this.checkSign == "01") {
+ this.$refs.uToast.show({
+ title: this.info,
+ type: 'error',
+ duration: '2000',
- })
+ })
- }
- else {
- uni.navigateTo({
- url: "/pagesC/ServiceAppointment/ServiceAppointment"
- })
- }
+ } else {
+ uni.navigateTo({
+ url: "/pagesC/ServiceAppointment/ServiceAppointment"
+ })
+ }
- // } else {
- // this.family()
+ // } else {
+ // this.family()
- // }
+ // }
// }
// }
@@ -362,15 +355,14 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
- if (this.checkSign=="0") {
+ if (this.checkSign == "0") {
this.$refs.uToast.show({
title: '未签约，请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
- }
- else if(this.checkSign=="01"){
+ } else if (this.checkSign == "01") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
@@ -378,7 +370,7 @@
})
- }else{
+ } else {
uni.navigateTo({
url: "/pagesC/servicerecord/servicerecord"
})
@@ -404,15 +396,14 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
- if (this.checkSign=="0") {
+ if (this.checkSign == "0") {
this.$refs.uToast.show({
title: '未签约，请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
- }
- else if(this.checkSign=="01"){
+ } else if (this.checkSign == "01") {
this.$refs.uToast.show({
title: this.info,
type: 'error',
@@ -420,8 +411,7 @@
})
- }
- else {
+ } else {
uni.navigateTo({
url: "/pagesC/Myappointment/Myappointment"
})
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f357aad..7711cd7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -111,34 +111,28 @@
type: 'error',
duration: '1500',
})
- setTimeout(() => {
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(() => {
uni.redirectTo({
url: '/pages/register/register',
})
- })
+ }, 1500)
} else if (resp.data.code == '1') {
getCurrentUser(resp.data.openid, resp.data.cityCode).then(res => {
if (res.code == 200) {
+ uni.setStorageSync('patientId', res.data.id);
+ uni.setStorageSync('userinfo', res.data);
that.$refs.uToast.show({
title: '登录成功',
type: 'success',
- duration: '1500'
+ back: 1
})
- uni.setStorageSync('patientId', res.data.id);
- uni.setStorageSync('userinfo', res.data);
- if (that.timer) {
- clearTimeout(that.timer)
- }
- that.timer = setTimeout(e => {
- uni.navigateBack({
- delta: 1
- })
- }, 500)
} else {
that.$refs.uToast.show({
title: '登录失败',
type: 'error',
- duration: '1500'
})
}
})
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index cb54b20..a3d42fd 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -10,14 +10,11 @@
-
-
- {{appPersonallist.patientName}}
+
+
+ {{appPersonallist.patientName?appPersonallist.patientName:'点击登录'}}
-
- 请先登录!
-
-
+
已签约
@@ -56,7 +53,8 @@
-
+
0
@@ -240,22 +238,15 @@
showhome: false, //切换
familyList: null, //切换列表
userinfo: {}, //用户信息
- valueopenid: '',
cityCode: '',
};
},
onShow() {
// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
- let that = this
this.userinfo = uni.getStorageSync('userinfo')
this.baseurl = baseurl
- this.valueopenid = uni.getStorageSync('openid');
this.cityCode = uni.getStorageSync('region');
- if (that.userinfo) {
- that.myInfo()
- } else {
- that.appPersonallist = null
- }
+ this.myInfo()
this.getpersnoal()
},
methods: {
@@ -281,9 +272,6 @@
type: 'success',
duration: '1000'
})
- createMobileToken().then(res => {
- uni.setStorageSync("token", res.data.token)
- })
if (that.timer) {
clearTimeout(that.timer)
}
@@ -305,31 +293,39 @@
},
// 获取成员
getpersnoal() {
- getCurrentUser(this.valueopenid).then(res => {
- this.familyList = res.data
- })
+ const value = uni.getStorageSync('openid');
+ if (value) {
+ getCurrentUser(value).then(res => {
+ this.familyList = res.data
+ })
+ }
},
// 切换成员
changeFamilyInfo(e) {
- switchResident(this.valueopenid, e.patientCode).then(res => {
- if (res.code == 200) {
- this.$refs.uToast.show({
- title: '切换成功',
- type: 'success',
- duration: '1000',
- })
+ const value = uni.getStorageSync('openid');
+ if (value) {
+ switchResident(value, e.patientCode).then(res => {
uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('patientId', res.data.id);
- this.myInfo()
- } else {
- this.$refs.uToast.show({
- title: res.msg,
- type: 'error',
- duration: '1000',
- })
- }
- })
- this.showhome = false
+ this.userinfo = res.data
+ if (res.code == 200) {
+ this.$refs.uToast.show({
+ title: '切换成功',
+ type: 'success',
+ duration: '1000',
+ })
+
+ this.myInfo()
+ } else {
+ this.$refs.uToast.show({
+ title: res.msg,
+ type: 'error',
+ duration: '1000',
+ })
+ }
+ })
+ this.showhome = false
+ }
},
removes() {
this.appPersonallist = null
@@ -337,7 +333,6 @@
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
uni.removeStorageSync('userinfo');
- uni.removeStorageSync('token');
},
//获取个人信息
myInfo() {
@@ -358,7 +353,7 @@
.homeLatitude)
that.appPersonallist.homeLongitude = Number(that.appPersonallist
.homeLongitude)
- } else if (Response.code == 9999) {} else {
+ } else {
that.removes();
}
})
@@ -371,7 +366,7 @@
}
},
updatainfo() {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
@@ -383,7 +378,7 @@
},
//护理站服务订单
gonursestation() {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
@@ -417,7 +412,7 @@
},
//优惠券
gocoupon() {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
@@ -435,7 +430,7 @@
},
//全部订单
goorder(index, item) {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
@@ -455,7 +450,7 @@
},
//护理站服务订单
gonursestation() {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
@@ -473,15 +468,12 @@
},
// 切换家庭成员
homeshow() {
- // this.getSetting()
- // this.listquery.bindingCity = uni.getStorageSync('userinfo').bindingCity
- var patientCode = this.userinfo.patientCode
- var openid = uni.getStorageSync('openid')
- // getFamilyList(openid, patientCode).then(res => {
- // this.familyList = res.data
- // console.log(this.familyList, '000')
- // })
+
this.showhome = true
+ this.getpersnoal()
+ // this.myInfo()
+
+
},
//管理家庭成员
gomanagefamily() {
@@ -520,7 +512,7 @@
//积分页面
...mapActions(["integralopenPopup"]),
gointegral() {
- const value = uni.getStorageSync('openid');
+ const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
this.integralopenPopup();
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 9aa283a..6b8e447 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -248,7 +248,7 @@
}, {
value: '3',
label: '高血脂'
- },],
+ }, ],
arealist: [], //区街道list
list: [{
id: "",
@@ -362,10 +362,7 @@
console.log(e, '打印e')
},
submit() {
-
var that = this
- // console.log(that.query)
- // console.log(that.query.diseaseList.length,'000')
that.query.openid = uni.getStorageSync('openid');
that.query.cityCode = uni.getStorageSync('region');
if (that.query.sexname == '男') {
@@ -373,59 +370,54 @@
} else if (that.query.sexname == '女') {
that.query.sex = 'FEMALE';
}
+ if (that.selected == 1) {
+ that.$refs.uToast.show({
+ title: '请审核并同意用户协议',
+ type: 'error'
+ })
+ return
+ } else if (that.query.sex == "") {
+ that.$refs.uToast.show({
+ title: '请选择性别',
+ type: 'error'
+ })
+ return
+ } else if (!that.query.locationName) {
+ that.$refs.uToast.show({
+ title: '请选择所在位置',
+ type: 'error'
+ })
+ return
+ } else if (!that.query.birthDate) {
+ that.$refs.uToast.show({
+ title: '请选择出生日期',
+ type: 'error'
+ })
+ return
+ }
that.$refs.uForm.validate(valid => {
if (valid) {
-
- if (that.selected == 1) {
- that.$refs.uToast.show({
- title: '请审核并同意用户协议',
- type: 'error'
- })
- } else if (that.query.sex == "") {
- that.$refs.uToast.show({
- title: '请选择性别',
- type: 'error'
- })
- } else if (!that.query.locationName) {
- that.$refs.uToast.show({
- title: '请选择所在位置',
- type: 'error'
- })
- } else if (!that.query.birthDate) {
- that.$refs.uToast.show({
- title: '请选择出生日期',
- type: 'error'
- })
- }
- // else if (that.query.diseaseList.length == 0) {
- // that.$refs.uToast.show({
- // title: '请选择基础疾病',
- // type: 'error'
- // })
- // }
- else {
- registerdata(that.query).then(res => {
- if (res.code == 200) {
- getCurrentUser(that.query.openid, that.query.cityCode).then(res => {
- uni.setStorageSync('patientId', res.data.id);
- uni.setStorageSync('patientName', res.data.patientName);
- uni.setStorageSync("userinfo", res.data)
- that.$refs.uToast.show({
- title: '注册成功',
- type: 'success',
- duration: '1000',
- back: 1,
- })
- })
- } else {
+ registerdata(that.query).then(res => {
+ if (res.code == 200) {
+ getCurrentUser(that.query.openid, that.query.cityCode).then(res => {
+ uni.setStorageSync('patientId', res.data.id);
+ uni.setStorageSync('patientName', res.data.patientName);
+ uni.setStorageSync("userinfo", res.data)
that.$refs.uToast.show({
- title: res.msg,
- type: 'error',
+ title: '注册成功',
+ type: 'success',
+ duration: '1000',
+ back: 1,
})
- }
- })
- }
- } else {}
+ })
+ } else {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error',
+ })
+ }
+ })
+ }
});
},
//切换
@@ -574,9 +566,10 @@
justify-content: center;
align-items: center;
background: #fff;
- ::v-deep .select-modal .select-dialog{
- height: 370rpx !important;
-
+
+ ::v-deep .select-modal .select-dialog {
+ height: 370rpx !important;
+
}
.Agreement {
@@ -909,4 +902,4 @@
/deep/ .u-form-item__message {
padding-left: 0 !important;
}
-
+
\ No newline at end of file
diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue
index 411577c..daaeb64 100644
--- a/pagesB/AddMembers/AddMembers.vue
+++ b/pagesB/AddMembers/AddMembers.vue
@@ -71,7 +71,7 @@
请选择出生日期
{{form.birthDate}}
-
+
-->
@@ -98,6 +98,13 @@
+
+ 所在位置
+
+ 请选择所在位置
+ {{form.locationName}}
+
+
手机号
@@ -115,11 +122,12 @@
-
-
-
-
-
+
+
+
+
+
@@ -130,7 +138,7 @@
import {
registerdata
} from '@/api/pages/register/register.js'
-
+
// import {
// bindFamilyUser,
// getDictByType
@@ -176,13 +184,15 @@
address: '',
phone: '',
birthDate: '',
-
householdRelationship: '',
+ locationName: '',
+ homeLongitude: '',
+ homeLatitude: '',
},
- householdRelationship:'',
- userinfo:{},
-
- nation:'',
+ householdRelationship: '',
+ userinfo: {},
+
+ nation: '',
actions: [{
value: '1',
label: '汉族'
@@ -290,10 +300,10 @@
trigger: ['blur', 'change']
}],
householdRelationship: [{
- min: 1,
- required: true,
- message: '请选择与户主关系',
- trigger: ['blur', 'change']
+ min: 1,
+ required: true,
+ message: '请选择与户主关系',
+ trigger: ['blur', 'change']
}],
address: [{
required: true,
@@ -358,6 +368,20 @@
})
},
methods: {
+ //获取所在位置
+ getAddress() {
+ var that = this;
+ uni.chooseLocation({
+ success: function(location) {
+ that.form.locationName = location.address
+ that.form.homeLongitude = location.longitude;
+ that.form.homeLatitude = location.latitude;
+ },
+ fail(err) {
+ console.log(err)
+ }
+ });
+ },
//选择出生日期
timechange(e) {
this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@@ -367,7 +391,7 @@
const _this = this
_this.userinfo = uni.getStorageSync('userinfo');
_this.form.openid = uni.getStorageSync('openid');
- _this.form.cityCode= uni.getStorageSync('region');
+ _this.form.cityCode = uni.getStorageSync('region');
console.log(_this.form, '000')
if (_this.form.sexname == '男') {
_this.form.sex = 'MALE';
@@ -380,7 +404,7 @@
type: 'error'
})
}
-
+
_this.$refs.uForm.validate(valid => {
if (valid) {
registerdata(_this.form).then(res => {
@@ -389,7 +413,7 @@
title: res.data.msg,
type: 'error'
})
- }else{
+ } else {
_this.$refs.uToast.show({
title: '添加成功',
type: 'success'
@@ -398,7 +422,7 @@
delta: 1
})
// this.back()
-
+
}
})
@@ -419,13 +443,13 @@
} else if (e == '女') {
this.form.sex = 'FEMALE';
}
-
+
},
// 民族
nationSelect(e) {
this.form.nation = e[0].value
this.nation = e[0].label
-
+
},
// 与户主关系
relationshipSelect(e) {
@@ -472,7 +496,8 @@
}
}
- .u-form-item{
+
+ .u-form-item {
padding: 0 0 !important;
}
@@ -491,7 +516,7 @@
display: flex;
// align-items: center;
// justify-content: center;
- //
+ //
width: 47%;
margin: 23rpx 30rpx 0 55rpx;
@@ -535,8 +560,8 @@
left: 50%;
transform: translateX(-50%);
margin-top: 100rpx;
- bottom: 27rpx;
-
+ bottom: 27rpx;
+
}
.contentbottom {
@@ -624,6 +649,51 @@
}
+ // .selectdata{
+
+ // }
+ .selectdata {
+ width: 636rpx;
+ height: 63rpx;
+ background: #F6F6F6;
+ margin: 12rpx auto;
+ border-radius: 5rpx;
+ display: flex;
+ position: relative;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+
+ .testitem {
+ font-size: 26rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #000000;
+
+
+ }
+
+ text {
+ padding-left: 20rpx;
+ line-height: 63rpx;
+ font-size: 20rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #8E8E8E;
+ }
+
+ image {
+ width: 9rpx;
+ height: 17rpx;
+ position: absolute;
+ right: 40rpx;
+ top: 50%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ }
+ }
+
.select {
width: 636rpx;
height: 63rpx;
@@ -632,13 +702,14 @@
border-radius: 5rpx;
display: flex;
position: relative;
+
.testitem {
font-size: 26rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
-
-
+
+
}
text {
@@ -749,4 +820,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pagesB/Applforrefund/Applforrefund.vue b/pagesB/Applforrefund/Applforrefund.vue
index 5389a62..575f0fc 100644
--- a/pagesB/Applforrefund/Applforrefund.vue
+++ b/pagesB/Applforrefund/Applforrefund.vue
@@ -11,11 +11,11 @@