From 3a4ec8da75f6f9eaf9571334319388455c61c65b Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期四, 11 五月 2023 15:52:48 +0800
Subject: [PATCH] 修改样式
---
static/tabbar/wt.png | 0
package-lock.json | 2
pages/index/write.vue | 40 +-
components/css/index.css | 544 +++++++++++++++++++++++++++----------------------
pages/index/chat.vue | 4
pages/index/home.vue | 23 +-
static/tabbar/cd.png | 0
static/tabbar/wtd.png | 0
static/style/color-ui.css | 4
static/tabbar/homed.png | 0
static/tabbar/mined.png | 0
uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue | 10
store/index.js | 5
static/tabbar/mine.png | 0
static/tabbar/modeld.png | 0
static/tabbar/c.png | 0
pages/tab/assistant.vue | 11
static/tabbar/model.png | 0
static/tabbar/home.png | 0
19 files changed, 351 insertions(+), 292 deletions(-)
diff --git a/components/css/index.css b/components/css/index.css
index a27b304..0860023 100755
--- a/components/css/index.css
+++ b/components/css/index.css
@@ -1,244 +1,302 @@
-.body{
- padding: 30rpx;
-}
-.body_lpic,.body_rpic{
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- overflow: hidden;background: #EDEDED;
-}
-.body_l,.body_r{
- display: flex;align-items: flex-start;margin-bottom: 50rpx;
-}
-.body_r{
- justify-content: flex-end;
-}
-.body_lcon,.body_rcon{
- /* font-size: 32rpx; */
- /* font-weight: 500; */
- position: relative;
- /* padding: 20rpx; */
- border-radius: 12rpx;
- max-width: 450rpx;
- /* line-height:1.2; */
- word-wrap: break-word;
- text-align: justify;
- word-break: normal;
-
- /*markdown鍏煎鏍峰紡*/
- font-size: 16rpx!;
- padding: 0;
- line-height:1;
- max-width: 500rpx;
-}
-.mark-content{
- /* padding: 0 15rpx!important; */
-}
-.body_lcon{
- color: #57546F;background: #F6F7FB;margin-left: 36rpx;margin-right: 60rpx;
-}
-.body_rcon{
- /* color: #ffffff; */
- /* background: #4E82FA; */
- margin-right: 36rpx;
-
- /*markdown鍏煎鏍峰紡*/
- /* margin-right: 48rpx; */
- background: #F6F7FB;
- /* margin-left: 15rpx; */
-}
-.body_r .body_rcon{
- margin-right: 15rpx;
-}
-.body_l .body_rcon{
- margin-right: 55rpx;
- margin-left: 15rpx;
-}
-.body_box{
- position: relative;
-}
-.body_jt{
- position: absolute;
- /* left: 12rpx; */
- top: 24rpx;z-index: 2;
- /*markdown鍏煎鏍峰紡*/
- left: -5rpx;
-}
-.body_rjt{
- position: absolute;
- right: 12rpx;
- top: 24rpx;z-index: 2;
- /*markdown鍏煎鏍峰紡*/
- right: -5rpx;
-}
-.flooer{
- width: 100vw;
- min-height: 98rpx;
- background: #FFFFFF;
- display: flex;align-items: center;justify-content: space-between;
- position: fixed;bottom: 0;left: 0;z-index: 999;border-top: 1rpx solid #E9E9E9;border-bottom: 1rpx solid #E9E9E9;
-}
-.flooer_l{
- width: 540rpx;
- /* height: 68rpx; */
- margin-left: 30rpx;
- border-radius: 30rpx;
- background: #F6F7FB;display: flex;align-items: center;
- padding: 0 30rpx;
-}
-
-.flooer_l > .u-textarea {
- background: #F6F7FB !important;
- text-align: justify;
- padding: 20rpx 0;
- line-height: 1.2;
-}
-.flooer_rpic{
- width: 48rpx;
- height: 48rpx;
-}
-.flooer_r{
- padding: 0 30rpx;height: 100%;display: flex;align-items: center;
-}
-.update{
- width: 100vw;
- height: 100vh;
- position: fixed;
- top: 0;
- left: 0;
- background: rgba(0,0,0,0.36);
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 10000;
-}
-.update_box{
- width: 550upx;
- height: 818upx;
- position: relative;
-}
-.update_box image{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: 1;
-}
-.update_bav{
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 100;
-}
-.update_title{
- margin: 473upx 48upx 0 48upx;
- height: 184upx;
-}
-.update_btn{
- font-size: 28upx;
- font-weight: 400;
- color: #FFFFFF;
- width: 360upx;
- height: 60upx;
- background: #E64239;
- border-radius: 30upx;
- display: flex;
- align-items: center;
- justify-content: center;
- position: absolute;
- bottom: 42upx;
- left: 50%;
- margin-left: -180upx;
-}
-.unp_icon{
- width: 56upx;
- height: 56upx;
-}
-.update_op{
- width: 88upx;
- height: 88upx;
- display: flex;
- align-items: center;
- justify-content: center;
- margin: auto;
- margin-top: 60upx;
-}
-.update_title .update_text{
- font-size: 28upx;
- font-weight: 400;
- color: #666666;
-}
-.agreement {
- width: 100vw;
- height: 100vh;
- background: rgba(0, 0, 0, 0.7);
- position: fixed;
- z-index: 999999;
- top: 0;
- left: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- font-family: '瀹嬩綋';
-}
-.agssold{
- width: 1upx;
- height: 80%;
- background: #333333;
-}
-.agreement-box {
- width: 540upx;
- background: #FFFFFF;
- border-radius: 12upx;
- padding: 58upx 40upx 28upx 40upx;
- position: relative;
-}
-.agreement-main{
- /* height: 230px; */
- padding-bottom: 78upx;
- margin-top: 41upx;
-}
-.agreement-title {
- text-align: center;
- font-size:38upx;
- font-weight:bold;
- color:rgba(40,40,40,1);
-}
-
-.ags {
- font-size:28upx;
- color:rgba(102,102,102,1);
- line-height:38upx;
- text-indent: 52upx;
- margin-bottom: 12upx;
-}
-
-.ags-btn {
- display: flex;
- align-items: center;
- justify-content: center;
-}
-.tong,.ton{
- width:240upx;
- height:68upx;
- border:1upx solid transparent;
- border-radius:4upx;
- text-align: center;
- line-height: 68upx;
- font-size: 32upx;
-}
-.ton{
- border:1upx solid rgba(102,102,102,1);
-}
-.tong {
- color: #FFFFFF;
- background: #953EF1;
- border: 1upx solid #953EF1;
- margin-left: 28upx;
-}
-.ags text{
- color: #953EF1;
+.body {
+ padding: 30rpx;
+}
+
+.body_lpic,
+.body_rpic {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ overflow: hidden;
+ background: #EDEDED;
+}
+
+.body_l,
+.body_r {
+ display: flex;
+ align-items: flex-start;
+ margin-bottom: 50rpx;
+}
+
+.body_r {
+ justify-content: flex-end;
+}
+
+.body_lcon,
+.body_rcon {
+ /* font-size: 32rpx; */
+ /* font-weight: 500; */
+ position: relative;
+ /* padding: 20rpx; */
+ border-radius: 12rpx;
+ max-width: 450rpx;
+ /* line-height:1.2; */
+ word-wrap: break-word;
+ text-align: justify;
+ word-break: normal;
+
+ /*markdown鍏煎鏍峰紡*/
+ font-size: 16rpx !;
+ padding: 0;
+ line-height: 1;
+ max-width: 500rpx;
+}
+
+.mark-content {
+ /* padding: 0 15rpx!important; */
+}
+
+.body_lcon {
+ color: #57546F;
+ background: #F6F7FB;
+ margin-left: 36rpx;
+ margin-right: 60rpx;
+}
+
+.body_rcon {
+ /* color: #ffffff; */
+ /* background: #4E82FA; */
+ margin-right: 36rpx;
+
+ /*markdown鍏煎鏍峰紡*/
+ /* margin-right: 48rpx; */
+ background: #F6F7FB;
+ /* margin-left: 15rpx; */
+}
+
+.body_r .body_rcon {
+ margin-right: 15rpx;
+}
+
+.body_l .body_rcon {
+ margin-right: 55rpx;
+ margin-left: 15rpx;
+}
+
+.body_box {
+ position: relative;
+}
+
+.body_jt {
+ position: absolute;
+ /* left: 12rpx; */
+ top: 24rpx;
+ z-index: 2;
+ /*markdown鍏煎鏍峰紡*/
+ left: -5rpx;
+}
+
+.body_rjt {
+ position: absolute;
+ right: 12rpx;
+ top: 24rpx;
+ z-index: 2;
+ /*markdown鍏煎鏍峰紡*/
+ right: -5rpx;
+}
+
+.flooer {
+ width: 100vw;
+ min-height: 128rpx;
+ background: #323552;
+ border-radius: 32rpx 32rpx 0 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 999;
+}
+
+.flooer_l {
+ width: 540rpx;
+ /* height: 68rpx; */
+ margin-left: 32rpx;
+ border-radius: 40rpx;
+ border:2rpx solid #F6F7FB;
+ background: #323552;
+ display: flex;
+ align-items: center;
+ padding: 0 30rpx;
+}
+
+.flooer_l>.u-textarea {
+ background: #323552 !important;
+ text-align: justify;
+ padding: 16rpx 0;
+ line-height: 1.2;
+}
+
+.flooer_rpic {
+ width: 48rpx;
+ height: 48rpx;
+}
+
+.flooer_r {
+ padding: 0 30rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+}
+
+.update {
+ width: 100vw;
+ height: 100vh;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0.36);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 10000;
+}
+
+.update_box {
+ width: 550upx;
+ height: 818upx;
+ position: relative;
+}
+
+.update_box image {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 1;
+}
+
+.update_bav {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 100;
+}
+
+.update_title {
+ margin: 473upx 48upx 0 48upx;
+ height: 184upx;
+}
+
+.update_btn {
+ font-size: 28upx;
+ font-weight: 400;
+ color: #FFFFFF;
+ width: 360upx;
+ height: 60upx;
+ background: #E64239;
+ border-radius: 30upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ bottom: 42upx;
+ left: 50%;
+ margin-left: -180upx;
+}
+
+.unp_icon {
+ width: 56upx;
+ height: 56upx;
+}
+
+.update_op {
+ width: 88upx;
+ height: 88upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin: auto;
+ margin-top: 60upx;
+}
+
+.update_title .update_text {
+ font-size: 28upx;
+ font-weight: 400;
+ color: #666666;
+}
+
+.agreement {
+ width: 100vw;
+ height: 100vh;
+ background: rgba(0, 0, 0, 0.7);
+ position: fixed;
+ z-index: 999999;
+ top: 0;
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-family: '瀹嬩綋';
+}
+
+.agssold {
+ width: 1upx;
+ height: 80%;
+ background: #333333;
+}
+
+.agreement-box {
+ width: 540upx;
+ background: #FFFFFF;
+ border-radius: 12upx;
+ padding: 58upx 40upx 28upx 40upx;
+ position: relative;
+}
+
+.agreement-main {
+ /* height: 230px; */
+ padding-bottom: 78upx;
+ margin-top: 41upx;
+}
+
+.agreement-title {
+ text-align: center;
+ font-size: 38upx;
+ font-weight: bold;
+ color: rgba(40, 40, 40, 1);
+}
+
+.ags {
+ font-size: 28upx;
+ color: rgba(102, 102, 102, 1);
+ line-height: 38upx;
+ text-indent: 52upx;
+ margin-bottom: 12upx;
+}
+
+.ags-btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tong,
+.ton {
+ width: 240upx;
+ height: 68upx;
+ border: 1upx solid transparent;
+ border-radius: 4upx;
+ text-align: center;
+ line-height: 68upx;
+ font-size: 32upx;
+}
+
+.ton {
+ border: 1upx solid rgba(102, 102, 102, 1);
+}
+
+.tong {
+ color: #FFFFFF;
+ background: #953EF1;
+ border: 1upx solid #953EF1;
+ margin-left: 28upx;
+}
+
+.ags text {
+ color: #953EF1;
}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a50976f..07cb7d5 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "chatgpt-uniapp-vip-1.2.0",
+ "name": "chatgpt-AI",
"lockfileVersion": 2,
"requires": true,
"packages": {
diff --git a/pages/index/chat.vue b/pages/index/chat.vue
index 8a14065..f53fc9c 100755
--- a/pages/index/chat.vue
+++ b/pages/index/chat.vue
@@ -1,6 +1,6 @@
<template>
<view class="content">
- <u-navbar :bgColor="'#202123'" placeholder :title="now_model.title" :titleStyle ="'color: #fff;'">
+ <u-navbar :bgColor="'#17181D'" placeholder :title="now_model.title" :titleStyle ="'color: #fff;'">
<view slot="left">
<u-icon @click="showLeftList = true" name="list" size="24" color="#fff"></u-icon>
</view>
@@ -474,7 +474,7 @@
<style lang="scss">
.safebottom {
- padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+ padding-bottom: calc(112rpx + env(safe-area-inset-bottom));
}
.left-wrap {
width: 525rpx;
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 56acc7d..35e7d6d 100755
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -1,21 +1,21 @@
<template>
<view>
<view class="margin-top-xl">
- <view v-if="config.site_title" class="flex align-center justify-center flex-direction padding-xl margin-top-lg">
+ <view v-if="config.site_title" class="flex align-center justify-center flex-direction padding margin-top-lg">
<image v-if="config.site_title" :src="main_model.icon ? `http://ai.shsening.com${main_model.icon}` : ''" mode="aspectFill"
style="background-color: #f4f5f6;width: 160rpx;height: 160rpx;" class="round"></image>
- <view class="text-bold text-xxl text-orange padding-tb"> {{ main_model.title ? main_model.title : '涓撲笟鐗�' }} </view>
- <view style="width: 650rpx;" class="padding-bottom" v-if="config.home_notice">
+ <view class="text-bold text-xxl text-cyan padding-tb"> {{ main_model.title ? main_model.title : '涓撲笟鐗�' }} </view>
+ <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 shadow-blur radius text-lg"
+ <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: 650rpx;height: 100rpx;" class="cu-btn lines-orange text-bold round">
+ <button @click="toChat" style="width: calc(100vw - 60rpx); height: 100rpx;" class="cu-btn lines-cyan text-bold round">
寮�濮嬪挩璇� (浣檣{num}}娆�) </button>
</view>
<!-- <text>{{ main_model.icon ? `http://ai.shsening.com${main_model.icon}` : '' }}</text> -->
@@ -149,7 +149,7 @@
<style lang="scss">
.tool {
- width: 90%;
+ width: calc(100vw - 60rpx);
margin: 15rpx auto;
.header {
@@ -165,22 +165,23 @@
justify-content: space-between;
.item {
- width: 30%;
+ width: calc(calc(100vw - 60rpx - 30rpx) / 3);
display: flex;
flex-direction: column;
align-items: center;
- background-color: #F0FAF8;
- margin: 15rpx 0rpx;
+ background-color: #30324f;
+ margin: 12rpx 0rpx;
padding: 30rpx 0rpx;
border-radius: 10rpx;
.title {
- color: #1B2B20;
+ color: #fff;
+ font-size: 28rpx;
margin-top: 15rpx;
}
.desc {
- color: #67776C;
+ color: #93949d;
font-size: 24rpx;
}
}
diff --git a/pages/index/write.vue b/pages/index/write.vue
index f3a15d5..7b32ccb 100755
--- a/pages/index/write.vue
+++ b/pages/index/write.vue
@@ -16,18 +16,18 @@
<!-- <button class="cu-btn bg-gradual-orange round">鎴戠殑鍒涗綔</button> -->
</view>
</view>
- <view class="cu-bar bg-white text-orange">
+ <view class="cu-bar text-cyan">
<view class="action">
- <text class="icon-titles text-orange"></text>
+ <text class="text-cyan"></text>
<text class="text-lg text-bold">鍒涗綔绫诲瀷</text>
</view>
</view>
<view class="padding-lr">
<u-input v-model="title" placeholder="杈撳叆闇�瑕丄I涓轰綘鍒涗綔鐨勬枃鏈被鍨�,濡�:灏忕孩涔︽枃妗�" />
</view>
- <view class="cu-bar bg-white text-orange padding-right">
+ <view class="cu-bar text-cyan padding-right">
<view class="action">
- <text class="icon-titles text-orange"></text>
+ <text class="text-cyan"></text>
<text class="text-lg text-bold">涓昏鍐呭</text>
</view>
<button @click="submit" class="cu-btn line-blue radius text-bold">鎻愪氦</button>
@@ -37,10 +37,10 @@
placeholder="杈撳叆闇�瑕丄I涓轰綘鍒涗綔鐨勬枃鏈富瑕佸唴瀹瑰強瑕佹眰,濡�:涓�涓叧浜庢垝鎸囩殑灏忕孩涔︿骇鍝佹枃妗堬紝瑕佹眰浠ョ綉绾㈢鑽夊崥涓荤殑鍙ｅ惢锛屽崥涓昏韩浠戒负缃戠孩濂崇敓锛屾枃妗堜腑鏈�濂藉甯︿竴浜沞moji琛ㄦ儏"
:adjustPosition="false"></u--textarea>
</view>
- <view class="cu-bar bg-white text-orange padding-right">
+ <view class="cu-bar text-cyan padding-right">
<view class="action">
- <text class="icon-titles text-orange"></text>
- <text class="text-lg text-bold">馃AI鍒涗綔</text>
+ <text class="text-cyan"></text>
+ <text class="text-lg text-bold">AI鍒涗綔</text>
</view>
<view class="flex" v-if="answerStatus == 2">
<button class="cu-btn line-black radius text-bold">閲嶆柊鐢熸垚</button>
@@ -53,20 +53,20 @@
<zero-markdown-view style="padding: 0;" :markdown="answer"></zero-markdown-view>
</view>
</view>
- <view class="cu-bar bg-white text-orange">
+ <view class="cu-bar text-cyan">
<view class="action">
- <text class="icon-titles text-orange"></text>
+ <text class="text-cyan"></text>
<text class="text-lg text-bold">甯哥敤妯℃澘</text>
</view>
</view>
<view class="padding-lr">
<view v-for="item in write_template" :key="item.write_template_id">
- <view class="flex align-center text-orange text-df">
+ <view class="flex align-center text-cyan text-df">
<view class="icon-tagfill"></view>
<view class="text-bold">{{item.title}}</view>
</view>
<view v-if="item.children.length > 0" class="flex flex-wrap justify-between align-center padding-tb-sm">
- <view v-for="child in item.children" :key="child.write_template_id" class="template-card bg-orange light">
+ <view v-for="child in item.children" :key="child.write_template_id" class="template-card light">
<view class="write-title"> {{child.title}} </view>
<view class="write-sub-title"> {{child.description}} </view>
</view>
@@ -325,8 +325,8 @@
.template-card {
- /* background: #f5f8f7; */
- border-radius: 10px;
+ background: #30324F;
+ border-radius: 24rpx;
padding: 15px;
width: 48%;
margin-bottom: 15px;
@@ -338,15 +338,15 @@
font-size: 15px;
font-weight: 700;
margin-bottom: 9px;
- /* color: #000; */
+ color: #fff;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.write-sub-title {
- /* color: #8f9ca2; */
- font-size: 12px;
+ color: #93949d;
+ font-size: 14px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
@@ -373,10 +373,10 @@
}
.anser-area {
- box-shadow: 0 0 10px 5px hsla(0, 0%, 62%, .21176470588235294);
- margin-top: 20rpx;
- border-radius: 5px;
- padding: 8px;
+ color: #93949D;
+ background: #30324F;
+ border-radius: 32rpx;
+ padding: 24rpx;
min-height: 120px;
}
diff --git a/pages/tab/assistant.vue b/pages/tab/assistant.vue
index 57e99ca..90a7770 100755
--- a/pages/tab/assistant.vue
+++ b/pages/tab/assistant.vue
@@ -155,7 +155,7 @@
<style lang="scss">
page {
- background-color: #f3f3f3;
+ background-color: #17181d;
box-sizing: border-box;
letter-spacing: 0;
word-wrap: break-word;
@@ -265,8 +265,7 @@
min-height: 168rpx;
width: 347rpx;
border-radius: 10rpx;
- background-color: #fff;
- box-shadow: 2px 2px 5px #f8f8f8;
+ background-color: #30324f;
margin-top: 20rpx;
.label_wrap {
@@ -296,14 +295,14 @@
.tool_name {
font-size: 28rpx;
font-weight: 600;
- color: #333;
+ color: #fff;
}
.tool_hint {
margin-top: 15rpx;
- font-size: 18rpx;
+ font-size: 24rpx;
font-weight: 500;
- color: #999;
+ color: #93949d;
}
}
diff --git a/static/style/color-ui.css b/static/style/color-ui.css
index 02537dc..24ef075 100755
--- a/static/style/color-ui.css
+++ b/static/style/color-ui.css
@@ -5,7 +5,7 @@
==================== */
page {
- /* background: #F5F6F9; */
+ background: #17181D;
font-size: 28rpx;
color: #333;
font-family: Helvetica Neue, Helvetica, sans-serif;
@@ -3643,7 +3643,7 @@
}
.text-cyan, .line-cyan, .lines-cyan {
- color: #1cbbb4;
+ color: #8BE0E4;
}
.text-blue, .line-blue, .lines-blue {
diff --git a/static/tabbar/c.png b/static/tabbar/c.png
index b766064..98f998b 100755
--- a/static/tabbar/c.png
+++ b/static/tabbar/c.png
Binary files differ
diff --git a/static/tabbar/cd.png b/static/tabbar/cd.png
index a5d6e26..30016a1 100755
--- a/static/tabbar/cd.png
+++ b/static/tabbar/cd.png
Binary files differ
diff --git a/static/tabbar/home.png b/static/tabbar/home.png
index 050007a..7c33c9f 100755
--- a/static/tabbar/home.png
+++ b/static/tabbar/home.png
Binary files differ
diff --git a/static/tabbar/homed.png b/static/tabbar/homed.png
index 4cac155..fdc5183 100755
--- a/static/tabbar/homed.png
+++ b/static/tabbar/homed.png
Binary files differ
diff --git a/static/tabbar/mine.png b/static/tabbar/mine.png
old mode 100755
new mode 100644
index c4eae84..077475b
--- a/static/tabbar/mine.png
+++ b/static/tabbar/mine.png
Binary files differ
diff --git a/static/tabbar/mined.png b/static/tabbar/mined.png
index d66de91..c6d5b4d 100755
--- a/static/tabbar/mined.png
+++ b/static/tabbar/mined.png
Binary files differ
diff --git a/static/tabbar/model.png b/static/tabbar/model.png
index ce1461b..01930bb 100755
--- a/static/tabbar/model.png
+++ b/static/tabbar/model.png
Binary files differ
diff --git a/static/tabbar/modeld.png b/static/tabbar/modeld.png
index 49b90ba..345ea7a 100755
--- a/static/tabbar/modeld.png
+++ b/static/tabbar/modeld.png
Binary files differ
diff --git a/static/tabbar/wt.png b/static/tabbar/wt.png
index ca2a9e4..0576174 100755
--- a/static/tabbar/wt.png
+++ b/static/tabbar/wt.png
Binary files differ
diff --git a/static/tabbar/wtd.png b/static/tabbar/wtd.png
index c338c1d..42bbccf 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 49e5b4f..e98bf63 100755
--- a/store/index.js
+++ b/store/index.js
@@ -16,7 +16,8 @@
models: [],
is_loaded: false,
tabbar: {
- "selectedColor": "#FF9900",
+ "selectedColor": "#fff",
+ "color": "#848597",
"fontSize": "16",
"list": [
{
@@ -26,7 +27,7 @@
"selectedIconPath": "static/tabbar/modeld.png"
},
{
- "text": "涓汉涓績",
+ "text": "鎴戠殑",
"pagePath": "pages/mine/mine",
"iconPath": "static/tabbar/mine.png",
"selectedIconPath": "static/tabbar/mined.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 261b2a2..50f8f0b 100755
--- a/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue
+++ b/uni_modules/m-tabbar/components/m-tabbar/m-tabbar.vue
@@ -101,7 +101,7 @@
},
tabbarHeight: {
type: [Number, String],
- default: 100
+ default: 112
}
},
data() {
@@ -195,7 +195,7 @@
if (reload) {}
return obj2strStyle({
'height': `${tabbarHeight}rpx`,
- 'background-color': backgroundColor || '#fff',
+ 'background-color': backgroundColor || '#323552',
})
},
tabbarItemStyle() {
@@ -410,12 +410,12 @@
flex-direction: column;
align-items: center;
flex: 1;
- padding: 4px 0 2px;
+ padding: 8px 0 0;
}
.m-tabbar__icon {
- width: 48rpx;
- height: 48rpx;
+ width: 44rpx;
+ height: 44rpx;
margin-bottom: 6rpx;
position: relative;
--
Gitblit v1.9.1