Skip to content

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

1

parents 7b35ca17 e0b9430e
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 148 deletions
src/components/UserMan/disWithdrawal.vue
View file @ fe91f926
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="reasonDig = false">取 消</el-button> <el-button size="small" @click="reasonDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button> <el-button size="small" type="primary" @click="czsubmitForm('addMsg')" :loading="tjloading">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
czType:1, czType:1,
changeState:false, changeState:false,
loading:false, loading:false,
tjloading:false,
checkAll: false, checkAll: false,
checkedCities: [], checkedCities: [],
cities: [], cities: [],
...@@ -233,17 +234,17 @@ ...@@ -233,17 +234,17 @@
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let cmd="/api/user/SetDistributorRemitAudit"; let cmd="/api/user/SetDistributorRemitAudit";
this.loading = true this.tjloading = true
this.apipost(cmd,this.addMsg, this.apipost(cmd,this.addMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
this.reasonDig=false; this.reasonDig=false;
this.loading = false this.tjloading = false
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
this.loading = false this.tjloading = false
} }
}, },
null null
......
src/components/common/choiceGood.vue
View file @ fe91f926
...@@ -6,8 +6,18 @@ ...@@ -6,8 +6,18 @@
</el-input> </el-input>
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%" <el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50px"> <template v-if="isSingle">
</el-table-column> <el-table-column width="50px" label="">
<template slot-scope="scope">
<el-radio v-model="scope.row.IsChecked" @change.native="getTemplateRow(scope.$index,scope.row)">&nbsp;
</el-radio>
</template>
</el-table-column>
</template>
<template v-else>
<el-table-column type="selection" width="50px">
</el-table-column>
</template>
<el-table-column label="ID" width="80px"> <el-table-column label="ID" width="80px">
<template slot-scope="scope">{{ scope.row.Id }}</template> <template slot-scope="scope">{{ scope.row.Id }}</template>
</el-table-column> </el-table-column>
...@@ -34,7 +44,7 @@ ...@@ -34,7 +44,7 @@
</template> </template>
<script> <script>
export default { export default {
props:['ckGoods'], props: ['ckGoods', "isSingle", "IsGetSpec"],
data() { data() {
return { return {
dataList: [], dataList: [],
...@@ -42,32 +52,50 @@ ...@@ -42,32 +52,50 @@
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
Name: '', Name: '',
GoodsStatus:1 //上架中 GoodsStatus: 1, //上架中
IsGetSpec: 0
}, },
total: 0, total: 0,
selectRow: [], selectRow: [],
}; };
}, },
created() {}, created() {
if (this.IsGetSpec) {
this.msg.IsGetSpec = this.IsGetSpec;
}
},
methods: { methods: {
//获取所有菜单 //获取所有菜单
getList() { getList() {
this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => { this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
item.IsChecked = false;
});
}
this.dataList = JSON.parse(JSON.stringify(tempArray));
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
// if(val.length>this.ckGoods){
// this.Info('超过了');
// val=val.slice(0,this.ckGoods);
// }
this.selectRow = JSON.parse(JSON.stringify(val)); this.selectRow = JSON.parse(JSON.stringify(val));
}, },
getTemplateRow(index, row) {
this.selectRow = [];
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.Id != row.Id) {
item.IsChecked = false;
}
})
}
this.selectRow.push(JSON.parse(JSON.stringify(row)));
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
......
src/components/pintuan/pintuanActive.vue
View file @ fe91f926
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="开始时间"> <el-form-item label="开始时间">
<el-date-picker v-model="addMsg.start_time" size="small" type="datetime" placeholder="选择日期时间"> <el-date-picker v-model="addMsg.StartTime" size="small" type="datetime" placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="结束时间"> <el-form-item label="结束时间">
<el-date-picker v-model="addMsg.end_time" size="small" type="datetime" placeholder="选择日期时间"> <el-date-picker v-model="addMsg.EndTime" size="small" type="datetime" placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -64,14 +64,15 @@ ...@@ -64,14 +64,15 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-button type="text">文字按钮</el-button> <el-button type="text" @click="isShowGoods=true">选择商品</el-button>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="Name"> <el-form-item label="商品名称" prop="Name">
<el-input size="small" v-model="addMsg.name" placeholder="请输入内容" maxlength="100"> <el-input size="small" v-model="addMsg.name" placeholder="请输入内容" maxlength="100">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="上架状态"> <el-form-item label="上架状态">
<el-switch active-color="#409EFF" v-model="addMsg.status" :active-value="1" :inactive-value="2"> <el-switch active-color="#409EFF" v-model="addMsg.GoodsStatus" :active-value="1"
:inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -93,8 +94,8 @@ ...@@ -93,8 +94,8 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="售价" prop="price"> <el-form-item label="售价" prop="SellingPrice">
<el-input v-model="addMsg.price" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"> class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
...@@ -106,17 +107,17 @@ ...@@ -106,17 +107,17 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input v-model="addMsg.original_price" type="number" :disabled="true" min="1" size="small" <el-input v-model="addMsg.Original_Price" type="number" :disabled="true" min="1" size="small"
placeholder="请输入内容" class="input-with-select"> placeholder="请输入内容" class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品总库存"> <el-form-item label="商品总库存">
<el-input v-model="addMsg.goods_stock" size="small" placeholder="请输入内容" class="input-with-select"> <el-input v-model="addMsg.Goods_Stock" size="small" placeholder="请输入内容" class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="默认规格名"> <el-form-item label="默认规格名">
<el-input v-model="addMsg.attr_default_name" type="text" size="small" placeholder="请输入默认规格名" <el-input v-model="addMsg.Goods_unit" type="text" size="small" placeholder="请输入默认规格名"
class="input-with-select"> class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -127,14 +128,16 @@ ...@@ -127,14 +128,16 @@
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<goodsSpe></goodsSpe> <goodsSpe :SpecList="SpecificationList">
</goodsSpe>
</el-form-item> </el-form-item>
<el-form-item label="商品货号"> <el-form-item label="商品货号">
<el-input v-model="addMsg.goods_no" size="small" placeholder="请输入内容" class="input-with-select"> <el-input v-model="addMsg.Goods_no" size="small" placeholder="请输入内容" class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品重量"> <el-form-item label="商品重量">
<el-input v-model="addMsg.goods_weight" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.Goods_weight" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"> class="input-with-select">
<el-button slot="append">克</el-button> <el-button slot="append">克</el-button>
</el-input> </el-input>
...@@ -149,7 +152,7 @@ ...@@ -149,7 +152,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否开启虚拟成团"> <el-form-item label="是否开启虚拟成团">
<el-switch active-color="#409EFF" v-model="addMsg.is_auto_add_robot" :active-value="1" <el-switch active-color="#409EFF" v-model="addMsg.Is_Auto_Add_Robot" :active-value="1"
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
<div style="color:#c6c6c6">开启虚拟成团后，系统将模拟“匿名买家”凑满人数促成成团，商家仅需对真实拼团买家发货</div> <div style="color:#c6c6c6">开启虚拟成团后，系统将模拟“匿名买家”凑满人数促成成团，商家仅需对真实拼团买家发货</div>
...@@ -161,13 +164,13 @@ ...@@ -161,13 +164,13 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="number" :disabled="true" v-model="addMsg.virtual_sales" min="0" size="small" <el-input type="number" :disabled="true" v-model="addMsg.Virtual_Sales" min="0" size="small"
placeholder="请输入内容" class="input-with-select"> placeholder="请输入内容" class="input-with-select">
<el-button slot="append">件</el-button> <el-button slot="append">件</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否允许单独购买"> <el-form-item label="是否允许单独购买">
<el-switch active-color="#409EFF" v-model="addMsg.is_alone_buy" :active-value="1" <el-switch active-color="#409EFF" v-model="addMsg.Is_Alone_Buy" :active-value="1"
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
...@@ -199,22 +202,22 @@ ...@@ -199,22 +202,22 @@
<div flex="dir:left"> <div flex="dir:left">
<span class="box-grow-0" style="color:#606266">商品</span> <span class="box-grow-0" style="color:#606266">商品</span>
<div style="width: 100%;margin:0 10px"> <div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.confine_count" size="small"> <el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Count" size="small">
<template slot="append">件</template> <template slot="append">件</template>
</el-input> </el-input>
</div> </div>
<el-checkbox v-model="addMsg.confine_count <= -1" @change="itemChecked" <el-checkbox v-model="addMsg.Confine_Count <= -1" @change="itemChecked"
style="margin-left:5px;line-height:32px;">无限制 style="margin-left:5px;line-height:32px;">无限制
</el-checkbox> </el-checkbox>
</div> </div>
<div flex="dir:left" style="margin-top: 10px;"> <div flex="dir:left" style="margin-top: 10px;">
<span class="box-grow-0" style="color:#606266">订单</span> <span class="box-grow-0" style="color:#606266">订单</span>
<div style="width: 100%;margin:0 10px"> <div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.confine_order_count" size="small"> <el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Order_Count" size="small">
<template slot="append">单</template> <template slot="append">单</template>
</el-input> </el-input>
</div> </div>
<el-checkbox v-model="addMsg.confine_order_count<=-1" @change="itemOrderChecked" <el-checkbox v-model="addMsg.Confine_Order_Count<=-1" @change="itemOrderChecked"
style="margin-left:5px;line-height:32px;">无限制 style="margin-left:5px;line-height:32px;">无限制
</el-checkbox> </el-checkbox>
</div> </div>
...@@ -226,7 +229,7 @@ ...@@ -226,7 +229,7 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="number" :disabled="true" v-model="addMsg.pieces" min="0" size="small" <el-input type="number" :disabled="true" v-model="addMsg.Pieces" min="0" size="small"
placeholder="请输入数量" class="input-with-select"> placeholder="请输入数量" class="input-with-select">
<el-button slot="append">件</el-button> <el-button slot="append">件</el-button>
</el-input> </el-input>
...@@ -238,13 +241,13 @@ ...@@ -238,13 +241,13 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="number" :disabled="true" v-model="addMsg.forehead" min="0" size="small" <el-input type="number" :disabled="true" v-model="addMsg.Forehead" min="0" size="small"
placeholder="请输入金额" class="input-with-select"> placeholder="请输入金额" class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="区域购买"> <el-form-item label="区域购买">
<el-switch active-color="#409EFF" v-model="addMsg.is_area_limit" :active-value="1" <el-switch active-color="#409EFF" v-model="addMsg.Is_Area_Limit" :active-value="1"
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
...@@ -269,13 +272,13 @@ ...@@ -269,13 +272,13 @@
<i class="el-icon-info"></i> <i class="el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="number" min="0" v-model="addMsg.give_integral" size="small" <el-input type="number" min="0" v-model="addMsg.Give_integral" size="small"
placeholder="请输入赠送积分数量"> placeholder="请输入赠送积分数量">
<template slot="append"> <template slot="append">
分 分
<el-radio :label="1" v-model="addMsg.give_integral_type">固定值 <el-radio :label="1" v-model="addMsg.Give_integral_type">固定值
</el-radio> </el-radio>
<el-radio :label="2" v-model="addMsg.give_integral_type">百分比 <el-radio :label="2" v-model="addMsg.Give_integral_type">百分比
</el-radio> </el-radio>
</template> </template>
</el-input> </el-input>
...@@ -287,18 +290,18 @@ ...@@ -287,18 +290,18 @@
<i class="el-icon-info"></i> <i class="el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="number" min="0" size="small" v-model="addMsg.forehead_integral" <el-input type="number" min="0" size="small" v-model="addMsg.Is_forehead_integral"
placeholder="请输最高抵扣金额"> placeholder="请输最高抵扣金额">
<template slot="prepend">最多抵扣</template> <template slot="prepend">最多抵扣</template>
<template slot="append"> <template slot="append">
元 元
<el-radio :label="1" v-model="addMsg.forehead_integral_type">固定值 <el-radio :label="1" v-model="addMsg.Forehead_integral_type">固定值
</el-radio> </el-radio>
<el-radio :label="2" v-model="addMsg.forehead_integral_type">百分比 <el-radio :label="2" v-model="addMsg.Forehead_integral_type">百分比
</el-radio> </el-radio>
</template> </template>
</el-input> </el-input>
<el-checkbox :true-label="1" v-model="addMsg.accumulative" :false-label="0"> <el-checkbox :true-label="1" v-model="addMsg.Accumulative" :false-label="0">
允许多件累计抵扣 允许多件累计抵扣
</el-checkbox> </el-checkbox>
</el-form-item> </el-form-item>
...@@ -321,7 +324,7 @@ ...@@ -321,7 +324,7 @@
<i class="el-icon-info"></i> <i class="el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-input type="text" size="small" v-model="addMsg.app_share_title" placeholder="请输入分享标题"> <el-input type="text" size="small" v-model="addMsg.App_share_title" placeholder="请输入分享标题">
</el-input> </el-input>
<el-button type="text">查看图例</el-button> <el-button type="text">查看图例</el-button>
</el-form-item> </el-form-item>
...@@ -336,7 +339,6 @@ ...@@ -336,7 +339,6 @@
<el-button size="mini">选择图片</el-button> <el-button size="mini">选择图片</el-button>
</el-tooltip> </el-tooltip>
<div class="zk_pic_box" flex="main:center cross:center" style="width:80px;height:80px;"> <div class="zk_pic_box" flex="main:center cross:center" style="width:80px;height:80px;">
<!-- app_share_pic -->
<i class="el-icon-picture-outline"></i> <i class="el-icon-picture-outline"></i>
</div> </div>
<el-button type="text">查看图例</el-button> <el-button type="text">查看图例</el-button>
...@@ -345,24 +347,30 @@ ...@@ -345,24 +347,30 @@
</el-row> </el-row>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="阶梯团设置" name="second"> <el-tab-pane lebel="购买设置">
<ladderGroup></ladderGroup>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分销价设置" name="third"> <el-tab-pane lebel="分销价设置">
<distributePrice></distributePrice>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="阶梯团设置" name="fourth"> <el-tab-pane lebel="阶梯团设置">
4
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-row> </el-row>
</el-form> </el-form>
<div class="bottom-div" flex="cross:center" style="margin-top:20px"> <div class="bottom-div" flex="cross:center" style="margin-top:20px">
<el-button size="small" class="button-item" type="primary" @click="Save('addMsg')">保存</el-button> <el-button size="small" class="button-item" type="primary" @click="SaveActivity()">保存</el-button>
<el-button size="small" class="button-item">预览</el-button> <el-button size="small" class="button-item">预览</el-button>
</div> </div>
</div> </div>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" :ckGoods="ckGoods" :isSingle="true" :IsGetSpec="1"></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
</span>
</el-dialog>
<!-- 选择图片 --> <!-- 选择图片 -->
<!-- <el-dialog title="选择文件" :visible.sync="changeState" width="1240px"> <!-- <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg> <ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg>
...@@ -372,99 +380,104 @@ ...@@ -372,99 +380,104 @@
<script> <script>
import ChooseImg from "@/components/global/ChooseImg.vue"; import ChooseImg from "@/components/global/ChooseImg.vue";
import goodsSpe from "@/components/pintuan/pintuanPlugin/goodsSpecifica.vue" import goodsSpe from "@/components/pintuan/pintuanPlugin/goodsSpecifica.vue"
import ladderGroup from "@/components/pintuan/pintuanPlugin/ladderGroup.vue" import choiceGood from "@/components/common/choiceGood.vue";
import distributePrice from "@/components/pintuan/pintuanPlugin/distributePrice.vue"
export default { export default {
components: { components: {
ChooseImg, ChooseImg,
goodsSpe, goodsSpe,
ladderGroup choiceGood
}, },
data() { data() {
return { return {
activeName: "second", ckGoods: 0,
isShowGoods: false, //是否显示商品
activeName: "first",
addMsg: { addMsg: {
start_time: '', //开始时间 ActivityId: 0, //活动Id
end_time: '', //结束时间 StartTime: '', //开始时间
EndTime: '', //结束时间
GoodId: 0, //商品编号
name: '', //商品名称 name: '', //商品名称
status: 0, //上架状态 GoodsStatus: 0, //上架状态(0-未开始，1-上架,2-下架中,3-删除)
Sort: 100, //排序 Sort: 100, //排序
price: 0, //售价 SellingPrice: 0, //售价
original_price: 0, //原价 Original_Price: 0, //原价
goods_num: 0, //库存 Goods_Stock: 0, //商品总库存
goods_stock: 0, //商品总库存 Goods_unit: "", // 商品规格字段
attr_default_name: '', //默认规格名 Goods_no: '', //商品货号
// 商品规格字段 Goods_weight: '', //商品重量
goods_no: '', //商品货号 Is_Auto_Add_Robot: 0, //是否开启虚拟团
goods_weight: '', //商品重量 Virtual_Sales: 0, //已团商品数
is_auto_add_robot: 0, //是否开启虚拟团 Is_Alone_Buy: 0, //是否允许单独购买
virtual_sales: 0, //已团商品数 IsDefaultService: 1, //是否默认商品服务(1是,2否)
is_alone_buy: 0, //是否允许单独购买 GoodsService: [], //商品服务字段
Service: [], //商品服务字段 FreightId: 0, //运费设置
freight: '', //运费设置 FormsId: 0, //自定义表单
form: '', //自定义表单 Confine_Count: -1, //限购数量
confine_count: -1, //限购数量 Confine_Order_Count: -1, //限购订单
confine_order_count: -1, //限购订单 Pieces: 0, //单品满件包邮
pieces: 0, //单品满件包邮 Forehead: 0, //单品满额包邮
forehead: 0, //单品满额包邮 Is_Area_Limit: 0, //区域购买
is_area_limit: 0, //区域购买 Area_limit: "", //购买区域
Give_integral: 0, //积分赠送
give_integral: 0, //积分赠送 Give_integral_type: 1, //积分赠送=>1固定值 2百分比
give_integral_type: 1, //积分赠送=>1固定值 2百分比 Is_forehead_integral: 0, //积分抵扣
forehead_integral: 0, //积分抵扣 Forehead_integral_type: 1, //积分抵扣=>1固定值 2百分比
forehead_integral_type: 1, //积分抵扣=>1固定值 2百分比 Accumulative: 0, //允许多件累计抵扣
accumulative: 0, //允许多件累计抵扣 CardIds: [], //卡券发放
cards: [], //卡券发放 App_share_title: '', //自定义分享标题、
app_share_title: '', //自定义分享标题、 App_share_pic: '', //自定义分享图片
app_share_pic: '', //自定义分享图片
}, },
attr_groups: [], SpecificationList:[],//规格列表
new_attr_groups: [],
rules: { rules: {
// Name: [{
// required: true,
// message: "请输入商品名称",
// trigger: "blur"
// }]
}, },
}; };
}, },
created() {}, created() {},
mounted() { mounted() {
// if (this.$route.query.GoodsId) { if (this.$route.query.Id) {
// this.GoodsId = this.$route.query.GoodsId; this.addMsg.ActivityId = this.$route.query.Id;
// this.getData(); this.getData();
// } }
}, },
methods: { methods: {
//点击checkbox是否限购商品 //点击checkbox是否限购商品
itemChecked(type) { itemChecked(type) {
this.addMsg.confine_count = type ? -1 : 0; this.addMsg.Confine_Count = type ? -1 : 0;
}, },
//点击checkbox是否限购订单 //点击checkbox是否限购订单
itemOrderChecked(type) { itemOrderChecked(type) {
this.addMsg.confine_order_count = type ? -1 : 0; this.addMsg.Confine_Order_Count = type ? -1 : 0;
}, },
}, //保存拼团活动
watch: { SaveActivity() {
attr_groups: { this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
handler: function (data) { console.log("res", res);
this.new_attr_groups = JSON.parse(JSON.stringify(data)); if (res.data.resultCode == 1) {
if (this.new_attr_groups.length === 0) {
this.new_attr_groups = [{
attr_group_id: 1,
attr_group_name: "规格",
attr_list: {
attr_id: 0,
attr_name: '默认',
pic_url: '',
},
}]
} }
}, })
deep: true, },
immediate: true //选择商品
getGoodsChoice() {
this.isShowGoods = false;
var chooseGoods = this.$refs.choiceGood.getChoicedGoods();
console.log("chooseGoods",chooseGoods);
if(chooseGoods&&chooseGoods.length>0)
{
this.addMsg.GoodId=chooseGoods[0].Id;
this.addMsg.name=chooseGoods[0].Name;
this.addMsg.Sort=chooseGoods[0].Sort;
this.addMsg.SellingPrice=chooseGoods[0].SellingPrice;
this.addMsg.Original_Price=chooseGoods[0].OriginalPrice;
this.addMsg.Goods_Stock=chooseGoods[0].InventoryNum;
this.addMsg.Goods_unit=chooseGoods[0].DefaultSpecificationName;
this.addMsg.Goods_no=chooseGoods[0].GoodsNumbers;
this.addMsg.Goods_weight=chooseGoods[0].GoodsWeight;
this.SpecificationList=choiceGood[0].SpecificationList;
}
this.$refs.choiceGood.toggleSelection();
} }
} }
}; };
......
src/components/pintuan/pintuanList.vue
View file @ fe91f926
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Goods_stock" label="库存"> <el-table-column prop="Goods_Stock" label="库存">
</el-table-column> </el-table-column>
<el-table-column label="活动时间"> <el-table-column label="活动时间">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
this.loading = true; this.loading = true;
this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => { this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => {
this.loading = false; this.loading = false;
console.log("res", res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
let pageData = res.data.data.pageData; let pageData = res.data.data.pageData;
......
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
View file @ fe91f926
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
padding: 10px; padding: 10px;
} }
.speciDig .tpl-box { .speciDig .tpl-box {
width: 300px; width: 300px;
height: 440px; height: 440px;
} }
.speciDig .tpl-box .tpl-head { .speciDig .tpl-box .tpl-head {
padding: 0 20px; padding: 0 20px;
font-size: 15px; font-size: 15px;
...@@ -36,11 +38,13 @@ ...@@ -36,11 +38,13 @@
margin-bottom: 10px; margin-bottom: 10px;
line-height: 44px; line-height: 44px;
background: #f5f7fa; background: #f5f7fa;
} }
.speciDig .tpl-scrollbar {
.speciDig .tpl-scrollbar {
height: calc(440px - 44px - 10px); height: calc(440px - 44px - 10px);
} }
.speciDig .tpl-scrollbar .el-checkbox {
.speciDig .tpl-scrollbar .el-checkbox {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
...@@ -48,35 +52,39 @@ ...@@ -48,35 +52,39 @@
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 0; padding: 10px 0;
} }
.goodsSpecifica .app-attr-group .attr-list {
.goodsSpecifica .app-attr-group .attr-list {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
position: relative; position: relative;
} }
.goodsSpecifica .app-attr-group .close {
.goodsSpecifica .app-attr-group .close {
position: absolute; position: absolute;
top: -4px; top: -4px;
right: -4px; right: -4px;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.goodsSpecifica .box-grow-0 {
.goodsSpecifica .box-grow-0 {
min-width: 0; min-width: 0;
-webkit-box-flex: 0; -webkit-box-flex: 0;
flex-grow: 0; flex-grow: 0;
flex-shrink: 0; flex-shrink: 0;
} }
.goodsSpecifica .app-attr-group .img-box {
.goodsSpecifica .app-attr-group .img-box {
position: relative; position: relative;
height: 100px; height: 100px;
width: 100px; width: 100px;
margin-top: 8px; margin-top: 8px;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
} }
.goodsSpecifica .app-attr-group .attr-jt { .goodsSpecifica .app-attr-group .attr-jt {
background: #ffffff; background: #ffffff;
width: 6px; width: 6px;
height: 6px; height: 6px;
...@@ -89,7 +97,8 @@ ...@@ -89,7 +97,8 @@
-ms-transform: rotate(-45deg); -ms-transform: rotate(-45deg);
position: absolute; position: absolute;
top: -5px; top: -5px;
} }
</style> </style>
<template> <template>
<div> <div>
...@@ -254,7 +263,8 @@ ...@@ -254,7 +263,8 @@
<script> <script>
import ChooseImg from "@/components/global/ChooseImg.vue"; import ChooseImg from "@/components/global/ChooseImg.vue";
export default { export default {
components:{ props: ['SpecList'],
components: {
ChooseImg ChooseImg
}, },
data() { data() {
...@@ -278,14 +288,12 @@ ...@@ -278,14 +288,12 @@
speciList: [], speciList: [],
DropdownList: [], DropdownList: [],
huiyList: [], huiyList: [],
SeparateDistributionType: 1, //待传递给父组件
SeparateDistributionType: 1, //待传递给父组件 EnjoyMember: 1, //待传父组件
EnjoyMember: 1, //待传父组件
}; };
}, },
created() { created() {
console.log("SpecificationList",this.SpecificationList);
}, },
methods: { methods: {
// 添加规格模板 // 添加规格模板
...@@ -665,12 +673,12 @@ ...@@ -665,12 +673,12 @@
}); });
}, },
CheckBox(val) { CheckBox(val) {
console.log(val,'valll'); console.log(val, 'valll');
}, },
}, },
mounted() { mounted() {
this.getSpeciList(); this.getSpeciList();
} }
}; };
......
src/components/sallCenter/plugin/goods.vue
View file @ fe91f926
...@@ -542,9 +542,9 @@ ...@@ -542,9 +542,9 @@
</el-dialog> </el-dialog>
<!-- 选择商品 --> <!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog"> <el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" :ckGoods="ckGoods"></choiceGood> <choiceGood ref="choiceGood" ></choiceGood>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="quxiaoGoods()">取 消</el-button> <el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button> <el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
......
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