Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/discoveryModule/clapIndex.vue

@@ -95,6 +95,11 @@
             <span>{{scope.row.count?scope.row.count.comment:0}}</span>
           </template>
         </el-table-column>
+        <el-table-column width="200" align="center" label="发布时间">
+          <template scope="scope">
+            <span>{{scope.row.body.timeStr}}</span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" align="center" label="来源">
           <template scope="scope">
             <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
@@ -664,17 +669,17 @@
         params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
 
         if(this.listQuery.startTime  && (typeof this.listQuery.startTime == "object")){
-          params.startTime = this.listQuery.startTime.getTime()/1000;
+          params.startTime = this.listQuery.startTime.getTime();
         }
         if(this.listQuery.endTime  && (typeof this.listQuery.endTime == "object")){
-          params.endTime = this.listQuery.endTime.getTime()/1000;
+          params.endTime = this.listQuery.endTime.getTime();
         }
         page(params).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
             response.data.list.map(function(item){
-
+              item.body.timeStr = timestamp2Date(item.body.time);
             });
             listRs = response.data.list;
             totalCountRs = response.data.total;

src/views/discoveryModule/shortVideo.vue

@@ -95,6 +95,11 @@
             <span>{{scope.row.count?scope.row.count.comment:0}}</span>
           </template>
         </el-table-column>
+        <el-table-column width="200" align="center" label="发布时间">
+          <template scope="scope">
+            <span>{{scope.row.body.timeStr}}</span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" align="center" label="来源">
           <template scope="scope">
             <span>{{scope.row.source == 1? '后台创建':'app用户'}}</span>
@@ -652,17 +657,17 @@
         params.praise = this.listQuery.praise?this.listQuery.praise:undefined;
 
         if(this.listQuery.startTime  && (typeof this.listQuery.startTime == "object")){
-          params.startTime = this.listQuery.startTime.getTime()/1000;
+          params.startTime = this.listQuery.startTime.getTime();
         }
         if(this.listQuery.endTime  && (typeof this.listQuery.endTime == "object")){
-          params.endTime = this.listQuery.endTime.getTime()/1000;
+          params.endTime = this.listQuery.endTime.getTime();
         }
         page(params).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
             response.data.list.map(function(item){
-
+              item.body.timeStr = timestamp2Date(item.body.time);
             });
             listRs = response.data.list;
             totalCountRs = response.data.total;

src/views/order/rentVehicleInfo/index.vue

@@ -1160,6 +1160,8 @@ export default {
 					}
 					if(this.orderReturnVehicleCrosstown.checkUserInfo) {
 						this.checkUserInfo = JSON.parse(this.orderReturnVehicleCrosstown.checkUserInfo);
+					} else {
+						this.checkUserInfo =[]
 					}
 					if (response.data[0].imgs) {
 						this.otherImg = response.data[0].imgs.split(',')