Skip to content

E
ElectricitySheep
Commit 92ebb08b authored by Mac's avatar Mac
Browse files
Options

提交代码

parent c90ecf23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 266 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ 92ebb08b
......@@ -2150,18 +2150,10 @@
if (this.addMsg.MarketingLogo) {
try {
let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
if(MarketingLogo.indexOf('iswords')==-1){
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
}
}else {
let obj = MarketingLogo
this.addMsg.MarketingLogo = obj
}
} catch (err) {
this.addMsg.MarketingLogo = {
iswords: 0,
......
src/components/director/addSite.vue
View file @ 92ebb08b
......@@ -15,16 +15,45 @@
<el-radio v-model="addMsg.IsEnable" :label="1">是</el-radio>
<el-radio v-model="addMsg.IsEnable" :label="0">否</el-radio>
</el-form-item>
<el-form-item label="司导区域" class="is-required" >
<div class="gez_list el-card" v-if="addMsg.RegionList.length>0">
<div style="width: 500px;" >
<div >区域：<span v-for="(item,index) in addMsg.RegionList" :key="index" class="quyu">
{{item.RegionName}}</span>
</div>
</div>
<div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="edit()">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b()">
</el-tooltip>
</div>
</div>
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="addOf" v-if="addMsg.RegionList.length==0">+新增规则</span>
</el-form-item>
</el-form>
</div>
<div style="margin-top:20px">
<el-button size="small" type="primary" @click="Save('addMsg')">保存</el-button>
</div>
<el-dialog title="新增司导地区" :visible.sync="dialogFormVisible" >
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<el-form-item label="司导地区" prop="List">
<region_Choice @event1="change($event)" ref="child"></region_Choice>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="Addto()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import region_Choice from '../setup/view/regionChoice'
export default {
data() {
return {
......@@ -44,6 +73,8 @@
},
loading: false,
dialogFormVisible:false,
};
},
......@@ -53,6 +84,9 @@
this.getData(this.$route.query.ID)
}
},
components:{
region_Choice,
},
methods: {
......@@ -60,9 +94,9 @@
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost("/api/MallBase/AddOrUpdateFreeShipping", this.addMsg, res => {
this.apipost("/api/GuideCar/AddOrUpdateGuideCarSite", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.CommonJump('mailRules');
this.CommonJump('guideCarSiteList');
this.Success(res.data.message);
} else {
this.Error(res.data.message);
......@@ -73,18 +107,41 @@
}
});
},
edit(){
this.dialogFormVisible=true;
setTimeout(()=>{
this.$refs.child.Receive(this.addMsg.RegionList)
},1000)
} ,
delete_b(){
this.addMsg.RegionList=[]
},
change(data){
this.List = data;
},
Addto(){
this.dialogFormVisible=false
this.addMsg.RegionList =this.List;
},
addOf(){
this.List=[]
this.dialogFormVisible=true;
this.isedit=false;//设置为编辑状态
setTimeout(()=>{
this.$refs.child.Receive(this.List)
},1000)
},
getData(ID) {
this.loading = true;
this.apipost("/api/MallBase/GetFreeShippingModel", {
Id: ID
this.apipost("/api/GuideCar/GetGuideCarSiteModel", {
ID: ID
}, res => {
this.loading = false;
this.addMsg = res.data.data;
})
},
},
......@@ -186,5 +243,32 @@
padding: 20px;
box-sizing: border-box;
}
.addSite .gez_list{
width: 650px;
margin-bottom: 12px;
padding: 20px;
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.addSite .quyu{
background-color: #f4f4f5;
color: #909399;
padding: 10px;
line-height: 30px;
height: 30px;
font-size: 12px;
border-radius: 4px;
white-space: nowrap;
margin: 5px;
}
.addSite .imgstyle{
width: 32px;
height: 32px;
margin: 0 5px;
}
</style>
src/components/director/guideCarSiteList.vue
View file @ 92ebb08b
......@@ -8,7 +8,7 @@
</div>
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<div class="block">
<div class="block" style="display: flex;flex-direction: row;justify-content: space-between;width: 100%;">
<div class="searchInput" style="width:250px">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入站点名称搜索"
......@@ -20,6 +20,10 @@
</el-input>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<div style="display: flex;flex-direction: row;">
<el-button type="primary" @click="SetProduct(1)" size="small">开启</el-button>
<el-button type="primary" @click="SetProduct(0)" size="small">关闭</el-button>
</div>
</div>
</div>
</div>
......@@ -31,7 +35,9 @@
header-cell-class-name="headClass"
style="width: 100%"
border
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" style="text-align:center;"></el-table-column>
<el-table-column
prop="ID"
......@@ -103,7 +109,11 @@
},
tableData:[],
count:0,
loading:false
loading:false,
EnableMsg:{
Ids:'',
IsEnable:0,
},
}
},
created(){
......@@ -131,7 +141,7 @@
Edit(row){
this.$router.push({
name: 'addCoupon',
name: 'addSite',
query: {
ID:row.ID,
blank: "y"
......@@ -156,13 +166,39 @@
});
},
changeEnabled(item){
// this.apipost("/api/MallBase/AddOrUpdateIsEnable",{Id:item.ID,IsEnable:item.IsEnable}, res => {
// if(res.data.resultCode==1){
// this.Success(res.data.message)
// this.getList()
// }
// })
this.EnableMsg.Ids = item.ID;
this.EnableMsg.IsEnable = item.IsEnable;
this.enableGuideCar()
},
enableGuideCar(){
this.apipost("/api/GuideCar/EnableGuideCarSiteInfo", this.EnableMsg, res => {
if(res.data.resultCode==1){
this.Success(res.data.message)
this.getList()
}
})
},
SetProduct(type){
this.EnableMsg.IsEnable = type;
if(this.EnableMsg.Ids.length==0){
this.Info('请选择站点');
return
}
this.EnableMsg.Ids = this.EnableMsg.Ids.join(",");
this.enableGuideCar()
},
handleSelectionChange(val){
var selectRow = JSON.parse(JSON.stringify(val));
let array= [];
selectRow.forEach(x => {
let obj = {}
obj = x.ID;
array.push(obj)
});
this.EnableMsg.Ids = array
},
getList(){
this.msg.pageIndex = 1
this.getDateList()
......@@ -211,4 +247,7 @@
padding: 15px;
box-sizing: border-box;
}
.guideCarSiteList .el-tag{
margin-right: 5px;
}
</style>
src/components/orderMan/customerEvaluation.vue
View file @ 92ebb08b
......@@ -34,7 +34,7 @@
<div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
<img v-if="!addMsg.userPath || addMsg.userPath==''"
src="../../assets/img/default.png" style="width:80px;height:80px" alt="">
<img style="width:80px;height:80px" :src="domainManager().ImageUrl+addMsg.userPath"
<img style="width:80px;height:80px" :src="addMsg.userPath"
alt="">
</div>
</el-form-item>
......@@ -55,7 +55,7 @@
<div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
<img v-if="!addMsg.pjPath || addMsg.pjPath==''"
src="../../assets/img/default.png" style="width:80px;height:80px" alt="">
<img style="width:80px;height:80px" :src="domainManager().ImageUrl+addMsg.pjPath"
<img style="width:80px;height:80px" :src="addMsg.pjPath"
alt="">
</div>
</el-form-item>
......@@ -81,7 +81,7 @@
</div>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
......@@ -142,17 +142,22 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this.getTemplate();
this.getList();
this.getplat();
},
methods: {
SelectId(msg){
if(this.imgType==1){
this.addMsg.UserPhoto=msg.selectId;
this.addMsg.userPath=msg.url;
let url = this.getIconLink(msg.url)
console.log(url)
this.addMsg.UserPhoto=msg.selectId;
this.addMsg.userPath=url;
}
if(this.imgType==2){
this.addMsg.CommentImgList=[msg.selectId];
this.addMsg.pjPath=msg.url;
let url = this.getIconLink(msg.url)
console.log(url)
this.addMsg.CommentImgList=[url];
this.addMsg.pjPath=url;
}
this.changeState = false;
},
......@@ -181,7 +186,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
getplat(){
......@@ -194,7 +199,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this.templateList=res.data.data;
})
},
},
mounted() {
......
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