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
3380ed97
Commit
3380ed97
authored
Mar 03, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
e1bfe137
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
153 additions
and
125 deletions
+153
-125
app.js
app.js
+2
-2
app.json
app.json
+2
-3
hotelDetails.wxml
pages/index/hotelDetails/hotelDetails.wxml
+1
-1
index.js
pages/index/index.js
+121
-109
mealDetail.wxml
pages/index/mealDetail/mealDetail.wxml
+1
-1
sceneDetail.wxml
pages/index/sceneDetail/sceneDetail.wxml
+1
-1
strateDateil.wxml
pages/index/strateDateil/strateDateil.wxml
+1
-1
index.wxml
pages/me/index.wxml
+3
-2
index.wxml
pages/video/index.wxml
+0
-2
index.wxss
pages/video/index.wxss
+0
-1
video.js
pages/video/video.js
+1
-1
video.json
pages/video/video.json
+0
-0
video.wxml
pages/video/video.wxml
+3
-0
video.wxss
pages/video/video.wxss
+1
-0
welcome.json
pages/welcome/welcome.json
+2
-1
project.config.json
project.config.json
+14
-0
No files found.
app.js
View file @
3380ed97
...
...
@@ -47,8 +47,8 @@ import PAGE_CONFIG from './config/pageConfig.js'
const
{
Provider
}
=
WeAppRedux
;
const
store
=
createStore
(
reducer
)
// redux store
let
md5
=
require
(
'utils/md5.js'
)
let
netUrl
=
'http://testapi.oytour.com/api/common/post'
;
//
let netUrl = 'https://reborn.oytour.com/api/common/post';
//
let netUrl = 'http://testapi.oytour.com/api/common/post';
let
netUrl
=
'https://reborn.oytour.com/api/common/post'
;
App
(
Provider
(
store
)(
...
...
app.json
View file @
3380ed97
...
...
@@ -8,7 +8,7 @@
"pages/logs/logs"
,
"pages/me/index"
,
"partials/chating/chating"
,
"pages/video/
index
"
,
"pages/video/
video
"
,
"components/emoji/emoji"
,
"components/inputclear/inputclear"
,
"components/inputmodal/inputmodal"
,
...
...
@@ -23,7 +23,6 @@
"pages/tripover/tripover"
,
"pages/comments/comments"
,
"pages/VoucherDetails/VoucherDetails"
],
"window"
:
{
"backgroundTextStyle"
:
"light"
,
...
...
@@ -50,7 +49,7 @@
"selectedIconPath"
:
"images/tabbar/msga.png"
},
{
"pagePath"
:
"pages/video/
index
"
,
"pagePath"
:
"pages/video/
video
"
,
"text"
:
"旅友圈"
,
"iconPath"
:
"images/tabbar/video.png"
,
"selectedIconPath"
:
"images/tabbar/videoa.png"
...
...
pages/index/hotelDetails/hotelDetails.wxml
View file @
3380ed97
...
...
@@ -14,7 +14,7 @@
</view>
</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:20rpx 0 20rpx 0">
<image bindtap="modeImg" data-img="{{item}}" wx:if="item" mode="widthFix" style="max-width:100%" src="{{item}}"></image>
<image bindtap="modeImg" data-img="{{item}}" wx:if="item" mode="widthFix" style="max-width:100%
;min-width:100%
" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
...
...
pages/index/index.js
View file @
3380ed97
This diff is collapsed.
Click to expand it.
pages/index/mealDetail/mealDetail.wxml
View file @
3380ed97
...
...
@@ -17,7 +17,7 @@
<view wx:if="{{dataInfo.SupportCount && dataInfo.SupportCount!=''}}" style="margin-top:10rpx" class="f24 c99">餐厅人数:{{dataInfo.SupportCount}}</view>
<view wx:if="{{dataInfo.ParkInfo && dataInfo.ParkInfo!=''}}" style="margin-top:10rpx" class="f24 c99">停车说明:{{dataInfo.ParkInfo}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:40rpx 0 30rpx 0">
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%" src="{{item}}"></image>
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%
;min-width:100%
" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
...
...
pages/index/sceneDetail/sceneDetail.wxml
View file @
3380ed97
...
...
@@ -15,7 +15,7 @@
</view>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:30rpx 0 30rpx 0">
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%" src="{{item}}"></image>
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%
;min-width:100%
" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
...
...
pages/index/strateDateil/strateDateil.wxml
View file @
3380ed97
...
...
@@ -15,7 +15,7 @@
</view>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:30rpx 0 30rpx 0">
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%" src="{{item}}"></image>
<image bindtap="modeImg" data-img="{{item}}" wx:if="{{item}}" mode="widthFix" style="max-width:100%
;min-width:100%
" src="{{item}}"></image>
<image wx:else style="width:100%;border-radius:20rpx" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
...
...
pages/me/index.wxml
View file @
3380ed97
<!--pages/me/index.wxml-->
<text>pages/me/index.wxml</text>
<view class="f30 c99 center">
正在开发中请稍后
</view>
pages/video/index.wxml
deleted
100644 → 0
View file @
e1bfe137
<!--pages/video/index.wxml-->
<text>pages/video/index.wxml</text>
pages/video/index.wxss
deleted
100644 → 0
View file @
e1bfe137
/* pages/video/index.wxss */
\ No newline at end of file
pages/video/
index
.js
→
pages/video/
video
.js
View file @
3380ed97
// pages/video/
index
.js
// pages/video/
video
.js
Page
({
/**
...
...
pages/video/
index
.json
→
pages/video/
video
.json
View file @
3380ed97
File moved
pages/video/video.wxml
0 → 100644
View file @
3380ed97
<view class="f30 c99 center">
正在开发中请稍后
</view>
pages/video/video.wxss
0 → 100644
View file @
3380ed97
/* pages/video/video.wxss */
\ No newline at end of file
pages/welcome/welcome.json
View file @
3380ed97
{
"usingComponents"
:
{}
"usingComponents"
:
{},
"navigationStyle"
:
"custom"
}
\ No newline at end of file
project.config.json
View file @
3380ed97
...
...
@@ -167,6 +167,20 @@
"pathName"
:
"pages/msg/index/index"
,
"query"
:
""
,
"scene"
:
null
},
{
"id"
:
-1
,
"name"
:
"欢迎页"
,
"pathName"
:
"pages/welcome/welcome"
,
"query"
:
""
,
"scene"
:
null
},
{
"id"
:
17
,
"name"
:
"旅又圈"
,
"pathName"
:
"pages/video/video"
,
"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