From dff68c168478d086ccfe2eb103c3e1f11a39fbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 16 Oct 2023 11:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pages/homepage/homepage.js | 4 ++-- api/pagesB/exchangerecords/index.js | 12 ++++++++++++ api/pagesB/myfamilydoctorteam/index.js | 2 +- api/pagesB/mysigning/index.js | 2 +- api/pagesB/performancedetails/index.js | 2 +- api/pagesC/ServiceAppointment/ServiceAppointment.js | 2 +- api/pagesC/choosedoctor/index.js | 2 +- api/pagesC/contractsigningprotocol/index.js | 4 ++-- api/pagesC/selectInstitution/index.js | 8 ++++---- components/protocol/protocol.vue | 4 ++-- pagesB/myfamilydoctorteam/myfamilydoctorteam.vue | 6 +++--- pagesC/Onlinesigning/Onlinesigning.vue | 4 ++-- pagesC/ServiceAppointment/ServiceAppointment.vue | 6 ++---- pagesC/choosedoctor/choosedoctor.vue | 10 +++++----- .../contractsigningprotocol.vue | 2 +- 15 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 api/pagesB/exchangerecords/index.js 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/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/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/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/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index e0a5a5c..8e766bc 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -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 8218836..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) {