Merge branch 'dev' of xiongzhu/raex_front into master

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://www.raex.vip/
+VUE_APP_BASE_URL=https://test.raex.vip/
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/components/ChatInfo.vue

@@ -162,7 +162,7 @@ const noticeStr = computed(() => {
 });
 
 const timeStr = computed(() => {
-    let day1 = dayjs(props.info.time || props.info.timetag || props.info.createdAt);
+    let day1 = dayjs(props.info.time || props.info.createdAt);
     let day2 = '';
     if (props.beforeTime) {
         day2 = dayjs(props.beforeTime);

src/plugins/chat.js

@@ -188,7 +188,7 @@ function getPushMsg(msgs, oldMsgs = []) {
         .map(item => {
             return {
                 ...item,
-                time: item.time || item.timetag || new Date(item.createdAt)
+                time: item.time || new Date(item.createdAt)
             };
         })
         .sort((a, b) => {

src/views/chat/Detail.vue

@@ -32,9 +32,7 @@
                 v-for="(item, index) in list"
                 :key="index"
                 :info="item"
-                :beforeTime="
-                    index > 0 ? list[index - 1].time || list[index - 1].timetag || list[index - 1].createdAt : ''
-                "
+                :beforeTime="index > 0 ? list[index - 1].time || list[index - 1].createdAt : ''"
             ></chat-info>
         </div>