Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_app into dev

src/components/list/index.vue

@@ -17,8 +17,8 @@ export default {
       isLoading: false,
       isFinished: true,
       page: {
-        page: 0,
-        size: 10
+        pageNum: 0,
+        pageSize: 10,
       },
       dataList: []
     }
@@ -29,7 +29,7 @@ export default {
       deep: true,
       handler: debounce(
         function () {
-          this.page = { page: 0, size: 10 }
+          this.page = { pageNum: 0, pageSize: 10 }
           this.dataList = []
           this.next()
         },
@@ -58,7 +58,7 @@ export default {
   methods: {
     //
     async next() {
-      this.page.page++
+      this.page.pageNum++
       try {
         this.isLoading = true
 
@@ -68,9 +68,9 @@ export default {
         })
         // 工程商列表获取接口/api/service/find/v2/all返回结构为dataList
         const content = data.rows ? data.rows : data.dataList || data
-        this.isFinished = content.length < this.page.size
+        this.isFinished = content.length < this.page.pageSize
         await this.wrap(content)
-        if (this.page.page === 0) {
+        if (this.page.pageNum === 0) {
           this.dataList = content
         } else {
           this.dataList = this.dataList.concat(content)

src/main.js

@@ -9,8 +9,8 @@ import Vant from 'vant';
 import 'vant/lib/index.css';
 import router from './router'
 import store from './store'
-
-import dayjs from "dayjs";
+// import VueQuickCalendar from 'vue-quick-calendar'
+// import dayjs from "dayjs";
 // 设置 js中可以访问 $cdn
 import { $cdn } from '@/config'
 Vue.prototype.$cdn = $cdn
@@ -24,7 +24,7 @@ import VCalendar from 'v-calendar';
 import globals from "@/utils/global.js"//全局混入
 Vue.use(Vant);
 Vue.use(globals);
-
+// 
 Vue.use(VCalendar,{
   componentPrefix: 'vc',  // Use <vc-calendar /> instead of <v-calendar />
 });

src/views/menu/protection/components/item.vue

@@ -25,7 +25,7 @@
 import { getLabel } from '@/utils/optionEx.js'
 import * as api from '@/api/protection.js'
 import { Dialog } from 'vant'
-
+import dayjs from 'dayjs'
 export default {
   components: {},
   data() {
@@ -50,6 +50,7 @@ export default {
           api.updateStatus(data.id, status).then(r => {
             if (r.data) {
               data.status = status
+              data.statusUpdateTime = dayjs(r.data).format('YYYY-MM-DD HH:MM:ss')
             }
           })
         })