From 66d08cc899612be19eb77ad449b1a90f5192d599 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sat, 14 Mar 2020 18:19:21 +0800
Subject: [PATCH] #I1BLJM #I1BLV6

---
 src/components/material/index.vue | 2 +-
 src/views/shop/order/detail.vue   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/material/index.vue b/src/components/material/index.vue
index 0f0de5e..7d8fb6c 100644
--- a/src/components/material/index.vue
+++ b/src/components/material/index.vue
@@ -103,7 +103,7 @@
                         :src="item.url"
                         fit="contain"
                         :preview-src-list="[item.url]"
-                        z-index="999"
+                        :z-index=999
                       />
                       <div>
                         <el-checkbox class="material-name" :label="item.url">
diff --git a/src/views/shop/order/detail.vue b/src/views/shop/order/detail.vue
index 0ec0ad1..4375aa8 100644
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@@ -25,8 +25,8 @@
           <div class="text item">订单状态: {{ form.statusName }}</div>
           <div class="text item">商品总价: {{ form.totalPrice }}</div>
           <div class="text item">优惠券金额: {{ form.couponPrice }}</div>
-          <div class="text item">创建时间: {{ formatTime(form.addTime) }}</div>
-          <div class="text item">支付时间: {{ formatTime(form.payTime) }}</div>
+          <div class="text item">创建时间: {{ parseTime(form.addTime) }}</div>
+          <div class="text item">支付时间: {{ parseTime(form.payTime) }}</div>
         </el-col>
       </el-row>
     </el-card>
@@ -48,7 +48,7 @@
 
 <script>
 import { add, edit } from '@/api/yxStoreOrder'
-import { formatTime } from '@/utils/index'
+import { parseTime } from '@/utils/index'
 export default {
   props: {
     isAdd: {
@@ -120,7 +120,7 @@ export default {
     }
   },
   methods: {
-    formatTime,
+    parseTime,
     cancel() {
       this.resetForm()
     },