diff --git a/quickapp/pushdeer素材.xd b/quickapp/pushdeer素材.xd index 5918474..9c50e91 100644 Binary files a/quickapp/pushdeer素材.xd and b/quickapp/pushdeer素材.xd differ diff --git a/quickapp/src/assets/images/arrow-down.png b/quickapp/src/assets/images/arrow-down.png new file mode 100644 index 0000000..79572ac Binary files /dev/null and b/quickapp/src/assets/images/arrow-down.png differ diff --git a/quickapp/src/assets/images/arrow-up.png b/quickapp/src/assets/images/arrow-up.png new file mode 100644 index 0000000..2037ebb Binary files /dev/null and b/quickapp/src/assets/images/arrow-up.png differ diff --git a/quickapp/src/assets/styles/mixins.less b/quickapp/src/assets/styles/mixins.less index 2144608..c5af32b 100644 --- a/quickapp/src/assets/styles/mixins.less +++ b/quickapp/src/assets/styles/mixins.less @@ -2,5 +2,4 @@ flex-direction: @column; justify-content: @justify; align-items: @align; - height: 100%; } \ No newline at end of file diff --git a/quickapp/src/assets/styles/variables.less b/quickapp/src/assets/styles/variables.less index af5a05d..b6006eb 100644 --- a/quickapp/src/assets/styles/variables.less +++ b/quickapp/src/assets/styles/variables.less @@ -1,9 +1,3 @@ -@brand: #09ba07; - -@white: #ffffff; -@black: #000000; -@grey: #9393aa; -@red: #fa0101; -@green: #ffff00; - -@size-factor: 5px; +@primary-color: #3b4789; +@secondry-color: #d6d6d6; +@font-color: #a7a7a7; \ No newline at end of file diff --git a/quickapp/src/pages/Device/card.ux b/quickapp/src/pages/Device/card.ux deleted file mode 100644 index 1d5e172..0000000 --- a/quickapp/src/pages/Device/card.ux +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - {{ devObj.name }} - - - - - - diff --git a/quickapp/src/pages/Device/index.ux b/quickapp/src/pages/Device/index.ux deleted file mode 100644 index f79efea..0000000 --- a/quickapp/src/pages/Device/index.ux +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - 设备 - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/quickapp/src/pages/Home/index.ux b/quickapp/src/pages/Home/index.ux index 5a051fa..60ee1b1 100644 --- a/quickapp/src/pages/Home/index.ux +++ b/quickapp/src/pages/Home/index.ux @@ -1,8 +1,8 @@ - - + + @@ -66,6 +66,7 @@ export default { .wrapper { .flex-box-mixins(column, center, center); + height: 100%; .stack { flex-grow: 1; diff --git a/quickapp/src/pages/component/Device/index.ux b/quickapp/src/pages/component/Device/index.ux index 34b32e1..9c733c2 100644 --- a/quickapp/src/pages/component/Device/index.ux +++ b/quickapp/src/pages/component/Device/index.ux @@ -41,6 +41,7 @@ export default { .wrapper { .flex-box-mixins(column, flex-start, center); width: 100%; + height: 100%; padding-top: 84px; .header { diff --git a/quickapp/src/pages/component/Key/card.ux b/quickapp/src/pages/component/Key/card.ux index 553bd0a..8f26b20 100644 --- a/quickapp/src/pages/component/Key/card.ux +++ b/quickapp/src/pages/component/Key/card.ux @@ -40,7 +40,7 @@ export default { }, onInit() { - console.log('key', this.key, this.idx) + // console.log('key', this.key, this.idx) // console.log('card', 'name', this.devObj.name) } } diff --git a/quickapp/src/pages/component/Key/index.ux b/quickapp/src/pages/component/Key/index.ux index 3dcee96..57d9797 100644 --- a/quickapp/src/pages/component/Key/index.ux +++ b/quickapp/src/pages/component/Key/index.ux @@ -43,6 +43,7 @@ export default { .wrapper { .flex-box-mixins(column, flex-start, center); width: 100%; + height: 100%; padding-top: 84px; .header { diff --git a/quickapp/src/pages/component/Message/index.ux b/quickapp/src/pages/component/Message/index.ux new file mode 100644 index 0000000..59aecdf --- /dev/null +++ b/quickapp/src/pages/component/Message/index.ux @@ -0,0 +1,130 @@ + + + + + + 消息 + + + + {{ + input + }} + 推送测试 + + + + + + + + + + + + \ No newline at end of file diff --git a/quickapp/src/pages/component/Message/msg-header.ux b/quickapp/src/pages/component/Message/msg-header.ux new file mode 100644 index 0000000..909b113 --- /dev/null +++ b/quickapp/src/pages/component/Message/msg-header.ux @@ -0,0 +1,52 @@ + + + + + {{ title }} + + + + + + + diff --git a/quickapp/src/pages/component/Message/msg-text.ux b/quickapp/src/pages/component/Message/msg-text.ux new file mode 100644 index 0000000..85a07e8 --- /dev/null +++ b/quickapp/src/pages/component/Message/msg-text.ux @@ -0,0 +1,42 @@ + + + + + {{ msg.text }} + + + + + + diff --git a/quickapp/src/pages/component/Settings/card.ux b/quickapp/src/pages/component/Settings/card.ux new file mode 100644 index 0000000..d334388 --- /dev/null +++ b/quickapp/src/pages/component/Settings/card.ux @@ -0,0 +1,49 @@ + + + {{ label }} + {{ optName }} + + + + + + diff --git a/quickapp/src/pages/component/Settings/index.ux b/quickapp/src/pages/component/Settings/index.ux new file mode 100644 index 0000000..abfacdc --- /dev/null +++ b/quickapp/src/pages/component/Settings/index.ux @@ -0,0 +1,65 @@ + + + + + 设置 + + + + + + + + + + + + + + \ No newline at end of file