diff --git a/web/.env.development b/web/.env.development index 74134cf4..9811fffe 100644 --- a/web/.env.development +++ b/web/.env.development @@ -6,4 +6,4 @@ VUE_APP_ADMIN_USER=admin VUE_APP_ADMIN_PASS=admin123 VUE_APP_KEY_PREFIX=ChatPLUS_DEV_ VUE_APP_TITLE="Geek-AI 创作系统" -VUE_APP_VERSION=v4.0.6 +VUE_APP_VERSION=v4.0.7 diff --git a/web/.env.production b/web/.env.production index 14a09e67..9404e7a0 100644 --- a/web/.env.production +++ b/web/.env.production @@ -2,4 +2,4 @@ VUE_APP_API_HOST= VUE_APP_WS_HOST= VUE_APP_KEY_PREFIX=ChatPLUS_ VUE_APP_TITLE="Geek-AI 创作系统" -VUE_APP_VERSION=v4.0.6 +VUE_APP_VERSION=v4.0.7 diff --git a/web/src/assets/css/chat-plus.styl b/web/src/assets/css/chat-plus.styl index 624c42d6..585b6e1c 100644 --- a/web/src/assets/css/chat-plus.styl +++ b/web/src/assets/css/chat-plus.styl @@ -114,10 +114,13 @@ $borderColor = #4676d0; .tool-box { display: flex; - justify-content: flex-end; - align-items: center; - padding 0 20px 10px 20px; + justify-content: center; + padding-top 12px border-top 1px solid #3c3c3c; + + .iconfont { + margin-right 5px + } } } @@ -126,52 +129,6 @@ $borderColor = #4676d0; --el-main-padding: 0; margin: 0; - .chat-head { - width: 100%; - height: 50px; - background-color: #28292A - - .chat-config { - display flex - flex-direction row - align-items: center; - justify-content center; - padding-top 10px; - - .role-select-label { - color #ffffff - } - - .el-select { - max-width 150px; - margin-right 10px; - } - - .role-select { - max-width 130px; - } - - .el-button { - .el-icon { - margin-right 5px; - } - } - } - - .iconfont { - margin-right 5px; - } - - .is-circle { - margin-left 5px - - .iconfont { - margin-right 0 - } - } - } - - .chat-box { min-width: 0; flex: 1; @@ -207,23 +164,6 @@ $borderColor = #4676d0; } } - .re-generate { - position: relative; - display: flex; - justify-content: center; - - .btn-box { - position: absolute - bottom: 10px; - - .el-button { - .el-icon { - margin-right 5px; - } - } - } - } - .input-box { background-color: #ffffff display: flex; @@ -232,6 +172,26 @@ $borderColor = #4676d0; box-shadow: 0 2px 15px rgba(0, 0, 0, 0.1); padding 0 15px; + .tool-item { + margin-right 15px + border-radius: 6px; + color: #19c37d; + display flex + justify-content center + justify-items center + padding 6px + cursor pointer + background #F2F2F2 + + &:hover { + background #D5FAD3 + } + + .iconfont { + font-size: 24px; + } + } + .input-container { width 100% margin: 0; @@ -242,7 +202,6 @@ $borderColor = #4676d0; position relative .el-textarea { - .el-textarea__inner::-webkit-scrollbar { width: 0; height: 0; @@ -263,8 +222,6 @@ $borderColor = #4676d0; .el-button { padding 8px 5px; border-radius 6px; - background: rgb(25, 195, 125) - color #ffffff; font-size 20px; } } diff --git a/web/src/assets/css/home.styl b/web/src/assets/css/home.styl index 2d6ecdb1..0a018512 100644 --- a/web/src/assets/css/home.styl +++ b/web/src/assets/css/home.styl @@ -35,6 +35,23 @@ } .navbar { + display flex + flex-flow row + + .link-button { + margin-right 15px + color #e1e1e1 + padding 0 10px + + &:hover { + background-color #414141 + } + + .iconfont { + font-size 24px + } + } + .user-info { width 100% padding 5px 0; @@ -153,4 +170,18 @@ background-color #f1f1f1 } } + + .user-info-menu { + li { + a { + width 100% + justify-content left + + &:hover { + text-decoration none !important + color var(--el-primary-text-color) + } + } + } + } } \ No newline at end of file diff --git a/web/src/assets/iconfont/iconfont.css b/web/src/assets/iconfont/iconfont.css index 3ff257a6..00207962 100644 --- a/web/src/assets/iconfont/iconfont.css +++ b/web/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4125778 */ - src: url('iconfont.woff2?t=1713766977199') format('woff2'), - url('iconfont.woff?t=1713766977199') format('woff'), - url('iconfont.ttf?t=1713766977199') format('truetype'); + src: url('iconfont.woff2?t=1715938850931') format('woff2'), + url('iconfont.woff?t=1715938850931') format('woff'), + url('iconfont.ttf?t=1715938850931') format('truetype'); } .iconfont { @@ -13,6 +13,38 @@ -moz-osx-font-smoothing: grayscale; } +.icon-mic-bold:before { + content: "\e683"; +} + +.icon-mic-thin:before { + content: "\e8c2"; +} + +.icon-attachment-cl:before { + content: "\e66a"; +} + +.icon-attachment-st:before { + content: "\e63b"; +} + +.icon-speaker:before { + content: "\e607"; +} + +.icon-clear:before { + content: "\e900"; +} + +.icon-bbs:before { + content: "\e623"; +} + +.icon-license:before { + content: "\e65a"; +} + .icon-more:before { content: "\e63c"; } diff --git a/web/src/assets/iconfont/iconfont.js b/web/src/assets/iconfont/iconfont.js index 9aab97ef..084bbd34 100644 --- a/web/src/assets/iconfont/iconfont.js +++ b/web/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4125778='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var t,h,i,o,z,m=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}t=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_4125778,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?m(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),t()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(i=t,o=a.document,z=!1,v(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){z||(z=!0,i())}function v(){try{o.documentElement.doScroll("left")}catch(l){return void setTimeout(v,50)}s()}}(window); \ No newline at end of file +window._iconfont_svg_string_4125778='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var t,h,i,o,z,s=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}t=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_4125778,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?s(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),t()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(i=t,o=a.document,z=!1,p(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,m())})}function m(){z||(z=!0,i())}function p(){try{o.documentElement.doScroll("left")}catch(l){return void setTimeout(p,50)}m()}}(window); \ No newline at end of file diff --git a/web/src/assets/iconfont/iconfont.json b/web/src/assets/iconfont/iconfont.json index 47a9dc74..068c5c7c 100644 --- a/web/src/assets/iconfont/iconfont.json +++ b/web/src/assets/iconfont/iconfont.json @@ -5,6 +5,62 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "6539424", + "name": "麦克风", + "font_class": "mic-bold", + "unicode": "e683", + "unicode_decimal": 59011 + }, + { + "icon_id": "1727442", + "name": "213麦克风", + "font_class": "mic-thin", + "unicode": "e8c2", + "unicode_decimal": 59586 + }, + { + "icon_id": "3730725", + "name": "attach-attachment-cl", + "font_class": "attachment-cl", + "unicode": "e66a", + "unicode_decimal": 58986 + }, + { + "icon_id": "15748474", + "name": "st-attachment", + "font_class": "attachment-st", + "unicode": "e63b", + "unicode_decimal": 58939 + }, + { + "icon_id": "1010", + "name": "扬声器", + "font_class": "speaker", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "8094805", + "name": "clear", + "font_class": "clear", + "unicode": "e900", + "unicode_decimal": 59648 + }, + { + "icon_id": "34803640", + "name": "论坛", + "font_class": "bbs", + "unicode": "e623", + "unicode_decimal": 58915 + }, + { + "icon_id": "310708", + "name": "license", + "font_class": "license", + "unicode": "e65a", + "unicode_decimal": 58970 + }, { "icon_id": "1421807", "name": "更多", diff --git a/web/src/assets/iconfont/iconfont.ttf b/web/src/assets/iconfont/iconfont.ttf index 4140a66c..fec76c49 100644 Binary files a/web/src/assets/iconfont/iconfont.ttf and b/web/src/assets/iconfont/iconfont.ttf differ diff --git a/web/src/assets/iconfont/iconfont.woff b/web/src/assets/iconfont/iconfont.woff index 210c4aa4..5fa852d5 100644 Binary files a/web/src/assets/iconfont/iconfont.woff and b/web/src/assets/iconfont/iconfont.woff differ diff --git a/web/src/assets/iconfont/iconfont.woff2 b/web/src/assets/iconfont/iconfont.woff2 index 2a217889..fabb4bd6 100644 Binary files a/web/src/assets/iconfont/iconfont.woff2 and b/web/src/assets/iconfont/iconfont.woff2 differ diff --git a/web/src/components/ChatPrompt.vue b/web/src/components/ChatPrompt.vue index 9c8b545b..fcd924e2 100644 --- a/web/src/components/ChatPrompt.vue +++ b/web/src/components/ChatPrompt.vue @@ -7,9 +7,9 @@
-
+
{{ createdAt }} - Tokens: {{ finalTokens }} +
diff --git a/web/src/components/ChatReply.vue b/web/src/components/ChatReply.vue index 5c5111b8..175af9f2 100644 --- a/web/src/components/ChatReply.vue +++ b/web/src/components/ChatReply.vue @@ -2,38 +2,61 @@
- ChatGPT + ChatGPT
-
-
- {{ createdAt }} - Tokens: {{ tokens }} +
+
+ {{ dateFormat(data.created_at) }} + + + + + + + + + - - - - + + - - - - - - - + + + + + + + + + + + + + + + + + +
@@ -41,36 +64,36 @@ \ No newline at end of file diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue index d4c4395c..e9cac3cb 100644 --- a/web/src/views/Home.vue +++ b/web/src/views/Home.vue @@ -11,13 +11,34 @@
+ + + + + + + + + + + + + + +
+ 登录 + 注册 +
@@ -92,25 +114,31 @@
- +
+ + + diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue index aaf582bc..21040b19 100644 --- a/web/src/views/Login.vue +++ b/web/src/views/Login.vue @@ -36,8 +36,12 @@ 注册 - 重置密码 - 首页 + + 重置密码 + + + 首页 +