diff --git a/main.js b/main.js index a2ad206..329477d 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -// const NODE_ENV = 'development'; -const NODE_ENV = 'production'; +const NODE_ENV = 'development'; +// const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 4ff136f..4eba802 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -13,7 +13,7 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - + 首次 + + + + + + + + + + {{item.name}} + 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 + 首次 + + + + {{item.sex}}| {{ item.age }}岁 + |手机号:{{ item.phone }} + + + + + + + @@ -36,12 +61,14 @@ + 请先勾选就诊人,可多选 确认预约(已选{{selectCount}}位) + 请先勾选就诊人,可多选 确认以上患者已到(已选{{selectCount}}位) @@ -320,7 +347,7 @@ } this.$http.req('api/user/get_visitors', obj, 'POST').then(data=>{ - this.visitUsers = data; + this.visitUsers = data; if(this.visitUsers.length == 0 && !obj.get_preview) { this.addVisitor() return; @@ -385,7 +412,7 @@ uni.setStorageSync('active_visitors', JSON.stringify(this.activeVisitors)) // 确认报道 => 跳转候诊方式 - if((this.type == 0 || this.type == 1) && !this.is_preview){ + if((this.type == 0 || this.type == 1) && !this.is_preview){ uni.setStorageSync('methods_set_wait', 1) this.$nav.navToPath('/pages/waiting_method/waiting_method') return @@ -499,17 +526,28 @@ } &.active{ border: 2rpx solid #39D067; - .status{ - display: block; + .status:first-of-type{ + display: none !important; + } + .status:nth-of-type(2){ + display: block !important; } } .status{ - right: 0; - bottom: 0; - width: 98rpx; - height: 98rpx; + right: 24rpx; + bottom: 37rpx; + width: 36rpx; + height: 36rpx; + z-index: 2; + } + + .status:first-of-type{ + display: block; + } + .status:nth-of-type(2){ display: none; } + .bg{ bottom: 0; right: 0; @@ -587,6 +625,12 @@ color: #B3B4BC; margin-top: 33rpx; } + .choose-desc{ + font-size: 28rpx; + text-align: center; + color: #21B955; + margin-bottom: 19rpx; + } } .list-wrapper2{ .item{