Commit f6857618 authored by zhengke's avatar zhengke

非企业,个人中心设置水印

parent 4eb6ed68
...@@ -265,6 +265,13 @@ const routes: RouteRecordRaw[] = [ ...@@ -265,6 +265,13 @@ const routes: RouteRecordRaw[] = [
title:'账号一览' title:'账号一览'
} }
}, },
{
path: '/u/w',
component: () => import('@/views/TeamCenter/WaterMaker.vue'),
meta:{
title:'水印设置'
}
},
{ {
path: '/u/order', path: '/u/order',
component: () => import('@/views/UserCenter/Order.vue'), component: () => import('@/views/UserCenter/Order.vue'),
......
...@@ -16,6 +16,7 @@ export interface MenuState { ...@@ -16,6 +16,7 @@ export interface MenuState {
const menus:{menu:Menu,owner:MenuOwner}[] = [ const menus:{menu:Menu,owner:MenuOwner}[] = [
{menu:{name:'账号一览',icon:'IconEarth',url:'/u'},owner:'*'}, {menu:{name:'账号一览',icon:'IconEarth',url:'/u'},owner:'*'},
{menu:{name:'水印设置',icon:'IconTag',url:'/u/w'},owner:'*'},
{menu:{name:'订单/发票',icon:'IconCurrency',url:'/u/order'},owner:'*'}, {menu:{name:'订单/发票',icon:'IconCurrency',url:'/u/order'},owner:'*'},
{menu:{name:'账户设置',icon:'IconProtect',url:'/u/setting'},owner:'*'}, {menu:{name:'账户设置',icon:'IconProtect',url:'/u/setting'},owner:'*'},
{menu:{name:'模版管理',icon:'IconPageTemplate',url:'/m'},owner:'M'}, {menu:{name:'模版管理',icon:'IconPageTemplate',url:'/m'},owner:'M'},
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div ref="marketRef" class="Market-from"> <div ref="marketRef" class="Market-from">
<div class="Market-fromBj"></div> <div class="Market-fromBj"></div>
<div class="relative" style="padding: 22px 17px; max-width:1440px; margin:0 auto;z-index: 2;"> <div class="relative" style="padding: 22px 17px; max-width:1440px; margin:0 auto;z-index: 2;">
<div :class="[datas.scrollTop>100?'MarketHeader':'']"> <div :class="[datas.scrollTop>200?'MarketHeader':'']">
<div class="row items-center"> <div class="row items-center">
<img class="q-pr-36" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1713237911000_1.png" style="height: 30px;" /> <img class="q-pr-36" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1713237911000_1.png" style="height: 30px;" />
<div class="row grow Market-select reactive"> <div class="row grow Market-select reactive">
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</template> </template>
</div> </div>
<div v-else-if="dataList.length == 0 && !loading" class="q-mt-lg bg-white rounded" <div v-else-if="dataList.length == 0 && !loading" class="q-mt-lg bg-white rounded"
style="padding:60px 10px;"> style="padding: 3.1vw 10px;">
<el-empty description="暂无数据" :image="noDataImg(1)" /> <el-empty description="暂无数据" :image="noDataImg(1)" />
</div> </div>
<div v-if='queryObj.pageCount == queryObj.pageIndex && !loading' class="text-center q-pt-lg"><img :src="noDataImg(2)" width="118" /></div> <div v-if='queryObj.pageCount == queryObj.pageIndex && !loading' class="text-center q-pt-lg"><img :src="noDataImg(2)" width="118" /></div>
...@@ -402,7 +402,6 @@ const search = () => { ...@@ -402,7 +402,6 @@ const search = () => {
* 获取模板市场分页列表 * 获取模板市场分页列表
*/ */
const queryTemplateBySearchHandler = async () => { const queryTemplateBySearchHandler = async () => {
console.log(parmas,'---------')
if(parmas.value.temptype) queryObj.TempType = parseInt(parmas.value.temptype.toString()) if(parmas.value.temptype) queryObj.TempType = parseInt(parmas.value.temptype.toString())
loading.value = true loading.value = true
try { try {
......
...@@ -29,20 +29,24 @@ ...@@ -29,20 +29,24 @@
<script lang="ts" setup> <script lang="ts" setup>
import UserCard from "@/components/User/UserCard.vue"; import UserCard from "@/components/User/UserCard.vue";
import { useMenuStore } from "@/store"; import { useMenuStore, useUserStore } from "@/store";
import { storeToRefs } from 'pinia'
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const router = useRouter() const router = useRouter()
const useMenu = useMenuStore(); const useMenu = useMenuStore();
const menus = ref(useMenu.getUserMenu); const menus = ref([] as any);
const activeIndex = ref(0) const activeIndex = ref(0)
const { userInfo } =storeToRefs(useUserStore())
const forwardSpace = () => router.push('/space') const forwardSpace = () => router.push('/space')
watch(() => router.currentRoute.value.path, (toPath) => { watch(() => router.currentRoute.value.path, (toPath) => {
menus.value = useMenu.getUserMenu if(!userInfo.value.it&&userInfo.value.iv) menus.value = useMenu.getUserMenu
else menus.value = useMenu.getUserMenu.filter(x=> {return x.url!='/u/w'})
if(!menus.value) return if(!menus.value) return
activeIndex.value = menus.value.findIndex(x=>x.url==router.currentRoute.value.path) activeIndex.value = menus.value.findIndex(x=>x.url==router.currentRoute.value.path)
},{immediate: true,deep: true}) },{immediate: true,deep: true})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment