From fe30334244b2612cdebf2314b2de218cc910303a Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 9 Jun 2024 22:57:41 +0800 Subject: [PATCH] opt some --- const.js | 11 +- publish/client/mp/Makefile | 2 + publish/client/mp/app.js | 10 +- publish/client/mp/app.json | 69 ++++++++--- publish/client/mp/app.wxml | 8 +- publish/client/mp/app.wxss | 54 +++------ publish/client/mp/pages/action/action.js | 101 +++++++++++++++- publish/client/mp/pages/action/action.wxss | 30 +++++ .../client/mp/pages/action/desktop-dark.png | Bin 0 -> 1608 bytes .../client/mp/pages/action/desktop-light.png | Bin 0 -> 1545 bytes publish/client/mp/pages/action/desktop.js | 9 ++ publish/client/mp/pages/action/desktop.wxml | 8 ++ publish/client/mp/pages/action/desktop.wxss | 3 + publish/client/mp/pages/action/dream-dark.png | Bin 0 -> 5263 bytes .../client/mp/pages/action/dream-light.png | Bin 0 -> 4629 bytes publish/client/mp/pages/action/dream.js | 9 ++ publish/client/mp/pages/action/dream.wxml | 17 +++ publish/client/mp/pages/action/dream.wxss | 11 ++ publish/client/mp/pages/action/grant.js | 21 ++++ publish/client/mp/pages/action/grant.wxml | 7 ++ publish/client/mp/pages/action/grant.wxss | 2 + publish/client/mp/pages/action/home-dark.png | Bin 0 -> 4045 bytes publish/client/mp/pages/action/home-light.png | Bin 0 -> 4099 bytes publish/client/mp/pages/action/home.js | 24 ++++ publish/client/mp/pages/action/home.wxml | 18 +++ publish/client/mp/pages/action/home.wxss | 11 ++ publish/client/mp/pages/action/my-dark.png | Bin 0 -> 4709 bytes publish/client/mp/pages/action/my-light.png | Bin 0 -> 4628 bytes publish/client/mp/pages/action/my.js | 51 ++++++++ publish/client/mp/pages/action/my.wxml | 22 ++++ publish/client/mp/pages/action/my.wxss | 9 ++ publish/client/mp/pages/insert/insert.js | 2 +- publish/client/mp/pages/river/river.js | 2 +- publish/client/mp/pages/web-chat/favor.js | 19 +++ publish/client/mp/pages/web-chat/favor.wxml | 2 + publish/client/mp/theme.json | 32 +++-- publish/client/mp/utils/frame-wx.js | 110 ++---------------- publish/client/mp/utils/lib/misc-wx.js | 47 +++++++- publish/client/mp/utils/lib/page-wx.js | 4 +- publish/client/mp/utils/lib/user-wx.js | 41 +++++-- publish/client/mp/utils/proto-wx.js | 49 ++++---- 41 files changed, 596 insertions(+), 219 deletions(-) create mode 100644 publish/client/mp/pages/action/action.wxss create mode 100644 publish/client/mp/pages/action/desktop-dark.png create mode 100644 publish/client/mp/pages/action/desktop-light.png create mode 100644 publish/client/mp/pages/action/desktop.js create mode 100644 publish/client/mp/pages/action/desktop.wxml create mode 100644 publish/client/mp/pages/action/desktop.wxss create mode 100644 publish/client/mp/pages/action/dream-dark.png create mode 100644 publish/client/mp/pages/action/dream-light.png create mode 100644 publish/client/mp/pages/action/dream.js create mode 100644 publish/client/mp/pages/action/dream.wxml create mode 100644 publish/client/mp/pages/action/dream.wxss create mode 100644 publish/client/mp/pages/action/grant.js create mode 100644 publish/client/mp/pages/action/grant.wxml create mode 100644 publish/client/mp/pages/action/grant.wxss create mode 100644 publish/client/mp/pages/action/home-dark.png create mode 100644 publish/client/mp/pages/action/home-light.png create mode 100644 publish/client/mp/pages/action/home.js create mode 100644 publish/client/mp/pages/action/home.wxml create mode 100644 publish/client/mp/pages/action/home.wxss create mode 100644 publish/client/mp/pages/action/my-dark.png create mode 100644 publish/client/mp/pages/action/my-light.png create mode 100644 publish/client/mp/pages/action/my.js create mode 100644 publish/client/mp/pages/action/my.wxml create mode 100644 publish/client/mp/pages/action/my.wxss create mode 100644 publish/client/mp/pages/web-chat/favor.js create mode 100644 publish/client/mp/pages/web-chat/favor.wxml diff --git a/const.js b/const.js index 6b8f53da..07b30f10 100644 --- a/const.js +++ b/const.js @@ -89,7 +89,7 @@ var web = { SERVE: "serve", SPACE: "space", DREAM: "dream", ROUTE: "route", SHARE: "share", TOKEN: "token", STATS: "stats", COUNT: "count", SPIDE: "spide", STORE: "store", ADMIN: "admin", MATRIX: "matrix", - GRANT: "grant", + GRANT: "grant", CHAT_GRANT: "web.chat.grant", WORKER: "worker", SERVER: "server", ORIGIN: "origin", VENDOR: "vendor", GATEWAY: "gateway", ONLINE: "online", OFFLINE: "offline", @@ -314,12 +314,19 @@ var chat = { _INIT: "_init", _DELAY_INIT: "_delay_init", _TRANS: "_trans", _STYLE: "_style", _ENGINE: "_engine", _SEARCH: "_search", _NAMES: "_names", _TOAST: "_toast", - PAGES_RIVER: "/pages/river/river", + PAGES_HOME: "/pages/action/home", + PAGES_DREAM: "/pages/action/dream", + PAGES_DESKTOP: "/pages/action/desktop", + PAGES_MY: "/pages/action/my", PAGES_ACTION: "/pages/action/action", PAGES_INSERT: "/pages/insert/insert", + PAGES_RIVER: "/pages/river/river", + PAGES_GRANT: "/pages/web-chat/grant", + WX_LOGIN_SESS: "/chat/wx/login/action/sess", WX_LOGIN_USER: "/chat/wx/login/action/user", WX_LOGIN_SCAN: "/chat/wx/login/action/scan", + API_HEADER: "/chat/header/", } var team = { TASK: "task", PLAN: "plan", ASSET: "asset", diff --git a/publish/client/mp/Makefile b/publish/client/mp/Makefile index 61d3dfe7..c26fe0bd 100644 --- a/publish/client/mp/Makefile +++ b/publish/client/mp/Makefile @@ -1,2 +1,4 @@ all: + @echo + @date +"%Y-%m-%d %H:%M:%S" ${CTX_ROOT}/bin/ice.bin web.admin web.chat.wx.ide make diff --git a/publish/client/mp/app.js b/publish/client/mp/app.js index ca51e500..48334900 100644 --- a/publish/client/mp/app.js +++ b/publish/client/mp/app.js @@ -8,7 +8,8 @@ const misc_wx = require("utils/lib/misc-wx.js") const page_wx = require("utils/lib/page-wx.js") const user_wx = require("utils/lib/user-wx.js") -App({conf: conf, +App({ + conf: conf, base: base, core: core, misc: base.Copy(misc, misc_wx), page: base.Copy(page, page_wx), @@ -16,12 +17,9 @@ App({conf: conf, onLaunch: function() { const info = wx.getSystemInfoSync() switch (info.language.toLowerCase().replaceAll("_", "-")) { case "zh-cn": base.Copy(user, require("utils/lib/zh-cn.js")); break - default: base.Copy(user, require("utils/lib/en-us.js")) - user.trans = function(can, text, list, zone) { return text } + default: base.Copy(user, require("utils/lib/en-us.js")), user.trans = function(can, text, list, zone) { return text } } - this.conf.platform = info.platform - this.conf.brand = info.brand - this.conf.model = info.model + this.conf.platform = info.platform, this.conf.brand = info.brand, this.conf.model = info.model this.misc.Info("app load", this.conf, info) }, }) diff --git a/publish/client/mp/app.json b/publish/client/mp/app.json index f9f1b7a8..6412a15c 100644 --- a/publish/client/mp/app.json +++ b/publish/client/mp/app.json @@ -1,19 +1,52 @@ { - "pages": [ - "pages/river/river", - "pages/action/action", - "pages/insert/insert" - ], - "window": { - "navigationBarBackgroundColor": "@navBgColor", - "navigationBarTextStyle": "@navTxtStyle", - "backgroundColor": "@bgColor", - "backgroundTextStyle": "@bgTxtStyle", - "backgroundColorTop": "@bgColorTop", - "backgroundColorBottom": "@bgColorBottom" - }, - "style": "v2", - "darkmode": true, - "themeLocation": "theme.json", - "sitemapLocation": "sitemap.json" -} + "darkmode": true, + "pages": [ + "pages/action/home", + "pages/action/dream", + "pages/action/desktop", + "pages/action/my", + "pages/action/grant", + "pages/action/action", + "pages/insert/insert", + "pages/web-chat/favor" + ], + "style": "v2", + "tabBar": { + "backgroundColor": "@tabBgColor", + "borderStyle": "@tabBorderStyle", + "color": "@tabFontColor", + "list": [ + { + "iconPath": "@homeIcon", + "pagePath": "pages/action/home", + "text": "首页" + }, + { + "iconPath": "@dreamIcon", + "pagePath": "pages/action/dream", + "text": "空间" + }, + { + "iconPath": "@desktopIcon", + "pagePath": "pages/action/desktop", + "text": "桌面" + }, + { + "iconPath": "@myIcon", + "pagePath": "pages/action/my", + "text": "我的" + } + ], + "selectedColor": "@tabSelectedColor" + }, + "themeLocation": "theme.json", + "window": { + "backgroundColor": "@bgColor", + "backgroundColorBottom": "@bgColorBottom", + "backgroundColorTop": "@bgColorTop", + "backgroundTextStyle": "@bgTxtStyle", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "@navBgColor", + "navigationBarTextStyle": "@navTxtStyle" + } +} \ No newline at end of file diff --git a/publish/client/mp/app.wxml b/publish/client/mp/app.wxml index 3cd8643a..2541d17e 100644 --- a/publish/client/mp/app.wxml +++ b/publish/client/mp/app.wxml @@ -1,7 +1,7 @@ -