Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jz_Travel
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
zhengke
jz_Travel
Commits
bdd2af9b
Commit
bdd2af9b
authored
Oct 11, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
6b08fb1d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
236 additions
and
199 deletions
+236
-199
style1.vue
components/goods/style1.vue
+217
-169
style2.vue
components/goods/style2.vue
+5
-10
jz_Reserve.vue
pages/jiuzhai/jz_Reserve.vue
+9
-1
detail.vue
pages/restaurant/detail.vue
+3
-17
detail.vue
pages/ticketCoupons/detail.vue
+2
-2
No files found.
components/goods/style1.vue
View file @
bdd2af9b
This diff is collapsed.
Click to expand it.
components/goods/style2.vue
View file @
bdd2af9b
...
@@ -251,28 +251,23 @@ export default {
...
@@ -251,28 +251,23 @@ export default {
padding-bottom: 0; */
padding-bottom: 0; */
}
}
.good-two
.good-info
.good-name
{
.good-two
.good-info
.good-name
{
width
:
100%
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
/* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; */
white-space
:
nowrap
;
margin-bottom
:
10
rpx
;
margin-bottom
:
10
rpx
;
font-size
:
26
rpx
;
font-size
:
26
rpx
;
font-weight
:
600
;
font-weight
:
600
;
/* height: 37px; */
}
}
.good-two
.good-info
.good-sub-name
{
.good-two
.good-info
.good-sub-name
{
width
:
100%
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
/* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; */
white-space
:
nowrap
;
margin-bottom
:
10
rpx
;
margin-bottom
:
10
rpx
;
font-size
:
22
rpx
;
font-size
:
22
rpx
;
color
:
#999999
;
color
:
#999999
;
/* height: 37px; */
}
}
.good-two
.good-info
.good-price-info
{
.good-two
.good-info
.good-price-info
{
display
:
flex
;
display
:
flex
;
...
...
pages/jiuzhai/jz_Reserve.vue
View file @
bdd2af9b
...
@@ -864,7 +864,15 @@ export default {
...
@@ -864,7 +864,15 @@ export default {
},
},
(
res
)
=>
{
(
res
)
=>
{
this
.
orderInfo
=
JSON
.
parse
(
res
.
data
);
this
.
orderInfo
=
JSON
.
parse
(
res
.
data
);
// this.PayAli(OrderId);
if
(
res
.
data
)
{
this
.
PayAli
(
res
.
data
);
}
else
{
uni
.
showToast
({
title
:
"获取交易号失败"
,
duration
:
2000
,
});
}
console
.
log
(
873
,
res
);
console
.
log
(
873
,
res
);
}
}
);
);
...
...
pages/restaurant/detail.vue
View file @
bdd2af9b
...
@@ -16,21 +16,20 @@
...
@@ -16,21 +16,20 @@
name=
"picUrl"
name=
"picUrl"
v-if=
"active == 1"
v-if=
"active == 1"
></u-swiper>
></u-swiper>
<!-- #ifdef MP-WEIXIN -->
<view
<view
@
click=
"goback"
@
click=
"goback"
:style=
"[titleStyle,
{ opacity: '100% !important' }]"
:style=
"[titleStyle,
{ opacity: '100% !important' }]"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
>
>
<!-- #ifdef MP-WEIXIN -->
<u-icon
<u-icon
name=
"arrow-left"
name=
"arrow-left"
size=
"44"
size=
"44"
color=
"#FFF"
color=
"#FFF"
style=
"margin-top: 22rpx"
style=
"margin-top: 22rpx"
></u-icon>
></u-icon>
<!-- #endif -->
</view>
</view>
<!-- #endif -->
</view>
</view>
<view
class=
"restaurant-title"
:style=
"[titleStyle]"
>
<view
class=
"restaurant-title"
:style=
"[titleStyle]"
>
<view
@
click=
"goback"
>
<view
@
click=
"goback"
>
...
@@ -284,20 +283,7 @@ import calendar from "./components/uni-calendar/uni-calendar.vue";
...
@@ -284,20 +283,7 @@ import calendar from "./components/uni-calendar/uni-calendar.vue";
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
imgsList
:
[
imgsList
:
[],
// {
// picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
// }
],
ID
:
0
,
ID
:
0
,
details
:
{},
details
:
{},
typeList
:
[
typeList
:
[
...
...
pages/ticketCoupons/detail.vue
View file @
bdd2af9b
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
"
"
:style=
"
{ opacity: 100 - boxOption + '%' }"
:style=
"
{ opacity: 100 - boxOption + '%' }"
>
>
<!-- #ifdef MP-WEIXIN -->
<view
<view
@
click=
"goback"
@
click=
"goback"
:style=
"[titleStyle,
{ opacity: '100% !important' }]"
:style=
"[titleStyle,
{ opacity: '100% !important' }]"
...
@@ -28,15 +29,14 @@
...
@@ -28,15 +29,14 @@
padding-left: 6rpx;
padding-left: 6rpx;
"
"
>
>
<!-- #ifdef MP-WEIXIN -->
<u-icon
<u-icon
name=
"arrow-left"
name=
"arrow-left"
size=
"44"
size=
"44"
color=
"#ffffff"
color=
"#ffffff"
style=
"margin-top: 22rpx"
style=
"margin-top: 22rpx"
></u-icon>
></u-icon>
<!-- #endif -->
</view>
</view>
<!-- #endif -->
<image
<image
class=
"banner-img"
class=
"banner-img"
:src=
"details.AllPicList[0].TagPicList[0].Path"
:src=
"details.AllPicList[0].TagPicList[0].Path"
...
...
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