Commit 3380ed97 authored by 黄媛媛's avatar 黄媛媛

update

parent e1bfe137
...@@ -47,8 +47,8 @@ import PAGE_CONFIG from './config/pageConfig.js' ...@@ -47,8 +47,8 @@ import PAGE_CONFIG from './config/pageConfig.js'
const { Provider } = WeAppRedux; const { Provider } = WeAppRedux;
const store = createStore(reducer) // redux store const store = createStore(reducer) // redux store
let md5 = require('utils/md5.js') let md5 = require('utils/md5.js')
let netUrl = 'http://testapi.oytour.com/api/common/post'; // let netUrl = 'http://testapi.oytour.com/api/common/post';
// let netUrl = 'https://reborn.oytour.com/api/common/post'; let netUrl = 'https://reborn.oytour.com/api/common/post';
App( App(
Provider(store)( Provider(store)(
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"pages/logs/logs", "pages/logs/logs",
"pages/me/index", "pages/me/index",
"partials/chating/chating", "partials/chating/chating",
"pages/video/index", "pages/video/video",
"components/emoji/emoji", "components/emoji/emoji",
"components/inputclear/inputclear", "components/inputclear/inputclear",
"components/inputmodal/inputmodal", "components/inputmodal/inputmodal",
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"pages/tripover/tripover", "pages/tripover/tripover",
"pages/comments/comments", "pages/comments/comments",
"pages/VoucherDetails/VoucherDetails" "pages/VoucherDetails/VoucherDetails"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
...@@ -50,7 +49,7 @@ ...@@ -50,7 +49,7 @@
"selectedIconPath": "images/tabbar/msga.png" "selectedIconPath": "images/tabbar/msga.png"
}, },
{ {
"pagePath": "pages/video/index", "pagePath": "pages/video/video",
"text": "旅友圈", "text": "旅友圈",
"iconPath": "images/tabbar/video.png", "iconPath": "images/tabbar/video.png",
"selectedIconPath": "images/tabbar/videoa.png" "selectedIconPath": "images/tabbar/videoa.png"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</view> </view>
</view> </view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:20rpx 0 20rpx 0"> <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> <image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view> </view>
<view style="padding-bottom: 20rpx;" class="f28"> <view style="padding-bottom: 20rpx;" class="f28">
......
This diff is collapsed.
...@@ -17,7 +17,7 @@ ...@@ -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.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: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"> <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> <image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view> </view>
<view style="padding-bottom: 20rpx;" class="f28"> <view style="padding-bottom: 20rpx;" class="f28">
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</view> </view>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</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"> <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> <image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view> </view>
<view style="padding-bottom: 20rpx;" class="f28"> <view style="padding-bottom: 20rpx;" class="f28">
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</view> </view>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</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"> <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> <image wx:else style="width:100%;border-radius:20rpx" src="../../../images/index/default.png"></image>
</view> </view>
<view style="padding-bottom: 20rpx;" class="f28"> <view style="padding-bottom: 20rpx;" class="f28">
......
<!--pages/me/index.wxml--> <view class="f30 c99 center">
<text>pages/me/index.wxml</text> 正在开发中请稍后
</view>
<!--pages/video/index.wxml-->
<text>pages/video/index.wxml</text>
/* pages/video/index.wxss */
\ No newline at end of file
// pages/video/index.js // pages/video/video.js
Page({ Page({
/** /**
......
<view class="f30 c99 center">
正在开发中请稍后
</view>
/* pages/video/video.wxss */
\ No newline at end of file
{ {
"usingComponents": {} "usingComponents": {},
"navigationStyle": "custom"
} }
\ No newline at end of file
...@@ -167,6 +167,20 @@ ...@@ -167,6 +167,20 @@
"pathName": "pages/msg/index/index", "pathName": "pages/msg/index/index",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "欢迎页",
"pathName": "pages/welcome/welcome",
"query": "",
"scene": null
},
{
"id": 17,
"name": "旅又圈",
"pathName": "pages/video/video",
"query": "",
"scene": null
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment