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

This commit is contained in:
shidongli 2023-10-16 11:33:51 +08:00
commit 46fd79638e
26 changed files with 260 additions and 173 deletions

View File

@ -22,7 +22,7 @@ export function getCurrentUser(openid, cityCode) {
}) })
} }
// 获取签约信息 // 获取签约信息
export function detail(identity, region) { export function detail(identity) {
return request({ return request({
url: `/applet/signinfo/detail/${identity}`, url: `/applet/signinfo/detail/${identity}`,
method: 'GET', method: 'GET',
@ -34,7 +34,7 @@ export function detail(identity, region) {
} }
//是否注册 //是否注册
export function checkSignApply(identity, region) { export function checkSignApply(identity) {
return request({ return request({
url: `/applet/sign/apply/checkSignApply/${identity}`, url: `/applet/sign/apply/checkSignApply/${identity}`,
method: 'GET', method: 'GET',

View File

@ -1,12 +1,22 @@
import request from "../../request.js" import request from "../../request.js"
export function prizeExchangelist(data, region) { export function scorelist(data) {
return request({ return request({
url: `/applet/score/prizeExchange/list`, url: `/applet/score/list`,
method: 'get', method: 'get',
data: data, data: data,
header: { header: {
region: uni.getStorageSync('region'), region: uni.getStorageSync('region'),
} }
}) })
} }
//总积分
export function scoretotal(cardNo) {
return request({
url: `/applet/score/total/${cardNo}`,
method: 'get',
header: {
region: uni.getStorageSync('region'),
}
})
}

View File

@ -1,6 +1,6 @@
import request from "../../request.js" import request from "../../request.js"
export function prizelist(data, region) { export function prizelist(data) {
return request({ return request({
url: `/applet/score/prize/list`, url: `/applet/score/prize/list`,
method: 'get', method: 'get',
@ -9,4 +9,15 @@ export function prizelist(data, region) {
region: uni.getStorageSync('region'), region: uni.getStorageSync('region'),
} }
}) })
} }
//兑换奖品
export function prizeExchangesave(data) {
return request({
url: `/applet/score/prizeExchange/save`,
method: 'post',
data: data,
header: {
region: uni.getStorageSync('region'),
}
})
}

View File

@ -0,0 +1,12 @@
import request from "../../request.js"
export function prizeExchangelist(data) {
return request({
url: `/applet/score/prizeExchange/list`,
method: 'get',
data: data,
header: {
region: uni.getStorageSync('region'),
}
})
}

View File

@ -1,7 +1,7 @@
import request from "@/api/request.js" import request from "@/api/request.js"
export function getDoctorListtwo(pageNum, pageSize, teamNo, region,realname) { export function getDoctorListtwo(pageNum, pageSize, teamNo,realname) {
return request({ return request({
url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}&realname=${realname}`, url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}&realname=${realname}`,
method: 'get', method: 'get',

View File

@ -1,6 +1,6 @@
import request from "@/api/request.js" import request from "@/api/request.js"
//解约 //解约
export function rescindapplysave(data, region) { export function rescindapplysave(data) {
return request({ return request({
url: `/applet/rescind/apply/save`, url: `/applet/rescind/apply/save`,
method: 'post', method: 'post',

View File

@ -1,7 +1,7 @@
import request from "@/api/request.js" import request from "@/api/request.js"
export function getPerformance(identity, region) { export function getPerformance(identity) {
return request({ return request({
url: `/applet/signinfo/getPerformance/${identity}`, url: `/applet/signinfo/getPerformance/${identity}`,
method: 'get', method: 'get',

View File

@ -1,7 +1,7 @@
import request from "@/api/request.js" import request from "@/api/request.js"
// 获取区划列表 // 获取区划列表
export function arealist(pid, region) { export function arealist(pid) {
return request({ return request({
url: `/applet/signinfo/area/list/${pid}`, url: `/applet/signinfo/area/list/${pid}`,
method: 'get', method: 'get',
@ -12,7 +12,7 @@ export function arealist(pid, region) {
} }
//提交签约 //提交签约
export function applysave(data, region) { export function applysave(data) {
return request({ return request({
url: `/applet/sign/apply/save`, url: `/applet/sign/apply/save`,
method: 'post', method: 'post',
@ -24,7 +24,7 @@ export function applysave(data, region) {
} }
//人群 //人群
export function getCrowd(identity, region) { export function getCrowd(identity) {
return request({ return request({
url: `/applet/signinfo/getCrowd/${identity}`, url: `/applet/signinfo/getCrowd/${identity}`,
method: 'get', method: 'get',
@ -35,7 +35,7 @@ export function getCrowd(identity, region) {
} }
//服务包 //服务包
export function getPackageByCrowdNo(data, region) { export function getPackageByCrowdNo(data) {
return request({ return request({
url: `/applet/signinfo/getPackageByCrowdNo`, url: `/applet/signinfo/getPackageByCrowdNo`,
method: 'post', method: 'post',
@ -44,4 +44,4 @@ export function getPackageByCrowdNo(data, region) {
region: uni.getStorageSync('region'), region: uni.getStorageSync('region'),
} }
}) })
} }

View File

@ -1,7 +1,7 @@
import request from "../../request.js" import request from "../../request.js"
// 服务预约 // 服务预约
export function getForm(identity,region,projectName) { export function getForm(identity,projectName) {
return request({ return request({
url: `/applet/service/apply/getForm/${identity}?projectName=${projectName}`, url: `/applet/service/apply/getForm/${identity}?projectName=${projectName}`,
method: 'GET', method: 'GET',

View File

@ -1,7 +1,7 @@
import request from "@/api/request.js" import request from "@/api/request.js"
// 获取医生列表 // 获取医生列表
export function getDoctorList(pageNum, orgNo, region,realname) { export function getDoctorList(pageNum, orgNo,realname) {
return request({ return request({
url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}&realname=${realname}`, url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}&realname=${realname}`,
method: 'get', method: 'get',

View File

@ -1,7 +1,7 @@
import request from "@/api/request.js" import request from "@/api/request.js"
export function getContent(userNo, region) { export function getContent(userNo) {
return request({ return request({
url: `/applet/signinfo/getContent/${userNo}`, url: `/applet/signinfo/getContent/${userNo}`,
method: 'get', method: 'get',
@ -13,7 +13,7 @@ export function getContent(userNo, region) {
export function getSignProtocol(cardNo, region) { export function getSignProtocol(cardNo) {
return request({ return request({
url: `/applet/signinfo/getSignProtocol/${cardNo}`, url: `/applet/signinfo/getSignProtocol/${cardNo}`,
method: 'get', method: 'get',

View File

@ -1,25 +1,25 @@
import request from "@/api/request.js" import request from "@/api/request.js"
export function getCounty(data, region) { export function getCounty(data) {
return request({ return request({
url: `/applet/signinfo/getCounty`, url: `/applet/signinfo/getCounty`,
method: 'post', method: 'post',
data: data, data: data,
header: { header: {
region: region region: uni.getStorageSync('region'),
} }
}) })
} }
export function getNearbyOrg(data, region) { export function getNearbyOrg(data) {
return request({ return request({
url: `/applet/signinfo/getNearbyOrg`, url: `/applet/signinfo/getNearbyOrg`,
method: 'get', method: 'get',
data: data, data: data,
header: { header: {
region: region region: uni.getStorageSync('region'),
} }
}) })
} }

View File

@ -182,7 +182,7 @@
filePath: that.meimage, filePath: that.meimage,
name: 'file', name: 'file',
header: { header: {
region: '1' region: uni.getStorageSync('region'),
}, },
timeout: 60000, timeout: 60000,
success(respp) { success(respp) {
@ -208,7 +208,7 @@
filePath: data, filePath: data,
name: 'file', name: 'file',
header: { header: {
region: '1' region: uni.getStorageSync('region'),
}, },
timeout: 60000, timeout: 60000,
success(res) { success(res) {

View File

@ -316,7 +316,8 @@
"path": "exchangerecords/exchangerecords", "path": "exchangerecords/exchangerecords",
"style": { "style": {
"navigationBarTitleText": "兑换记录", "navigationBarTitleText": "兑换记录",
"enablePullDownRefresh": false "onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
} }
}, { }, {
"path": "familymemberdetail/familymemberdetail", "path": "familymemberdetail/familymemberdetail",
@ -551,4 +552,4 @@
} }
] ]
} }
} }

View File

@ -5,17 +5,20 @@
我的 我的
</view> --> </view> -->
<image src="../../static/pages/userbanner.png" mode="" class="userbanner"></image> <image src="../../static/pages/userbanner.png" mode="" class="userbanner"></image>
<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo'> <image src="/static/myinformation.png" mode="" class="headsculpture" @tap='updatainfo'
v-if="!appPersonallist.headPictureUrl">
</image>
<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo' v-else>
</image> </image>
<view class="namesigning"> <view class="namesigning">
<span class="name"> <span class="name" v-if="appPersonallist.patientName">
{{appPersonallist.patientName}} {{appPersonallist.patientName}}
</span> </span>
<view class="signing"> <view class="signing">
未签约 未签约
</view> </view>
</view> </view>
<view class="phone"> <view class="phone" v-if="appPersonallist.phone">
{{appPersonallist.phone}} {{appPersonallist.phone}}
</view> </view>
<view class="switch btn" @tap='homeshow'> <view class="switch btn" @tap='homeshow'>
@ -428,17 +431,17 @@
} }
}, },
// //
updatainfo() { // updatainfo() {
const value = uni.getStorageSync('openid'); // const value = uni.getStorageSync('openid');
const value2 = uni.getStorageSync('patientId'); // const value2 = uni.getStorageSync('patientId');
if (value && value2) { // if (value && value2) {
uni.navigateTo({ // uni.navigateTo({
url: `/pagesB/modify/modify` // url: `/pagesB/modify/modify`
}) // })
} else { // } else {
this.gologin(); // this.gologin();
} // }
}, // },
// //
expertOrder() { expertOrder() {
uni.navigateTo({ uni.navigateTo({

View File

@ -9,11 +9,12 @@
margin: 0 auto; margin: 0 auto;
.content { .content {
position: relative; position: relative;
image { image {
width: 100%; width: 100%;
height: 319rpx; height: 319rpx;
} }
.Exchangerecords { .Exchangerecords {
width: 180rpx; width: 180rpx;
height: 54rpx; height: 54rpx;
@ -38,23 +39,21 @@
text-align: center; text-align: center;
line-height: 54rpx; line-height: 54rpx;
} }
.name { .name {
width: 90%; width: 90%;
height: 100rpx; height: 100rpx;
font-size: 30rpx; font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
position: absolute; position: absolute;
top: 10%; top: 10%;
left: 5%; left: 5%;
line-height: 33rpx; line-height: 33rpx;
} }
.number { .number {
font-size: 56rpx; font-size: 56rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
position: absolute; position: absolute;
@ -66,26 +65,21 @@
} }
} }
.bottomitem{ .bottomitem{
position: relative;
background-color: #FFF; background-color: #FFF;
margin: 0 auto; margin: 0 auto;
padding-bottom: 100rpx;
.item{
position: relative;
}
.Establishingarchives{ .Establishingarchives{
font-size: 30rpx; font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 38rpx; line-height: 38rpx;
padding: 8px 10px 5px 18px; padding: 8px 10px 5px 18px;
} }
.integraltwo{ .integraltwo{
position: absolute; color: red !important;
top: 75%;
right: 3%;
color: red;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.integral{ .integral{
position: absolute; position: absolute;
@ -98,7 +92,6 @@
} }
.timeone{ .timeone{
font-size: 20rpx; font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 38rpx; line-height: 38rpx;
@ -107,7 +100,6 @@
} }
.PointsRecord { .PointsRecord {
font-size: 30rpx; font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
line-height: 33rpx; line-height: 33rpx;
@ -115,6 +107,6 @@
} }
} }
} }
} }

View File

@ -5,7 +5,7 @@
<image src="/static/pagesB/Behave.png" mode=""></image> <image src="/static/pagesB/Behave.png" mode=""></image>
<view class="name">我的积分 <view class="name">我的积分
</view> </view>
<view class="number">1000 <view class="number">{{score?score:0}}
</view> </view>
<view class="PointsMall" @tap='gointegral'> <view class="PointsMall" @tap='gointegral'>
积分商城 积分商城
@ -18,32 +18,31 @@
<view class="PointsRecord"> <view class="PointsRecord">
积分记录 积分记录
</view> </view>
<view class="Establishingarchives"> <view class="" v-if="list&&list.length>0">
建立档案 <view class="item" v-for="item in list">
</view> <view class="Establishingarchives">
<view class="integral"> {{item.actName}}
+20000 </view>
</view> <view class="integral" v-if="item.score>0">
<view class="timeone"> {{'+'+item.score}}
2023-03-09 13:23:12 </view>
</view> <view class="integral integraltwo" v-else>
<view class="Establishingarchives"> {{item.score}}
兑换商品 </view>
</view> <view class="timeone">
<view class="integraltwo"> {{item.scoreDate}}
-2000000000 </view>
</view> </view>
<view class="timeone">
2023-03-09 13:23:12
</view> </view>
<u-empty v-else mode="list" icon-size='220' text='暂无积分记录'></u-empty>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import {
prizeExchangelist scorelist,
scoretotal
} from '@/api/pagesB/Behaviorpoints/index.js' } from '@/api/pagesB/Behaviorpoints/index.js'
// import { // import {
// mapActions // mapActions
@ -52,20 +51,27 @@
data() { data() {
return { return {
query: { query: {
identity: '372325195905293621', identity: uni.getStorageSync('userinfo').cardNo,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
list: [], list: null,
total: 0, total: 0,
score: 0,
}; };
}, },
onLoad() { onLoad() {
this.info(); this.info();
this.scoretotalinfo();
}, },
methods: { methods: {
scoretotalinfo() {
scoretotal(this.query.identity).then(res => {
this.score = res.data
})
},
info() { info() {
prizeExchangelist(this.query, '2').then(res => { scorelist(this.query).then(res => {
this.list = res.rows this.list = res.rows
this.total = res.total this.total = res.total
}) })
@ -98,7 +104,7 @@
onReachBottom() { // onReachBottom() { //
if (this.list.length >= this.total) {} else { if (this.list.length >= this.total) {} else {
this.query.pageNum++ this.query.pageNum++
prizeExchangelist(this.query, '1').then(res => { scorelist(this.query).then(res => {
if (res.rows) { if (res.rows) {
res.rows.forEach(e => { res.rows.forEach(e => {
this.list.push(e) this.list.push(e)
@ -118,4 +124,4 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import './Behaviorpoints.scss' @import './Behaviorpoints.scss'
</style> </style>

View File

@ -1,45 +1,66 @@
<template> <template>
<view class="app"> <view class="app">
<view class="content" v-for="item in list"> <view class="contents" v-if="list&&list.length>0">
<image :src="item.attachment" mode=""></image> <view class="content" v-for="item in list">
<view class="servename"> <image :src="item.attachment" mode=""></image>
{{item.prizeName}} <view class="servename">
{{item.prizeName?item.prizeName:''}}
</view>
<view class="PointsRecord">
{{item.score?item.score:''}}积分
</view>
<view class="button" @tap="goexchange(item)">
兑换
</view>
</view> </view>
<view class="PointsRecord"> <view style="width: 48%;" v-if="list.length%2!=0">
{{item.score}}
</view>
<view class="button" @tap="goexchange">
兑换
</view> </view>
</view> </view>
<u-empty v-else mode="list" icon-size='220' text='暂无可兑换商品'></u-empty>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
import { import {
prizelist prizelist,
prizeExchangesave
} from '@/api/pagesB/PointsMall/index.js' } from '@/api/pagesB/PointsMall/index.js'
export default { export default {
data() { data() {
return { return {
query: { query: {
identity: '372325195905293621', identity: uni.getStorageSync('userinfo').cardNo,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
list: [], list: null,
total: 0, total: 0,
}; };
}, },
methods: { methods: {
goexchange() { goexchange(item) {
uni.navigateTo({ var obj = {
url: '/pagesB/exchangerecords/exchangerecords' identity: this.query.identity,
}); prizeId: item.prizeId
}
prizeExchangesave(obj).then(res => {
if (res.code == 200) {
this.$refs.uToast.show({
title: '兑换成功',
type: 'success',
})
} else {
this.$refs.uToast.show({
title: res.msg,
type: 'error',
})
}
})
}, },
info() { info() {
prizelist(this.query, '2').then(res => { prizelist(this.query).then(res => {
this.list = res.rows this.list = res.rows
this.total = res.total this.total = res.total
}) })
@ -51,7 +72,7 @@
onReachBottom() { // onReachBottom() { //
if (this.list.length >= this.total) {} else { if (this.list.length >= this.total) {} else {
this.query.pageNum++ this.query.pageNum++
prizelist(this.query, '1').then(res => { prizelist(this.query).then(res => {
if (res.rows) { if (res.rows) {
res.rows.forEach(e => { res.rows.forEach(e => {
this.list.push(e) this.list.push(e)
@ -72,13 +93,16 @@
<style lang="scss"> <style lang="scss">
.app { .app {
background-color: #F7F5F5; ::v-deep .u-empty{
padding-top: 10rpx; margin-top: 25vh !important;
height: 100vh; }
display: flex; .contents {
width: 100%; padding-top: 10rpx;
flex-wrap: wrap; display: flex;
justify-content: space-evenly; width: 100%;
flex-wrap: wrap;
justify-content: space-evenly;
}
.content { .content {
height: 514rpx; height: 514rpx;
@ -128,4 +152,4 @@
} }
} }
} }
</style> </style>

View File

@ -1,43 +1,83 @@
<template> <template>
<view class="app"> <view class="app">
<view class="content"> <view class="" v-if="list&&list.length>0">
<view class="time"> <view class="content" v-for="item in list">
2023-08-13 23:43:49 <view class="time">
<span> {{item.exchangeDate?item.exchangeDate:''}}
2000积分 <span>
</span> {{item.score?item.score:0}} 积分
</view> </span>
<view class="imageitem"> </view>
<image src="../../static/pagesB/Behave.png" mode=""></image> <image :src="item.prizeBase64" mode=""></image>
</view> <view class="servename">
<view class="servename"> {{item.prizeName?item.prizeName:''}}
服务名称 </view>
</view> <view class="servetime" v-if='item.useDate'>
<view class="servetime"> 服务时间{{item.useDate}}
服务时间2023-12-12 08:30 </view>
</view> </view>
</view> </view>
<u-empty v-else mode="list" icon-size='220' text='暂无兑换记录'></u-empty>
</view> </view>
</template> </template>
<script> <script>
import {
prizeExchangelist
} from '@/api/pagesB/exchangerecords/index.js'
export default { export default {
data() { data() {
return { return {
query: {
identity: uni.getStorageSync('userinfo').cardNo,
pageNum: 1,
pageSize: 10,
},
list: [],
total: 0,
}; };
} },
onLoad() {
this.info()
},
methods: {
info() {
prizeExchangelist(this.query).then(res => {
this.list = res.rows
this.total = res.total
})
},
},
onReachBottom() { //
if (this.list.length >= this.total) {} else {
this.query.pageNum++
prizeExchangelist(this.query).then(res => {
if (res.rows) {
res.rows.forEach(e => {
this.list.push(e)
})
}
})
}
},
onPullDownRefresh() { //
this.query.pageNum = 1;
this.info();
setTimeout(function() {
uni.stopPullDownRefresh();
}, 1000);
},
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.app { .app {
width: 100%; width: 100%;
height: 100vh;
text-align: justify; text-align: justify;
background-color: #F7F5F5;
padding: 25rpx 0 30rpx 0; padding: 25rpx 0 30rpx 0;
::v-deep .u-empty{
margin-top: 25vh !important;
}
.content { .content {
width: 90%; width: 90%;
height: 321rpx; height: 321rpx;
@ -48,21 +88,18 @@
position: relative; position: relative;
.servetime { .servetime {
font-size: 26rpx;
font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #959595; color: #959595;
line-height: 38rpx; line-height: 38rpx;
position: absolute; position: absolute;
bottom: 23%; bottom: 23%;
left: 35%; left: 35%;
text-align: justify;
} }
.servename { .servename {
font-size: 32rpx; font-size: 32rpx;
font-family: Source Han Sans CN;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 38rpx; line-height: 38rpx;
@ -74,21 +111,18 @@
white-space: nowrap; white-space: nowrap;
} }
.imageitem { image {
position: absolute; position: absolute;
left: 3%; left: 3%;
top: 28%; top: 28%;
width: 180rpx;
image { height: 180rpx;
width: 180rpx;
height: 180rpx;
}
} }
.time { .time {
text-align: justify;
padding: 25rpx 0 0 20rpx; padding: 25rpx 0 0 20rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
line-height: 38rpx; line-height: 38rpx;
@ -100,7 +134,6 @@
white-space: nowrap; white-space: nowrap;
font-size: 28rpx; font-size: 28rpx;
position: absolute; position: absolute;
font-family: Source Han Sans CN;
font-weight: 500; font-weight: 500;
color: #26A888; color: #26A888;
line-height: 38rpx; line-height: 38rpx;
@ -110,4 +143,4 @@
} }
} }
</style> </style>

View File

@ -206,6 +206,7 @@
that.appPersonallist.sex = '女'; that.appPersonallist.sex = '女';
} }
that.appPersonallist = Response.data that.appPersonallist = Response.data
that.value2=Response.data.diseaseList.map(String)
Number(that.appPersonallist.homeLatitude) > 0 ? that.appPersonallist.homeLatitude = Number( Number(that.appPersonallist.homeLatitude) > 0 ? that.appPersonallist.homeLatitude = Number(
that.appPersonallist.homeLatitude) : that.appPersonallist.homeLatitude = null that.appPersonallist.homeLatitude) : that.appPersonallist.homeLatitude = null
Number(that.appPersonallist.homeLongitude) > 0 ? that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude) > 0 ? that.appPersonallist.homeLongitude =
@ -229,7 +230,6 @@
methods: { methods: {
confirm(e) { confirm(e) {
this.appPersonallist.diseaseList = e.map(Number) this.appPersonallist.diseaseList = e.map(Number)
console.log(e)
}, },
// //
selectChange(val) { selectChange(val) {

View File

@ -47,7 +47,7 @@
}, },
methods: { methods: {
info() { info() {
getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, '1', this.realname).then(res => { getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, this.realname).then(res => {
this.list = res.rows this.list = res.rows
this.total = res.total this.total = res.total
}) })
@ -62,7 +62,7 @@
onReachBottom() { // onReachBottom() { //
if (this.list.length >= this.total) {} else { if (this.list.length >= this.total) {} else {
this.pageNum++; this.pageNum++;
getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, '1').then(res => { getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, this.realname).then(res => {
res.rows.forEach(e => { res.rows.forEach(e => {
this.list.push(e) this.list.push(e)
}) })
@ -82,4 +82,4 @@
<style lang="scss"> <style lang="scss">
@import './myfamilydoctorteam.scss'; @import './myfamilydoctorteam.scss';
</style> </style>

View File

@ -164,8 +164,7 @@
}, },
// //
detailinfo() { detailinfo() {
// detail(uni.getStorageSync('userinfo').cardNo, this.region).then(res => { detail(uni.getStorageSync('userinfo').cardNo).then(res => {
detail('372424194703207523', '1').then(res => {
if (res.code == 200) { if (res.code == 200) {
this.list = res.data this.list = res.data
this.list.rescindType = null this.list.rescindType = null

View File

@ -349,14 +349,14 @@
this.query.county = e[0].value this.query.county = e[0].value
this.query.countyName = e[0].label this.query.countyName = e[0].label
const pid = this.countylist.find(m => m.areaCode === e[0].value).id const pid = this.countylist.find(m => m.areaCode === e[0].value).id
this.arealistinfo(pid, '1', 'Township') this.arealistinfo(pid, 'Township')
}, },
// //
Townshipconfirm(e) { Townshipconfirm(e) {
this.query.town = e[0].value this.query.town = e[0].value
this.query.townName = e[0].label this.query.townName = e[0].label
const pid = this.Townshiplist.find(m => m.streetCode === e[0].value).id const pid = this.Townshiplist.find(m => m.streetCode === e[0].value).id
this.arealistinfo(pid, '1', 'village') this.arealistinfo(pid, 'village')
}, },
// //
villageconfirm(e) { villageconfirm(e) {
@ -364,8 +364,8 @@
this.query.committeeName = e[0].label this.query.committeeName = e[0].label
}, },
//list //list
arealistinfo(code, code2, list) { arealistinfo(code, list) {
arealist(code, code2).then(res => { arealist(code).then(res => {
if (list == 'county') { if (list == 'county') {
this.countylist = res.data this.countylist = res.data
} else if (list == 'Township') { } else if (list == 'Township') {
@ -442,7 +442,7 @@
}, },
//list //list
getCrowdinfo() { getCrowdinfo() {
getCrowd('370882199909092123', '1').then(res => { getCrowd(uni.getStorageSync('userinfo').cardNo).then(res => {
res.data.forEach(e => { res.data.forEach(e => {
e.checked = false e.checked = false
}) })
@ -515,7 +515,7 @@
}, },
}, },
onLoad(options) { onLoad(options) {
this.arealistinfo('371400000000 ', '1', 'county'); this.arealistinfo('371400000000 ', 'county');
this.getCrowdinfo(); this.getCrowdinfo();
let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
@ -549,7 +549,7 @@
that.query.userNo = item.userNo that.query.userNo = item.userNo
that.query.teamNo = item.teamNo that.query.teamNo = item.teamNo
that.query.teamName = item.teamName that.query.teamName = item.teamName
getDoctorListtwo(1, 20, item.teamNo, '1').then(res => { getDoctorListtwo(1, 20, item.teamNo).then(res => {
that.query.DoctorList = res.rows that.query.DoctorList = res.rows
}) })
uni.$off('doctordata') uni.$off('doctordata')
@ -559,4 +559,4 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import "./Onlinesigning.scss"; @import "./Onlinesigning.scss";
</style> </style>

View File

@ -39,7 +39,6 @@
}, },
projectName: '', projectName: '',
identity: '', identity: '',
region: '',
listinfo: [], listinfo: [],
appointlist: [], appointlist: [],
packageNo: '', packageNo: '',
@ -59,9 +58,8 @@
methods: { methods: {
getlist() { getlist() {
this.userinfo = uni.getStorageSync('userinfo'); this.userinfo = uni.getStorageSync('userinfo');
this.identity=this.userinfo.cardNo this.identity = this.userinfo.cardNo
this.region = this.userinfo.cityCode; getForm(this.identity, this.projectName).then(res => {
getForm(this.identity, this.region, this.projectName).then(res => {
this.listinfo = res.data this.listinfo = res.data
}) })
}, },

View File

@ -56,12 +56,12 @@
methods: { methods: {
getDoctorListinfo() { getDoctorListinfo() {
if (this.orgNo) { if (this.orgNo) {
getDoctorList(this.pageNum, this.orgNo, '1', this.realname).then(res => { getDoctorList(this.pageNum, this.orgNo, this.realname).then(res => {
this.doctorlist = res.rows this.doctorlist = res.rows
this.doctortotal = res.total this.doctortotal = res.total
}) })
} else { } else {
getDoctorListtwo(this.pageNum, 10, this.teamNo, '1', this.realname).then(res => { getDoctorListtwo(this.pageNum, 10, this.teamNo, this.realname).then(res => {
this.doctorlist = res.rows this.doctorlist = res.rows
this.doctortotal = res.total this.doctortotal = res.total
}) })
@ -90,14 +90,14 @@
if (this.doctorlist.length >= this.doctortotal) {} else { if (this.doctorlist.length >= this.doctortotal) {} else {
this.pageNum++; this.pageNum++;
if (this.orgNo) { if (this.orgNo) {
getDoctorList(this.pageNum, this.orgNo, '1', this.realname).then(res => { getDoctorList(this.pageNum, this.orgNo, this.realname).then(res => {
res.rows.forEach(e => { res.rows.forEach(e => {
this.doctorlist.push(e) this.doctorlist.push(e)
}) })
this.doctortotal = res.total this.doctortotal = res.total
}) })
} else { } else {
getDoctorListtwo(this.pageNum, 10, this.teamNo, '1', this.realname).then(res => { getDoctorListtwo(this.pageNum, 10, this.teamNo, this.realname).then(res => {
res.rows.forEach(e => { res.rows.forEach(e => {
this.doctorlist.push(e) this.doctorlist.push(e)
}) })
@ -118,4 +118,4 @@
<style lang="scss"> <style lang="scss">
@import './choosedoctor.scss'; @import './choosedoctor.scss';
</style> </style>

View File

@ -170,7 +170,7 @@
filePath: tempFilePath, filePath: tempFilePath,
name: 'file', name: 'file',
header: { header: {
region: '1' region: uni.getStorageSync('region'),
}, },
timeout: 10000, timeout: 10000,
success(respp) { success(respp) {
@ -190,14 +190,12 @@
this.signatureshow = false this.signatureshow = false
}, },
info() { info() {
getSignProtocol(this.cardNo, '1').then(res => { getSignProtocol(uni.getStorageSync('userinfo').cardNo, '1').then(res => {
this.list = res.data this.list = res.data
}) })
}, },
}, },
onLoad(options) { onLoad(options) {
this.cardNo = options.cardNo
this.cardNo = '372424194703207523'
this.info(); this.info();
}, },
} }