Skip to content

E
ElectricitySheep
Commit d9a1ddad authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 2bd28b6e e8ef6e4e
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 31 deletions
src/components/Index.vue
View file @ d9a1ddad
......@@ -740,9 +740,9 @@
//cmdStr = "/api/Mall/GetMessageTemplate";
// cmdStr = "/api/Mall/GetWeChatOpenId";
var postData = {};
this.apipost(cmdStr, postData, res => {
console.log("Test", res.data);
})
// this.apipost(cmdStr, postData, res => {
// console.log("Test", res.data);
// })
},
},
mounted() {
......
src/components/common/chooseMenu.vue
View file @ d9a1ddad
......@@ -21,7 +21,7 @@
<el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText">
</el-input>
<el-tree :data="item.SubMenuList" node-key="PageId" ref="tree" :props="defaultProps" filter
:filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox>
:filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox :check-on-click-node="true">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="{'other_Style':data.SubMenuList&&data.SubMenuList.length>0}">{{ data.PageName }}</span>
</span>
......
src/components/sallCenter/plugin/rubik.vue
View file @ d9a1ddad
<style>
.diy-rubik .layout {
width: 750px;
/* width: 750px; */
position: relative;
}
......@@ -79,31 +79,69 @@
</div>
<div class="diy-rubik">
<div class="diy-component-preview">
<div class="layout" :style="blockStyle(rubData.data.style)" :class="{'defaultImg':rubData.data.style==8}"
@click="blockClick">
<div class="rubik" style="width:100%;height:100%;" @mousemove="blockMove"
:style="rubData.isCked ? (isMove ? 'z-index: 12' : 'z-index: 10') : 'z-index: 16'"></div>
<template v-for="(item, index) in cList">
<div class="rubik" flex="main:center cross:center" :key="index+1" @click.stop="selectRubik(index)"
:class="rubik == index ? 'active' : ''" :style="layoutRubik(index)">
<template v-if="rubData.data.style == 8">
<el-button class="delete" v-show="index == rubik && !isMove" size="mini" type="danger"
icon="el-icon-close" circle @click.stop="deleteRubik(index)"></el-button>
</template>
<span v-if="!rubData.data.list[index].pic_url">{{rubikSize(index)}}</span>
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)" style="width: 100%;visibility: hidden;">
</div>
<div class="rubik" :style="emptyStyle(index)" v-if="rubData.data.style == 8" :key="index"></div>
<img v-if="rubData.data.list[index].pic_url && rubData.data.style == 0"
:src="getIconLink(rubData.data.list[index].pic_url)" :key="index"
style="width: 100%;visibility: hidden;display: block">
</template>
<div :style="{marginTop:rubData.data.top+'px',marginRight:rubData.data.right+'px',marginBottom:rubData.data.bottom+'px',marginLeft:rubData.data.left+'px'}">
<div class="layout" :style="blockStyle(rubData.data.style)" :class="{'defaultImg':rubData.data.style==8}"
@click="blockClick">
<div class="rubik" style="width:100%;height:100%;" @mousemove="blockMove"
:style="rubData.isCked ? (isMove ? 'z-index: 12' : 'z-index: 10') : 'z-index: 16'"></div>
<template v-for="(item, index) in cList">
<div class="rubik" flex="main:center cross:center" :key="index+1" @click.stop="selectRubik(index)"
:class="rubik == index ? 'active' : ''" :style="layoutRubik(index)">
<template v-if="rubData.data.style == 8">
<el-button class="delete" v-show="index == rubik && !isMove" size="mini" type="danger"
icon="el-icon-close" circle @click.stop="deleteRubik(index)"></el-button>
</template>
<span v-if="!rubData.data.list[index].pic_url">{{rubikSize(index)}}</span>
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)" style="width: 100%;visibility: hidden;">
</div>
<div class="rubik" :style="emptyStyle(index)" v-if="rubData.data.style == 8" :key="index"></div>
<img v-if="rubData.data.list[index].pic_url && rubData.data.style == 0"
:src="getIconLink(rubData.data.list[index].pic_url)" :key="index"
style="width: 100%;visibility: hidden;display: block">
</template>
</div>
</div>
</div>
<div class="diy-component-edit" v-if="rubData.isCked">
<el-form label-width="100px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="图片样式" name="first">
<el-row>
<el-col :span="12">
<el-form-item label="上边距">
<el-input type="text" size="small" @keyup.native="checkInteger(rubData.data,'top','-')"
v-model="rubData.data.top" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下边距">
<el-input type="text" size="small" @keyup.native="checkInteger(rubData.data,'bottom','-')"
v-model="rubData.data.bottom" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="左边距">
<el-input type="text" size="small" @keyup.native="checkInteger(rubData.data,'left','-')"
v-model="rubData.data.left" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="右边距">
<el-input type="text" size="small" @keyup.native="checkInteger(rubData.data,'right','-')"
v-model="rubData.data.right" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="样式">
<div flex="dir:left" style="flex-wrap: wrap;">
<div class="block" @click="selectStyle(index)" :class="blockActive(index)"
......@@ -161,7 +199,8 @@
</template>
<el-form-item label="热区划分">
<choiceArea :multiple="true" :pic-list="rubData.data.list" :hotspot-array="rubData.data.hotspot"
width="750px" :height="rubData.data.height + 'px'" @confirm="selectHotspot" :is-link="true" :chooseType="'rubik'">
width="750px" :height="rubData.data.height + 'px'" @confirm="selectHotspot" :is-link="true"
:chooseType="'rubik'">
<el-button size="mini">划分热区</el-button>
</choiceArea>
</el-form-item>
......@@ -724,7 +763,7 @@
// 热区选择(edit)
selectHotspot(list) {
//console.log("list",list);
//console.log("list",list);
this.rubData.data.hotspot = list;
},
//选择图片
......@@ -739,6 +778,20 @@
//点击触发父组件删除
delPlugin() {
this.$emit('comDelPlugin', this.index);
},
getminNum(){
if(this.rubData.data.top==''){
this.rubData.data.top=0;
}
if(this.rubData.data.right==''){
this.rubData.data.right=0;
}
if(this.rubData.data.bottom==''){
this.rubData.data.bottom=0;
}
if(this.rubData.data.left==''){
this.rubData.data.left=0;
}
}
},
updated() {
......@@ -784,7 +837,7 @@
let block = this.rubData.data.list[i];
block = this.getStyle(block, this.rubData.data);
}
},
}
},
mounted() {
......
src/components/sallCenter/plugin/search.vue
View file @ d9a1ddad
......@@ -9,7 +9,8 @@
style="right: -25px; top: 30px;"></el-button>
</div>
<div class="diy-component-preview">
<div class="diy-search" :style="{background:searchData.data.background}">
<div class="diy-search" :style="{background:searchData.data.background,marginLeft:searchData.data.left+'px',
marginRight:searchData.data.right+'px',marginTop:searchData.data.top+'px',marginBottom:searchData.data.bottom+'px'}">
<div
:style="{background:searchData.data.color,borderRadius:searchData.data.radius+'px',color:searchData.data.textColor,textAlign:searchData.data.textPosition}">
{{searchData.data.placeholder}}
......@@ -44,6 +45,26 @@
<el-radio v-model="searchData.data.textPosition" label="left">居左</el-radio>
<el-radio v-model="searchData.data.textPosition" label="right">居右</el-radio>
</el-form-item>
<el-form-item label="上边距">
<el-input type="text" size="small" @keyup.native="checkInteger(searchData.data,'top','-')" v-model="searchData.data.top" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="下边距">
<el-input type="text" size="small" @keyup.native="checkInteger(searchData.data,'bottom','-')" v-model="searchData.data.bottom" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="左边距">
<el-input type="text" size="small" @keyup.native="checkInteger(searchData.data,'left','-')" v-model="searchData.data.left" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="右边距">
<el-input type="text" size="small" @keyup.native="checkInteger(searchData.data,'right','-')" v-model="searchData.data.right" @change="getminNum()">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-form>
</div>
</div>
......@@ -66,7 +87,20 @@
delPlugin() {
this.$emit('comDelPlugin', this.index);
},
getminNum(){
if(this.searchData.data.top==''){
this.searchData.data.top=0;
}
if(this.searchData.data.right==''){
this.searchData.data.right=0;
}
if(this.searchData.data.bottom==''){
this.searchData.data.bottom=0;
}
if(this.searchData.data.left==''){
this.searchData.data.left=0;
}
}
},
mounted() {}
};
......
src/components/sallCenter/templateEdit.vue
View file @ d9a1ddad
......@@ -526,7 +526,11 @@
radius: 4, //圆角
placeholder: '搜索', //提示文字
textColor: '#555555', //文字颜色
textPosition: "left" //文字位置
textPosition: "left", //文字位置
top:0, //上边距
right:0, //右边距
bottom:0, //下边距
left:0, //左边距
}
}
this.dataList.push(searchObj);
......@@ -643,7 +647,11 @@
w: 1, //选中的第几张图 对应的style_list里的w
h: 1, //选中的第几张图 对应的style_list里的h
list: [], //选中的第几张图的小区域对应的数据
hotspot: [] //热区划分
hotspot: [], //热区划分
top:0, // 上边距
right:0, //右边距
bottom:0, //下边距
left:0 //左边距
}
}
this.dataList.push(rubObj);
......
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