Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
0f3b3a75
Commit
0f3b3a75
authored
Sep 21, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式的一些修改
parent
6913b5d1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
12 deletions
+20
-12
guidecarGoodsdetails.vue
pages/guidecar/guidecarGoodsdetails.vue
+1
-0
guidecarList.vue
pages/guidecar/guidecarList.vue
+3
-2
index.vue
pages/guidecar/index.vue
+5
-1
order-commit.vue
pages/guidecar/order-commit.vue
+1
-0
rili.vue
pages/guidecar/rili.vue
+9
-8
user-center.vue
pages/user-center/user-center.vue
+1
-1
No files found.
pages/guidecar/guidecarGoodsdetails.vue
View file @
0f3b3a75
...
...
@@ -742,6 +742,7 @@
}
.guidecarOrderdetails
.details
{
padding
:
10px
;
margin-bottom
:
80px
;
}
.guidecarOrderdetails
.sku-box
.content
{
width
:
1px
;
...
...
pages/guidecar/guidecarList.vue
View file @
0f3b3a75
...
...
@@ -55,7 +55,7 @@
v-if=
"g.length > 0"
style=
" height: calc(100vh - (44px+10px+50px)) ;width: calc(100vw - 85px);"
>
<view
style=
"width: 100%;display: flex;flex-direction: column;align-items: center;padding: 10px
;
"
>
<view
style=
"width: 100%;display: flex;flex-direction: column;align-items: center;padding: 10px"
>
<view
class=
"c_list_item"
v-for=
"(x, i) in g"
:key=
"i"
@
click=
"goDetails(x)"
>
<view
class=
"itemb"
>
<view
class=
"c_t_l"
>
...
...
@@ -67,7 +67,7 @@
</view>
</view>
<view
class=
"itemb"
style=
"justify-content: space-between;margin-top: 10px;"
>
<view
class=
"itemb"
style=
"
max-width: 360rpx;
height:43px ;padding-right: 3px;"
>
<view
class=
"itemb"
style=
"height:43px ;padding-right: 3px;"
>
<image
:src=
"x.guidephoto"
mode=
"aspectFill"
style=
"width: 30px;height: 30px;border-radius: 15px;"
></image>
<view
style=
"display: flex;flex-direction: column;justify-content: space-between;height: 30px;margin-left: 8px;"
>
<view
class=
"itemb"
>
...
...
@@ -442,6 +442,7 @@ getGuideCarBrandList(){
width
:
96%
;
display
:
flex
;
flex-direction
:
column
;
margin-bottom
:
15px
;
}
.guidecarList
.itemb
{
...
...
pages/guidecar/index.vue
View file @
0f3b3a75
...
...
@@ -387,13 +387,17 @@
}
let
startTime
=
new
Date
(
this
.
msg
.
StartTime
);
// 开始时间
let
endTime
=
new
Date
(
this
.
msg
.
EndTime
);
// 结束时间
console
.
log
(
startTime
.
getTime
(),
endTime
.
getTime
())
if
(
startTime
.
getTime
()
>
endTime
.
getTime
()){
//如果开始时间大于结束时间吧结束时间赋值和开始时间一样
this
.
msg
.
StartTime
=
val
.
year
+
'-'
+
val
.
month
+
'-'
+
val
.
day
+
' '
+
val
.
hour
+
':'
+
val
.
minute
+
':00'
;
this
.
msg
.
EndTime
=
val
.
year
+
'-'
+
val
.
month
+
'-'
+
val
.
day
+
' '
+
val
.
hour
+
':'
+
val
.
minute
+
':10'
;
this
.
STime
=
val
this
.
ETime
=
val
let
myDate
=
new
Date
(
this
.
msg
.
EndTime
);
let
days
=
myDate
.
getDay
();
this
.
STime
.
week
=
this
.
getweek
(
days
)
this
.
ETime
.
week
=
this
.
getweek
(
days
)
this
.
intervalDay
=
''
this
.
intervalDay
=
'
半天
'
}
else
{
let
usedTime
=
endTime
-
startTime
;
// 相差的毫秒数
let
days
=
Math
.
floor
(
usedTime
/
(
24
*
3600
*
1000
));
// 计算出天数
...
...
pages/guidecar/order-commit.vue
View file @
0f3b3a75
...
...
@@ -180,6 +180,7 @@ export default {
}
},
getReceive
(
couponMessage
,
msgType
){
console
.
log
(
couponMessage
,
msgType
)
setTimeout
(()
=>
{
this
.
couponMessage
=
'获取'
+
couponMessage
+
'积分'
;
this
.
msgType
=
msgType
;
...
...
pages/guidecar/rili.vue
View file @
0f3b3a75
...
...
@@ -100,17 +100,18 @@
this
.
STime
=
this
.
getTime
(
data
+
' '
+
this
.
qutime
)
let
myDate
=
new
Date
(
data
);
if
(
this
.
use_day
==
0.5
){
this
.
S
Time
=
this
.
getTime
(
data
+
' '
+
this
.
stilltime
)
this
.
E
Time
=
this
.
getTime
(
data
+
' '
+
this
.
stilltime
)
}
else
{
myDate
=
myDate
.
setDate
(
myDate
.
getDate
()
+
(
Number
(
this
.
use_day
)
-
1
));
myDate
=
new
Date
(
myDate
);
let
year
=
myDate
.
getFullYear
();
//年
let
month
=
myDate
.
getMonth
()
+
1
;
//月
let
day
=
myDate
.
getDate
();
//日
let
data2
=
year
+
'-'
+
month
+
'-'
+
day
this
.
ETime
=
this
.
getTime
(
data2
+
' '
+
this
.
stilltime
)
}
myDate
=
new
Date
(
myDate
);
let
year
=
myDate
.
getFullYear
();
//年
let
month
=
myDate
.
getMonth
()
+
1
;
//月
let
day
=
myDate
.
getDate
();
//日
let
data2
=
year
+
'-'
+
month
+
'-'
+
day
this
.
ETime
=
this
.
getTime
(
data2
+
' '
+
this
.
stilltime
)
},
...
...
@@ -130,7 +131,7 @@
console
.
log
(
this
.
qutime
)
console
.
log
(
this
.
stilltime
)
let
quT
=
this
.
timeToSec
(
this
.
qutime
)
let
stillT
=
this
.
timeToSec
(
this
.
qu
time
)
let
stillT
=
this
.
timeToSec
(
this
.
still
time
)
console
.
log
(
quT
,
stillT
)
if
(
this
.
use_day
==
0.5
){
if
(
quT
>=
stillT
){
...
...
pages/user-center/user-center.vue
View file @
0f3b3a75
...
...
@@ -148,7 +148,7 @@
</view>
</view>
</view>
<view
:class=
"meueData.user_center.menu_style == 1 ? 'menus2' : 'menus'"
v-if=
"meueData.user_center&& meueData.user_center.is_menu_status == 1"
>
<view
:class=
"meueData.user_center.menu_style == 1 ? 'menus2' : 'menus'"
v-if=
"meueData.user_center&& meueData.user_center.is_menu_status == 1"
style=
"margin-bottom: 50px;"
>
<view
:class=
"meueData.user_center.menu_style == 1 ? 'menus_item2' : 'menus_item'"
v-for=
"(item, index) in meueData.user_center.menus"
...
...
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