diff --git a/api/register/index.js b/api/register/index.js deleted file mode 100644 index 8c53c2e..0000000 --- a/api/register/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import request from "../request.js" - -export function appRegister(patientName,phone, password,verification) { - return request({ - url: `/nurseApp/login/appRegister?patientName=${patientName}&phone=${phone}&password=${password}&verification=${verification}`, - method: 'POST' - }) -} diff --git a/api/store/index.js b/api/store/index.js new file mode 100644 index 0000000..56daf90 --- /dev/null +++ b/api/store/index.js @@ -0,0 +1,9 @@ +import request from "../request.js" + +export function insertSubscribeMessageRecord(data) { + return request({ + url: `/nurseApplet/patientInfo/insertSubscribeMessageRecord`, + method: 'POST', + data + }) +} diff --git a/pages/confirmation/confirmation.vue b/pages/confirmation/confirmation.vue index ad87b63..afbe5cd 100644 --- a/pages/confirmation/confirmation.vue +++ b/pages/confirmation/confirmation.vue @@ -25,7 +25,18 @@ - 温馨提示:我们会尽快与您取得联系,您也可以进入“首页”-“在线客服”主动联系客服,谢谢! + + 【温馨提示】 + + + 1、下单后24h内我们会与您确认具体时间点,您也可以进入“首页”-“在线客服”联系客服 + + + 2、请提前准备好健康资料,以备专家参考 + + + 3、请提前下载“腾讯会议”APP + 咨询内容: @@ -215,10 +226,14 @@ border-bottom: 1rpx solid #D8D4D4; margin-left: 3%; + span:nth-child(1) { + font-weight: 600; + } + .addition { color: #666666; line-height: 30rpx; - font-size: 28rpx; + font-size: 32rpx; } } @@ -253,12 +268,30 @@ } } } - .pointout{ + + .pointout { color: #666666; width: 94%; font-size: 28rpx; margin: 20rpx auto; + + span { + color: black; + font-size: 34rpx; + font-weight: 600; + display: block; + margin-bottom: 10rpx; + } + + view { + padding-left: 30rpx; + } + + view:nth-child(1) { + padding-top: 10rpx; + } } + .remarks { width: 94%; margin: 10rpx auto; @@ -267,6 +300,9 @@ background: #FFFFFF; border-radius: 20rpx; padding: 30rpx 0 0 30rpx; + span { + font-weight: 600; + } } .bottomitem { diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue index 72c4b4f..0677079 100644 --- a/pages/coupon/coupon.vue +++ b/pages/coupon/coupon.vue @@ -121,7 +121,7 @@ this.getlist(); }, goshoping() { - uni.switchTab({ + uni.navigateTo({ url: '/pages/shopping/shopping' }) }, diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue index 531c277..eb3be77 100644 --- a/pages/diseasemanagement/diseasemanagement.vue +++ b/pages/diseasemanagement/diseasemanagement.vue @@ -1,7 +1,7 @@ diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue index 690d12c..1c8a2d5 100644 --- a/pages/materialbenefits/materialbenefits.vue +++ b/pages/materialbenefits/materialbenefits.vue @@ -184,7 +184,7 @@ }) }, goshoping() { - uni.switchTab({ + uni.navigateTo({ url: '/pages/shopping/shopping' }) }, diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue index 08401e0..86782f9 100644 --- a/pages/medicine/medicine.vue +++ b/pages/medicine/medicine.vue @@ -163,15 +163,21 @@ this.DepartmentpageNum = 1 this.swiperImgUrls = [] selectDepartment(this.DepartmentpageNum, this.DepartmentpageSize).then(res => { - this.hospitalDepartmentList = res.rows - this.hospitalDepartmenttotal = res.total - res.rows[0].poserInfoList.forEach(e => { - e.image = baseurl + e.posterPictureUrl - this.swiperImgUrls.push(e.image) - }) - this.departmentId = this.hospitalDepartmentList[0].departmentId - this.selectHospitalPersonInfo(); - if (this.swiperImgUrls.length == 0) { + if (res.rows.length > 0) { + this.hospitalDepartmentList = res.rows + this.hospitalDepartmenttotal = res.total + this.departmentId = this.hospitalDepartmentList[0].departmentId + this.selectHospitalPersonInfo(); + if (res.rows[0].poserInfoList.length > 0) { + res.rows[0].poserInfoList.forEach(e => { + e.image = baseurl + e.posterPictureUrl + this.swiperImgUrls.push(e.image) + }) + } else { + var img = baseurl + '/profile/appletPicture/healthy.png' + this.swiperImgUrls.push(img) + } + } else { var img = baseurl + '/profile/appletPicture/healthy.png' this.swiperImgUrls.push(img) } diff --git a/store/index.js b/store/index.js index 5024864..7d04e77 100644 --- a/store/index.js +++ b/store/index.js @@ -1,15 +1,21 @@ import Vue from 'vue' - import Vuex from 'vuex' - Vue.use(Vuex) - +import { + insertSubscribeMessageRecord +} from '@/api/store/index.js' const store = new Vuex.Store({ state: { //公共的变量,这里的变量不能随便修改,只能通过触发mutations的方法才能改变 }, mutations: { //相当于同步的操作 + //点击确认 + subscribesuccess(state) { + insertSubscribeMessageRecord().then(res => { + console.log(res) + }) + }, }, actions: { //相当于异步的操作,不能直接改变state的值,只能通过触发mutations的方法才能改变 @@ -20,10 +26,7 @@ const store = new Vuex.Store({ withSubscriptions: true, // 是否获取用户订阅消息的订阅状态,默认false不返回 success(res) { console.log('res.authSetting', res.authSetting) - if (res.authSetting['scope.subscribeMessage']) { - console.log('用户点击了“总是保持以上,不再询问”') - } else { - console.log('用户没有点击“总是保持以上,不再询问”则每次都会调起订阅消息') + if (res.authSetting['scope.subscribeMessage']) {} else { //因为没有选择总是保持,所以需要调起授权弹窗再次授权 wx.requestSubscribeMessage({ tmplIds: [ @@ -31,10 +34,16 @@ const store = new Vuex.Store({ 'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA', 'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU' ], - success(res) {}, - fail(err) {}, - complete(scc) { - } + success(res) { + console.log(res) + setTimeout(() => { + contxt.commit('subscribesuccess') + }, 1000) + }, + fail(err) { + console.log(err) + }, + complete(scc) {} }) } }