This commit is contained in:
X1627315083
2024-09-03 16:39:06 +08:00
54 changed files with 1298 additions and 723 deletions

View File

@@ -14,20 +14,20 @@
<!-- 点击事件就用下面的div -->
<!-- <div class="attention_item attention_item_active"> -->
<div>{{ userInfo?.followeeCount }}</div>
<span>关注</span>
<span>{{$t('account.Follow')}}</span>
</div>
<div class="attention_item">
<div>{{ userInfo?.followerCount }}</div>
<span>粉丝</span>
<span>{{$t('account.Fans')}}</span>
</div>
<div class="attention_item">
<!-- <div class="attention_item">
<div>22</div>
<span>作品数</span>
</div>
</div> -->
</div>
<div class="homeMain_user_detail_item homeMain_user_detail_setUser" @click="openAccount">
<i class="fi fi-rr-user"></i>
<div>个人中心</div>
<div>{{$t('Header.personal')}}</div>
<i class="icon iconfont icon-xiala"></i>
</div>
</div>
@@ -48,11 +48,7 @@
></div>
</div>
<div class="trialApproval button_second credits message">
<a-badge :count="messageNum">
<i class="fi fi-rr-envelope" @click="openMessage"></i>
</a-badge>
</div>
<div
class="trialApproval button_second credits hideChecked"
>
@@ -85,11 +81,29 @@
</nav> -->
<navRouter :routerList="navRouterList"></navRouter>
<div class="homeMain_right">
<img
<!-- <img
class="homeMain_logo"
@click="turnToNewPage('https://www.aidlab.hk/en/')"
src="@/assets/images/loginPage/aida_logo.png"
/>
/> -->
<div class="trialApproval credits message">
<div class="message_iconItem">
<a-badge :count="messageNum">
<i class="fi fi-rr-envelope" @click="openMessage"></i>
</a-badge>
</div>
<div class="message_iconItem">
<a-badge :count="messageType?.newPosted">
<!-- <i class="fi fi-rr-envelope" @click="openMessage"></i> -->
<i class="fi fi-rr-bell" @click.stop="openNewPosted"></i>
</a-badge>
<div class="message_iconItem_value select_block" v-show="isNewPosted" style="width: 40rem">
<newPosted ref="newPosted"></newPosted>
</div>
</div>
</div>
<Habit></Habit>
</div>
<nav class="select_block" v-show="isShowOperate">
@@ -149,7 +163,7 @@
</div>
</template>
<script >
import { defineComponent, createVNode, ref, computed, onMounted } from "vue";
import { defineComponent, createVNode, ref,toRefs, reactive, computed, onMounted } from "vue";
import { isEmail } from "@/tool/util";
import { setCookie, getCookie, WriteCookie,clonAllCookie } from "@/tool/cookie";
import payOrder from "@/component/Pay/payOrder.vue";
@@ -162,6 +176,7 @@ import { Modal, message } from "ant-design-vue";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import RobotAssist from "@/component/HomePage/RobotAssist.vue";
import scaleVideo from "@/component/HomePage/scaleVideo.vue";
import newPosted from "@/component/HomePage/newPosted.vue";
import navRouter from "@/component/modules/navRouter.vue";
import { useStore } from "vuex";
import { setLang } from "@/tool/guide";
@@ -177,6 +192,7 @@ export default defineComponent({
Habit,
RobotAssist,
scaleVideo,
newPosted,
UpgradePlan,
payOrder,
TaskPage,
@@ -194,6 +210,7 @@ export default defineComponent({
let credits = computed(()=>{
return store.state.UserHabit.credits.value
})
let activeCredits = ref(false)
let getLangIsShowMark = ref(true)
let AdministratorUserIdList = [88,6,46,31,73,83,87,4]
@@ -223,6 +240,19 @@ export default defineComponent({
let messageNum = computed(()=>{
return store.state.UserHabit.messageSystem.messageNum
})
let messageType = computed(()=>{
return store.state.UserHabit.messageSystem.messageType
})
let stateList = reactive({
isNewPosted:false,
isShowOperate:false,
isLanguage:false,
})
let isNewPosted = ref(false)
let isShowOperate = ref(false)
let isLanguage = ref(false)
let newPosted = ref(null)
let getUnreadCount = ()=>{
Https.axiosGet(Https.httpUrls.getUnreadCount).then((rv)=>{
if(rv){
@@ -230,9 +260,9 @@ export default defineComponent({
}
})
}
MyWs.linkWs("ws://"+MyWs.messageUrl,'message')
let getWsMessage = (data)=>{
console.log(data);
store.commit('setMessageSystem',...data)
}
MyEvent.add('getMessage',getWsMessage)
@@ -242,6 +272,42 @@ export default defineComponent({
// MyWs.ws.onmessage = (data)=>{
// console.log(JSON.parse(data.data),232);
// }
let openNewPosted = ()=>{
stateList.isNewPosted = !stateList.isNewPosted
newPosted.value.init()
document.addEventListener(
"click",
closeShowOperateContent,
false
);
}
//点击下拉图标出现操作
let changeShowOperateContent=() =>{
stateList.isShowOperate = !stateList.isShowOperate;
document.addEventListener(
"click",
closeShowOperateContent,
false
);
}
let changeLanguage=() =>{
stateList.isLanguage = !stateList.isLanguage;
document.addEventListener(
"click",
closeShowOperateContent,
false
);
}
//关闭下拉图标
let closeShowOperateContent=() =>{
stateList.isShowOperate = false;
stateList.isLanguage = false
stateList.isNewPosted = false
document.removeEventListener("click", closeShowOperateContent);
}
onMounted(()=>{
getUnreadCount()
})
@@ -258,11 +324,17 @@ export default defineComponent({
AdministratorUserIdList,
navRouterList,
messageNum,
messageType,
...toRefs(stateList),
newPosted,
openNewPosted,
changeShowOperateContent,
changeLanguage,
closeShowOperateContent,
}
},
data() {
return {
isShowOperate: false,
bindEmailVisible: false,
isHaveBindEmail: false,
bindEmailStep: 1,
@@ -275,7 +347,6 @@ export default defineComponent({
numTime: 30,
timerSec: null,
modalWarning: null,
isLanguage: false,
language:[
{name:'English',value:'ENGLISH'},
@@ -397,31 +468,7 @@ export default defineComponent({
},
//点击下拉图标出现操作
changeShowOperateContent() {
this.isShowOperate = !this.isShowOperate;
document.addEventListener(
"click",
this.closeShowOperateContent,
false
);
},
changeLanguage(){
this.isLanguage = !this.isLanguage;
document.addEventListener(
"click",
this.closeShowOperateContent,
false
);
},
//关闭下拉图标
closeShowOperateContent() {
this.isShowOperate = false;
this.isLanguage = false
document.removeEventListener("click", this.closeShowOperateContent);
},
@@ -601,6 +648,39 @@ export default defineComponent({
display: flex;
justify-content: flex-end;
align-items: center;
.message{
display: flex;
width: 6rem;
justify-content: space-between;
margin: 0 2rem;
// padding: 1rem;
i{
margin-left: 0rem;
border-left: none;
padding-left: 0rem;
height: auto;
font-size: 2rem;
width: 3rem;
cursor: pointer;
}
span{
overflow: initial;
align-items: center;
width: auto;
margin: auto;
height: auto;
}
.message_iconItem{
position: relative;
display: flex;
.message_iconItem_value{
padding: 1rem;
left: 50%;
transform: translateX(-50%);
top: 4rem;
}
}
}
}
.homeMain_logo {
width: 14.4rem;
@@ -726,6 +806,7 @@ export default defineComponent({
align-items: center;
position: relative;
height: 3.7rem;
&.marLeft2{
margin-left: 2rem;
}
@@ -774,23 +855,7 @@ export default defineComponent({
font-size: 1.8rem;
cursor: pointer;
}
&.message{
// padding: 1rem;
i{
margin-left: 0rem;
border-left: none;
padding-left: 0rem;
height: auto;
width: 3rem;
}
span{
overflow: initial;
align-items: center;
width: auto;
margin: auto;
height: auto;
}
}
.fi-br-refresh{
margin-left: 0;
border-left: none;