diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json index 4dc7375f..c153daff 100644 --- a/yanzhu-ui-app/miniprogram/app.json +++ b/yanzhu-ui-app/miniprogram/app.json @@ -43,8 +43,7 @@ "project_schedule/info/index", "project_checked/list/index", "project_checked/add/index", - "project_checked/info/index", - "project_checked/handle/index" + "project_checked/info/index" ], "independent": false } diff --git a/yanzhu-ui-app/miniprogram/components/svg-icon/base64.js b/yanzhu-ui-app/miniprogram/pageage/components/svg-icon/base64.js similarity index 100% rename from yanzhu-ui-app/miniprogram/components/svg-icon/base64.js rename to yanzhu-ui-app/miniprogram/pageage/components/svg-icon/base64.js diff --git a/yanzhu-ui-app/miniprogram/components/svg-icon/index.js b/yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.js similarity index 100% rename from yanzhu-ui-app/miniprogram/components/svg-icon/index.js rename to yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.js diff --git a/yanzhu-ui-app/miniprogram/components/svg-icon/index.json b/yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.json similarity index 100% rename from yanzhu-ui-app/miniprogram/components/svg-icon/index.json rename to yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.json diff --git a/yanzhu-ui-app/miniprogram/components/svg-icon/index.wxml b/yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.wxml similarity index 100% rename from yanzhu-ui-app/miniprogram/components/svg-icon/index.wxml rename to yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.wxml diff --git a/yanzhu-ui-app/miniprogram/components/svg-icon/index.wxss b/yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.wxss similarity index 100% rename from yanzhu-ui-app/miniprogram/components/svg-icon/index.wxss rename to yanzhu-ui-app/miniprogram/pageage/components/svg-icon/index.wxss diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js index f388a85f..eb26e433 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js @@ -1,9 +1,9 @@ // pageage/project_checked/add/index.js import config from "../../../config"; -import fmt from "../../../utils/date.js"; +import fmt from "../../utils/date.js"; import { getToken, getUserInfo } from "../../../utils/auth"; -import { uploadFiles } from "../../../utils/upload.js"; -import { tryToJson } from '../../../utils/tools' +import { uploadFiles } from "../../utils/upload.js"; +import { tryToJson } from '../../utils/tools' import { getProjectChecked, findPlanDatas, diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js index e01be930..d74368da 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js @@ -1,18 +1,12 @@ // pageage/project_checked/info/index.js import config from "../../../config"; -import fmt from "../../../utils/date.js"; import { getToken, getUserInfo } from "../../../utils/auth"; -import { uploadFiles } from "../../../utils/upload.js"; -import { tryToJson } from '../../../utils/tools' -import { - findDictCache, -} from '../../../api/publics' +import { uploadFiles } from "../../utils/upload.js"; +import { tryToJson } from '../../utils/tools' + import { getProjectChecked, - findPlanDatas, - listProProjectInfoSubdeptsUsers, updateProjectChecked, - addProjectChecked, } from "../../../api/project"; const app = getApp(); Page({ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js index fef901c3..ba0a2d1f 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js @@ -7,7 +7,7 @@ import { projectCheckedList, projectCheckedListCount } from '../../../api/project' -import { tryToJson } from '../../../utils/tools' +import { tryToJson } from '../../utils/tools' const app = getApp() Page({ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json index e1c274e2..33aad63e 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "svg-icon": "/components/svg-icon/index" + "svg-icon": "/pageage/components/svg-icon/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/utils/date.js b/yanzhu-ui-app/miniprogram/pageage/utils/date.js similarity index 100% rename from yanzhu-ui-app/miniprogram/utils/date.js rename to yanzhu-ui-app/miniprogram/pageage/utils/date.js diff --git a/yanzhu-ui-app/miniprogram/utils/moment.min.js b/yanzhu-ui-app/miniprogram/pageage/utils/moment.min.js similarity index 100% rename from yanzhu-ui-app/miniprogram/utils/moment.min.js rename to yanzhu-ui-app/miniprogram/pageage/utils/moment.min.js diff --git a/yanzhu-ui-app/miniprogram/utils/tools.js b/yanzhu-ui-app/miniprogram/pageage/utils/tools.js similarity index 100% rename from yanzhu-ui-app/miniprogram/utils/tools.js rename to yanzhu-ui-app/miniprogram/pageage/utils/tools.js diff --git a/yanzhu-ui-app/miniprogram/utils/upload.js b/yanzhu-ui-app/miniprogram/pageage/utils/upload.js similarity index 97% rename from yanzhu-ui-app/miniprogram/utils/upload.js rename to yanzhu-ui-app/miniprogram/pageage/utils/upload.js index 8171126b..986a1868 100644 --- a/yanzhu-ui-app/miniprogram/utils/upload.js +++ b/yanzhu-ui-app/miniprogram/pageage/utils/upload.js @@ -3,8 +3,8 @@ * 封装微信小程序文件上传功能 */ -const config = require('../config.js'); -const { getToken } = require('../utils/auth.js'); +const config = require('../../config.js'); +const { getToken } = require('../../utils/auth.js'); /** * 文件上传工具类 diff --git a/yanzhu-ui-app/miniprogram/pages/components/voucher-datetime/index.js b/yanzhu-ui-app/miniprogram/pages/components/voucher-datetime/index.js index 0ba8dba3..d5648c0b 100644 --- a/yanzhu-ui-app/miniprogram/pages/components/voucher-datetime/index.js +++ b/yanzhu-ui-app/miniprogram/pages/components/voucher-datetime/index.js @@ -1,5 +1,5 @@ // pages/components/voucher-select/index.js -import fmt from '../../../utils/date.js' + Component({ /** * 组件的属性列表 @@ -87,8 +87,7 @@ Component({ */ methods: { showPopup() { - debugger - let cDate = this.properties.currentDate ? this.properties.currentDate : this.properties.value ? +fmt(this.properties.value) : +(new Date()) + let cDate = this.properties.currentDate ? this.properties.currentDate : this.properties.value ? +Date.parse(this.properties.value) : +(new Date()) this.setData({ currDate: cDate, show: true diff --git a/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue b/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue index a45613d4..177566fe 100644 --- a/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue @@ -147,7 +147,7 @@ - + {{ form.projectName }}