From 56c645a75c1623ec07d5196b54a617e3e8aa4b98 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 6 Jan 2026 08:36:02 +0800 Subject: [PATCH] =?UTF-8?q?1.6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 + api/api.js | 12 + manifest.json | 7 +- pages.json | 265 +-- pages_app/buyPoint/buyPoint.vue | 65 +- pages_app/consult/consult.vue | 173 +- pages_app/consultDetail/consultDetail.vue | 1171 ++++++----- pages_app/freeDetail/freeDetail.vue | 17 +- pages_app/myAnswer/myAnswer.vue | 8 +- pages_app/myPoint/myPoint.vue | 2053 ++++++++++--------- pages_app/myWelfare/myWelfare.vue | 8 +- pages_app/patientInfo/patientInfo.vue | 147 +- pages_app/patientVideo/patientVideo.vue | 4 + pages_app/pay/pay.vue | 87 +- pages_app/pointMall/pointMall.vue | 1 + pages_app/ppt/ppt.vue | 74 +- pages_app/pptDetail/pptDetail.vue | 435 +++- pages_app/pptDownload/pptDownload.vue | 108 +- pages_app/replayList/replayList.vue | 4 + pages_app/video/video.vue | 16 +- pages_app/videoDetail/videoDetail.vue | 79 +- pages_app/webview/webview.vue | 701 ++++--- pages_app/zhinanDownload/zhinanDownload.vue | 4 +- pages_goods/coupon/coupon.vue | 30 +- pages_goods/exchange/address.vue | 9 +- pages_goods/exchange/address_list.vue | 5 +- pages_goods/exchange/index.vue | 7 +- pages_goods/myRedemption/myRedemption.vue | 13 +- pages_goods/pointMall/pointMall.vue | 924 +++++---- pages_goods/productDetail/productDetail.vue | 11 +- static/buy_points.png | Bin 0 -> 1346 bytes static/complete_question.png | Bin 0 -> 1312 bytes static/fulicard_bg.png | Bin 0 -> 22046 bytes static/integralticket.png | Bin 0 -> 1676 bytes static/myjifen_big.png | Bin 0 -> 89350 bytes static/point_shop.png | Bin 0 -> 2205 bytes static/sign_day_false.png | Bin 0 -> 1969 bytes static/word.png | Bin 0 -> 3596 bytes tsconfig.json | 10 + utils/docUrl.js | 1 - utils/request.js | 38 +- utils/version.js | 2 +- 42 files changed, 3902 insertions(+), 2595 deletions(-) create mode 100644 static/buy_points.png create mode 100644 static/complete_question.png create mode 100644 static/fulicard_bg.png create mode 100644 static/integralticket.png create mode 100644 static/myjifen_big.png create mode 100644 static/point_shop.png create mode 100644 static/sign_day_false.png create mode 100644 static/word.png diff --git a/App.vue b/App.vue index d85e9fd..92f0e3e 100644 --- a/App.vue +++ b/App.vue @@ -61,6 +61,14 @@ export default { }); } } + if(event.indexOf('paySuccess') > -1){ + console.log('app.vue监听到成功支付'); + if(data.type=='GandanFile'){ + uni.$emit('paySuccess',{ + type:'GandanFile', + }); + } + } }); // #endif } catch (error) { diff --git a/api/api.js b/api/api.js index 7897d04..5196122 100644 --- a/api/api.js +++ b/api/api.js @@ -599,6 +599,7 @@ const api = { getOrderStatus(data){ return request('/expertPay/getOrderStatus', data, 'post', false); }, + getOrderStatus(data){ return request('/expertPay/getOrderStatus', data, 'post', false); }, @@ -660,6 +661,17 @@ const api = { downloadGanDanFile(data){ return request('/expertAPI/downloadGanDanFile', data, 'post', false,'application/json',{},'arraybuffer'); }, + downloadGanDanFileV2(data){ + return request('/expertAPI/downloadGanDanFileV2', data, 'post', false); + }, + feedBack(data){ + return request('/expert/feedBack', data, 'post', false); + }, + getPointUnitPrice(data){ + return request('/expertApp/getPointUnitPrice', data, 'post', false); + }, + + } export default api \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8508173..cf5b387 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "肝胆相照专家版", "appid" : "__UNI__89F511F", "description" : "", - "versionName" : "4.1.5", - "versionCode" : 100, + "versionName" : "4.1.9", + "versionCode" :419, "transformPx" : false, "app-plus" : { /* 5+App特有相关 */ @@ -31,7 +31,8 @@ "VideoPlayer" : {}, "OAuth" : {}, "Barcode" : {}, - "Camera" : {} + "Camera" : {}, + "Payment" : {} }, /* 模块配置 */ "distribute" : { diff --git a/pages.json b/pages.json index 727b58e..4d13562 100644 --- a/pages.json +++ b/pages.json @@ -489,6 +489,57 @@ } } }, + { + "path": "buyPoint/buyPoint", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "myWelfare/myWelfare", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "myWelfareCard/myWelfareCard", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "myPoint/myPoint", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "积分", + "app": { + "bounce": "none" + } + } + }, + + { + "path": "pointGoods/pointGoods", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, { "path": "newsList/newsList", "style": { @@ -509,6 +560,16 @@ } } }, + { + "path": "patientInfo/patientInfo", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "患者信息", + "app": { + "bounce": "none" + } + } + }, { "path": "replayText/replayText", "style": { @@ -743,16 +804,7 @@ // } // }, - // { - // "path": "myWelfareCard/myWelfareCard", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "myWelfareCard/exchange", // "style": { @@ -773,27 +825,7 @@ // } // }, - // { - // "path": "buyPoint/buyPoint", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "pointGoods/pointGoods", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, // { // "path": "msg/msg", // "style": { @@ -804,16 +836,7 @@ // } // } // }, - // { - // "path": "myWelfare/myWelfare", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "caseRecord/caseRecord", @@ -1178,15 +1201,7 @@ // } // }, // { - // "path": "myPoint/myPoint", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "积分", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "feedback/feedback", // "style": { @@ -1221,83 +1236,83 @@ ] - } - // { - // "root": "pages_goods", - // "pages": [ - // { - // "path": "coupon/coupon", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "积分券", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "pointMall/pointMall", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "积分商城", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "myRedemption/myRedemption", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "我的兑换", - // "app": { - // "bounce": "none" - // } - // } - // }, + }, + { + "root": "pages_goods", + "pages": [ + { + "path": "coupon/coupon", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "积分券", + "app": { + "bounce": "none" + } + } + }, + { + "path": "pointMall/pointMall", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "积分商城", + "app": { + "bounce": "none" + } + } + }, + { + "path": "myRedemption/myRedemption", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "我的兑换", + "app": { + "bounce": "none" + } + } + }, - // { - // "path": "productDetail/productDetail", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "商品详情", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "exchange/index", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "在线兑换", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "exchange/address_list", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "地址管理", - // "app": { - // "bounce": "none" - // } - // } - // }, - // { - // "path": "exchange/address", - // "style": { - // "navigationStyle": "custom", - // "navigationBarTitleText": "收货地址", - // "app": { - // "bounce": "none" - // } - // } - // } - // ] - // }, + { + "path": "productDetail/productDetail", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "商品详情", + "app": { + "bounce": "none" + } + } + }, + { + "path": "exchange/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "在线兑换", + "app": { + "bounce": "none" + } + } + }, + { + "path": "exchange/address_list", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "地址管理", + "app": { + "bounce": "none" + } + } + }, + { + "path": "exchange/address", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "收货地址", + "app": { + "bounce": "none" + } + } + } + ] + } // { // "root": "pages_chat", // "pages": [ diff --git a/pages_app/buyPoint/buyPoint.vue b/pages_app/buyPoint/buyPoint.vue index 43e3681..badfe27 100644 --- a/pages_app/buyPoint/buyPoint.vue +++ b/pages_app/buyPoint/buyPoint.vue @@ -1,5 +1,5 @@ @@ -138,7 +160,7 @@ } .buy-point-page { - height: calc(100vh - 180rpx); + height: 100vh; background-color: $bg-color; overflow: hidden; // 隐藏滚动条 @@ -224,6 +246,7 @@ } .main-content { + margin-top: calc(var(--status-bar-height) + 44px); padding: 40rpx 0rpx; .page-title { diff --git a/pages_app/consult/consult.vue b/pages_app/consult/consult.vue index 97c53b4..aba37e2 100644 --- a/pages_app/consult/consult.vue +++ b/pages_app/consult/consult.vue @@ -4,6 +4,7 @@ 新的咨询 + 我已回答 @@ -20,14 +21,18 @@ > - {{ item.maskName }} + + {{ item.maskName }} + ({{item.sex==1?'女':'男' }} {{ calcAge(item.birthDate) }}岁) + {{ item.date }} - {{ item.content }} + {{ item.disease_describe }} - {{ item.answer_num }}位医生已回答 + {{ item.answer_num }}位医生已回答 + 暂未有医生回答 {{ item.tag }} @@ -52,7 +57,7 @@ diff --git a/pages_app/freeDetail/freeDetail.vue b/pages_app/freeDetail/freeDetail.vue index 76c02c9..405fa04 100644 --- a/pages_app/freeDetail/freeDetail.vue +++ b/pages_app/freeDetail/freeDetail.vue @@ -158,12 +158,17 @@ const countConsult=()=>{ } const answerConsult=async()=>{ if(hasAnswer.value){ - let userId=uni.getStorageSync('userInfo').uuid.toLowerCase(); - let conversationId=userId+'|1|'+patientUuid.value.toLowerCase(); - await uni.$UIKitStore.uiStore.selectConversation(conversationId) - navTo({ - url:'/pages_chat/chat/index?from=consult&patientUuid='+patientUuid.value - }) + uni.sendNativeEvent('goConsultPage', { + msg: 'chat' + },ret => { + console.log(ret); + }) + // let userId=uni.getStorageSync('userInfo').uuid.toLowerCase(); + // let conversationId=userId+'|1|'+patientUuid.value.toLowerCase(); + // await uni.$UIKitStore.uiStore.selectConversation(conversationId) + // navTo({ + // url:'/pages_chat/chat/index?from=consult&patientUuid='+patientUuid.value + // }) }else{ countConsult() } diff --git a/pages_app/myAnswer/myAnswer.vue b/pages_app/myAnswer/myAnswer.vue index bfb7578..3cbb0c9 100644 --- a/pages_app/myAnswer/myAnswer.vue +++ b/pages_app/myAnswer/myAnswer.vue @@ -117,7 +117,8 @@ const updateInterrogationAnswer=()=>{ imgsBean: imgobj }).then(res=>{ if(res.code == 200){ - uni.showToast({title: '提交成功', icon: 'none'}) + uni.showToast({title: '提交成功', icon: 'none'}); + uni.$emit('updateStatus',1) uni.navigateBack() } }) @@ -139,6 +140,7 @@ const addInterrogationAnswer=()=>{ imgsBean: imgobj }).then(res=>{ if(res.code == 200){ + uni.$emit('updateStatus',1) uni.showToast({title: '提交成功', icon: 'none'}) uni.navigateBack() } @@ -205,7 +207,7 @@ function submit(){ .content-scroll{ flex: 1; position: fixed; - top: 135rpx; + top: calc(var(--status-bar-height) + 44px); left: 0; right: 0; bottom: 160rpx; @@ -303,7 +305,7 @@ function submit(){ height: 88rpx; line-height: 88rpx; text-align: center; - background: #00bcd4; + background: #3cc7c0; color: #fff; font-size: 32rpx; border-radius: 16rpx; diff --git a/pages_app/myPoint/myPoint.vue b/pages_app/myPoint/myPoint.vue index 0990dfa..e4812cd 100644 --- a/pages_app/myPoint/myPoint.vue +++ b/pages_app/myPoint/myPoint.vue @@ -1,130 +1,140 @@ diff --git a/pages_app/myWelfare/myWelfare.vue b/pages_app/myWelfare/myWelfare.vue index 59e0068..a6ded58 100644 --- a/pages_app/myWelfare/myWelfare.vue +++ b/pages_app/myWelfare/myWelfare.vue @@ -1,5 +1,5 @@