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
06ef873c
Commit
06ef873c
authored
Jun 04, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
6be93e19
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
412 additions
and
26 deletions
+412
-26
Fsetting.vue
src/components/Fsetting.vue
+1
-1
Ftemplate.vue
src/components/Ftemplate.vue
+1
-1
choiceAreaAuth.vue
src/components/common/choiceAreaAuth.vue
+386
-0
mall.vue
src/components/mall.vue
+2
-2
mallIndex.vue
src/components/mallIndex.vue
+16
-16
index.js
src/plug/index.js
+3
-3
index.js
src/router/index.js
+3
-3
No files found.
src/components/Fsetting.vue
View file @
06ef873c
...
@@ -162,7 +162,7 @@
...
@@ -162,7 +162,7 @@
<div
class=
"mainLeftMenu"
>
<div
class=
"mainLeftMenu"
>
<div
class=
"leftMenu1"
>
<div
class=
"leftMenu1"
>
<div
class=
"F_Logo"
>
<div
class=
"F_Logo"
>
<div
class=
"asideInner"
@
click=
"CommonJump('
zan
Index')"
>
{{
currentUser
.
MallName
}}
<div
class=
"asideInner"
@
click=
"CommonJump('
mall
Index')"
>
{{
currentUser
.
MallName
}}
</div>
</div>
</div>
</div>
<ul
class=
"FsettingUU"
>
<ul
class=
"FsettingUU"
>
...
...
src/components/Ftemplate.vue
View file @
06ef873c
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
<div
class=
"mainLeftMenu"
>
<div
class=
"mainLeftMenu"
>
<div
class=
"leftMenu1"
>
<div
class=
"leftMenu1"
>
<div
class=
"F_Logo"
>
<div
class=
"F_Logo"
>
<div
class=
"asideInner"
@
click=
"CommonJump('
zan
Index')"
>
{{
currentUser
.
MallName
}}
<div
class=
"asideInner"
@
click=
"CommonJump('
mall
Index')"
>
{{
currentUser
.
MallName
}}
</div>
</div>
</div>
</div>
<ul
class=
"FsettingUU"
>
<ul
class=
"FsettingUU"
>
...
...
src/components/common/choiceAreaAuth.vue
0 → 100644
View file @
06ef873c
This diff is collapsed.
Click to expand it.
src/components/mall.vue
View file @
06ef873c
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
<div
class=
"is-show-menu-2"
v-if=
"isShowOne"
@
click=
"showTwo=true,isShowOne=false"
>
>>
</div>
<div
class=
"is-show-menu-2"
v-if=
"isShowOne"
@
click=
"showTwo=true,isShowOne=false"
>
>>
</div>
<div
class=
"leftMenu1"
>
<div
class=
"leftMenu1"
>
<div
class=
"aside-logo"
>
<div
class=
"aside-logo"
>
<div
class=
"asideInner"
@
click=
"CommonJump('
zan
Index'),firstCked=0,showTwo=false"
>
{{
currentUser
.
MallName
}}
<div
class=
"asideInner"
@
click=
"CommonJump('
mall
Index'),firstCked=0,showTwo=false"
>
{{
currentUser
.
MallName
}}
</div>
</div>
</div>
</div>
<ul>
<ul>
...
@@ -472,7 +472,7 @@
...
@@ -472,7 +472,7 @@
mounted
()
{
mounted
()
{
this
.
getMenuList
();
this
.
getMenuList
();
if
(
this
.
$route
.
query
.
FIndex
){
if
(
this
.
$route
.
query
.
FIndex
){
this
.
CommonJump
(
'
zan
Index'
);
this
.
CommonJump
(
'
mall
Index'
);
}
}
this
.
Height
=
document
.
documentElement
.
clientHeight
-
60
;
this
.
Height
=
document
.
documentElement
.
clientHeight
-
60
;
//监听浏览器窗口变化
//监听浏览器窗口变化
...
...
src/components/
zan
Index.vue
→
src/components/
mall
Index.vue
View file @
06ef873c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
border-bottom
:
1px
solid
#EBEEF5
;
border-bottom
:
1px
solid
#EBEEF5
;
}
}
.
zan
Index_Second
{
.
mall
Index_Second
{
background-color
:
#fff
;
background-color
:
#fff
;
position
:
relative
;
position
:
relative
;
padding-bottom
:
50px
;
padding-bottom
:
50px
;
...
@@ -24,13 +24,13 @@
...
@@ -24,13 +24,13 @@
width
:
6%
;
width
:
6%
;
}
}
.
zan
Index
.el-input__inner
{
.
mall
Index
.el-input__inner
{
height
:
32px
;
height
:
32px
;
line-height
:
32px
;
line-height
:
32px
;
padding
:
0
10px
;
padding
:
0
10px
;
}
}
.
zan
Index
.el-input__icon
{
.
mall
Index
.el-input__icon
{
line-height
:
32px
;
line-height
:
32px
;
}
}
...
@@ -38,12 +38,12 @@
...
@@ -38,12 +38,12 @@
margin-right
:
5px
;
margin-right
:
5px
;
}
}
.
zanIndex
.zan
Index_Second
.el-tabs__nav-scroll
{
.
mallIndex
.mall
Index_Second
.el-tabs__nav-scroll
{
width
:
120px
;
width
:
120px
;
margin-left
:
30px
;
margin-left
:
30px
;
}
}
.
zanIndex
.zan
Index_Second
.el-tabs__nav-wrap
::after
{
.
mallIndex
.mall
Index_Second
.el-tabs__nav-wrap
::after
{
content
:
""
;
content
:
""
;
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
...
@@ -55,12 +55,12 @@
...
@@ -55,12 +55,12 @@
height
:
1px
;
height
:
1px
;
}
}
.
zan
Index
.el-tabs__item
{
.
mall
Index
.el-tabs__item
{
height
:
32px
;
height
:
32px
;
line-height
:
32px
;
line-height
:
32px
;
}
}
.
zan
Index
.clean
{
.
mall
Index
.clean
{
color
:
#92959B
;
color
:
#92959B
;
margin-left
:
30px
;
margin-left
:
30px
;
cursor
:
pointer
;
cursor
:
pointer
;
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
border-left
:
1px
dashed
#EFF1F7
;
border-left
:
1px
dashed
#EFF1F7
;
}
}
.
zan
IndexThrid
{
.
mall
IndexThrid
{
border
:
1px
solid
#EBEEF5
;
border
:
1px
solid
#EBEEF5
;
background-color
:
#FFF
;
background-color
:
#FFF
;
color
:
#303133
;
color
:
#303133
;
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
background-color
:
transparent
;
background-color
:
transparent
;
}
}
.
zan
Index
.el-card__body
{
.
mall
Index
.el-card__body
{
padding
:
20px
;
padding
:
20px
;
}
}
...
@@ -193,11 +193,11 @@
...
@@ -193,11 +193,11 @@
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.el-
zan
Index_btmheader
{
.el-
mall
Index_btmheader
{
padding
:
14px
20px
;
padding
:
14px
20px
;
}
}
.el-
zan
Index_btmheader
span
{
.el-
mall
Index_btmheader
span
{
/* float:left; */
/* float:left; */
height
:
32px
;
height
:
32px
;
line-height
:
32px
;
line-height
:
32px
;
...
@@ -299,9 +299,9 @@
...
@@ -299,9 +299,9 @@
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"
zan
Index"
>
<div
class=
"
mall
Index"
>
<div
class=
"zanTotalTop"
>
数据概况
</div>
<div
class=
"zanTotalTop"
>
数据概况
</div>
<div
class=
"
zan
Index_Second"
>
<div
class=
"
mall
Index_Second"
>
<div
class=
"searchDiv"
>
<div
class=
"searchDiv"
>
<div>
<div>
<el-select
v-model=
"basicQMsg.Source"
class=
"w120"
@
change=
"getChange"
>
<el-select
v-model=
"basicQMsg.Source"
class=
"w120"
@
change=
"getChange"
>
...
@@ -355,7 +355,7 @@
...
@@ -355,7 +355,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"
zan
IndexThrid"
>
<div
class=
"
mall
IndexThrid"
>
<div
class=
"el-card_header"
>
<div
class=
"el-card_header"
>
<div>
<div>
<span>
销售情况
</span>
<span>
销售情况
</span>
...
@@ -415,7 +415,7 @@
...
@@ -415,7 +415,7 @@
</div>
</div>
<div
class=
"zantable-area"
>
<div
class=
"zantable-area"
>
<div
class=
"el-card"
>
<div
class=
"el-card"
>
<div
class=
"el-
zan
Index_btmheader"
>
<div
class=
"el-
mall
Index_btmheader"
>
<span>
商品购买力TOP排行
</span>
<span>
商品购买力TOP排行
</span>
<el-button
type=
"primary"
class=
"ZexportBtn"
size=
"mini"
@
click=
"DownLoadSalesGoods"
>
导出TOP100
</el-button>
<el-button
type=
"primary"
class=
"ZexportBtn"
size=
"mini"
@
click=
"DownLoadSalesGoods"
>
导出TOP100
</el-button>
</div>
</div>
...
@@ -460,7 +460,7 @@
...
@@ -460,7 +460,7 @@
</div>
</div>
</div>
</div>
<div
class=
"el-card"
>
<div
class=
"el-card"
>
<div
class=
"el-
zan
Index_btmheader"
>
<div
class=
"el-
mall
Index_btmheader"
>
<span>
用户购买力TOP排行
</span>
<span>
用户购买力TOP排行
</span>
<el-button
type=
"primary"
class=
"ZexportBtn"
size=
"mini"
@
click=
"DownLoadSalesUser"
>
导出TOP100
</el-button>
<el-button
type=
"primary"
class=
"ZexportBtn"
size=
"mini"
@
click=
"DownLoadSalesUser"
>
导出TOP100
</el-button>
</div>
</div>
...
...
src/plug/index.js
View file @
06ef873c
...
@@ -54,7 +54,8 @@ export default {
...
@@ -54,7 +54,8 @@ export default {
//域名管理对象
//域名管理对象
Vue
.
prototype
.
domainManager
=
function
()
{
Vue
.
prototype
.
domainManager
=
function
()
{
let
domainUrl
=
''
;
let
domainUrl
=
''
;
domainUrl
=
"http://192.168.2.214:8200"
domainUrl
=
"http://192.168.2.214:8200"
;
domainUrl
=
"https://localhost:5001"
;
let
locationName
=
window
.
location
.
hostname
;
let
locationName
=
window
.
location
.
hostname
;
if
(
locationName
.
indexOf
(
'testmall.oytour'
)
!==
-
1
)
{
if
(
locationName
.
indexOf
(
'testmall.oytour'
)
!==
-
1
)
{
domainUrl
=
"http://mallapi.oytour.com"
;
domainUrl
=
"http://mallapi.oytour.com"
;
...
@@ -69,7 +70,6 @@ export default {
...
@@ -69,7 +70,6 @@ export default {
ImageUrl
:
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com'
,
ImageUrl
:
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com'
,
UploadFileUrl
:
domainUrl
+
'/api/File/LocalFileUploadImport'
,
UploadFileUrl
:
domainUrl
+
'/api/File/LocalFileUploadImport'
,
UploadBlob
:
domainUrl
+
'/api/File/UploadBlob'
,
UploadBlob
:
domainUrl
+
'/api/File/UploadBlob'
,
};
};
return
obj
;
return
obj
;
},
},
...
...
src/router/index.js
View file @
06ef873c
...
@@ -106,9 +106,9 @@ export default new Router({
...
@@ -106,9 +106,9 @@ export default new Router({
name
:
'mall'
,
name
:
'mall'
,
component
:
resolve
=>
require
([
'@/components/mall'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/mall'
],
resolve
),
children
:
[{
children
:
[{
path
:
'/
zan
Index'
,
path
:
'/
mall
Index'
,
name
:
'
zan
Index'
,
name
:
'
mall
Index'
,
component
:
resolve
=>
require
([
'@/components/
zan
Index'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/
mall
Index'
],
resolve
),
},
},
// 用户管理 用户列表
// 用户管理 用户列表
{
{
...
...
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