Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
FlashMan
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
华国豪
FlashMan
Commits
06f383ae
Commit
06f383ae
authored
Jul 08, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增优惠券
parent
669dc424
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
648 additions
and
207 deletions
+648
-207
app.js
app.js
+8
-8
app.json
app.json
+1
-0
Voucher.js
pages/Voucher/Voucher.js
+59
-43
Voucher.wxml
pages/Voucher/Voucher.wxml
+10
-3
Voucher.wxss
pages/Voucher/Voucher.wxss
+23
-1
write.js
pages/Voucher/write/write.js
+2
-2
member.wxml
pages/member/member.wxml
+1
-1
orderCenter.js
pages/member/orderCenter/orderCenter.js
+52
-19
orderCenter.wxml
pages/member/orderCenter/orderCenter.wxml
+54
-18
orderCenter.wxss
pages/member/orderCenter/orderCenter.wxss
+1
-0
orderDeatils.js
pages/member/orderDeatils/orderDeatils.js
+44
-13
orderDeatils.wxml
pages/member/orderDeatils/orderDeatils.wxml
+384
-82
project.config.json
project.config.json
+9
-17
No files found.
app.js
View file @
06f383ae
...
...
@@ -52,8 +52,8 @@ App({
let
sign
=
md5
(
'cmd='
+
url
+
'&'
+
'msg='
+
encodeURIComponent
(
data
).
toLowerCase
()
+
'&'
+
'timestamp='
+
timestamp
+
'&'
+
'token='
+
getApp
().
state
.
admin
.
token
+
'&'
+
'key='
+
''
)
wx
.
request
({
// url: 'http://192.168.2.214:8082/api/Common/Post',
//
url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
url
:
'https://reborn.oytour.com/api/common/post'
,
//线上
url
:
'http://192.168.2.65:8025/api/Common/Post'
,
//春姐
//
url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post',
method
:
'POST'
,
...
...
@@ -92,8 +92,8 @@ App({
let
sign
=
md5
(
'cmd='
+
url
+
'&'
+
'msg='
+
encodeURIComponent
(
data
).
toLowerCase
()
+
'&'
+
'timestamp='
+
timestamp
+
'&'
+
'token='
+
getApp
().
state
.
admin
.
token
+
'&'
+
'key='
+
''
)
wx
.
request
({
// url: 'http://192.168.2.214:8082/api/Common/Post',
//
url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
url
:
'https://reborn.oytour.com/api/common/post'
,
//线上
url
:
'http://192.168.2.65:8025/api/Common/Post'
,
//春姐
//
url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post',
method
:
'POST'
,
...
...
@@ -124,8 +124,8 @@ App({
let
timestamp
=
(
new
Date
()).
valueOf
()
let
sign
=
md5
(
'msg='
+
encodeURIComponent
(
JSON
.
stringify
(
msg
)).
toLowerCase
()
+
'&'
+
'timestamp='
+
timestamp
+
'&'
+
'token='
+
token
+
'&'
+
'key='
+
secretKey
)
wx
.
request
({
url
:
'https://efficient.oytour.com/'
+
url
,
//线上
//
url: 'http://47.96.12.235:9001/' + url, //测试
//
url: 'https://efficient.oytour.com/'+ url, //线上
url
:
'http://47.96.12.235:9001/'
+
url
,
//测试
// url: 'http://192.168.2.215:9000/'+ url,
method
:
'POST'
,
...
...
@@ -173,8 +173,8 @@ App({
let
timestamp
=
(
new
Date
()).
valueOf
()
let
sign
=
md5
(
'msg='
+
encodeURIComponent
(
JSON
.
stringify
(
msg
)).
toLowerCase
()
+
'&'
+
'timestamp='
+
timestamp
+
'&'
+
'token='
+
token
+
'&'
+
'key='
+
secretKey
)
wx
.
request
({
url
:
'https://efficient.oytour.com/'
+
url
,
//线上
//
url: 'http://47.96.12.235:9001/' + url, //测试
//
url: 'https://efficient.oytour.com/'+ url, //线上
url
:
'http://47.96.12.235:9001/'
+
url
,
//测试
method
:
'POST'
,
data
:
{
...
...
app.json
View file @
06f383ae
...
...
@@ -24,6 +24,7 @@
"pages/member/investigation/investigation"
,
"pages/member/nameList/nameList"
,
"pages/member/invesDetails/invesDetails"
,
"pages/member/Coupon/Coupon"
,
"pages/visa/visa"
,
"pages/Voucher/Voucher"
,
"pages/Voucher/rating/rating"
,
...
...
pages/Voucher/Voucher.js
View file @
06f383ae
...
...
@@ -7,11 +7,57 @@ Page({
*/
data
:
{
telPhone
:
''
,
tcId
:
null
,
orderId
:
null
tcId
:
904
,
orderId
:
null
,
dataList
:
[],
},
goPage
:
function
(
e
)
{
console
.
log
(
e
)
let
index
=
e
.
currentTarget
.
dataset
.
index
;
let
name
=
this
.
data
.
dataList
[
index
].
nameID
let
orderId
=
this
.
data
.
dataList
[
index
].
OrderId
wx
.
setStorage
({
key
:
"info"
,
data
:
{
ID
:
this
.
data
.
dataList
[
index
].
Id
,
nameID
:
name
}
})
wx
.
navigateTo
({
url
:
'/pages/Voucher/VoucherDetails/VoucherDetails?&orderId='
+
orderId
+
'&tcId='
+
this
.
data
.
tcId
// url: '/pages/Voucher/VoucherDetails/VoucherDetails?&orderId=' + _this.data.orderId + '&tcId=3278'
})
return
wx
.
navigateTo
({
url
:
'/pages/Voucher/VoucherDetails/VoucherDetails?&orderId='
+
orderId
+
'&tcId='
+
_this
.
data
.
tcId
// url: '/pages/Voucher/VoucherDetails/VoucherDetails?&orderId=' + _this.data.orderId + '&tcId=3278'
})
},
//问券详情跳转
Details
:
function
(
e
)
{
let
data
=
{
guestMobile
:
this
.
data
.
telPhone
,
TCID
:
this
.
data
.
tcId
// TCID: 3278
}
app
.
$api
(
'miniProgram_price_GetGuestByPhone'
,
data
).
then
(
res
=>
{
let
_this
=
this
;
let
data
=
res
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
){
data
[
i
].
nameID
=
data
[
i
].
SurName
+
(
data
[
i
].
Sex
===
1
?
'先生'
:
'女士'
);
data
[
i
].
MobilePhoneS
=
data
[
i
].
MobilePhone
.
substr
(
0
,
3
)
+
'****'
+
data
[
i
].
MobilePhone
.
substr
(
7
)
}
_this
.
setData
({
dataList
:
data
})
}).
catch
(
err
=>
{
wx
.
showToast
({
title
:
err
.
message
,
icon
:
'none'
,
duration
:
1000
})
})
return
if
(
!
this
.
data
.
telPhone
)
{
wx
.
showToast
({
title
:
'请输入手机号'
,
...
...
@@ -19,41 +65,7 @@ Page({
duration
:
1000
})
}
else
{
let
data
=
{
guestMobile
:
this
.
data
.
telPhone
,
TCID
:
this
.
data
.
tcId
}
app
.
$api
(
'miniProgram_price_GetGuestByPhone'
,
data
).
then
(
res
=>
{
if
(
res
.
Id
===
0
)
{
wx
.
showToast
({
title
:
'旅客信息有误,请检查手机号'
,
icon
:
'none'
,
duration
:
1000
})
return
}
let
_this
=
this
;
let
nameID
=
res
.
SurName
+
(
res
.
Sex
===
1
?
'先生'
:
'女士'
);
wx
.
setStorage
({
key
:
"info"
,
data
:
{
nameID
:
nameID
,
ID
:
res
.
Id
,
}
})
this
.
setData
({
orderId
:
res
.
OrderId
})
wx
.
navigateTo
({
url
:
'/pages/Voucher/VoucherDetails/VoucherDetails?&orderId='
+
_this
.
data
.
orderId
+
'&tcId='
+
_this
.
data
.
tcId
})
}).
catch
(
err
=>
{
wx
.
showToast
({
title
:
err
.
message
,
icon
:
'none'
,
duration
:
1000
})
})
}
},
...
...
@@ -70,13 +82,17 @@ Page({
onLoad
:
function
(
options
)
{
const
scene
=
decodeURIComponent
(
options
.
scene
)
if
(
scene
)
{
// let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.tcid;
let
tcId
=
4006
console
.
log
(
tcId
)
this
.
setData
({
tcId
:
tcId
})
let
tcId
=
scene
.
split
(
'='
)[
1
]
?
scene
.
split
(
'='
)[
1
]
:
options
.
tcid
;
// let tcId = 4006
// this.setData({
// tcId: tcId
// })
}
else
{
// this.setData({
// tcId: 3278
// })
}
this
.
Details
()
//修改title
wx
.
setNavigationBarTitle
({
title
:
'意见调查'
...
...
pages/Voucher/Voucher.wxml
View file @
06f383ae
<view class='page-Voucher'>
<text class='text'>身份确认</text>
<view class='page-Voucher'>
<view class='item' wx:for="{{dataList}}" wx:for-index="index" wx:for-item="item" wx:key="index" data-index="{{index}}" bindtap='goPage'>
<view>
<text class='name'>{{item.SurName + item.Name}}</text>
<text class='phone'>{{item.MobilePhoneS}}</text>
</view>
<image mode='widthFix' src='../../images/group/chakn.png'></image>
</view>
<!-- <text class='text'>身份确认</text>
<input bindinput='TelPhone' placeholder='请输入手机号以确认身份'></input>
<button class='next {{telPhone !== "" ? "active" : ""}}' type="default" size="mini" bindtap="Details">确认</button>
<button class='next {{telPhone !== "" ? "active" : ""}}' type="default" size="mini" bindtap="Details">确认</button>
-->
</view>
\ No newline at end of file
pages/Voucher/Voucher.wxss
View file @
06f383ae
...
...
@@ -2,10 +2,32 @@ page{
height: 100%
}
.page-Voucher{
padding:
162rpx 49
rpx;
padding:
20
rpx;
height: 100%;
background-color: white;
}
.page-Voucher .item{
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx 0;
font-size: 28rpx;
border-bottom: 1px solid #DEDEDE
}
.page-Voucher .item>view{
display: flex;
align-items: center;
}
.phone{
padding-left: 10rpx;
}
.name{
width: 250rpx;
display: inline-block;
}
.page-Voucher .item image{
width: 10rpx;
}
.page-Voucher .text{
font-size: 48rpx;
font-weight:500;
...
...
pages/Voucher/write/write.js
View file @
06f383ae
...
...
@@ -64,8 +64,8 @@ Page({
})
app
.
$api
(
'survey_post_SetGuestTravelNotes'
,
msg
).
then
(
res
=>
{
if
(
res
.
Id
>
0
)
{
thi
.
setData
({
ActivateCode
:
ActivateCode
,
thi
s
.
setData
({
ActivateCode
:
res
.
ActivateCode
,
})
}
this
.
setData
({
...
...
pages/member/member.wxml
View file @
06f383ae
...
...
@@ -143,7 +143,7 @@
</view>
<view>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/
visa/visa
">
<button hover-class="btn-hover" form-type="submit" data-url="/pages/
member/Coupon/Coupon
">
<image mode="aspectFit" src="../../images/menber/menu-you.png"></image>
<view class='order-type-name'>我的优惠券</view>
</button>
...
...
pages/member/orderCenter/orderCenter.js
View file @
06f383ae
...
...
@@ -43,6 +43,20 @@ Page({
ID
:
3
,
}
],
TitListJiPiao
:
[
{
Type
:
"待付款"
,
ID
:
1
},
{
Type
:
"正常"
,
ID
:
2
},
{
Type
:
"取消"
,
ID
:
3
}
],
tagList
:
[
{
id
:
1
,
...
...
@@ -105,35 +119,39 @@ Page({
tagIndex
:
0
,
},
formSubmit
:
function
(
e
)
{
console
.
log
(
e
)
wx
.
getStorage
({
key
:
'admin'
,
success
:
res
=>
{
let
index
=
e
.
detail
.
target
.
dataset
.
index
;
let
formId
=
e
.
detail
.
formId
app
.
$apiSaveFormId
(
'survey_post_SaveFormId'
,
{
formId
:
formId
,
customerId
:
res
.
data
.
id
}).
then
(
res
=>
{
console
.
log
(
res
)
}).
catch
(
err
=>
{
})
console
.
log
(
formId
,
code
)
let
index
=
e
.
currentTarget
.
dataset
.
index
;
// let formId = e.detail.formId
// app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => {
// console.log(res)
// }).catch(err => { })
this
.
goDetails
(
index
)
}
})
},
endPaoPao
:
function
()
{
console
.
log
(
'阻止冒泡····'
)
},
// 跳转详情页面
goDetails
:
function
(
e
)
{
let
index
=
e
,
item
=
this
.
data
.
dataList
[
index
];
let
orderId
=
item
.
orderId
?
item
.
orderId
:
item
.
id
wx
.
setStorage
({
key
:
"DetailsItem"
,
data
:
item
})
wx
.
navigateTo
({
url
:
'/pages/member/orderDeatils/orderDeatils?tagID='
+
this
.
data
.
tagID
+
'&tagIndex='
+
this
.
data
.
tagIndex
,
url
:
'/pages/member/orderDeatils/orderDeatils?tagID='
+
this
.
data
.
tagID
+
'&tagIndex='
+
this
.
data
.
tagIndex
+
'&orderId='
+
orderId
,
})
},
// 加载更多
scrollGetMore
:
function
()
{
this
.
setData
({
'getOrderMsg.pageIndex'
:
this
.
data
.
pageIndex
+
1
'getOrderMsg.pageIndex'
:
this
.
data
.
pageIndex
+
1
,
})
this
.
getOrderList
(
1
)
},
...
...
@@ -142,12 +160,15 @@ Page({
let
url
=
'api/b2b/user/getrecentorder'
,
tagID
=
this
.
data
.
tagID
,
msg
=
this
.
data
.
getOrderMsg
;
if
(
tagID
!==
6
&&
tagID
!==
8
)
{
if
(
tagID
!==
6
&&
tagID
!==
8
&&
tagID
!==
4
)
{
// console.log(tagID)
url
=
'api/b2b/user/getrecentorder'
}
else
{
// 8美食 6门票
}
else
if
(
tagID
!==
4
)
{
// 8美食 6门票
msg
.
status
=
msg
.
orderState
url
=
tagID
==
8
?
'api/b2b/food/getFoodOrder'
:
'api/b2b/scenic/getTicketCouponsOrder'
}
else
{
msg
.
status
=
msg
.
orderState
url
=
'api/b2b/user/getAirTicketOrder'
}
this
.
data
.
getOrderMsg
.
CustomerId
=
this
.
data
.
userInfo
.
id
if
(
this
.
data
.
pageIndex
>=
this
.
data
.
totalPage
&&
type
){
...
...
@@ -155,7 +176,7 @@ Page({
}
app
.
$apiJavaNew
(
url
,
msg
).
then
(
res
=>
{
let
arr
=
this
.
data
.
dataList
;
let
arr2
=
res
.
pageData
let
arr2
=
res
.
pageData
?
res
.
pageData
:
[];
for
(
let
i
=
0
;
i
<
arr2
.
length
;
i
++
)
{
if
(
tagID
!==
6
&&
tagID
!==
8
)
{
arr2
[
i
].
day
=
arr2
[
i
].
createDate
.
replace
(
/-/g
,
'.'
).
substring
(
0
,
10
)
...
...
@@ -164,6 +185,7 @@ Page({
}
}
if
(
type
)
{
console
.
log
(
type
,
'组装数据'
)
for
(
let
i
=
0
;
i
<
arr2
.
length
;
i
++
){
arr
.
push
(
arr2
[
i
])
}
...
...
@@ -172,9 +194,9 @@ Page({
}
this
.
setData
({
dataList
:
arr
,
totalPage
:
res
.
pageCount
,
pageIndex
:
res
.
pageIndex
,
count
:
res
.
count
totalPage
:
res
.
pageCount
?
res
.
pageCount
:
1
,
pageIndex
:
res
.
pageIndex
?
res
.
pageIndex
:
1
,
count
:
res
.
count
?
res
.
count
:
1
})
}).
catch
(
err
=>
{
})
},
...
...
@@ -186,8 +208,10 @@ Page({
}
else
{
index
=
Number
(
e
.
target
.
id
.
split
(
'active'
)[
1
])
}
if
(
this
.
data
.
tagList
[
index
].
name
!==
'美食'
&&
this
.
data
.
tagList
[
index
].
name
!==
'门票'
){
if
(
this
.
data
.
tagList
[
index
].
name
!==
'美食'
&&
this
.
data
.
tagList
[
index
].
name
!==
'门票'
&&
this
.
data
.
tagList
[
index
].
name
!==
'机票'
){
TitList
=
this
.
data
.
TitListTc
}
else
if
(
this
.
data
.
tagList
[
index
].
name
==
'机票'
){
TitList
=
this
.
data
.
TitListJiPiao
}
else
{
TitList
=
this
.
data
.
TitListMenJi
}
...
...
@@ -198,7 +222,7 @@ Page({
pageIndex
:
1
,
TitList
:
TitList
,
tagID
:
this
.
data
.
tagList
[
index
].
id
,
tagIndex
:
index
tagIndex
:
index
+
1
})
this
.
getOrderList
()
},
...
...
@@ -222,14 +246,23 @@ Page({
*/
onLoad
:
function
(
options
)
{
let
userInfo
=
wx
.
getStorageSync
(
'admin'
);
let
index
=
options
.
index
?
Number
(
options
.
index
)
:
null
// console.log(index,this.data.tagList[index-1])
let
index
=
options
.
index
?
Number
(
options
.
index
)
:
1
let
TitList
=
[];
if
(
this
.
data
.
tagList
[
index
-
1
].
name
!==
'美食'
&&
this
.
data
.
tagList
[
index
-
1
].
name
!==
'门票'
&&
this
.
data
.
tagList
[
index
-
1
].
name
!==
'机票'
)
{
TitList
=
this
.
data
.
TitListTc
}
else
if
(
this
.
data
.
tagList
[
index
-
1
].
name
==
'机票'
)
{
TitList
=
this
.
data
.
TitListJiPiao
}
else
{
TitList
=
this
.
data
.
TitListMenJi
}
if
(
index
)
{
this
.
setData
({
tagBoxActive
:
index
-
1
,
userInfo
:
userInfo
,
TitList
:
this
.
data
.
TitListTc
,
TitList
:
TitList
,
tagID
:
this
.
data
.
tagList
[
index
-
1
].
id
,
'getOrderMsg.orderType'
:
this
.
data
.
tagList
[
index
-
1
].
id
,
tagIndex
:
index
})
}
else
{
this
.
setData
({
...
...
pages/member/orderCenter/orderCenter.wxml
View file @
06f383ae
...
...
@@ -18,10 +18,10 @@
</view>
</view>
<scroll-view class='data_body' scroll-y bindscrolltolower="scrollGetMore">
<view wx:if="{{tagID !== 6 && tagID !== 8}}">
<view wx:if="{{tagID !== 6 && tagID !== 8
&& tagID !== 4
}}">
<view class='list-item' wx:for="{{dataList}}" wx:for-item="item" wx:key="index" wx:for-index="index">
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter" data-index='{{index}}'>
<
!-- <
form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter" data-index='{{index}}'>
-->
<text class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagList[tagBoxActive].name}}</text>
<view class='list-item-states'>
<text wx:if="{{item.orderState == 1}}">待付定金</text>
...
...
@@ -30,7 +30,7 @@
<text wx:elif="{{item.orderState == 4}}">交易完成</text>
<text wx:elif="{{item.orderState == 5}}">取消</text>
</view>
<view class='list-item-info' data-index='{{index}}' bindtap='
goDetails
'>
<view class='list-item-info' data-index='{{index}}' bindtap='
formSubmit
'>
<view class='list-item-name'>{{item.title}}</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
...
...
@@ -43,18 +43,18 @@
<view class='list-item-btn'>
<view wx:if="{{item.orderState == 1}}">联系客服</view>
<view wx:if="{{item.orderState == 3 || item.orderState == 2}}">取消订单</view>
<view wx:if="{{item.orderState == 1 || item.orderState == 2}}" class='btn-red'>付款</view>
<view wx:if="{{item.orderState == 1 || item.orderState == 2}}" c
atchtap="endPaoPao" c
lass='btn-red'>付款</view>
<!-- <view class='btn-red'>确认收货</view> -->
<view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view>
</view>
</button>
</form>
<
!-- <
/button>
</form>
-->
</view>
</view>
<view wx:elif="{{tagID ==8}}">
<view class='list-item' wx:for="{{dataList}}" wx:for-item="item" wx:key="index" wx:for-index="index">
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter" data-index='{{index}}'>
<
!-- <
form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter" data-index='{{index}}'>
-->
<text class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagList[tagBoxActive].name}}</text>
<view class='list-item-states'>
<text wx:if="{{item.status == 1}}">正常</text>
...
...
@@ -77,21 +77,21 @@
<view wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view>
</view>
</button>
</form>
<
!-- <
/button>
</form>
-->
</view>
</view>
<view wx:elif="{{tagID ==6}}">
<view class='list-item' wx:for="{{dataList}}" wx:for-item="item" wx:key="index" wx:for-index="index">
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-index='{{index}}'>
<
!-- <
form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-index='{{index}}'>
-->
<text class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagList[tagBoxActive].name}}</text>
<view class='list-item-states'>
<text wx:if="{{item.status == 1}}">正常</text>
<text wx:elif="{{item.status == 2}}">取消</text>
<text wx:elif="{{item.status == 3}}">待付款</text>
</view>
<view class='list-item-info' data-index='{{index}}' bindtap='
goDetails
'>
<view class='list-item-info' data-index='{{index}}' bindtap='
formSubmit
'>
<view class='list-item-name'>{{item.couponsName}}</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
...
...
@@ -107,10 +107,46 @@
<view wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view>
</view>
</button>
</form>
</view>
<!-- </button>
</form> -->
</view>
</view>
<view wx:elif="{{tagID == 4}}">
<view class='list-item' wx:for="{{dataList}}" wx:for-item="item" wx:key="index" wx:for-index="index">
<!-- <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-index='{{index}}'> -->
<text class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagList[tagBoxActive].name}}</text>
<view class='list-item-states'>
<text wx:if="{{item.orderState == 2}}">正常</text>
<text wx:elif="{{item.orderState == 3}}">取消</text>
<text wx:elif="{{item.orderState == 1}}">待付款</text>
</view>
<view class='list-item-info' data-index='{{index}}' bindtap='formSubmit'>
<view class='list-item-name' wx:if="{{item.airticket.ticketType==2}}">
<text>往:{{item.airticket.goStartCityName}} - {{item.airticket.goEndCityName}}</text>
<text style='color: #fff;'>......</text>
<text>返:{{item.airticket.backStartCityName}} - {{item.airticket.backEndCityName}}</text>
</view>
<view wx:else>
{{item.airticket.goStartCityName}} - {{item.airticket.goEndCityName}}
</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
<text>{{item.guestNum+'张'}}</text>
<text>{{item.day}}</text>
</view>
<view>¥{{item.preferPrice}}</view>
</view>
</view>
<view class='list-item-btn'>
<view wx:if="{{item.orderState == 1}}">联系客服</view>
<view wx:if="{{item.orderState == 1}}">取消订单</view>
<view wx:if="{{item.orderState == 1}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 2}}">再次购买</view>
</view>
<!-- </button>
</form> -->
</view>
</view>
<view class='body_footer'>{{pageIndex >= totalPage ? '没有更多了...' : '上拉获取更多数据'}}</view>
</scroll-view>
...
...
pages/member/orderCenter/orderCenter.wxss
View file @
06f383ae
...
...
@@ -125,6 +125,7 @@ page{background-color: #F8F5F5}
font-size: 15px;
}
.list-item-name{
text-align: left;
width: 484rpx;
color: #333;
overflow: hidden;
...
...
pages/member/orderDeatils/orderDeatils.js
View file @
06f383ae
// pages/member/orderDeatils/orderDeatils.js
let
app
=
getApp
()
Page
({
/**
...
...
@@ -6,7 +6,7 @@ Page({
*/
data
:
{
tagID
:
0
,
d
atilse
:
{},
d
etails
:
{},
tagBoxActive
:
0
,
tagName
:
''
,
tagList
:
[
...
...
@@ -52,23 +52,54 @@ Page({
},
],
},
getDetailse
:
function
(
url
,
orderId
,
index
)
{
console
.
log
(
index
)
let
msg
=
{
orderType
:
index
,
orderId
:
orderId
}
app
.
$apiJavaNew
(
url
,
msg
).
then
(
res
=>
{
this
.
setData
({
details
:
res
})
}).
catch
(
err
=>
{
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
console
.
log
(
options
)
let
_this
=
this
;
wx
.
getStorage
({
key
:
'DetailsItem'
,
success
:
function
(
res
)
{
_this
.
setData
({
datilse
:
res
.
data
,
tagID
:
options
.
tagID
,
tagBoxActive
:
Number
(
options
.
tagIndex
),
tagName
:
_this
.
data
.
tagList
[
Number
(
options
.
tagIndex
)].
name
})
},
let
index
=
Number
(
options
.
tagIndex
);
let
url
=
''
;
if
(
index
==
4
){
// 机票
url
=
'api/b2b/user/getAirTicketOrderDetail'
_this
.
getDetailse
(
url
,
options
.
orderId
,
index
)
}
else
if
(
index
==
5
){
//签证
url
=
'api/b2b/visa/getVisaOrderDetail'
_this
.
getDetailse
(
url
,
options
.
orderId
,
index
)
}
else
if
(
index
==
6
)
{
// 门票
url
=
'api/b2b/scenic/getTicketCouponsOrderDetail'
_this
.
getDetailse
(
url
,
options
.
orderId
,
index
)
}
else
if
(
index
==
8
)
{
// 美食 读取缓存数据
console
.
log
(
'美食1'
)
wx
.
getStorage
({
key
:
'DetailsItem'
,
success
:
function
(
res
)
{
_this
.
setData
({
details
:
res
.
data
,
})
},
})
}
else
{
// 1:跟团游 2:自由行 3:当地游 7: 定制游
url
=
'api/b2b/user/getrecentOrderDetail'
_this
.
getDetailse
(
url
,
options
.
orderId
,
index
)
}
console
.
log
(
index
,
"荷藕"
)
_this
.
setData
({
tagBoxActive
:
index
-
1
,
tagName
:
_this
.
data
.
tagList
[
index
-
1
].
name
})
wx
.
setNavigationBarTitle
({
title
:
'订单详情'
...
...
pages/member/orderDeatils/orderDeatils.wxml
View file @
06f383ae
This diff is collapsed.
Click to expand it.
project.config.json
View file @
06f383ae
...
...
@@ -39,23 +39,8 @@
"list"
:
[]
},
"miniprogram"
:
{
"current"
:
2
,
"current"
:
9
,
"list"
:
[
{
"id"
:
-1
,
"name"
:
"产品"
,
"pathName"
:
"pages/product/product"
,
"query"
:
""
,
"scene"
:
"1001"
},
{
"id"
:
-1
,
"name"
:
"个人中心"
,
"pathName"
:
"pages/mine/mine"
,
"query"
:
""
,
"scene"
:
"1036"
,
"referrerInfo"
:
{}
},
{
"id"
:
2
,
"name"
:
"写游记"
,
...
...
@@ -67,7 +52,7 @@
"id"
:
3
,
"name"
:
"调查"
,
"pathName"
:
"pages/Voucher/Voucher"
,
"query"
:
"
tcid=4006
"
,
"query"
:
""
,
"scene"
:
null
},
{
...
...
@@ -118,6 +103,13 @@
"pathName"
:
"pages/member/invesDetails/invesDetails"
,
"query"
:
""
,
"scene"
:
null
},
{
"id"
:
-1
,
"name"
:
"我的票券"
,
"pathName"
:
"pages/member/Coupon/Coupon"
,
"query"
:
""
,
"scene"
:
null
}
]
}
...
...
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