魏熙美 5 år sedan
förälder
incheckning
785e5bf798

+ 6
- 2
src/views/building/list.vue Visa fil

@@ -97,7 +97,7 @@
97 97
         prop="openingDate"
98 98
         label="开盘时间">
99 99
         <template slot-scope="scope">
100
-          <span>{{(scope.row.openingDate || '').split(' ')[0]}}</span>
100
+          <span>{{formateDate((scope.row.openingDate || '').split(' ')[0])}}</span>
101 101
         </template>
102 102
       </el-table-column>
103 103
       <el-table-column
@@ -119,7 +119,7 @@
119 119
         prop="createDate"
120 120
         label="录入时间">
121 121
         <template slot-scope="scope">
122
-          <span>{{(scope.row.createDate || '').split(' ')[0]}}</span>
122
+          <span>{{ formateDate((scope.row.createDate || '').split(' ')[0])}}</span>
123 123
         </template>
124 124
       </el-table-column>
125 125
       <el-table-column
@@ -157,6 +157,7 @@
157 157
 import { createNamespacedHelpers } from 'vuex';
158 158
 const {mapState: mapBuildingState, mapActions: mapBuildingActions} = createNamespacedHelpers('building')
159 159
 import { mapState } from 'vuex'
160
+import dayjs from 'dayjs'
160 161
 
161 162
 export default {
162 163
   data() {
@@ -271,6 +272,9 @@ export default {
271 272
         })
272 273
       })
273 274
     },
275
+    formateDate(dt) {
276
+       return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
277
+    },
274 278
     handleUnPulic (row) {
275 279
       this.$confirm('确认取消发布此数据?', '提示', {
276 280
         confirmButtonText: '确定',

+ 0
- 1
src/views/customer/editRecommend.vue Visa fil

@@ -232,7 +232,6 @@ export default {
232 232
       this.imgList = fileList;
233 233
     },
234 234
     submitForm() {
235
-        console.log('this.detail: ', this.detail)
236 235
       this.showLoadding("保存中...");
237 236
       this.$store.dispatch('customer/verifyRecommend',this.detail)
238 237
         .then(res => {

+ 2
- 2
src/views/indexEcharts/components/UserActive.vue Visa fil

@@ -33,14 +33,14 @@ export default {
33 33
       theType: 'day',
34 34
       types: [
35 35
         {label: '日活跃', value: 'day'},
36
-        {label: '周活跃', value: 'week'},
36
+        // {label: '周活跃', value: 'week'},
37 37
         {label: '月活跃', value: 'month'},
38 38
       ],
39 39
       defaultOpt: {
40 40
         legend: { show: false },
41 41
         color: ['#8954BA', '#175DFB', '#0BB963', '#27DEFF', '#E713D2', '#E71313'],
42 42
         tooltip: {},
43
-        xAxis: { type: 'time' },
43
+        xAxis: { type: 'category' },
44 44
         yAxis: {},
45 45
       },
46 46
     }

+ 1
- 1
src/views/systemManagement/Intention.vue Visa fil

@@ -47,7 +47,7 @@
47 47
             },
48 48
             onSubmit() {
49 49
                 this.$store.dispatch('building/saveOrUpdateBatchBuildingIntention',{ list: this.list, buildingId: this.buildingId }).then((res) => {
50
-                    this.$notify.message("操作成功!")
50
+                    this.$notify.success('操作成功');
51 51
                 }).catch((err) => {
52 52
                     this.$notify.error(err.msg || err.message)
53 53
                 })