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
9b151619
Commit
9b151619
authored
Oct 11, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
702483d7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
734 additions
and
561 deletions
+734
-561
style1.vue
components/educationteacher/style1.vue
+131
-98
style2.vue
components/goods/style2.vue
+252
-201
style5.vue
components/goods/style5.vue
+250
-205
jz_LineDetail.vue
pages/jiuzhai/jz_LineDetail.vue
+72
-54
jz_Reserve.vue
pages/jiuzhai/jz_Reserve.vue
+23
-1
detail.vue
pages/ticketCoupons/detail.vue
+6
-2
No files found.
components/educationteacher/style1.vue
View file @
9b151619
<
template
>
<view
class=
"her-scoller"
:style=
"
{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<view
class=
"good-five"
@
click=
"openGood(item)"
v-for=
"(item, gli) in goodList"
:key=
"gli"
:style=
"
{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view
class=
"list-box"
>
<view
class=
"img-box"
>
<image
style=
"width: 100%; height: 100%; border-radius: 50%;"
mode=
"aspectFill"
:src=
"item.picUrl"
/>
</view>
<view
class=
"textone"
style=
"font-size: 14px;font-weight: bold;margin: 5px 0;"
>
{{
item
.
name
}}
</view>
<view
style=
"display: flex;align-items: center;margin-top: 5px;margin-bottom: 14px;"
>
<image
style=
"width: 23px; height: 15px;margin-right: 5px;"
mode=
"aspectFill"
:src=
"item.foreignersUrl"
/>
<text
>
{{
item
.
nationality
}}
</text>
</view>
<view
class=
"textone"
>
<text
v-for=
"(x, y) in item.lableNameList"
:key=
"y"
v-if=
"item.lableNameList!=null && item.lableNameList.length>0"
>
{{
x
}}{{
item
.
lableNameList
.
length
==
y
+
1
?
''
:
'、'
}}
</text>
<text
v-if=
"item.lableNameList==null || item.lableNameList.length==0"
>
教育
</text>
</view>
</view>
</view>
<good-sku
v-if=
"showSku"
:option-type=
"2"
borderRadius=
"20"
v-model=
"showSku"
:good=
"sku"
></good-sku>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
</view>
<view
class=
"her-scoller"
:style=
"
{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '',
}"
>
<view
class=
"good-five"
@
click=
"openGood(item)"
v-for=
"(item, gli) in goodList"
:key=
"gli"
:style=
"
{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}"
>
<view
class=
"list-box"
>
<view
class=
"img-box"
>
<image
style=
"width: 100%; height: 100%; border-radius: 50%"
mode=
"aspectFill"
:src=
"item.picUrl"
/>
</view>
<view
class=
"textone"
style=
"font-size: 14px; font-weight: bold; margin: 5px 0"
>
{{
item
.
name
}}
</view
>
<view
style=
"
display: flex;
align-items: center;
margin-top: 5px;
margin-bottom: 14px;
"
>
<image
style=
"width: 23px; height: 15px; margin-right: 5px"
mode=
"aspectFill"
:src=
"item.foreignersUrl"
/>
<text>
{{
item
.
nationality
}}
</text>
</view>
<view
class=
"textone"
>
<text
v-for=
"(x, y) in item.lableNameList"
:key=
"y"
v-if=
"item.lableNameList != null && item.lableNameList.length > 0"
>
{{
x
}}{{
item
.
lableNameList
.
length
==
y
+
1
?
""
:
"、"
}}
</text>
<text
v-if=
"item.lableNameList == null || item.lableNameList.length == 0"
>
教育
</text>
</view>
</view>
</view>
<good-sku
v-if=
"showSku"
:option-type=
"2"
borderRadius=
"20"
v-model=
"showSku"
:good=
"sku"
></good-sku>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
</view>
</
template
>
<
script
>
import
goodSku
from
'../goods/goodsku'
;
import
auth
from
'@/components/auth/index.vue'
;
import
goodSku
from
"../goods/goodsku"
;
import
auth
from
"@/components/auth/index.vue"
;
export
default
{
components
:
{
goodSku
,
auth
},
props
:
[
'goodList'
,
'goodsInfo'
],
data
()
{
return
{
mainColor
:
''
,
activeKey
:
0
,
showSku
:
false
,
sku
:
{},
showAuth
:
false
,
u
:
{}
};
},
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
},
methods
:
{
openGood
(
item
)
{
uni
.
navigateTo
({
url
:
'/pages/school/teacherDetails?ID='
+
item
.
id
});
},
}
components
:
{
goodSku
,
auth
,
},
props
:
[
"goodList"
,
"goodsInfo"
],
data
()
{
return
{
mainColor
:
""
,
activeKey
:
0
,
showSku
:
false
,
sku
:
{},
showAuth
:
false
,
u
:
{},
};
},
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
},
methods
:
{
openGood
(
item
)
{
uni
.
navigateTo
({
url
:
"/pages/school/teacherDetails?ID="
+
item
.
id
});
},
},
};
</
script
>
<
style
>
<
style
scoped
>
.her-scoller
{
overflow-x
:
auto
!important
;
padding
:
12px
;
/* display: flex; */
white-space
:
nowrap
;
overflow-x
:
auto
!important
;
padding
:
12px
;
/* display: flex; */
white-space
:
nowrap
;
}
/* .her-scoller::after {
clear: both;
...
...
@@ -90,31 +119,35 @@ export default {
display: block;
} */
.her-scoller
.good-five
{
position
:
relative
;
margin-right
:
12px
;
width
:
120px
;
border
:
1
rpx
solid
transparent
;
border-radius
:
10
rpx
;
padding
:
10px
;
display
:
inline-block
;
box-shadow
:
0
5px
10
upx
rgba
(
0
,
0
,
0
,
0.1
);
background
:
#FFF
;
/* float: left; */
position
:
relative
;
margin-right
:
12px
;
width
:
120px
;
border
:
1
rpx
solid
transparent
;
border-radius
:
10
rpx
;
padding
:
10px
;
display
:
inline-block
;
box-shadow
:
0
5px
10
upx
rgba
(
0
,
0
,
0
,
0.1
);
background
:
#fff
;
/* float: left; */
}
.her-scoller
.good-five
.img-box
{
width
:
40px
;
height
:
40px
;
border-radius
:
50%
;
width
:
40px
;
height
:
40px
;
border-radius
:
50%
;
}
.list-box
{
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
font-size
:
12px
;
color
:
#333F53
;
.list-box
{
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
font-size
:
12px
;
color
:
#333f53
;
}
.textone
{
width
:
100%
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
text-align
:
center
;
.textone
{
width
:
100%
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
text-align
:
center
;
}
</
style
>
components/goods/style2.vue
View file @
9b151619
This diff is collapsed.
Click to expand it.
components/goods/style5.vue
View file @
9b151619
This diff is collapsed.
Click to expand it.
pages/jiuzhai/jz_LineDetail.vue
View file @
9b151619
...
...
@@ -42,21 +42,20 @@
</view>
</view>
</view>
<!-- #ifdef MP-WEIXIN -->
<view
@
click=
"goback"
:style=
"[titleStyle,
{ opacity: '100% !important' }]"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
>
<!-- #ifdef MP-WEIXIN -->
<u-icon
name=
"arrow-left"
size=
"44"
color=
"#FFF"
style=
"margin-top: 22rpx"
></u-icon>
<!-- #endif -->
</view>
<!-- #endif -->
</view>
<view
class=
"top-title"
:style=
"[titleStyle]"
>
<view
@
click=
"goback"
>
...
...
@@ -99,7 +98,7 @@
>
2728人出游
</text
>
</view>
<!--
<view
class=
"jz_OrderNow"
@
click=
"downloadFile"
>
下载
</view>
<!--
<view
class=
"jz_OrderNow"
@
click=
"downloadFile"
>
下载
</view>
<view
class=
"jz_OrderNow"
@
click=
"downloadFile2"
>
下载2
</view>
-->
<view
class=
"jz_MainTitle"
>
<text
v-if=
"dataList.title"
>
{{
dataList
.
title
}}
</text>
...
...
@@ -892,12 +891,11 @@
<view
class=
"jz_OrderDiv"
>
<view
style=
"color: #ff3166; font-weight: bold"
>
<text
style=
"font-size: 22rpx"
>
¥
</text>
<text
style=
"font-size: 40rpx"
>
{{
$utils.getretailer() == true
<!-- b2b -->
? currentPrice.b2CPrice
: currentPrice.b2CPrice
}}
</text>
<text
style=
"font-size: 40rpx"
>
{{ $utils.getretailer() == true
<!-- b2b -->
? currentPrice.b2CPrice : currentPrice.b2CPrice }}
</text
>
<text
style=
"font-size: 22rpx"
>
/起
</text>
</view>
<view
style=
"display: flex; align-items: center"
>
...
...
@@ -984,55 +982,75 @@ export default {
that
.
titleStyle
=
{
height
:
"45px"
,
paddingTop
:
`
${
res
.
statusBarHeight
}
px`
,
opacity
:
"0"
,
opacity
:
0
,
};
},
});
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
},
methods
:
{
downloadFile
(){
let
msg
=
{
"configId"
:
"7274"
,
"cityId"
:
"0"
,
"tcid"
:
"11409"
,
"orderId"
:
"0"
,
"FileName"
:
"2021-10-11飞猪平台九寨沟3天2晚3日游"
,
"isShowBase"
:
1
,
"isShowFlight"
:
1
,
"isShowFeature"
:
1
,
"isShowFee"
:
1
,
"isShowShop"
:
1
,
"isShowTip"
:
1
,
"isShowB2B"
:
1
,
"isShowTrip"
:
1
,
"isShowTitle"
:
0
,
"isShowGuest"
:
0
,
"isShowMan"
:
1
,
"isShowTCNUM"
:
1
,
"isShowTripImage"
:
1
,
"isShowVisa"
:
1
,
"isShowVideoImg"
:
1
,
"isPc"
:
2
,
"templateId"
:
3
,
"UId"
:
615
}
this
.
apipostDownload
(
"GetWebHtmlTwo_V2"
,
msg
,
(
res
)
=>
{
console
.
log
(
res
)
let
url
=
"https://reborn.oytour.com"
+
res
.
data
uni
.
downloadFile
({
url
:
url
,
success
:
(
res
)
=>
{
if
(
res
.
statusCode
===
200
)
{
console
.
log
(
'下载成功'
);
}
}
});
})
}
,
downloadFile2
(){
let
url
=
"https://reborn.oytour.com/Upload/Temporary/C7274_T11409_CTY0_OD0_MMDD637695432017412893_1_1.pdf"
uni
.
downloadFile
({
url
:
url
,
success
:
(
res
)
=>
{
console
.
log
(
'suc'
,
res
);
if
(
res
.
statusCode
===
200
)
{
console
.
log
(
'下载成功'
);
const
tempFilePath
=
res
.
tempFilePath
//返回的文件临时地址,用于后面打开本地预览所用
wx
.
openDocument
({
filePath
:
tempFilePath
,
showMenu
:
true
,
fileType
:
"pdf"
,
success
:
function
(
res
)
{}
})
}
},
fail
(
err
){
console
.
log
(
'err'
,
err
);
}
});
},
downloadFile
()
{
let
msg
=
{
configId
:
"7274"
,
cityId
:
"0"
,
tcid
:
"11409"
,
orderId
:
"0"
,
FileName
:
"2021-10-11飞猪平台九寨沟3天2晚3日游"
,
isShowBase
:
1
,
isShowFlight
:
1
,
isShowFeature
:
1
,
isShowFee
:
1
,
isShowShop
:
1
,
isShowTip
:
1
,
isShowB2B
:
1
,
isShowTrip
:
1
,
isShowTitle
:
0
,
isShowGuest
:
0
,
isShowMan
:
1
,
isShowTCNUM
:
1
,
isShowTripImage
:
1
,
isShowVisa
:
1
,
isShowVideoImg
:
1
,
isPc
:
2
,
templateId
:
3
,
UId
:
615
,
};
this
.
apipostDownload
(
"GetWebHtmlTwo_V2"
,
msg
,
(
res
)
=>
{
console
.
log
(
res
);
let
url
=
"https://reborn.oytour.com"
+
res
.
data
;
uni
.
downloadFile
({
url
:
url
,
success
:
(
res
)
=>
{
if
(
res
.
statusCode
===
200
)
{
console
.
log
(
"下载成功"
);
}
},
});
});
},
downloadFile2
()
{
let
url
=
"https://reborn.oytour.com/Upload/Temporary/C7274_T11409_CTY0_OD0_MMDD637695432017412893_1_1.pdf"
;
uni
.
downloadFile
({
url
:
url
,
success
:
(
res
)
=>
{
console
.
log
(
"suc"
,
res
);
if
(
res
.
statusCode
===
200
)
{
console
.
log
(
"下载成功"
);
const
tempFilePath
=
res
.
tempFilePath
;
//返回的文件临时地址,用于后面打开本地预览所用
wx
.
openDocument
({
filePath
:
tempFilePath
,
showMenu
:
true
,
fileType
:
"pdf"
,
success
:
function
(
res
)
{},
});
}
},
fail
(
err
)
{
console
.
log
(
"err"
,
err
);
},
});
},
openOrderPreview
()
{
if
(
this
.
canCreateOrder
&&
this
.
finishFirstLoad
)
{
this
.
showOrderPreviwe
=
true
;
...
...
@@ -1263,7 +1281,7 @@ export default {
encodeURIComponent
(
this
.
dataList
.
feature
.
importantTipText
),
});
},
// #ifdef MP-WEIXIN
//分享朋友圈
onShareTimeline
()
{
...
...
pages/jiuzhai/jz_Reserve.vue
View file @
9b151619
...
...
@@ -869,8 +869,30 @@ export default {
}
);
},
PayAli
(
OrderId
)
{
PayAli
(
tradeNO
)
{
let
that
=
this
;
my
.
tradePay
({
tradeNO
:
tradeNO
,
success
:
function
(
res
)
{
console
.
log
(
"success"
,
res
);
uni
.
showToast
({
title
:
"支付成功"
,
});
setTimeout
(()
=>
{
uni
.
redirectTo
({
url
:
"/pages/jiuzhai/paysuccess?PreferPrice="
+
price
,
});
},
100
);
},
fail
:
function
(
err
)
{
console
.
log
(
"fail:"
,
err
);
uni
.
showToast
({
title
:
"支付失败"
,
icon
:
"none"
,
});
},
});
return
;
uni
.
requestPayment
({
provider
:
"wxpay"
,
timeStamp
:
this
.
orderInfo
.
timeStamp
,
...
...
pages/ticketCoupons/detail.vue
View file @
9b151619
...
...
@@ -232,7 +232,7 @@
:class=
"
{ 'last-item': index == TicketList.length - 1 }"
v-if="TicketList.length > 0"
>
<view
class=
"ticket-key"
>
<view
class=
"ticket-key"
v-if=
"item.Key"
>
{{
item
.
Key
}}
</view>
<view
class=
"ticket-list"
>
...
...
@@ -553,7 +553,7 @@ export default {
that
.
titleStyle
=
{
height
:
"45px"
,
paddingTop
:
`
${
res
.
statusBarHeight
}
px`
,
opacity
:
"0"
,
opacity
:
0
,
};
},
});
...
...
@@ -1197,6 +1197,10 @@ export default {
position
:
relative
;
.TicketName
{
max-width
:
450rpx
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
font-size
:
28rpx
;
font-family
:
PingFang
SC
;
font-weight
:
bold
;
...
...
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