更新界面UI

pull/361/head
HXY 2 years ago
parent d917ead34d
commit 7bbe14e8b9

@ -93,11 +93,11 @@ func (s *alipayPrivSrv) UserRechargeLink(req *web.UserRechargeLinkReq) (*web.Use
//定义一个整型变量,单价 //定义一个整型变量,单价
p := alipay.TradePreCreate{} p := alipay.TradePreCreate{}
p.OutTradeNo = fmt.Sprintf("%d", recharge.ID) p.OutTradeNo = fmt.Sprintf("%d", recharge.ID)
p.Subject = "PaoPao用户钱包充值" p.Subject = "Aimo用户钱包充值"
p.TotalAmount = fmt.Sprintf("%.2f", float64(recharge.Amount)/100.0*a) p.TotalAmount = fmt.Sprintf("%.2f", float64(recharge.Amount)/100.0*a)
//p.NotifyURL = "http://" + req.Host + "/v1/alipay/notify" p.NotifyURL = "https://" + req.Host + "/v1/alipay/notify"
//支付宝回调,如果是内网环境的话,需要增加内网穿透 //支付宝回调,如果是内网环境的话,需要增加内网穿透
p.NotifyURL = "http://uszkjc.natappfree.cc/v1/alipay/notify" //p.NotifyURL = "http://uszkjc.natappfree.cc/v1/alipay/notify"
rsp, err := s.alipayClient.TradePreCreate(p) rsp, err := s.alipayClient.TradePreCreate(p)
if err != nil { if err != nil {
logrus.Errorf("client.TradePreCreate err: %v\n", err) logrus.Errorf("client.TradePreCreate err: %v\n", err)

@ -61,7 +61,7 @@
}, },
"windows": [ "windows": [
{ {
"title": "泡泡 | 一个清新文艺的微社区", "title": "Aimo社区",
"width": 1080, "width": 1080,
"height": 860, "height": 860,
"resizable": false, "resizable": false,

@ -1,5 +1,5 @@
<template> <template>
<n-config-provider :theme="theme"> <n-config-provider :theme="theme" :theme-overrides="theme === null ? lightThemeOverrides : darkThemeOverrides">
<n-message-provider> <n-message-provider>
<n-dialog-provider> <n-dialog-provider>
<div <div
@ -47,8 +47,34 @@ import { computed } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { darkTheme } from 'naive-ui'; import { darkTheme } from 'naive-ui';
const lightThemeOverrides = {
common: {
primaryColor: '#063c62',
quaternaryColor: '#063c62',
primaryColorHover: '#063c62',
primaryColorPressed: '#063c62',
primaryColorPressedHover: '#063c62',
},
Button: {
color: '#fff',
colorDisabled: '#fff',
},
}
const darkThemeOverrides = {
common: {
primaryColor: '#2080f0',
quaternaryColor: '#2080f0',
primaryColorHover: '#2080f0',
primaryColorPressed: '#2080f0',
primaryColorPressedHover: '#2080f0',
}
}
const store = useStore(); const store = useStore();
const theme = computed(() => (store.state.theme === 'dark' ? darkTheme : null)); const theme = computed(() => (store.state.theme === 'dark' ? darkTheme : null));
</script> </script>
<style lang="less"> <style lang="less">

@ -45,7 +45,7 @@
.hash-link, .hash-link,
.user-link { .user-link {
color: #18a058; color: #063c62;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
@ -78,7 +78,7 @@
.hash-link, .hash-link,
.user-link { .user-link {
color: #63e2b7; color: #2080f0;
} }
.username-link { .username-link {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 39 KiB

@ -136,9 +136,6 @@
/> />
</n-form-item-row> </n-form-item-row>
</n-form> </n-form>
<p style=" font-size: 12px; color: #ef0808;">
14Aimo
</p>
<n-button <n-button
type="primary" type="primary"
block block
@ -161,6 +158,7 @@ import { ref, reactive, onMounted } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { userLogin, userRegister, userInfo } from '@/api/auth'; import { userLogin, userRegister, userInfo } from '@/api/auth';
import type { FormInst, FormItemRule } from 'naive-ui'; import type { FormInst, FormItemRule } from 'naive-ui';
import router from '@/router';
const allowUserRegister = ref(import.meta.env.VITE_ALLOW_USER_REGISTER.toLowerCase() === 'true') const allowUserRegister = ref(import.meta.env.VITE_ALLOW_USER_REGISTER.toLowerCase() === 'true')
const store = useStore(); const store = useStore();
@ -274,6 +272,10 @@ const handleRegister = (e: Event) => {
registerForm.username = ''; registerForm.username = '';
registerForm.password = ''; registerForm.password = '';
registerForm.repassword = ''; registerForm.repassword = '';
//跳转到setting页面
router.push({
name: 'setting',
});
}) })
.catch((err) => { .catch((err) => {
loading.value = false; loading.value = false;

@ -24,7 +24,7 @@
@focus="focusComment" @focus="focusComment"
:placeholder=" :placeholder="
props.lock === 1 props.lock === 1
? '' ? 'Aimo'
: '...' : '...'
" "
/> />

@ -201,7 +201,7 @@ defineExpose({ switchReply });
} }
.show { .show {
color: #18a058; color: #063c62;
cursor: pointer; cursor: pointer;
opacity: 0.75; opacity: 0.75;
@ -220,7 +220,7 @@ defineExpose({ switchReply });
.reply-switch { .reply-switch {
.show { .show {
color: #63e2b7; color: #2080f0;
} }
} }
} }

@ -75,7 +75,7 @@
:mask-closable="false" :mask-closable="false"
preset="dialog" preset="dialog"
title="提示" title="提示"
content="确定删除该泡泡动态吗?" content="确定删除该Aimo动态吗?"
positive-text="确认" positive-text="确认"
negative-text="取消" negative-text="取消"
@positive-click="execDelAction" @positive-click="execDelAction"
@ -89,7 +89,7 @@
:content=" :content="
'' + '' +
(post.is_lock ? '' : '') + (post.is_lock ? '' : '') +
'' 'Aimo'
" "
positive-text="确认" positive-text="确认"
negative-text="取消" negative-text="取消"
@ -104,7 +104,7 @@
:content=" :content="
'' + '' +
(post.is_top ? '' : '') + (post.is_top ? '' : '') +
'' 'Aimo'
" "
positive-text="确认" positive-text="确认"
negative-text="取消" negative-text="取消"
@ -117,7 +117,7 @@
preset="dialog" preset="dialog"
title="提示" title="提示"
:content=" :content="
'' + 'Aimo' +
(tempVisibility == 0 ? '' : (tempVisibility == 1 ? '' : '')) + (tempVisibility == 0 ? '' : (tempVisibility == 1 ? '' : '')) +
'' ''
" "

@ -3,7 +3,7 @@
<n-grid :x-gap="4" :y-gap="4" :cols="full ? 1 : 5"> <n-grid :x-gap="4" :y-gap="4" :cols="full ? 1 : 5">
<n-gi :span="full ? 1 : 3"> <n-gi :span="full ? 1 : 3">
<paopao-video-player @click.stop v-for="video in props.videos" :key="video.id" :src="video.content" <paopao-video-player @click.stop v-for="video in props.videos" :key="video.id" :src="video.content"
:colors="['#18a058', '#2aca75']" :hoverable="true" theme="gradient" /> :colors="['#063c62', '#2aca75']" :hoverable="true" theme="gradient" />
</n-gi> </n-gi>
</n-grid> </n-grid>
</div> </div>

@ -260,7 +260,7 @@ const execDelAction = () => {
} }
.show { .show {
color: #18a058; color: #063c62;
cursor: pointer; cursor: pointer;
} }
@ -280,7 +280,7 @@ const execDelAction = () => {
.base-wrap { .base-wrap {
.reply-switch { .reply-switch {
.show { .show {
color: #63e2b7; color: #2080f0;
} }
} }
} }

@ -78,11 +78,11 @@
</n-space> </n-space>
</div> </div>
</n-card> </n-card>
<n-card class="hottopic-wrap" title="排行榜" embedded :bordered="false" size="small"> <!-- <n-card class="hottopic-wrap" title="排行榜" embedded :bordered="false" size="small">
<n-spin :show="loading"> <n-spin :show="loading">
~ ~
</n-spin> </n-spin>
</n-card> </n-card> -->
</div> </div>
</template> </template>

@ -1,7 +1,7 @@
<template> <template>
<div class="sidebar-wrap"> <div class="sidebar-wrap">
<div class="logo-wrap"> <div class="logo-wrap">
<n-image class="logo-img" width="36" :src="LOGO" :preview-disabled="true" @click="goHome" /> <n-image class="logo-img" width="160" :src="LOGO" :preview-disabled="true" @click="goHome" />
</div> </div>
<n-menu :accordion="true" :icon-size="24" <n-menu :accordion="true" :icon-size="24"
:options="menuOptions" :render-label="renderMenuLabel" :render-icon="renderMenuIcon" :value="selectedPath" :options="menuOptions" :render-label="renderMenuLabel" :render-icon="renderMenuIcon" :value="selectedPath"

@ -160,6 +160,7 @@ onMounted(() => {
<style lang="less"> <style lang="less">
.tag-item { .tag-item {
.tag-quote { .tag-quote {
color: #063c62;
margin-left: 12px; margin-left: 12px;
font-size: 14px; font-size: 14px;
opacity: 0.75; opacity: 0.75;

@ -134,7 +134,7 @@ const router = createRouter({
}); });
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
document.title = `${to.meta.title} | 泡泡 - 一个清新文艺的微社区`; document.title = `${to.meta.title} | Aimo社区`;
next(); next();
}); });

@ -93,7 +93,7 @@ onMounted(() => {
} }
.income { .income {
color: #18a058; color: #063c62;
} }
} }
@ -125,7 +125,7 @@ onMounted(() => {
.dark { .dark {
.income { .income {
color: #63e2b7; color: #2080f0;
} }
} }
</style> </style>

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<main-nav title="泡泡详情" :back="true" /> <main-nav title="Aimo详情" :back="true" />
<n-list class="main-content-wrap" bordered> <n-list class="main-content-wrap" bordered>
<n-list-item> <n-list-item>

@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<n-tabs class="profile-tabs-wrap" type="line" animated @update:value="changeTab"> <n-tabs class="profile-tabs-wrap" type="line" animated @update:value="changeTab">
<n-tab-pane name="post" tab="泡泡"> </n-tab-pane> <n-tab-pane name="post" tab="Aimo"> </n-tab-pane>
<n-tab-pane name="comment" tab="评论"> </n-tab-pane> <n-tab-pane name="comment" tab="评论"> </n-tab-pane>
<n-tab-pane name="media" tab="图文"> </n-tab-pane> <n-tab-pane name="media" tab="图文"> </n-tab-pane>
<n-tab-pane name="star" tab="喜欢"> </n-tab-pane> <n-tab-pane name="star" tab="喜欢"> </n-tab-pane>

@ -57,6 +57,7 @@
) )
" "
@click="handleNicknameShow" @click="handleNicknameShow"
:style="{color : buttonStyle}"
> >
<template #icon> <template #icon>
<n-icon> <n-icon>
@ -87,13 +88,14 @@
type="success" type="success"
v-if="!showPhoneBind && store.state.userInfo.status == 1" v-if="!showPhoneBind && store.state.userInfo.status == 1"
@click="showPhoneBind = true" @click="showPhoneBind = true"
:style="{color : buttonStyle}"
> >
</n-button> </n-button>
</div> </div>
<div v-else> <div v-else>
<n-alert title="手机绑定提示" type="warning"> <n-alert title="手机绑定提示" type="warning">
~<br /> 14Aimo<br />
<a <a
class="hash-link" class="hash-link"
@click="showPhoneBind = true" @click="showPhoneBind = true"
@ -275,8 +277,9 @@
type="success" type="success"
v-if="!showPasswordSetting" v-if="!showPasswordSetting"
@click="showPasswordSetting = true" @click="showPasswordSetting = true"
:style="{color : buttonStyle}"
> >
</n-button> </n-button>
<div class="phone-bind-wrap" v-if="showPasswordSetting"> <div class="phone-bind-wrap" v-if="showPasswordSetting">
<n-form ref="formRef" :model="modelData" :rules="passwordRules"> <n-form ref="formRef" :model="modelData" :rules="passwordRules">
@ -340,7 +343,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref, reactive } from 'vue'; import { onMounted, ref, reactive, computed } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { Edit } from '@vicons/tabler'; import { Edit } from '@vicons/tabler';
import { import {
@ -360,6 +363,8 @@ import type {
InputInst, InputInst,
} from 'naive-ui'; } from 'naive-ui';
const uploadGateway = import.meta.env.VITE_HOST + '/v1/attachment'; const uploadGateway = import.meta.env.VITE_HOST + '/v1/attachment';
const uploadToken = 'Bearer ' + localStorage.getItem('PAOPAO_TOKEN'); const uploadToken = 'Bearer ' + localStorage.getItem('PAOPAO_TOKEN');
const uploadType = ref('public/avatar'); const uploadType = ref('public/avatar');
@ -368,6 +373,9 @@ const allowPhoneBind = (import.meta.env.VITE_ALLOW_PHONE_BIND.toLowerCase() ===
const allowActivation = (import.meta.env.VITE_ALLOW_ACTIVATION.toLowerCase() === 'true') const allowActivation = (import.meta.env.VITE_ALLOW_ACTIVATION.toLowerCase() === 'true')
const store = useStore(); const store = useStore();
const buttonStyle = computed(() => {
return store.state.theme === 'dark' ? "#2080f0" : "#063c62";
});
const sending = ref(false); const sending = ref(false);
const binding = ref(false); const binding = ref(false);
const activating = ref(false) const activating = ref(false)

@ -261,7 +261,7 @@ onMounted(() => {
} }
.income { .income {
color: #18a058; color: #063c62;
} }
} }
.pagination-wrap { .pagination-wrap {
@ -290,7 +290,7 @@ onMounted(() => {
.dark { .dark {
.income { .income {
color: #63e2b7; color: #2080f0;
} }
.main-content-wrap { .main-content-wrap {
background-color: rgba(16, 16, 20, 0.75); background-color: rgba(16, 16, 20, 0.75);

@ -47,7 +47,7 @@
<whisper-add-friend :show="showAddFriendWhisper" :user="user" @success="addFriendWhisperSuccess" /> <whisper-add-friend :show="showAddFriendWhisper" :user="user" @success="addFriendWhisperSuccess" />
</n-spin> </n-spin>
<n-tabs class="profile-tabs-wrap" type="line" animated @update:value="changeTab"> <n-tabs class="profile-tabs-wrap" type="line" animated @update:value="changeTab">
<n-tab-pane name="post" tab="泡泡"> </n-tab-pane> <n-tab-pane name="post" tab="Aimo"> </n-tab-pane>
<n-tab-pane name="comment" tab="评论"> </n-tab-pane> <n-tab-pane name="comment" tab="评论"> </n-tab-pane>
<n-tab-pane name="media" tab="图文"> </n-tab-pane> <n-tab-pane name="media" tab="图文"> </n-tab-pane>
<n-tab-pane name="star" tab="喜欢"> </n-tab-pane> <n-tab-pane name="star" tab="喜欢"> </n-tab-pane>

@ -311,7 +311,7 @@ onMounted(() => {
} }
.income { .income {
color: #18a058; color: #063c62;
} }
} }
.pagination-wrap { .pagination-wrap {
@ -340,7 +340,7 @@ onMounted(() => {
.dark { .dark {
.income { .income {
color: #63e2b7; color: #2080f0;
} }
.main-content-wrap { .main-content-wrap {
background-color: rgba(16, 16, 20, 0.75); background-color: rgba(16, 16, 20, 0.75);

Loading…
Cancel
Save