From 920777db52a41d468eda0be6b3025ea2e0cb4e5b Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 11 Jun 2021 09:46:02 +0800 Subject: [PATCH] no message --- app.js | 2 +- app.json | 13 ++++--------- pages/home/index/index.wxml | 4 ++-- pages/login/index.js | 2 +- {client => xtends/client}/factory-list/index.js | 4 ++-- {client => xtends/client}/factory-list/index.json | 0 {client => xtends/client}/factory-list/index.wxml | 0 {client => xtends/client}/factory-list/index.wxss | 0 {client => xtends/client}/formate.wxs | 0 {client => xtends/client}/home/index.js | 14 +++++++------- {client => xtends/client}/home/index.json | 0 {client => xtends/client}/home/index.wxml | 0 {client => xtends/client}/home/index.wxss | 0 {client => xtends/client}/index/index.js | 2 +- {client => xtends/client}/index/index.json | 6 +++--- {client => xtends/client}/index/index.wxml | 0 {client => xtends/client}/index/index.wxss | 0 {client => xtends/client}/message/detail/index.js | 0 .../client}/message/detail/index.json | 0 .../client}/message/detail/index.wxml | 0 .../client}/message/detail/index.wxss | 0 {client => xtends/client}/message/index/index.js | 6 +++--- {client => xtends/client}/message/index/index.json | 0 {client => xtends/client}/message/index/index.wxml | 0 {client => xtends/client}/message/index/index.wxss | 0 {client => xtends/client}/order-list/index.js | 4 ++-- {client => xtends/client}/order-list/index.json | 0 {client => xtends/client}/order-list/index.wxml | 0 {client => xtends/client}/order-list/index.wxss | 0 {client => xtends/client}/workbench/index.js | 4 ++-- {client => xtends/client}/workbench/index.json | 0 {client => xtends/client}/workbench/index.wxml | 0 {client => xtends/client}/workbench/index.wxss | 0 33 files changed, 28 insertions(+), 33 deletions(-) rename {client => xtends/client}/factory-list/index.js (95%) rename {client => xtends/client}/factory-list/index.json (100%) rename {client => xtends/client}/factory-list/index.wxml (100%) rename {client => xtends/client}/factory-list/index.wxss (100%) rename {client => xtends/client}/formate.wxs (100%) rename {client => xtends/client}/home/index.js (88%) rename {client => xtends/client}/home/index.json (100%) rename {client => xtends/client}/home/index.wxml (100%) rename {client => xtends/client}/home/index.wxss (100%) rename {client => xtends/client}/index/index.js (97%) rename {client => xtends/client}/index/index.json (59%) rename {client => xtends/client}/index/index.wxml (100%) rename {client => xtends/client}/index/index.wxss (100%) rename {client => xtends/client}/message/detail/index.js (100%) rename {client => xtends/client}/message/detail/index.json (100%) rename {client => xtends/client}/message/detail/index.wxml (100%) rename {client => xtends/client}/message/detail/index.wxss (100%) rename {client => xtends/client}/message/index/index.js (94%) rename {client => xtends/client}/message/index/index.json (100%) rename {client => xtends/client}/message/index/index.wxml (100%) rename {client => xtends/client}/message/index/index.wxss (100%) rename {client => xtends/client}/order-list/index.js (97%) rename {client => xtends/client}/order-list/index.json (100%) rename {client => xtends/client}/order-list/index.wxml (100%) rename {client => xtends/client}/order-list/index.wxss (100%) rename {client => xtends/client}/workbench/index.js (95%) rename {client => xtends/client}/workbench/index.json (100%) rename {client => xtends/client}/workbench/index.wxml (100%) rename {client => xtends/client}/workbench/index.wxss (100%) diff --git a/app.js b/app.js index dbe5e0f..68d51be 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 2, // 0: 开发版本；1：测试版本；2：生产版本 + evn: 0, // 0: 开发版本；1：测试版本；2：生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: '2.0.0', xAppId: '503258978847953926', diff --git a/app.json b/app.json index bc1aebb..c81093c 100644 --- a/app.json +++ b/app.json @@ -57,18 +57,13 @@ "pages/setting/paper-detial/index" ], "subpackages": [ - { - "root": "client/", - "pages": [ - "index/index", - "message/detail/index", - "order-list/index", - "factory-list/index" - ] - }, { "root": "xtends/", "pages": [ + "client/index/index", + "client/message/detail/index", + "client/order-list/index", + "client/factory-list/index", "statics/index/index", "statics/agent-report/index", "statics/gross-report/index", diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index 79bcc66..f6175dd 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -46,9 +46,9 @@ - + diff --git a/pages/login/index.js b/pages/login/index.js index f56e5fb..4fac4ec 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -429,7 +429,7 @@ Page({ bindCustomer(this.data.metaData).then(result => { this.data.metaData = null this.setData({loging: false}) - wx.redirectTo({ url: '/client/index/index' }) + wx.redirectTo({ url: '/xtends/client/index/index' }) }).catch(error => { this.setData({loging: false}) util.showToast(error) diff --git a/client/factory-list/index.js b/xtends/client/factory-list/index.js similarity index 95% rename from client/factory-list/index.js rename to xtends/client/factory-list/index.js index eff1919..87f5937 100644 --- a/client/factory-list/index.js +++ b/xtends/client/factory-list/index.js @@ -1,6 +1,6 @@ // pages/client/order-list/index.js -import { getFactoryOrderList } from "../../api/saas" -const util = require('../../utils/util') +import { getFactoryOrderList } from "../../../api/saas" +const util = require('../../../utils/util') const app = getApp() Page({ diff --git a/client/factory-list/index.json b/xtends/client/factory-list/index.json similarity index 100% rename from client/factory-list/index.json rename to xtends/client/factory-list/index.json diff --git a/client/factory-list/index.wxml b/xtends/client/factory-list/index.wxml similarity index 100% rename from client/factory-list/index.wxml rename to xtends/client/factory-list/index.wxml diff --git a/client/factory-list/index.wxss b/xtends/client/factory-list/index.wxss similarity index 100% rename from client/factory-list/index.wxss rename to xtends/client/factory-list/index.wxss diff --git a/client/formate.wxs b/xtends/client/formate.wxs similarity index 100% rename from client/formate.wxs rename to xtends/client/formate.wxs diff --git a/client/home/index.js b/xtends/client/home/index.js similarity index 88% rename from client/home/index.js rename to xtends/client/home/index.js index e3e708a..07871c3 100644 --- a/client/home/index.js +++ b/xtends/client/home/index.js @@ -1,11 +1,11 @@ // pages/stock/index.js -import Dialog from '../../components/dialog/dialog' -import { finalizeToken } from "../../api/user" -import { getBalanceInfo } from '../../api/payment' -const util = require('../../utils/util') -const event = require('../../utils/event') -const math = require('../../utils/math') -const storage = require('../../utils/storage') +import Dialog from '../../../components/dialog/dialog' +import { finalizeToken } from "../../../api/user" +import { getBalanceInfo } from '../../../api/payment' +const util = require('../../../utils/util') +const event = require('../../../utils/event') +const math = require('../../../utils/math') +const storage = require('../../../utils/storage') const app = getApp() Component({ diff --git a/client/home/index.json b/xtends/client/home/index.json similarity index 100% rename from client/home/index.json rename to xtends/client/home/index.json diff --git a/client/home/index.wxml b/xtends/client/home/index.wxml similarity index 100% rename from client/home/index.wxml rename to xtends/client/home/index.wxml diff --git a/client/home/index.wxss b/xtends/client/home/index.wxss similarity index 100% rename from client/home/index.wxss rename to xtends/client/home/index.wxss diff --git a/client/index/index.js b/xtends/client/index/index.js similarity index 97% rename from client/index/index.js rename to xtends/client/index/index.js index e76a7a1..c4cef31 100644 --- a/client/index/index.js +++ b/xtends/client/index/index.js @@ -1,5 +1,5 @@ // pages/administ/index.js -const event = require('../../utils/event') +const event = require('../../../utils/event') const app = getApp() Page({ diff --git a/client/index/index.json b/xtends/client/index/index.json similarity index 59% rename from client/index/index.json rename to xtends/client/index/index.json index 54bdfe4..3952be8 100644 --- a/client/index/index.json +++ b/xtends/client/index/index.json @@ -3,9 +3,9 @@ "van-icon": "/components/icon/index", "van-tabbar": "/components/tabbar/index", "van-tabbar-item": "/components/tabbar-item/index", - "message": "/client/message/index/index", - "workbench": "/client/workbench/index", - "home": "/client/home/index", + "message": "/xtends/client/message/index/index", + "workbench": "/xtends/client/workbench/index", + "home": "/xtends/client/home/index", "van-dialog": "/components/dialog/index" } } \ No newline at end of file diff --git a/client/index/index.wxml b/xtends/client/index/index.wxml similarity index 100% rename from client/index/index.wxml rename to xtends/client/index/index.wxml diff --git a/client/index/index.wxss b/xtends/client/index/index.wxss similarity index 100% rename from client/index/index.wxss rename to xtends/client/index/index.wxss diff --git a/client/message/detail/index.js b/xtends/client/message/detail/index.js similarity index 100% rename from client/message/detail/index.js rename to xtends/client/message/detail/index.js diff --git a/client/message/detail/index.json b/xtends/client/message/detail/index.json similarity index 100% rename from client/message/detail/index.json rename to xtends/client/message/detail/index.json diff --git a/client/message/detail/index.wxml b/xtends/client/message/detail/index.wxml similarity index 100% rename from client/message/detail/index.wxml rename to xtends/client/message/detail/index.wxml diff --git a/client/message/detail/index.wxss b/xtends/client/message/detail/index.wxss similarity index 100% rename from client/message/detail/index.wxss rename to xtends/client/message/detail/index.wxss diff --git a/client/message/index/index.js b/xtends/client/message/index/index.js similarity index 94% rename from client/message/index/index.js rename to xtends/client/message/index/index.js index 8fc2f6e..277bd37 100644 --- a/client/message/index/index.js +++ b/xtends/client/message/index/index.js @@ -1,6 +1,6 @@ -import { getMessageList } from "../../../api/saas" -const event = require('../../../utils/event') -const util = require('../../../utils/util') +import { getMessageList } from "../../../../api/saas" +const event = require('../../../../utils/event') +const util = require('../../../../utils/util') const app = getApp() Component({ diff --git a/client/message/index/index.json b/xtends/client/message/index/index.json similarity index 100% rename from client/message/index/index.json rename to xtends/client/message/index/index.json diff --git a/client/message/index/index.wxml b/xtends/client/message/index/index.wxml similarity index 100% rename from client/message/index/index.wxml rename to xtends/client/message/index/index.wxml diff --git a/client/message/index/index.wxss b/xtends/client/message/index/index.wxss similarity index 100% rename from client/message/index/index.wxss rename to xtends/client/message/index/index.wxss diff --git a/client/order-list/index.js b/xtends/client/order-list/index.js similarity index 97% rename from client/order-list/index.js rename to xtends/client/order-list/index.js index 77053f6..872b0ad 100644 --- a/client/order-list/index.js +++ b/xtends/client/order-list/index.js @@ -1,6 +1,6 @@ // pages/client/order-list/index.js -import { getCustomerOrderList } from "../../api/saas" -const util = require('../../utils/util') +import { getCustomerOrderList } from "../../../api/saas" +const util = require('../../../utils/util') const app = getApp() Page({ diff --git a/client/order-list/index.json b/xtends/client/order-list/index.json similarity index 100% rename from client/order-list/index.json rename to xtends/client/order-list/index.json diff --git a/client/order-list/index.wxml b/xtends/client/order-list/index.wxml similarity index 100% rename from client/order-list/index.wxml rename to xtends/client/order-list/index.wxml diff --git a/client/order-list/index.wxss b/xtends/client/order-list/index.wxss similarity index 100% rename from client/order-list/index.wxss rename to xtends/client/order-list/index.wxss diff --git a/client/workbench/index.js b/xtends/client/workbench/index.js similarity index 95% rename from client/workbench/index.js rename to xtends/client/workbench/index.js index b439839..7ba85e4 100644 --- a/client/workbench/index.js +++ b/xtends/client/workbench/index.js @@ -1,6 +1,6 @@ // pages/index/index.js -import { getStatisticsInfo } from "../../api/saas" -const event = require('../../utils/event') +import { getStatisticsInfo } from "../../../api/saas" +const event = require('../../../utils/event') const app = getApp() Component({ diff --git a/client/workbench/index.json b/xtends/client/workbench/index.json similarity index 100% rename from client/workbench/index.json rename to xtends/client/workbench/index.json diff --git a/client/workbench/index.wxml b/xtends/client/workbench/index.wxml similarity index 100% rename from client/workbench/index.wxml rename to xtends/client/workbench/index.wxml diff --git a/client/workbench/index.wxss b/xtends/client/workbench/index.wxss similarity index 100% rename from client/workbench/index.wxss rename to xtends/client/workbench/index.wxss