From f10f14ad1e100246c6bd19d30f275204147c8981 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期二, 28 十月 2025 22:09:20 +0800
Subject: [PATCH] gx

---
 src/views/paiban/index.vue           |   15 +++-
 src/views/home/index.vue             |    2 
 src/views/record/index.vue           |   11 +++
 src/views/report/index.vue           |    9 ++
 src/views/myMine/index.vue           |   10 ++-
 src/views/prescriptionDrug/index.vue |  121 +++++++++++++++++++++------------------
 6 files changed, 100 insertions(+), 68 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1b2b643..25ad9c8 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -156,6 +156,8 @@
         if (index==='home'){
             router.push('/')
         } else if (index==='xuanjiao') {
+            Toast('此功能正在开发中,敬请期待')
+            return
             router.push('xuanjiao')
         } else if (index==='my') {
             router.push('my')
diff --git a/src/views/myMine/index.vue b/src/views/myMine/index.vue
index a934e98..3d07046 100644
--- a/src/views/myMine/index.vue
+++ b/src/views/myMine/index.vue
@@ -169,7 +169,7 @@
         <myOrder ref="myOrderRef"></myOrder>
         <van-tabbar v-model="active" @change="tabChang">
             <van-tabbar-item name="home" icon="like">首页</van-tabbar-item>
-            <van-tabbar-item name="jifen" icon="cart-circle-o">积分商城</van-tabbar-item>
+            <van-tabbar-item name="xuanjiao" icon="smile-o">宣教</van-tabbar-item>
             <van-tabbar-item name="my" icon="manager">我的</van-tabbar-item>
         </van-tabbar>
     </div>
@@ -188,7 +188,7 @@
     import serve6 from './imgs/serve6.png'
     import erweima from './imgs/erwm.png'
     import {useRouter} from 'vue-router'
-    import { Dialog } from 'vant'
+    import { Dialog, Toast } from 'vant'
     const router=useRouter()
     const userInfo = userInfoStore()
     const myOrderRef=ref()
@@ -210,8 +210,10 @@
     const tabChang=(index:any)=>{
         if (index==='home'){
             router.push('/')
-        } else if (index==='jifen') {
-            router.push('jifenShangCheng')
+        } else if (index==='xuanjiao') {
+            Toast('此功能正在开发中,敬请期待')
+            return
+            router.push('xuanjiao')
         } else if (index==='my') {
             router.push('my')
         }
diff --git a/src/views/paiban/index.vue b/src/views/paiban/index.vue
index 3ded060..a92c58d 100644
--- a/src/views/paiban/index.vue
+++ b/src/views/paiban/index.vue
@@ -6,7 +6,7 @@
             left-arrow
             @click="fanhui"
         />
-        <div>
+        <div style="padding: 10px;">
             <van-calendar
                 :min-date="minDate"
                 @month-show="monthShow"
@@ -164,7 +164,7 @@
 }
 
 .listdiv {
-    margin-top: 20px;
+    // margin-top: 20px;
 
     .listrow {
         margin-top: 10px;
@@ -242,8 +242,15 @@
 /* stylelint-disable selector-pseudo-class-no-unknown */
 
 :deep(.van-calendar__day--end) {
-    border-radius: 0 var(--van-border-radius-md) var(--van-border-radius-md) 0;
-    background: #4696f9;
+    background: #46a8f9;
+    border-radius: 10px;
+    font-size: 12px;
+}
+
+:deep(.van-calendar__day--start) {
+    background: #f98546;
+    border-radius: 10px;
+    font-size: 12px;
 }
 
 </style>
\ No newline at end of file
diff --git a/src/views/prescriptionDrug/index.vue b/src/views/prescriptionDrug/index.vue
index 6694771..5efb549 100644
--- a/src/views/prescriptionDrug/index.vue
+++ b/src/views/prescriptionDrug/index.vue
@@ -12,13 +12,16 @@
         <div class="listdiv">
             <div class="listrow" v-for="(order,index) in pageData" :key="index">
                 <van-row>
-                    <div class="info"></div>
                     <van-row class="lable">
-                        <van-col span="18">
+                        <van-col span="24" style="text-align: right;color: #769aff;font-weight: 400;">长期医嘱</van-col>
+                    </van-row>
+                    <van-row class="lable">
+
+                        <van-col span="24">
                             <span class="labletext">医嘱名称:</span>
-                            <span>{{order.drugName}}</span>
+                            <span class="text-wrap" style=" overflow: hidden;">{{order.drugName}}</span>
                         </van-col>
-                        <van-col span="6" style="text-align: right;color: #769aff;font-weight: 400;">长期医嘱</van-col>
+
                     </van-row>
                     <van-row class="lable3">
                         <van-col span="24">
@@ -94,78 +97,84 @@
     })
 </script>
 <style lang="scss">
-    .report {
-        background-color: #f6faff;
-        padding: 0;
+.report {
+    background-color: #f6faff;
+    padding: 0;
 
-        .inputdiv {
-            width: 94%;
-            margin-left: 3%;
-            margin-top: 10px;
+    .inputdiv {
+        width: 94%;
+        margin-left: 3%;
+        margin-top: 10px;
 
-            .input {
-                width: 100%;
+        .input {
+            width: 100%;
 
-                // height: 33px;
-                border-radius: 22px;
-                border: 1px solid #dadada;
+            // height: 33px;
+            border-radius: 22px;
+            border: 1px solid #dadada;
 
-                // line-height: 33px;
-            }
+            // line-height: 33px;
         }
     }
+}
 
-    .listdiv {
-        .listrow {
-            margin-top: 10px;
-            width: 94%;
-            margin-left: 3%;
-            background: #fff;
-            box-shadow: 0 2px 4px 0 rgba(70, 150, 249, 0.1);
-            border-radius: 8px;
+.listdiv {
+    .listrow {
+        margin-top: 10px;
+        width: 94%;
+        margin-left: 3%;
+        background: #fff;
+        box-shadow: 0 2px 4px 0 rgba(70, 150, 249, 0.1);
+        border-radius: 8px;
 
-            .lable {
-                width: 90%;
-                margin-left: 5%;
+        .lable {
+            width: 90%;
+            margin-left: 5%;
+            height: 40px;
+
+            div {
                 height: 40px;
+                font-size: 13px;
+                font-family: Arial, sans-serif;
+                font-weight: 400;
+                color: #2a2a2a;
+                line-height: 40px;
+                border-bottom: #f1f1f2 1px solid;
 
-                div {
-                    height: 40px;
-                    font-size: 13px;
-                    font-family: Arial, sans-serif;
+                .labletext {
                     font-weight: 400;
-                    color: #2a2a2a;
-                    line-height: 40px;
-                    border-bottom: #f1f1f2 1px solid;
-
-                    .labletext {
-                        font-weight: 400;
-                        color: #777;
-                    }
+                    color: #777;
                 }
             }
+        }
 
-            .lable3 {
-                width: 90%;
-                margin-left: 5%;
+        .lable3 {
+            width: 90%;
+            margin-left: 5%;
 
+            // height: 40px;
+
+            div {
                 // height: 40px;
+                font-size: 13px;
+                font-family: Arial, sans-serif;
+                font-weight: 400;
+                color: #2a2a2a;
+                line-height: 20px;
+                border-bottom: #f1f1f2 1px solid;
 
-                div {
-                    // height: 40px;
-                    font-size: 13px;
-                    font-family: Arial, sans-serif;
+                .labletext {
                     font-weight: 400;
-                    color: #2a2a2a;
-                    line-height: 20px;
-                    border-bottom: #f1f1f2 1px solid;
-
-                    .labletext {
-                        font-weight: 400;
-                        color: #777;
-                    }
+                    color: #777;
                 }
             }
         }
     }
+}
+
+.text-wrap {
+    //   word-wrap: break-word;           /* 长单词或URL自动换行 */
+    //   white-space: normal;             /* 允许换行 */
+    overflow: hidden;                /* 超出隐藏 */
+}
 </style>
\ No newline at end of file
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 57ef34f..605bfc2 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -299,7 +299,14 @@
 }
 /* stylelint-disable selector-pseudo-class-no-unknown */
 :deep(.van-calendar__day--end) {
-    border-radius: 0 var(--van-border-radius-md) var(--van-border-radius-md) 0;
-    background: #4696f9;
+    background: #46a8f9;
+    border-radius: 10px;
+    font-size: 12px;
+}
+
+:deep(.van-calendar__day--start) {
+    background: #f98546;
+    border-radius: 10px;
+    font-size: 12px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index 08cb07a..eb266f6 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="report">
-        <div style="border: 1pt solid #707070;">
-            <van-nav-bar title="" :left-text="typeName">
+        <div>
+            <van-nav-bar @click="fanhui" title="" left-arrow :left-text="typeName">
                 <template #right>
                     <van-button
                         icon="todo-list-o"
@@ -63,6 +63,8 @@
     import itembody from './item/index.vue'
     import { ajaxPost } from '@/utils/axios'
     import { AxiosRequestConfig } from 'axios'
+    import {useRouter} from 'vue-router'
+    const router=useRouter()
     const showPopup = ref(false)
     const userInfo = userInfoStore()
     const typeName=ref('近三个月')
@@ -169,6 +171,9 @@
             console.error('获取数据失败', error)
         })
     }
+    const fanhui=()=>{
+        router.go(-1)
+    }
     onMounted(() => {
         const now = new Date()
         const threeMonthsAgo = new Date(now)

--
Gitblit v1.8.0