huangyouyou 11 месяцев назад
Родитель
Сommit
8e51bba2ce
25 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      pages/index/index.vue
  2. BIN
      static/image/新建文件夹/img_saoma.png
  3. BIN
      static/image/新建文件夹/manual_icon_arrow.png
  4. BIN
      static/image/新建文件夹/manual_icon_class.png
  5. BIN
      static/image/新建文件夹/manual_icon_class_selected.png
  6. BIN
      static/image/新建文件夹/manual_icon_grade.png
  7. BIN
      static/image/新建文件夹/manual_icon_grade_selected.png
  8. BIN
      static/image/新建文件夹/manual_icon_student.png
  9. BIN
      static/image/新建文件夹/manual_icon_student_selected.png
  10. BIN
      static/image/新建文件夹/test_icon_boy.png
  11. BIN
      static/image/新建文件夹/test_icon_eye.png
  12. BIN
      static/image/新建文件夹/test_icon_fei.png
  13. BIN
      static/image/新建文件夹/test_icon_gril.png
  14. BIN
      static/image/新建文件夹/test_icon_hight.png
  15. BIN
      static/image/新建文件夹/test_icon_id.png
  16. BIN
      static/image/新建文件夹/test_icon_kg.png
  17. BIN
      static/image/新建文件夹/test_icon_school.png
  18. BIN
      static/image/新建文件夹/test_img_adron.png
  19. BIN
      static/image/新建文件夹/test_img_head_boy.png
  20. BIN
      static/image/新建文件夹/test_img_head_gril.png
  21. 1 1
      store/useConfigStore.js
  22. 1 1
      store/useMachineStore.js
  23. 1 1
      uni_modules/uv-calendar/components/uv-calendar/month.vue
  24. 1 1
      uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue
  25. 1 1
      uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue

+ 1 - 1
pages/index/index.vue

@@ -35,7 +35,7 @@ import {getAllMethods, logs, sleep} from "@/utils/util";
 import * as ASCIIUtils from "@/uni_modules/wrs-js-modbusCRCHex/js_sdk/wrs-ASCIIUtils";
 import * as HexUtils from "@/uni_modules/wrs-js-modbusCRCHex/js_sdk/wrs-HexUtils";
 import {orderToData} from "@/utils/ble/hex";
-import dayjs from "dayjs";
+import * as dayjs from "@/utils/dayjs";
 
 const $machine = inject('$machine')
 

BIN
static/image/新建文件夹/img_saoma.png


BIN
static/image/新建文件夹/manual_icon_arrow.png


BIN
static/image/新建文件夹/manual_icon_class.png


BIN
static/image/新建文件夹/manual_icon_class_selected.png


BIN
static/image/新建文件夹/manual_icon_grade.png


BIN
static/image/新建文件夹/manual_icon_grade_selected.png


BIN
static/image/新建文件夹/manual_icon_student.png


BIN
static/image/新建文件夹/manual_icon_student_selected.png


BIN
static/image/新建文件夹/test_icon_boy.png


BIN
static/image/新建文件夹/test_icon_eye.png


BIN
static/image/新建文件夹/test_icon_fei.png


BIN
static/image/新建文件夹/test_icon_gril.png


BIN
static/image/新建文件夹/test_icon_hight.png


BIN
static/image/新建文件夹/test_icon_id.png


BIN
static/image/新建文件夹/test_icon_kg.png


BIN
static/image/新建文件夹/test_icon_school.png


BIN
static/image/新建文件夹/test_img_adron.png


BIN
static/image/新建文件夹/test_img_head_boy.png


BIN
static/image/新建文件夹/test_img_head_gril.png


+ 1 - 1
store/useConfigStore.js

@@ -4,7 +4,7 @@ import platform from "@/utils/platform";
 import {getSystemDeviceInfo} from "@/utils/getSystemDeviceInfo";
 import {FileStorage} from "@/utils/fileStorage";
 import {confirmModal, showToast} from "@/utils/app";
-import dayjs from "dayjs";
+import * as dayjs from "@/utils/dayjs"
 import {logs} from "@/utils/util";
 import {calcStrHash} from "@/utils/machine/function";
 

+ 1 - 1
store/useMachineStore.js

@@ -4,7 +4,7 @@ import platform from "@/utils/platform";
 import {getSystemDeviceInfo} from "@/utils/getSystemDeviceInfo";
 import {FileStorage} from "@/utils/fileStorage";
 import {confirmModal, showToast} from "@/utils/app";
-import dayjs from "dayjs";
+import * as dayjs from "@/utils/dayjs";
 import {logs} from "@/utils/util";
 import {calcStrHash} from "@/utils/machine/function";
 

+ 1 - 1
uni_modules/uv-calendar/components/uv-calendar/month.vue

@@ -39,7 +39,7 @@
 	import { colorGradient } from '@/uni_modules/uv-ui-tools/libs/function/colorGradient.js';
 	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
-	import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+	import * as dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
 	export default {
 		name: 'uv-calendar-month',
 		emits:['monthSelected','updateMonthTop','change'],

+ 1 - 1
uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue

@@ -66,7 +66,7 @@ import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
 import uvHeader from './header.vue'
 import uvMonth from './month.vue'
 import props from './props.js'
-import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+import * as dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
 import Calendar from './calendar.js'
 /**
  * Calendar 日历

+ 1 - 1
uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue

@@ -33,7 +33,7 @@
 	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
 	import props from './props.js';
-	import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+	import * as dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
 	/**
 	 * DatetimePicker 时间日期选择器
 	 * @description 此选择器用于时间日期