Compare commits

..

No commits in common. "aa705a8bb8275133abfaa74ab78f72bd3a9ad1f1" and "b160d3447dd1009ed22f23db725dd40abed53bf0" have entirely different histories.

3 changed files with 33 additions and 35 deletions

View File

@ -11,7 +11,7 @@ import {getHomePath} from "@/views/setting/tools";
NProgress.configure({showSpinner: false}); // NProgress Configuration NProgress.configure({showSpinner: false}); // NProgress Configuration
const whiteList = ["/login", "/homePage", "/registrationPage", "/shoppingCart", "/homePageImage","/h5HomePage"]; // no redirect whitelist const whiteList = ["/login", "/homePage", "/registrationPage", "/shoppingCart", "/homePageImage"]; // no redirect whitelist
// 获取用户代理字符串 // 获取用户代理字符串
const userAgent = window.navigator.userAgent; const userAgent = window.navigator.userAgent;

View File

@ -54,8 +54,34 @@ export const constantRoutes = [
path: "/", component: Layout, hidden: true, children: [{ path: "/", component: Layout, hidden: true, children: [{
path: "/redirect/:path(.*)", component: () => import("@/views/redirect/index"), path: "/redirect/:path(.*)", component: () => import("@/views/redirect/index"),
},], },],
}, {
path: '/beforeLogin',
name: 'BeforeLogin',
title: 'beforeLogin',
component: () => import('@/views/beforeLogin/index.vue'),
hidden: true
}, },
{ {
path: '/demoDify',
name: 'DemoDify',
title: 'DemoDify',
component: () => import('@/views/demoDify/index.vue'),
},
{
path: '/wxPage',
name: 'wxPage',
title: '热门产品',
component: () => import('@/views/homePage/wxPage.vue'),
hidden: true
}, {
path: '/wxDetailPage',
name: 'wxDetailPage',
title: '产品详情',
component: () => import('@/views/homePage/wxDetailPage.vue'),
hidden: true
},
{
path: '/h5HomePage', path: '/h5HomePage',
name: 'H5HomePage', name: 'H5HomePage',
title: 'H5首页', title: 'H5首页',
@ -105,34 +131,6 @@ export const constantRoutes = [
}, },
] ]
}, },
{
path: '/beforeLogin',
name: 'BeforeLogin',
title: 'beforeLogin',
component: () => import('@/views/beforeLogin/index.vue'),
hidden: true
},
{
path: '/demoDify',
name: 'DemoDify',
title: 'DemoDify',
component: () => import('@/views/demoDify/index.vue'),
},
{
path: '/wxPage',
name: 'wxPage',
title: '热门产品',
component: () => import('@/views/homePage/wxPage.vue'),
hidden: true
}, {
path: '/wxDetailPage',
name: 'wxDetailPage',
title: '产品详情',
component: () => import('@/views/homePage/wxDetailPage.vue'),
hidden: true
},
{ {
hidden: true, path: '/screen', name: 'screen', title: '可视化大屏', meta: { hidden: true, path: '/screen', name: 'screen', title: '可视化大屏', meta: {

View File

@ -184,8 +184,8 @@ window.onresize = adapter()
} }
.tabBar { .tabBar {
// height:1.1rem; height:.8rem;
padding: .12rem 0; // padding: .1rem 0;
background-color: #fff; background-color: #fff;
width: 100%; width: 100%;
display: flex; display: flex;
@ -222,15 +222,15 @@ window.onresize = adapter()
margin-bottom: .05rem; margin-bottom: .05rem;
img { img {
width: .3rem; width: .24rem;
height: .3rem; height: .24rem;
display: block; display: block;
transition: transform 0.3s ease; transition: transform 0.3s ease;
} }
} }
.item-text { .item-text {
font-size: .2rem; font-size: .12rem;
color: #666; color: #666;
transition: color 0.3s ease; transition: color 0.3s ease;
} }