Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
af7cf9b1
Commit
af7cf9b1
authored
Nov 01, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商品
parent
12e38e9f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
171 additions
and
243 deletions
+171
-243
BuyingAdd.vue
src/components/Buying/BuyingAdd.vue
+120
-171
BuyingList.vue
src/components/Buying/BuyingList.vue
+25
-44
BuyingType.vue
src/components/Buying/BuyingType.vue
+15
-25
index.js
src/plug/index.js
+1
-1
config.js
src/router/config.js
+10
-2
No files found.
src/components/
activity
/BuyingAdd.vue
→
src/components/
Buying
/BuyingAdd.vue
View file @
af7cf9b1
...
@@ -197,73 +197,51 @@
...
@@ -197,73 +197,51 @@
.addIntegralMall
.ql-editor
{
.addIntegralMall
.ql-editor
{
min-height
:
200px
;
min-height
:
200px
;
}
}
.heightauto.el-select
.el-input
{
height
:
auto
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<el-row
class=
"addIntegralMall"
>
<el-row
class=
"addIntegralMall"
>
<el-col
:span=
"9"
>
<el-col
:span=
"9"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<span
class=
"resource-lititle"
>
基本信息
</span>
<span
class=
"resource-lititle"
>
基本信息
</span>
<el-form-item
label=
"商品名称"
prop=
"
n
ame"
>
<el-form-item
label=
"商品名称"
prop=
"
N
ame"
>
<el-input
v-model=
"addMsg.
n
ame"
class=
"w217"
/>
<el-input
v-model=
"addMsg.
N
ame"
class=
"w217"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"购买等级要求"
>
<el-form-item
label=
"商品类型"
prop=
"SellType"
>
<el-select
filterable
v-model=
"addMsg.isReqRate"
>
<el-select
filterable
v-model=
"addMsg.SellType"
>
<el-option
label=
"不限"
:value=
"-0"
:key=
"0"
></el-option>
<el-option
<el-option
v-for=
"item in MenberList"
v-for=
"item in CommodityTypeList"
:label=
"item.name"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
:value=
"item.id"
:key=
"item.id"
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品价格"
prop=
"price"
>
<el-form-item
label=
"商品分类"
prop=
"CategoryId"
>
<el-input
v-model=
"addMsg.price"
class=
"w217"
/>
<el-select
filterable
v-model=
"addMsg.CategoryId"
>
</el-form-item>
<el-form-item
label=
"价格单位"
prop=
"priceUnit"
>
<el-select
filterable
v-model=
"addMsg.priceUnit"
>
<el-option
label=
"积分"
:value=
"0"
:key=
"0"
></el-option>
<el-option
label=
"人民币"
:value=
"1"
:key=
"1"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"市场价格"
prop=
"marketPrice"
>
<el-input
v-model=
"addMsg.marketPrice"
class=
"w217"
/>
</el-form-item>
<el-form-item
label=
"限购"
>
<el-input
v-model=
"addMsg.quota"
class=
"w217"
/>
</el-form-item>
<p
class=
"tips"
style=
"padding-left: 130px; font-size: 12px;"
>
0为不限购
</p>
<el-form-item
label=
"商品类型"
prop=
"state"
>
<el-select
filterable
v-model=
"addMsg.type"
>
<el-option
<el-option
v-for=
"item in GoodsTypeList"
v-for=
"item in GoodsTypeList"
:label=
"item.name"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
:value=
"item.id"
:key=
"item.id"
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
商品数量"
prop=
"storeNum
"
>
<el-form-item
label=
"
成本价"
prop=
"CostPrice
"
>
<el-input
v-model=
"addMsg.
storeNum
"
class=
"w217"
/>
<el-input
v-model=
"addMsg.
CostPrice
"
class=
"w217"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品状态"
>
<el-form-item
label=
"销售价"
prop=
"SellPrice"
>
<el-select
filterable
v-model=
"addMsg.state"
>
<el-input
v-model=
"addMsg.SellPrice"
class=
"w217"
/>
<el-option
label=
"上架"
:value=
"1"
:key=
"1"
></el-option>
<el-option
label=
"下架"
:value=
"0"
:key=
"0"
></el-option>
<el-option
label=
"删除"
:value=
"-1"
:key=
"-1"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
包装说明
"
>
<el-form-item
label=
"
领队返佣金额"
prop=
"LeaderRebate
"
>
<el-input
v-model=
"addMsg.
packing
"
class=
"w217"
/>
<el-input
v-model=
"addMsg.
LeaderRebate
"
class=
"w217"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
商品所属活动
"
>
<el-form-item
label=
"
公司返佣金额"
prop=
"CompanyRebate
"
>
<el-
select
filterable
v-model=
"addMsg.ishot"
>
<el-
input
v-model=
"addMsg.CompanyRebate"
class=
"w217"
/
>
<el-option
label=
"无"
:value=
"0"
:key=
"0"
></el-option
>
</el-form-item
>
<el-option
v-for=
"item in GoodsSeriesList"
:label=
"item.name"
:value=
"item.id"
:key=
"item.id"
></el-option
>
<el-form-item
label=
"同行返佣金额"
prop=
"ClientRebate"
>
<
/el-select
>
<
el-input
v-model=
"addMsg.ClientRebate"
class=
"w217"
/
>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
配送说明
"
>
<el-form-item
label=
"
微途返佣金额"
prop=
"WeiTuRebate
"
>
<el-input
v-model=
"addMsg.
logistic
"
class=
"w217"
/>
<el-input
v-model=
"addMsg.
WeiTuRebate
"
class=
"w217"
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</el-col>
</el-col>
...
@@ -319,63 +297,25 @@
...
@@ -319,63 +297,25 @@
</div>
</div>
<p
class=
"tips tips2"
>
最多上传5张图片
</p>
<p
class=
"tips tips2"
>
最多上传5张图片
</p>
<span
class=
"resource-lititle resource-lititle2"
>
商品描述
</span>
<span
class=
"resource-lititle resource-lititle2"
>
商品描述
</span>
<el-input
type=
"textarea"
:rows=
"2"
v-model=
"addMsg.Description"
class=
"w217"
/>
<my-edit
v-on:edit-value=
"addMsg.description = arguments[0]"
v-bind:editValue=
"addMsg.description"
<span
class=
"resource-lititle resource-lititle2"
>
商品说明
</span>
<el-select
v-model=
"addMsg.ExplainList"
multiple
placeholder=
"请选择"
class=
"heightauto"
>
<el-option
v-for=
"item in CommodityExplainList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
<span
class=
"resource-lititle resource-lititle2"
>
商品详情
</span>
<my-edit
v-on:edit-value=
"addMsg.Content = arguments[0]"
v-bind:editValue=
"addMsg.Content"
v-bind:toolbarShow=
"toolbar"
v-bind:placeholder=
"placeholder"
></my-edit>
v-bind:toolbarShow=
"toolbar"
v-bind:placeholder=
"placeholder"
></my-edit>
<!--
<span
class=
"resource-lititle resource-lititle2"
>
图片介绍
</span>
<div
class=
"resource-imglist clearfix"
>
<div
class=
"re-img re-img2"
v-for=
"(item,index) in DiningImageArray2"
:key=
"index"
>
<img
v-if=
"!item"
src=
"../../assets/img/bg_c3@3x.png"
>
<img
:src=
"item"
:onerror=
"defaultImg"
>
<div
class=
"imgzhe"
>
<div
class=
"re-delte"
>
<i
@
click
.
stop=
"showImg(item)"
class=
"iconfont icon-img_cz"
></i>
</div>
<div
class=
"re-delte"
@
click=
"delImg(index, 2)"
>
<i
class=
"iconfont icon-xingzhuang"
></i>
</div>
<div
class=
"re-delte"
@
click
.
stop=
"ExchangeImg(index,0)"
v-if=
"index!=0&&item"
>
<i
class=
"iconfont icon-zuoyi"
></i>
</div>
<div
class=
"re-delte"
@
click
.
stop=
"ExchangeImg(index,1)"
v-if=
"index!=DiningImageArray2.length-1&&item"
>
<i
class=
"iconfont icon-youyi"
></i>
</div>
</div>
</div>
</div>
<div
class=
"add-img"
v-if=
"DiningImageArray2.length
<5
"
>
<div
class=
"reimg-add"
>
<i
class=
"iconfont icon-img_haha bigAdd"
></i>
<div
class=
"ad-one"
>
<div
class=
"re-upload"
>
<el-upload
:http-request=
"UploadImage2"
:multiple=
"true"
accept=
"image/jpeg, image/gif, image/png, image/bmp"
:show-file-list=
"false"
action
>
<i
class=
"iconfont icon-img_bdsc"
></i>
</el-upload>
</div>
</div>
</div>
</div>
-->
</div>
</div>
<div
class=
"bottom_sub"
>
<div
class=
"bottom_sub"
>
<button
<button
class=
"hollowFixedBtn"
class=
"hollowFixedBtn"
@
click=
"goIntegralMall('
IntegralMall
')"
@
click=
"goIntegralMall('
BuyingList
')"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
</div>
</div>
...
@@ -418,25 +358,25 @@ export default {
...
@@ -418,25 +358,25 @@ export default {
}
}
},
},
addMsg
:
{
addMsg
:
{
id
:
0
,
Id
:
0
,
name
:
""
,
Name
:
""
,
type
:
""
,
CoverImg
:
""
,
images
:
""
,
CategoryId
:
""
,
price
:
""
,
CostPrice
:
""
,
priceUnit
:
0
,
SellPrice
:
0
,
marketPrice
:
""
,
SellType
:
""
,
isReqRate
:
""
,
ExplainList
:
""
,
description
:
""
,
FlowImgList
:
""
,
packing
:
""
,
Description
:
""
,
logistic
:
""
,
Content
:
""
,
state
:
1
,
LeaderRebate
:
1
,
quota
:
0
,
CompanyRebate
:
0
,
ishot
:
0
,
ClientRebate
:
0
,
descripImg
:
''
,
WeiTuRebate
:
''
,
storeNum
:
''
},
},
MenberList
:
[],
MenberList
:
[],
GoodsTypeList
:
[],
GoodsTypeList
:
[],
CommodityTypeList
:
[],
rules
:
{
rules
:
{
memberLevel
:
[
memberLevel
:
[
{
required
:
true
,
message
:
"请输入会员等级"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请输入会员等级"
,
trigger
:
"blur"
}
...
@@ -460,21 +400,29 @@ export default {
...
@@ -460,21 +400,29 @@ export default {
},
},
//上传的文件数组
//上传的文件数组
DiningImageArray
:
[],
DiningImageArray
:
[],
DiningImageArray2
:
[],
imageOptions
:
{
imageOptions
:
{
navbar
:
false
,
navbar
:
false
,
title
:
false
title
:
false
},
},
images
:
[],
images
:
[],
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/bg_z1@2x.png"
)
+
'"'
,
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/bg_z1@2x.png"
)
+
'"'
,
apiUrl
:
'addGoodsInfo'
,
GoodsSeriesList
:
[],
GoodsSeriesList
:
[],
CommodityExplainList
:
[],
};
};
},
},
components
:
{
components
:
{
"my-edit"
:
MyEdit
"my-edit"
:
MyEdit
},
},
methods
:
{
methods
:
{
getDetails
(
id
){
this
.
apipost
(
"Shop_post_GetCommodityInfo"
,
{
CommodityId
:
id
},
r
=>
{
if
(
r
.
data
.
resultCode
===
1
)
{
this
.
addMsg
=
r
.
data
.
data
this
.
DiningImageArray
=
this
.
addMsg
.
FlowImgList
this
.
$forceUpdate
()
}
},
null
)
},
getGoodsSeries
()
{
getGoodsSeries
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apiJavaPost
(
this
.
apiJavaPost
(
...
@@ -515,33 +463,22 @@ export default {
...
@@ -515,33 +463,22 @@ export default {
newArr
.
push
(
file
.
file
);
newArr
.
push
(
file
.
file
);
let
fileName
=
file
.
file
.
name
;
let
fileName
=
file
.
file
.
name
;
var
path
=
"/Upload/DMC/"
;
var
path
=
"/Upload/DMC/"
;
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
//统一图片处理
//统一图片处理
if
(
this
.
DiningImageArray
.
length
===
5
)
{
return
this
.
$message
.
error
(
'最多上传5张图片'
)
}
var
obj
=
{}
var
obj
=
{}
var
str
=
x
.
data
.
FilePath
;
var
str
=
x
.
data
.
FilePath
;
var
imgUrl
=
this
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
var
imgUrl
=
this
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
this
.
DiningImageArray
.
push
(
imgUrl
);
this
.
DiningImageArray
.
push
(
imgUrl
);
});
});
},
},
UploadImage2
(
file
)
{
let
newArr
=
[];
newArr
.
push
(
file
.
file
);
let
fileName
=
file
.
file
.
name
;
var
path
=
"/Upload/DMC/"
;
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
//统一图片处理
var
obj
=
{}
var
str
=
x
.
data
.
FilePath
;
var
imgUrl
=
this
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
this
.
DiningImageArray2
.
push
(
imgUrl
);
});
},
//删除图片
//删除图片
delImg
(
index
,
type
)
{
delImg
(
index
,
type
)
{
//更新图片
//更新图片
if
(
type
)
{
if
(
type
)
{
var
item
=
this
.
DiningImageArray2
[
index
];
this
.
DiningImageArray2
.
splice
(
index
,
1
);
}
else
{
}
else
{
var
item
=
this
.
DiningImageArray
[
index
];
var
item
=
this
.
DiningImageArray
[
index
];
this
.
DiningImageArray
.
splice
(
index
,
1
);
this
.
DiningImageArray
.
splice
(
index
,
1
);
...
@@ -564,20 +501,6 @@ export default {
...
@@ -564,20 +501,6 @@ export default {
}
}
this
.
$viewer
.
show
();
this
.
$viewer
.
show
();
},
},
getGoodsTypeManager
:
function
()
{
this
.
apiJavaPost
(
"/api/IntegralManager/goodsTypeManager"
,
{
reqType
:
"find"
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
GoodsTypeList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
getMenberList
:
function
()
{
getMenberList
:
function
()
{
let
msg
=
{
let
msg
=
{
state
:
1
,
state
:
1
,
...
@@ -607,23 +530,13 @@ export default {
...
@@ -607,23 +530,13 @@ export default {
});
});
},
},
addIntegralMall
:
function
()
{
addIntegralMall
:
function
()
{
let
imgStr
=
''
,
imgStr2
=
''
;
this
.
addMsg
.
FlowImgList
=
this
.
DiningImageArray
for
(
let
i
=
0
;
i
<
this
.
DiningImageArray
.
length
;
i
++
)
{
this
.
apipost
(
"Shop_post_SetCommodityInfo"
,
this
.
addMsg
,
imgStr
+=
`
${
this
.
DiningImageArray
[
i
]}
,`
}
for
(
let
i
=
0
;
i
<
this
.
DiningImageArray2
.
length
;
i
++
)
{
imgStr2
+=
`
${
this
.
DiningImageArray2
[
i
]}
,`
}
this
.
addMsg
.
images
=
imgStr
.
substring
(
0
,
imgStr
.
length
-
1
)
this
.
addMsg
.
descripImg
=
imgStr2
.
substring
(
0
,
imgStr2
.
length
-
1
)
this
.
apiJavaPost
(
"/api/IntegralManager/"
+
this
.
apiUrl
,
this
.
addMsg
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
goIntegralMall
(
"
IntegralMall
"
);
this
.
goIntegralMall
(
"
BuyingList
"
);
},
1000
);
},
1000
);
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -631,22 +544,58 @@ export default {
...
@@ -631,22 +544,58 @@ export default {
},
},
null
null
);
);
}
},
getGoodsTypeManager
()
{
this
.
apipost
(
"Shop_post_GetCommodityCategoryList"
,{
Name
:
""
,
ParentId
:
0
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
GoodsTypeList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
getCommodityTypeList
()
{
this
.
apipost
(
"Shop_post_GetCommodityTypeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
CommodityTypeList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
getCommodityExplainList
()
{
this
.
apipost
(
"Shop_post_GetCommodityExplainList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
let
CommodityExplainList
=
[];
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
res
.
data
.
data
[
i
].
Id
=
parseInt
(
res
.
data
.
data
[
i
].
Id
)
CommodityExplainList
.
push
(
res
.
data
.
data
[
i
])
}
this
.
CommodityExplainList
=
CommodityExplainList
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
},
},
mounted
()
{
mounted
()
{
let
id
=
this
.
$route
.
query
.
proId
let
obj
=
localStorage
.
editIntegralMall
?
JSON
.
parse
(
localStorage
.
editIntegralMall
)
:
false
this
.
getDetails
(
id
)
if
(
obj
)
{
this
.
getCommodityTypeList
();
this
.
addMsg
=
obj
this
.
apiUrl
=
'updateGoodsInfo'
if
(
obj
.
images
)
{
this
.
DiningImageArray
=
obj
.
images
.
split
(
','
)
this
.
DiningImageArray2
=
obj
.
descripImg
.
split
(
','
)
}
}
this
.
getMenberList
();
this
.
getGoodsTypeManager
();
this
.
getGoodsTypeManager
();
this
.
get
GoodsSeries
();
this
.
get
CommodityExplainList
();
}
}
};
};
</
script
>
</
script
>
src/components/
activity
/BuyingList.vue
→
src/components/
Buying
/BuyingList.vue
View file @
af7cf9b1
...
@@ -37,14 +37,16 @@
...
@@ -37,14 +37,16 @@
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.Status"
>
<el-select
filterable
v-model=
"msg.Status"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<el-option
label=
"展示"
:value=
"0"
></el-option>
<el-option
label=
"待完善"
:value=
"1"
></el-option>
<el-option
label=
"不展示"
:value=
"1"
></el-option>
<el-option
label=
"上架"
:value=
"2"
></el-option>
<el-option
label=
"下架"
:value=
"3"
></el-option>
<el-option
label=
"取消"
:value=
"4"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
>
<input
type=
"button"
@
click=
"addIntegralMall('
addIntegralMall', '', $t('MarketingActi.addComm')
)"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
>
<input
type=
"button"
@
click=
"addIntegralMall('
BuyingAdd'
)"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -69,21 +71,27 @@
...
@@ -69,21 +71,27 @@
<td>
{{
item
.
Name
}}
</td>
<td>
{{
item
.
Name
}}
</td>
<td>
{{
item
.
CategoryName
}}
</td>
<td>
{{
item
.
CategoryName
}}
</td>
<td>
{{
item
.
SellTypeName
}}
</td>
<td>
{{
item
.
SellTypeName
}}
</td>
<td>
{{
item
.
price
}}{{
item
.
priceUnit
===
1
?
'人民币'
:
'积分'
}}
</td>
<td>
{{
item
.
CostPrice
}}
</td>
<td>
{{
item
.
market
Price
}}
</td>
<td>
{{
item
.
Sell
Price
}}
</td>
<td>
{{
item
.
quota
===
0
?
'不限购'
:
`限购${item.quota
}
次`
}}
<
/td
>
<td>
{{
item
.
LeaderRebate
}}
</td>
<
td
>
{{
item
.
logistic
}}
<
/td
>
<td>
{{
item
.
CompanyRebate
}}
</td>
<
td
>
{{
getHotName
(
item
.
ishot
)
}}
<
/td
>
<td>
{{
item
.
ClientRebate
}}
</td>
<
td
>
{{
item
.
state
===
1
?
'上架'
:
item
.
state
===
0
?
'下架'
:
'删除'
}}
<
/td
>
<td>
{{
item
.
WeiTuRebate
}}
</td>
<td>
<td>
<el-button-group>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_editInfo')"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_editInfo')"
placement=
"top"
>
<
el
-
button
<el-button
type=
"primary"
size=
"mini"
icon=
"el-icon-edit"
@
click=
"addIntegralMall('BuyingAdd', item.Id, '修改商品')"
></el-button>
type
=
"primary"
icon
=
"el-icon-edit"
circle
@
click
=
"addIntegralMall('addIntegralMall', item, '修改商品')"
><
/el-button
>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"上架"
placement=
"top"
>
<el-button
type=
"success"
size=
"mini"
class=
"iconfont icon-shangjia1"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"下架"
placement=
"top"
>
<el-button
type=
"warning"
size=
"mini"
class=
"iconfont icon-xiajia1"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消"
placement=
"top"
>
<el-button
type=
"danger"
size=
"mini"
class=
"iconfont icon-quxiao1"
></el-button>
</el-tooltip>
</el-button-group>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -111,7 +119,6 @@ export default {
...
@@ -111,7 +119,6 @@ export default {
loading
:
false
,
loading
:
false
,
dataList
:[],
dataList
:[],
GoodsTypeList
:
[],
GoodsTypeList
:
[],
GoodsSeriesList
:
[],
total
:
0
,
total
:
0
,
CommodityTypeList
:
[],
CommodityTypeList
:
[],
};
};
...
@@ -119,7 +126,6 @@ export default {
...
@@ -119,7 +126,6 @@ export default {
mounted
()
{
mounted
()
{
this
.
getList
();
this
.
getList
();
this
.
getGoodsSeries
();
this
.
getCommodityTypeList
();
this
.
getCommodityTypeList
();
this
.
getGoodsTypeManager
();
this
.
getGoodsTypeManager
();
},
},
...
@@ -131,33 +137,8 @@ export default {
...
@@ -131,33 +137,8 @@ export default {
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
},
},
getHotName
:
function
(
id
)
{
addIntegralMall
:
function
(
path
,
proId
,
tab
){
for
(
let
i
=
0
;
i
<
this
.
GoodsSeriesList
.
length
;
i
++
)
{
this
.
$router
.
push
({
name
:
path
,
query
:{
blank
:
'y'
,
proId
:
proId
,
tab
:
tab
}
})
if
(
this
.
GoodsSeriesList
[
i
].
id
===
id
)
{
return
this
.
GoodsSeriesList
[
i
].
name
}
}
return
'无'
}
,
getGoodsSeries
()
{
this
.
loading
=
true
;
this
.
apiJavaPost
(
"/api/IntegralManager/getGoodsSeries"
,
{
}
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
GoodsSeriesList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
,
null
);
}
,
addIntegralMall
:
function
(
path
,
obj
,
tab
){
localStorage
.
editIntegralMall
=
JSON
.
stringify
(
obj
);
this
.
$router
.
push
({
name
:
path
,
query
:{
blank
:
'y'
,
tab
:
tab
}
}
)
},
},
getGoodsTypeManager
()
{
getGoodsTypeManager
()
{
this
.
apipost
(
"Shop_post_GetCommodityCategoryList"
,{
Name
:
""
,
ParentId
:
0
},
res
=>
{
this
.
apipost
(
"Shop_post_GetCommodityCategoryList"
,{
Name
:
""
,
ParentId
:
0
},
res
=>
{
...
...
src/components/
activity
/BuyingType.vue
→
src/components/
Buying
/BuyingType.vue
View file @
af7cf9b1
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
<el-tooltip
<el-tooltip
class=
"item"
class=
"item"
effect=
"dark"
effect=
"dark"
:content=
"$t('active.ld_editInfo')
"
content=
"修改
"
placement=
"top"
placement=
"top"
>
>
<el-button
<el-button
...
@@ -129,6 +129,9 @@
...
@@ -129,6 +129,9 @@
@
click=
"outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
@
click=
"outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
></el-button>
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top"
>
<el-button
@
click=
"Delete(item)"
type=
"danger"
class=
'zidingyiFz'
icon=
"el-icon-delete"
circle
></el-button>
</el-tooltip>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -194,12 +197,6 @@
...
@@ -194,12 +197,6 @@
</div>
</div>
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item
label=
"是否展示"
prop=
"state"
>
<el-select
filterable
v-model=
"addMsg.Status"
>
<el-option
label=
"展示"
:value=
"0"
></el-option>
<el-option
label=
"不展示"
:value=
"1"
></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
<button
...
@@ -269,27 +266,18 @@ export default {
...
@@ -269,27 +266,18 @@ export default {
},
},
// 删除
// 删除
Delete
(
item
)
{
Delete
(
item
)
{
this
.
$confirm
(
"是否删除"
+
item
.
n
ame
+
"? 删除后不可恢复"
,
"提示"
,
{
this
.
$confirm
(
"是否删除"
+
item
.
N
ame
+
"? 删除后不可恢复"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
type
:
"warning"
})
})
.
then
(()
=>
{
.
then
(()
=>
{
this
.
apiJavaPost
(
this
.
updateData
(
item
,
2
)
"/api/IntegralManager/goodsTypeManager"
,
this
.
addAward
()
{
reqType
:
'delete'
,
id
:
item
.
id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
})
})
.
catch
(()
=>
{});
.
catch
(()
=>
{
this
.
resetInfo
()
});
},
},
//上传图片
//上传图片
uploadTypeImgBtn
(
file
){
uploadTypeImgBtn
(
file
){
...
@@ -386,15 +374,17 @@ export default {
...
@@ -386,15 +374,17 @@ export default {
);
);
},
},
//修改信息
//修改信息
updateData
(
item
)
{
updateData
(
item
,
t
)
{
this
.
outerVisible
=
true
;
if
(
!
t
)
{
this
.
outerVisible
=
true
;
}
this
.
addMsg
.
IsShowIndex
=
item
.
IsShowIndex
;
this
.
addMsg
.
IsShowIndex
=
item
.
IsShowIndex
;
this
.
addMsg
.
Name
=
item
.
Name
;
this
.
addMsg
.
Name
=
item
.
Name
;
this
.
addMsg
.
ParentId
=
item
.
ParentId
;
this
.
addMsg
.
ParentId
=
item
.
ParentId
;
this
.
addMsg
.
Sort
=
item
.
Sort
;
this
.
addMsg
.
Sort
=
item
.
Sort
;
this
.
addMsg
.
Image
=
item
.
Image
;
this
.
addMsg
.
Image
=
item
.
Image
;
this
.
addMsg
.
Id
=
item
.
Id
;
this
.
addMsg
.
Id
=
item
.
Id
;
this
.
addMsg
.
Status
=
item
.
Status
this
.
addMsg
.
Status
=
t
?
1
:
item
.
Status
},
},
//重置信息
//重置信息
resetInfo
()
{
resetInfo
()
{
...
...
src/plug/index.js
View file @
af7cf9b1
...
@@ -112,7 +112,7 @@ export default {
...
@@ -112,7 +112,7 @@ export default {
Vue
.
prototype
.
domainManager
=
function
()
{
Vue
.
prototype
.
domainManager
=
function
()
{
let
domainUrl
=
''
;
let
domainUrl
=
''
;
domainUrl
=
"http://192.168.2.214:8082"
;
domainUrl
=
"http://192.168.2.214:8082"
;
// domainUrl = "http://192.168.2.65:8025
"; // 吴春
domainUrl
=
"http://192.168.2.16:8083
"
;
// 吴春
let
locationName
=
window
.
location
.
hostname
;
let
locationName
=
window
.
location
.
hostname
;
let
javaUrldo
=
""
;
let
javaUrldo
=
""
;
...
...
src/router/config.js
View file @
af7cf9b1
...
@@ -3953,15 +3953,23 @@ export default {
...
@@ -3953,15 +3953,23 @@ export default {
{
{
path
:
'/BuyingType'
,
path
:
'/BuyingType'
,
name
:
'BuyingType'
,
name
:
'BuyingType'
,
component
:
resolve
=>
require
([
'@/components/
activity
/BuyingType'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/
Buying
/BuyingType'
],
resolve
),
meta
:
{
meta
:
{
title
:
'代购商品类型'
title
:
'代购商品类型'
}
}
},
},
{
path
:
'/BuyingAdd'
,
name
:
'BuyingAdd'
,
component
:
resolve
=>
require
([
'@/components/Buying/BuyingAdd'
],
resolve
),
meta
:
{
title
:
'新增代购商品'
}
},
{
{
path
:
'/BuyingList'
,
path
:
'/BuyingList'
,
name
:
'BuyingList'
,
name
:
'BuyingList'
,
component
:
resolve
=>
require
([
'@/components/
activity
/BuyingList'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/
Buying
/BuyingList'
],
resolve
),
meta
:
{
meta
:
{
title
:
'代购商品列表'
title
:
'代购商品列表'
}
}
...
...
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