调整样式

components/Card/Card.vue

@@ -12,6 +12,7 @@
     </view>
 </template>
 <style lang="scss" scoped>
+@import "/static/css/variables.scss";
 .card {
     margin: 0 25rpx 25rpx;
     font-size: 24rpx;
@@ -21,7 +22,7 @@
     color: #656565;
     .header {
         padding: 20rpx;
-        background-color: #4d80f0;
+        background-color: $blue;
         border-radius: 15rpx 15rpx 0 0;
         color: #fff;
     }

main.js

@@ -2,7 +2,6 @@ import App from './App'
 import { createSSRApp } from 'vue'
 import pinia from './store'
 import myComponents from "@/components"
-
 export function createApp() {
   const app = createSSRApp(App)
   app.use(myComponents)

pages/index/index.vue

@@ -18,6 +18,9 @@ let handleClose = () => {
 	showModel.value = false;
 };
 const showLogin = () => {
+	if (userStore.isLogin) {
+		return
+	}
 	showModel.value = true;
 }
 // 点击菜单
@@ -44,6 +47,7 @@ const clickMenu = (value) => {
 			break;
 	
 		default:
+			toast.warning('功能开发中')
 			break;
 	}
 }

pages/patient/patientAddTask/patientAddTask.vue

@@ -1,13 +1,13 @@
 <script setup>
 import { ref } from 'vue';
 const columns = ref(["患者1", "患者2", "患者3", "患者4"])
+const options = ref(["选项1", "选项2", "选项3", "选项4"])
 const value = ref("患者1")
 const date = ref(Date.now())
 const formatValue = ref("")
-const btnsValue = ref([1])
+const btnsValue = ref([])
 const handleDate = ({ value }) => {
     console.log(66, value);
-
     formatValue.value = new Date(value).toJSON().split("T")[0]
 }
 </script>
@@ -57,12 +57,6 @@ const handleDate = ({ value }) => {
                 </view>
             </view>
         </view>
-        <view>
-            <view>
-                院内执行
-                <wd-checkbox :modelValue="true" shape="button">加急</wd-checkbox>
-            </view>
-        </view>
         <view>
             <view class="title">分流调节计划</view>
             <view class="item">
@@ -79,58 +73,59 @@ const handleDate = ({ value }) => {
                         <wd-picker v-model="value" :columns="columns" confirm-button-text="确定" />
                     </view>
                 </view>
+                <view class="cause">
                     <view>
                         <view>调压原因</view>   
                         <view>
                             <wd-drop-menu direction="up">
                                 <wd-drop-menu-item title="筛选" ref="dropMenu">
                                     <wd-checkbox-group v-model="btnsValue" cell shape="button">
-                                    <wd-checkbox v-for="value in 5" :key="value" :modelValue="value" shape="button">选项{{ value }}</wd-checkbox>
+                                        <wd-checkbox v-for="item in options" :key="item" :modelValue="item" shape="button">{{ item }}</wd-checkbox>
                                     </wd-checkbox-group>
                                 </wd-drop-menu-item>
                             </wd-drop-menu>
                         </view>
                     </view>
+                    <view class="tag">
+                        <wd-tag type="primary" round v-for="tag in btnsValue" :key="tag">{{ tag }}</wd-tag>
+                    </view>
+                </view>
                 <view>
                     <view>是否加急</view>
                     <view>
                         <wd-checkbox :modelValue="true" shape="button">加急</wd-checkbox>
                     </view>
                 </view>
-            </view>
-        </view>
                 <view>
+                    <view>院内执行</view>
+                    <view>
+                        <wd-checkbox :modelValue="true" shape="button">执行</wd-checkbox>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="file">
             <view>任务文件</view>
             <view>
                 <wd-upload image-mode="aspectFill" :action="''"></wd-upload>
             </view>
         </view>
-        <wd-button>保存</wd-button>
+        <view class="save">
+            <wd-button :block="true">保存</wd-button>
+        </view>
     </view>
 </template>
 <style lang="scss" scoped>
-// .box {
+@import "/static/css/variables.scss";
-//     min-height: 95vh;
-//     padding: 20rpx;
-//     background-color: #fff;
-// }
 .title {
     display: flex;
     font-weight: bold;
-    font-size: 30rpx;
+    padding: 15rpx 20rpx;
+    font-size: 25rpx;
     align-items: center;
-    margin: 20rpx 0;
+    background-color: $blue;
-
+    color: #fff;
-    &::before {
-        content: "";
-        width: 8rpx;
-        height: 35rpx;
-        background-color: aqua;
-        border-radius: 5rpx;
-        margin: 0 15rpx;
 }
-}
-
 .item {
     >view {
         display: flex;
@@ -140,5 +135,30 @@ const handleDate = ({ value }) => {
         border-bottom: 1px solid #e0e0e0;
         font-size: 28rpx;
     }
+    .cause {
+        display: block;
+        transition: all 0.3s ease;
+        >view {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .tag {
+            gap: 15rpx;
+            justify-content: flex-start;
+        }
+    }
+}
+.file {
+    padding: 25rpx 25rpx 0;
+    font-size: 28rpx;
+    >view {
+        margin-bottom: 15rpx;
+    }
+}
+.save {
+    width: 80%;
+    margin: 0 auto;
+    padding-bottom: 20rpx;
 }
 </style>

pages/patient/patientList/patientList.vue

@@ -37,38 +37,42 @@ const reachBottom = () => {
         </view>
         <wd-gap height="190rpx"></wd-gap>
         <view class="patient_list">
-            <wd-card custom-class="item" v-for="item in num" :key="item">
+            <Card class="item" v-for="item in num" :key="item">
+                <template #header>
                     <view class="top">
                         <text>住院号：000000</text>
                         <text>2020-12-22</text>
                         <text>手术次数：{{ item }}{{ num }}</text>
                     </view>
+                </template>
                 <view class="content">
                     <view>患者姓名：xxx</view>
                     <view>手机号码：11111111111</view>
                     <view>植入物品牌：索菲萨</view>
                     <view>原发病：小脑但脂瘤</view>
-                    <view class="red">当前压力：110</view>
+                    <view class="bright">当前压力：110</view>
                     <view>初始压力：110</view>
                     <view>脑积水类型：交通性，高压性</view>
                 </view>
+                <template #footer>
                     <view class="btns">
                         <button size="mini" plain="true">医生共享</button>
                         <button size="mini" plain="true">调压趋势</button>
                         <button size="mini" plain="true">手术详情</button>
                         <button size="mini" plain="true">一键调压</button>
                     </view>
-
+                </template>
-            </wd-card>
+            </Card>
         </view>
     </view>
-    <Loadmore :number="num" :total="20" @reachBottom="reachBottom"></Loadmore>
+    <LoadMore :number="num" :total="20" @reachBottom="reachBottom"></LoadMore>
 </template>
 
 <style lang="scss" scoped>
+@import "/static/css/variables.scss";
 .fab {
     view {
-        background: #4d80f0;
+        background: $blue;
         width: 112rpx;
         height: 112rpx;
         border-radius: 50%;
@@ -95,42 +99,32 @@ const reachBottom = () => {
         font-size: 28rpx;
         color: #6b7280;
         padding: 10rpx;
+        box-shadow: 0 -10px 4px #fff;
 
         text {
             padding: 10rpx 16rpx;
-            border-radius: 5rpx;
+            border-radius: 10rpx;
         }
     }
 
     .active {
-        background: #3b82f6;
+        background: $blue;
         color: #ffffff;
-        border: 1rpx solid #3b82f6;
+        border: 1rpx solid $blue;
     }
 }
 
 .patient_list {
     padding-top: 20rpx;
-    :deep(.item) {
+    .item {
-        padding: 0;
-        font-size: 24rpx;
-        overflow: hidden;
-
         .top {
             display: flex;
             justify-content: space-between;
-            background-color: #d4edda;
-            padding: 20rpx;
-            color: #155724;
         }
 
         .content {
             display: flex;
-            padding: 20rpx;
             flex-wrap: wrap;
-            font-size: 28rpx;
-            color: #333;
-
             view {
                 width: 50%;
                 margin-bottom: 10rpx;
@@ -140,20 +134,18 @@ const reachBottom = () => {
                 }
             }
 
-            .red {
+            .bright {
                 font-weight: bold;
-                color: rgb(255, 21, 21);
+                color: $blue;
             }
         }
 
         .btns {
             display: flex;
-            // gap: 15rpx;
-            padding: 20rpx;
             justify-content: space-between;
-
             button {
                 padding: 0 20rpx;
+                margin: 0;
             }
 
             text {
@@ -164,10 +156,6 @@ const reachBottom = () => {
                 text-align: center;
             }
 
-            .add {
-                background-color: #007bff;
-                color: #ffffff;
-            }
         }
     }
 }

static/css/variables.scss

@@ -0,0 +1 @@
+$blue: #4d80f0;