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
244d660b
Commit
244d660b
authored
Jul 03, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增调查列表啥啥的
parent
4eda8c83
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
1644 additions
and
54 deletions
+1644
-54
app.js
app.js
+29
-3
app.json
app.json
+5
-0
Voucher.js
pages/Voucher/Voucher.js
+3
-2
invesDetails.js
pages/member/invesDetails/invesDetails.js
+70
-0
invesDetails.json
pages/member/invesDetails/invesDetails.json
+3
-0
invesDetails.wxml
pages/member/invesDetails/invesDetails.wxml
+3
-0
invesDetails.wxss
pages/member/invesDetails/invesDetails.wxss
+0
-0
investigation.js
pages/member/investigation/investigation.js
+145
-0
investigation.json
pages/member/investigation/investigation.json
+3
-0
investigation.wxml
pages/member/investigation/investigation.wxml
+32
-0
investigation.wxss
pages/member/investigation/investigation.wxss
+102
-0
member.js
pages/member/member.js
+22
-1
member.wxml
pages/member/member.wxml
+75
-41
member.wxss
pages/member/member.wxss
+21
-4
memberInfo.wxml
pages/member/memberInfo/memberInfo.wxml
+2
-2
memberInfo.wxss
pages/member/memberInfo/memberInfo.wxss
+1
-0
nameList.js
pages/member/nameList/nameList.js
+94
-0
nameList.json
pages/member/nameList/nameList.json
+3
-0
nameList.wxml
pages/member/nameList/nameList.wxml
+18
-0
nameList.wxss
pages/member/nameList/nameList.wxss
+40
-0
orderCenter.js
pages/member/orderCenter/orderCenter.js
+285
-0
orderCenter.json
pages/member/orderCenter/orderCenter.json
+3
-0
orderCenter.wxml
pages/member/orderCenter/orderCenter.wxml
+117
-0
orderCenter.wxss
pages/member/orderCenter/orderCenter.wxss
+186
-0
orderDeatils.js
pages/member/orderDeatils/orderDeatils.js
+126
-0
orderDeatils.json
pages/member/orderDeatils/orderDeatils.json
+3
-0
orderDeatils.wxml
pages/member/orderDeatils/orderDeatils.wxml
+118
-0
orderDeatils.wxss
pages/member/orderDeatils/orderDeatils.wxss
+135
-0
productAll.js
pages/product/productAll/productAll.js
+0
-1
No files found.
app.js
View file @
244d660b
...
...
@@ -52,7 +52,7 @@ 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
:
'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',
...
...
@@ -82,6 +82,32 @@ App({
}
}
})
})
return
promise
;
},
// 请求接口
$apiSaveFormId
:
function
(
url
,
data
)
{
var
promise
=
new
Promise
((
resolve
,
reject
)
=>
{
let
timestamp
=
(
new
Date
()).
valueOf
()
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://test.viitto.com/api/common/post',
method
:
'POST'
,
data
:
{
cmd
:
url
,
msg
:
data
,
timestamp
:
timestamp
,
token
:
getApp
().
state
.
admin
.
token
,
sign
:
sign
},
success
(
res
)
{
}
})
})
return
promise
;
},
...
...
@@ -98,9 +124,9 @@ 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://reborn.oytour.com/api/common/post
'
+
url
,
//线上
// url: 'http://efficient.oytour.com/
'+ url, //线上
// url: 'http://47.96.12.235:9001/' + url, //测试
//
url: 'http://192.168.2.215:9000/'+ url,
url
:
'http://192.168.2.215:9000/'
+
url
,
method
:
'POST'
,
data
:
{
...
...
app.json
View file @
244d660b
...
...
@@ -18,6 +18,11 @@
"pages/member/memberInfoED/memberInfoED"
,
"pages/member/memberInfoEDPasswod/memberInfoEDPasswod"
,
"pages/member/memberInfoEDAddr/memberInfoEDAddr"
,
"pages/member/orderCenter/orderCenter"
,
"pages/member/orderDeatils/orderDeatils"
,
"pages/member/investigation/investigation"
,
"pages/member/nameList/nameList"
,
"pages/member/invesDetails/invesDetails"
,
"pages/visa/visa"
,
"pages/Voucher/Voucher"
,
"pages/Voucher/rating/rating"
,
...
...
pages/Voucher/Voucher.js
View file @
244d660b
...
...
@@ -21,7 +21,8 @@ Page({
}
else
{
let
data
=
{
guestMobile
:
this
.
data
.
telPhone
,
TCID
:
this
.
data
.
tcId
// TCID: this.data.tcId
TCID
:
4018
}
app
.
$api
(
'miniProgram_price_GetGuestByPhone'
,
data
).
then
(
res
=>
{
if
(
res
.
Id
===
0
)
{
...
...
@@ -70,7 +71,7 @@ Page({
onLoad
:
function
(
options
)
{
const
scene
=
decodeURIComponent
(
options
.
scene
)
if
(
scene
)
{
let
tcId
=
scene
.
split
(
'='
)[
1
];
let
tcId
=
scene
.
split
(
'='
)[
1
]
?
scene
.
split
(
'='
)[
1
]
:
options
.
tcid
;
console
.
log
(
tcId
)
this
.
setData
({
tcId
:
tcId
...
...
pages/member/invesDetails/invesDetails.js
0 → 100644
View file @
244d660b
// pages/member/invesDetails/invesDetails.js
Page
({
/**
* 页面的初始数据
*/
data
:
{
url
:
''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
console
.
log
(
options
)
this
.
setData
({
url
:
"http://www.test.com:8084/html/invesDetails.html"
+
'?ID='
+
options
.
ID
+
'&name='
+
encodeURI
(
options
.
name
)
+
'&MobilePhone='
+
options
.
MobilePhone
})
console
.
log
(
this
.
data
.
url
)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/member/invesDetails/invesDetails.json
0 → 100644
View file @
244d660b
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/member/invesDetails/invesDetails.wxml
0 → 100644
View file @
244d660b
<view>
<web-view src="{{url}}"></web-view>
</view>
\ No newline at end of file
pages/member/invesDetails/invesDetails.wxss
0 → 100644
View file @
244d660b
pages/member/investigation/investigation.js
0 → 100644
View file @
244d660b
let
app
=
getApp
()
Page
({
/**
* 页面的初始数据
*/
data
:
{
active
:
0
,
tagBoxShow
:
false
,
tagBoxActive
:
0
,
getOrderMsg
:
{
pageIndex
:
1
,
pageSize
:
10
,
orderType
:
1
,
queryDays
:
0
,
orderState
:
1
,
CustomerId
:
""
},
userInfo
:
{},
dataList
:
[],
pageIndex
:
1
,
totalPage
:
1
,
count
:
0
,
tagID
:
1
,
tagIndex
:
0
,
},
formSubmit
:
function
(
e
)
{
wx
.
getStorage
({
key
:
'admin'
,
success
:
res
=>
{
let
url
=
e
.
detail
.
target
.
dataset
.
url
;
let
index
=
e
.
detail
.
target
.
dataset
.
index
;
let
formId
=
e
.
detail
.
formId
;
console
.
log
(
formId
,
code
)
app
.
$apiSaveFormId
(
'survey_post_SaveFormId'
,
{
formId
:
formId
,
customerId
:
res
.
data
.
id
}).
then
(
res
=>
{
console
.
log
(
res
)
}).
catch
(
err
=>
{
})
if
(
this
.
data
.
dataList
[
Number
(
index
)].
getScoreNum
>
-
1
)
{
wx
.
navigateTo
({
url
:
url
+
'?orderId='
+
this
.
data
.
dataList
[
Number
(
index
)].
orderId
,
})
}
}
})
},
// 加载更多
scrollGetMore
:
function
()
{
console
.
log
(
1
)
this
.
setData
({
'getOrderMsg.pageIndex'
:
this
.
data
.
pageIndex
+
1
})
this
.
getOrderList
(
1
)
},
// 获取数据
getOrderList
:
function
(
type
)
{
let
url
=
'api/b2b/user/getrecentorder'
,
msg
=
this
.
data
.
getOrderMsg
;
if
(
this
.
data
.
pageIndex
>=
this
.
data
.
totalPage
&&
type
)
{
return
}
this
.
data
.
getOrderMsg
.
CustomerId
=
this
.
data
.
userInfo
.
id
app
.
$apiJavaNew
(
url
,
msg
).
then
(
res
=>
{
let
arr
=
this
.
data
.
dataList
;
let
arr2
=
res
.
pageData
for
(
let
i
=
0
;
i
<
arr2
.
length
;
i
++
)
{
arr2
[
i
].
day
=
arr2
[
i
].
createDate
.
replace
(
/-/g
,
'.'
).
substring
(
0
,
10
)
}
if
(
type
)
{
for
(
let
i
=
0
;
i
<
arr2
.
length
;
i
++
)
{
arr
.
push
(
arr2
[
i
])
}
}
else
{
arr
=
arr2
}
this
.
setData
({
dataList
:
arr
,
totalPage
:
res
.
pageCount
,
pageIndex
:
res
.
pageIndex
,
count
:
res
.
count
})
}).
catch
(
err
=>
{
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
let
userInfo
=
wx
.
getStorageSync
(
'admin'
);
this
.
setData
({
userInfo
:
userInfo
,
})
this
.
getOrderList
()
wx
.
setNavigationBarTitle
({
title
:
'意见调查列表'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/member/investigation/investigation.json
0 → 100644
View file @
244d660b
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/member/investigation/investigation.wxml
0 → 100644
View file @
244d660b
<view class='order-center'>
<scroll-view class='data_body' scroll-y bindscrolltolower="scrollGetMore">
<view wx:if="{{tagID !== 6 && 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/nameList/nameList" data-index='{{index}}'>
<text class='list-item-tag tuan}}'>跟团游</text>
<view class='list-item-info'>
<view class='list-item-info-top'>
<view class='list-item-name'>{{item.title}}</view>
<view class='getScoreNum {{item.getScoreNum == -1 ? "" :"getScoreNum-red" }}'>{{item.getScoreNum == -1 ? '无评分' : item.getScoreNum + '分'}}</view>
</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
<text>{{item.ltName+item.guestNum+'人'}}</text>
<text>订单号:{{item.orderId}}</text>
</view>
</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
<text>下单日期:{{item.day}}</text>
</view>
<view>¥{{item.preferPrice}}</view>
</view>
</view>
</button>
</form>
</view>
</view>
<view class='body_footer'>{{pageIndex >= totalPage ? '没有更多了...' : '上拉获取更多数据'}}</view>
</scroll-view>
</view>
\ No newline at end of file
pages/member/investigation/investigation.wxss
0 → 100644
View file @
244d660b
page{background-color: #F8F5F5}
.order-center{
padding: 0 30rpx;
}
.data_body{
padding: 0 0 30rpx 0;
width: 100%;
height: 100VH;
}
.list-item-tag{
position: absolute;
left: 29rpx;
top: 0;
display: inline-block;
padding: 5rpx 12rpx;
border-radius:0px 0px 4rpx 4rpx;
color: #1D9890;
background:rgba(97,220,212,.5);
}
.list-item-info{
text-align: left;
margin-top: 50rpx;
}
.list-item{
margin: 30rpx 0;
/* height: 222rpx; */
background:rgba(255,255,255,1);
border-radius:20rpx;
padding: 23rpx 29rpx;
font-size: 24rpx;
position: relative;
}
.list-item-name{
width: 484rpx;
color: #333;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.list-item-detail-left{
color: #666666;
}
.list-item-btn{
display: flex;
margin-top: 15rpx;
justify-content: flex-end;
}
.list-item-btn>view{
width: 136rpx;
height: 46rpx;
line-height: 42rpx;
text-align: center;
font-size: 24rpx;
border:1px solid #D2D2D2;
border-radius:12px;
color: #666666;
margin-left: 30rpx;
}
.list-item-btn>view.btn-red{
border:1px solid #FFC8CD;
color: #EE4454;
}
.list-item-detail-left text:nth-child(1){
padding-right: 30rpx;
}
.list-item-detail{
display: flex;
justify-content: space-between;
margin-top: 10rpx;
}
.body_footer{
display: flex;
justify-content: center;
align-items: center;
height: 30px;
font-size: 12px;
color: #666666;
background-color:#F5F5F5;
}
button{
padding: 0;
font-size: 22rpx;
border: none;
background-color: transparent;
line-height: initial;
}
button::after{
border: none
}
.btn-hover{
background-color: transparent;
}
.list-item-info-top{
display: flex;
justify-content: space-between;
}
.getScoreNum{
color: #666666
}
.getScoreNum-red{
color: #EE4454;
}
\ No newline at end of file
pages/member/member.js
View file @
244d660b
...
...
@@ -12,6 +12,25 @@ Page({
gap
:
0
,
nextExp
:
0
,
},
formSubmit
:
function
(
e
)
{
wx
.
getStorage
({
key
:
'admin'
,
success
:
res
=>
{
let
url
=
e
.
detail
.
target
.
dataset
.
url
;
let
formId
=
e
.
detail
.
formId
app
.
$apiSaveFormId
(
'survey_post_SaveFormId'
,
{
formId
:
formId
,
customerId
:
res
.
data
.
id
}).
then
(
res
=>
{
console
.
log
(
res
)
}).
catch
(
err
=>
{
})
wx
.
navigateTo
({
url
:
url
,
})
}
})
},
formReset
:
function
()
{
console
.
log
(
'form发生了reset事件'
)
},
getInfo
:
function
()
{
app
.
$apiJavaNew
(
"api/b2b/user/getSimpleUser"
,
{
account
:
this
.
data
.
userInfo
.
account
}).
then
(
res
=>
{
this
.
setData
({
...
...
@@ -45,7 +64,9 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
wx
.
setNavigationBarTitle
({
title
:
'个人中心'
})
},
/**
...
...
pages/member/member.wxml
View file @
244d660b
...
...
@@ -53,38 +53,54 @@
<view class='order-menu'>
<view class='order-menu-tit'>
<view>我的近期订单</view>
<view class='_more'>全部订单>></view>
<view class='_more'>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter">
全部订单>>
</button>
</form>
</view>
</view>
<view class="tablist">
<view>
<navigator hover-class="Home_hover" url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/order-icon-tuan.png"></image>
<view class='order-type-name'>跟团游</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/order-icon-tuan.png"></image>
<view class='order-type-name'>跟团游</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/freeTravel/free">
<image mode="aspectFit" src="../../images/menber/order-icon-zi.png"></image>
<view class='order-type-name'>自由行</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/freeTravel/free">
<image mode="aspectFit" src="../../images/menber/order-icon-zi.png"></image>
<view class='order-type-name'>自由行</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/local/localhome">
<image mode="aspectFit" src="../../images/menber/order-icon-dang.png"></image>
<view class='order-type-name'>当地游</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/local/localhome">
<image mode="aspectFit" src="../../images/menber/order-icon-dang.png"></image>
<view class='order-type-name'>当地游</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/order-icon-ji.png"></image>
<view class='order-type-name'>机票</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/order-icon-ji.png"></image>
<view class='order-type-name'>机票</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/visa/visa">
<image mode="aspectFit" src="../../images/menber/order-icon-gai.png"></image>
<view class='order-type-name'>签证</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/visa/visa">
<image mode="aspectFit" src="../../images/menber/order-icon-gai.png"></image>
<view class='order-type-name'>签证</view>
</button>
</form>
</view>
</view>
</view>
...
...
@@ -94,34 +110,52 @@
</view>
<view class="tablist">
<view>
<navigator hover-class="Home_hover" url="/pages/member/memberCenter/memberCenter?progress={{progress}}&gap={{gap}}&vip={{custormInfo.vipRate}}&nextExp={{nextExp}}">
<image mode="aspectFit" src="../../images/menber/menu-hui.png"></image>
<view class='order-type-name'>会员中心</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/memberCenter/memberCenter?progress={{progress}}&gap={{gap}}&vip={{custormInfo.vipRate}}&nextExp={{nextExp}}">
<image mode="aspectFit" src="../../images/menber/menu-hui.png"></image>
<view class='order-type-name'>会员中心</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/freeTravel/free">
<image mode="aspectFit" src="../../images/menber/menu-ding.png"></image>
<view class='order-type-name'>定制游</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/freeTravel/free">
<image mode="aspectFit" src="../../images/menber/menu-ding.png"></image>
<view class='order-type-name'>定制游</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/member/memberInfo/memberInfo">
<image mode="aspectFit" src="../../images/menber/menu-ge.png"></image>
<view class='order-type-name'>个人信息</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/memberInfo/memberInfo">
<image mode="aspectFit" src="../../images/menber/menu-ge.png"></image>
<view class='order-type-name'>个人信息</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/menu-ji.png"></image>
<view class='order-type-name'>我的积分</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/Ticket/Ticket">
<image mode="aspectFit" src="../../images/menber/menu-ji.png"></image>
<view class='order-type-name'>我的积分</view>
</button>
</form>
</view>
<view>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/visa/visa">
<image mode="aspectFit" src="../../images/menber/menu-you.png"></image>
<view class='order-type-name'>我的优惠券</view>
</button>
</form>
</view>
<view>
<navigator hover-class="Home_hover" url="/pages/visa/visa">
<image mode="aspectFit" src="../../images/menber/menu-you.png"></image>
<view class='order-type-name'>我的优惠券</view>
</navigator>
<form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/investigation/investigation">
<image mode="aspectFit" src="../../images/menber/menu-you.png"></image>
<view class='order-type-name'>旅客调查</view>
</button>
</form>
</view>
</view>
</view>
...
...
pages/member/member.wxss
View file @
244d660b
...
...
@@ -193,7 +193,6 @@
margin: 0 31rpx;
}
.order-menu{
height:244rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
padding: 30rpx;
...
...
@@ -210,14 +209,29 @@
}
.tablist{
display: flex;
justify-content: space-around
;
flex-wrap:wrap
;
margin-top: 46rpx;
}
.tablist>view{
width: 18%;
text-align: center;
font-size: 22rpx;
color: #000000;
margin-right: 12rpx;
margin-bottom: 20rpx;
}
.tablist>view button,._more button{
padding: 0;
font-size: 22rpx;
border: none;
background-color: transparent;
margin-bottom: 10rpx;
line-height: initial;
}
.tablist>view button::after,._more button::after{
border: none
}
button:active{
background-color: transparent;
}
.tablist image{
height: 54rpx;
...
...
@@ -231,4 +245,7 @@
}
.order-menu2 image{
width: 54rpx;
}
\ No newline at end of file
}
.btn-hover{
background-color: transparent;
}
pages/member/memberInfo/memberInfo.wxml
View file @
244d660b
...
...
@@ -10,7 +10,7 @@
</view>
<view class='name' wx:if="{{active === 1 || active === 2}}">
<text>{{userInfo.name}}</text>
<navigator url="/pages/member/memberInfoEDPasswod/memberInfoEDPasswod" hover-class="
navigator-
hover"><image src='../../../images/memberInfo/qianbi.png'></image></navigator>
<navigator url="/pages/member/memberInfoEDPasswod/memberInfoEDPasswod" hover-class="
Home_
hover"><image src='../../../images/memberInfo/qianbi.png'></image></navigator>
</view>
<view class='info-box' wx:if="{{active === 1}}">
<view class='info-box-tit'>
...
...
@@ -131,7 +131,7 @@
<view class='addr-info'>
<text class='addr-info-tag'>默认</text>
<text class='addr-info-detais'>{{orderAdd.address}}</text>
<navigator url="/pages/member/memberInfoEDAddr/memberInfoEDAddr?id={{orderAdd.id}}" hover-class="
navigator-
hover"><image mode='widthFix' src='../../../images/memberInfo/qianbi.png'></image></navigator>
<navigator url="/pages/member/memberInfoEDAddr/memberInfoEDAddr?id={{orderAdd.id}}" hover-class="
Home_
hover"><image mode='widthFix' src='../../../images/memberInfo/qianbi.png'></image></navigator>
</view>
</view>
</view>
...
...
pages/member/memberInfo/memberInfo.wxss
View file @
244d660b
...
...
@@ -229,6 +229,7 @@ page {
width: 66rpx;
background:rgba(238, 68, 84, .2);
color: #EE4454;
text-align: center;
}
.addr-info-detais{
display: inline-block;
...
...
pages/member/nameList/nameList.js
0 → 100644
View file @
244d660b
let
app
=
getApp
()
Page
({
/**
* 页面的初始数据
*/
data
:
{
dataList
:
[],
},
getList
:
function
(
OrderId
)
{
app
.
$api
(
'sellorder_get_GetTravelGuestList'
,
{
OrderId
:
OrderId
}).
then
(
res
=>
{
this
.
setData
({
dataList
:
res
.
list
})
}).
catch
(
err
=>
{
})
},
formSubmit
:
function
(
e
)
{
wx
.
getStorage
({
key
:
'admin'
,
success
:
res
=>
{
let
url
=
e
.
detail
.
target
.
dataset
.
url
;
let
index
=
e
.
detail
.
target
.
dataset
.
index
;
let
formId
=
e
.
detail
.
formId
console
.
log
(
formId
,
code
)
app
.
$apiSaveFormId
(
'survey_post_SaveFormId'
,
{
formId
:
formId
,
customerId
:
res
.
data
.
id
}).
then
(
res
=>
{
console
.
log
(
res
)
}).
catch
(
err
=>
{
})
if
(
this
.
data
.
dataList
[
Number
(
index
)].
GuestSurveyID
>
0
)
{
wx
.
navigateTo
({
url
:
url
+
'?ID='
+
this
.
data
.
dataList
[
Number
(
index
)].
GuestSurveyID
+
'&name='
+
this
.
data
.
dataList
[
Number
(
index
)].
Name
+
'&MobilePhone='
+
this
.
data
.
dataList
[
Number
(
index
)].
MobilePhone
,
})
}
}
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
this
.
getList
(
options
.
orderId
)
wx
.
setNavigationBarTitle
({
title
:
'旅客名单'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/member/nameList/nameList.json
0 → 100644
View file @
244d660b
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/member/nameList/nameList.wxml
0 → 100644
View file @
244d660b
<view>
<view wx:if="{{dataList.length>0}}" class="list-box">
<form bindsubmit="formSubmit" report-submit wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/invesDetails/invesDetails" data-index='{{index}}'>
<view class='list-item' >
<text class='name'>{{item.Name}}</text>
<text class='name'>{{item.Sex}}</text>
<text class='phone'>{{item.MobilePhone}}</text>
<text class='fen' wx:if="{{item.ScoreNum == '-1.00'}}">评分: <text class='no-fen'>未评分</text></text>
<text class='fen' wx:else>评分: <text class='yes-fen'>{{item.ScoreNum}}</text></text>
</view>
</button>
</form>
</view>
<view wx:else class='no-data'>
暂无数据...
</view>
</view>
\ No newline at end of file
pages/member/nameList/nameList.wxss
0 → 100644
View file @
244d660b
page{
}
.list-item{
font-size: 24rpx;
background-color: white;
margin: 20rpx;
padding: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.list-item .fen{
width: 180rpx;
}
.no-data{
padding: 30rpx;
text-align: center;
font-size: 24rpx;
color:#666666;
}
button{
padding: 0;
font-size: 22rpx;
border: none;
background-color: transparent;
line-height: initial;
}
button::after{
border: none
}
.btn-hover{
background-color: transparent;
}
.no-fen{
color: #666666;
}
.yes-fen{
color: #EE4454;
}
\ No newline at end of file
pages/member/orderCenter/orderCenter.js
0 → 100644
View file @
244d660b
let
app
=
getApp
()
Page
({
/**
* 页面的初始数据
*/
data
:
{
active
:
0
,
TitList
:
[],
TitListTc
:
[
{
Type
:
"待付定金"
,
ID
:
1
,
},
{
Type
:
"待付尾款"
,
ID
:
2
,
},
{
Type
:
"待发团"
,
ID
:
3
,
},
{
Type
:
"交易完成"
,
ID
:
4
,
},
{
Type
:
"取消"
,
ID
:
0
,
}
],
TitListMenJi
:
[
{
Type
:
"正常"
,
ID
:
1
,
},
{
Type
:
"取消"
,
ID
:
2
,
},
{
Type
:
"待付款"
,
ID
:
3
,
}
],
tagList
:
[
{
id
:
1
,
name
:
'跟团游'
,
Class
:
'tuan'
},
{
id
:
2
,
name
:
'自由行'
,
Class
:
'ziyou'
},
{
id
:
3
,
name
:
'当地游'
,
Class
:
'dangdi'
},
{
id
:
4
,
name
:
'机票'
,
Class
:
'jipiao'
},
{
id
:
5
,
name
:
'签证'
,
Class
:
'qianzheng'
},
{
id
:
6
,
name
:
'门票'
,
Class
:
'menpiao'
},
{
id
:
7
,
name
:
'定制游'
,
Class
:
'dingzhi'
},
{
id
:
8
,
name
:
'美食'
,
Class
:
'meishi'
},
],
tagBoxShow
:
false
,
tagBoxActive
:
0
,
getOrderMsg
:
{
pageIndex
:
1
,
pageSize
:
5
,
orderType
:
1
,
queryDays
:
0
,
orderState
:
1
,
CustomerId
:
""
},
userInfo
:
{},
dataList
:
[],
pageIndex
:
1
,
totalPage
:
1
,
count
:
0
,
listClass
:
'tuan'
,
tagID
:
1
,
tagIndex
:
0
,
},
formSubmit
:
function
(
e
)
{
wx
.
getStorage
({
key
:
'admin'
,
success
:
res
=>
{
console
.
log
(
'form发生了submit事件,携带数据为:'
,
e
)
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
)
this
.
goDetails
(
index
)
}
})
},
// 跳转详情页面
goDetails
:
function
(
e
)
{
let
index
=
e
,
item
=
this
.
data
.
dataList
[
index
];
wx
.
setStorage
({
key
:
"DetailsItem"
,
data
:
item
})
wx
.
navigateTo
({
url
:
'/pages/member/orderDeatils/orderDeatils?tagID='
+
this
.
data
.
tagID
+
'&tagIndex='
+
this
.
data
.
tagIndex
,
})
},
// 加载更多
scrollGetMore
:
function
()
{
console
.
log
(
1
)
this
.
setData
({
'getOrderMsg.pageIndex'
:
this
.
data
.
pageIndex
+
1
})
this
.
getOrderList
(
1
)
},
// 获取数据
getOrderList
:
function
(
type
)
{
let
url
=
'api/b2b/user/getrecentorder'
,
tagID
=
this
.
data
.
tagID
,
msg
=
this
.
data
.
getOrderMsg
;
if
(
tagID
!==
6
&&
tagID
!==
8
)
{
console
.
log
(
tagID
)
url
=
'api/b2b/user/getrecentorder'
}
else
{
// 8美食 6门票
msg
.
status
=
msg
.
orderState
url
=
tagID
==
8
?
'api/b2b/food/getFoodOrder'
:
'api/b2b/scenic/getTicketCouponsOrder'
}
this
.
data
.
getOrderMsg
.
CustomerId
=
this
.
data
.
userInfo
.
id
if
(
this
.
data
.
pageIndex
>=
this
.
data
.
totalPage
&&
type
){
return
}
app
.
$apiJavaNew
(
url
,
msg
).
then
(
res
=>
{
let
arr
=
this
.
data
.
dataList
;
let
arr2
=
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
)
}
else
{
arr2
[
i
].
day
=
arr2
[
i
].
useDate
.
replace
(
/-/g
,
'.'
)
}
}
if
(
type
)
{
for
(
let
i
=
0
;
i
<
arr2
.
length
;
i
++
){
arr
.
push
(
arr2
[
i
])
}
}
else
{
arr
=
arr2
}
this
.
setData
({
dataList
:
arr
,
totalPage
:
res
.
pageCount
,
pageIndex
:
res
.
pageIndex
,
count
:
res
.
count
})
}).
catch
(
err
=>
{
})
},
// 切换订单类型
setActiveTag
:
function
(
e
)
{
let
index
=
e
.
target
.
id
.
split
(
'active'
)[
1
],
TitList
=
[];
if
(
index
==
this
.
data
.
tagBoxActive
)
{
index
=
0
}
else
{
index
=
Number
(
e
.
target
.
id
.
split
(
'active'
)[
1
])
}
if
(
this
.
data
.
tagList
[
index
].
name
!==
'美食'
&&
this
.
data
.
tagList
[
index
].
name
!==
'门票'
){
TitList
=
this
.
data
.
TitListTc
}
else
{
TitList
=
this
.
data
.
TitListMenJi
}
this
.
setData
({
tagBoxActive
:
index
,
tagBoxShow
:
false
,
'getOrderMsg.orderType'
:
this
.
data
.
tagList
[
index
].
id
,
pageIndex
:
1
,
TitList
:
TitList
,
tagID
:
this
.
data
.
tagList
[
index
].
id
,
tagIndex
:
index
})
this
.
getOrderList
()
},
// 切换类型显示?
setShow
:
function
()
{
this
.
setData
({
tagBoxShow
:
!
this
.
data
.
tagBoxShow
})
},
// 切换订单状态
setActive
:
function
(
e
)
{
this
.
setData
({
active
:
e
.
target
.
id
.
split
(
'active'
)[
1
],
'getOrderMsg.orderState'
:
Number
(
e
.
target
.
id
.
split
(
'active'
)[
1
])
+
1
,
pageIndex
:
1
,
})
this
.
getOrderList
()
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
let
userInfo
=
wx
.
getStorageSync
(
'admin'
);
this
.
setData
({
userInfo
:
userInfo
,
TitList
:
this
.
data
.
TitListTc
})
this
.
getOrderList
()
wx
.
setNavigationBarTitle
({
title
:
'订单中心'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/member/orderCenter/orderCenter.json
0 → 100644
View file @
244d660b
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/member/orderCenter/orderCenter.wxml
0 → 100644
View file @
244d660b
<view class='order-center'>
<view class='top-nav'>
<view class='left-btn'>
<text bindtap='setShow'>{{tagList[tagBoxActive].name}}</text>
<image mode='widthFix' src='../../../images/group/bx.png'></image>
</view>
<view class='right-nav'>
<scroll-view scroll-x style="width: 100%;white-space: nowrap;padding-right: 80rpx;padding-left: 147rpx;">
<view class='bottom-nav'>
<view wx:for="{{TitList}}" class='{{active == index ? "active" : ""}}' wx:for-item="item" wx:for-index="index" wx:key="index" id="active{{index}}" bindtap='setActive'>
{{item.Type}}
</view>
</view>
</scroll-view>
</view>
<view wx:if="{{tagBoxShow}}" class='tab-box'>
<text wx:for="{{tagList}}" bindtap='setActiveTag' class='tag{{index}} {{tagBoxActive == index ? "active" : ""}}' wx:for-item="item" wx:for-index="index" wx:key="index" id="active{{index}}">{{item.name}}</text>
</view>
</view>
<scroll-view class='data_body' scroll-y bindscrolltolower="scrollGetMore">
<view wx:if="{{tagID !== 6 && 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}}'>
<text class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagList[tagBoxActive].name}}</text>
<view class='list-item-states'>
<text wx:if="{{item.orderState == 1}}">待付定金</text>
<text wx:elif="{{item.orderState == 2}}">待付尾款</text>
<text wx:elif="{{item.orderState == 3}}">待发团</text>
<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-name'>{{item.title}}</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
<text>{{item.ltName+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 == 3 || item.orderState == 2}}">取消订单</view>
<view wx:if="{{item.orderState == 1 || item.orderState == 2}}" class='btn-red'>付款</view>
<!-- <view class='btn-red'>确认收货</view> -->
<view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view>
</view>
</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}}'>
<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'>
<view class='list-item-name'>{{item.diningName}}</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.status == 1}}">联系客服</view>
<view wx:if="{{item.status == 1 || item.status == 3}}">取消订单</view>
<view wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view>
</view>
</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}}'>
<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-name'>{{item.couponsName}}</view>
<view class='list-item-detail'>
<view class='list-item-detail-left'>
<text>{{item.purchaseQuantity+'张'}}</text>
<text>{{item.day}}</text>
</view>
<view>¥{{item.preferPrice}}</view>
</view>
</view>
<view class='list-item-btn'>
<view wx:if="{{item.status == 1}}">联系客服</view>
<view wx:if="{{item.status == 1 || item.status == 3}}">取消订单</view>
<view wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view>
</view>
</button>
</form>
</view>
</view>
<view class='body_footer'>{{pageIndex >= totalPage ? '没有更多了...' : '上拉获取更多数据'}}</view>
</scroll-view>
</view>
\ No newline at end of file
pages/member/orderCenter/orderCenter.wxss
0 → 100644
View file @
244d660b
page{background-color: #F8F5F5}
.top-nav{
position: fixed;
z-index: 10;
top: 0repx;
left: 0rpx;
width: 100%;
padding: 27rpx 0 10rpx 54rpx;
font-size: 28rpx;
color: #000000;
box-shadow:0px 2px 18px 0px rgba(177,177,177,1);
background-color: white;
}
.left-btn{
position: absolute;
padding-right: 10rpx;
border-right: 1px solid #CFCFCF;
display: flex;
align-items: center;
width: 140rpx;
}
.bottom-nav{
display: flex;
padding-left: 34rpx;
}
.bottom-nav>view{
margin-right: 43rpx;
padding-bottom: 15rpx;
border-bottom: 4rpx solid transparent;
}
.bottom-nav>view.active{
color: #EE4454;
border-bottom: 4rpx solid #EE4454;
}
.left-btn image{
width: 13rpx;
}
.left-btn text{
padding-right: 20rpx;
}
.tab-box{
display: flex;
flex-wrap:wrap;
position: relative;
left: -18rpx;
padding: 25rpx 0;
}
.tab-box text{
width: 142rpx;
height: 60rpx;
color: #000000;
background:#EEEEEE;
line-height: 60rpx;
text-align: center;
font-size: 28rpx;
display: inline-block;
border-radius: 10rpx;
margin: 10rpx 0 20rpx 38rpx;
}
.tab-box text.active{
color: #EE4454;
background:rgba(238,68,84,.2);
}
.tab-box text.tag0,.tab-box text.tag4{
margin-left: 0;
}
.data_body{
padding: 0 30rpx;
width: 100%;
height: 100VH;
padding-top: 100rpx;
}
.list-item{
margin: 30rpx 0;
height: 222rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
padding: 23rpx 29rpx;
font-size: 24rpx;
position: relative;
}
.list-item-tag{
position: absolute;
left: 29rpx;
top: 0;
display: inline-block;
padding: 5rpx 12rpx;
border-radius:0px 0px 4rpx 4rpx;
}
.list-item-tag.ziyou{
color: #D4542A;
background:rgba(253,127,86,.5);
}
.list-item-tag.tuan{
color: #1D9890;
background:rgba(97,220,212,.5);
}
.list-item-tag.menpiao{
color: #3C67A0;
background:rgba(106,168,249,.5);
}
.list-item-tag.dangdi{
color: #CC3C6E;
background:rgba(243,108,155,.5);
}
.list-item-tag.dingzhi{
color: #2884A3;
background:rgba(24,184,237,.5);
}
.list-item-tag.qianzheng{
color: #B8A313;
background:rgba(233,235,51,.5);
}
.list-item-tag.jipiao{
color: #BA6E01;
background:rgba(255,150,0,.5);
}
.list-item-tag.meishi{
color: #378F47;
background:rgba(31,193,62,.5);
}
.list-item-states{
text-align: right;
color: #EE4454;
font-size: 15px;
}
.list-item-name{
width: 484rpx;
color: #333;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.list-item-detail-left{
color: #666666;
}
.list-item-btn{
display: flex;
margin-top: 15rpx;
justify-content: flex-end;
}
.list-item-btn>view{
width: 136rpx;
height: 46rpx;
line-height: 42rpx;
text-align: center;
font-size: 24rpx;
border:1px solid #D2D2D2;
border-radius:12px;
color: #666666;
margin-left: 30rpx;
}
.list-item-btn>view.btn-red{
border:1px solid #FFC8CD;
color: #EE4454;
}
.list-item-detail-left text:nth-child(1){
padding-right: 30rpx;
}
.list-item-detail{
display: flex;
justify-content: space-between;
margin-top: 10rpx;
}
.body_footer{
display: flex;
justify-content: center;
align-items: center;
height: 30px;
font-size: 12px;
color: #666666;
background-color:#F5F5F5;
}
button{
padding: 0;
font-size: 22rpx;
border: none;
background-color: transparent;
line-height: initial;
}
button::after{
border: none
}
.btn-hover{
background-color: transparent;
}
pages/member/orderDeatils/orderDeatils.js
0 → 100644
View file @
244d660b
// pages/member/orderDeatils/orderDeatils.js
Page
({
/**
* 页面的初始数据
*/
data
:
{
tagID
:
0
,
datilse
:
{},
tagBoxActive
:
0
,
tagName
:
''
,
tagList
:
[
{
id
:
1
,
name
:
'跟团游'
,
Class
:
'tuan'
},
{
id
:
2
,
name
:
'自由行'
,
Class
:
'ziyou'
},
{
id
:
3
,
name
:
'当地游'
,
Class
:
'dangdi'
},
{
id
:
4
,
name
:
'机票'
,
Class
:
'jipiao'
},
{
id
:
5
,
name
:
'签证'
,
Class
:
'qianzheng'
},
{
id
:
6
,
name
:
'门票'
,
Class
:
'menpiao'
},
{
id
:
7
,
name
:
'定制游'
,
Class
:
'dingzhi'
},
{
id
:
8
,
name
:
'美食'
,
Class
:
'meishi'
},
],
},
/**
* 生命周期函数--监听页面加载
*/
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
})
},
})
wx
.
setNavigationBarTitle
({
title
:
'订单详情'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/member/orderDeatils/orderDeatils.json
0 → 100644
View file @
244d660b
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/member/orderDeatils/orderDeatils.wxml
0 → 100644
View file @
244d660b
<view class='order-deatils'>
<view class='order-deatils-top'>
<view class='order-deatils-top-s'>
<view class='list-item-tag {{tagList[tagBoxActive].Class}}'>{{tagName}}</view>
<view>
<view class='list-datilse-states ' wx:if="{{tagName!='美食' && tagName!='门票'}}" class='list-item-states'>
<text wx:if="{{datilse.orderState == 1}}">待付定金</text>
<text wx:elif="{{datilse.orderState == 2}}">待付尾款</text>
<text wx:elif="{{datilse.orderState == 3}}">待发团</text>
<text wx:elif="{{datilse.orderState == 4}}">交易完成</text>
<text wx:elif="{{datilse.orderState == 5}}">取消</text>
</view>
<view class='list-datilse-states' wx:else class='list-item-states'>
<text wx:if="{{datilse.status == 1}}">正常</text>
<text wx:elif="{{datilse.status == 2}}">取消</text>
<text wx:elif="{{datilse.status == 3}}">待付款</text>
</view>
</view>
</view>
<view class='title'>
{{tagName!='美食' && tagName!='门票' ? datilse.title : tagName!='门票' ? datilse.diningName : datilse.couponsName}}
</view>
<view class='details-info'>
<view class='details-info-item'>
<view>
成人,¥ <text>6998.00</text>
</view>
<view>*1</view>
</view>
<view class='details-info-item'>
<view>
老人,¥ <text>6998.00</text>
</view>
<view>*1</view>
</view>
<view class='details-info-item'>
<view>
大床
</view>
<view>*1</view>
</view>
<view class='details-info-item'>
<view>
双人床
</view>
<view>*1</view>
</view>
<view class='details-info-item'>
<view>
联运段,¥ <text>6998.00</text>
</view>
<view>*1</view>
</view>
<view class='line-line'></view>
<view class='details-info-item'>
<view>
费用合计
</view>
<view class='item-price'>¥866.00</view>
</view>
<view class='details-info-item'>
<view>
幸福存折
</view>
<view class='item-price'>¥866.00</view>
</view>
<view class='details-info-item'>
<view>
优惠券抵扣
</view>
<view class='item-price'>¥866.00</view>
</view>
<view class='details-info-item'>
<view>
已付金额
</view>
<view class='item-price'>¥866.00</view>
</view>
<view class='details-info-item'>
<view>
待付金额
</view>
<view class='item-price'>¥866.00</view>
</view>
</view>
</view>
<view class='order-deatils-bottom'>
<view class='b-tit'>
<text>订单信息</text>
</view>
<view class='oreder-info'>
<view class='oreder-info-item copy-box'>
<view>
订单号:12FS2F5DF4SD23F43
</view>
<view class='copy'>
复制
</view>
</view>
<view class='oreder-info-item'>
<view>
团队编号:1165464646SDS1541
</view>
</view>
<view class='oreder-info-item'>
<view>
创建时间:2019-06-26 12:01:05
</view>
</view>
</view>
</view>
<view class='btn-box'>
<view wx:if="{{datilse.orderState == 1 || datilse.status == 1}}">联系客服</view>
<view>旅客名单</view>
<view wx:if="{{datilse.orderState == 3 || datilse.orderState == 2 || datilse.status == 1 || datilse.status == 3}}">取消订单</view>
<view wx:if="{{datilse.orderState == 1 || datilse.orderState == 2 || datilse.status == 3}}" class='btn-red'>付款</view>
</view>
</view>
\ No newline at end of file
pages/member/orderDeatils/orderDeatils.wxss
0 → 100644
View file @
244d660b
page{
background-color: #F8F5F5;
}
.order-deatils{
padding: 20rpx 30rpx;
}
.order-deatils-top{
padding: 30rpx;
background-color: #FFFFFF;
}
.order-deatils-top-s{
display: flex;
justify-content: space-between;
}
.list-item-tag{
padding: 5rpx 12rpx;
border-radius:0px 0px 4rpx 4rpx;
font-size: 24rpx;
}
.list-item-tag.ziyou{
color: #D4542A;
background:rgba(253,127,86,.5);
}
.list-item-tag.tuan{
color: #1D9890;
background:rgba(97,220,212,.5);
}
.list-item-tag.menpiao{
color: #3C67A0;
background:rgba(106,168,249,.5);
}
.list-item-tag.dangdi{
color: #CC3C6E;
background:rgba(243,108,155,.5);
}
.list-item-tag.dingzhi{
color: #2884A3;
background:rgba(24,184,237,.5);
}
.list-item-tag.qianzheng{
color: #B8A313;
background:rgba(233,235,51,.5);
}
.list-item-tag.jipiao{
color: #BA6E01;
background:rgba(255,150,0,.5);
}
.list-item-tag.meishi{
color: #378F47;
background:rgba(31,193,62,.5);
}
.list-item-states{
text-align: right;
color: #EE4454;
font-size: 15px;
}
.title{
padding: 40rpx 20rpx;
font-size:24rpx;
color:rgba(0,0,0,1);
}
.details-info{
padding: 24rpx 30rpx;
font-size: 24rpx;
color: #666666;
}
.details-info-item{
display: flex;
justify-content: space-between;
margin-bottom: 21rpx;
}
.line-line{
border:1px dashed rgba(220,220,220,1);
margin: 31rpx 0;
}
.item-price{
color: #000000;
}
.item-price.item-price-red{
color: #EE4454;
}
.order-deatils-bottom{
margin: 30rpx 0 100rpx 0;
padding: 33rpx 60rpx;
background-color: white;
}
.b-tit{
border-left: 4rpx solid #61DCD4;
display: inline-block;
padding-left: 10rpx;
font-size: 24rpx;
margin-bottom: 33rpx;
}
.oreder-info-item{
color: #666666;
margin-bottom: 10rpx;
font-size: 24rpx;
}
.copy-box{
display: flex;
justify-content: space-between;
}
.copy{
color: #EE4454
}
.btn-box{
position: fixed;
width: 100%;
height: 98rpx;
box-shadow:0px -2px 18px 0px rgba(177,177,177,1);
font-size: 24rpx;
color: #666666;
left: 0;
bottom: 0;
background-color: white;
z-index: 99;
display: flex;
justify-content: flex-end;
align-items: center;
padding-right: 30rpx;
}
.btn-box>view{
width: 136rpx;
height: 46rpx;
line-height: 42rpx;
text-align: center;
font-size: 24rpx;
border:1px solid #D2D2D2;
border-radius:12px;
margin-left: 30rpx;
}
.btn-red{
border:1px solid #FFC8CD;
color: #EE4454;
}
\ No newline at end of file
pages/product/productAll/productAll.js
View file @
244d660b
...
...
@@ -20,7 +20,6 @@ Page({
orderByDate
:
0
,
orderBySales
:
0
},
/**
* 跳转至站点选择
*/
...
...
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