From d8eba32521969c0f94589d570483052928700dc4 Mon Sep 17 00:00:00 2001
From: aBin <binbin0314@126.com>
Date: Thu, 15 Dec 2022 16:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E8=BD=A6=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=8A=E8=AF=A6=E6=83=85=E9=A1=B5=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Service/Service.vue |   2 +-
 src/components/Volume/Volume.vue   |  24 ++++---
 src/pages/MoreCar/detail.vue       | 112 ++++++++++++++++++++++++-----
 src/pages/MoreCar/index.vue        |  53 ++------------
 src/static/news/Frame 34@2x.png    | Bin 0 -> 2899 bytes
 src/static/news/logo2x.png         | Bin 0 -> 2141 bytes
 src/static/news/logo2xg.png        | Bin 0 -> 1990 bytes
 7 files changed, 113 insertions(+), 78 deletions(-)
 create mode 100644 src/static/news/Frame 34@2x.png
 create mode 100644 src/static/news/logo2x.png
 create mode 100644 src/static/news/logo2xg.png

diff --git a/src/components/Service/Service.vue b/src/components/Service/Service.vue
index 4c57cc3..60784b2 100644
--- a/src/components/Service/Service.vue
+++ b/src/components/Service/Service.vue
@@ -9,7 +9,7 @@
       <!-- 客服 -->
       <img style="height: 28px; width: 28px" src="./icon/tel-we.png" alt="" />
     </button>
-    <view class="edition">v4.0.1</view>
+    <view class="edition">v4.0.2</view>
   </div>
 </template>
 <script>
diff --git a/src/components/Volume/Volume.vue b/src/components/Volume/Volume.vue
index 063e192..4f09fd3 100644
--- a/src/components/Volume/Volume.vue
+++ b/src/components/Volume/Volume.vue
@@ -2,11 +2,10 @@
   <view class="volume-box">
     <scroll-view scroll-x style="height: 100%; width: 100%">
       <view class="flex justify-between">
-        <view class="flex flex-col items-center justify-center" style="flex-shrink: 0" @click="apply">
-          <!-- <img class="volume-img" src="@/static/image.png" alt="" /> -->
+        <!-- <view class="flex flex-col items-center justify-center" style="flex-shrink: 0" @click="apply">
           <img class="volume-img" src="@/static/image.png" alt="" />
           <span class="mt-2" style="color: #70798c">申请</span>
-        </view>
+        </view> -->
         <!-- <view class="flex flex-col items-center justify-center" style="flex-shrink: 0" @click="statistics">
           <img class="volume-img" src="@/static/image.png" alt="" />
           <span class="mt-2" style="color: #70798c">统计</span>
@@ -16,7 +15,7 @@
           style="flex-shrink: 0"
           v-for="(item, index) in btnList"
           :key="index"
-          @click="jumpV(item.url)"
+          @click="jumpV(item)"
         >
           <!-- <img class="volume-img" src="@/static/image.png" alt="" /> -->
           <img class="volume-img" :src="item.iconUrl || '@/static/image.png'" alt="" />
@@ -78,13 +77,18 @@ export default {
       }
     },
     // 跳转到问卷调查
-    jumpV(url) {
-      if (this.user.phone) {
-        console.log('this.userId: ', this.userId);
-        this.$u.route('pages/questionnaire-webview/questionnaire-webview', { u: this.userId, url: url });
+    jumpV(item) {
+      const url = item.url;
+      if (item.jumpType === 0) {
+        uni.navigateTo({ url });
       } else {
-        // this.$u.route('/pages/get-phone-power/get-phone-power');
-        this.$u.route('/pages/phone-bind/phone-bind');
+        if (this.user.phone) {
+          console.log('this.userId: ', this.userId);
+          this.$u.route('pages/questionnaire-webview/questionnaire-webview', { u: this.userId, url: url });
+        } else {
+          // this.$u.route('/pages/get-phone-power/get-phone-power');
+          this.$u.route('/pages/phone-bind/phone-bind');
+        }
       }
     },
   },
diff --git a/src/pages/MoreCar/detail.vue b/src/pages/MoreCar/detail.vue
index f4c978b..5222efb 100644
--- a/src/pages/MoreCar/detail.vue
+++ b/src/pages/MoreCar/detail.vue
@@ -3,6 +3,7 @@
     <view class="title"> 平车信息 </view>
     <view
       class="car-box bor-left-lv"
+      v-if="car"
       :class="{
         'bor-left-lv': car.carStatus === 0,
         'bor-left-zhan': car.carStatus === 1,
@@ -10,6 +11,7 @@
         'bor-left-dian': car.carStatus === 3,
         'bor-left-li': car.carStatus === 4,
       }"
+      @click="openDetail"
     >
       <view class="car-title flex items-center">
         <view class="car-no">{{ car.carNo }}</view>
@@ -47,38 +49,66 @@
       </view>
     </view>
     <view class="title"> 时间轴 </view>
-    <view class="time-line-box"></view>
+    <view class="time-line-box">
+      <view class="flex" v-for="(step, stepIndex) in stepList" :key="step.stepId">
+        <view class="time-line-left flex flex-col items-center">
+          <view class="time-line-cir" :class="step.type === 1 ? 'green' : step.type === 2 ? 'blue' : ''"></view>
+          <view
+            class="time-line-bor"
+            v-if="stepIndex !== stepList.length - 1"
+            :class="step.type === 1 ? 'green-bg' : step.type === 2 ? 'blue-bg' : ''"
+          ></view>
+        </view>
+        <view class="time-line-right flex-1" style="margin-top: -16rpx">
+          <view class="w-full name-status flex justify-between">
+            <view :class="step.type === 1 ? 'green' : step.type === 2 ? 'blue' : ''">
+              {{ step.stepName }}
+            </view>
+            <view :class="step.type === 1 ? 'green' : step.type === 2 ? 'blue' : ''">
+              <!-- {{ step.type }} -->
+              {{ step.type === 0 ? '未开始' : step.type === 1 ? '待确认' : '已结束' }}
+            </view>
+          </view>
+          <view class="w-full time-status flex justify-between">
+            <view class="flex items-center" :class="step.type === 1 ? 'green' : step.type === 2 ? 'blue' : ''">
+              <!-- {{ step.stepName }} -->
+              <img src="@/static/news/logo2xg.png" v-if="step.type === 2" style="width: 32rpx; height: 32rpx; margin-right: 8rpx" alt="" />
+              <img src="@/static/news/logo2x.png" v-else style="width: 32rpx; height: 32rpx; margin-right: 8rpx" alt="" />
+              {{ step.startTime ? $moment(+step.startTime).format('YYYY-MM-DD HH:mm') : '未知' }}
+            </view>
+            <view>
+              <!-- {{ step.type }} -->
+              <u-icon size="32" name="edit-pen" :color="step.type === 1 ? '#00c767' : step.type === 2 ? '#4f8bff' : ''"></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
   </div>
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
 export default {
   name: 'detail',
   components: {},
   props: {},
   data() {
     return {
-      car: {
-        age: null,
-        carId: '1',
-        carNo: '1001',
-        carStatus: 0,
-        doctorId: '0',
-        doctorName: null,
-        firstAidId: '1601126216004542464',
-        gender: null,
-        medicalHistoryList: ['家族史', '心脏病', '高血压'],
-        name: '',
-        idcard: '123123444403142235',
-        nursesId: '1',
-        nursesName: '张野',
-      },
+      car: null,
       status: 0,
       stepList: [],
     };
   },
   computed: {},
   methods: {
+    ...mapMutations('carbasics', ['setFirstAidId', 'setDetailValueType']),
+    // 查看病历填写详情
+    openDetail() {
+      this.setFirstAidId(this.car.firstAidId);
+      this.setDetailValueType(this.car.demonstrate);
+      uni.navigateTo({ url: `/pages/patientLine/patientLine?caseType=${0}` });
+    },
     async getSteps() {
       try {
         const params = { firstAidId: this.car.firstAidId };
@@ -92,7 +122,9 @@ export default {
   watch: {},
 
   // 页面周期函数--监听页面加载
-  onLoad() {
+  onLoad(options) {
+    console.log('options: ', options);
+    this.car = JSON.parse(options.info);
     this.getSteps();
   },
   // 页面周期函数--监听页面初次渲染完成0
@@ -115,9 +147,53 @@ export default {
 </script>
 
 <style scoped>
+.blue-bg {
+  background: #4f8bff !important;
+}
+.green-bg {
+  background: #00c767 !important;
+}
+.blue {
+  color: #4f8bff !important;
+  border-color: #4f8bff !important;
+}
+.green {
+  color: #00c767 !important;
+  border-color: #00c767 !important;
+}
+.name-status {
+  font-size: 32rpx;
+  font-family: OPPOSans-Bold, OPPOSans;
+  font-weight: bold;
+  color: #a3acbf;
+}
+.time-status {
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  font-family: OPPOSans-Medium, OPPOSans;
+  font-weight: 500;
+  color: #a3acbf;
+}
+.time-line-left {
+  margin-right: 24rpx;
+}
+.time-line-cir {
+  width: 8px;
+  height: 8px;
+  border: 4rpx solid #a3acbf;
+  border-radius: 50%;
+  opacity: 1;
+}
+.time-line-bor {
+  width: 4rpx;
+  height: 112rpx;
+  background: #a3acbf;
+  opacity: 1;
+}
 .time-line-box {
+  margin-right: 24rpx;
   width: calc(100% - 64rpx);
-  height: 100rpx;
+  /* height: 100rpx; */
   margin: 32rpx;
   padding: 32rpx;
   background: #ffffff;
diff --git a/src/pages/MoreCar/index.vue b/src/pages/MoreCar/index.vue
index 23186ab..a223b78 100644
--- a/src/pages/MoreCar/index.vue
+++ b/src/pages/MoreCar/index.vue
@@ -52,7 +52,7 @@
                 {{ medical }}
               </view>
             </view>
-            <view class="id-card">身份证：{{ car.idcard }}</view>
+            <view class="id-card">身份证：{{ car.idcard || '' }}</view>
           </view>
         </view>
       </view>
@@ -87,53 +87,7 @@ export default {
       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: '张野',
-        },
-      ],
+      carList: [],
       status: 0,
     };
   },
@@ -142,7 +96,7 @@ export default {
     detailCar(info) {
       console.log('info: ', info);
       if (this.status === 0 || this.status === 1) {
-        uni.navigateTo({ url: '/pages/MoreCar/detail' });
+        uni.navigateTo({ url: `/pages/MoreCar/detail?info=${JSON.stringify(info)}` });
       }
     },
     change(index) {
@@ -157,6 +111,7 @@ export default {
         };
         const res = await this.$u.api.queryCar(params);
         console.log('res: ', res);
+        this.carList = [...res];
       } catch (error) {}
     },
   },
diff --git a/src/static/news/Frame 34@2x.png b/src/static/news/Frame 34@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5d1ece89e9148fd840e426a7008e4d89cfacc9c
GIT binary patch
literal 2899
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

literal 0
HcmV?d00001

diff --git a/src/static/news/logo2x.png b/src/static/news/logo2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..437ca03561e57c2af90648e1052c91bea84017a7
GIT binary patch
literal 2141
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
Tf${$a00000NkvXXu0mjf@wf$+

literal 0
HcmV?d00001

diff --git a/src/static/news/logo2xg.png b/src/static/news/logo2xg.png
new file mode 100644
index 0000000000000000000000000000000000000000..32ab5932d40e321be6fa2664840d73f3f53443fd
GIT binary patch
literal 1990
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
Y0g;(&3_?TtVgLXD07*qoM6N<$f??pmLI3~&

literal 0
HcmV?d00001