Skip to content

F
FlashMan
Commit d2dfb95b authored by Mac's avatar Mac
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

parents 42e557fb 97656a13
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 22 deletions
pages/product/product.wxml
View file @ d2dfb95b
......@@ -52,14 +52,20 @@
<image class='weui-media-box__date__image' src='../../images/product/ico_date.png'></image>
<text class='weui-media-box__date__text'>团期: {{item2.startDate}}</text>
</view>
<view hidden='{{account===""}}'>
<view class="weui-media-box__date weui-media-box__date2">
<text class='weui-media-box__date__text'>航班: {{item2.alName}}(余位：{{item2.surplus}})</text>
</view>
<!-- hidden='{{account===""}}' -->
<view >
<!-- wx:if="{{isMember===1}}" -->
<view class="weui-media-box__desc" wx:if="{{isMember===1}}">
<text class="weui-media-box__desc__up">{{item2.b2BMemberPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text>
统一售价：<text class="weui-media-box__desc__up">{{item2.b2BPrice}}</text>
<!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
</view>
<view class="weui-media-box__desc" wx:else>
<text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text>
统一售价：<text class="weui-media-box__desc__up">{{item2.b2CPrice}}</text>
<!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
</view>
</view>
</view>
......@@ -91,15 +97,25 @@
<image class='weui-media-box__date__image' src='../../images/product/ico_date.png'></image>
<text class='weui-media-box__date__text'>团期: {{item2.startDate}}</text>
</view>
<view hidden='{{account===""}}'>
<view class="weui-media-box__desc" wx:if="{{isMember===1}}">
<text class="weui-media-box__desc__up">{{item2.b2BMemberPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text>
<view class="weui-media-box__date weui-media-box__date2">
<text class='weui-media-box__date__text'>航班: {{item2.alName}}(余位：{{item2.surplus}})</text>
</view>
<!-- hidden='{{account===""}}' -->
<view >
<!-- wx:if="{{isMember===1}}" -->
<view class="weui-media-box__desc" wx:if="{{account=== ''}}">
统一售价1：<text class="weui-media-box__desc__up">{{item2.b2BPrice}}</text>
<!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
</view>
<view class="weui-media-box__desc" wx:else>
统一售价2：<text class="weui-media-box__desc__up">{{item2.b2CPrice}}</text>
<!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
</view>
<!-- <view class="weui-media-box__desc" wx:else>
<text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text>
</view>
</view> -->
</view>
</view>
</navigator>
......
pages/product/product.wxss
View file @ d2dfb95b
......@@ -197,7 +197,12 @@
display: flex;
align-items: center;
}
.weui-media-box__date2{
padding-bottom: 20rpx;
}
.weui-media-box__date2 .weui-media-box__date__text{
font-size: 12px;
}
.weui-media-box__date__image {
width: 30rpx;
height: 30rpx;
......@@ -217,7 +222,7 @@
.weui-media-box__desc{
position: absolute;
left: 0rpx;
bottom: 10rpx;
bottom: 0rpx;
}
.weui-media-box__desc__up{
font-size: 18px;
......
pages/product/productCheck/productCheck.wxml
View file @ d2dfb95b
......@@ -56,14 +56,33 @@
<image class='weui-media-box__date__image' src='../../../images/product/ico_date.png'></image>
<text class='weui-media-box__date__text'>团期: {{item.startDate}}</text>
</view>
<view class="weui-media-box__desc" wx:if="{{isMember===1}}">
<view class="weui-media-box__date weui-media-box__date2">
<text class='weui-media-box__date__text'>航班: {{item.alName}}(余位：{{item.surplus}})</text>
</view>
<view >
<!-- wx:if="{{isMember===1}}" -->
<view class="weui-media-box__desc" wx:if="{{account=== ''}}">
统一售价：<text class="weui-media-box__desc__up">{{item.b2BPrice}}</text>
<!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
</view>
<view class="weui-media-box__desc" wx:else>
统一售价：<text class="weui-media-box__desc__up">{{item.b2CPrice}}</text>
<!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
</view>
<!-- <view class="weui-media-box__desc" wx:else>
<text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text>
</view> -->
</view>
<!-- <view class="weui-media-box__desc" wx:if="{{isMember===1}}">
<text class="weui-media-box__desc__up">{{item.b2BMemberPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item.b2CMemberPrice}}</text>
</view>
<view class="weui-media-box__desc" wx:else>
<text class="weui-media-box__desc__up">{{account=== "" ? item.b2CPrice : item.b2BPrice}}</text>
<text class="weui-media-box__desc__down">¥{{item.b2CPrice}}</text>
</view>
</view> -->
</view>
</navigator>
</block>
......
pages/product/productCheck/productCheck.wxss
View file @ d2dfb95b
......@@ -191,7 +191,9 @@ page {
width: 30rpx;
height: 30rpx;
}
.weui-media-box__date2 .weui-media-box__date__text{
font-size: 12px;
}
.weui-media-box__date__text {
padding: 0 0 0 10rpx;
height: 30rpx;
......@@ -206,7 +208,7 @@ page {
.weui-media-box__desc {
position: absolute;
left: 0rpx;
bottom: 10rpx;
bottom: 0;
}
.weui-media-box__desc__up {
......
pages/product/productDetail/productDetail.wxml
View file @ d2dfb95b
......@@ -26,14 +26,16 @@
controls
></video>
</view>
<view class='header_info1' hidden='{{account===""}}'>
<!-- hidden='{{account===""}}' -->
<view class='header_info1' >
<text class='{{header.priceList.length>0 ? "header_title_style": ""}}'>{{header.priceList.length>0 ? header.priceList[0].myDateTitle :''}}</text>
<text class='header_info1_title'>{{header.title}}</text>
<view class='header_info1_price'>
<view wx:if='{{account!=="" && header.b2BPrice!=-1}}' class='header_info1_price_son'>
<view>
<text class='info1_price_1'>同行价：<text class='info1_price_1_text'>{{header.priceList[header.priceNum].b2BPrice}}</text> / 人起 </text>
<text class='info1_price_1'>统一售价：<text class='info1_price_1_text'>{{header.priceList[header.priceNum].b2BPrice}}</text> / 人起 </text>
</view>
<!-- hidden='{{account === ""}}' -->
<view bindtap='priceViewShow' hidden='{{account === ""}}'>
<image class='arrowo_up {{priceView === true ? "arrowo_down" : ""}} ' src='/images/product/arrow_up.png'></image>
</view>
......@@ -42,6 +44,7 @@
<view>
<text class='info1_price_2' >统一售价：<text class='info1_price_2_text'>{{header.priceList[header.priceNum].b2CPrice}}</text> / 人起</text>
</view>
<!-- -->
<view bindtap='priceViewShow' hidden='{{account === ""}}'>
<image class='arrowo_up {{priceView === true ? "arrowo_down" : ""}}' src='/images/product/arrow_up.png'></image>
</view>
......@@ -277,9 +280,6 @@
<view class='footer_btnBox_btn' bindtap='goUrlOrder'>立即预定</view>
<view class='footer_btnBox_btn footer_btnBox_btn_share' bindtap='OpenShareBox'>分享设置</view>
</view>
<!-- <view class='footer_btnBox' wx:else='{{loginInfo==="false"}}'> wx:if='{{loginInfo==="true"}}'
<view class='footer_btnBox_btn footer_btnBox_btn_noLogin' bindtap='goUrlOrder'>立即预定</view>
</view> -->
</view>
<view class='footer_info' wx:if='{{shareSource.c && shareSource.pe && shareSource.ph}}'>
<view class='footer_info_content'>
......
project.config.json
View file @ d2dfb95b
......@@ -14,7 +14,7 @@
"compileType": "miniprogram",
"libVersion": "2.0.4",
"appid": "wx2e070bb923f858fd",
"projectname": "FlashMan",
"projectname": "FLASHMAN",
"debugOptions": {
"hidedInDevtools": []
},
......
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