diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue index 798d49e..2ab8d26 100644 --- a/pages/book_detail/book_detail.vue +++ b/pages/book_detail/book_detail.vue @@ -63,7 +63,6 @@ {'leftTitle':'就诊时间','custom':"",show:true,edit:false} ], showCancelBook:false, - redirect:'/pages/prebook_list/prebook_list', bookId:false, depart_id:false, bookInfo:false, @@ -150,7 +149,6 @@ } var bookInfo = data - bookInfo = data this.bookInfo = bookInfo this.status = this.statusStyleList[bookInfo.status] if(bookInfo.status==0 || bookInfo.status==2){ @@ -159,10 +157,7 @@ this.showCancelBook = false } this.list[0].custom = ""+bookInfo.status_desc+"" - - this.list[1].custom = "2诊室13床" - this.list[2].rightTitle = bookInfo.name this.list[3].rightTitle = bookInfo.hospital_name this.list[4].rightTitle = bookInfo.depart_name diff --git a/pages/index/index.vue b/pages/index/index.vue index 04dde1c..a49a068 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -24,7 +24,6 @@ - {{doctorInfo.doctor_info.doctor_detail}} @@ -42,20 +41,10 @@ - {{item.hospital_name}} - - - - - - - + {{item.hospital_name}} - {{item.address}} - - @@ -65,11 +54,6 @@ 导航 - - @@ -138,13 +122,13 @@ }, onLoad(option) { // define('DEPART_TYPE_FULL', 0); // 全功能 - // define('DEPART_TYPE_COUNT', 1); // 仅计数 - // define('DEPART_TYPE_CARD', 2); // 仅名片 - // $GLOBALS['depart_type_list'] = array( - // DEPART_TYPE_FULL => '全功能', - // DEPART_TYPE_COUNT => '仅计数', - // DEPART_TYPE_CARD => '仅名片' - // ); + // define('DEPART_TYPE_COUNT', 1); // 仅计数 + // define('DEPART_TYPE_CARD', 2); // 仅名片 + // $GLOBALS['depart_type_list'] = array( + // DEPART_TYPE_FULL => '全功能', + // DEPART_TYPE_COUNT => '仅计数', + // DEPART_TYPE_CARD => '仅名片' + // ); if(option.code && option.state) { this.code = option.code this.state = option.state @@ -161,7 +145,6 @@ }) var token = this.$token.getToken() if(this.code && this.state && !token) { - var rebackPagePath = uni.getStorageSync('rebackPagePath') this.login() return } @@ -180,10 +163,34 @@ var baiduLngLat = that.qqMapTransBMap(lng, lat) var mapList = [ 'http://apis.map.qq.com/uri/v1/marker?marker=coord:'+ lat+','+lng+';addr:'+hospital.hospital_name, + // 'http://apis.map.qq.com/uri/v1/marker?marker=coord:'+ lat+','+lng+';title:'+hospital.hospital_name+ 'addr:'+hospital.address, // new 有title 'http://api.map.baidu.com/marker?location='+baiduLngLat.lat+','+baiduLngLat.lng+'&title='+hospital.hospital_name+'&content=即将前往目的地&output=html&src=webapp.baidu.openAPIdemo', 'https://m.amap.com/share/index/lnglat='+hospital.hospital_pos+'&name='+hospital.hospital_name+'&src=uriapi&innersrc=uriapi', ] - this.$nav.navToPath(mapList[res.tapIndex]) + // location.href(mapList[res.tapIndex]) + // 判断是否在小程序环境 + if (typeof wx !== 'undefined' && wx.openLocation) { + // 小程序环境 + // 跳不过去?? lat?问题? + // wx.openLocation({ + // latitude: lat, + // longitude: lng, + // name: hospital.hospital_name || '目的地', + // address: hospital.address || '', + // scale: 18 + // }); + wx.openLocation({ + latitude: baiduLngLat.lat, + longitude: baiduLngLat.lng, + name: hospital.hospital_name || '目的地', + address: hospital.address || '', + scale: 18 + }); + } + // 判断是否微信浏览器 + else if (/MicroMessenger/i.test(navigator.userAgent)) { + location.href = mapList[res.tapIndex]; + } }, fail: function (res) { } @@ -201,7 +208,6 @@ console.log(e); }, setLoginUserInfo(info) { - var uinfo = new Object(); this.$setuinfo.setUinfo(JSON.stringify(info)) }, login() { @@ -245,7 +251,6 @@ this.doctorInfo.doctor_info.depart_name = this.doctor_dept; for (var index = 0; index < this.hospitals.length; index++) { - var element = this.hospitals[index]; this.collapseValue[index] = [] } }else{ diff --git a/pages/waiting_method/waiting_method.vue b/pages/waiting_method/waiting_method.vue index 07974bc..7f42f83 100644 --- a/pages/waiting_method/waiting_method.vue +++ b/pages/waiting_method/waiting_method.vue @@ -49,8 +49,6 @@ return } }, - onReady() { - }, methods: { getVisitors() {