Skip to content

E
ElectricitySheep
Commit 8719ba25 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 9ef7b5eb
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 12 deletions
src/components/pintuan/pintuanActive.vue
View file @ 8719ba25
......@@ -59,7 +59,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="开始时间" prop="StartTime">
<el-date-picker :disabled="addMsg.ActivityId>0" v-model="addMsg.StartTime" size="small" type="datetime" placeholder="选择日期时间">
<el-date-picker :disabled="addMsg.ActivityId>0" v-model="addMsg.StartTime" size="small"
type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -186,8 +187,8 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" v-model="addMsg.Virtual_Sales" min="0" size="small"
placeholder="请输入内容" class="input-with-select">
<el-input type="number" v-model="addMsg.Virtual_Sales" min="0" size="small" placeholder="请输入内容"
class="input-with-select">
<el-button slot="append">件</el-button>
</el-input>
</el-form-item>
......@@ -242,7 +243,8 @@
<div flex="dir:left">
<span class="box-grow-0" style="color:#606266">商品</span>
<div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Count" size="small" :disabled="addMsg.Confine_Count <=-1">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Count" size="small"
:disabled="addMsg.Confine_Count <=-1">
<template slot="append">件</template>
</el-input>
</div>
......@@ -253,7 +255,8 @@
<div flex="dir:left" style="margin-top: 10px;">
<span class="box-grow-0" style="color:#606266">订单</span>
<div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Order_Count" size="small" :disabled="addMsg.Confine_Order_Count<=-1">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Order_Count" size="small"
:disabled="addMsg.Confine_Order_Count<=-1">
<template slot="append">单</template>
</el-input>
</div>
......@@ -269,8 +272,8 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" v-model="addMsg.Pieces" min="0" size="small"
placeholder="请输入数量" class="input-with-select">
<el-input type="number" v-model="addMsg.Pieces" min="0" size="small" placeholder="请输入数量"
class="input-with-select">
<el-button slot="append">件</el-button>
</el-input>
</el-form-item>
......@@ -281,16 +284,35 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" v-model="addMsg.Forehead" min="0" size="small"
placeholder="请输入金额" class="input-with-select">
<el-input type="number" v-model="addMsg.Forehead" min="0" size="small" placeholder="请输入金额"
class="input-with-select">
<el-button slot="append">元</el-button>
</el-input>
</el-form-item>
<el-form-item label="区域购买">
<el-switch active-color="#409EFF" v-model="addMsg.Is_Area_Limit" :active-value="1"
:inactive-value="2">
:inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item v-if="addMsg.Is_Area_Limit == 1" label="允许购买区域">
<span v-if="addMsg.Area_limit.length == 0" @click="addArea" class="blue point">+添加地区</span>
<div v-if="addMsg.Area_limit.length > 0" style="border: 1px solid #EBEEF5;padding:20px"
flex="dir:left box:last">
<div>
<div flex="dir:left" style="flex-wrap: wrap; width: 90%;">
<span>区域：</span>
<el-tag v-for="item in addMsg.Area_limit" :key="item.Id" type="info" style="margin:5px">
{{ item.AreaName }}</el-tag>
</div>
</div>
<div>
<img @click="editQy" style="cursor:pointer;" src="../../assets/img/userman/edit.png" alt="" />
<img @click="(addMsg.Area_limit = []), (AreaList = [])" style="margin-left:15px;cursor:pointer;"
src="../../assets/img/userman/del.png" alt="" />
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
......@@ -467,6 +489,13 @@
<el-button size="small" @click="getCkedForm" type="primary">确 定</el-button>
</span>
</el-dialog>
<!--区域-->
<el-dialog custom-class="regionDig" title="区域" :visible.sync="dialogFormVisible">
<regionChoice @event1="change($event)" :List="AreaList" ref="child"></regionChoice>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="Addto">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -477,6 +506,8 @@
import groupStep from "@/components/pintuan/pintuanPlugin/groupStep.vue"
import distributePrice from "@/components/pintuan/pintuanPlugin/distributePrice.vue"
import memberPrice from "@/components/pintuan/pintuanPlugin/memberPrice.vue"
import regionChoice from "@/components/setup/view/regionChoice";
export default {
components: {
......@@ -485,7 +516,8 @@
choiceGood,
groupStep,
distributePrice,
memberPrice
memberPrice,
regionChoice
},
data() {
return {
......@@ -518,7 +550,7 @@
Pieces: 0, //单品满件包邮
Forehead: 0, //单品满额包邮
Is_Area_Limit: 0, //区域购买
Area_limit: "", //购买区域
Area_limit: [], //购买区域
Give_integral: 0, //积分赠送
Give_integral_type: 1, //积分赠送=>1固定值 2百分比
Is_forehead_integral: 0, //积分抵扣
......@@ -550,6 +582,9 @@
checkedForm: '',
formName: '',
imgDialog: false,
//区域
AreaList:[],
dialogFormVisible: false,
rules: {
StartTime: [{
required: true,
......@@ -785,6 +820,38 @@
this.addMsg.App_share_pic = that.getIconLink(msg[0].url);
this.imgDialog = false;
},
//添加区域
addArea(){
this.dialogFormVisible = true;
this.AreaList = [];
this.addMsg.Area_limit = [];
setTimeout(() => {
this.$refs.child.Receive(this.AreaList);
}, 1000);
},
//点击区域弹窗确定
Addto() {
this.addMsg.Area_limit = [];
this.AreaList.forEach(item => {
let obj = {
Id: item.RegionId,
AreaId: item.RegionId,
AreaName: item.RegionName
};
this.addMsg.Area_limit.push(obj);
});
this.dialogFormVisible = false;
},
change(data) {
this.AreaList = data;
},
editQy() {
this.dialogFormVisible = true;
setTimeout(() => {
this.$refs.child.Receive(this.AreaList);
}, 1000);
}
}
};
......
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