diff --git a/src/assets/site/gexinghua.svg b/src/assets/site/gexinghua.svg new file mode 100644 index 0000000..869456c --- /dev/null +++ b/src/assets/site/gexinghua.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/sitebase.svg b/src/assets/site/sitebase.svg new file mode 100644 index 0000000..4a99d73 --- /dev/null +++ b/src/assets/site/sitebase.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/sitebase_active.svg b/src/assets/site/sitebase_active.svg new file mode 100644 index 0000000..1177a35 --- /dev/null +++ b/src/assets/site/sitebase_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/siteh5.svg b/src/assets/site/siteh5.svg new file mode 100644 index 0000000..4463815 --- /dev/null +++ b/src/assets/site/siteh5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/sitesem.svg b/src/assets/site/sitesem.svg new file mode 100644 index 0000000..0ff4fe4 --- /dev/null +++ b/src/assets/site/sitesem.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/GroupFormBtns.vue b/src/components/GroupFormBtns.vue new file mode 100644 index 0000000..c215223 --- /dev/null +++ b/src/components/GroupFormBtns.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file diff --git a/src/components/PageTitle.vue b/src/components/PageTitle.vue index ad2d462..b63d604 100644 --- a/src/components/PageTitle.vue +++ b/src/components/PageTitle.vue @@ -34,6 +34,7 @@ export default { display: flex; flex-direction: column; padding: 24px 12px; + box-sizing: border-box; b { /* headline/haeadline_3_bold */ diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue new file mode 100644 index 0000000..df2afa4 --- /dev/null +++ b/src/components/SetLeftMenu.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 9948898..c1159db 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,11 +6,12 @@ import HomeView from '../views/HomeView.vue'; // import Franchise from '../views/Franchise.vue' Vue.use(VueRouter) -const whiteSlideList = ['/','/ui','/siteList'];//侧边导航白名单 -const whiteHeaderList = ['/','/ui','/register','/configureServicePrices','/siteList'];//头部导航白名单 -const whiteFooterList = ['/','/ui','/configureServicePrices'];//底部白名单 -const routes = [ - { +const whiteSlideList = ['/', '/ui', '/siteList']; //侧边导航白名单 +const whiteHeaderList = ['/', '/ui', '/register', '/configureServicePrices', '/siteList','/siteSetting/siteBaseSetting','/siteSetting/sitePersonalization' + ,'/siteSetting/siteH5','/siteSetting/siteSem' +]; //头部导航白名单 +const whiteFooterList = ['/', '/ui', '/configureServicePrices']; //底部白名单 +const routes = [{ path: '/', name: '首页', component: HomeView, @@ -22,7 +23,7 @@ const routes = [ // route level code-splitting // this generates a separate chunk (about.[hash].js) for this route // which is lazy-loaded when the route is visited. - component: () => import(/* webpackChunkName: "register" */ '../views/Register.vue'), + component: () => import( /* webpackChunkName: "register" */ '../views/Register.vue'), children: [ // 这是子路由的定义开始 // { // path: '', // 当访问 /user 时，默认加载 UserProfile 组件 @@ -42,27 +43,44 @@ const routes = [ // route level code-splitting // this generates a separate chunk (about.[hash].js) for this route // which is lazy-loaded when the route is visited. - component: () => import(/* webpackChunkName: "ui" */ '../views/elementGroups.vue') + component: () => import( /* webpackChunkName: "ui" */ '../views/elementGroups.vue') }, { path: '/franchise', name: '加盟', - component: () => import(/* webpackChunkName: "franchise" */ '../views/Franchise.vue') + component: () => import( /* webpackChunkName: "franchise" */ '../views/Franchise.vue') }, { path: '/configureServicePrices', name: '配置服务价格', - component: () => import(/* webpackChunkName: "franchise" */ '../views/ConfigureServicePrices.vue') + component: () => import( /* webpackChunkName: "configureServicePrices" */ '../views/ConfigureServicePrices.vue') }, { path: '/siteList', name: '站点列表', - component: () => import(/* webpackChunkName: "franchise" */ '../views/SiteList.vue') + component: () => import( /* webpackChunkName: "siteList" */ '../views/SiteList.vue') }, + { - path: '/siteBaseSetting', - name: '站点基础设置', - component: () => import(/* webpackChunkName: "franchise" */ '../views/SiteBaseSetting.vue') + path: '/siteSetting', + name: '站点设置', + component: () => import( /* webpackChunkName: "SiteSetting" */ '../views/SiteSetting.vue'), + children: [ + { + path: '', // 默认子路由 + redirect: () => import( /* webpackChunkName: "siteBaseSetting" */ '../views/SiteBaseSetting.vue') // 重定向到第一个页面 + }, + { + path: 'siteBaseSetting', + name: '站点基础设置', + component: () => import( /* webpackChunkName: "siteBaseSetting" */ '../views/SiteBaseSetting.vue'), + }, + { + path: 'sitePersonalization', + name: '个性化设置', + component: () => import( /* webpackChunkName: "sitePersonalization" */ '../views/SitePersonalization.vue') + }, + ] }, ] @@ -72,7 +90,7 @@ const router = new VueRouter({ routes }) router.beforeEach((to, from, next) => { - console.log(to.path,'to.path-----'); + console.log(to.path, 'to.path-----'); if (whiteSlideList.includes(to.path)) { store.commit('SET_SIDEBAR', true); // 登录页面不显示侧边栏 } else { @@ -91,4 +109,4 @@ router.beforeEach((to, from, next) => { next(); }); -export default router +export default router \ No newline at end of file diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss index 653c0a4..daaf7d7 100644 --- a/src/style/theme/common.scss +++ b/src/style/theme/common.scss @@ -10,6 +10,19 @@ body { padding: 0; } } + +@keyframes fadeInOut { + 0% { + opacity: 0; + } + 50% { + opacity: 1; + } + 100% { + opacity: 0; + } + } + .ellipsis{ } diff --git a/src/views/ConfigureServicePrices.vue b/src/views/ConfigureServicePrices.vue index 34d1e48..caaaacd 100644 --- a/src/views/ConfigureServicePrices.vue +++ b/src/views/ConfigureServicePrices.vue @@ -144,7 +144,7 @@
- 添加商品 + 添加宝贝
diff --git a/src/views/Register.vue b/src/views/Register.vue index ba7e837..a2e3eb1 100755 --- a/src/views/Register.vue +++ b/src/views/Register.vue @@ -761,7 +761,7 @@ export default { dialogVisible: false,//是否展示弹框 showCancelButton: true, // 控制是否显示取消按钮 showCloseButton: true, // 控制是否显示关闭按钮 - activeStep: 3,//当前步骤条 + activeStep: 2,//当前步骤条 has_store: '1',//是否是初次授权 还是已有店铺 大于0 已有店铺 distribution_channel: '0',//销售渠道 是否为电商 0 非电商 >0 电商 payment_method_list: [//收款方式 diff --git a/src/views/SiteBaseSetting.vue b/src/views/SiteBaseSetting.vue new file mode 100644 index 0000000..e61d581 --- /dev/null +++ b/src/views/SiteBaseSetting.vue @@ -0,0 +1,315 @@ + + + \ No newline at end of file diff --git a/src/views/SitePersonalization.vue b/src/views/SitePersonalization.vue new file mode 100644 index 0000000..0fdb70d --- /dev/null +++ b/src/views/SitePersonalization.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/src/views/SiteSetting.vue b/src/views/SiteSetting.vue new file mode 100644 index 0000000..310c2d2 --- /dev/null +++ b/src/views/SiteSetting.vue @@ -0,0 +1,59 @@ + + + \ No newline at end of file