From e73ed4cbb6de7c3b7ef1cfa8e996a697bbb78db5 Mon Sep 17 00:00:00 2001
From: aBin <binbin0314@126.com>
Date: Fri, 9 Dec 2022 18:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E8=BD=A6=E5=88=97=E8=A1=A8=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                    |   6 ++
 src/pages/MoreCar/index.vue       | 174 ++++++++++++++++++++++++++++++
 src/pages/establish/establish.vue |   4 +-
 src/pages/index/index.vue         |   5 +-
 src/static/news/绿.png            | Bin 0 -> 4012 bytes
 5 files changed, 186 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/MoreCar/index.vue
 create mode 100644 src/static/news/绿.png

diff --git a/src/pages.json b/src/pages.json
index e285c1f..b8b0555 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -105,6 +105,12 @@
 			"style": {
 				"navigationBarTitleText": "数据统计"
 			}
+		},
+		{
+			"path": "pages/MoreCar/index",
+			"style": {
+				"navigationBarTitleText": "查看更多"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/src/pages/MoreCar/index.vue b/src/pages/MoreCar/index.vue
new file mode 100644
index 0000000..4159b65
--- /dev/null
+++ b/src/pages/MoreCar/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="MoreCar">
+    <view style="width: 100%; box-shadow: 0 0 4rpx rgba(0, 0, 0, 0.1)">
+      <u-tabs
+        :list="list"
+        :is-scroll="false"
+        :current="current"
+        @change="change"
+        :active-item-style="itemStyle"
+        bar-width="82"
+        inactive-color="#8C9AA3"
+      >
+      </u-tabs>
+    </view>
+    <scroll-view scroll-y style="height: calc(100% - 84rpx); margin-top: 4rpx; padding: 0 16rpx">
+      <div style="height: 1rpx; width: 100%"></div>
+      <view v-for="car in carList" :key="car.carId" class="car-box bor-left-lv">
+        <view class="title flex items-center">
+          <view style="margin-right: 32rpx">{{ car.carNo }}</view>
+          <view style="margin-right: 16rpx; font-size: 32rpx">{{ car.nursesName || '患者姓名' }}</view>
+          <view style="margin-right: 16rpx; font-size: 32rpx">{{ car.gender === 0 ? '女' : car.gender === 1 ? '男' : '性别' }}</view>
+          <view>{{ car.age || '年龄' }}</view>
+        </view>
+        <view class="info-box flex items-center">
+          <img src="@/static/news/绿.png" style="width: 60rpx; height: 60rpx" alt="" />
+          <view>
+            <view class="flex">
+              <view v-for="(medical, mIndex) in car.medicalHistoryList" :key="mIndex"> {{ medical }} </view>
+            </view>
+            <view>身份证：{{ car.idcard }}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MoreCar',
+  components: {},
+  props: {},
+  data() {
+    return {
+      list: [
+        {
+          name: '绿道',
+        },
+        {
+          name: '占用',
+        },
+        {
+          name: '空闲',
+        },
+        {
+          name: '充电',
+        },
+        {
+          name: '离线',
+        },
+      ],
+      current: 0,
+      itemStyle: {
+        color: '#2C2B3B',
+      },
+      carList: [
+        {
+          age: null,
+          carId: '1',
+          carNo: '1001',
+          carStatus: 0,
+          doctorId: '0',
+          doctorName: null,
+          firstAidId: '1601126216004542464',
+          gender: null,
+          medicalHistoryList: ['家族史', '心脏病', '高血压'],
+          name: '',
+          idcard: '123123444403142235',
+          nursesId: '1',
+          nursesName: '张野',
+        },
+        {
+          age: null,
+          carId: '2',
+          carNo: '1001',
+          carStatus: 0,
+          doctorId: '0',
+          doctorName: null,
+          firstAidId: '1601126216004542464',
+          gender: null,
+          medicalHistoryList: ['家族史', '心脏病', '高血压'],
+          name: '',
+          idcard: '123123444403142235',
+          nursesId: '1',
+          nursesName: '张野',
+        },
+        {
+          age: null,
+          carId: '3',
+          carNo: '1001',
+          carStatus: 0,
+          doctorId: '0',
+          doctorName: null,
+          firstAidId: '1601126216004542464',
+          gender: null,
+          medicalHistoryList: ['家族史', '心脏病', '高血压'],
+          name: '',
+          idcard: '123123444403142235',
+          nursesId: '1',
+          nursesName: '张野',
+        },
+      ],
+    };
+  },
+  computed: {},
+  methods: {
+    change(index) {
+      this.current = index;
+    },
+  },
+  watch: {},
+
+  // 页面周期函数--监听页面加载
+  onLoad() {},
+  // 页面周期函数--监听页面初次渲染完成
+  onReady() {},
+  // 页面周期函数--监听页面显示(not-nvue)
+  onShow() {},
+  // 页面周期函数--监听页面隐藏
+  onHide() {},
+  // 页面周期函数--监听页面卸载
+  onUnload() {},
+  // 页面处理函数--监听用户下拉动作
+  // onPullDownRefresh() { uni.stopPullDownRefresh(); },
+  // 页面处理函数--监听用户上拉触底
+  // onReachBottom() {},
+  // 页面处理函数--监听页面滚动(not-nvue)
+  // onPageScroll(event) {},
+  // 页面处理函数--用户点击右上角分享
+  // onShareAppMessage(options) {},
+};
+</script>
+
+<style scoped>
+.info-box {
+  margin-left: 42rpx;
+  margin-top: 8rpx;
+  height: 80rpx;
+}
+.MoreCar {
+  height: 100vh;
+  overflow: hidden;
+}
+.car-box {
+  height: 188rpx;
+  width: calc(100% - 64rpx);
+  box-sizing: border-box;
+  margin: 32rpx 16rpx;
+  /* margin-bottom: 0; */
+  border-radius: 8rpx;
+  box-shadow: 0 0 30rpx 5rpx rgba(0, 0, 0, 0.1);
+  padding: 24rpx 0;
+}
+.bor-left-lv {
+  border-left: 4rpx solid #1bb299;
+}
+.title {
+  margin-left: 42rpx;
+  font-size: 36rpx;
+  font-family: OPPOSans-Bold, OPPOSans;
+  font-weight: bold;
+  color: #70798c;
+}
+</style>
diff --git a/src/pages/establish/establish.vue b/src/pages/establish/establish.vue
index 4f9cf42..99cd425 100644
--- a/src/pages/establish/establish.vue
+++ b/src/pages/establish/establish.vue
@@ -89,13 +89,13 @@
         </div>
       </div>
     </div>
-    <div class="flex btn-box" v-if="showBtn">
+    <div class="flex btn-box justify-center" v-if="showBtn">
       <u-button
         type="primary"
         shape="circle"
         :disabled="isSubmit"
         id="complete-btn"
-        class="flex-1 btn mr-2"
+        class="flex-1 btn"
         @click="submit"
         :custom-style="customStyle"
       >
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 358ff4d..ba7be51 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -32,7 +32,7 @@
           <view class="title-shu"></view>
           <view class="news-title"> 平车 </view>
         </view>
-        <u-button shape="circle" size="mini">查看更多</u-button>
+        <u-button shape="circle" size="mini" @click="moreCar">查看更多</u-button>
       </view>
       <scroll-view scroll-x style="height: 224rpx">
         <view class="flex" style="width: min-content; padding: 24rpx 16rpx 0 32rpx">
@@ -178,6 +178,9 @@ export default {
 
   methods: {
     ...mapMutations('project', ['setProjects', 'setDotList']),
+    moreCar() {
+      uni.navigateTo({ url: '/pages/MoreCar/index' });
+    },
     gitSwiper(e) {
       const data = this.list[e];
       if (data.jumpUrl) {
diff --git a/src/static/news/绿.png b/src/static/news/绿.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ace7217155044903f0190337b5285790488a71
GIT binary patch
literal 4012
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
S=m3xa0000<MNUMnLSTZ%s<4s(

literal 0
HcmV?d00001