Commit e0b9430e authored by 黄奎's avatar 黄奎

页面修改

parent 2f3d5591
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
}; };
}, },
created() { created() {
console.log("this.IsGetSpec", this.IsGetSpec)
if (this.IsGetSpec) { if (this.IsGetSpec) {
this.msg.IsGetSpec = this.IsGetSpec; this.msg.IsGetSpec = this.IsGetSpec;
} }
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
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;
......
...@@ -107,17 +107,17 @@ ...@@ -107,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>
...@@ -128,7 +128,9 @@ ...@@ -128,7 +128,9 @@
<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">
...@@ -337,7 +339,6 @@ ...@@ -337,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>
...@@ -353,9 +354,7 @@ ...@@ -353,9 +354,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane lebel="阶梯团设置"> <el-tab-pane lebel="阶梯团设置">
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-row> </el-row>
</el-form> </el-form>
...@@ -429,6 +428,7 @@ ...@@ -429,6 +428,7 @@
App_share_title: '', //自定义分享标题、 App_share_title: '', //自定义分享标题、
App_share_pic: '', //自定义分享图片 App_share_pic: '', //自定义分享图片
}, },
SpecificationList:[],//规格列表
rules: { rules: {
}, },
...@@ -462,26 +462,22 @@ ...@@ -462,26 +462,22 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
this.isShowGoods = false; this.isShowGoods = false;
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var chooseGoods = this.$refs.choiceGood.getChoicedGoods();
console.log("ckedArr", ckedArr); console.log("chooseGoods",chooseGoods);
// var myArray = []; if(chooseGoods&&chooseGoods.length>0)
// if (ckedArr && ckedArr.length > 0) { {
// ckedArr.forEach(element => { this.addMsg.GoodId=chooseGoods[0].Id;
// myArray.push({ this.addMsg.name=chooseGoods[0].Name;
// id: element.Id, this.addMsg.Sort=chooseGoods[0].Sort;
// name: element.Name, this.addMsg.SellingPrice=chooseGoods[0].SellingPrice;
// picUrl: element.CoverImage, this.addMsg.Original_Price=chooseGoods[0].OriginalPrice;
// price: element.SellingPrice 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;
// if (this.comIndex !== null) { this.SpecificationList=choiceGood[0].SpecificationList;
// this.data.catList[this.comIndex].goodsList = this.data.catList[this.comIndex].goodsList.concat(myArray); }
// } else { this.$refs.choiceGood.toggleSelection();
// this.data.list = this.data.list.concat(myArray);
// }
//
// this.$refs.choiceGood.toggleSelection();
} }
} }
}; };
......
...@@ -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();
} }
}; };
......
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