Skip to content

E
ElectricitySheep
Commit 7bd46817 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 2d062011
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 62 deletions
src/components/common/choicePeople.vue
View file @ 7bd46817
<template>
<div>
<el-input size="mini" v-model="msg.Name" placeholder="根据名称搜索" :clearable="true" @clear="msg.pageIndex=1,getList()"
<el-input size="mini" v-model="msg.RealName" placeholder="根据名称搜索" :clearable="true" @clear="msg.pageIndex=1,getList()"
@keyup.enter.native="msg.pageIndex=1,getList()">
<el-button slot="append" @click="msg.pageIndex=1,getList()">搜索</el-button>
</el-input>
......@@ -18,7 +18,7 @@
<el-table-column type="selection" width="50px">
</el-table-column>
</template>
<el-table-column label="ID" width="80px">
<el-table-column label="ID" width="60px">
<template slot-scope="scope">{{ scope.row.Id }}</template>
</el-table-column>
<el-table-column prop="name" label="名称">
......@@ -47,7 +47,7 @@
<el-table-column label="婚姻状态" width="80px">
<template slot-scope="scope">{{ scope.row.Marriage }}</template>
</el-table-column>
<el-table-column label="生日" width="80px">
<el-table-column label="生日" width="100px">
<template slot-scope="scope">{{ scope.row.Birthday }}</template>
</el-table-column>
......
src/components/sallCenter/plugin/miaiuser.vue
View file @ 7bd46817
......@@ -347,7 +347,8 @@
style="right: -25px; top: 30px;"></el-button>
</div>
<div class="diy-goods">
<div class="diy-component-preview" :style="cListStyle">
<div class="diy-component-preview" :style="{backgroundColor:data.backgroundColor,paddingBottom:data.PaddingBottom+'px',
paddingTop:data.PaddingTop+'px',paddingLeft:data.PaddingLeft+'px',paddingRight:data.PaddingRight+'px'}">
<div :flex="cMainFlex">
<div :flex="cCatFlex" class="cat-list"
v-if="data.showCat && (data.catPosition=='left'||(data.catPosition=='top'&&cCatList.length>1))"
......@@ -369,14 +370,12 @@
<div :style="cGoodsItemStyle" :flex="cGoodsItemFlex" style="position: relative;">
<div class="goods-pic"
:class="'goods-pic-'+data.goodsCoverProportion+' goods-pic-fill-'+data.fill"
:style="'background-image: url('+getIconLink(goods.picUrl)+')'">
<div v-if="data.showGoodsTag" class="goods-tag"
:style="'background-image: url('+ getIconLink(data.goodsTagPicUrl)+')'"></div>
:style="{'backgroundImage':'url(' +getIconLink(goods.Photo) + ')','borderRadius':data.SearchFilletPX+'px'}">
</div>
<div :style="cGoodsItemInfoStyle">
<div class="goods-name"
:class="{'goods-name-static':data.listStyle===-1,'goods-name-staticList':data.listStyle===4}">
<template v-if="data.showGoodsName">{{goods.name}}</template>
<template>{{goods.name}}</template>
</div>
<div flex="box:last" :class="{'goods-name-StaticName':data.listStyle===4}">
<div class="goods-price">
......@@ -432,7 +431,7 @@
<el-button @click="deleteGoods(goodsIndex,null)" circle class="goods-delete" type="danger"
icon="el-icon-close"></el-button>
</el-tooltip>
<div class="goods-pic" :style="'background-image:url('+getIconLink(goods.picUrl)+')'"></div>
<div class="goods-pic" :style="'background-image:url('+getIconLink(goods.Photo)+')'"></div>
</div>
</draggable>
<div class="goods-add">
......@@ -488,16 +487,8 @@
<el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
<!-- 选择分类 -->
<el-dialog title="选择分类" :visible.sync="isFenlei" width="800px">
<ChooseFenlei ref="ChooseFenlei"></ChooseFenlei>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="quxiaoFenlei()">取 消</el-button>
<el-button size="small" type="danger" @click="getChoiceFenlei()">确 定</el-button>
</span>
</el-dialog>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<el-dialog title="选择人物" :visible.sync="isShowGoods" width="900px">
<choicePeople ref="choicePeople"></choicePeople>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
......@@ -510,7 +501,6 @@
<script>
import draggable from "vuedraggable"
import ChooseImg from "@/components/global/ChooseImg.vue";
import ChooseFenlei from "../../common/choiceFenlei.vue";
import choicePeople from "../../common/choicePeople.vue";
export default {
......@@ -518,7 +508,6 @@
components: {
draggable,
ChooseImg,
ChooseFenlei,
choicePeople
},
data() {
......@@ -560,9 +549,9 @@
} else {
const defaultGoodsItem = {
id: 0,
name: '商品名称',
name: '姓名',
picUrl: '',
price: '100.00',
price: '',
};
newList = new Array(cat.goodsNum).fill(defaultGoodsItem);
}
......@@ -626,66 +615,41 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//选择商品分类
getChoiceFenlei() {
var ckedArr = this.$refs.ChooseFenlei.getChoicedFenlei();
var myCatArray = [];
if (ckedArr && ckedArr.length > 0) {
ckedArr.forEach(item => {
myCatArray.push({
goodsList: [],
goodsNum: 3,
id: item.id,
menuName: item.menuName,
name: item.name,
staticGoods: false
});
});
}
this.data.catList = this.data.catList.concat(myCatArray);
this.isFenlei = false;
this.$refs.ChooseFenlei.toggleSelection();
},
//取消商品分类选择
quxiaoFenlei() {
this.isFenlei = false;
this.$refs.ChooseFenlei.toggleSelection();
},
//选择商品
getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods();
var ckedArr = this.$refs.choicePeople.getChoicedGoods();
var myArray = [];
if (ckedArr && ckedArr.length > 0) {
ckedArr.forEach(element => {
myArray.push({
id: element.Id,
name: element.Name,
picUrl: element.CoverImage,
price: element.SellingPrice
Photo: element.Photo,
SexStr: element.SexStr,
Age: element.Age?element.Age:'',
Education: element.EducationType,
Marriage: element.Marriage,
MatchingRate: element.MatchingRate?element.MatchingRate:'',
Score: element.Score?element.Score:'',
Album: element.Album?element.Album:''
});
});
}
if (this.comIndex !== null) {
this.data.catList[this.comIndex].goodsList = this.data.catList[this.comIndex].goodsList.concat(myArray);
} else {
this.data.list = this.data.list.concat(myArray);
}
this.data.list = this.data.list.concat(myArray);
this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection();
this.$refs.choicePeople.toggleSelection();
},
//取消选择商品
quxiaoGoods() {
this.isShowGoods = false;
this.$refs.choiceGood.toggleSelection();
this.$refs.choicePeople.toggleSelection();
}
},
computed: {
cListStyle() {
if (this.data.backgroundColor) {
return `background-color:${this.data.backgroundColor};background-image:url(${this.data.backgroundPicUrl});background-size:${this.data.backgroundWidth}% ${this.data.backgroundHeight}%;background-repeat:${this.repeat};background-position:${this.position}`
} else {
return `background-image:url(${this.data.backgroundPicUrl});background-size:${this.data.backgroundWidth}% ${this.data.backgroundHeight}%;background-repeat:${this.repeat};background-position:${this.position}`
}
console.log(this.data.backgroundColor,'this.data.backgroundColor');
return `background-color:${this.data.backgroundColor};padding-top:${this.data.PaddingTop}+'px';padding-botttom:${this.data.PaddingBottom};
padding-left:${this.data.PaddingLeft};padding-right:${this.data.PaddingRight};`
},
cMainFlex() {
if (this.data.catPosition === 'left') {
......
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