diff --git a/src/views/login1.vue b/src/views/login1.vue
index 3003166e..29ffc663 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -153,7 +153,7 @@
>
{{ loginMethod === "password" ? "短信登录" : "密码登录" }}
-
注册账号
-
- 记住密码
+ -->
+
登 录 中...
-
+
diff --git a/src/views/search/order/index.vue b/src/views/search/order/index.vue
index dcf563f8..68472799 100644
--- a/src/views/search/order/index.vue
+++ b/src/views/search/order/index.vue
@@ -267,9 +267,8 @@
style="font-weight: bold; margin-top: 10px"
v-if="item.orderStatus == 20"
>
- {{ goods.takeOverTime.slice(0, 10) }}至{{
- goods.rentOverTime.slice(0, 10)
- }}
+ {{ goods.takeOverTime ? goods.takeOverTime.slice(0, 10) : '' }}至
+ {{ goods.rentOverTime ? goods.rentOverTime.slice(0, 10) : '' }}