diff --git a/components/doctorImport.vue b/components/doctorImport.vue index d609d50..935b347 100644 --- a/components/doctorImport.vue +++ b/components/doctorImport.vue @@ -38,7 +38,7 @@ export default { wx.navigateToMiniProgram({ appId: data.appid, path: data.path+'?did='+data.param.did, - envVersion: 'release', // 打开的小程序版本,有 develop(开发版),trial(体验版),release(正式版) + envVersion: 'trial', // 打开的小程序版本,有 develop(开发版),trial(体验版),release(正式版) success(res) { console.log('跳转成功') }, diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue index 86a665f..ac4de3f 100644 --- a/components/visitorAccount.vue +++ b/components/visitorAccount.vue @@ -126,7 +126,6 @@ export default { ::v-deep { .uni-collapse-item .error{ margin-top: 24rpx; - margin-bottom: 24rpx; } } } @@ -194,6 +193,7 @@ export default { width: 100%; height: auto; overflow: hidden; + margin-top: 24rpx; .account-item { margin-bottom: 40rpx; diff --git a/main.js b/main.js index ce04543..3ba6261 100644 --- a/main.js +++ b/main.js @@ -212,6 +212,8 @@ function req(url, data={}, method = 'POST', header={}) { } } + data.did = uni.getStorageSync('doctor_id'); + var getWxH5LoginConfigUri = 'common/wxh5_login' var noNeedLoginFunc = [ getWxH5LoginConfigUri, @@ -278,9 +280,6 @@ function req(url, data={}, method = 'POST', header={}) { const currentPage = pages[pages.length - 1]; let pageUrl = '/'+currentPage.route; if(data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5){ - // uni.navigateTo({ - // url: '/pages/index/index' - // }); this.$nav.navToPath('/pages/index/index') }else{ } @@ -325,7 +324,7 @@ function xcx_login(url, eqdata={}, method = 'POST') { wx.login({ success (res) { if (res.code) { - var pdata = new Object(); + var pdata = eqdata; pdata.code = res.code; var doctor_id = uni.getStorageSync('doctor_id'); pdata.state = 'user-'+doctor_id; diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue index 85eb62d..6eff5f7 100644 --- a/pages/book_detail/book_detail.vue +++ b/pages/book_detail/book_detail.vue @@ -124,7 +124,7 @@ uni.showToast({ title:"取消预约成功", mask:true, - image:that.cssUrl+'gou.svg', + image:'/static/images/gou.svg', times:false, duration: 1500, success() { diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue index 1ad7f3f..4928c97 100644 --- a/pages/modify_visitor/modify_visitor.vue +++ b/pages/modify_visitor/modify_visitor.vue @@ -78,10 +78,13 @@ var method = 'POST' if(this.vid){ param.id = this.vid + param.get_idcard = 1 req = 'api/user/update_visitor' } - this.$http.req(req, param, method, true).then(data=>{ + this.$http.req(req, param, method).then(data=>{ + if(data == -1) return + clearTimeout(addtimer) this.adding = false if(this.vid){ @@ -92,14 +95,20 @@ }); }, getVisitorInfo() { - this.visitor_info = JSON.parse(uni.getStorageSync('visitor_info_'+ this.vid)) - this.name = this.visitor_info.name - this.idcard = this.visitor_info.idcard - this.phone = this.visitor_info.phone - this.nameRule = true - this.idcardExtRule = true - this.phoneRule = true - this.checkSubmit() + var param = new Object() + param.vid = this.vid + + this.$http.req('api/user/get_modify_visitor', param, 'POST').then(data=>{ + if(data == -1) return + this.name = data.name + this.idcard = data.idcard + this.phone = data.phone + this.nameRule = true + this.idcardExtRule = true + this.phoneRule = true + this.checkSubmit() + }); + }, nameBlurEvent(value, res){ this.name = value diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue index d5af056..0e5ae4e 100644 --- a/pages/visit_detail/visit_detail.vue +++ b/pages/visit_detail/visit_detail.vue @@ -8,14 +8,14 @@ - + 治疗记录 - + 就诊提醒 @@ -140,7 +140,7 @@ uni.showToast({ title:"修改成功", mask:true, - image:that.cssUrl+'gou.svg', + image:'/static/images/gou.svg', times:false, duration: 1500, success() { @@ -187,7 +187,7 @@ uni.showToast({ title:"取消预约成功", mask:true, - image:that.cssUrl+'gou.svg', + image:'/static/images/gou.svg', times:false, duration: 1500, success() { diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue index 040a0f8..65becda 100644 --- a/pages/visitors_new/visitors_new.vue +++ b/pages/visitors_new/visitors_new.vue @@ -2,11 +2,14 @@ - - - + + + + + + @@ -32,10 +35,27 @@ visitorList, visitorAccount }, - onReady() { + onShow() { this.pageInit() }, methods: { + modifyVisitor(e) { + var visitor = e.currentTarget.dataset.item + + var is_jump = true + if(visitor.h_list && visitor.h_list.length > 0) { + is_jump = false + if(e.detail.y < 291){ + is_jump = true + } + } + if(!is_jump) return + uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor)) + this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id) + }, + stopModifyVisitor(e) { + console.log(e) + }, closeCollapse() { this.isOpen = false }, @@ -78,6 +98,11 @@ .visitor-account{ margin-top: 28rpx; } + .empty { + .visitor-account{ + margin-top: 0rpx; + } + } ::v-deep { .uni-card{ diff --git a/pages/waiting_method/waiting_method.vue b/pages/waiting_method/waiting_method.vue index 51edc35..0ef50a2 100644 --- a/pages/waiting_method/waiting_method.vue +++ b/pages/waiting_method/waiting_method.vue @@ -6,6 +6,7 @@ + 确认候诊方式 @@ -111,17 +112,21 @@ box-sizing: border-box; width: 100%; height: 116rpx; - margin-bottom: 20rpx; background: white; - display: flex; align-items: center; font-size: 32rpx; color: #000000; + margin-bottom: 20rpx; } .title-wrap{ width: 100%; height: 100rpx; } + .pagebt{ + height: 20vh; + width: 100%; + } + .submit{ position: fixed; width: 100%;