diff --git a/quickapp/package.json b/quickapp/package.json
index 8ec57f9..f8d4e1b 100644
--- a/quickapp/package.json
+++ b/quickapp/package.json
@@ -19,7 +19,9 @@
},
"dependencies": {
"apex-ui": "^1.9.2",
- "dayjs": "^1.10.7"
+ "dayjs": "^1.10.7",
+ "markdown-it": "^12.3.2",
+ "punycode": "^2.1.1"
},
"devDependencies": {
"@babel/runtime": "^7.12.5",
diff --git a/quickapp/src/app.ux b/quickapp/src/app.ux
index b8930a2..b397ce8 100644
--- a/quickapp/src/app.ux
+++ b/quickapp/src/app.ux
@@ -5,17 +5,13 @@
const $utils = require('./helper/utils').default
const $apis = require('./helper/apis').default
- const $storage = require('@system.storage')
-
- console.log('app: create channel');
- const appInitC = new BroadcastChannel('init');
/* @desc: 注入方法至全局 global,以便页面调用 */
const hook2global = Object.getPrototypeOf(global) || global;
hook2global.$utils = $utils
hook2global.API = $apis
- const _promiseFactory = (pointer, params = {}) => {
+ hook2global.promiseFactory = (pointer, params = {}) => {
return new Promise((resolve, reject) => {
params = Object.assign({
success: (data) => { resolve(data); },
@@ -24,38 +20,9 @@
pointer(params);
});
}
- hook2global.promiseFactory = _promiseFactory;
-
- const userinfoFromToken = async (token) => {
- $apis.setToken(token)
- let userinfo = await $apis.userInfo()
- userinfo.token = token
- hook2global.$userinfo = userinfo
- _promiseFactory($storage.set, { key: 'token', value: token })
- appInitC.postMessage(1)
- appInitC.close()
- }
export default {
onCreate() {
- console.log('app: init oncreate');
- appInitC.onmessage = ({ data: token }) => {
- console.log('app: login success, data=', JSON.stringify(token));
- userinfoFromToken(token)
- }
- (async () => {
- let token = await _promiseFactory($storage.get, { key: 'token' })
- .catch((data, code) => {
- console.warn(`get token from storage fail, code = ${code}`)
- })
- console.log(`app: get token = ${token} from storage success`)
- if (token.length === 0) {
- console.log('app: init token.length==0, send init message');
- appInitC.postMessage(0)
- return
- }
- userinfoFromToken(token)
- })()
}
}
diff --git a/quickapp/src/helper/apis.js b/quickapp/src/helper/apis.js
index bcfcb35..325dfc8 100644
--- a/quickapp/src/helper/apis.js
+++ b/quickapp/src/helper/apis.js
@@ -8,7 +8,7 @@ import $ajax from './ajax'
*
* 备注:如果您不需要发起请求,删除 apis 目录,以及 app.ux 中引用即可;
*/
-const baseUrl = 'https://pushdeer.qiyanghong.cn:5443/'
+const baseUrl = 'YOUR_API_ADDRESS'
let token = ""
@@ -24,23 +24,26 @@ export default {
login() {
return to($ajax.get(`${baseUrl}login/fake`).then(res => res.token))
},
+ wxLogin(code) {
+ return $ajax.post(`${baseUrl}login/wecode`, { code }).then(res => res.token)
+ },
userInfo() {
- return to($ajax.post(`${baseUrl}user/info`, { token }))
+ return $ajax.post(`${baseUrl}user/info`, { token })
},
// device
deviceReg(name, device_id) {
- return to($ajax.post(`${baseUrl}device/reg`, { token, is_clip: 1, name, device_id }))
+ return $ajax.post(`${baseUrl}device/reg`, { token, is_clip: 1, name, device_id })
.then(res => res.devices)
},
deviceList() {
- return to($ajax.post(`${baseUrl}device/list`, { token }))
+ return $ajax.post(`${baseUrl}device/list`, { token })
.then(res => res.devices)
},
deviceRename(id, name) {
- return to($ajax.post(`${baseUrl}device/rename`, { token, id, name }))
+ return $ajax.post(`${baseUrl}device/rename`, { token, id, name })
},
deviceRemove(id) {
- return to($ajax.post(`${baseUrl}device/remove`, { token, id }))
+ return $ajax.post(`${baseUrl}device/remove`, { token, id })
},
// key
keyGen() {
diff --git a/quickapp/src/manifest.json b/quickapp/src/manifest.json
index ee0021e..0f1ab35 100644
--- a/quickapp/src/manifest.json
+++ b/quickapp/src/manifest.json
@@ -1,66 +1,75 @@
{
- "package": "dev.pushdeer.app",
- "name": "pushdeer",
- "versionName": "1.0.0",
- "versionCode": 1,
- "minPlatformVersion": 1070,
- "icon": "/assets/images/logo.svg",
- "features": [
- {
- "name": "system.prompt"
+ "package": "dev.pushdeer.app",
+ "name": "pushdeer",
+ "versionName": "1.0.0",
+ "versionCode": 1,
+ "minPlatformVersion": 1090,
+ "icon": "/assets/images/logo.png",
+ "features": [
+ {
+ "name": "system.prompt"
+ },
+ {
+ "name": "system.router"
+ },
+ {
+ "name": "system.clipboard"
+ },
+ {
+ "name": "system.fetch"
+ },
+ {
+ "name": "system.storage"
+ },
+ {
+ "name": "system.device"
+ },
+ {
+ "name": "service.push"
+ },
+ {
+ "name": "service.wxaccount",
+ "params": {
+ "appId": "YOUR_APPID"
+ }
+ }
+ ],
+ "permissions": [
+ {
+ "origin": "*"
+ }
+ ],
+ "config": {
+ "logLevel": "debug"
},
- {
- "name": "system.router"
+ "router": {
+ "entry": "pages",
+ "pages": {
+ "pages": {
+ "component": "index"
+ },
+ "pages/Home": {
+ "component": "index",
+ "launchMode": "singleTask"
+ },
+ "pages/component": {
+ "component": "devpage"
+ },
+ "pages/swipe": {
+ "component": "index"
+ }
+ }
},
- {
- "name": "system.clipboard"
- },
- {
- "name": "system.fetch"
- },
- {
- "name": "system.storage"
- },
- {
- "name": "system.device"
+ "display": {
+ "titleBarBackgroundColor": "#f2f2f2",
+ "titleBarTextColor": "#414141",
+ "pages": {
+ "pages": {
+ "titleBar": false
+ },
+ "pages/Home": {
+ "titleBar": false
+ }
+ }
}
- ],
- "permissions": [
- {
- "origin": "*"
- }
- ],
- "config": {
- "logLevel": "debug"
- },
- "router": {
- "entry": "pages",
- "pages": {
- "pages": {
- "component": "index"
- },
- "pages/Home": {
- "component": "index",
- "launchMode": "singleTask"
- },
- "pages/component": {
- "component": "devpage"
- },
- "pages/swipe":{
- "component": "index"
- }
- }
- },
- "display": {
- "titleBarBackgroundColor": "#f2f2f2",
- "titleBarTextColor": "#414141",
- "pages": {
- "pages": {
- "titleBar": false
- },
- "pages/Home": {
- "titleBar": false
- }
- }
- }
}
\ No newline at end of file
diff --git a/quickapp/src/pages/component/Device/index.ux b/quickapp/src/pages/component/Device/index.ux
index 45ded51..6ad9ab5 100644
--- a/quickapp/src/pages/component/Device/index.ux
+++ b/quickapp/src/pages/component/Device/index.ux
@@ -1,5 +1,4 @@
-
-
{{ msg.text }}
+
+ {{
+ msg.text
+ }}
+
-
- {{msg.text}}
+
+
+
-
-
diff --git a/quickapp/src/pages/component/Settings/index.ux b/quickapp/src/pages/component/Settings/index.ux
index abfacdc..dd322f8 100644
--- a/quickapp/src/pages/component/Settings/index.ux
+++ b/quickapp/src/pages/component/Settings/index.ux
@@ -19,13 +19,25 @@
diff --git a/quickapp/src/pages/index.ux b/quickapp/src/pages/index.ux
index 2b416d8..ffe40b9 100644
--- a/quickapp/src/pages/index.ux
+++ b/quickapp/src/pages/index.ux
@@ -16,66 +16,135 @@