xinyilu/xinelu-applet-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
辉 2023-11-09 16:15:20 +08:00
commit 192b9da6f1
8 changed files with 230 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/baseurl.js
View File

@ -1,10 +1,12 @@
// var baseurl = "https://quanyidaojia.xinelu.cn"; // var baseurl = "https://quanyidaojia.xinelu.cn";
// var baseurl = "http://192.168.16.48:8088"; var baseurl = "http://192.168.16.48:8088";
// 蒙 // 蒙
// var baseurl = "http://8.131.93.145:54088"; // var baseurl = "http://8.131.93.145:54088";
// 郝 // 郝
// var baseurl = "http://8.131.93.145:54010"; // var baseurl = "http://8.131.93.145:54010";
var baseurl = "http://192.168.16.30:8088"; // var baseurl = "http://192.168.16.76:8080";
// var baseurl = "http://192.168.16.212:8088";
export default baseurl export default baseurl

4
api/pagesB/Serviceevaluation/Serviceevaluation.js
View File

@ -4,7 +4,9 @@ export function getAppletOrderList(parentId,orderStatus,cardNo,region,pageNum,pa
url: `/nurseApplet/nursingOrder/getAppletOrderList?parentId=${parentId}&orderStatus=${orderStatus}&cardNo=${cardNo}&region=${region}&pageNum=${pageNum}&pageSize=${pageSize}`, url: `/nurseApplet/nursingOrder/getAppletOrderList?parentId=${parentId}&orderStatus=${orderStatus}&cardNo=${cardNo}&region=${region}&pageNum=${pageNum}&pageSize=${pageSize}`,
method: 'GET', method: 'GET',
header: { header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
region: uni.getStorageSync('region'),
}, },
}) })

4
api/pagesC/healthtest/index.js
View File

@ -8,6 +8,8 @@ export function surveylist(data) {
data, data,
header: { header: {
region: uni.getStorageSync('region'), region: uni.getStorageSync('region'),
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
}, },
}) })
} }

25
components/protocol/protocol.vue
View File

@ -12,7 +12,28 @@
<h4>乙方：</h4> <h4>乙方：</h4>
<h4 class="box-line">{{list.residentName}}</h4> <h4 class="box-line">{{list.residentName}}</h4>
</view> </view>
<uni-table border stripe emptyText="暂无更多数据"> <u-table width="80%">
<u-tr class="u-tr">
<u-th class="u-th">姓名</u-th>
<u-th class="u-th">性别</u-th>
<u-th class="u-th">年龄</u-th>
<u-th class="u-th">身份证号</u-th>
<u-th class="u-th">现住址</u-th>
<u-th class="u-th">选择签约基础服务包</u-th>
<u-th class="u-th">选择签约个性服务包</u-th>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-th">{{list.residentName}}</u-td>
<u-td class="u-th">{{list.gender === '1' ? '男' : '女'}}</u-td>
<u-td class="u-th">{{list.age?list.age:''}}</u-td>
<u-td class="u-th">{{list.identity?list.identity:''}}</u-td>
<u-td class="u-th">{{list.address?list.address:''}}</u-td>
<u-td class="u-th">{{list.phone?list.phone:''}}</u-td>
<u-td class="u-th">{{list.BasePackage?list.BasePackage:''}} </u-td>
<u-td class="u-th">{{list.PersonalityPack?list.PersonalityPack:''}}</u-td>
</u-tr>
</u-table>
<!-- <uni-table border stripe emptyText="暂无更多数据">
<uni-tr> <uni-tr>
<uni-th>姓名</uni-th> <uni-th>姓名</uni-th>
<uni-th>性别</uni-th> <uni-th>性别</uni-th>
@ -33,7 +54,7 @@
<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td> <uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td> <uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
</uni-tr> </uni-tr>
</uni-table> </uni-table> -->
<view> <view>
<p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p> <p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p>
<p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定 <p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定

98
pages/homepage/homepage.vue
View File

@ -88,10 +88,7 @@
data() { data() {
return { return {
patientName: '', patientName: '',
userinfo: { userinfo: null,
cityCode: "",
},
region: '', region: '',
checkSign: null, checkSign: null,
address: '', address: '',
@ -103,9 +100,11 @@
}, },
onShow() { onShow() {
this.address = uni.getStorageSync('location') this.address = uni.getStorageSync('location')
this.userinfo = uni.getStorageSync('userinfo')
this.openid = uni.getStorageSync('openid'); 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 == '德州市') { if (this.address == '德州市') {
uni.setStorageSync("region", 1) uni.setStorageSync("region", 1)
} else if (this.address == '东营市') { } else if (this.address == '东营市') {
@ -114,12 +113,12 @@
uni.setStorageSync("region", 3) uni.setStorageSync("region", 3)
} }
this.region = uni.getStorageSync('region') this.region = uni.getStorageSync('region')
if (this.userinfo && this.region!="3") { if (this.userinfo && this.region != "3") {
this.patientName = this.userinfo.patientName this.patientName = this.userinfo.patientName
checkSignApply(this.userinfo.cardNo).then(res => { checkSignApply(this.userinfo.cardNo).then(res => {
if(res.data){ if (res.data) {
this.checkSign=res.data.code this.checkSign = res.data.code
this.info=res.data.info this.info = res.data.info
} }
// if (res.data.code == 0) { // if (res.data.code == 0) {
@ -174,14 +173,14 @@
this.family() this.family()
} else { } else {
if (this.cityCode == "1" || this.cityCode == "2") { if (this.cityCode == "1" || this.cityCode == "2") {
if (this.checkSign=="0") { if (this.checkSign == "0") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未签约，请先签约', title: '未签约，请先签约',
type: 'error', type: 'error',
duration: '1000', duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning" url: "/pagesC/Onlinesigning/Onlinesigning"
}) })
} else if(this.checkSign=="01"){ } else if (this.checkSign == "01") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
@ -189,8 +188,7 @@
}) })
} } else {
else {
uni.navigateTo({ uni.navigateTo({
url: "/pagesB/mysigning/mysigning" url: "/pagesB/mysigning/mysigning"
}) })
@ -214,15 +212,14 @@
this.family() this.family()
} else { } else {
if (this.cityCode == "1" || this.cityCode == "2") { if (this.cityCode == "1" || this.cityCode == "2") {
if (this.checkSign=="0") { if (this.checkSign == "0") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
duration: '1000', duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning" url: "/pagesC/Onlinesigning/Onlinesigning"
}) })
} } else if (this.checkSign == "01") {
else if(this.checkSign=="01"){
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
@ -230,8 +227,7 @@
}) })
} } else if (this.checkSign == "01") {
else if(this.checkSign=="01"){
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
@ -239,8 +235,7 @@
}) })
} } else {
else {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/Behaviorpoints/Behaviorpoints' url: '/pagesB/Behaviorpoints/Behaviorpoints'
}) })
@ -314,34 +309,32 @@
// if (this.region == "3") { // if (this.region == "3") {
// this.family() // this.family()
// } else { // } else {
// if (this.cityCode == "1" || this.cityCode == "2") { // if (this.cityCode == "1" || this.cityCode == "2") {
if (this.checkSign=="0") { if (this.checkSign == "0") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未签约，请先签约', title: '未签约，请先签约',
type: 'error', type: 'error',
duration: '1000', duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning" url: "/pagesC/Onlinesigning/Onlinesigning"
}) })
} } else if (this.checkSign == "01") {
else if(this.checkSign=="01"){ this.$refs.uToast.show({
this.$refs.uToast.show({ title: this.info,
title: this.info, type: 'error',
type: 'error', duration: '2000',
duration: '2000',
}) })
} } else {
else { uni.navigateTo({
uni.navigateTo({ url: "/pagesC/ServiceAppointment/ServiceAppointment"
url: "/pagesC/ServiceAppointment/ServiceAppointment" })
}) }
}
// } else { // } else {
// this.family() // this.family()
// } // }
// } // }
// } // }
@ -362,15 +355,14 @@
this.family() this.family()
} else { } else {
if (this.cityCode == "1" || this.cityCode == "2") { if (this.cityCode == "1" || this.cityCode == "2") {
if (this.checkSign=="0") { if (this.checkSign == "0") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未签约，请先签约', title: '未签约，请先签约',
type: 'error', type: 'error',
duration: '1000', duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning" url: "/pagesC/Onlinesigning/Onlinesigning"
}) })
} } else if (this.checkSign == "01") {
else if(this.checkSign=="01"){
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
@ -378,7 +370,7 @@
}) })
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url: "/pagesC/servicerecord/servicerecord" url: "/pagesC/servicerecord/servicerecord"
}) })
@ -404,15 +396,14 @@
this.family() this.family()
} else { } else {
if (this.cityCode == "1" || this.cityCode == "2") { if (this.cityCode == "1" || this.cityCode == "2") {
if (this.checkSign=="0") { if (this.checkSign == "0") {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未签约，请先签约', title: '未签约，请先签约',
type: 'error', type: 'error',
duration: '1000', duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning" url: "/pagesC/Onlinesigning/Onlinesigning"
}) })
} } else if (this.checkSign == "01") {
else if(this.checkSign=="01"){
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.info, title: this.info,
type: 'error', type: 'error',
@ -420,8 +411,7 @@
}) })
} } else {
else {
uni.navigateTo({ uni.navigateTo({
url: "/pagesC/Myappointment/Myappointment" url: "/pagesC/Myappointment/Myappointment"
}) })

102
pages/myinformation/myinformation.vue
View File

@ -11,13 +11,10 @@
<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo' v-else> <image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo' v-else>
</image> </image>
<view class="namesigning"> <view class="namesigning">
<span class="name" v-if="appPersonallist.patientName"> <span class="name">
{{appPersonallist.patientName}} {{appPersonallist.patientName?appPersonallist.patientName:'请先登录!'}}
</span> </span>
<span class="name" v-else> <span class="" v-show="appPersonallist.patientName">
请先登录!
</span>
<span class="" v-if="appPersonallist.patientName">
<span class="signing" v-if="appPersonallist.signNo"> <span class="signing" v-if="appPersonallist.signNo">
已签约 已签约
</span> </span>
@ -56,7 +53,8 @@
</view> </view>
</view> </view>
<view class="item" @tap='gocoupon'> <view class="item" @tap='gocoupon'>
<view class="number" v-if="appPersonallist.patientCouponCount==0 ||appPersonallist.patientCouponCount==undefined"> <view class="number"
v-if="appPersonallist.patientCouponCount==0 ||appPersonallist.patientCouponCount==undefined">
0 0
</view> </view>
<view class="number" v-else> <view class="number" v-else>
@ -240,22 +238,15 @@
showhome: false, //切换 showhome: false, //切换
familyList: null, //切换列表 familyList: null, //切换列表
userinfo: {}, //用户信息 userinfo: {}, //用户信息
valueopenid: '',
cityCode: '', cityCode: '',
}; };
}, },
onShow() { onShow() {
// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png' // this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
let that = this
this.userinfo = uni.getStorageSync('userinfo') this.userinfo = uni.getStorageSync('userinfo')
this.baseurl = baseurl this.baseurl = baseurl
this.valueopenid = uni.getStorageSync('openid');
this.cityCode = uni.getStorageSync('region'); this.cityCode = uni.getStorageSync('region');
if (that.userinfo) { this.myInfo()
that.myInfo()
} else {
that.appPersonallist = null
}
this.getpersnoal() this.getpersnoal()
}, },
methods: { methods: {
@ -281,9 +272,6 @@
type: 'success', type: 'success',
duration: '1000' duration: '1000'
}) })
createMobileToken().then(res => {
uni.setStorageSync("token", res.data.token)
})
if (that.timer) { if (that.timer) {
clearTimeout(that.timer) clearTimeout(that.timer)
} }
@ -305,31 +293,39 @@
}, },
// 获取成员 // 获取成员
getpersnoal() { getpersnoal() {
getCurrentUser(this.valueopenid).then(res => { const value = uni.getStorageSync('openid');
this.familyList = res.data if (value) {
}) getCurrentUser(value).then(res => {
this.familyList = res.data
})
}
}, },
// 切换成员 // 切换成员
changeFamilyInfo(e) { changeFamilyInfo(e) {
switchResident(this.valueopenid, e.patientCode).then(res => { const value = uni.getStorageSync('openid');
if (res.code == 200) { if (value) {
this.$refs.uToast.show({ switchResident(value, e.patientCode).then(res => {
title: '切换成功',
type: 'success',
duration: '1000',
})
uni.setStorageSync('userinfo', res.data); uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('patientId', res.data.id); uni.setStorageSync('patientId', res.data.id);
this.myInfo() this.userinfo =res.data
} else { if (res.code == 200) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.msg, title: '切换成功',
type: 'error', type: 'success',
duration: '1000', duration: '1000',
}) })
}
}) this.myInfo()
this.showhome = false } else {
this.$refs.uToast.show({
title: res.msg,
type: 'error',
duration: '1000',
})
}
})
this.showhome = false
}
}, },
removes() { removes() {
this.appPersonallist = null this.appPersonallist = null
@ -337,7 +333,6 @@
uni.removeStorageSync('openid'); uni.removeStorageSync('openid');
uni.removeStorageSync('phone'); uni.removeStorageSync('phone');
uni.removeStorageSync('userinfo'); uni.removeStorageSync('userinfo');
uni.removeStorageSync('token');
}, },
//获取个人信息 //获取个人信息
myInfo() { myInfo() {
@ -358,7 +353,7 @@
.homeLatitude) .homeLatitude)
that.appPersonallist.homeLongitude = Number(that.appPersonallist that.appPersonallist.homeLongitude = Number(that.appPersonallist
.homeLongitude) .homeLongitude)
} else if (Response.code == 9999) {} else { } else {
that.removes(); that.removes();
} }
}) })
@ -371,7 +366,7 @@
} }
}, },
updatainfo() { updatainfo() {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
uni.navigateTo({ uni.navigateTo({
@ -383,7 +378,7 @@
}, },
//护理站服务订单 //护理站服务订单
gonursestation() { gonursestation() {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
uni.navigateTo({ uni.navigateTo({
@ -417,7 +412,7 @@
}, },
//优惠券 //优惠券
gocoupon() { gocoupon() {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
uni.navigateTo({ uni.navigateTo({
@ -435,7 +430,7 @@
}, },
//全部订单 //全部订单
goorder(index, item) { goorder(index, item) {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
uni.navigateTo({ uni.navigateTo({
@ -455,7 +450,7 @@
}, },
//护理站服务订单 //护理站服务订单
gonursestation() { gonursestation() {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
uni.navigateTo({ uni.navigateTo({
@ -473,15 +468,12 @@
}, },
// 切换家庭成员 // 切换家庭成员
homeshow() { 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.showhome = true
this.getpersnoal()
// this.myInfo()
}, },
//管理家庭成员 //管理家庭成员
gomanagefamily() { gomanagefamily() {
@ -520,7 +512,7 @@
//积分页面 //积分页面
...mapActions(["integralopenPopup"]), ...mapActions(["integralopenPopup"]),
gointegral() { gointegral() {
const value = uni.getStorageSync('openid'); const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId'); const value2 = uni.getStorageSync('patientId');
if (value && value2) { if (value && value2) {
this.integralopenPopup(); this.integralopenPopup();
@ -545,4 +537,4 @@
<style lang="scss"> <style lang="scss">
@import './myinformation.scss' @import './myinformation.scss'
</style> </style>

129
pagesB/AddMembers/AddMembers.vue
View File

@ -71,7 +71,7 @@
<view class="select"> <view class="select">
<text v-if="!form.birthDate">请选择出生日期</text> <text v-if="!form.birthDate">请选择出生日期</text>
<text v-else class="testitem">{{form.birthDate}}</text> <text v-else class="testitem">{{form.birthDate}}</text>
<image src="../../static/huijiantou.png" mode=""></image> <image src="../../static/huijiantou.png" mode=""></image>
</view> </view>
</view> --> </view> -->
@ -98,6 +98,13 @@
<u-input v-model="form.address" placeholder="请输入居住地址" /> <u-input v-model="form.address" placeholder="请输入居住地址" />
</view> </view>
</u-form-item> </u-form-item>
<view class="name">
所在位置
<view class="selectdata" @tap='getAddress'>
<text v-if="form.locationName ==''">请选择所在位置</text>
<text class="testitem">{{form.locationName}}</text>
</view>
</view>
<u-form-item prop="phone" :border-bottom="false"> <u-form-item prop="phone" :border-bottom="false">
<view class="name"> <view class="name">
手机号 手机号
@ -115,11 +122,12 @@
<!-- 民族 --> <!-- 民族 -->
<u-select v-model="showNation" :list="actions" @confirm="nationSelect"></u-select> <u-select v-model="showNation" :list="actions" @confirm="nationSelect"></u-select>
<!-- 与户主关系 --> <!-- 与户主关系 -->
<u-select v-model="showRelationshipWithHouseholder" :list="relationship" @confirm="relationshipSelect"></u-select> <u-select v-model="showRelationshipWithHouseholder" :list="relationship"
@confirm="relationshipSelect"></u-select>
<!-- 出生日期 -->
<u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'> <!-- 出生日期 -->
</u-picker> <u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'>
</u-picker>
</view> </view>
</view> </view>
@ -130,7 +138,7 @@
import { import {
registerdata registerdata
} from '@/api/pages/register/register.js' } from '@/api/pages/register/register.js'
// import { // import {
// bindFamilyUser, // bindFamilyUser,
// getDictByType // getDictByType
@ -176,13 +184,15 @@
address: '', address: '',
phone: '', phone: '',
birthDate: '', birthDate: '',
householdRelationship: '', householdRelationship: '',
locationName: '',
homeLongitude: '',
homeLatitude: '',
}, },
householdRelationship:'', householdRelationship: '',
userinfo:{}, userinfo: {},
nation:'', nation: '',
actions: [{ actions: [{
value: '1', value: '1',
label: '汉族' label: '汉族'
@ -290,10 +300,10 @@
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}], }],
householdRelationship: [{ householdRelationship: [{
min: 1, min: 1,
required: true, required: true,
message: '请选择与户主关系', message: '请选择与户主关系',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}], }],
address: [{ address: [{
required: true, required: true,
@ -358,6 +368,20 @@
}) })
}, },
methods: { 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) { timechange(e) {
this.form.birthDate = e.year + '-' + e.month + '-' + e.day this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@ -367,7 +391,7 @@
const _this = this const _this = this
_this.userinfo = uni.getStorageSync('userinfo'); _this.userinfo = uni.getStorageSync('userinfo');
_this.form.openid = uni.getStorageSync('openid'); _this.form.openid = uni.getStorageSync('openid');
_this.form.cityCode= uni.getStorageSync('region'); _this.form.cityCode = uni.getStorageSync('region');
console.log(_this.form, '000') console.log(_this.form, '000')
if (_this.form.sexname == '男') { if (_this.form.sexname == '男') {
_this.form.sex = 'MALE'; _this.form.sex = 'MALE';
@ -380,7 +404,7 @@
type: 'error' type: 'error'
}) })
} }
_this.$refs.uForm.validate(valid => { _this.$refs.uForm.validate(valid => {
if (valid) { if (valid) {
registerdata(_this.form).then(res => { registerdata(_this.form).then(res => {
@ -389,7 +413,7 @@
title: res.data.msg, title: res.data.msg,
type: 'error' type: 'error'
}) })
}else{ } else {
_this.$refs.uToast.show({ _this.$refs.uToast.show({
title: '添加成功', title: '添加成功',
type: 'success' type: 'success'
@ -398,7 +422,7 @@
delta: 1 delta: 1
}) })
// this.back() // this.back()
} }
}) })
@ -419,13 +443,13 @@
} else if (e == '女') { } else if (e == '女') {
this.form.sex = 'FEMALE'; this.form.sex = 'FEMALE';
} }
}, },
// 民族 // 民族
nationSelect(e) { nationSelect(e) {
this.form.nation = e[0].value this.form.nation = e[0].value
this.nation = e[0].label this.nation = e[0].label
}, },
// 与户主关系 // 与户主关系
relationshipSelect(e) { relationshipSelect(e) {
@ -472,7 +496,8 @@
} }
} }
.u-form-item{
.u-form-item {
padding: 0 0 !important; padding: 0 0 !important;
} }
@ -491,7 +516,7 @@
display: flex; display: flex;
// align-items: center; // align-items: center;
// justify-content: center; // justify-content: center;
// //
width: 47%; width: 47%;
margin: 23rpx 30rpx 0 55rpx; margin: 23rpx 30rpx 0 55rpx;
@ -535,8 +560,8 @@
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
margin-top: 100rpx; margin-top: 100rpx;
bottom: 27rpx; bottom: 27rpx;
} }
.contentbottom { .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 { .select {
width: 636rpx; width: 636rpx;
height: 63rpx; height: 63rpx;
@ -632,13 +702,14 @@
border-radius: 5rpx; border-radius: 5rpx;
display: flex; display: flex;
position: relative; position: relative;
.testitem { .testitem {
font-size: 26rpx; font-size: 26rpx;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }
text { text {
@ -749,4 +820,4 @@
} }
} }
} }
</style> </style>

8
pagesB/performancedetails/performancedetails.vue
View File

@ -24,6 +24,7 @@
data() { data() {
return { return {
itemlist: [], itemlist: [],
userinfo:{},
}; };
}, },
watch: {}, watch: {},
@ -33,7 +34,10 @@
}, },
info() { info() {
// getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => { // getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => {
getPerformance('372424194703207523', '1').then(res => { this.cityCode = uni.getStorageSync('region');
this.userinfo = uni.getStorageSync('userinfo')
var identity=this.userinfo.cardNo
getPerformance(identity).then(res => {
res.data.forEach(e => { res.data.forEach(e => {
e.check = false e.check = false
}) })
@ -105,4 +109,4 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
</style> </style>