Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

VUECODE/smart-property-manage/src/router/index.js

@@ -129,28 +129,28 @@ export const constantRouterMap = [
         component: () => import('@/views/social/transaction/transactionAdd'),
         name: 'transaction-add',
         hidden: true,
-        meta: { title: '添加二手求购', icon: 'table' }
+        meta: { title: '添加话题', icon: 'table' }
       },
       {
         path: '/transaction/transaction',
         component: () => import('@/views/social/transaction/transactionEdit'),
         name: 'transaction-edit',
         hidden: true,
-        meta: { title: '修改二手求购', icon: 'table' }
+        meta: { title: '修改话题', icon: 'table' }
       },
       {
         path: '/transaction/info',
         component: () => import('@/views/social/transaction/transactionDetails'),
         name: 'transaction-info',
         hidden: true,
-        meta: { title: '二手求购租赁详情', icon: 'table' }
+        meta: { title: '话题详情', icon: 'table' }
       },
       {
         path: '/transaction/reply',
         component: () => import('@/views/social/transaction/reply/transactionreply'),
         name: 'transactionreply-index',
         hidden: true,
-        meta: { title: '二手帖子回复列表', icon: 'table' }
+        meta: { title: '话题回复列表', icon: 'table' }
       },
       {
         path: '/transaction/transactionReport',

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -268,7 +268,12 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      // return year + '-' + month + '-' + day
+      // return year + '-' + month + '-' + day
     },
     // 举报数量
     report(sum,id){

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -230,7 +230,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
     },
     // 弹出层
     TransactionReplyOpen(id){

VUECODE/smart-property-manage/src/views/social/transaction/transactionReport/report.vue

@@ -127,7 +127,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
     }
   }
 }