From ebcf143a65cae060d19f74bb72a81f7a79b62c12 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 10:23:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/orderDetails/orderDetails.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pagesB/orderDetails/orderDetails.vue b/pagesB/orderDetails/orderDetails.vue index 505d818..725adde 100644 --- a/pagesB/orderDetails/orderDetails.vue +++ b/pagesB/orderDetails/orderDetails.vue @@ -161,12 +161,12 @@ goodsOrderId: null, patientId: '', openid: null, - orderType: 'HEALTH_CONSULTATION', - orderStatus: 'WAIT_PAY', - // orderTypeList: [ - // 'INTEGRAL_EXCHANGE', - // 'DIRECT_BUY', - // ], + // orderType: 'HEALTH_CONSULTATION', + // orderStatus: 'WAIT_PAY', + orderTypeList: [ + 'INTEGRAL_EXCHANGE',//商城 + 'DIRECT_BUY', + ], // orderStatus: '', pageSize: 15, pageNum: 1, From c405783f3e77fb93c25a9df77dd3469f3f39c87d Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 10:43:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/managefamily/managefamily.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pagesB/managefamily/managefamily.scss b/pagesB/managefamily/managefamily.scss index e3e8731..15e7ede 100644 --- a/pagesB/managefamily/managefamily.scss +++ b/pagesB/managefamily/managefamily.scss @@ -8,14 +8,12 @@ left: 50%; transform: translateX(-50%); text-align: center; - .text { margin-bottom: 12rpx; font-size: 20rpx; font-weight: 500; color: #26A888; } - .btn { font-size: 31rpx; width: 500rpx; @@ -31,6 +29,8 @@ .forlist { width: 100%; + height: 82vh; + overflow: auto; .item { border-radius: 10rpx; From a8f86d6ac021848e4f8d87e39dc2e2a740b7c277 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 10:53:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/CommodityOrder/CommodityOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pagesB/CommodityOrder/CommodityOrder.vue b/pagesB/CommodityOrder/CommodityOrder.vue index dd026df..dfd77f5 100644 --- a/pagesB/CommodityOrder/CommodityOrder.vue +++ b/pagesB/CommodityOrder/CommodityOrder.vue @@ -15,7 +15,7 @@ active-color='#26A888'> - 店铺名称 + {{item.orderTime}} 待付款 退款中 From 21e7835c7acaae7bb724dd2356db2fe276da5a8f Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 11:38:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/orderDetails/orderDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pagesB/orderDetails/orderDetails.vue b/pagesB/orderDetails/orderDetails.vue index 725adde..ee175fd 100644 --- a/pagesB/orderDetails/orderDetails.vue +++ b/pagesB/orderDetails/orderDetails.vue @@ -11,7 +11,7 @@ - 店铺名称 + {{order.orderTime}} From e4d1f8967886ecfaf86e67110e364bc0dd0beff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 1 Nov 2023 14:05:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/chat.png | Bin 2665 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/chat.png diff --git a/static/chat.png b/static/chat.png deleted file mode 100644 index ee93026d61d26854b765c4d32ddff763d04e158f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 zcmV-v3YPVWP)Px4$9pD6-u( z#e9UVsBT606p{B(R)hT}mh}$V4IfduVAGxsWru@>wOdnuC|0-((eqImip5}*;sA~Q z8>k1ZL8XRp?^O(+wIx9OoKS@$Z*lp)6ogj0yqFEe zm!WbSB8TMT#NN@>71;J=l+9b=*Sf=MObq>g>ehqgKy$t9KLOO-hsy2G{$vb&< zu?mof_UP*AH7f7&f1-KY7*7A~8ZWBu$sqlS>UJc@2&x<#ERaQSjtP6=ODO{4mH5-2!)0xlO3XC`~SK3!P%= zoV?}d_94@EAtGlu0rjx&H)Chdr)=KKoyFBLd94Y20{B4>BgSnw>&e<>jI3JKkwVAh zrDDGVxxuZao+GClfGR9`h!Kf*z0bV5%29|e0($ivQXC`sJHjlK$A~7(E{)@8Kl5tG zABYut6ByvA-6I5aB{mPy+*r-1>djt4YEND|{xHhrUO>8^tl4ehCEx+VeU>nM*0xS# zsEwVBW%VICw|-Z-w&c~tha=Pi;qFI>D~~sVK8wu^N|S#^&`z}$k2{3o&@CWW0LzIa zN_W+1OI|Ae3UHIO&G7f%RNlAVa^tssZD%B!L>meRy?JM?#w zw{-kSib6{rfxDN$TPQOrvgf%@{8RBWLGJ-MrCq41t2m%>C?`}mneTRzmyRz$Ik$Up zlgnFGL|!3l&tTK~mpJFeMprSVV}r0|N=uyuDe71!`#qxb=Ixe)<@X4XbwZ4 z{M@~oiMMhD=rrFktNw`6mgg<%S)z%tLS6j(2+w+QqWv=T3en`~mVfK*7WE&-P?-)b zGckx^NO}Rwetj^Yn-W$SKgWiZrUr)L@h4mk7Sa+x$`(thpd3c8a6ChUyG@ZU=l%7XEE{(?&7oTmxwOD(=5>ZVv;7jx z3Mt%0ByoFAf=us9Ny%-fm}e?$r;IkCvIt>1O>1fxwWQhchsq^j?rU0nDOfiH+fyoE zNbZzGCkyHLW|V#0X*f!KLP=%_!>i4PV(w8N8-`5}N$&{nb}YVK zF&eS%MLEgQ!=MC2X9%g79c(GlzLIFw%%FVi6lZCC2t{Tw(DQg# z8aTce!0ngqdmzVp(Q_eNPh?=J>*U-8AoUedY`G8QG&kafm(i(awM_w$K#d7DSv`xg zb(ic1+pfjZp9Ygs z`E#RVt?W=U^WwnVprJvV5gkUP>Mf7hLaOotP?J)bPWi4lHqn&nXL8$9!7^2$LR=D$ z6HQEX9ewTiQ?RV5AcaY(Tsz_@_$raaXkqagMHCNsKadoyz0J+o98X!|pPjl>cTqp2 z=w?(VB3-ecc{lGxZzGbN+`1W>u6z*H0^IiuxK1USyfG(v&!5|egZf?$V!jV1MRc4r z0SILE6hEW}t(Q|M?$?Y7&yEPf7IrUEAv!f3%TRadid-N~k~)Jk4U zb9UHt107uuqoz7<+t*N5^)B_X5vcqO7*h~ig$5O_C6X{3y}OhiQ?V;R3Yn8Ofqn)p zo%4lQoC-~wse6Bl)p#tC>h*2OTUN0@w)GCWw@>X9o&*0D?0bk-ebIK;w%sBfyAG9m z{e$;lO>>^D$Ub4$&V#n(nLYph;nz`y^>@ zhVGWezM^FXd-m%dzsfYCiR(?8%!_fgNDXQZX1c*lV?I+JmCO(H9wBX`CXU+Kdx=Uwr`}&TfNyEc`XEaguQ7+Dp_uDO5mQt_3*&@M$z zE@u?ef?I>y_wz~9i*8p^H*xtRuQvWQEX-NdJet7WxaU_!6{G=MpP@)*^M}OhLcCAP zA9<;Yv0zoZ2(1BSDWac)9EmUtZK;wKVjJGP8(oA(-V8r~fKQ{Yd z$-b@c*t54H))s8d5R#49_P@|<10QGC26_K-qUcHmozC_so_MP-?nzQ35rJrB1JL-5RFCCwVGOOhsp28z&X3CB_W_KhYAD{mR X9_C8;@d1Wn00000NkvXXu0mjfSq&>f From ca0e8152f8bdc1b644106d711548c9478b9869a4 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 14:30:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.js | 5 +++-- pages/homepage/homepage.vue | 42 +++++++++++++++---------------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/api/request.js b/api/request.js index a674cb4..1c5af34 100644 --- a/api/request.js +++ b/api/request.js @@ -4,7 +4,8 @@ import baseurl from './baseurl.js' var request = function(config) { return new Promise((resolve, rejected) => { if (config.url != '/nurseApplet/chatRecord/updateReadStatus' && config.url != - "/nurseApplet/chatRecord/sendMessage") { + "/nurseApplet/chatRecord/sendMessage" && config.url != + `/applet/sign/apply/checkSignApply/` + uni.getStorageSync('userinfo').cardNo) { uni.showLoading({ title: '' }); @@ -27,4 +28,4 @@ var request = function(config) { }) } -export default request +export default request \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 7943b1d..024d236 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -115,16 +115,8 @@ uni.setStorageSync("region", 3) } this.region = uni.getStorageSync('region') - // if (this.region) { - // if (this.region == "1" || this.region == "2") { - // } else { - // this.family() - // } - - // } - - if (this.userinfo) { + if (this.userinfo && this.region!="3") { this.patientName = this.userinfo.patientName checkSignApply(this.userinfo.cardNo).then(res => { if (res.data.code != 0) { @@ -163,7 +155,7 @@ // 家医功能提示 family() { this.$refs.uToast.show({ - title: '请切换城市，再操作家医相关功能', + title: '当前绑定地市不支持', type: 'error', duration: '3000', @@ -177,7 +169,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -193,9 +185,9 @@ } } else { this.family() - + } - + } @@ -208,7 +200,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -222,15 +214,15 @@ url: '/pagesB/Behaviorpoints/Behaviorpoints' }) } - + } else { this.family() - + } - + } - + } }, @@ -327,18 +319,18 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { uni.navigateTo({ url: "/pagesC/servicerecord/servicerecord" }) - + } else { this.family() } - + } - + } }, @@ -349,7 +341,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -363,11 +355,11 @@ url: "/pagesC/Myappointment/Myappointment" }) } - + } else { this.family() } - + } From b3b997736a1ca086f416e7d319a43b86cb4f2115 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 1 Nov 2023 15:53:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/myevaluation/myevaluation.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pagesB/myevaluation/myevaluation.vue b/pagesB/myevaluation/myevaluation.vue index 34d0ee7..34a4157 100644 --- a/pagesB/myevaluation/myevaluation.vue +++ b/pagesB/myevaluation/myevaluation.vue @@ -21,7 +21,10 @@ - 已评价 + + + + 已评价 @@ -48,6 +51,7 @@ getPageNum:1, getPageSize:20, userinfo:{}, + rateval: '', //评价星棵树 } }, onShow() { @@ -205,8 +209,18 @@ bottom: 4%; font-size: 28rpx; font-family: Source Han Sans CN; + + .rate{ + display: inline-block; + font-weight: 400; + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 10rpx; + text-align: center; + } - span:nth-child(1) { + .rateval { line-height: 30px; width: 169rpx; height: 61rpx;