Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/views/repair/tickets/Components/UserInfo.vue

@@ -213,7 +213,7 @@
                 预约订单选择
               </template>
               <el-select v-model="formData.bookingId" size="small">
-                <el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="item.bookingTime" />
+                <el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="parseTime(item.bookingTime)" />
               </el-select>
             </el-descriptions-item>
             <!--      <el-descriptions-item :span="3">-->
@@ -720,6 +720,7 @@ export default {
         method: "get"
       })
       this.bookingList = res.data
+      console.log(this.bookingList,723)
     },
     // 权益更改
     changeCoupon(data){