Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
TripFriend
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
TripFriend
Commits
7db24be0
Commit
7db24be0
authored
Mar 05, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
6b44c43e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
242 additions
and
254 deletions
+242
-254
app.json
app.json
+0
-1
comments.js
pages/comments/comments.js
+10
-1
comments.wxml
pages/comments/comments.wxml
+1
-1
hotelDetails.js
pages/index/hotelDetails/hotelDetails.js
+9
-0
hotelDetails.wxml
pages/index/hotelDetails/hotelDetails.wxml
+1
-1
index.js
pages/index/index.js
+13
-4
index.wxml
pages/index/index.wxml
+166
-159
index.wxss
pages/index/index.wxss
+12
-1
mealDetail.js
pages/index/mealDetail/mealDetail.js
+9
-0
mealDetail.wxml
pages/index/mealDetail/mealDetail.wxml
+1
-1
sceneDetail.js
pages/index/sceneDetail/sceneDetail.js
+9
-0
sceneDetail.wxml
pages/index/sceneDetail/sceneDetail.wxml
+1
-1
strateDateil.js
pages/index/strateDateil/strateDateil.js
+9
-0
strateDateil.wxml
pages/index/strateDateil/strateDateil.wxml
+1
-1
tripover.js
pages/tripover/tripover.js
+0
-66
tripover.json
pages/tripover/tripover.json
+0
-5
tripover.wxml
pages/tripover/tripover.wxml
+0
-6
tripover.wxss
pages/tripover/tripover.wxss
+0
-6
No files found.
app.json
View file @
7db24be0
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
"pages/Clockin/Clockin"
,
"pages/Clockin/Clockin"
,
"pages/validateForm/allPerson"
,
"pages/validateForm/allPerson"
,
"pages/validateForm/yzCard/yzCard"
,
"pages/validateForm/yzCard/yzCard"
,
"pages/tripover/tripover"
,
"pages/comments/comments"
,
"pages/comments/comments"
,
"pages/VoucherDetails/VoucherDetails"
"pages/VoucherDetails/VoucherDetails"
],
],
...
...
pages/comments/comments.js
View file @
7db24be0
...
@@ -7,7 +7,7 @@ Page({
...
@@ -7,7 +7,7 @@ Page({
*/
*/
data
:
{
data
:
{
msg
:
{
msg
:
{
Id
:
'
2162
'
,
Id
:
'
847
'
,
Type
:
2
,
Type
:
2
,
GuestId
:
'37284'
GuestId
:
'37284'
},
},
...
@@ -30,6 +30,15 @@ Page({
...
@@ -30,6 +30,15 @@ Page({
this
.
getPinglunList
();
this
.
getPinglunList
();
},
},
modeImg
(
e
)
{
let
img
=
e
.
currentTarget
.
dataset
.
item
.
ImgList
;
wx
.
previewImage
({
current
:
img
[
0
],
urls
:
img
,
success
:
function
(
res
)
{
}
})
},
getPinglunList
()
{
getPinglunList
()
{
console
.
log
(
" this.data.msg"
,
this
.
data
.
msg
)
console
.
log
(
" this.data.msg"
,
this
.
data
.
msg
)
let
msg
=
{};
let
msg
=
{};
...
...
pages/comments/comments.wxml
View file @
7db24be0
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</view>
</view>
<view style="margin-top:10rpx" class="f28">{{item.Description}}</view>
<view style="margin-top:10rpx" class="f28">{{item.Description}}</view>
<view style="margin-top:20rpx">
<view style="margin-top:20rpx">
<image wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx;border-radius:20rpx;" src="{{img}}"></image>
<image
bindtap="modeImg" data-item="{{item}}"
wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx;border-radius:20rpx;" src="{{img}}"></image>
</view>
</view>
</view>
</view>
</view>
</view>
...
...
pages/index/hotelDetails/hotelDetails.js
View file @
7db24be0
...
@@ -36,6 +36,15 @@ Page({
...
@@ -36,6 +36,15 @@ Page({
pathUrl
:
pathUrl
pathUrl
:
pathUrl
})
})
},
},
modeImg1
(
e
)
{
let
img
=
e
.
currentTarget
.
dataset
.
item
.
ImgList
;
wx
.
previewImage
({
current
:
img
[
0
],
urls
:
img
,
success
:
function
(
res
)
{
}
})
},
modeImg
(
e
)
{
modeImg
(
e
)
{
let
img
=
[];
let
img
=
[];
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
...
...
pages/index/hotelDetails/hotelDetails.wxml
View file @
7db24be0
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
</view>
</view>
<view class="f28">{{item.Description}}</view>
<view class="f28">{{item.Description}}</view>
<view style="margin-top:20rpx">
<view style="margin-top:20rpx">
<image wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
<image
bindtap="modeImg1" data-item="{{item}}"
wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/index/index.js
View file @
7db24be0
...
@@ -30,8 +30,8 @@ Page({
...
@@ -30,8 +30,8 @@ Page({
configId
:
''
,
configId
:
''
,
tcid
:
''
,
tcid
:
''
,
pathUrl
:
'/pages/index/index'
,
pathUrl
:
'/pages/index/index'
,
optionTCID
:
'
7003
'
,
optionTCID
:
'
8705
'
,
//
8705
//
7003
getimg
:
true
,
getimg
:
true
,
guidegrey
:
5
,
guidegrey
:
5
,
guidemsg
:
{
guidemsg
:
{
...
@@ -41,6 +41,7 @@ Page({
...
@@ -41,6 +41,7 @@ Page({
Score
:
0
,
Score
:
0
,
Description
:
''
,
Description
:
''
,
},
},
tripOver
:
false
,
},
},
...
@@ -103,6 +104,13 @@ Page({
...
@@ -103,6 +104,13 @@ Page({
}
}
},
},
goVoucher
()
{
goVoucher
()
{
let
userInfo
=
(
wx
.
getStorageSync
(
'userInfo'
))
if
(
!
userInfo
)
{
util
.
showToast
(
'text'
,
'请先核对身份!'
,
{
duration
:
3000
})
return
;
}
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'/pages/VoucherDetails/VoucherDetails'
url
:
'/pages/VoucherDetails/VoucherDetails'
})
})
...
@@ -154,6 +162,7 @@ Page({
...
@@ -154,6 +162,7 @@ Page({
this
.
setData
({
this
.
setData
({
contactState
:
true
contactState
:
true
})
})
this
.
getData
();
}).
catch
(
err
=>
{})
}).
catch
(
err
=>
{})
},
},
...
@@ -377,8 +386,8 @@ Page({
...
@@ -377,8 +386,8 @@ Page({
app
.
$api
(
'b2b_get_GetMXYTravelIndexInfo'
,
msg
).
then
(
res
=>
{
app
.
$api
(
'b2b_get_GetMXYTravelIndexInfo'
,
msg
).
then
(
res
=>
{
wx
.
setStorageSync
(
'tcid'
,
res
.
tcid
)
wx
.
setStorageSync
(
'tcid'
,
res
.
tcid
)
if
(
res
.
IsTravelEnd
)
{
if
(
res
.
IsTravelEnd
)
{
//
wx.navigateTo
({
//
this.setData
({
//
url: '/pages/tripover/tripover'
//
tripOver:true
// })
// })
}
}
if
(
res
.
CityList
.
length
>
0
)
{
if
(
res
.
CityList
.
length
>
0
)
{
...
...
pages/index/index.wxml
View file @
7db24be0
This diff is collapsed.
Click to expand it.
pages/index/index.wxss
View file @
7db24be0
/**index.wxss**/
/**index.wxss**/
.tripover{
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: #fff;
}
.getUserInfo{
.getUserInfo{
position: fixed;
position: fixed;
width: 100%;
width: 100%;
...
@@ -347,6 +355,7 @@
...
@@ -347,6 +355,7 @@
border-radius:20rpx;
border-radius:20rpx;
margin: 0 auto;
margin: 0 auto;
margin-top: 30rpx;
margin-top: 30rpx;
}
}
.ContactTc .contentView .lxView{
.ContactTc .contentView .lxView{
width:440rpx;
width:440rpx;
...
@@ -382,7 +391,9 @@
...
@@ -382,7 +391,9 @@
}
}
.ContactTc .noDes{
.ContactTc .noDes{
font-size: 26rpx;
font-size: 26rpx;
padding: 20rpx 0;
padding: 20rpx;
box-sizing: border-box;
text-align: left;
}
}
.ContactTc .noDes textarea{
.ContactTc .noDes textarea{
height: 200rpx;
height: 200rpx;
...
...
pages/index/mealDetail/mealDetail.js
View file @
7db24be0
...
@@ -36,6 +36,15 @@ Page({
...
@@ -36,6 +36,15 @@ Page({
pathUrl
:
pathUrl
pathUrl
:
pathUrl
})
})
},
},
modeImg1
(
e
)
{
let
img
=
e
.
currentTarget
.
dataset
.
item
.
ImgList
;
wx
.
previewImage
({
current
:
img
[
0
],
urls
:
img
,
success
:
function
(
res
)
{
}
})
},
modeImg
(
e
)
{
modeImg
(
e
)
{
let
img
=
[];
let
img
=
[];
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
...
...
pages/index/mealDetail/mealDetail.wxml
View file @
7db24be0
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</view>
</view>
<view class="f28">{{item.Description}}</view>
<view class="f28">{{item.Description}}</view>
<view style="margin-top:20rpx">
<view style="margin-top:20rpx">
<image wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
<image
bindtap="modeImg1" data-item="{{item}}"
wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.js
View file @
7db24be0
...
@@ -37,6 +37,15 @@ Page({
...
@@ -37,6 +37,15 @@ Page({
this
.
getPinglunList
();
this
.
getPinglunList
();
},
},
modeImg1
(
e
)
{
let
img
=
e
.
currentTarget
.
dataset
.
item
.
ImgList
;
wx
.
previewImage
({
current
:
img
[
0
],
urls
:
img
,
success
:
function
(
res
)
{
}
})
},
modeImg
(
e
){
modeImg
(
e
){
let
img
=
[];
let
img
=
[];
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
...
...
pages/index/sceneDetail/sceneDetail.wxml
View file @
7db24be0
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
</view>
</view>
<view class="f28">{{item.Description}}</view>
<view class="f28">{{item.Description}}</view>
<view style="margin-top:20rpx">
<view style="margin-top:20rpx">
<image wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
<image
bindtap="modeImg1" data-item="{{item}}"
wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/index/strateDateil/strateDateil.js
View file @
7db24be0
...
@@ -36,6 +36,15 @@ Page({
...
@@ -36,6 +36,15 @@ Page({
pathUrl
:
pathUrl
pathUrl
:
pathUrl
})
})
},
},
modeImg1
(
e
)
{
let
img
=
e
.
currentTarget
.
dataset
.
item
.
ImgList
;
wx
.
previewImage
({
current
:
img
[
0
],
urls
:
img
,
success
:
function
(
res
)
{
}
})
},
modeImg
(
e
)
{
modeImg
(
e
)
{
let
img
=
[];
let
img
=
[];
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
img
[
0
]
=
e
.
currentTarget
.
dataset
.
img
;
...
...
pages/index/strateDateil/strateDateil.wxml
View file @
7db24be0
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
</view>
</view>
<view class="f28">{{item.Description}}</view>
<view class="f28">{{item.Description}}</view>
<view style="margin-top:20rpx">
<view style="margin-top:20rpx">
<image wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
<image
bindtap="modeImg1" data-item="{{item}}"
wx:for="{{item.ImgList}}" wx:for-item="img" wx:key="index" style="width:250rpx;height:250rpx;margin-right:24rpx" src="{{img}}"></image>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/tripover/tripover.js
deleted
100644 → 0
View file @
6b44c43e
// pages/tripover/tripover.js
Page
({
/**
* 页面的初始数据
*/
data
:
{
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
pages/tripover/tripover.json
deleted
100644 → 0
View file @
6b44c43e
{
"usingComponents"
:
{},
"navigationBarTitleText"
:
"行程结束"
,
"navigationStyle"
:
"default"
}
\ No newline at end of file
pages/tripover/tripover.wxml
deleted
100644 → 0
View file @
6b44c43e
<view class="tripover">
<view style="text-align:center;margin-top:250rpx">
<image style="width:611rpx;height:669rpx" src="../../images/index/trip.png"></image>
</view>
</view>
\ No newline at end of file
pages/tripover/tripover.wxss
deleted
100644 → 0
View file @
6b44c43e
/* pages/tripover/tripover.wxss */
.tripover{
position: absolute;
width: 100%;
height: 100%;
}
\ No newline at end of file
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