1. 第一次进入商品列表,商品分类未展示

2. 链接选择器,店铺开启状态展示错误
3. 从新装修楼层,楼层bug修改
4. 搜索热词为空是返回null,导致报错
5. 首页全部商品分类缓存问题
6. 修改菜单项缓存、添加设置
7. 店铺分类二级分类修改时无父级分类
master
mabo 2021-08-04 17:07:39 +08:00
parent 483d8c3aef
commit 726ae1f856
15 changed files with 1383 additions and 486 deletions

View File

@ -82,13 +82,17 @@ export default {
},
computed: {
promotionTags () {
return JSON.parse(this.$store.state.hotWordsList)
if (this.$store.state.hotWordsList) {
return JSON.parse(this.$store.state.hotWordsList)
} else {
return []
}
}
},
created () {
this.searchData = this.$route.query.keyword
if (!this.hover) { //
//
// 5
const reloadTime = storage.getItem('hotWordsReloadTime')
const time = new Date().getTime() - 5 * 60 * 1000
if (!reloadTime) {

View File

@ -81,10 +81,10 @@ export default {
},
data () {
return {
cateList: [], //
panel: false, //
panelData: [], //
showFirstList: false //
showFirstList: false, //
cateList: [] //
}
},
computed: {
@ -98,6 +98,7 @@ export default {
getCategory(0).then(res => {
if (res.success) {
this.cateList = res.result;
this.$store.commit('SET_CATEGORY', res.result)
//
var expirationTime = new Date().setHours(new Date().getHours() + 1);
//

View File

@ -183,10 +183,14 @@ export default {
multSelected: [], //
selectedItem: [], //
brandIds: [], // id
params: {}, //
cateList: [] //
params: {} //
};
},
computed: {
cateList () { //
return this.$store.state.category
}
},
watch: {
selectedItem: {
//
@ -228,8 +232,12 @@ export default {
methods: {
getNav () { //
if (!this.$route.query.categoryId) return
this.cateList = JSON.parse(localStorage.getItem('category'))
if (!this.cateList.length) { // localstorage
setTimeout(() => {
this.getNav()
}, 500)
return
}
const arr = this.$route.query.categoryId.split(',')
if (arr.length > 0) {
this.tabBar = this.cateList.filter(e => {
@ -416,7 +424,7 @@ export default {
background: #fff;
border: 1px solid #999;
padding: 0 8px;
width: 85px;
min-width: 85px;
text-align: center;
margin: 0 3px;
&:hover {

View File

@ -81,10 +81,10 @@ export default {
},
data () {
return {
cateList: [], //
panel: false, //
panelData: [], //
showFirstList: false //
showFirstList: false, //
cateList: [] //
}
},
computed: {
@ -98,6 +98,7 @@ export default {
getCategory(0).then(res => {
if (res.success) {
this.cateList = res.result;
this.$store.commit('SET_CATEGORY', res.result)
//
var expirationTime = new Date().setHours(new Date().getHours() + 1);
//

View File

@ -3,7 +3,6 @@
<drawer></drawer>
<!-- 固定头部 -->
<hover-search class="hover-search" :class="{show: topSearchShow}"></hover-search>
<!-- 顶部广告 -->
<FixedTopPage :data="topAdvert"></FixedTopPage>
<!-- 头部 包括登录我的订单等 -->

View File

@ -34,7 +34,7 @@
{{item.grade==='GOOD'?'好评' : item.grade === 'WORSE'?'差评' : '中评'}}
</i-col>
<i-col span="4">
<Tooltip >
<Tooltip transfer>
<div class="content">{{item.content}}</div>
<div style="white-space: normal;" slot="content">
{{item.content}}

View File

@ -9,11 +9,11 @@ Vue.use(Vuex);
export default new Vuex.Store({
state: {
category: [], // 全部分类
navList: [], // 首页快捷导航
cartNum: storage.getItem('cartNum') || 0,
logoImg: require('@/assets/images/logo2.png'),
hotWordsList: storage.getItem('hotWordsList') || []
hotWordsList: storage.getItem('hotWordsList'),
category: localStorage.getItem('category')
},
getters,
actions,

View File

@ -1,7 +1,6 @@
import { otherRouter } from '@/router/router';
import { router } from '@/router/index';
import Util from '@/libs/util';
import Cookies from 'js-cookie';
import Vue from 'vue';
const app = {
@ -14,11 +13,7 @@ const app = {
currNavTitle: "", // 当前顶部菜单标题
cachePage: [],
lang: '',
isFullScreen: false,
openedSubmenuArr: [], // 要展开的菜单数组
menuTheme: 'dark', // 主题
themeColor: '',
pageOpenedList: [{
pageOpenedList: [{ // 打开过的页面,顶部历史菜单项
title: '首页',
path: '',
name: 'home_index'
@ -34,9 +29,7 @@ const app = {
// 面包屑数组 左侧菜单
menuList: [],
tagsList: [...otherRouter.children], //这块是面包屑的内容不能删除
routers: [
otherRouter
],
routers: [otherRouter],
messageCount: 0,
// 在这里定义你不想要缓存的页面的name属性值(参见路由配置router.js)
dontCache: ['test', 'test']
@ -67,25 +60,11 @@ const app = {
state.currNavTitle = v;
},
setTagsList(state, list) {
state.tagsList.push(...list);
},
updateMenulist(state, routes) {
state.menuList = routes;
},
addOpenSubmenu(state, name) {
let hasThisName = false;
let isEmpty = false;
if (name.length == 0) {
isEmpty = true;
}
if (state.openedSubmenuArr.indexOf(name) > -1) {
hasThisName = true;
}
if (!hasThisName && !isEmpty) {
state.openedSubmenuArr.push(name);
}
},
closePage(state, name) {
state.cachePage.forEach((item, index) => {
if (item == name) {
@ -158,9 +137,6 @@ const app = {
localStorage.lang = lang;
Vue.config.lang = lang;
},
clearOpenedSubmenu(state) {
state.openedSubmenuArr.length = 0;
},
setMessageCount(state, count) {
state.messageCount = count;
},

View File

@ -88,9 +88,6 @@ export default {
avatarPath() {
return localStorage.avatorImgPath;
},
cachePage() {
return this.$store.state.app.cachePage;
},
lang() {
return this.$store.state.app.lang;
}
@ -99,10 +96,6 @@ export default {
methods: {
init() {
//
let pathArr = util.setCurrentPath(this, this.$route.name);
if (pathArr.length >= 2) {
this.$store.commit("addOpenSubmenu", pathArr[1].name);
}
let userInfo = JSON.parse(Cookies.get("userInfo"));
this.userInfo = userInfo;
@ -138,9 +131,7 @@ export default {
}
// 退
else if (name === "loginOut") {
Cookies.set("accessToken", "");
this.$store.commit("logout", this);
this.$store.commit("clearOpenedSubmenu");
this.setStore("accessToken", "");
this.setStore("refreshToken", "");
this.$router.push({ path: "/login" });
@ -177,16 +168,9 @@ export default {
watch: {
$route(to, from) {
this.$store.commit("setCurrentPageName", to.name);
let pathArr = util.setCurrentPath(this, to.name);
if (pathArr.length > 2) {
this.$store.commit("addOpenSubmenu", pathArr[1].name);
}
this.checkTag(to.name);
localStorage.currentPageName = to.name;
},
lang() {
util.setCurrentPath(this, this.$route.name); //
},
}
},
mounted() {
this.init();

View File

@ -116,7 +116,6 @@ export default {
content: "修改密码成功,需重新登录",
onOk: () => {
this.$store.commit("logout", this);
this.$store.commit("clearOpenedSubmenu");
this.$router.push({
name: "login",
});

View File

@ -1,389 +1,484 @@
<template>
<div class="model-item"
v-if="element && element.key"
>
<!-- 轮播图模块包括个人信息快捷导航模块 -->
<template v-if="element.type == 'carousel'">
<model-carousel :data="element"></model-carousel>
</template>
<!-- 热门广告 -->
<template v-if="element.type == 'hotAdvert'">
<div class="setup-content">
<img style="display:block;" :src="element.options.list[0].img" @click="$router.push(element.options.list[0].url)" width="1200" alt="">
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(element.options.list[0])">编辑</Button>
</div>
</div>
</div>
<ul class="advert-list">
<template v-for="(item,index) in element.options.list">
<li v-if="index!==0" @click="$router.push(item.url)" class="setup-content" :key="index">
<img :src="item.img" width="230" height="190" alt="">
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
</div>
</div>
</li>
</template>
</ul>
</template>
<!-- 限时秒杀 待完善 -->
<template v-if="element.type == 'seckill'">
<seckill :data="element"></seckill>
</template>
<!-- 折扣广告 -->
<template v-if="element.type == 'discountAdvert'">
<div class="discountAdvert" :style="{'background-image' : 'url(' + require('@/assets/nav/decorate.png') + ')'}">
<div>
<div v-for="(item,index) in element.options.classification" :key="index" class="setup-content">
<img :src="item.img" width="190" height="210" alt="">
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
</div>
</div>
</div>
</div>
<div>
<div v-for="(item,index) in element.options.brandList" :key="index" class="setup-content">
<img :src="item.img" width="240" height="105" alt="">
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
</div>
</div>
</div>
</div>
</div>
</template>
<!-- 好货推荐 -->
<template v-if="element.type == 'recommend'">
<recommend :data="element"></recommend>
</template>
<!-- 新品排行 -->
<template v-if="element.type == 'newGoodsSort'">
<new-goods-sort :data="element"></new-goods-sort>
</template>
<!-- 首页广告 -->
<template v-if="element.type == 'firstAdvert'">
<first-page-advert :data="element"></first-page-advert>
</template>
<!-- 横幅广告 -->
<template v-if="element.type == 'bannerAdvert'">
<div class="horizontal-advert setup-content">
<img v-if="element.options.img" width="1200" :src="element.options.img" alt="">
<div v-else class="default-con">
<p>广告图片</p>
<p>1200*自定义</p>
</div>
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(element.options)">编辑</Button>
</div>
</div>
</div>
</template>
<template v-if="element.type == 'notEnough'">
<not-enough :data="element"></not-enough>
</template>
<div class="del-btn">
<Button size="small" type="error" @click="handleModelDelete"></Button>
</div>
<Modal
v-model="showModal"
title="装修"
draggable
width="800"
:z-index="100"
mask-closable="false"
:on-ok="sureDecorate"
:on-cancel="cancelDecorate"
<div class="model-item" v-if="element && element.key">
<!-- 轮播图模块包括个人信息快捷导航模块 -->
<template v-if="element.type == 'carousel'">
<model-carousel :data="element"></model-carousel>
</template>
<!-- 热门广告 -->
<template v-if="element.type == 'hotAdvert'">
<div class="setup-content">
<img
style="display: block"
:src="element.options.list[0].img"
@click="$router.push(element.options.list[0].url)"
width="1200"
alt=""
/>
<div class="setup-box">
<div>
<Button
size="small"
@click.stop="handleSelectModel(element.options.list[0])"
>编辑</Button
>
<div class="modal-top-advert">
<div>
<!-- 热门广告两种图片尺寸 -->
<img class="show-image" width="600" height="40" v-if="selected.size && selected.size.indexOf('1200')>=0" :src="selected.img" alt />
<img class="show-image" width="230" height="190" v-if="selected.size && selected.size.indexOf('230*190')>=0" :src="selected.img" alt />
<!-- 折扣广告三种图片尺寸 -->
<img class="show-image" width="600" height="300" v-if="selected.size && selected.size.indexOf('1300')>=0" :src="selected.img" alt />
<img class="show-image" width="190" height="210" v-if="selected.size && selected.size.indexOf('190*210')>=0" :src="selected.img" alt />
<img class="show-image" width="240" height="105" v-if="selected.size && selected.size.indexOf('240*105')>=0" :src="selected.img" alt />
</div>
<div class="tips">
建议尺寸<span>{{ selected.size }}</span>
</div>
<div>
图片链接<span>{{ selected.url }}</span> <Button size="small" type="primary" @click="handleSelectLink"></Button>
</div>
<div>
选择图片<Button size="small" type="primary" @click="handleSelectImg"></Button>&nbsp;
</div>
</div>
</div>
</div>
<ul class="advert-list">
<template v-for="(item, index) in element.options.list">
<li
v-if="index !== 0"
@click="$router.push(item.url)"
class="setup-content"
:key="index"
>
<img :src="item.img" width="230" height="190" alt="" />
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)"
>编辑</Button
>
</div>
</div>
</Modal>
<!-- 选择商品链接 -->
<liliDialog
ref="liliDialog"
@selectedLink="selectedLink"
@selectedGoodsData="selectedGoodsData"
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</li>
</template>
</ul>
</template>
<!-- 限时秒杀 待完善 -->
<template v-if="element.type == 'seckill'">
<seckill :data="element"></seckill>
</template>
<!-- 折扣广告 -->
<template v-if="element.type == 'discountAdvert'">
<div
class="discountAdvert"
:style="{
'background-image':
'url(' + require('@/assets/nav/decorate.png') + ')',
}"
>
<div>
<div
v-for="(item, index) in element.options.classification"
:key="index"
class="setup-content"
>
<img :src="item.img" width="190" height="210" alt="" />
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)"
>编辑</Button
>
</div>
</div>
</div>
</div>
<div>
<div
v-for="(item, index) in element.options.brandList"
:key="index"
class="setup-content"
>
<img :src="item.img" width="240" height="105" alt="" />
<div class="setup-box">
<div>
<Button size="small" @click.stop="handleSelectModel(item)"
>编辑</Button
>
</div>
</div>
</div>
</div>
</div>
</template>
<!-- 好货推荐 -->
<template v-if="element.type == 'recommend'">
<recommend :data="element"></recommend>
</template>
<!-- 新品排行 -->
<template v-if="element.type == 'newGoodsSort'">
<new-goods-sort :data="element"></new-goods-sort>
</template>
<!-- 首页广告 -->
<template v-if="element.type == 'firstAdvert'">
<first-page-advert :data="element"></first-page-advert>
</template>
<!-- 横幅广告 -->
<template v-if="element.type == 'bannerAdvert'">
<div class="horizontal-advert setup-content">
<img
v-if="element.options.img"
width="1200"
:src="element.options.img"
alt=""
/>
<div v-else class="default-con">
<p>广告图片</p>
<p>1200*自定义</p>
</div>
<div class="setup-box">
<div>
<Button
size="small"
@click.stop="handleSelectModel(element.options)"
>编辑</Button
>
</div>
</div>
</div>
</template>
<template v-if="element.type == 'notEnough'">
<not-enough :data="element"></not-enough>
</template>
<div class="del-btn">
<Button size="small" type="error" @click="handleModelDelete"></Button>
</div>
<Modal
v-model="showModal"
title="装修"
draggable
width="800"
:z-index="100"
mask-closable="false"
:on-ok="sureDecorate"
:on-cancel="cancelDecorate"
>
<div class="modal-top-advert">
<div>
<!-- 热门广告两种图片尺寸 -->
<img
class="show-image"
width="600"
height="40"
v-if="selected.size && selected.size.indexOf('1200') >= 0"
:src="selected.img"
alt
/>
<img
class="show-image"
width="230"
height="190"
v-if="selected.size && selected.size.indexOf('230*190') >= 0"
:src="selected.img"
alt
/>
<!-- 折扣广告三种图片尺寸 -->
<img
class="show-image"
width="600"
height="300"
v-if="selected.size && selected.size.indexOf('1300') >= 0"
:src="selected.img"
alt
/>
<img
class="show-image"
width="190"
height="210"
v-if="selected.size && selected.size.indexOf('190*210') >= 0"
:src="selected.img"
alt
/>
<img
class="show-image"
width="240"
height="105"
v-if="selected.size && selected.size.indexOf('240*105') >= 0"
:src="selected.img"
alt
/>
</div>
<div class="tips">
建议尺寸<span>{{ selected.size }}</span>
</div>
<div>
图片链接<span>{{ selected.url }}</span>
<Button size="small" type="primary" @click="handleSelectLink"
>选择链接</Button
>
</div>
<div>
选择图片<Button size="small" type="primary" @click="handleSelectImg"
>选择图片</Button
>&nbsp;
</div>
</div>
</Modal>
<!-- 选择商品链接 -->
<liliDialog
ref="liliDialog"
@selectedLink="selectedLink"
@selectedGoodsData="selectedGoodsData"
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage
@callback="callbackSelected"
:isComponent="true"
ref="ossManage"
/>
</Modal>
</div>
</template>
<script>
import ModelCarousel from './modelList/carousel.vue';
import FirstPageAdvert from './modelList/firstPageAdvert.vue';
import NewGoodsSort from './modelList/newGoodsSort.vue';
import Recommend from './modelList/recommend.vue';
import NotEnough from './modelList/notEnough.vue';
import Seckill from './modelList/seckill.vue';
import ModelCarousel from "./modelList/carousel.vue";
import FirstPageAdvert from "./modelList/firstPageAdvert.vue";
import NewGoodsSort from "./modelList/newGoodsSort.vue";
import Recommend from "./modelList/recommend.vue";
import NotEnough from "./modelList/notEnough.vue";
import Seckill from "./modelList/seckill.vue";
import ossManage from "@/views/sys/oss-manage/ossManage";
export default {
name:'modelFormItem',
props: ['element', 'select', 'index', 'data'],
components:{
ModelCarousel, Recommend, NewGoodsSort, FirstPageAdvert, NotEnough, Seckill, ossManage
name: "modelFormItem",
props: ["element", "select", "index", "data"],
components: {
ModelCarousel,
Recommend,
NewGoodsSort,
FirstPageAdvert,
NotEnough,
Seckill,
ossManage,
},
data() {
return {
showModal: false, // modal
selected: {}, //
picModelFlag: false, //
};
},
methods: {
//
handleSelectModel(item) {
this.selected = item;
this.showModal = true;
},
data () {
return {
showModal:false, // modal
selected:{}, //
picModelFlag: false //
}
//
handleModelDelete() {
this.$Modal.confirm({
title: "提示",
content: "<p>确定删除当前模块吗?</p>",
onOk: () => {
this.$nextTick(() => {
this.data.list.splice(this.index, 1);
});
},
});
},
methods: {
//
handleSelectModel (item) {
this.selected = item;
this.showModal = true
},
//
handleModelDelete () {
this.$Modal.confirm({
title: '提示',
content: '<p>确定删除当前模块吗?</p>',
onOk: () => {
this.$nextTick(() => {
this.data.list.splice(this.index, 1)
})
}
});
},
handleSelectLink(item,index) { //
this.$refs.liliDialog.open('link')
},
//
selectedLink(val) {
this.selected.url = this.$options.filters.formatLinkType(val);;
},
//
handleMoveEnd ({newIndex, oldIndex}) {
console.log('index', newIndex, oldIndex)
},
handleSelectImg(){ //
this.$refs.ossManage.selectImage = true;
this.picModelFlag = true;
},
//
callbackSelected (val) {
this.picModelFlag = false;
this.selected.img = val.url;
}
handleSelectLink(item, index) {
//
this.$refs.liliDialog.open("link");
},
}
//
selectedLink(val) {
this.selected.url = this.$options.filters.formatLinkType(val);
},
//
handleMoveEnd({ newIndex, oldIndex }) {
console.log("index", newIndex, oldIndex);
},
handleSelectImg() {
//
this.$refs.ossManage.selectImage = true;
this.picModelFlag = true;
},
//
callbackSelected(val) {
this.picModelFlag = false;
this.selected.img = val.url;
},
},
};
</script>
<style lang="scss" scoped>
@import './modelList/setup-box.scss';
.model-item{
position: relative;
margin-bottom: 20px;
&:hover{
.del-btn{display: block;}
@import "./modelList/setup-box.scss";
.model-item {
position: relative;
margin-bottom: 20px;
&:hover {
.del-btn {
display: block;
}
}
}
.del-btn{
width: 100px;
height: 100px;
display: none;
position: absolute;
right: -100px;
top: 0;
&:hover{
display: block;
}
.del-btn {
width: 100px;
height: 100px;
display: none;
position: absolute;
right: -100px;
top: 0;
&:hover {
display: block;
}
}
/** 横幅广告 */
.horizontal-advert{
width: 1200px;
height: auto;
.default-con{
height: 100px;
padding-top: 30px;
text-align: center;
background: #ddd;
}
.horizontal-advert {
width: 1200px;
height: auto;
.default-con {
height: 100px;
padding-top: 30px;
text-align: center;
background: #ddd;
}
}
/** 热门广告 */
.advert-list{
background: $theme_color;
height:200px;
display: flex;
justify-content: space-around;
padding: 3px 10px;
>li{
img{
cursor: pointer;
border-radius: 10px;
transition: all 150ms ease-in-out;
&:hover{
transform: translateY(-3px);
box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
}
}
.advert-list {
background: $theme_color;
height: 200px;
display: flex;
justify-content: space-around;
padding: 3px 10px;
> li {
img {
cursor: pointer;
border-radius: 10px;
transition: all 150ms ease-in-out;
&:hover {
transform: translateY(-3px);
box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
}
}
}
}
/** 限时秒杀 */
.limit-img{
display: flex;
flex-direction: row;
img{
width: 300px;
height: 100px;
}
.limit-img {
display: flex;
flex-direction: row;
img {
width: 300px;
height: 100px;
}
}
/** 折扣广告 */
.discountAdvert{
height:566px;
background-repeat: no-repeat ;
margin-left: -97px;
position: relative;
>div {
padding-left: 295px;
display: flex;
flex-wrap: wrap;
&:nth-child(1) img{
margin: 10px 10px 0 0;
}
&:nth-child(2) img{
margin: 0 10px 0 0;
}
.discountAdvert {
height: 566px;
background-repeat: no-repeat;
margin-left: -97px;
position: relative;
> div {
padding-left: 295px;
display: flex;
flex-wrap: wrap;
&:nth-child(1) img {
margin: 10px 10px 0 0;
}
&:nth-child(2) img {
margin: 0 10px 0 0;
}
}
}
/** 首页品牌 */
.brand{
.brand-view{
display: flex;
margin-top: 10px;
.brand-view-content{
width: 470px;
margin-left: 10px;
img{
width: 100%;
height: 316px;
}
.brand-view-title{
height: 50px;
padding: 0 5px;
display: flex;
align-items: center;
justify-content: space-between;
}
}
.brand-view-content:first-child{
width: 240px;
margin-left: 0;
}
}
.brand-list{
margin-top: 10px;
.brand {
.brand-view {
display: flex;
margin-top: 10px;
.brand-view-content {
width: 470px;
margin-left: 10px;
img {
width: 100%;
height: 316px;
}
.brand-view-title {
height: 50px;
padding: 0 5px;
display: flex;
align-items: center;
flex-wrap: wrap;
li{
width: 121px;
height: 112px;
position: relative;
overflow: hidden;
border: 1px solid #f5f5f5;
margin: -1px -1px 0 0;
&:hover{
.brand-mash{display:flex;}
}
.brand-img{
text-align: center;
margin-top: 30px;
img{
width: 100px;
height: auto;
}
}
.brand-mash{
display: none;
position: absolute;
top: 0;
left: 0;
background: rgba(0, 0, 0, .5);
width: inherit;
height: inherit;
font-size: 12px;
font-weight: bold;
.ivu-icon{
position: absolute;
right: 10px;
top: 10px;
font-size: 15px;
}
align-items: center;
justify-content: center;
flex-direction: column;
color: #fff;
cursor: pointer;
div:last-child{
background-color: $theme_color;
border-radius: 9px;
padding: 0 10px;
margin-top: 5px;
}
}
}
.refresh{
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
.ivu-icon{
font-size: 18px;
transition: all .3s ease-out;
}
&:hover{
background-color: $theme_color;
color: #fff;
.ivu-icon{
transform: rotateZ(360deg);
}
}
}
justify-content: space-between;
}
}
.brand-view-content:first-child {
width: 240px;
margin-left: 0;
}
}
.brand-list {
margin-top: 10px;
display: flex;
align-items: center;
flex-wrap: wrap;
li {
width: 121px;
height: 112px;
position: relative;
overflow: hidden;
border: 1px solid #f5f5f5;
margin: -1px -1px 0 0;
&:hover {
.brand-mash {
display: flex;
}
}
.brand-img {
text-align: center;
margin-top: 30px;
img {
width: 100px;
height: auto;
}
}
.brand-mash {
display: none;
position: absolute;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
width: inherit;
height: inherit;
font-size: 12px;
font-weight: bold;
.ivu-icon {
position: absolute;
right: 10px;
top: 10px;
font-size: 15px;
}
align-items: center;
justify-content: center;
flex-direction: column;
color: #fff;
cursor: pointer;
div:last-child {
background-color: $theme_color;
border-radius: 9px;
padding: 0 10px;
margin-top: 5px;
}
}
}
.refresh {
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
.ivu-icon {
font-size: 18px;
transition: all 0.3s ease-out;
}
&:hover {
background-color: $theme_color;
color: #fff;
.ivu-icon {
transform: rotateZ(360deg);
}
}
}
}
}
/** 装修模态框 内部样式start */
.modal-top-advert{
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
>*{
margin-bottom: 10px;
}
.modal-top-advert {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
> * {
margin-bottom: 10px;
}
}
</style>

View File

@ -14,8 +14,11 @@
<div class="show-content">
<model-form ref="modelForm" :data="modelForm"></model-form>
</div>
<!-- 保存按钮 -->
<div class="btn-bar"><Button type="primary" @click="saveTemplate"></Button> <Button @click="resetTemplate"></Button></div>
<!-- 操作按钮 -->
<div class="btn-bar">
<Button type="primary" @click="saveTemplate"></Button>
<Button class="ml_10" @click="resetTemplate"></Button>
</div>
</div>
</template>
<script>
@ -55,8 +58,6 @@ export default {
API_floor.updateHome(this.$route.query.id, data).then((res) => {
if (res.success) {
this.$Message.success("保存模板成功");
} else {
// this.$Message.error(res.message);
}
});
},
@ -69,6 +70,892 @@ export default {
API_floor.getHomeData(id).then((res) => {
if (res.success) {
let pageData = res.result.pageData;
// let pageData = {
// "list": [{
// "type": "topAdvert",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9fc491bd51484690a405ce0fab1bb118.jpeg",
// "url": "/merchant?id=1376369067769724928",
// "bgColor": "#377CFA",
// "size": "1200*80"
// }, {
// "type": "navBar",
// "list": [{
// "name": "",
// "url": "/seckill"
// }, {
// "name": "",
// "url": "/coupon"
// }, {
// "name": "",
// "url": "https://store-b2b2c.pickmall.cn"
// }]
// }, {
// "type": "carousel",
// "name": "",
// "icon": "md-image",
// "showName": "",
// "size": "790*340",
// "options": {
// "list": [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/fda3ca6646a6401b9c4cc664af3a8bb6.png",
// "url": "/goodsList?cateId=1348576427264204943"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/885ba98892d048049c158296bc4c6759.png",
// "url": "/goodsList?cateId=1348576427268399379"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/8e33ab68ef734558bdc158d6b1b1451f.png",
// "url": "/goodsList?cateId=1348576427264204982"
// }]
// },
// "key": "1612497034000_84734",
// "model": "carousel_1612497034000_84734"
// }, {
// "type": "seckill",
// "name": "",
// "icon": "md-image",
// "showName": "",
// "options": {
// "list": [{
// "time": 6,
// "goodsList": [{
// "img": "/img/1.389c5949.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafads123213a",
// "url": ""
// }, {
// "img": "/img/2.8b41a762.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/3.0448ed98.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/4.b7944e24.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/5.a172e11a.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/1.389c5949.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/2.8b41a762.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/3.0448ed98.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/4.b7944e24.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }, {
// "img": "/img/5.a172e11a.jpg",
// "price": 20,
// "originalPrice": 30,
// "name": "asdasdafadsa",
// "url": ""
// }]
// }, {
// "time": 8,
// "goodsList": [{
// "img": "/img/1.389c5949.jpg",
// "url": ""
// }, {
// "img": "/img/2.8b41a762.jpg",
// "url": ""
// }, {
// "img": "/img/3.0448ed98.jpg",
// "url": ""
// }, {
// "img": "/img/4.b7944e24.jpg",
// "url": ""
// }, {
// "img": "/img/5.a172e11a.jpg",
// "url": ""
// }]
// }, {
// "time": 10,
// "goodsList": [{
// "img": "/img/1.389c5949.jpg",
// "url": ""
// }, {
// "img": "/img/2.8b41a762.jpg",
// "url": ""
// }, {
// "img": "/img/3.0448ed98.jpg",
// "url": ""
// }, {
// "img": "/img/4.b7944e24.jpg",
// "url": ""
// }, {
// "img": "/img/5.a172e11a.jpg",
// "url": ""
// }]
// }, {
// "time": 12,
// "goodsList": [{
// "img": "/img/1.389c5949.jpg",
// "url": ""
// }, {
// "img": "/img/2.8b41a762.jpg",
// "url": ""
// }, {
// "img": "/img/3.0448ed98.jpg",
// "url": ""
// }, {
// "img": "/img/4.b7944e24.jpg",
// "url": ""
// }, {
// "img": "/img/5.a172e11a.jpg",
// "url": ""
// }]
// }, {
// "time": 14,
// "goodsList": []
// }, {
// "time": 16,
// "goodsList": []
// }, {
// "time": 18,
// "goodsList": []
// }]
// },
// "key": "1628048373000_83760",
// "model": "seckill_1628048373000_83760"
// }, {
// "type": "discountAdvert",
// "name": "广",
// "icon": "md-image",
// "options": {
// "bgImg": "",
// "classification": [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/1dd9c20ffad245e89e6dc516d6603719.jpg",
// "url": "/goodsDetail?id=1354319273359335424",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d64d48fa56b340f59bd3064aa8d4bdca.png",
// "url": "/goodsDetail?skuId=1376845635973545984&goodsId=1376845635923214336",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/51fc954e0f0f4feda97611a2fecc0ad1.png",
// "url": "/goodsDetail?skuId=1376544591066431488&goodsId=1376544590403731456",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/fde5349e6b4c438d884ee36ae8c97096.png",
// "url": "/goodsDetail?skuId=1376554436532371456&goodsId=1376554435945168896",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d64d48fa56b340f59bd3064aa8d4bdca.png",
// "url": "/goodsDetail?skuId=1376556775628603392&goodsId=1376556775007846400",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/5259dbfb17fd482894021b86140d2871.png",
// "url": "/goodsDetail?skuId=1381792993853308928&goodsId=1377083477941288960",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png",
// "url": "/goodsDetail?skuId=1381793060458856448&goodsId=1377085464581767168",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d53cbd59ce3a4efd8c3c8f476c91f3e9.png",
// "url": "/goodsDetail?skuId=1381791842919514112&goodsId=1376443041593688064",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b95573e65d2b4ffa8e7ed96d94da37c9.png",
// "url": "/goodsDetail?skuId=1381792775162298368&goodsId=1377077664103268352",
// "size": "190*210"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/6a5182bc98a347a5926e3be24e55719f.png",
// "url": "/goodsDetail?skuId=1381793449228894208&goodsId=1377098934119301120",
// "size": "190*210"
// }],
// "brandList": [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/905c55d7dc7044328314c94adfbe6051.png",
// "url": "",
// "size": "240*105"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/de02941684f6423db05fe84ade7bbf35.png",
// "url": "",
// "size": "240*105"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9f6ad605ba4047db90109d45ab9265ca.png",
// "url": "",
// "size": "240*105"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/0dd24fb3bc554158973a3deda5edfda5.png",
// "url": "",
// "size": "240*105"
// }]
// },
// "key": "1612497041000_99064",
// "model": "discountAdvert_1612497041000_99064"
// }, {
// "type": "recommend",
// "name": "",
// "icon": "md-image",
// "options": {
// "contentLeft": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#449dae",
// "url": "/goodsDetail?id=1346742995118743552",
// "list": [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b20243bc89a149a398b6d7ef9a097938.jpg?x-oss-process=style/400X400",
// "name": " (MI)Redmi K40 Pro ",
// "describe": "",
// "url": "/goodsDetail?skuId=1376544591276146688&goodsId=1376544590403731456",
// "size": "160*160",
// "price": 3999
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a4c2b5073fd84d60bfe38d6a6c0044c9.jpeg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "describe": " 8GB+128GB 5G",
// "url": "/goodsDetail?skuId=1376373278989352960&goodsId=1376373278360207360",
// "size": "80*80",
// "price": 3799
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/df6377650f94456087316c1c9a381952.jpeg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "describe": " 8GB+128GB 5G",
// "url": "/goodsDetail?skuId=1376373279131959296&goodsId=1376373278360207360",
// "size": "80*80",
// "price": 3899
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/30b3030b9bb44e758146d8eca63a1242.jpeg?x-oss-process=style/400X400",
// "name": "vivo iQOO 7 ",
// "describe": "UFS 3.1 5G",
// "url": "/goodsDetail?skuId=1376521744352804864&goodsId=1376521743522332672",
// "size": "80*80",
// "price": 4198
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d86a06718d88422baf7422cb0d8b71db.jpeg?x-oss-process=style/400X400",
// "name": "vivo iQOO 7 ",
// "describe": "UFS 3.1 5G",
// "url": "/goodsDetail?skuId=1376521744608657408&goodsId=1376521743522332672",
// "size": "80*80",
// "price": 4298
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b3dccb22364f42c9bec193d64f140abb.jpg?x-oss-process=style/400X400",
// "name": "Apple iPhone 12 ",
// "describe": " 5G",
// "url": "/goodsDetail?skuId=1376529926336806912&goodsId=1376529925690884096",
// "size": "80*80",
// "price": 4200
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/af4e8d5341b1433c8d23d44dbf9bf37f.jpg?x-oss-process=style/400X400",
// "name": "Apple iPhone 12 ",
// "describe": " 5G",
// "url": "/goodsDetail?skuId=1376529926533939200&goodsId=1376529925690884096",
// "size": "80*80",
// "price": 4100
// }]
// },
// "contentRight": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#a25684",
// "url": "/goodsDetail?skuId=1376541893952798720&goodsId=1376541893319458816",
// "list": [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/0544e5c117a348998d80061f7a900400.jpg?x-oss-process=style/400X400",
// "name": " EOS 200D II ",
// "describe": "(Canon) 2",
// "url": "/goodsDetail?skuId=1376541893755666432&goodsId=1376541893319458816",
// "size": "220*110",
// "price": 4449
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/e58eae43b3784a1bb1bdf13937442e2d.jpg?x-oss-process=style/400X400",
// "name": "耀Play4T Pro ",
// "describe": "86530W",
// "url": "/goodsDetail?skuId=1376547794663243776&goodsId=1376547793954406400",
// "size": "220*110",
// "price": 2999
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/745f6ef25634428a8b1972ce23c9c7b3.jpg?x-oss-process=style/400X400",
// "name": "Redmi K30 ",
// "describe": "MI",
// "url": "/goodsDetail?skuId=1376554436532371456&goodsId=1376554435945168896",
// "size": "220*110",
// "price": 3000
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/5fc6e64e189c4c378e72757af663ff3a.png?x-oss-process=style/400X400",
// "name": "12 ",
// "describe": "2K4400W",
// "url": "/goodsDetail?skuId=1376559979762286592&goodsId=1376559979007311872",
// "size": "220*110",
// "price": 4999
// }]
// }
// },
// "key": "1612497146000_38763",
// "model": "recommend_1612497146000_38763"
// }, {
// "type": "newGoodsSort",
// "name": "",
// "icon": "md-image",
// "options": {
// "left": {
// "title": "",
// "secondTitle": "333",
// "bgColor": "#c43d7e",
// "url": "/goodsDetail?id=1346742995596894208",
// "list": [{
// "name": "MIRedmi K30 ",
// "describe": "26950,999100",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/6fed4b19c53c4b88a5123301dede09c9.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376554436721115136&goodsId=1376554435945168896",
// "size": "160*160",
// "price": 4000
// }, {
// "name": " ",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/7896c015be3f4418a99e6ca2efcae386.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381796259035086848&goodsId=1377122967070179328",
// "size": "90*90",
// "price": 400
// }, {
// "name": "MAXFACTOR ",
// "describe": " ",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/75b2a1a1f4d74470a9da19158ff805ac.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381796144429924352&goodsId=1377121719424122880",
// "size": "90*90",
// "price": 333
// }, {
// "name": "ARMANI",
// "describe": " 03",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/389b2ce90fd0425a8a9d988890ad46d2.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381789991541145600&goodsId=1377127936569638912",
// "size": "90*90",
// "price": 666
// }, {
// "name": "NYX 16",
// "describe": " ",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/53b1c3cc1f1d4085917c282179f3e2fa.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1377137907063586816&goodsId=1377137906799345664",
// "size": "90*90",
// "price": 100
// }]
// },
// "middle": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#e66a07",
// "url": "",
// "list": [{
// "name": "",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/c9cbc345f3014affbb09a80306303c7c.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381793449233088512&goodsId=1377098934119301120",
// "size": "90*90",
// "price": 8
// }, {
// "name": " ",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/54dcb9cd0fea4f1f8243e12d49c28af9.png?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381791842915319808&goodsId=1376443041593688064",
// "size": "90*90",
// "price": 15
// }, {
// "name": "YSL ",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/31731869956848be8fc34f6751136977.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381796591895052288&goodsId=1377145942322446336",
// "size": "90*90",
// "price": 886
// }, {
// "name": "(Nestle) ",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/fe5b8167b0264c53836d08a6a7003cf0.jpeg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381797095073120256&goodsId=1377805575856848896",
// "size": "90*90",
// "price": 9.9
// }, {
// "name": " ",
// "describe": " ",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/999746fb087a40a280c2ef2c5abb7cc3.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381792548812488704&goodsId=1377071458592751616",
// "size": "90*90",
// "price": 37
// }, {
// "name": "VERSACE",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9b04d1580fb84e67939392a65b9d708d.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1381796537792724992&goodsId=1377143657961881600",
// "size": "90*90",
// "price": 199
// }]
// },
// "right": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#b62323",
// "url": "",
// "list": [{
// "name": " (MI)Redmi K40 Pro ",
// "price": 2999,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9064c20d62f24bfaa5d3854f72a83c6c.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376544591066431488&goodsId=1376544590403731456"
// }, {
// "name": " OnePlus 9 ",
// "price": 3899,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/df6377650f94456087316c1c9a381952.jpeg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376373279131959296&goodsId=1376373278360207360"
// }, {
// "name": " OnePlus 9 ",
// "price": 5000,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/cc724307f056420eb14c5bd35608a024.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376556775628603392&goodsId=1376556775007846400"
// }, {
// "name": "Apple iPhone 12 ",
// "price": 4100,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/af4e8d5341b1433c8d23d44dbf9bf37f.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376529926533939200&goodsId=1376529925690884096"
// }, {
// "name": "耀Play4T Pro ",
// "price": 2999,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/e58eae43b3784a1bb1bdf13937442e2d.jpg?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376547794663243776&goodsId=1376547793954406400"
// }, {
// "name": "12 ",
// "price": 3999,
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9ebe5bdb79c840ed9619b4fc72de21a9.png?x-oss-process=style/400X400",
// "url": "/goodsDetail?skuId=1376559979577737216&goodsId=1376559979007311872"
// }]
// }
// },
// "key": "1612497051000_82856",
// "model": "newGoodsSort_1612497051000_82856"
// }, {
// "type": "firstAdvert",
// "name": "广",
// "icon": "md-image",
// "options": {
// "list": [{
// "name": "",
// "describe": "1000",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/24e82e04abb3430399a888e845f74a54.png",
// "url": "/goodsDetail?id=1351420391981867008",
// "fromColor": "#e89621",
// "toColor": "#f5c568",
// "size": "170*170"
// }, {
// "name": "",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/1bed3dd6c8f04397ae598b626391869b.png",
// "url": "",
// "fromColor": "#325bb4",
// "toColor": "#4c9afe",
// "size": "170*170"
// }, {
// "name": "",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/8770b83f90c3409694d36f2ef9b559e4.png",
// "url": "",
// "fromColor": "#1c9daf",
// "toColor": "#40cda7",
// "size": "170*170"
// }, {
// "name": "",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/cf8665501b9e4856bb658c17014e35a2.png",
// "url": "",
// "fromColor": "#d13837",
// "toColor": "#df6d4f",
// "size": "170*170"
// }, {
// "name": "LILI",
// "describe": " 19960",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/bd17d2ade7764a049e430d2e2e899b16.png",
// "url": "",
// "fromColor": "#ca4283",
// "toColor": "#eb75cf",
// "size": "170*170"
// }, {
// "name": "LILI",
// "describe": "",
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/8cd10a71b92c4ff2866f6fdd3a69ded2.png",
// "url": "",
// "fromColor": "#5d40c1",
// "toColor": "#8c5fdb",
// "size": "170*170"
// }]
// },
// "key": "1612497063000_39466",
// "model": "firstAdvert_1612497063000_39466"
// }, {
// "type": "newGoodsSort",
// "name": "",
// "icon": "md-image",
// "options": {
// "left": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#c43d7e",
// "url": "",
// "list": [{
// "name": "",
// "describe": "26950,999100",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "160*160"
// }, {
// "name": "Ms.Maggie ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": "Ms.Maggie ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": "Ms.Maggie ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }]
// },
// "middle": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#e66a07",
// "url": "",
// "list": [{
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }, {
// "name": " ",
// "describe": "26950",
// "img": "/img/decorate6.3b8e00a9.jpeg",
// "url": "",
// "size": "90*90"
// }]
// },
// "right": {
// "title": "",
// "secondTitle": "",
// "bgColor": "#b62323",
// "url": "",
// "list": [{
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }, {
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }, {
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }, {
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }, {
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }, {
// "name": "3s3 ",
// "price": 14.9,
// "img": "/img/decorate7.2e150fd1.jpeg",
// "url": ""
// }]
// }
// }
// }, {
// "type": "notEnough",
// "name": "",
// "icon": "md-image",
// "options": {
// "list": [
// [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/217488c7baa44c99a447f4e31eb8642f.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 36,
// "url": "/goodsDetail?skuId=1381792263700480000&goodsId=1377064344218501120"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/3e7cdac8739c4d338fb0afb770cf5495.jpg?x-oss-process=style/400X400",
// "name": "NYX 16 ",
// "price": 100,
// "url": "/goodsDetail?skuId=1377137907063586817&goodsId=1377137906799345664"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/389b2ce90fd0425a8a9d988890ad46d2.jpg?x-oss-process=style/400X400",
// "name": "ARMANI · 03",
// "price": 666,
// "url": "/goodsDetail?skuId=1381789991541145600&goodsId=1377127936569638912"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/0ebd7f52cb9641d4a0f2596c5e862c35.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 299,
// "url": "/goodsDetail?skuId=1381793547266555904&goodsId=1377102418646401024"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/36e66e081a11449cbe03e9c2df884a9f.jpg?x-oss-process=style/400X400",
// "name": "(NIVEA) 湿",
// "price": 23,
// "url": "/goodsDetail?skuId=1381795951156396032&goodsId=1377104395929387008"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d1e7dcda155d454c8f7089298a9bcb82.jpg?x-oss-process=style/400X400",
// "name": "西x 1",
// "price": 999,
// "url": "/goodsDetail?skuId=1381796022597976064&goodsId=1377106159533555712"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/432970f4d3d24692bd7b68299c260601.jpg?x-oss-process=style/400X400",
// "name": "EsteeLauder 01",
// "price": 333,
// "url": "/goodsDetail?skuId=1381796080479371264&goodsId=1377118965985181696"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/75b2a1a1f4d74470a9da19158ff805ac.jpg?x-oss-process=style/400X400",
// "name": "MAXFACTOR 02",
// "price": 333,
// "url": "/goodsDetail?skuId=1381796144429924352&goodsId=1377121719424122880"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/ba6efdfae1fe4493a6160ca86114845e.jpg?x-oss-process=style/400X400",
// "name": "sweetpink 01",
// "price": 29,
// "url": "/goodsDetail?skuId=1381796202034495488&goodsId=1377129270085681152"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/f4930e4df42c4d80af1ca2a2106e22ad.jpg?x-oss-process=style/400X400",
// "name": " Armani 02",
// "price": 400,
// "url": "/goodsDetail?skuId=1381796259039281152&goodsId=1377122967070179328"
// }],
// [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a4c2b5073fd84d60bfe38d6a6c0044c9.jpeg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "price": 3799,
// "url": "/goodsDetail?skuId=1376373278989352960&goodsId=1376373278360207360"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/df6377650f94456087316c1c9a381952.jpeg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "price": 3899,
// "url": "/goodsDetail?skuId=1376373279131959296&goodsId=1376373278360207360"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/30b3030b9bb44e758146d8eca63a1242.jpeg?x-oss-process=style/400X400",
// "name": "vivo iQOO 7 ",
// "price": 4198,
// "url": "/goodsDetail?skuId=1376521744352804864&goodsId=1376521743522332672"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/d86a06718d88422baf7422cb0d8b71db.jpeg?x-oss-process=style/400X400",
// "name": "vivo iQOO 7 ",
// "price": 4298,
// "url": "/goodsDetail?skuId=1376521744608657408&goodsId=1376521743522332672"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b3dccb22364f42c9bec193d64f140abb.jpg?x-oss-process=style/400X400",
// "name": "Apple iPhone 12 ",
// "price": 4200,
// "url": "/goodsDetail?skuId=1376529926336806912&goodsId=1376529925690884096"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/af4e8d5341b1433c8d23d44dbf9bf37f.jpg?x-oss-process=style/400X400",
// "name": "Apple iPhone 12 ",
// "price": 4100,
// "url": "/goodsDetail?skuId=1376529926533939200&goodsId=1376529925690884096"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/0544e5c117a348998d80061f7a900400.jpg?x-oss-process=style/400X400",
// "name": "(Canon) EOS 200D II 2 ",
// "price": 4449,
// "url": "/goodsDetail?skuId=1376541893755666432&goodsId=1376541893319458816"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/299785007b884e6a823c212c839e092c.jpg?x-oss-process=style/400X400",
// "name": "(Canon) EOS 200D II 2 ",
// "price": 4459,
// "url": "/goodsDetail?skuId=1376541893952798720&goodsId=1376541893319458816"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9064c20d62f24bfaa5d3854f72a83c6c.jpg?x-oss-process=style/400X400",
// "name": " (MI)Redmi K40 Pro ",
// "price": 2999,
// "url": "/goodsDetail?skuId=1376544591066431488&goodsId=1376544590403731456"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b20243bc89a149a398b6d7ef9a097938.jpg?x-oss-process=style/400X400",
// "name": " (MI)Redmi K40 Pro ",
// "price": 3999,
// "url": "/goodsDetail?skuId=1376544591276146688&goodsId=1376544590403731456"
// }],
// [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/e58eae43b3784a1bb1bdf13937442e2d.jpg?x-oss-process=style/400X400",
// "name": "耀Play4T Pro ",
// "price": 2999,
// "url": "/goodsDetail?skuId=1376547794663243776&goodsId=1376547793954406400"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a91ea16401974fc29364c8be9ca76e83.jpg?x-oss-process=style/400X400",
// "name": "耀Play4T Pro 绿",
// "price": 2999,
// "url": "/goodsDetail?skuId=1376547794856181760&goodsId=1376547793954406400"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/745f6ef25634428a8b1972ce23c9c7b3.jpg?x-oss-process=style/400X400",
// "name": "MIRedmi K30 绿",
// "price": 3000,
// "url": "/goodsDetail?skuId=1376554436532371456&goodsId=1376554435945168896"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/6fed4b19c53c4b88a5123301dede09c9.jpg?x-oss-process=style/400X400",
// "name": "MIRedmi K30 ",
// "price": 4000,
// "url": "/goodsDetail?skuId=1376554436721115136&goodsId=1376554435945168896"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/cc724307f056420eb14c5bd35608a024.jpg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "price": 5000,
// "url": "/goodsDetail?skuId=1376556775628603392&goodsId=1376556775007846400"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/7a90d38c4a9f4c8f84f10e53bc204b84.jpg?x-oss-process=style/400X400",
// "name": " OnePlus 9 ",
// "price": 5000,
// "url": "/goodsDetail?skuId=1376556775825735680&goodsId=1376556775007846400"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9ebe5bdb79c840ed9619b4fc72de21a9.png?x-oss-process=style/400X400",
// "name": "12 ",
// "price": 3999,
// "url": "/goodsDetail?skuId=1376559979577737216&goodsId=1376559979007311872"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/5fc6e64e189c4c378e72757af663ff3a.png?x-oss-process=style/400X400",
// "name": "12 ",
// "price": 4999,
// "url": "/goodsDetail?skuId=1376559979762286592&goodsId=1376559979007311872"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/230413f3a04b4dfeb4797211a760f0ce.jpg?x-oss-process=style/400X400",
// "name": "MateBook ",
// "price": 2999,
// "url": "/goodsDetail?skuId=1376727108025319424&goodsId=1376727107777855488"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/9f66c6e074f9405195eea1c5587da964.jpg?x-oss-process=style/400X400",
// "name": "Galaxy S21 Ultra ",
// "price": 7474,
// "url": "/goodsDetail?skuId=1376850145177501696&goodsId=1376850145118781440"
// }],
// [{
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/54dcb9cd0fea4f1f8243e12d49c28af9.png?x-oss-process=style/400X400",
// "name": " ",
// "price": 15,
// "url": "/goodsDetail?skuId=1381791842915319808&goodsId=1376443041593688064"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/ce9a24a34bb34479b9239f07a9425746.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 35,
// "url": "/goodsDetail?skuId=1381792695176921088&goodsId=1377074868700315648"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/fced3eededaf4018a26af0ebd660238c.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 35,
// "url": "/goodsDetail?skuId=1381792775162298368&goodsId=1377077664103268352"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/58411207ec5946c7950be9d6eccd136c.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 35,
// "url": "/goodsDetail?skuId=1381792775170686976&goodsId=1377077664103268352"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/5b87f8d1439b4dd2b1bd7f9c331eb91b.jpg?x-oss-process=style/400X400",
// "name": "22g ",
// "price": 8,
// "url": "/goodsDetail?skuId=1381793449228894208&goodsId=1377098934119301120"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/028c7081275d4c1ea1c7aac206162c44.jpg?x-oss-process=style/400X400",
// "name": "-48便 ",
// "price": 2,
// "url": "/goodsDetail?skuId=1381793503364775936&goodsId=1377100803117940736"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/fe5b8167b0264c53836d08a6a7003cf0.jpeg?x-oss-process=style/400X400",
// "name": "(Nestle) ",
// "price": 9.9,
// "url": "/goodsDetail?skuId=1381797095073120256&goodsId=1377805575856848896"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/6ce1382ba55f4284a86f893cfc79eed8.jpg?x-oss-process=style/400X400",
// "name": "Nestle 10",
// "price": 39,
// "url": "/goodsDetail?skuId=1381791962713030656&goodsId=1377057500825649152"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/72927f793db7454d9109ab0581ace984.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 9,
// "url": "/goodsDetail?skuId=1381792469200404480&goodsId=1377070177157382144"
// }, {
// "img": "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/b7c76242a9914e60a059b2f2dfee168b.jpg?x-oss-process=style/400X400",
// "name": " ",
// "price": 37,
// "url": "/goodsDetail?skuId=1381792548808294400&goodsId=1377071458592751616"
// }]
// ],
// "navList": [{
// "title": "",
// "desc": ""
// }, {
// "title": "",
// "desc": ""
// }, {
// "title": "",
// "desc": ""
// }, {
// "title": "",
// "desc": ""
// }]
// },
// "key": "1612497066000_30831",
// "model": "notEnough_1612497066000_30831"
// }]
// }
if (pageData) {
pageData = JSON.parse(pageData);
if (pageData.list[0].type === "topAdvert") {

View File

@ -57,7 +57,6 @@
<script>
import {
userInfo,
userInfoEdit,
} from "@/api/index";
import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
@ -92,7 +91,6 @@ export default {
}
let userInfo = JSON.parse(JSON.stringify(v));
this.userForm = userInfo;
console.log(userInfo)
},
//
changePassword() {

View File

@ -18,14 +18,14 @@ export default {
* @description api请求基础路径
*/
api_dev: {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
// common: 'http://192.168.0.101:8890',
// buyer: 'http://192.168.0.101:8888',
// seller: 'http://192.168.0.101:8889',
// manager: 'http://192.168.0.101:8887'
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.100:8887'
},
api_prod: {
common: "https://common-api.pickmall.cn",

View File

@ -77,7 +77,7 @@ import * as API_Goods from "@/api/goods";
import TreeTable from "@/views/my-components/tree-table/Table/Table";
export default {
name: "lili-components",
name: "store-category",
components: {
TreeTable
},
@ -85,7 +85,6 @@ export default {
return {
submitLoading: false, // loading
loading: false, //loading
expandLevel: 1, //
modalType: 0, //
modalVisible: false, //
modalTitle: "", //
@ -162,7 +161,6 @@ export default {
this.formAdd.level = v.level;
this.formAdd.parentId = v.parentId;
this.formAdd.sortOrder = v.sortOrder;
this.formAdd.image = v.image;
this.showParent = false;
this.modalVisible = true;
},
@ -184,6 +182,7 @@ export default {
this.$refs.formAdd.validate(valid => {
if (valid) {
this.submitLoading = true;
console.log(this.formAdd);
if (this.modalType === 0) {
// id
delete this.formAdd.id;
@ -193,7 +192,6 @@ export default {
this.$Message.success("添加成功");
this.getAllList(0);
this.modalVisible = false;
this.$refs.form.resetFields();
}
});
} else {
@ -204,7 +202,6 @@ export default {
this.$Message.success("修改成功");
this.getAllList(0);
this.modalVisible = false;
this.$refs.form.resetFields();
}
});
}
@ -236,63 +233,11 @@ export default {
API_Goods.getShopGoodsLabelList(this.searchForm).then((res) => {
this.loading = false;
if (res.success) {
//
let expandLevel = this.expandLevel;
res.result.forEach(function (e) {
if (expandLevel == 1) {
if (e.level == 0) {
e.expand = false;
}
if (e.children && e.children.length > 0) {
e.children.forEach(function (c) {
if (c.level == 1) {
c.expand = false;
}
if (c.children && c.children.length > 0) {
c.children.forEach(function (b) {
if (b.level == 2) {
b.expand = false;
}
});
}
});
}
} else if (expandLevel == 2) {
if (e.level == 0) {
e.expand = true;
}
if (e.children && e.children.length > 0) {
e.children.forEach(function (c) {
if (c.level == 1) {
c.expand = false;
}
if (c.children && c.children.length > 0) {
c.children.forEach(function (b) {
if (b.level == 2) {
b.expand = false;
}
});
}
});
}
} else if (expandLevel == 3) {
if (e.level == 0) {
e.expand = true;
}
if (e.children && e.children.length > 0) {
e.children.forEach(function (c) {
if (c.level == 1) {
c.expand = true;
}
if (c.children && c.children.length > 0) {
c.children.forEach(function (b) {
if (b.level == 2) {
b.expand = false;
}
});
}
});
}
res.result.forEach(firstCate => {
if (firstCate.children && firstCate.children.length) {
firstCate.children.forEach(secondCate => {
secondCate.parentId = firstCate.id
})
}
});
this.tableData = res.result;