From a69996e28d24ed4bd94cf7ebe3869a91dc47c0a5 Mon Sep 17 00:00:00 2001
From: songsong428 <srf428110@163.com>
Date: Wed, 11 Mar 2020 02:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/add-stroke/components/date-selector.vue |  2 +-
 pages/apply-code/apply-code.vue               |  2 +-
 pages/my-trips/my-trips.vue                   |  4 +-
 pages/punch-the-clock/punch-the-clock.vue     |  2 +-
 pages/user-code/user-code.vue                 | 50 +++++++++++++++----
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/pages/add-stroke/components/date-selector.vue b/pages/add-stroke/components/date-selector.vue
index 293c553..02102c3 100644
--- a/pages/add-stroke/components/date-selector.vue
+++ b/pages/add-stroke/components/date-selector.vue
@@ -11,7 +11,7 @@
 	export default {
 		name: 'DateSelector',
 		data() {
-			const time = this.$moment().format('YYYY-MM-DD');
+			const time = this.$moment().format('YYYY-MM-DD hh:mm:ss');
 			return {
 				time,
 			};
diff --git a/pages/apply-code/apply-code.vue b/pages/apply-code/apply-code.vue
index 5ef2adb..92c6554 100644
--- a/pages/apply-code/apply-code.vue
+++ b/pages/apply-code/apply-code.vue
@@ -85,7 +85,7 @@
         <view class="title padding-bottom-sm">
           <span class="text-red padding-right-xs">*</span>当前体温（℃）
         </view>
-        <input name="input" placeholder="请输入当前真实体温" type="number" v-model="animalHeat" />
+        <input name="input" placeholder="请输入当前真实体温" type="text" v-model="animalHeat" />
       </view>
     </form>
     <user-agreement @changeIntentions="changeIntentions"></user-agreement>
diff --git a/pages/my-trips/my-trips.vue b/pages/my-trips/my-trips.vue
index 2b8db40..383826d 100644
--- a/pages/my-trips/my-trips.vue
+++ b/pages/my-trips/my-trips.vue
@@ -5,7 +5,7 @@
 		<view v-if="tableList && tableList.length>0" class="cu-timeline" :key="index" v-for="(item,index) in tableList">
 			<view class="cu-time">{{ +item.startTime | formatDate }}</view>
 			<view class="cu-item cuIcon-timefill text-blue">
-				<view class="content shadow-blur bg-blue light">
+				<view class="content shadow-blur bg-blue light">formatDate(data, 'MM-dd hh:mm:ss')
 					{{ +item.startTime | formatDate }} 至 {{ +item.endTime | formatDate }}
 				</view>
 			</view>
@@ -92,7 +92,7 @@
 			formatDate(time) {
 				var data = new Date(time);
 				return formatDate(data, 'MM-dd');
-			}
+			},
 		},
 
 		onLoad() {
diff --git a/pages/punch-the-clock/punch-the-clock.vue b/pages/punch-the-clock/punch-the-clock.vue
index ff837d8..d1d39db 100644
--- a/pages/punch-the-clock/punch-the-clock.vue
+++ b/pages/punch-the-clock/punch-the-clock.vue
@@ -59,7 +59,7 @@
 			</view>
 			<view class="cu-form-group flex flex-direction padding-tb">
 				<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前体温（℃）</view>
-				<input placeholder="请输入当前真实体温" name="input" type="number" v-model="animalHeat" />
+				<input placeholder="请输入当前真实体温" name="input" type="text" v-model="animalHeat"/>
 			</view>
 		</form>
 		<user-agreement @changeIntentions="changeIntentions"></user-agreement>
diff --git a/pages/user-code/user-code.vue b/pages/user-code/user-code.vue
index 74bc90e..6c533d1 100644
--- a/pages/user-code/user-code.vue
+++ b/pages/user-code/user-code.vue
@@ -1,42 +1,56 @@
 <template>
   <view class="padding-lg">
-    <template v-if="userInfo">
+    <!-- <template v-if="userInfo"> -->
+    <template>
       <view class="padding bg-purple shadow-blur radius margin-bottom-xl">
         <view>
-          <view class="text-lg text-bold margin-bottom">个人申报信息</view>
-          <view class="text-df text-grey">
+          <view class="text-xl text-bold margin-bottom">个人申报信息</view>
+          <view class="text-lg text-grey">
             <text class="margin-right">{{ userInfo.name }}</text>
             <text>{{ post }}</text>
           </view>
-          <view class="text-df text-grey">
+          <view class="text-lg text-grey">
             身份证：
             <text>{{ userInfo.idCard }}</text>
           </view>
-          <view class="text-df text-grey">
+          <view class="text-lg text-grey">
             手机号：
             <text>{{ userInfo.phone }}</text>
           </view>
-          <view class="text-df text-grey">
+          <view class="text-lg text-grey">
             学号：
             <text>{{ userInfo.no }}</text>
           </view>
-          <view class="text-df text-grey">
+          <view class="text-lg text-grey">
             登记时间：
             <text>{{ time }}</text>
           </view>
-          <view class="text-df text-grey">
+          <view class="text-lg text-grey">
             健康状态：
             <text>{{ level }}</text>
           </view>
         </view>
       </view>
       <view class="padding-top-xl">
-        <image
+        <!-- <image
           :src="userInfo.healthCodeList[0].healthCode"
           class="img solid radius"
           mode="aspectFit"
-        />
+        /> -->
+		<image
+		  :src="healthCode"
+		  class="img solid radius"
+		  mode="aspectFit"
+		/>
       </view>
+	  
+	  <!-- 返回首页 -->
+	  <button
+	    @tap="openPage('/pages/index/index')"
+	    class="shadow round bg-purple index-btn iconfont icon-home"
+	    hover-class="cc-active"
+	  >首页</button>
+	  
     </template>
   </view>
 </template>
@@ -69,7 +83,7 @@ export default {
   },
 
   computed: {
-    ...mapState('user', ['token']),
+    ...mapState('user', ['token','healthCode']),
 
     // 身份
     post() {
@@ -173,4 +187,18 @@ export default {
   height: 400rpx;
   margin: 0 auto;
 }
+
+.index-btn {
+  position: fixed;
+  bottom: 40rpx;
+  right: 40rpx;
+  width: 96rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  padding: 0;
+}
+
+.index-btn::after {
+  border: none;
+}
 </style>