diff --git a/package.json b/package.json index d5a2f95e..2fa8b161 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "src/common/monent.js", "src/common/modules.js", "src/common/http.js", + "src/common/crypto-js.js", "src/apps", "src/saas" ], diff --git a/src/apps/AppMessageNotification/SelectUser.vue b/src/apps/AppMessageNotification/SelectUser.vue index 72ab89a7..010c4561 100644 --- a/src/apps/AppMessageNotification/SelectUser.vue +++ b/src/apps/AppMessageNotification/SelectUser.vue @@ -28,13 +28,10 @@ -->
-

选择标签

-
-
-

{{item.name}}

-
-
{{items.name}}
-
+
+

{{item.name}}

+
+
{{items.name}}
@@ -158,12 +155,13 @@ export default { margin-bottom: 24px; } .type-content{ - padding: 34px 32px; - background-color: #fff; + } .type-list{ padding-left: 16px; - margin-top: 32px; + margin-bottom: 16px; + padding: 34px 32px 32px; + background-color: #fff; p{ line-height: 44px; margin-bottom: 24px; @@ -172,20 +170,19 @@ export default { } .list{ overflow: hidden; - margin-bottom: 32px; .item{ - padding: 0 32px; - line-height: 56px; + padding: 12px 32px; float: left; - text-align: center; - border-radius: 28px; - border: 1px solid #ddd; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + color: #333; + line-height: 40px; + background-color: #F3F4F7; + border-radius: 4px; margin: 0 16px 16px 0; - font-size: 30px; } .active{ background-color: #3192F4; - border: 1px solid #3192F4; color: #fff; } } diff --git a/src/utils/crypto-js.js b/src/common/crypto-js.js similarity index 100% rename from src/utils/crypto-js.js rename to src/common/crypto-js.js diff --git a/src/common/modules.js b/src/common/modules.js index abe38fe1..6befd077 100644 --- a/src/common/modules.js +++ b/src/common/modules.js @@ -1,6 +1,6 @@ import http from "./http"; import Vue from "vue"; -import CryptoJS from "../utils/crypto-js"; +import CryptoJS from "./crypto-js"; /** * 登录方法 diff --git a/src/pages/loading.vue b/src/pages/loading.vue index aadcd349..7dedd943 100644 --- a/src/pages/loading.vue +++ b/src/pages/loading.vue @@ -10,7 +10,12 @@
- {{ app.label }}({{ app.name }}) +
+ + +
+ +
@@ -29,8 +34,8 @@ export default { appsList() { let {search, currentLib} = this return this.apps.filter(e => { - if (/beta/.test(e.libPath)) { - e.isBeta = true + if (/\/project\//.test(e.libPath)) { + e.project = e.libPath.replace(/.*project\/([^\/]+)\/.+/, '$1') } return (currentLib == "apps" && e.libPath.indexOf("project") > -1) || e.libPath.indexOf(currentLib) > -1 }).filter(e => !!search ? e.label?.indexOf(search) > -1 : true) || [] @@ -110,33 +115,27 @@ export default { .appsPane { justify-content: center; margin-top: 16px; - padding: 0 16px; + + .item { + width: 100%; + font-size: 28px; + padding: 0 32px; + height: 64px; + border-bottom: 1px solid #ddd; + + &:nth-of-type(2n) { + background: rgba(#26f, .02); + } + } b { cursor: pointer; - font-size: 24px; - background: $uni-color-primary; - color: #fff; - padding: 8px; - margin: 8px 4px; - border-radius: 8px; - font-weight: normal; + margin-right: 16px; + display: block; + } - &.beta { - background: $uni-color-warning; - position: relative; - - &:before { - position: absolute; - top: 0; - right: 0; - content: "beta"; - transform: translate(-8px, -50%); - color: $uni-color-error; - z-index: 20220613952; - font-weight: bold; - } - } + .appName { + text-align: right; } } }