Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
ElectricitySheep
Commits
e0b9430e
Commit
e0b9430e
authored
Aug 11, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2f3d5591
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
53 deletions
+55
-53
choiceGood.vue
src/components/common/choiceGood.vue
+0
-2
pintuanActive.vue
src/components/pintuan/pintuanActive.vue
+23
-27
goodsSpecifica.vue
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
+32
-24
No files found.
src/components/common/choiceGood.vue
View file @
e0b9430e
...
...
@@ -60,7 +60,6 @@
};
},
created
()
{
console
.
log
(
"this.IsGetSpec"
,
this
.
IsGetSpec
)
if
(
this
.
IsGetSpec
)
{
this
.
msg
.
IsGetSpec
=
this
.
IsGetSpec
;
}
...
...
@@ -68,7 +67,6 @@
methods
:
{
//获取所有菜单
getList
()
{
this
.
apipost
(
"/api/product/GetProductGoodsDialogList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
...
...
src/components/pintuan/pintuanActive.vue
View file @
e0b9430e
...
...
@@ -107,17 +107,17 @@
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
</
template
>
<el-input
v-model=
"addMsg.
original_p
rice"
type=
"number"
:disabled=
"true"
min=
"1"
size=
"small"
<el-input
v-model=
"addMsg.
Original_P
rice"
type=
"number"
:disabled=
"true"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-button
slot=
"append"
>
元
</el-button>
</el-input>
</el-form-item>
<el-form-item
label=
"商品总库存"
>
<el-input
v-model=
"addMsg.
goods_s
tock"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-input
v-model=
"addMsg.
Goods_S
tock"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
</el-input>
</el-form-item>
<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"
>
</el-input>
</el-form-item>
...
...
@@ -128,7 +128,9 @@
<i
class=
"elzk el-tooltip el-icon-info"
></i>
</el-tooltip>
</
template
>
<goodsSpe></goodsSpe>
<goodsSpe
:SpecList=
"SpecificationList"
>
</goodsSpe>
</el-form-item>
<el-form-item
label=
"商品货号"
>
<el-input
v-model=
"addMsg.Goods_no"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
...
...
@@ -337,7 +339,6 @@
<el-button
size=
"mini"
>
选择图片
</el-button>
</el-tooltip>
<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>
</div>
<el-button
type=
"text"
>
查看图例
</el-button>
...
...
@@ -353,9 +354,7 @@
</el-tab-pane>
<el-tab-pane
lebel=
"阶梯团设置"
>
</el-tab-pane>
</el-tabs>
</el-row>
</el-form>
...
...
@@ -429,6 +428,7 @@
App_share_title
:
''
,
//自定义分享标题、
App_share_pic
:
''
,
//自定义分享图片
},
SpecificationList
:[],
//规格列表
rules
:
{
},
...
...
@@ -462,26 +462,22 @@
//选择商品
getGoodsChoice
()
{
this
.
isShowGoods
=
false
;
var
ckedArr
=
this
.
$refs
.
choiceGood
.
getChoicedGoods
();
console
.
log
(
"ckedArr"
,
ckedArr
);
// var myArray = [];
// if (ckedArr && ckedArr.length > 0) {
// ckedArr.forEach(element => {
// myArray.push({
// id: element.Id,
// name: element.Name,
// picUrl: element.CoverImage,
// price: element.SellingPrice
// });
// });
// }
// if (this.comIndex !== null) {
// this.data.catList[this.comIndex].goodsList = this.data.catList[this.comIndex].goodsList.concat(myArray);
// } else {
// this.data.list = this.data.list.concat(myArray);
// }
//
// this.$refs.choiceGood.toggleSelection();
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/pintuanPlugin/goodsSpecifica.vue
View file @
e0b9430e
...
...
@@ -25,10 +25,12 @@
border
:
1px
solid
#ebeef5
;
padding
:
10px
;
}
.speciDig
.tpl-box
{
width
:
300px
;
height
:
440px
;
}
}
.speciDig
.tpl-box
.tpl-head
{
padding
:
0
20px
;
font-size
:
15px
;
...
...
@@ -36,11 +38,13 @@
margin-bottom
:
10px
;
line-height
:
44px
;
background
:
#f5f7fa
;
}
.speciDig
.tpl-scrollbar
{
}
.speciDig
.tpl-scrollbar
{
height
:
calc
(
440px
-
44px
-
10px
);
}
.speciDig
.tpl-scrollbar
.el-checkbox
{
}
.speciDig
.tpl-scrollbar
.el-checkbox
{
display
:
-webkit-box
;
display
:
-ms-flexbox
;
display
:
flex
;
...
...
@@ -48,35 +52,39 @@
-ms-flex-align
:
center
;
align-items
:
center
;
padding
:
10px
0
;
}
.goodsSpecifica
.app-attr-group
.attr-list
{
}
.goodsSpecifica
.app-attr-group
.attr-list
{
display
:
inline-block
;
margin-right
:
10px
;
margin-bottom
:
10px
;
position
:
relative
;
}
.goodsSpecifica
.app-attr-group
.close
{
}
.goodsSpecifica
.app-attr-group
.close
{
position
:
absolute
;
top
:
-4px
;
right
:
-4px
;
font-size
:
16px
;
cursor
:
pointer
;
}
.goodsSpecifica
.box-grow-0
{
}
.goodsSpecifica
.box-grow-0
{
min-width
:
0
;
-webkit-box-flex
:
0
;
flex-grow
:
0
;
flex-shrink
:
0
;
}
.goodsSpecifica
.app-attr-group
.img-box
{
}
.goodsSpecifica
.app-attr-group
.img-box
{
position
:
relative
;
height
:
100px
;
width
:
100px
;
margin-top
:
8px
;
border
:
1px
solid
#ebeef5
;
}
}
.goodsSpecifica
.app-attr-group
.attr-jt
{
.goodsSpecifica
.app-attr-group
.attr-jt
{
background
:
#ffffff
;
width
:
6px
;
height
:
6px
;
...
...
@@ -89,7 +97,8 @@
-ms-transform
:
rotate
(
-45deg
);
position
:
absolute
;
top
:
-5px
;
}
}
</
style
>
<
template
>
<div>
...
...
@@ -254,7 +263,8 @@
<
script
>
import
ChooseImg
from
"@/components/global/ChooseImg.vue"
;
export
default
{
components
:{
props
:
[
'SpecList'
],
components
:
{
ChooseImg
},
data
()
{
...
...
@@ -278,14 +288,12 @@
speciList
:
[],
DropdownList
:
[],
huiyList
:
[],
SeparateDistributionType
:
1
,
//待传递给父组件
EnjoyMember
:
1
,
//待传父组件
SeparateDistributionType
:
1
,
//待传递给父组件
EnjoyMember
:
1
,
//待传父组件
};
},
created
()
{
console
.
log
(
"SpecificationList"
,
this
.
SpecificationList
);
},
methods
:
{
// 添加规格模板
...
...
@@ -665,12 +673,12 @@
});
},
CheckBox
(
val
)
{
console
.
log
(
val
,
'valll'
);
console
.
log
(
val
,
'valll'
);
},
},
mounted
()
{
this
.
getSpeciList
();
this
.
getSpeciList
();
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment