diff --git a/api/pages/homepage/homepage.js b/api/pages/homepage/homepage.js index 793dd65..687f2fa 100644 --- a/api/pages/homepage/homepage.js +++ b/api/pages/homepage/homepage.js @@ -22,7 +22,7 @@ export function getCurrentUser(openid, cityCode) { }) } // 获取签约信息 -export function detail(identity, region) { +export function detail(identity) { return request({ url: `/applet/signinfo/detail/${identity}`, method: 'GET', @@ -34,7 +34,7 @@ export function detail(identity, region) { } //是否注册 -export function checkSignApply(identity, region) { +export function checkSignApply(identity) { return request({ url: `/applet/sign/apply/checkSignApply/${identity}`, method: 'GET', diff --git a/api/pagesB/Behaviorpoints/index.js b/api/pagesB/Behaviorpoints/index.js index f06dcf5..a4157da 100644 --- a/api/pagesB/Behaviorpoints/index.js +++ b/api/pagesB/Behaviorpoints/index.js @@ -1,12 +1,22 @@ import request from "../../request.js" -export function prizeExchangelist(data, region) { +export function scorelist(data) { return request({ - url: `/applet/score/prizeExchange/list`, + url: `/applet/score/list`, method: 'get', data: data, header: { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} +//总积分 +export function scoretotal(cardNo) { + return request({ + url: `/applet/score/total/${cardNo}`, + method: 'get', + header: { + region: uni.getStorageSync('region'), + } + }) +} diff --git a/api/pagesB/PointsMall/index.js b/api/pagesB/PointsMall/index.js index 055997e..4139fac 100644 --- a/api/pagesB/PointsMall/index.js +++ b/api/pagesB/PointsMall/index.js @@ -1,6 +1,6 @@ import request from "../../request.js" -export function prizelist(data, region) { +export function prizelist(data) { return request({ url: `/applet/score/prize/list`, method: 'get', @@ -9,4 +9,15 @@ export function prizelist(data, region) { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} +//兑换奖品 +export function prizeExchangesave(data) { + return request({ + url: `/applet/score/prizeExchange/save`, + method: 'post', + data: data, + header: { + region: uni.getStorageSync('region'), + } + }) +} diff --git a/api/pagesB/exchangerecords/index.js b/api/pagesB/exchangerecords/index.js new file mode 100644 index 0000000..b5aa4b7 --- /dev/null +++ b/api/pagesB/exchangerecords/index.js @@ -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'), + } + }) +} diff --git a/api/pagesB/myfamilydoctorteam/index.js b/api/pagesB/myfamilydoctorteam/index.js index 7336f3b..15ac447 100644 --- a/api/pagesB/myfamilydoctorteam/index.js +++ b/api/pagesB/myfamilydoctorteam/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" -export function getDoctorListtwo(pageNum, pageSize, teamNo, region,realname) { +export function getDoctorListtwo(pageNum, pageSize, teamNo,realname) { return request({ url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}&realname=${realname}`, method: 'get', diff --git a/api/pagesB/mysigning/index.js b/api/pagesB/mysigning/index.js index 636815f..352a12c 100644 --- a/api/pagesB/mysigning/index.js +++ b/api/pagesB/mysigning/index.js @@ -1,6 +1,6 @@ import request from "@/api/request.js" //解约 -export function rescindapplysave(data, region) { +export function rescindapplysave(data) { return request({ url: `/applet/rescind/apply/save`, method: 'post', diff --git a/api/pagesB/performancedetails/index.js b/api/pagesB/performancedetails/index.js index b4fc486..18ff5e2 100644 --- a/api/pagesB/performancedetails/index.js +++ b/api/pagesB/performancedetails/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" -export function getPerformance(identity, region) { +export function getPerformance(identity) { return request({ url: `/applet/signinfo/getPerformance/${identity}`, method: 'get', diff --git a/api/pagesC/Onlinesigning/index.js b/api/pagesC/Onlinesigning/index.js index 6d39f26..dc28e3d 100644 --- a/api/pagesC/Onlinesigning/index.js +++ b/api/pagesC/Onlinesigning/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" // 获取区划列表 -export function arealist(pid, region) { +export function arealist(pid) { return request({ url: `/applet/signinfo/area/list/${pid}`, method: 'get', @@ -12,7 +12,7 @@ export function arealist(pid, region) { } //提交签约 -export function applysave(data, region) { +export function applysave(data) { return request({ url: `/applet/sign/apply/save`, method: 'post', @@ -24,7 +24,7 @@ export function applysave(data, region) { } //人群 -export function getCrowd(identity, region) { +export function getCrowd(identity) { return request({ url: `/applet/signinfo/getCrowd/${identity}`, method: 'get', @@ -35,7 +35,7 @@ export function getCrowd(identity, region) { } //服务包 -export function getPackageByCrowdNo(data, region) { +export function getPackageByCrowdNo(data) { return request({ url: `/applet/signinfo/getPackageByCrowdNo`, method: 'post', @@ -44,4 +44,4 @@ export function getPackageByCrowdNo(data, region) { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} diff --git a/api/pagesC/ServiceAppointment/ServiceAppointment.js b/api/pagesC/ServiceAppointment/ServiceAppointment.js index 73049a8..d46f1fb 100644 --- a/api/pagesC/ServiceAppointment/ServiceAppointment.js +++ b/api/pagesC/ServiceAppointment/ServiceAppointment.js @@ -1,7 +1,7 @@ import request from "../../request.js" // 服务预约 -export function getForm(identity,region,projectName) { +export function getForm(identity,projectName) { return request({ url: `/applet/service/apply/getForm/${identity}?projectName=${projectName}`, method: 'GET', diff --git a/api/pagesC/choosedoctor/index.js b/api/pagesC/choosedoctor/index.js index 6531759..2a18807 100644 --- a/api/pagesC/choosedoctor/index.js +++ b/api/pagesC/choosedoctor/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" // 获取医生列表 -export function getDoctorList(pageNum, orgNo, region,realname) { +export function getDoctorList(pageNum, orgNo,realname) { return request({ url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}&realname=${realname}`, method: 'get', diff --git a/api/pagesC/contractsigningprotocol/index.js b/api/pagesC/contractsigningprotocol/index.js index 84695b4..131ffe6 100644 --- a/api/pagesC/contractsigningprotocol/index.js +++ b/api/pagesC/contractsigningprotocol/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" -export function getContent(userNo, region) { +export function getContent(userNo) { return request({ url: `/applet/signinfo/getContent/${userNo}`, method: 'get', @@ -13,7 +13,7 @@ export function getContent(userNo, region) { -export function getSignProtocol(cardNo, region) { +export function getSignProtocol(cardNo) { return request({ url: `/applet/signinfo/getSignProtocol/${cardNo}`, method: 'get', diff --git a/api/pagesC/selectInstitution/index.js b/api/pagesC/selectInstitution/index.js index c5ffef9..3e45cd4 100644 --- a/api/pagesC/selectInstitution/index.js +++ b/api/pagesC/selectInstitution/index.js @@ -1,25 +1,25 @@ import request from "@/api/request.js" -export function getCounty(data, region) { +export function getCounty(data) { return request({ url: `/applet/signinfo/getCounty`, method: 'post', data: data, header: { - region: region + region: uni.getStorageSync('region'), } }) } -export function getNearbyOrg(data, region) { +export function getNearbyOrg(data) { return request({ url: `/applet/signinfo/getNearbyOrg`, method: 'get', data: data, header: { - region: region + region: uni.getStorageSync('region'), } }) } diff --git a/components/protocol/protocol.vue b/components/protocol/protocol.vue index 9f731b2..c9e230d 100644 --- a/components/protocol/protocol.vue +++ b/components/protocol/protocol.vue @@ -182,7 +182,7 @@ filePath: that.meimage, name: 'file', header: { - region: '1' + region: uni.getStorageSync('region'), }, timeout: 60000, success(respp) { @@ -208,7 +208,7 @@ filePath: data, name: 'file', header: { - region: '1' + region: uni.getStorageSync('region'), }, timeout: 60000, success(res) { diff --git a/pages.json b/pages.json index a532f0a..0ebb63a 100644 --- a/pages.json +++ b/pages.json @@ -316,7 +316,8 @@ "path": "exchangerecords/exchangerecords", "style": { "navigationBarTitleText": "兑换记录", - "enablePullDownRefresh": false + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true } }, { "path": "familymemberdetail/familymemberdetail", @@ -551,4 +552,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 0b8392f..1cfabe3 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -5,17 +5,20 @@ 我的 --> - + + + - + {{appPersonallist.patientName}} 未签约 - + {{appPersonallist.phone}} @@ -428,17 +431,17 @@ } }, //修改信息 - updatainfo() { - const value = uni.getStorageSync('openid'); - const value2 = uni.getStorageSync('patientId'); - if (value && value2) { - uni.navigateTo({ - url: `/pagesB/modify/modify` - }) - } else { - this.gologin(); - } - }, + // updatainfo() { + // const value = uni.getStorageSync('openid'); + // const value2 = uni.getStorageSync('patientId'); + // if (value && value2) { + // uni.navigateTo({ + // url: `/pagesB/modify/modify` + // }) + // } else { + // this.gologin(); + // } + // }, // 专家咨询订单 expertOrder() { uni.navigateTo({ diff --git a/pagesB/Behaviorpoints/Behaviorpoints.scss b/pagesB/Behaviorpoints/Behaviorpoints.scss index e785c9e..ae5cb13 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.scss +++ b/pagesB/Behaviorpoints/Behaviorpoints.scss @@ -9,11 +9,12 @@ margin: 0 auto; .content { position: relative; + image { width: 100%; height: 319rpx; } - + .Exchangerecords { width: 180rpx; height: 54rpx; @@ -38,23 +39,21 @@ text-align: center; line-height: 54rpx; } - + .name { width: 90%; height: 100rpx; font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; position: absolute; top: 10%; left: 5%; line-height: 33rpx; - + } .number { font-size: 56rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; position: absolute; @@ -66,26 +65,21 @@ } } .bottomitem{ - position: relative; background-color: #FFF; margin: 0 auto; - + padding-bottom: 100rpx; + .item{ + position: relative; + } .Establishingarchives{ font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #333333; line-height: 38rpx; padding: 8px 10px 5px 18px; } .integraltwo{ - position: absolute; - top: 75%; - right: 3%; - color: red; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + color: red !important; } .integral{ position: absolute; @@ -98,7 +92,6 @@ } .timeone{ font-size: 20rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #333333; line-height: 38rpx; @@ -107,7 +100,6 @@ } .PointsRecord { font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #000000; line-height: 33rpx; @@ -115,6 +107,6 @@ } } } - - - } \ No newline at end of file + + + } diff --git a/pagesB/Behaviorpoints/Behaviorpoints.vue b/pagesB/Behaviorpoints/Behaviorpoints.vue index c32ae9b..b280a9d 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.vue +++ b/pagesB/Behaviorpoints/Behaviorpoints.vue @@ -5,7 +5,7 @@ 我的积分 - 1000 + {{score?score:0}} 积分商城 @@ -18,32 +18,31 @@ 积分记录 - - 建立档案 - - - +20000 - - - 2023-03-09 13:23:12 - - - 兑换商品 - - - -2000000000 - - - 2023-03-09 13:23:12 + + + + {{item.actName}} + + + {{'+'+item.score}} + + + {{item.score}} + + + {{item.scoreDate}} + + + - \ No newline at end of file + diff --git a/pagesB/PointsMall/PointsMall.vue b/pagesB/PointsMall/PointsMall.vue index f585848..7f3142e 100644 --- a/pagesB/PointsMall/PointsMall.vue +++ b/pagesB/PointsMall/PointsMall.vue @@ -1,45 +1,66 @@ \ No newline at end of file + diff --git a/pagesB/modify/modify.vue b/pagesB/modify/modify.vue index 7c0470f..e3025eb 100644 --- a/pagesB/modify/modify.vue +++ b/pagesB/modify/modify.vue @@ -206,6 +206,7 @@ that.appPersonallist.sex = '女'; } that.appPersonallist = Response.data + that.value2=Response.data.diseaseList.map(String) Number(that.appPersonallist.homeLatitude) > 0 ? that.appPersonallist.homeLatitude = Number( that.appPersonallist.homeLatitude) : that.appPersonallist.homeLatitude = null Number(that.appPersonallist.homeLongitude) > 0 ? that.appPersonallist.homeLongitude = @@ -229,7 +230,6 @@ methods: { confirm(e) { this.appPersonallist.diseaseList = e.map(Number) - console.log(e) }, // 下拉框多选 selectChange(val) { diff --git a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue index e167958..80d2714 100644 --- a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue +++ b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue @@ -47,7 +47,7 @@ }, methods: { 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.total = res.total }) @@ -62,7 +62,7 @@ onReachBottom() { //上滑加载 if (this.list.length >= this.total) {} else { 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 => { this.list.push(e) }) @@ -82,4 +82,4 @@ + \ No newline at end of file diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index bce8af2..b6127cc 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -164,8 +164,7 @@ }, // 签约信息 detailinfo() { - // detail(uni.getStorageSync('userinfo').cardNo, this.region).then(res => { - detail('372424194703207523', '1').then(res => { + detail(uni.getStorageSync('userinfo').cardNo).then(res => { if (res.code == 200) { this.list = res.data this.list.rescindType = null diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 51dace4..8e766bc 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -349,14 +349,14 @@ this.query.county = e[0].value this.query.countyName = e[0].label const pid = this.countylist.find(m => m.areaCode === e[0].value).id - this.arealistinfo(pid, '1', 'Township') + this.arealistinfo(pid, 'Township') }, //选择乡镇 Townshipconfirm(e) { this.query.town = e[0].value this.query.townName = e[0].label const pid = this.Townshiplist.find(m => m.streetCode === e[0].value).id - this.arealistinfo(pid, '1', 'village') + this.arealistinfo(pid, 'village') }, //选择村 villageconfirm(e) { @@ -364,8 +364,8 @@ this.query.committeeName = e[0].label }, //区县list - arealistinfo(code, code2, list) { - arealist(code, code2).then(res => { + arealistinfo(code, list) { + arealist(code).then(res => { if (list == 'county') { this.countylist = res.data } else if (list == 'Township') { @@ -442,7 +442,7 @@ }, //人群list getCrowdinfo() { - getCrowd('370882199909092123', '1').then(res => { + getCrowd(uni.getStorageSync('userinfo').cardNo).then(res => { res.data.forEach(e => { e.checked = false }) @@ -515,7 +515,7 @@ }, }, onLoad(options) { - this.arealistinfo('371400000000 ', '1', 'county'); + this.arealistinfo('371400000000 ', 'county'); this.getCrowdinfo(); let date = new Date(); let year = date.getFullYear(); @@ -549,7 +549,7 @@ that.query.userNo = item.userNo that.query.teamNo = item.teamNo 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 }) uni.$off('doctordata') @@ -559,4 +559,4 @@ + \ No newline at end of file diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index 2fe182b..10061d0 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -39,7 +39,6 @@ }, projectName: '', identity: '', - region: '', listinfo: [], appointlist: [], packageNo: '', @@ -59,9 +58,8 @@ methods: { getlist() { this.userinfo = uni.getStorageSync('userinfo'); - this.identity=this.userinfo.cardNo - this.region = this.userinfo.cityCode; - getForm(this.identity, this.region, this.projectName).then(res => { + this.identity = this.userinfo.cardNo + getForm(this.identity, this.projectName).then(res => { this.listinfo = res.data }) }, diff --git a/pagesC/choosedoctor/choosedoctor.vue b/pagesC/choosedoctor/choosedoctor.vue index fc44984..01637f7 100644 --- a/pagesC/choosedoctor/choosedoctor.vue +++ b/pagesC/choosedoctor/choosedoctor.vue @@ -56,12 +56,12 @@ methods: { getDoctorListinfo() { 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.doctortotal = res.total }) } 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.doctortotal = res.total }) @@ -90,14 +90,14 @@ if (this.doctorlist.length >= this.doctortotal) {} else { this.pageNum++; 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 => { this.doctorlist.push(e) }) this.doctortotal = res.total }) } 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 => { this.doctorlist.push(e) }) @@ -118,4 +118,4 @@ + \ No newline at end of file diff --git a/pagesC/contractsigningprotocol/contractsigningprotocol.vue b/pagesC/contractsigningprotocol/contractsigningprotocol.vue index c430642..75a91e5 100644 --- a/pagesC/contractsigningprotocol/contractsigningprotocol.vue +++ b/pagesC/contractsigningprotocol/contractsigningprotocol.vue @@ -170,7 +170,7 @@ filePath: tempFilePath, name: 'file', header: { - region: '1' + region: uni.getStorageSync('region'), }, timeout: 10000, success(respp) { @@ -190,14 +190,12 @@ this.signatureshow = false }, info() { - getSignProtocol(this.cardNo, '1').then(res => { + getSignProtocol(uni.getStorageSync('userinfo').cardNo, '1').then(res => { this.list = res.data }) }, }, onLoad(options) { - this.cardNo = options.cardNo - this.cardNo = '372424194703207523' this.info(); }, }