From 06b0e6254f472cf9e2d19199361fcf1ad76d31dd Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 22 Mar 2024 16:10:22 +0800 Subject: [PATCH] =?UTF-8?q?3.22=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TUICallKit/TUICallKit/TUICallKit.js | 9 +- .../component/SingleCall/SingleCall.js | 14 +-- .../TUICallService/serve/callManager.js | 4 + TUICallKit/pages/globalCall/globalCall.js | 4 + TUIService/TUIKit/components/TUIChat/index.js | 6 +- app.js | 18 ++-- app.json | 3 +- components/consultList/consultList.js | 8 +- pages/expertDetail/expertDetail.js | 86 +++++++++++++++++++ pages/expertDetail/expertDetail.json | 6 ++ pages/expertDetail/expertDetail.wxml | 1 + pages/expertDetail/expertDetail.wxss | 1 + patient/pages/expertConsult/expertConsult.js | 4 +- patient/pages/expertDetail/expertDetail.js | 56 +++++++++--- patient/pages/expertDetail/expertDetail.wxml | 62 +++++++------ patient/pages/expertDetail/expertDetail.wxss | 16 ++-- .../medinceOrderDetail/medinceOrderDetail.js | 7 +- patient/pages/payInfo/payInfo.js | 2 +- patient/pages/sysMsgList/sysMsgList.js | 12 +-- patient/pages/videoList/videoList.js | 4 +- patient/pages/videoList/videoList.wxml | 12 +-- .../checkOrderDetail/checkOrderDetail.js | 8 +- .../pages/sugarSickInfo/sugarSickInfo.js | 6 +- 23 files changed, 256 insertions(+), 93 deletions(-) create mode 100644 pages/expertDetail/expertDetail.js create mode 100644 pages/expertDetail/expertDetail.json create mode 100644 pages/expertDetail/expertDetail.wxml create mode 100644 pages/expertDetail/expertDetail.wxss diff --git a/TUICallKit/TUICallKit/TUICallKit.js b/TUICallKit/TUICallKit/TUICallKit.js index e814148..8c3910a 100644 --- a/TUICallKit/TUICallKit/TUICallKit.js +++ b/TUICallKit/TUICallKit/TUICallKit.js @@ -1,5 +1,6 @@ -import { TUIStore, StoreName, NAME } from "../index"; -import { TUICallKitServer } from "../TUICallService/index"; + +import { TUICallKitServer,TUIStore, StoreName, NAME } from "../index"; + const { CALL_STATUS, CALL_ROLE, @@ -44,12 +45,15 @@ Component({ }); if(value=="calling"){ TUICallKitServer.setLogLevel(0); + console.log("呼叫者userId："+this.data.callerUserInfo.userId) if(this.data.callerUserInfo.userId){ let chat=TUICallKitServer.getTim(); let promise=chat.getUserProfile({ userIDList: [this.data.callerUserInfo.userId] }); promise.then((imResponse)=> { + console.log("呼叫者信息："); + console.log(imResponse.data[0]) this.setData({ doctorInfo:imResponse.data[0] }) @@ -196,6 +200,7 @@ Component({ }, async detached() { let that = this; + TUICallKitServer.getTUICallEngineInstance().handleExceptionExit(); TUIStore.unwatch(StoreName.CALL, { [CALL_STATUS]: this.handleCallStatusChange.bind(that), [IS_GROUP]: this.handleIsGroupChange.bind(that), diff --git a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js index 10282cb..7b07653 100644 --- a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js +++ b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js @@ -49,18 +49,20 @@ Component({ moved(){ //console.log('moved') }, - detached(){ + async detached(){ + //await TUICallKitServer.enableFloatWindow(true); //console.log('detached') - this.reject(); - this.hangup() + // this.reject(); + // this.hangup() } }, pageLifetimes: { show() { - + //TUICallKitServer.enableFloatWindow(true); }, hide() { - this.hangup() + // this.reject(); + // this.hangup() }, }, @@ -85,9 +87,11 @@ Component({ await TUICallKitServer.accept(); }), async hangup() { + console.log("hangup") await TUICallKitServer.hangup(); }, async reject() { + console.log("reject") await TUICallKitServer.reject(); }, async switchCamera() { diff --git a/TUICallKit/TUICallService/serve/callManager.js b/TUICallKit/TUICallService/serve/callManager.js index 2d2b3ff..0fb1c15 100644 --- a/TUICallKit/TUICallService/serve/callManager.js +++ b/TUICallKit/TUICallService/serve/callManager.js @@ -87,6 +87,7 @@ class CallManager { }); } _handleCallStatusToCalling() { + console.log('_isPageRedirected:'+this._isPageRedirected); if (this._isPageRedirected) return; this._targetPagePath = this.getRoute().route; @@ -103,6 +104,7 @@ class CallManager { }); } _handleCallStatusToIdle() { + console.log('idle__isPageRedirected:'+this._isPageRedirected); if (!this._isPageRedirected) return; if (this._targetPagePath === this.getRoute().route) { @@ -115,6 +117,8 @@ class CallManager { this._isPageRedirected = false; }, fail: () => { + // this._isPageRedirected = false; + //wx.navigateBack(); console.error(`${PREFIX} navigateBack fail!`); }, complete: () => { }, diff --git a/TUICallKit/pages/globalCall/globalCall.js b/TUICallKit/pages/globalCall/globalCall.js index 6bcdc3f..d20aaf2 100644 --- a/TUICallKit/pages/globalCall/globalCall.js +++ b/TUICallKit/pages/globalCall/globalCall.js @@ -1,4 +1,8 @@ +//import { TUICallKitServer } from "../../TUICallService/index"; Page({ data: {}, onShow() {}, + onHide(){ + //TUICallKitServer.getTUICallEngineInstance().handleExceptionExit(); + } }); diff --git a/TUIService/TUIKit/components/TUIChat/index.js b/TUIService/TUIKit/components/TUIChat/index.js index feb6847..d90599b 100644 --- a/TUIService/TUIKit/components/TUIChat/index.js +++ b/TUIService/TUIKit/components/TUIChat/index.js @@ -477,9 +477,11 @@ Component({ let message=''; if(data.inquiry_type==4 || data.inquiry_type==2){ message=`医生接诊后${duration}${number}沟通。超过5分钟未接诊，平台会在1个工作日内全额退还费用，如使用优惠劵，一并退回。` - }else if(data.inquiry_type==1 || data.inquiry_type==3){ + }else if((data.inquiry_type==1 && data.inquiry_mode!=2) || data.inquiry_type==3){ message=`医生接诊后${duration}${number}沟通。医生超过24小时未接诊，平台会在1个工作日内全额退还费用，如使用优惠劵，一并退回` - } + }else if(data.inquiry_type==1 && data.inquiry_mode==2){ + message=` 医生会在24小时内接诊，接诊后24小时内，可以和医生按沟通时间进行视频问诊，同时可进行图文、语音沟通且无回合限制。医生超过24小时未接诊，平台会在24小时后全额退还费用，如使用优惠劵，一并退回。` + }; this.setData({ message:message }) diff --git a/app.js b/app.js index 0a4d61f..a7b0239 100644 --- a/app.js +++ b/app.js @@ -3,6 +3,7 @@ import TIM from './miniprogram_npm/tim-wx-sdk/index' import TIMUploadPlugin from './miniprogram_npm/tim-upload-plugin/index' import {lastSysMsg} from "/api/msg" + import { imSign } from "./api/common" @@ -17,11 +18,7 @@ import { } from "./utils/config" const myconfig = hostConfig(); -require.async('./TUICallKit/TUICallService/serve/callManager').then(res => { - wx.callManager = new res.CallManager(); - }).catch(({mod, errMsg}) => { - console.error(`path: ${mod}, ${errMsg}`) - }) + // require.async('./TUICallKit/TUICallService/index').then(res => { // wx.TUICallKitServer = res.TUICallKitServer; // }).catch(({mod, errMsg}) => { @@ -99,19 +96,22 @@ App({ wx.$TUIKit.login({ userID: wx.getStorageSync('USER_ID'), userSig: data - }).then(async res => { + }).then(async (res) => { console.log("登录成功"); wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady); console.log('userSig:'+data) - await wx.callManager.init({ + await require.async('./TUICallKit/TUICallService/serve/callManager').then(res => { + wx.callManager = new res.CallManager(); + }).catch(({mod, errMsg}) => { + console.error(`path: ${mod}, ${errMsg}`) + }) + await wx.callManager.init({ sdkAppID: Number(this.globalData.config.SDKAPPID), // 请填入 sdkAppID userID: wx.getStorageSync('USER_ID'), // 请填入 userID userSig: data, // 请填入 userSig globalCallPagePath: "TUICallKit/pages/globalCall/globalCall", tim: wx.$TUIKit }) - - // wx.callManager callback(); }).catch(function (imError) { console.warn('login error:', imError); // 登录失败的相关信息 diff --git a/app.json b/app.json index 6ba862e..4fad8ed 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,8 @@ "pages": [ "pages/index/index", "pages/message/message", - "pages/my/my" + "pages/my/my", + "pages/expertDetail/expertDetail" ], "subPackages": [ { diff --git a/components/consultList/consultList.js b/components/consultList/consultList.js index f2fe8a4..1f72679 100644 --- a/components/consultList/consultList.js +++ b/components/consultList/consultList.js @@ -43,22 +43,22 @@ Component({ methods: { goFree:throttle(function(){ app.method.navigateTo({ - url: '/pages/expertConsult/expertConsult?type=free', + url: '/patient/pages/expertConsult/expertConsult?type=free', }) }), goQuick:throttle(function(){ app.method.navigateTo({ - url: '/pages/quickConsult/quickConsult' + url: '/patient/pages/quickConsult/quickConsult' }) }), goExpert:throttle(function(){ app.method.navigateTo({ - url: '/pages/expertConsult/expertConsult' + url: '/patient/pages/expertConsult/expertConsult' }) }), goBuyMedince:throttle(function(){ app.method.navigateTo({ - url: '/pages/quickConsult/quickConsult?inquiry_type=4' + url: '/patient/pages/quickConsult/quickConsult?inquiry_type=4' }) }), getPrice(){ diff --git a/pages/expertDetail/expertDetail.js b/pages/expertDetail/expertDetail.js new file mode 100644 index 0000000..a480b11 --- /dev/null +++ b/pages/expertDetail/expertDetail.js @@ -0,0 +1,86 @@ +// pages/expertDetail/expertDetail.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.showLoading({ + title: '加载中', + mask:true, + }); + const scene = options.scene?decodeURIComponent(options.scene):''; + let doctor_id=''; + if(scene){ + doctor_id=scene.split('=')[1] + }else{ + doctor_id=options.doctor_id + }; + console.log(options) + this.setData({ + doctor_id:doctor_id + }) + wx.redirectTo({ + url: '/patient/pages/expertDetail/expertDetail?doctor_id='+doctor_id, + complete:function(){ + wx.hideLoading(); + } + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/expertDetail/expertDetail.json b/pages/expertDetail/expertDetail.json new file mode 100644 index 0000000..26bdbc5 --- /dev/null +++ b/pages/expertDetail/expertDetail.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + + }, + "navigationStyle":"custom" +} \ No newline at end of file diff --git a/pages/expertDetail/expertDetail.wxml b/pages/expertDetail/expertDetail.wxml new file mode 100644 index 0000000..cb112ec --- /dev/null +++ b/pages/expertDetail/expertDetail.wxml @@ -0,0 +1 @@ + diff --git a/pages/expertDetail/expertDetail.wxss b/pages/expertDetail/expertDetail.wxss new file mode 100644 index 0000000..325450f --- /dev/null +++ b/pages/expertDetail/expertDetail.wxss @@ -0,0 +1 @@ +/* pages/expertDetail/expertDetail.wxss */ \ No newline at end of file diff --git a/patient/pages/expertConsult/expertConsult.js b/patient/pages/expertConsult/expertConsult.js index 4382d4f..9d52113 100644 --- a/patient/pages/expertConsult/expertConsult.js +++ b/patient/pages/expertConsult/expertConsult.js @@ -22,8 +22,8 @@ Page({ lock:false, is_online:0, sort_order:1, - inquiry_type:0, - inquiry_mode:0, + inquiry_type:1, + inquiry_mode:'1,2,6', navName:"专家问诊", scrollHeight:300, sickList:[], diff --git a/patient/pages/expertDetail/expertDetail.js b/patient/pages/expertDetail/expertDetail.js index b6e58af..8d8ac3a 100644 --- a/patient/pages/expertDetail/expertDetail.js +++ b/patient/pages/expertDetail/expertDetail.js @@ -58,19 +58,24 @@ Page({ freePrice:'', freeAmount:0, expertAmount:0, + hasFree:false, + hasExpert:false, recieveStatus:0, commentList: [], hasVideoList:false, + totalComment:0, isFinished:false, isReceivePatient:false, //是否可接诊 service_content:'【医生填写的服务内容】', - service_process:'【医生填写的服务流程】' + service_process:'【医生填写的服务流程】', + cycle:'', + rounds:'' }, getHeight(){ wx.createSelectorQuery().select('#swiperitem3').boundingClientRect( (rect)=>{ this.setData({ - tab3Height:rect.height*2 + tab3Height:(rect.height) }) console.log('元素高度为：', rect.height) }).exec() @@ -253,7 +258,7 @@ bindchange(e){ } //如果公益问诊 次数为0 则去看是否有专家问诊 if(type==3 && recieveStatus==0){ - console.log('222222222222221'); + for (let i = 0; i < arr.length; i++) { if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==1 && arr[i].is_enable==1){ order_type=1; @@ -288,13 +293,22 @@ bindchange(e){ hasOtherInquiry(arr){ if(arr){ for (var i = 0; i < arr.length; ++i) { + if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==1){ + if(arr[i].is_enable==1){ + this.setData({ + hasExpert:true + }) + }; + this.setData({ + expertAmount:arr[i].work_num_day-arr[i].order_inquiry_count + }) + } if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){ if(arr[i].is_enable==1){ this.setData({ canVideo:true }) }; - console.log('videoPrice:'+arr[i].inquiry_price) this.setData({ videoPrice:arr[i].inquiry_price }) @@ -302,10 +316,13 @@ bindchange(e){ if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){ if(arr[i].is_enable==1){ this.setData({ - canDiffcult:true + canDiffcult:true, + }) } this.setData({ + rounds: arr[i].times_number, + cycle:arr[i].duration, yinanPrice:arr[i].inquiry_price }) } @@ -320,9 +337,13 @@ bindchange(e){ for (var i = 0; i < arr.length; ++i) { if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==1){ if(arr[i].is_enable==1 ){ + this.setData({ + hasExpert:true + }) a='2'; } this.setData({ + expertAmount:arr[i].work_num_day-arr[i].order_inquiry_count, expertInquiry_price: arr[i].inquiry_price }) @@ -334,9 +355,10 @@ bindchange(e){ }) } this.setData({ - yinanPrice: arr[i].inquiry_price - }) - + yinanPrice: arr[i].inquiry_price, + rounds: arr[i].times_number, + cycle:arr[i].duration + }) }; if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){ if(arr[i].is_enable==1){ @@ -352,19 +374,26 @@ bindchange(e){ if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){ if(arr[i].is_enable==1 ){ this.setData({ - canDiffcult:true + canDiffcult:true, + }) } console.log(' yinanPrice:'+arr[i].inquiry_price) this.setData({ - yinanPrice:arr[i].inquiry_price + yinanPrice:arr[i].inquiry_price, + rounds: arr[i].times_number, + cycle:arr[i].duration }) } if(arr[i].inquiry_type==3){ this.setData({ - freePrice:arr[i].inquiry_price + freePrice:arr[i].inquiry_price, + freeAmount:arr[i].work_num_day-arr[i].order_inquiry_count, }) if(arr[i].is_enable==1){ + this.setData({ + hasFree:true + }) return '1' } @@ -372,7 +401,6 @@ bindchange(e){ } } - console.log('a:'+a) return a }, getDeatil(id) { @@ -442,9 +470,9 @@ bindchange(e){ break; } } - wx.nextTick(()=>{ + setTimeout(()=>{ this.getHeight() - }) + },800) if(this.data.canTuwen){ this.setData({ diff --git a/patient/pages/expertDetail/expertDetail.wxml b/patient/pages/expertDetail/expertDetail.wxml index bb75930..becd26b 100644 --- a/patient/pages/expertDetail/expertDetail.wxml +++ b/patient/pages/expertDetail/expertDetail.wxml @@ -82,13 +82,25 @@ 图文问诊 - ￥{{current_inquiry_config.inquiry_price}}/次 - ￥{{expertInquiry_price}}/次 + + ￥{{expertInquiry_price}}/次 + + + ￥{{freePrice}}/次 + + + ￥{{freePrice}}/次 + ￥{{expertInquiry_price}}/次 + ￥{{freePrice}}/次 + ￥{{expertInquiry_price}}/次 + + 图文问诊 ￥{{expertInquiry_price}}/次 - + 暂未开通 @@ -122,7 +134,7 @@ - + @@ -132,19 +144,19 @@ 通过文字、图片、语音进行咨询 - + 可通过文字、图片、语音等形式和医生进行沟通； - + 医生接诊后24小时内10个沟通回合； - + 医生未接诊，平台24小时内自动退款； - + 医生未回复，可联系平台客服协商进行退款。 @@ -159,35 +171,35 @@ 通过视频面对面进行咨询 - + 医生接诊后，主动和就诊人预约视频时间； - - + + 若预约时间因故需要改变，可与医生图文协商时间； - + 视频交流服务时长一般为5-10分钟； - + 医生接诊后48小时内可以通过文字、图片、语音等形式和医生不限制沟通回合数； - + 医生未接诊，平台24小时内自动退款； - + 医生未回复或未进行视频，可联系平台客服协商进行退款； - + 如因您个人原因（忘记时间、迟到、中途断开未在进入视频等情况），咨询费用可能将无法退回，请准时接收医生视频请求； - + 视频不支持回放。 @@ -202,27 +214,29 @@ 通过文字、图片、语音进行咨询 - + {{service_content}}； - + {{service_process}}； - + 可通过文字、图片、语音等形式和医生进行沟通； - - 医生接诊后【医生选择的服务周期】内【医生选择的服务次数】沟通回合； + + 医生接诊后{{cycle}}天内{{(rounds!='' && rounds==0)?'不限':rounds+"个"}}沟通回合； + + 医生接诊后{{cycle?cycle+'天':'【医生选择的服务周期】'}}内{{(rounds==='0' )?'不限':(rounds && rounds!==0)?rounds+"个":'【医生选择的服务次数】'}}沟通回合； - + 医生未接诊，平台24小时内自动退款； - + 医生未回复或医生服务不满意，可联系平台客服协商进行退款。 diff --git a/patient/pages/expertDetail/expertDetail.wxss b/patient/pages/expertDetail/expertDetail.wxss index c5e3b81..37d648f 100644 --- a/patient/pages/expertDetail/expertDetail.wxss +++ b/patient/pages/expertDetail/expertDetail.wxss @@ -604,18 +604,22 @@ border-radius: 50%; white-space: pre-wrap; color: rgba(0,0,0,0.65); } -.swiperbox .swiper-item:nth-child(1) .circle{ - background: #52C41A; -} -.swiperbox .swiper-item:last-child .circle{ - background: #FF9C00; -} + .tipbox.active .tipmsg .msg{ color: rgba(0,0,0,0.35); } .swiperbox .tipbox.active .circle{ background-color: rgba(0,0,0,0.35); } +.tipbox .tipmsg .circle.tuwen{ + background: #3BB5FE; + } + .tipbox .tipmsg .circle.video{ + background: #52C41A; +} +.tipbox .tipmsg .circle.yinan{ + background: #FF9C00; +} .itembg{ height:100%; width:100%; diff --git a/patient/pages/medinceOrderDetail/medinceOrderDetail.js b/patient/pages/medinceOrderDetail/medinceOrderDetail.js index 9a78b3e..5151c8f 100644 --- a/patient/pages/medinceOrderDetail/medinceOrderDetail.js +++ b/patient/pages/medinceOrderDetail/medinceOrderDetail.js @@ -22,6 +22,7 @@ Page({ }, goBack(){ let {fromType}=this.data; + console.log(fromType); if(app.globalData.origion==1){ wx.reLaunch({ url: '/pages/index/index', @@ -66,13 +67,13 @@ Page({ goExpress:throttle(function(event){ let id=event.currentTarget.dataset.id; app.method.navigateTo({ - url: '/pages/expressDetail/expressDetail?logistics_no='+id, + url: '/patient/pages/expressDetail/expressDetail?logistics_no='+id, }) }), goExpert:throttle(function(){ let id=this.data.user_doctor.doctor_id; app.method.navigateTo({ - url: '/pages/expertDetail/expertDetail?doctor_id='+id, + url: '/patient/pages/expertDetail/expertDetail?doctor_id='+id, }) }), handleProductDetail(flag=false){ @@ -137,7 +138,7 @@ copy(event){ goPay:throttle(function(){ let {order_product_id,order_product_no}=this.data.order_product; app.method.navigateTo({ - url: '/patient/pages/payOrder/payOrder?inquiry_no='+ order_product_no +"&order_product_id="+order_product_id+"&order_type=2&fromType="+encodeURIComponent('pages/medinceOrder/medinceOrder') + url: '/patient/pages/payOrder/payOrder?inquiry_no='+ order_product_no +"&order_product_id="+order_product_id+"&order_type=2&fromType="+encodeURIComponent('patient/pages/medinceOrder/medinceOrder') }) }), handelDelProduct(){ diff --git a/patient/pages/payInfo/payInfo.js b/patient/pages/payInfo/payInfo.js index 88635c5..ac16988 100644 --- a/patient/pages/payInfo/payInfo.js +++ b/patient/pages/payInfo/payInfo.js @@ -62,7 +62,7 @@ Page({ btnLock:false }); this.setData({ - fromType:encodeURIComponent('pages/medinceOrder/medinceOrder') + fromType:encodeURIComponent('patient/pages/medinceOrder/medinceOrder') }) // if(fromType){ // this.setData({ diff --git a/patient/pages/sysMsgList/sysMsgList.js b/patient/pages/sysMsgList/sysMsgList.js index 3c2d0cc..2276e30 100644 --- a/patient/pages/sysMsgList/sysMsgList.js +++ b/patient/pages/sysMsgList/sysMsgList.js @@ -81,17 +81,17 @@ Page({ if(link_type==1){ url= '/TUIService/pages/index?currentConversationID='+link_params.doctor_user_id+'&order_inquiry_id='+link_params.order_inquiry_id+'&inquiry_type='+link_params.inquiry_type; }else if(link_type==7){ - url='/pages/myWelfare/myWelfare' + url='/patient/pages/myWelfare/myWelfare' }else if(link_type==8){ - url='/pages/medinceOrder/medinceOrder' + url='/patient/pages/medinceOrder/medinceOrder' }else if(link_type==9){ - url='/pages/medinceOrder/medinceOrder' + url='/patient/pages/medinceOrder/medinceOrder' }else if(link_type==10){ - url='/pages/orderDetail/orderDetail?order_inquiry_id='+link_params.order_inquiry_id + url='/patient/pages/orderDetail/orderDetail?order_inquiry_id='+link_params.order_inquiry_id }else if(link_type==12){ }else if(link_type==13){ - url='/pages/prescriptDetail/prescriptDetail?order_prescription_id='+link_params.order_prescription_id + url='/patient/pages/prescriptDetail/prescriptDetail?order_prescription_id='+link_params.order_prescription_id }; app.method.navigateTo({ url: url, @@ -99,7 +99,7 @@ Page({ }, goMishu(){ app.method.navigateTo({ - url: '/pages/gandansecretary/gandansecretary', + url: '/patient/pages/gandansecretary/gandansecretary', }) }, /** diff --git a/patient/pages/videoList/videoList.js b/patient/pages/videoList/videoList.js index 6a42239..18fe013 100644 --- a/patient/pages/videoList/videoList.js +++ b/patient/pages/videoList/videoList.js @@ -75,7 +75,9 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.setData({ + img_host:app.hostConfig().imghost + }); }, /** diff --git a/patient/pages/videoList/videoList.wxml b/patient/pages/videoList/videoList.wxml index 8860f0d..2cab4d0 100644 --- a/patient/pages/videoList/videoList.wxml +++ b/patient/pages/videoList/videoList.wxml @@ -23,12 +23,12 @@ {{item.doctor_title_name}}{{item.department_custom_name}} {{item.hospital.hospital_name}} 擅长：{{item.be_good_at}} - - + {{cell.expertise_name}} + + 评分: {{item.praise_rate}} 暂无 + 问诊量: {{item.served_patients_num}}暂无 + 平均回复: {{moduleFilter.formatReply(item.avg_response_time)}}h暂无 + 图文问诊：￥{{itemName.inquiry_price}} diff --git a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js index 6c78abe..7e791f6 100644 --- a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js +++ b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js @@ -372,13 +372,13 @@ Page({ }, goSugar:throttle(function(){ app.method.navigateTo({ - url: '/pages/sugarDetail/sugarDetail', + url: '/sugarCheck/pages/sugarDetail/sugarDetail', }) }), goExpert:throttle(function(){ let id=this.data.user_doctor.doctor_id; app.method.navigateTo({ - url: '/pages/expertDetail/expertDetail?doctor_id='+id, + url: '/patient/pages/expertDetail/expertDetail?doctor_id='+id, }) }), handleDetectionDetail(flag=false){ @@ -508,7 +508,7 @@ copy(event){ goPay:throttle(function(){ let {order_detection_id,detection_no}=this.data.order; app.method.navigateTo({ - url: '/pages/payOrder/payOrder?inquiry_no='+ detection_no +"&order_detection_id="+order_detection_id+"&order_type=3&fromType="+encodeURIComponent('/sugarCheck/pages/checkOrder/checkOrder') + url: '/patient/pages/payOrder/payOrder?inquiry_no='+ detection_no +"&order_detection_id="+order_detection_id+"&order_type=3&fromType="+encodeURIComponent('/sugarCheck/pages/checkOrder/checkOrder') }) }), handelDelProduct(){ @@ -533,7 +533,7 @@ handelDelProduct(){ goPrescriptionDetail:throttle(function(event){ let id=event.currentTarget.dataset.id; app.method.navigateTo({ - url: '/pages/prescriptDetail/prescriptDetail?order_prescription_id='+id, + url: '/patient/pages/prescriptDetail/prescriptDetail?order_prescription_id='+id, }) }), handelfllowDoctor(){ diff --git a/sugarCheck/pages/sugarSickInfo/sugarSickInfo.js b/sugarCheck/pages/sugarSickInfo/sugarSickInfo.js index fd1be7d..b752b18 100644 --- a/sugarCheck/pages/sugarSickInfo/sugarSickInfo.js +++ b/sugarCheck/pages/sugarSickInfo/sugarSickInfo.js @@ -114,7 +114,7 @@ Page({ if(this.data.messageTitle=="当前患者存在进行中检测订单"){ let {order_detection_id}=this.data; app.method.navigateTo({ - url: '/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+ order_detection_id, + url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+ order_detection_id, }) } }, @@ -178,7 +178,7 @@ Page({ goAgree(){ let {detection_project_id}=this.data; app.method.navigateTo({ - url:'/pages/agreement/agreement?detection_project_id='+detection_project_id + url:'/patient/pages/agreement/agreement?detection_project_id='+detection_project_id }) }, handelGetProject(){ @@ -304,7 +304,7 @@ Page({ }).then(data=>{ if(data.status==1){ app.method.navigateTo({ - url: '/pages/payOrder/payOrder?&inquiry_no=' + data.data.inquiry_no + "&order_detection_id="+ data.data.order_no+"&order_type=3&fromType="+encodeURIComponent('pages/checkOrder/checkOrder') + url: '/patient/pages/payOrder/payOrder?&inquiry_no=' + data.data.inquiry_no + "&order_detection_id="+ data.data.order_no+"&order_type=3&fromType="+encodeURIComponent('sugarCheck/pages/checkOrder/checkOrder') }) }else if(data.status==2){ this.setData({