Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
E
etao-sjht-sd
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张志伟
etao-sjht-sd
提交
7cfbe339
提交
7cfbe339
编写于
8月 23, 2025
作者:
zhangzhiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
.
上级
5c69d9c1
变更
12
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
1216 行增加
和
889 行删除
+1216
-889
index.html
dist/index.html
+1
-1
app.62556b3d72455819fde5f9ac3c5a980c.css
dist/static/css/app.62556b3d72455819fde5f9ac3c5a980c.css
+1
-0
app.78237847f6c83f3c354114688193c8ab.css
dist/static/css/app.78237847f6c83f3c354114688193c8ab.css
+0
-1
0.76ed2655edbf8d3e7509.js
dist/static/js/0.76ed2655edbf8d3e7509.js
+356
-0
app.6c88485738f178dfa228.js
dist/static/js/app.6c88485738f178dfa228.js
+0
-1
app.e647228d38e85cf56243.js
dist/static/js/app.e647228d38e85cf56243.js
+1
-0
manifest.ce6ce250fafdef5a6f4e.js
dist/static/js/manifest.ce6ce250fafdef5a6f4e.js
+1
-1
Aside.vue
src/components/Aside.vue
+591
-639
Login.vue
src/pages/Login.vue
+1
-0
activityMall.vue
src/pages/marketing/activity/activityMall.vue
+3
-3
activityMall.vue
src/pages/marketing/activityCopy/activityMall.vue
+16
-16
AddActivityProduct.vue
...pages/marketing/activityCopy/model/AddActivityProduct.vue
+245
-227
未找到文件。
dist/index.html
浏览文件 @
7cfbe339
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
><link
rel=
icon
type=
image/x-icon
href=
./static/favicon.ico
><link
rel=
stylesheet
href=
//at.alicdn.com/t/font_1586872_yhll0m2jcs.css
><title>
EDS供货商
</title><link
href=
/static/css/app.78237847f6c83f3c354114688193c8ab.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
type=
text/javascript
src=
/static/js/manifest.7d138ce09293b559e122.js
></script><script
type=
text/javascript
src=
/static/js/vendor.02a8d01969b52bb78b9a.js
></script><script
type=
text/javascript
src=
/static/js/app.6c88485738f178dfa228.js
></script></body></html>
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
><link
rel=
icon
type=
image/x-icon
href=
./static/favicon.ico
><link
rel=
stylesheet
href=
//at.alicdn.com/t/font_1586872_yhll0m2jcs.css
><title>
EDS供货商
</title><link
href=
/static/css/app.62556b3d72455819fde5f9ac3c5a980c.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
type=
text/javascript
src=
/static/js/manifest.ce6ce250fafdef5a6f4e.js
></script><script
type=
text/javascript
src=
/static/js/vendor.02a8d01969b52bb78b9a.js
></script><script
type=
text/javascript
src=
/static/js/app.e647228d38e85cf56243.js
></script></body></html>
\ No newline at end of file
\ No newline at end of file
dist/static/css/app.62556b3d72455819fde5f9ac3c5a980c.css
0 → 100644
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
dist/static/css/app.78237847f6c83f3c354114688193c8ab.css
已删除
100644 → 0
浏览文件 @
5c69d9c1
此差异已折叠。
点击以展开。
dist/static/js/0.
1e6f021611ef01473065
.js
→
dist/static/js/0.
76ed2655edbf8d3e7509
.js
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
dist/static/js/app.6c88485738f178dfa228.js
已删除
100644 → 0
浏览文件 @
5c69d9c1
此差异已折叠。
点击以展开。
dist/static/js/app.e647228d38e85cf56243.js
0 → 100644
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
dist/static/js/manifest.
7d138ce09293b559e122
.js
→
dist/static/js/manifest.
ce6ce250fafdef5a6f4e
.js
浏览文件 @
7cfbe339
!
function
(
e
){
var
n
=
window
.
webpackJsonp
;
window
.
webpackJsonp
=
function
(
r
,
c
,
a
){
for
(
var
i
,
u
,
f
,
s
=
0
,
l
=
[];
s
<
r
.
length
;
s
++
)
u
=
r
[
s
],
t
[
u
]
&&
l
.
push
(
t
[
u
][
0
]),
t
[
u
]
=
0
;
for
(
i
in
c
)
Object
.
prototype
.
hasOwnProperty
.
call
(
c
,
i
)
&&
(
e
[
i
]
=
c
[
i
]);
for
(
n
&&
n
(
r
,
c
,
a
);
l
.
length
;)
l
.
shift
()();
if
(
a
)
for
(
s
=
0
;
s
<
a
.
length
;
s
++
)
f
=
o
(
o
.
s
=
a
[
s
]);
return
f
};
var
r
=
{},
t
=
{
6
:
0
};
function
o
(
n
){
if
(
r
[
n
])
return
r
[
n
].
exports
;
var
t
=
r
[
n
]
=
{
i
:
n
,
l
:
!
1
,
exports
:{}};
return
e
[
n
].
call
(
t
.
exports
,
t
,
t
.
exports
,
o
),
t
.
l
=!
0
,
t
.
exports
}
o
.
e
=
function
(
e
){
var
n
=
t
[
e
];
if
(
0
===
n
)
return
new
Promise
(
function
(
e
){
e
()});
if
(
n
)
return
n
[
2
];
var
r
=
new
Promise
(
function
(
r
,
o
){
n
=
t
[
e
]
=
[
r
,
o
]});
n
[
2
]
=
r
;
var
c
=
document
.
getElementsByTagName
(
"head"
)[
0
],
a
=
document
.
createElement
(
"script"
);
a
.
type
=
"text/javascript"
,
a
.
charset
=
"utf-8"
,
a
.
async
=!
0
,
a
.
timeout
=
12
e4
,
o
.
nc
&&
a
.
setAttribute
(
"nonce"
,
o
.
nc
),
a
.
src
=
o
.
p
+
"static/js/"
+
e
+
"."
+
{
0
:
"1e6f021611ef01473065"
,
3
:
"ca2708494961454b4374"
,
4
:
"c569c81ffe41d4800bf8"
,
5
:
"cb7f3344fd930f577a5c"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
u
,
12
e4
);
function
u
(){
a
.
onerror
=
a
.
onload
=
null
,
clearTimeout
(
i
);
var
n
=
t
[
e
];
0
!==
n
&&
(
n
&&
n
[
1
](
new
Error
(
"Loading chunk "
+
e
+
" failed."
)),
t
[
e
]
=
void
0
)}
return
a
.
onerror
=
a
.
onload
=
u
,
c
.
appendChild
(
a
),
r
},
o
.
m
=
e
,
o
.
c
=
r
,
o
.
d
=
function
(
e
,
n
,
r
){
o
.
o
(
e
,
n
)
||
Object
.
defineProperty
(
e
,
n
,{
configurable
:
!
1
,
enumerable
:
!
0
,
get
:
r
})},
o
.
n
=
function
(
e
){
var
n
=
e
&&
e
.
__esModule
?
function
(){
return
e
.
default
}:
function
(){
return
e
};
return
o
.
d
(
n
,
"a"
,
n
),
n
},
o
.
o
=
function
(
e
,
n
){
return
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
n
)},
o
.
p
=
"/"
,
o
.
oe
=
function
(
e
){
throw
console
.
error
(
e
),
e
}}([]);
!
function
(
e
){
var
n
=
window
.
webpackJsonp
;
window
.
webpackJsonp
=
function
(
r
,
c
,
a
){
for
(
var
i
,
u
,
f
,
s
=
0
,
l
=
[];
s
<
r
.
length
;
s
++
)
u
=
r
[
s
],
t
[
u
]
&&
l
.
push
(
t
[
u
][
0
]),
t
[
u
]
=
0
;
for
(
i
in
c
)
Object
.
prototype
.
hasOwnProperty
.
call
(
c
,
i
)
&&
(
e
[
i
]
=
c
[
i
]);
for
(
n
&&
n
(
r
,
c
,
a
);
l
.
length
;)
l
.
shift
()();
if
(
a
)
for
(
s
=
0
;
s
<
a
.
length
;
s
++
)
f
=
o
(
o
.
s
=
a
[
s
]);
return
f
};
var
r
=
{},
t
=
{
6
:
0
};
function
o
(
n
){
if
(
r
[
n
])
return
r
[
n
].
exports
;
var
t
=
r
[
n
]
=
{
i
:
n
,
l
:
!
1
,
exports
:{}};
return
e
[
n
].
call
(
t
.
exports
,
t
,
t
.
exports
,
o
),
t
.
l
=!
0
,
t
.
exports
}
o
.
e
=
function
(
e
){
var
n
=
t
[
e
];
if
(
0
===
n
)
return
new
Promise
(
function
(
e
){
e
()});
if
(
n
)
return
n
[
2
];
var
r
=
new
Promise
(
function
(
r
,
o
){
n
=
t
[
e
]
=
[
r
,
o
]});
n
[
2
]
=
r
;
var
c
=
document
.
getElementsByTagName
(
"head"
)[
0
],
a
=
document
.
createElement
(
"script"
);
a
.
type
=
"text/javascript"
,
a
.
charset
=
"utf-8"
,
a
.
async
=!
0
,
a
.
timeout
=
12
e4
,
o
.
nc
&&
a
.
setAttribute
(
"nonce"
,
o
.
nc
),
a
.
src
=
o
.
p
+
"static/js/"
+
e
+
"."
+
{
0
:
"76ed2655edbf8d3e7509"
,
3
:
"ca2708494961454b4374"
,
4
:
"c569c81ffe41d4800bf8"
,
5
:
"cb7f3344fd930f577a5c"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
u
,
12
e4
);
function
u
(){
a
.
onerror
=
a
.
onload
=
null
,
clearTimeout
(
i
);
var
n
=
t
[
e
];
0
!==
n
&&
(
n
&&
n
[
1
](
new
Error
(
"Loading chunk "
+
e
+
" failed."
)),
t
[
e
]
=
void
0
)}
return
a
.
onerror
=
a
.
onload
=
u
,
c
.
appendChild
(
a
),
r
},
o
.
m
=
e
,
o
.
c
=
r
,
o
.
d
=
function
(
e
,
n
,
r
){
o
.
o
(
e
,
n
)
||
Object
.
defineProperty
(
e
,
n
,{
configurable
:
!
1
,
enumerable
:
!
0
,
get
:
r
})},
o
.
n
=
function
(
e
){
var
n
=
e
&&
e
.
__esModule
?
function
(){
return
e
.
default
}:
function
(){
return
e
};
return
o
.
d
(
n
,
"a"
,
n
),
n
},
o
.
o
=
function
(
e
,
n
){
return
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
n
)},
o
.
p
=
"/"
,
o
.
oe
=
function
(
e
){
throw
console
.
error
(
e
),
e
}}([]);
\ No newline at end of file
\ No newline at end of file
src/components/Aside.vue
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
src/pages/Login.vue
浏览文件 @
7cfbe339
...
@@ -180,6 +180,7 @@ import { checkPC } from '../utils/utils';
...
@@ -180,6 +180,7 @@ import { checkPC } from '../utils/utils';
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
$axios
.
post
(
'/account/login'
,{
this
.
$axios
.
post
(
'/account/login'
,{
glsd
:
1
,
username
:
this
.
ruleForm
.
username
,
username
:
this
.
ruleForm
.
username
,
password
:
this
.
ruleForm
.
password
password
:
this
.
ruleForm
.
password
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
...
...
src/pages/marketing/activity/activityMall.vue
浏览文件 @
7cfbe339
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<!--
<div
class=
"actHead"
@
click=
"dialogVisible=true"
style=
"cursor: pointer"
>
-->
<!--
<div
class=
"actHead"
@
click=
"dialogVisible=true"
style=
"cursor: pointer"
>
-->
<!--查看活动规则-->
<!--查看活动规则-->
<!--
</div>
-->
<!--
</div>
-->
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"
!
showUpdateBtn"
>
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"showUpdateBtn"
>
添加活动商品
添加活动商品
</el-button>
</el-button>
</div>
</div>
...
@@ -207,7 +207,7 @@
...
@@ -207,7 +207,7 @@
this
.
$router
.
push
(
"/marketing/AddActivityProduct"
);
this
.
$router
.
push
(
"/marketing/AddActivityProduct"
);
},
},
delActGoods
()
{
delActGoods
()
{
this
.
$axios
.
post
(
"/act
LocalR
egist/delActGoods"
,
{
this
.
$axios
.
post
(
"/act
r
egist/delActGoods"
,
{
skuIds
:
this
.
selection
,
skuIds
:
this
.
selection
,
"actId"
:
this
.
activeStatus
,
"actId"
:
this
.
activeStatus
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
});
});
},
},
getActSkuList
()
{
getActSkuList
()
{
this
.
$axios
.
post
(
"/act
LocalR
egist/actSkuList"
,
{
this
.
$axios
.
post
(
"/act
r
egist/actSkuList"
,
{
...
this
.
params
,
...
this
.
params
,
"actId"
:
this
.
activeStatus
,
"actId"
:
this
.
activeStatus
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
...
src/pages/marketing/activityCopy/activityMall.vue
浏览文件 @
7cfbe339
...
@@ -10,21 +10,21 @@
...
@@ -10,21 +10,21 @@
<
template
>
<
template
>
<div
class=
"goods-list"
style=
"width: 1100px"
>
<div
class=
"goods-list"
style=
"width: 1100px"
>
<el-button
@
click=
"goback1()"
>
返回上一层
</el-button>
<el-button
@
click=
"goback1()"
>
返回上一层
</el-button>
<div
style=
"background: #f0f5ff;height: 50px;width: 96%;padding: 20px;margin-top: 3px"
>
<div
style=
"background: #f0f5ff;height: 50px;width: 96%;padding: 20px;margin-top: 3px"
>
<h3>
{{
headTitle
.
name
}}
<h3>
{{
headTitle
.
name
}}
<span
<span
style=
"color: #FFFFFF;font-size: 12px;background: #ff6600;padding: 5px 8px;margin-left: 6px;border-radius: 16px"
>
style=
"color: #FFFFFF;font-size: 12px;background: #ff6600;padding: 5px 8px;margin-left: 6px;border-radius: 16px"
>
<span
v-if=
"headTitle.actStatus==1"
>
未开始
</span>
<span
v-if=
"headTitle.actStatus==1"
>
未开始
</span>
<span
v-if=
"headTitle.actStatus==2"
>
进行中
</span>
<span
v-if=
"headTitle.actStatus==2"
>
进行中
</span>
<span
v-if=
"headTitle.actStatus==3"
>
已结束
</span>
<span
v-if=
"headTitle.actStatus==3"
>
已结束
</span>
</span>
</span>
</h3>
</h3>
<el-row
style=
"margin-top: 20px"
>
<el-row
style=
"margin-top: 20px"
>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple"
>
活动时间：
{{
headTitle
.
actDateStr
}}
</div></el-col>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple"
>
活动时间：
{{
headTitle
.
actDateStr
}}
</div></el-col>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple-light"
>
创建时间：
{{
headTitle
.
addDate
}}
</div></el-col>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple-light"
>
创建时间：
{{
headTitle
.
addDate
}}
</div></el-col>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple"
>
参与活动SKU总数：
{{
total
}}
</div></el-col>
<el-col
:span=
"8"
style=
"text-align: center"
><div
class=
"grid-content bg-purple"
>
参与活动SKU总数：
{{
total
}}
</div></el-col>
</el-row>
</el-row>
</div>
</div>
<div
v-if=
"zoneList.length!=0"
>
<div
v-if=
"zoneList.length!=0"
>
<div
style=
"display: flex;justify-content: space-between;margin: 10px 15px"
>
<div
style=
"display: flex;justify-content: space-between;margin: 10px 15px"
>
<div
style=
"display: flex"
>
<div
style=
"display: flex"
>
...
@@ -83,9 +83,9 @@
...
@@ -83,9 +83,9 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
"skuModel"
label=
"SKU型号"
align=
"left"
></el-table-column>
<el-table-column
prop=
"skuModel"
label=
"SKU型号"
align=
"left"
></el-table-column>
<!--<el-table-column label="商品类目" align="left">-->
<!--<el-table-column label="商品类目" align="left">-->
<!--<template slot-scope="scope">-->
<!--<template slot-scope="scope">-->
<!--吊灯-->
<!--吊灯-->
<!--</template>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table-column>-->
<el-table-column
label=
"增补库存"
align=
"left"
width=
"180"
v-if=
"headTitle.type==1"
>
<el-table-column
label=
"增补库存"
align=
"left"
width=
"180"
v-if=
"headTitle.type==1"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
title=
"提示"
title=
"提示"
:visible
.
sync=
"isShowPriceRatio"
:visible
.
sync=
"isShowPriceRatio"
width=
"400px"
width=
"400px"
>
>
活动折扣：
<el-input-number
v-model=
"priceRatio"
:precision=
"1"
:min=
"1"
:max=
"10"
></el-input-number>
折
活动折扣：
<el-input-number
v-model=
"priceRatio"
:precision=
"1"
:min=
"1"
:max=
"10"
></el-input-number>
折
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"isShowPriceRatio = false"
>
取 消
</el-button>
<el-button
@
click=
"isShowPriceRatio = false"
>
取 消
</el-button>
...
@@ -398,7 +398,7 @@
...
@@ -398,7 +398,7 @@
},
},
getActSkuList
()
{
getActSkuList
()
{
this
.
loading
=
true
this
.
loading
=
true
this
.
$axios
.
post
(
this
.
headTitle
.
type
==
2
?
"/actregist/autonom/actSkuList"
:
"/actr
egist/actSkuList"
,
{
this
.
$axios
.
post
(
"/actLocalR
egist/actSkuList"
,
{
...
this
.
params
,
...
this
.
params
,
"actId"
:
this
.
headTitle
.
type
==
2
?
this
.
headTitle
.
actId
:
this
.
activeStatus
,
"actId"
:
this
.
headTitle
.
type
==
2
?
this
.
headTitle
.
actId
:
this
.
activeStatus
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
...
src/pages/marketing/activityCopy/model/AddActivityProduct.vue
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑！
取消
想要评论请
注册
或
登录
