Skip to content

E
ElectricitySheep
Commit f2515d09 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents ff9914fa 1b79dc03
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 111 deletions
src/components/sallCenter/plugin/rubik.vue
View file @ f2515d09
...@@ -149,7 +149,9 @@ ...@@ -149,7 +149,9 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="选择链接"> <el-form-item label="选择链接">
<el-input size="small" v-model="rubData.data.list&&rubData.data.list[rubik].link[0].PageName" :disabled="true"> <el-input size="small" v-if="rubData.data.list&&rubData.data.list.length>0
&& rubData.data.list[rubik].link && rubData.data.list[rubik].link.length>0" v-model="
rubData.data.list[rubik].link[0].PageName" :disabled="true">
<template slot="append"> <template slot="append">
<el-button @click="isShowLink=true">选择链接</el-button> <el-button @click="isShowLink=true">选择链接</el-button>
</template> </template>
......
src/components/sallCenter/templateEdit.vue
View file @ f2515d09
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
border: none; border: none;
border-radius: 0; border-radius: 0;
position: absolute; position: absolute;
margin-left: 0!important; margin-left: 0 !important;
} }
.diy-search>div { .diy-search>div {
...@@ -159,17 +159,20 @@ ...@@ -159,17 +159,20 @@
justify-content: center; justify-content: center;
background: #fff; background: #fff;
} }
.bgMsg_Div div{
.bgMsg_Div div {
height: 50px; height: 50px;
width: 50px; width: 50px;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
background-color: #F5F7F9; background-color: #F5F7F9;
} }
.bgMsg_Div .active{
.bgMsg_Div .active {
background-color: #E6F4FF; background-color: #E6F4FF;
border: 2px dashed #5CB3FD; border: 2px dashed #5CB3FD;
} }
</style> </style>
<template> <template>
<div class="templateEdit"> <div class="templateEdit">
...@@ -292,7 +295,8 @@ ...@@ -292,7 +295,8 @@
<el-form-item label="背景颜色"> <el-form-item label="背景颜色">
<div flex="dir:left cross:center"> <div flex="dir:left cross:center">
<el-color-picker size="small" v-model="bgMsg.data.backgroundColor"></el-color-picker> <el-color-picker size="small" v-model="bgMsg.data.backgroundColor"></el-color-picker>
<el-input size="small" style="width: 80px;margin-right: 25px;" v-model="bgMsg.data.backgroundColor"></el-input> <el-input size="small" style="width: 80px;margin-right: 25px;" v-model="bgMsg.data.backgroundColor">
</el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="背景图片"> <el-form-item label="背景图片">
...@@ -329,11 +333,13 @@ ...@@ -329,11 +333,13 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="bgMsg.data.showImg && bgMsg.data.mode != 1" label="背景图宽"> <el-form-item v-if="bgMsg.data.showImg && bgMsg.data.mode != 1" label="背景图宽">
<el-slider v-model="bgMsg.data.backgroundWidth" :show-input-controls="false" style="float: left;width: 95%" :max="100" show-input></el-slider> <el-slider v-model="bgMsg.data.backgroundWidth" :show-input-controls="false" style="float: left;width: 95%"
:max="100" show-input></el-slider>
<div style="float: right">%</div> <div style="float: right">%</div>
</el-form-item> </el-form-item>
<el-form-item v-if="bgMsg.data.showImg && bgMsg.data.mode != 1" label="背景图高"> <el-form-item v-if="bgMsg.data.showImg && bgMsg.data.mode != 1" label="背景图高">
<el-slider v-model="bgMsg.data.backgroundHeight" :show-input-controls="false" style="float: left;width: 95%" :max="100" show-input></el-slider> <el-slider v-model="bgMsg.data.backgroundHeight" :show-input-controls="false" style="float: left;width: 95%"
:max="100" show-input></el-slider>
<div style="float: right">%</div> <div style="float: right">%</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -407,7 +413,7 @@ ...@@ -407,7 +413,7 @@
repeat: 'no-repeat', repeat: 'no-repeat',
choicImg: false, choicImg: false,
//左侧组件列表 //左侧组件列表
bgVisible:false, bgVisible: false,
allComponents: [], allComponents: [],
dataList: [], dataList: [],
}; };
...@@ -455,41 +461,41 @@ ...@@ -455,41 +461,41 @@
this.bgMsg.data.backgroundPicUrl = msg.url; this.bgMsg.data.backgroundPicUrl = msg.url;
this.choicImg = false; this.choicImg = false;
}, },
choose(num,position) { choose(num, position) {
this.bgMsg.data.position = num; this.bgMsg.data.position = num;
this.position = position; this.position = position;
}, },
//点击设置背景 //点击设置背景
SetBgInfo(){ SetBgInfo() {
this.dataList.push(this.bgMsg); this.dataList.push(this.bgMsg);
this.bgVisible=false; this.bgVisible = false;
}, },
showBackground(e) { showBackground(e) {
if(!e) { if (!e) {
this.bgMsg.data.backgroundPicUrl += '临时放置' this.bgMsg.data.backgroundPicUrl += '临时放置'
}else { } else {
this.bgMsg.data.backgroundPicUrl = this.bgMsg.data.backgroundPicUrl.replace('临时放置','') this.bgMsg.data.backgroundPicUrl = this.bgMsg.data.backgroundPicUrl.replace('临时放置', '')
} }
if(this.bgMsg.data.mode == 2) { if (this.bgMsg.data.mode == 2) {
this.repeat = 'repeat-x' this.repeat = 'repeat-x'
}else if(this.bgMsg.data.mode == 3) { } else if (this.bgMsg.data.mode == 3) {
this.repeat = 'repeat-y' this.repeat = 'repeat-y'
}else if(this.bgMsg.data.mode == 4) { } else if (this.bgMsg.data.mode == 4) {
this.repeat = 'repeat' this.repeat = 'repeat'
}else if(this.bgMsg.data.mode == 1) { } else if (this.bgMsg.data.mode == 1) {
this.repeat = 'no-repeat'; this.repeat = 'no-repeat';
this.bgMsg.data.backgroundHeight = 100; this.bgMsg.data.backgroundHeight = 100;
this.bgMsg.data.backgroundWidth = 100; this.bgMsg.data.backgroundWidth = 100;
} }
}, },
changeMode(e){ changeMode(e) {
if(e == 2) { if (e == 2) {
this.repeat = 'repeat-x' this.repeat = 'repeat-x'
}else if(e == 3) { } else if (e == 3) {
this.repeat = 'repeat-y' this.repeat = 'repeat-y'
}else if(e == 4) { } else if (e == 4) {
this.repeat = 'repeat' this.repeat = 'repeat'
}else if(e == 1) { } else if (e == 1) {
this.repeat = 'no-repeat'; this.repeat = 'no-repeat';
this.bgMsg.data.backgroundHeight = 100; this.bgMsg.data.backgroundHeight = 100;
this.bgMsg.data.backgroundWidth = 100; this.bgMsg.data.backgroundWidth = 100;
...@@ -569,10 +575,10 @@ ...@@ -569,10 +575,10 @@
data: { data: {
name: '公告', //公告名称 name: '公告', //公告名称
content: '', //公告内容 content: '', //公告内容
icon: this.domainManager().ImageUrl+'/Static/icon-notice.png', //公告图标 icon: this.domainManager().ImageUrl + '/Static/icon-notice.png', //公告图标
textColor: '#ffffff', //文字颜色 textColor: '#ffffff', //文字颜色
background: '#f67f79', //背景颜色 background: '#f67f79', //背景颜色
headerUrl: this.domainManager().ImageUrl+'/Static/icon-notice-title.png', //头部图片 headerUrl: this.domainManager().ImageUrl + '/Static/icon-notice-title.png', //头部图片
btnColor: '#ff4544', //按钮颜色 btnColor: '#ff4544', //按钮颜色
btnWidth: 500, //按钮宽度 btnWidth: 500, //按钮宽度
btnHeight: 80, //按钮高度 btnHeight: 80, //按钮高度
...@@ -589,13 +595,13 @@ ...@@ -589,13 +595,13 @@
Id: 'topic', Id: 'topic',
isCked: false, isCked: false,
data: { data: {
style: 'normal',//专题样式 style: 'normal', //专题样式
count: 1,//显示行数 count: 1, //显示行数
logo_1: this.domainManager().ImageUrl+'/Static/icon-topic-1.png',//logo(1行) logo_1: this.domainManager().ImageUrl + '/Static/icon-topic-1.png', //logo(1行)
logo_2: this.domainManager().ImageUrl+'/Static/icon-topic-2.png',//logo(2行) logo_2: this.domainManager().ImageUrl + '/Static/icon-topic-2.png', //logo(2行)
icon: this.domainManager().ImageUrl+'/Static/icon-topic-r.png',//专题标签 icon: this.domainManager().ImageUrl + '/Static/icon-topic-r.png', //专题标签
list: [], list: [],
cat_show: false,//是否显示分类 cat_show: false, //是否显示分类
topic_list: [] topic_list: []
} }
} }
...@@ -696,8 +702,8 @@ ...@@ -696,8 +702,8 @@
Id: 'store', Id: 'store',
isCked: false, isCked: false,
data: { data: {
navPicUrl: this.domainManager().ImageUrl+'/Static/nav-icon.png', //导航图标 navPicUrl: this.domainManager().ImageUrl + '/Static/nav-icon.png', //导航图标
scorePicUrl: this.domainManager().ImageUrl+'/Static/score-icon.png', //评分图标 scorePicUrl: this.domainManager().ImageUrl + '/Static/score-icon.png', //评分图标
showName: true, //显示门店名称 showName: true, //显示门店名称
showScore: true, //显示评分 showScore: true, //显示评分
showTel: true, //显示电话 showTel: true, //显示电话
...@@ -726,7 +732,7 @@ ...@@ -726,7 +732,7 @@
Id: 'check-in', Id: 'check-in',
isCked: false, isCked: false,
data: { data: {
backgroundPicUrl: this.domainManager().ImageUrl+'/Static/check-in-default-bg.png', //背景图 backgroundPicUrl: this.domainManager().ImageUrl + '/Static/check-in-default-bg.png', //背景图
showText: true, //显示文字 showText: true, //显示文字
textPosition: 'left', //文字位置 textPosition: 'left', //文字位置
textColor: '#ffffff', //文本颜色 textColor: '#ffffff', //文本颜色
...@@ -757,31 +763,31 @@ ...@@ -757,31 +763,31 @@
navs: [{ navs: [{
url: '', url: '',
openType: 'navigate', openType: 'navigate',
picUrl: this.domainManager().ImageUrl+'/Static/user-order-dfk.png', picUrl: this.domainManager().ImageUrl + '/Static/user-order-dfk.png',
text: '待付款', text: '待付款',
}, },
{ {
url: '', url: '',
openType: 'navigate', openType: 'navigate',
picUrl: this.domainManager().ImageUrl+'/Static/user-order-dfh.png', picUrl: this.domainManager().ImageUrl + '/Static/user-order-dfh.png',
text: '待发货', text: '待发货',
}, },
{ {
url: '', url: '',
openType: 'navigate', openType: 'navigate',
picUrl: this.domainManager().ImageUrl+'/Static/user-order-dsh.png', picUrl: this.domainManager().ImageUrl + '/Static/user-order-dsh.png',
text: '待收货', text: '待收货',
}, },
{ {
url: '', url: '',
openType: 'navigate', openType: 'navigate',
picUrl: this.domainManager().ImageUrl+'/Static/user-order-ywc.png', picUrl: this.domainManager().ImageUrl + '/Static/user-order-ywc.png',
text: '待评价', text: '待评价',
}, },
{ {
url: '', url: '',
openType: 'navigate', openType: 'navigate',
picUrl: this.domainManager().ImageUrl+'/Static/user-order-sh.png', picUrl: this.domainManager().ImageUrl + '/Static/user-order-sh.png',
text: '售后', text: '售后',
}, },
], ],
...@@ -839,8 +845,8 @@ ...@@ -839,8 +845,8 @@
isCked: false, isCked: false,
data: { data: {
textColor: '#ffffff', //字体颜色 textColor: '#ffffff', //字体颜色
receiveBg: this.domainManager().ImageUrl+'/Static/icon-coupon-no.png', //不可领取 receiveBg: this.domainManager().ImageUrl + '/Static/icon-coupon-no.png', //不可领取
unclaimedBg: this.domainManager().ImageUrl+'/Static/icon-coupon-index.png', //可领取 unclaimedBg: this.domainManager().ImageUrl + '/Static/icon-coupon-index.png', //可领取
showImg: false, showImg: false,
backgroundColor: '#fff', //背景颜色 backgroundColor: '#fff', //背景颜色
backgroundPicUrl: '', backgroundPicUrl: '',
...@@ -971,7 +977,7 @@ ...@@ -971,7 +977,7 @@
showCoupon: true, showCoupon: true,
showGoods: true, showGoods: true,
couponColor: '#ffffff', couponColor: '#ffffff',
couponPicUrl: this.domainManager().ImageUrl+'/Static/coupon-background.png', couponPicUrl: this.domainManager().ImageUrl + '/Static/coupon-background.png',
buttonColor: '#ff4544', buttonColor: '#ff4544',
list: [], list: [],
listStyle: 1, listStyle: 1,
...@@ -1065,8 +1071,8 @@ ...@@ -1065,8 +1071,8 @@
background: '#FFFFFF', //背景色 background: '#FFFFFF', //背景色
usePluginConfig: true, //使用插件配置 usePluginConfig: true, //使用插件配置
top_bottom_padding: 0, //上下间距 top_bottom_padding: 0, //上下间距
buy_bg: this.domainManager().ImageUrl+'/Static/buy_bg.png', //未购买用户默认背景图 buy_bg: this.domainManager().ImageUrl + '/Static/buy_bg.png', //未购买用户默认背景图
renew_bg: this.domainManager().ImageUrl+'/Static/buy_bg.png', //未购买用户背景图 renew_bg: this.domainManager().ImageUrl + '/Static/buy_bg.png', //未购买用户背景图
buy_big_color: '', //未购买用户-大标题字体颜色 buy_big_color: '', //未购买用户-大标题字体颜色
buy_small_color: '', //未购买用户-小标题背景颜色 buy_small_color: '', //未购买用户-小标题背景颜色
buy_btn_color: '', //未购买用户-按钮文字颜色 buy_btn_color: '', //未购买用户-按钮文字颜色
...@@ -1231,7 +1237,22 @@ ...@@ -1231,7 +1237,22 @@
getItem(item) { getItem(item) {
this.dataList.forEach(x => { this.dataList.forEach(x => {
x.isCked = false; x.isCked = false;
})
if (item.Id == "rubik") {
if (item.data.list && item.data.list.length > 0) {
item.data.list.forEach(subItem => {
if (subItem.link && subItem.link.length == 0) {
subItem.link.push({
PageUrl: '',
IsParameter: 0,
ParameterValue: '',
PageName: ''
}) })
}
})
}
}
item.isCked = true; item.isCked = true;
}, },
//点击保存 //点击保存
...@@ -1263,10 +1284,10 @@ ...@@ -1263,10 +1284,10 @@
if (jsonData.ComponentDataList) { if (jsonData.ComponentDataList) {
this.dataList = jsonData.ComponentDataList; this.dataList = jsonData.ComponentDataList;
} }
if(jsonData.ComponentDataList){ if (jsonData.ComponentDataList) {
jsonData.ComponentDataList.forEach(x=>{ jsonData.ComponentDataList.forEach(x => {
if(x.Id=='background'){ if (x.Id == 'background') {
this.bgMsg=x; this.bgMsg = x;
} }
}) })
} }
......
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