diff --git a/pages/api/axios.js b/api/axios.js similarity index 100% rename from pages/api/axios.js rename to api/axios.js diff --git a/pages/api/request.js b/api/request.js similarity index 98% rename from pages/api/request.js rename to api/request.js index 7364b7f..220a00d 100644 --- a/pages/api/request.js +++ b/api/request.js @@ -3,8 +3,8 @@ */ import axios from "./axios" -const event = require('../../utils/event') -const storage = require('../../utils/storage') +const event = require('../utils/event') +const storage = require('../utils/storage') const app = getApp() /** * axios defaults 配置 diff --git a/pages/api/saas.js b/api/saas.js similarity index 100% rename from pages/api/saas.js rename to api/saas.js diff --git a/pages/api/user.js b/api/user.js similarity index 98% rename from pages/api/user.js rename to api/user.js index 9adc51f..7d70816 100644 --- a/pages/api/user.js +++ b/api/user.js @@ -3,8 +3,8 @@ */ import { mGet, mPost } from "./request" import { sconfig } from "./saas" -const util = require('../../utils/util') -const storage = require('../../utils/storage') +const util = require('../utils/util') +const storage = require('../utils/storage') const app = getApp() const config = { diff --git a/pages/formate.wxs b/pages/formate.wxs index c3304f2..1e03ef7 100644 --- a/pages/formate.wxs +++ b/pages/formate.wxs @@ -52,7 +52,12 @@ function formateDate(datetime) { return datetime + week } +function formateAmount(amount) { + return Number(amount).toFixed(2) +} + module.exports = { + formateAmount: formateAmount, formatTime: formatTime, formateDate: formateDate } \ No newline at end of file diff --git a/pages/home/authory/index.js b/pages/home/authory/index.js index 2ace65b..05a78b7 100644 --- a/pages/home/authory/index.js +++ b/pages/home/authory/index.js @@ -1,5 +1,5 @@ // pages/home/authory/index.js -import { getAuthSession, certificateImage, certificateIdentity} from "../../api/user" +import { getAuthSession, certificateImage, certificateIdentity} from "../../../api/user" import Dialog from '../../../components/dialog/dialog' const util = require('../../../utils/util') const event = require('../../../utils/event') diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js index 21672c3..b425f04 100644 --- a/pages/home/employee/index.js +++ b/pages/home/employee/index.js @@ -1,5 +1,5 @@ // pages/home/employee/index.js -import { getCheckList, getEmployeList, auditEmploye, adminEmploye, deleteEmploye, qrcodeEmploye } from "../../api/user" +import { getCheckList, getEmployeList, auditEmploye, adminEmploye, deleteEmploye, qrcodeEmploye } from "../../../api/user" const util = require('../../../utils/util') const app = getApp() diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 125f6fe..cb56404 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -1,6 +1,6 @@ // pages/stock/index.js import Dialog from '../../../components/dialog/dialog' -import { finalizeToken } from "../../api/user" +import { finalizeToken } from "../../../api/user" const util = require('../../../utils/util') const event = require('../../../utils/event') const storage = require('../../../utils/storage') diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index 4c53ab5..7d8d2dd 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -1,4 +1,4 @@ - + 我的 diff --git a/pages/home/mobile/index.js b/pages/home/mobile/index.js index 21fc640..8a1df33 100644 --- a/pages/home/mobile/index.js +++ b/pages/home/mobile/index.js @@ -1,5 +1,5 @@ // pages/home/mobile/index.js -const util = require('../../../utils/util'); +const util = require('../../../utils/util') const app = getApp() Page({ diff --git a/pages/login/index.js b/pages/login/index.js index 319c82a..d325898 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,7 +1,7 @@ //获取应用实例 import Dialog from '../../components/dialog/dialog' -import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode } from "../api/user" -import { sconfig, loginToken, getBaseInfo } from "../api/saas" +import { config, wechatApplet, loginWechat, postCaptcha, loginCaptcha, loginPwd, verifyCode } from "../../api/user" +import { sconfig, loginToken, getBaseInfo } from "../../api/saas" const util = require('../../utils/util') const storage = require('../../utils/storage') const app = getApp() diff --git a/pages/process/index/index.js b/pages/process/index/index.js index f40c63d..8abed98 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -1,5 +1,5 @@ // pages/index/index.js -import { getUserInfo } from "../../api/user" +import { getUserInfo } from "../../../api/user" const event = require('../../../utils/event') const app = getApp() diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js index 67e05ff..7774ad5 100644 --- a/pages/process/order-check/index.js +++ b/pages/process/order-check/index.js @@ -1,6 +1,6 @@ // pages/process/order-check/index.js import Dialog from '../../../components/dialog/dialog' -import { pricingOrder, cancelOrder, getFactoryOrderInfo, getPaperPrice} from "../../api/saas" +import { pricingOrder, cancelOrder, getFactoryOrderInfo, getPaperPrice} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js index 9a8e955..219a080 100644 --- a/pages/process/order-info/index.js +++ b/pages/process/order-info/index.js @@ -1,6 +1,6 @@ // pages/process/order-check/index.js import Dialog from '../../../components/dialog/dialog' -import { cancelOrder, getFactoryOrderInfo, checkingOrder} from "../../api/saas" +import { cancelOrder, getFactoryOrderInfo, checkingOrder} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js index fe0e21d..a5bdddb 100644 --- a/pages/process/order-list/index.js +++ b/pages/process/order-list/index.js @@ -1,6 +1,6 @@ // pages/process/order-list/index.js import Dialog from '../../../components/dialog/dialog' -import { getFactoryOrderList, cancelOrder } from "../../api/saas" +import { getFactoryOrderList, cancelOrder } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp()