From 250107f90fb590fa8c67312d836f25c420c80de4 Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期二, 16 五月 2023 18:02:47 +0800
Subject: [PATCH] 修改样式
---
pages/mine/mine.vue | 16 +----
pages/index/write.vue | 11 +--
pages/loading/loading.vue | 4
components/css/index.css | 16 ++--
pages.json | 6 +-
pages/index/chat.vue | 22 +++----
pages/index/home.vue | 30 ++-------
static/tabbar/cd.png | 0
static/tabbar/wtd.png | 0
static/style/color-ui.css | 5 +
static/tabbar/homed.png | 0
static/tabbar/mined.png | 0
uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue | 2
store/index.js | 6 +-
static/tabbar/modeld.png | 0
manifest.json | 2
pages/tab/assistant.vue | 33 +---------
pages/index/index.vue | 15 +---
18 files changed, 56 insertions(+), 112 deletions(-)
diff --git a/components/css/index.css b/components/css/index.css
index 4c1bb90..ccd69ea 100755
--- a/components/css/index.css
+++ b/components/css/index.css
@@ -98,8 +98,9 @@
.flooer {
width: 100vw;
min-height: 128rpx;
- background: #323552;
- border-radius: 32rpx 32rpx 0 0;
+ background: #fff;
+ border-radius: 32rpx 32rpx 0 0;
+ box-shadow: 0 -1 4px rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: space-between;
@@ -110,19 +111,18 @@
}
.flooer_l {
- width: 540rpx;
- /* height: 68rpx; */
- margin-left: 32rpx;
+ width: 100%;
+ margin: 20rpx 0 20rpx 32rpx;
border-radius: 40rpx;
- border:2rpx solid #F6F7FB;
- background: #323552;
+ border:2rpx solid rgba(0, 0, 0, 0.36);
+ background: #fff;
display: flex;
align-items: center;
padding: 0 30rpx;
}
.flooer_l>.u-textarea {
- background: #323552 !important;
+ background: #fff !important;
text-align: justify;
padding: 16rpx 0;
line-height: 1.2;
diff --git a/manifest.json b/manifest.json
index 9948e5f..c2b07dd 100755
--- a/manifest.json
+++ b/manifest.json
@@ -83,6 +83,6 @@
"enable" : false
}
},
- "title" : "GPT涓撲笟鐗�"
+ "title" : "Chat Fox"
}
}
diff --git a/pages.json b/pages.json
index f95bd6c..6d43a44 100755
--- a/pages.json
+++ b/pages.json
@@ -10,7 +10,7 @@
{
"path": "pages/index/home",
"style": {
- "navigationBarTitleText": "鏅虹◣鍜ㄨ",
+ "navigationBarTitleText": "ChatFox",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -19,7 +19,7 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "鑳栧ぇ娴�",
+ "navigationBarTitleText": "ChatFox",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -103,7 +103,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "AI鏅虹◣",
+ "navigationBarTitleText": "Chat Fox",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
diff --git a/pages/index/chat.vue b/pages/index/chat.vue
index 48c25d2..d5a1a2e 100755
--- a/pages/index/chat.vue
+++ b/pages/index/chat.vue
@@ -1,11 +1,11 @@
<template>
<view class="content">
- <u-navbar :bgColor="'#17181D'" placeholder :title="now_model.title" :titleStyle ="'color: #fff;'">
+ <u-navbar :bgColor="'#302cd9'" placeholder :title="now_model.title" :titleStyle ="'color: #fff;'">
<view slot="left">
- <u-icon @click="showLeftList = true" name="list" size="24" color="#fff"></u-icon>
+ <u-icon @click="showLeftList = true" name="list" size="16" color="#fff"></u-icon>
</view>
<view @click="create_newChat" slot="right">
- <u-icon name="plus" size="24" color="#fff"></u-icon>
+ <u-icon name="plus" size="16" color="#fff"></u-icon>
</view>
</u-navbar>
<view class="body">
@@ -21,7 +21,7 @@
<zero-markdown-view :markdown="item.content"></zero-markdown-view>
</view>
<view style="position: absolute;right: 0;bottom: 10rpx;">
- <u-icon @click="copy(item)" name="file-text-fill" size="30"></u-icon>
+ <u-icon @click="copy(item)" name="file-text-fill" size="24" color="#302cd9"></u-icon>
</view>
</view>
</view>
@@ -473,12 +473,8 @@
</script>
<style lang="scss">
- page {
- background-color: #17181d;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
- }
+ @import url("@/static/style/color-ui.css");
+
.safebottom {
padding-bottom: calc(112rpx + env(safe-area-inset-bottom));
}
@@ -591,10 +587,12 @@
<style scoped>
.border_radius_l{
border-top-left-radius:0;
- background: #30324f;
+ background: #fff;
+ color: #222;
}
.border_radius_r{
border-top-right-radius:0;
- background: #54c867;
+ background: #fff;
+ color: #222;
}
</style>
\ No newline at end of file
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 47f5cc1..4d62de1 100755
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -8,21 +8,12 @@
<view style="width: calc(100vw - 60rpx);" class="padding-bottom" v-if="config.home_notice">
<u-notice-bar :text="config.home_notice" mode="closable"></u-notice-bar>
</view>
- <view class="cu-card bg-gradual-blue padding radius text-lg"
- style="line-height: 1.5;text-align: justify;">
- {{ main_model.description ? main_model.description : '浣犲ソ锛屾杩庝綋楠屾櫤璐㈠皬灞嬶紒鎴戞槸浜哄伐鏅鸿兘鑳栧ぇ娴凤紝骞剁粡杩囪嚦浠婃渶鏂扮殑璐㈢◣娉曞緥鏂归潰涓撻棬璁粌锛屽洜姝ゆ垜鍙互鍥炵瓟浣犲湪璐㈢◣棰嗗煙鎵�鏈夌殑闂锛屽鎮ㄦ湁浣跨敤闂锛屽彲浠ユ煡闃呬釜浜轰腑蹇�-浣跨敤鎸囧崡锛�' }}
- </view>
</view>
</view>
<view class="flex justify-center align-center flex-direction">
- <button @click="toChat" style="width: calc(100vw - 60rpx); height: 100rpx;" class="cu-btn lines-cyan text-bold round">
+ <button @click="toChat" style="width: calc(100vw - 60rpx); height: 100rpx;" class="cu-btn text-bold chat-button">
寮�濮嬪挩璇� (浣檣{num}}娆�) </button>
</view>
- <!-- <text>{{ main_model.icon ? `http://ai.shsening.com${main_model.icon}` : '' }}</text> -->
- <!-- <view class="flex justify-center align-center flex-direction padding-top">
- <button @click="toTax" style="width: 650rpx;height: 100rpx;" class="cu-btn lines-orange text-bold round">
- 鑳栨櫤杈撅紙鏅虹◣鍜ㄨ锛� </button>
- </view> -->
<view class="tool padding-top-xl">
<view class="header">
<view class="title text-bold">鍔熻兘鐗规��</view>
@@ -148,19 +139,14 @@
}
}
</script>
-<style>
- /*姣忎釜椤甸潰鍏叡css */
- @import url("@/static/style/color-ui.css");
-</style>
-<style>
- page {
- background-color: #17181d;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
- }
-</style>
<style lang="scss">
+ @import url("@/static/style/color-ui.css");
+
+ .chat-button{
+ background: #302cd9 !important;
+ color: #fff;
+ }
+
.tool {
width: calc(100vw - 60rpx);
margin: 15rpx auto;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5b43f8d..4bbbd3e 100755
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,7 +4,7 @@
<view v-for="(item,index) in arr" :key="index" :id="'message' + item.message_id">
<view class="body_l" v-if="item.role == 'assistant'">
<view class="body_lpic a">
- <image :src="now_model.icon" mode=""></image>
+ <image :src="`${setting_data.base_url+now_model.icon}`" mode=""></image>
</view>
<view class="body_box">
<!-- <view class="body_lcon pdg" v-html="item.content"></view> -->
@@ -33,7 +33,7 @@
<view class="body_l" v-if="loading" id="loading">
<view class="body_lpic a">
- <image :src="now_model.icon" mode=""></image>
+ <image :src="`${setting_data.base_url+now_model.icon}`" mode=""></image>
</view>
<view class="body_box ">
<view class="body_lcon pdg border_radius_l" style="display: flex;overflow-x: hidden;">
@@ -87,13 +87,14 @@
typeingText: "",
typeingId: "",
now_model: {},
+ setting_data:'null'
}
},
computed: {
...mapState(['config', 'num', 'userInfo'])
},
onLoad(op) {
- console.log(op,'op')
+ this.setting_data = setting
if (op.model) {
this.now_model = JSON.parse(op.model)
} else {
@@ -353,14 +354,6 @@
}
</script>
-<style>
- page {
- background-color: #17181d;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
- }
-</style>
<style>
@import '../../components/css/index.css';
</style>
diff --git a/pages/index/write.vue b/pages/index/write.vue
index c8e4712..489526e 100755
--- a/pages/index/write.vue
+++ b/pages/index/write.vue
@@ -291,16 +291,12 @@
}
</script>
-<style>
- .uni-input-input{
- color: #fff !important;
- }
-</style>
-
<style lang="scss">
+ @import url("@/static/style/color-ui.css");
+
.input-text{
border-radius: 22rpx;
- background: #30324f;
+ background: #ecf4fd;
border: none;
padding: 20rpx 24rpx !important;
margin-bottom: 20rpx;
@@ -357,7 +353,6 @@
</style>
<style>
- @import url("@/static/style/color-ui.css");
.template-card {
background: #30324F;
diff --git a/pages/loading/loading.vue b/pages/loading/loading.vue
index 4303186..a0cb2f8 100755
--- a/pages/loading/loading.vue
+++ b/pages/loading/loading.vue
@@ -34,13 +34,13 @@
"selectedIconPath": "static/tabbar/qad.png"
},
chat: {
- text: '寮�濮嬭亰澶�',
+ text: '鑱婂ぉ',
"pagePath": "/pages/index/chat",
"iconPath": "static/tabbar/c.png",
"selectedIconPath": "static/tabbar/cd.png"
},
write: {
- text: 'AI鍒涗綔',
+ text: '鍒涗綔鏁欏',
"pagePath": "/pages/index/write",
"iconPath": "static/tabbar/wt.png",
"selectedIconPath": "static/tabbar/wtd.png"
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 18dfa53..68b7420 100755
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -22,7 +22,7 @@
</view>
</view>
<view class="mine-list padding-lr">
- <view @click="toVip" class="flex item align-center">
+ <!-- <view @click="toVip" class="flex item align-center">
<u-icon name="/static/icon/mine-gift.png" size="20"></u-icon>
<view class="flex align-center justify-between solid-bottom margin-left-sm">
<view class="title">寮�閫氭潈鐩�</view>
@@ -31,7 +31,7 @@
<u-icon name="arrow-right" color="#848B9E" size="16"></u-icon>
</view>
</view>
- </view>
+ </view> -->
<view @click="toVip" class="flex item align-center" v-if="showPay">
<u-icon name="/static/icon/mine-gift.png" size="20"></u-icon>
@@ -212,8 +212,8 @@
}
},
toVip() {
- uni.redirectTo({
- url:'../vip/vip'
+ uni.navigateTo({
+ url:"/pages/vip/vip"
})
},
toAgreement() {
@@ -339,14 +339,6 @@
background-repeat: no-repeat;
background-size: 100%;
// width: 100%;
- }
-</style>
-<style>
- page {
- background-color: #17181d;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
}
</style>
<style lang="scss">
diff --git a/pages/tab/assistant.vue b/pages/tab/assistant.vue
index 7d54e1a..8cf7439 100755
--- a/pages/tab/assistant.vue
+++ b/pages/tab/assistant.vue
@@ -2,21 +2,7 @@
<view class="container">
<view class="form">
<image src="/static/bg_ai_assistant_title.png" class="banner"></image>
- <!-- <u-transition :show="true" mode="slide-left">
- <view class="head">
- <view class="head-top">
- aa
- <view class="head-top-right">
- <view class="ai-consult">
- <u-button open-type='contact' color="#FF9900" :plain="true" text="鍜ㄨ瀹㈡湇"></u-button>
- </view>
- </view>
- </view>
- <view class="head-bottom">
- <text class="description">鐭ヤ綘鍥板锛岃В浣犵儲鎭硷紝AI甯綘鍐欑瓟妗�;缁樺０缁樿壊锛岀粯绮惧僵;</text>
- </view>
- </view>
- </u-transition> -->
+
</view>
<u-transition :show="true" mode="slide-right">
<view class="tool_list">
@@ -59,7 +45,9 @@
// },
data() {
return {
- setting_data:'null'
+ setting_data:'null',
+ showTab: false,
+ tabIndex: 0
};
},
computed: {
@@ -151,12 +139,7 @@
</script>
<style lang="scss">
- page {
- background-color: #17181d;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
- }
+ @import url("@/static/style/color-ui.css");
.form {
border-bottom-left-radius: 30rpx;
@@ -318,12 +301,6 @@
}
</style>
<style scoped>
- page {
- background-color: #15151f;
- box-sizing: border-box;
- letter-spacing: 0;
- word-wrap: break-word;
- }
.banner{
width: 100vw;
height: calc(100vw * 0.324);
diff --git a/static/style/color-ui.css b/static/style/color-ui.css
index f76140e..501ad77 100755
--- a/static/style/color-ui.css
+++ b/static/style/color-ui.css
@@ -5,7 +5,10 @@
==================== */
page {
- background: #17181D;
+ background: #ecf4fd;
+ box-sizing: border-box;
+ letter-spacing: 0;
+ word-wrap: break-word;
font-size: 28rpx;
color: #333;
font-family: Helvetica Neue, Helvetica, sans-serif;
diff --git a/static/tabbar/cd.png b/static/tabbar/cd.png
index e5ddede..1b67a14 100755
--- a/static/tabbar/cd.png
+++ b/static/tabbar/cd.png
Binary files differ
diff --git a/static/tabbar/homed.png b/static/tabbar/homed.png
index 83a451f..709eec9 100755
--- a/static/tabbar/homed.png
+++ b/static/tabbar/homed.png
Binary files differ
diff --git a/static/tabbar/mined.png b/static/tabbar/mined.png
index 9f5fafc..f5edae1 100755
--- a/static/tabbar/mined.png
+++ b/static/tabbar/mined.png
Binary files differ
diff --git a/static/tabbar/modeld.png b/static/tabbar/modeld.png
index cee868d..9344752 100755
--- a/static/tabbar/modeld.png
+++ b/static/tabbar/modeld.png
Binary files differ
diff --git a/static/tabbar/wtd.png b/static/tabbar/wtd.png
index a887f4e..6bf57d4 100755
--- a/static/tabbar/wtd.png
+++ b/static/tabbar/wtd.png
Binary files differ
diff --git a/store/index.js b/store/index.js
index 1654c36..ebaa12b 100755
--- a/store/index.js
+++ b/store/index.js
@@ -16,12 +16,12 @@
models: [],
is_loaded: false,
tabbar: {
- "selectedColor": "#01e681",
- "color": "#848597",
+ "selectedColor": "#302cd9",
+ "color": "#afbdca",
"fontSize": "16",
"list": [
{
- "text": "妯″瀷鍒囨崲",
+ "text": "AI鍒涗綔",
"pagePath": "pages/tab/assistant",
"iconPath": "static/tabbar/model.png",
"selectedIconPath": "static/tabbar/modeld.png"
diff --git a/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue b/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue
index 50f8f0b..6bf0c54 100755
--- a/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue
+++ b/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue
@@ -195,7 +195,7 @@
if (reload) {}
return obj2strStyle({
'height': `${tabbarHeight}rpx`,
- 'background-color': backgroundColor || '#323552',
+ 'background-color': backgroundColor || '#fff',
})
},
tabbarItemStyle() {
--
Gitblit v1.9.1