Skip to content

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

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

parents e874c636 e27970c4
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 57 deletions
src/components/StoreDesign/labelBar.vue
View file @ 6be4783b
......@@ -605,6 +605,7 @@
})
}
this.mallMsg.BottomTagList = [];
this.mallMsg.TopNavBgColor='#FFFFFF';
this.mallMsg.BottomTagList = JSON.parse(JSON.stringify(this.defaultTagList));
}
},
......
src/components/UserMan/customSet.vue
View file @ 6be4783b
......@@ -14,8 +14,7 @@
<div class="el-scrollbar__view">
<div>
<div class="el-image" style="display: block; width: 100%; height: 150px;">
<img :src="getIconLink(addMsg.HeadImagePath)"
class="el-image__inner">
<img :src="getIconLink(addMsg.HeadImagePath)" class="el-image__inner">
</div>
<div style="background: rgb(255, 255, 255); height: 40px; padding: 0px 14px;">
<div flex="cross:center"
......@@ -57,8 +56,7 @@
{{addMsg.ButtonText}}
</div>
<div class="el-image" style="display: block; width: 100%;">
<img :src="getIconLink(addMsg.BottomImagePath)"
class="el-image__inner">
<img :src="getIconLink(addMsg.BottomImagePath)" class="el-image__inner">
</div>
</div>
</div>
......@@ -201,8 +199,7 @@
<div flex="dir:left cross:center" style="flex-wrap: wrap;">
<div flex="dir:top cross:center main:center" class="text-center"
style="border-right: 1px solid rgb(226, 226, 226); border-bottom: 1px solid rgb(226, 226, 226); width: 125px; height: 110px;">
<img
:src="getIconLink(addMsg.DistributionCommissionImagePath)"
<img :src="getIconLink(addMsg.DistributionCommissionImagePath)"
style="width: 35px; height: 35px;">
<div style="transform: scale(0.8); font-size: 16px; padding-top: 8px; color: rgb(102, 102, 102);">
{{addMsg.DistributionCommissionName}}
......@@ -210,33 +207,28 @@
</div>
<div flex="dir:top cross:center main:center" class="text-center"
style="border-right: 1px solid rgb(226, 226, 226); border-bottom: 1px solid rgb(226, 226, 226); width: 125px; height: 110px;">
<img
:src="getIconLink(addMsg.DistributionOrderImagePath)"
style="width: 35px; height: 35px;">
<img :src="getIconLink(addMsg.DistributionOrderImagePath)" style="width: 35px; height: 35px;">
<div style="transform: scale(0.8); font-size: 16px; padding-top: 8px; color: rgb(102, 102, 102);">
{{addMsg.DistributionOrderName}}
</div>
</div>
<div flex="dir:top cross:center main:center" class="text-center"
style="border-right: 1px solid rgb(226, 226, 226); border-bottom: 1px solid rgb(226, 226, 226); width: 125px; height: 110px;">
<img :src="getIconLink(addMsg.WithdrawDetialsImagePath)"
style="width: 35px; height: 35px;">
<img :src="getIconLink(addMsg.WithdrawDetialsImagePath)" style="width: 35px; height: 35px;">
<div style="transform: scale(0.8); font-size: 16px; padding-top: 8px; color: rgb(102, 102, 102);">
{{addMsg.WithdrawDetialsName}}
</div>
</div>
<div flex="dir:top cross:center main:center" class="text-center"
style="border-right: 1px solid rgb(226, 226, 226); border-bottom: 1px solid rgb(226, 226, 226); width: 125px; height: 110px;">
<img :src="getIconLink(addMsg.MyTeamImagePath)"
style="width: 35px; height: 35px;">
<img :src="getIconLink(addMsg.MyTeamImagePath)" style="width: 35px; height: 35px;">
<div style="transform: scale(0.8); font-size: 16px; padding-top: 8px; color: rgb(102, 102, 102);">
{{addMsg.MyTeamName}}
</div>
</div>
<div flex="dir:top cross:center main:center" class="text-center"
style="border-right: 1px solid rgb(226, 226, 226); border-bottom: 1px solid rgb(226, 226, 226); width: 125px; height: 110px;">
<img :src="getIconLink(addMsg.PromoteQRCodeImagePath)"
style="width: 35px; height: 35px;">
<img :src="getIconLink(addMsg.PromoteQRCodeImagePath)" style="width: 35px; height: 35px;">
<div style="transform: scale(0.8); font-size: 16px; padding-top: 8px; color: rgb(102, 102, 102);">
{{addMsg.PromoteQRCodeName}}
</div>
......@@ -655,9 +647,9 @@
</el-form-item>
<el-form-item label="图标" prop="Password2">
<el-button @click="openChangeDig(imgType)" size="small">选择文件</el-button>
<el-button @click="getIconMsg(iconMsg)" size="small">恢复默认</el-button>
<div>
<img style="width:80px;height:80px"
:src="getIconLink(iconMsg.Path)" alt="">
<img style="width:80px;height:80px" :src="getIconLink(iconMsg.Path)" alt="">
</div>
</el-form-item>
</el-form>
......@@ -680,8 +672,19 @@
return {
activeName: 'first',
addMsg: {},
HeadImagePath: '',
BottomImagePath: '',
commonIndex:-1,
HeadImagePath: this.domainManager().ImageUrl + '/Upload/Set/1587968479000.png',
BottomImagePath: this.domainManager().ImageUrl + '/Upload/Set/1587968716000.png',
//分销佣金默认
fenxiaoMoren: this.domainManager().ImageUrl + '/Upload/Set/1587968503000.png',
//分销订单默认
fenxiaoOrder: this.domainManager().ImageUrl + '/Upload/Set/1587968517000.png',
//提现明细默认
tixianMoren: this.domainManager().ImageUrl + '/Upload/Set/1587968599000.png',
//我的团队默认
myTeamMoren: this.domainManager().ImageUrl + '/Upload/Set/1587968613000.png',
//推广二维码默认
tuiguangCode: this.domainManager().ImageUrl + '/Upload/Set/1587968626000.png',
imgType: 1,
changeState: false,
iconDig: false,
......@@ -694,12 +697,11 @@
},
created() {
this.getData();
this.GetPageList1();
this.GetPageList2();
},
mounted() {},
methods: {
openIcon(index, name, path) {
this.commonIndex=index;
this.imgType = index;
this.iconDig = true;
this.iconMsg = {
......@@ -707,6 +709,27 @@
Path: path,
}
},
//点击栏目下栏目编辑恢复默认
getIconMsg(iconMsg){
switch(this.commonIndex){
case 3:
iconMsg.Path=this.fenxiaoMoren;
break;
case 4:
iconMsg.Path=this.fenxiaoOrder;
break;
case 5:
iconMsg.Path=this.tixianMoren;
break;
case 6:
iconMsg.Path=this.myTeamMoren;
break;
case 7:
iconMsg.Path=this.myTeamMoren;
break;
}
console.log(msg,'msg');
},
save() {
this.apipost("/api/user/SetDistributorCustomInfo", this.addMsg, res => {
this.loading = false;
......@@ -776,38 +799,6 @@
})
},
GetPageList1() {
let msg = {
Id: 1,
Name: '',
Type: 1,
Recycled: 1,
pageIndex: 1,
pageSize: 15,
GroupId: 0,
}
this.apipost("/api/product/GetMaterialInfoPageList", msg, res => {
this.total = res.data.data.count;
let data = res.data.data.pageData;
this.HeadImagePath = data[0].Path;
})
},
GetPageList2() {
let msg = {
Id: 2,
Name: '',
Type: 1,
Recycled: 1,
pageIndex: 1,
pageSize: 15,
GroupId: 0,
}
this.apipost("/api/product/GetMaterialInfoPageList", msg, res => {
this.total = res.data.data.count;
let data = res.data.data.pageData;
this.BottomImagePath = data[0].Path;
})
},
UploadImage(file) {
this.UploadFileToTencent(this.FileType().SetImg, file.file, res => {
if (res.resultCode == 1) {}
......
src/components/common/choiceFenlei.vue
View file @ 6be4783b
<template>
<div>
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
......
src/components/common/choiceGood.vue
View file @ 6be4783b
......@@ -34,6 +34,7 @@
</template>
<script>
export default {
props:['ckGoods'],
data() {
return {
dataList: [],
......@@ -60,6 +61,10 @@
})
},
handleSelectionChange(val) {
if(val.length>this.ckGoods){
this.Info('超过了');
val=val.slice(0,this.ckGoods);
}
this.selectRow = JSON.parse(JSON.stringify(val));
},
handleCurrentChange(val) {
......
src/components/global/ChooseImg.vue
View file @ 6be4783b
......@@ -48,7 +48,7 @@
</el-upload>
</div>
</div>
<el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" content="双击选中图片"
<el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" :content="'双击选中【'+item.Name+'】'"
placement="top-start">
<div @click="PageSelect(item,1)" @dblclick="PageSelect(item,2)" :class="selectId==item.Id ? 'selected' :''"
class="el-tooltip item app-attachment-item">
......
src/components/sallCenter/plugin/goods.vue
View file @ 6be4783b
......@@ -420,7 +420,7 @@
</div>
</draggable>
<div class="goods-add">
<el-button @click="showGoodsDialog(catIndex)" icon="el-icon-plus"></el-button>
<el-button @click="showGoodsDialog(catIndex),ckGoods=cat.goodsNum" icon="el-icon-plus"></el-button>
</div>
</div>
</div>
......@@ -542,7 +542,7 @@
</el-dialog>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood"></choiceGood>
<choiceGood ref="choiceGood" :ckGoods="ckGoods"></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="quxiaoGoods()">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
......@@ -567,6 +567,8 @@
},
data() {
return {
//可以选择的商品数
ckGoods:0,
data: this.goodData.data,
position: 'center center',
repeat: 'no-repeat',
......
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