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>
\ No newline at end of file
<!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
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
}}([]);
\ No newline at end of file
!
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
src/components/Aside.vue
浏览文件 @
7cfbe339
...
...
@@ -81,9 +81,9 @@
</template>
<
script
>
import
{
mapState
,
mapMutations
}
from
"vuex"
;
import
{
_deepClone
,
_deal
,
_getStorage
}
from
"@/utils/utils"
;
export
default
{
import
{
mapState
,
mapMutations
}
from
"vuex"
;
import
{
_deepClone
,
_deal
,
_getStorage
}
from
"@/utils/utils"
;
export
default
{
name
:
"Aside"
,
data
()
{
return
{
...
...
@@ -99,7 +99,7 @@ export default {
{
icon
:
require
(
"@/assets/img/icons/dailishang.png"
),
index
:
"/order/orderlist"
,
title
:
"EDS
市级代理"
,
title
:
"E淘
市级代理"
,
showBadge
:
true
,
subs
:
[
{
...
...
@@ -173,7 +173,7 @@ export default {
// {
// icon: require("@/assets/img/icons/dianpu.png"),
// index: "/order/orderlistbrand",
// title: "EDS
品牌共享中心",
// title: "E淘
品牌共享中心",
// subs: [
// {
// icon: "iconfont iconshangpinguanli",
...
...
@@ -292,48 +292,6 @@ export default {
// },
// ],
items_3
:
[
// {
// icon: require("@/assets/img/icons/ziyuanwei.png"),
// index: "/ad/advertisementList",
// title: "推广资源位",
// subs: [
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList",
// title: "热销广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/16",
// title: "E淘宝广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/2",
// title: "APP广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/3",
// title: "电脑版广告位",
// },
// // {
// // icon: "iconfont iconxiaoshou-",
// // index: "/ad/advertisementList/4",
// // title: "活动直播广告位",
// // },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/14",
// title: "消费者小程序广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/myAdvertisement",
// title: "我的广告位",
// },
// ],
// },
{
icon
:
require
(
"@/assets/img/icons/dianpuguanli.png"
),
index
:
"/marketing/shoprenovation"
,
...
...
@@ -361,11 +319,11 @@ export default {
// // index: "/marketing/coupon",
// // title: "优惠券",
// // },
// //
{
// //
icon: "iconfont iconxiaoshou-",
// //
index: "/marketing/pay",
// //
title: "EDS扫码付",
// //
},
//
{
//
icon: "iconfont iconxiaoshou-",
//
index: "/marketing/pay",
//
title: "EDS扫码付",
//
},
// ],
// },
// {
...
...
@@ -427,7 +385,6 @@ export default {
// title: "运营数据",
// },
{
icon
:
require
(
"@/assets/img/icons/actIcon.png"
),
index
:
"/marketing/activity"
,
title
:
"活动管理"
,
subs
:
[
...
...
@@ -480,16 +437,11 @@ export default {
index
:
"/checking/order"
,
title
:
"订单流水"
,
},
{
icon
:
"iconfont iconxiaoshou-"
,
index
:
"/checking/record"
,
title
:
"提现记录"
,
},
{
icon
:
"iconfont iconxiaoshou-"
,
index
:
"/checking/showzhifubao"
,
title
:
"我的支付宝"
,
},
// {
// icon: "iconfont iconxiaoshou-",
// index: "/checking/record",
// title: "提现记录",
// },
],
},
...
...
@@ -516,11 +468,11 @@ export default {
// index: "/help/exvip",
// title: "E淘工厂权益升级"
// },
//
{
//
icon: "iconfont iconxiaoshou-",
//
index: "/help/exshort",
//
title: "桌面快捷方式说明",
//
},
{
icon
:
"iconfont iconxiaoshou-"
,
index
:
"/help/exshort"
,
title
:
"桌面快捷方式说明"
,
},
// {
// icon: "iconfont iconxiaoshou-",
// index: "/help/exproducts",
...
...
@@ -623,19 +575,19 @@ export default {
// }
// E淘家居权限
if
(
isHome
==
1
)
{
this
.
itemsData
.
items_1
.
push
({
icon
:
require
(
"@/assets/img/icons/self.png"
),
index
:
"/order/orderlistself"
,
title
:
"自营订单管理"
,
subs
:
[
{
icon
:
"iconfont iconshangpinguanli"
,
index
:
"/order/orderlistself"
,
title
:
"快捷订单"
,
},
],
})
//
this.itemsData.items_1.push({
//
icon: require("@/assets/img/icons/self.png"),
//
index: "/order/orderlistself",
//
title: "自营订单管理",
//
subs: [
//
{
//
icon: "iconfont iconshangpinguanli",
//
index: "/order/orderlistself",
//
title: "快捷订单",
//
},
//
//
],
//
})
}
else
{
if
(
this
.
$route
.
path
==
'/order/orderlistself'
){
...
...
@@ -725,32 +677,32 @@ export default {
components
:
{
// 传入组件
},
};
};
</
script
>
<
style
lang=
"scss"
scoped
>
@import
"../assets/styles/_var"
;
.sidebar
{
@import
"../assets/styles/_var"
;
.sidebar
{
display
:
block
;
background
:
#fff
;
color
:
#000
;
position
:
relative
;
// overflow-y: scroll;
}
.
sidebar
:
:-
webkit-scrollbar
{
}
.
sidebar
:
:-
webkit-scrollbar
{
width
:
0
;
}
.sidebar-el-menu
:not
(
.el-menu--collapse
)
{
}
.sidebar-el-menu
:not
(
.el-menu--collapse
)
{
// width: 200px;
width
:
map-get
(
$width
,
asideWidth
);
}
.sidebar
>
ul
{
}
.sidebar
>
ul
{
height
:
100%
;
width
:
100%
;
font-size
:
14px
;
}
/
deep
/
.sidebar
.el-menu-item.is-active
{
}
/
deep
/
.sidebar
.el-menu-item.is-active
{
color
:
#fff
;
background
:
#147ef9
;
}
background
:
#f60
;
}
</
style
>
src/pages/Login.vue
浏览文件 @
7cfbe339
...
...
@@ -180,6 +180,7 @@ import { checkPC } from '../utils/utils';
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
$axios
.
post
(
'/account/login'
,{
glsd
:
1
,
username
:
this
.
ruleForm
.
username
,
password
:
this
.
ruleForm
.
password
}).
then
((
res
)
=>
{
...
...
src/pages/marketing/activity/activityMall.vue
浏览文件 @
7cfbe339
...
...
@@ -28,7 +28,7 @@
<!--
<div
class=
"actHead"
@
click=
"dialogVisible=true"
style=
"cursor: pointer"
>
-->
<!--查看活动规则-->
<!--
</div>
-->
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"
!
showUpdateBtn"
>
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"showUpdateBtn"
>
添加活动商品
</el-button>
</div>
...
...
@@ -207,7 +207,7 @@
this
.
$router
.
push
(
"/marketing/AddActivityProduct"
);
},
delActGoods
()
{
this
.
$axios
.
post
(
"/act
LocalR
egist/delActGoods"
,
{
this
.
$axios
.
post
(
"/act
r
egist/delActGoods"
,
{
skuIds
:
this
.
selection
,
"actId"
:
this
.
activeStatus
,
}).
then
(
res
=>
{
...
...
@@ -246,7 +246,7 @@
});
},
getActSkuList
()
{
this
.
$axios
.
post
(
"/act
LocalR
egist/actSkuList"
,
{
this
.
$axios
.
post
(
"/act
r
egist/actSkuList"
,
{
...
this
.
params
,
"actId"
:
this
.
activeStatus
,
}).
then
(
res
=>
{
...
...
src/pages/marketing/activityCopy/activityMall.vue
浏览文件 @
7cfbe339
...
...
@@ -398,7 +398,7 @@
},
getActSkuList
()
{
this
.
loading
=
true
this
.
$axios
.
post
(
this
.
headTitle
.
type
==
2
?
"/actregist/autonom/actSkuList"
:
"/actr
egist/actSkuList"
,
{
this
.
$axios
.
post
(
"/actLocalR
egist/actSkuList"
,
{
...
this
.
params
,
"actId"
:
this
.
headTitle
.
type
==
2
?
this
.
headTitle
.
actId
:
this
.
activeStatus
,
}).
then
(
res
=>
{
...
...
src/pages/marketing/activityCopy/model/AddActivityProduct.vue
浏览文件 @
7cfbe339
此差异已折叠。
点击以展开。
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑！
取消
想要评论请
注册
或
登录
