Skip to content

严立 / mini-shimao

Go to a project
Commit af169284 by wjw
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao.git into master

parents 746763ca 28a28d3b
Inline Side-by-side
Showing with 29 additions and 30 deletions
pages/commodity/home/home.wxml
......@@ -114,7 +114,7 @@
</view>
<swiper indicator-dots="true">
<!-- 儿童营地文创店 -->
<!-- <swiper-item>
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image>
<button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button>
......@@ -127,12 +127,12 @@
</view>
</block>
</view>
</swiper-item> -->
</swiper-item>
<!-- 海错图文创店 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-3.png'}}"></image>
<image src="{{resourcesBase + 'commodity/home/shop-3-0930.png'}}"></image>
<!-- 临时屏蔽购买 -->
<!-- <button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button> -->
</view>
......
pages/home/home/home.js
......@@ -86,7 +86,7 @@ Page({
// 来自页面内转发按钮
}
return {
title: '自定义转发标题',
title: '碧海银湖 | 理想生活',
path: '/pages/home/home/home'
}
},
......
pages/mine/appointment/appointment.js
......@@ -57,11 +57,6 @@ Page({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
active: type
})
if (type === 0) {
this.getActivity()
} else {
this.getList(type)
}
},
onShow: function () {
......@@ -69,6 +64,7 @@ Page({
pageNo: 1,
pageSize: 10,
data: [],
isFinished: false,
activityList: [],
})
......@@ -241,7 +237,7 @@ Page({
isDoing: false,
'activityList': [],
'pageNo': 1,
isFinished:false
isFinished: false
})
that.getActivity()
}, 2000);
......@@ -298,7 +294,7 @@ Page({
'date': item.activeTime,
'address': item.address,
'num': item.number,
'amount': item.totalMoney.toFixed(2),
'amount': item.totalMoney ? item.totalMoney.toFixed(2) : 0,
'wxRequest': item.wxRequest
}
tmpArr.push(obj)
......
pages/mine/order/order.js
......@@ -46,6 +46,7 @@ Page({
this.setData({
orderPages: 1,
orderList: [],
isFinished: false,
})
this.setOrderType()
},
......
pages/pay/order-detail/order-detail.js
......@@ -264,7 +264,7 @@ Page({
}
// 电影
if (Number(funcOrderInfo.commodityType) === -2) {
if (funcOrderInfo.expireTime !== '' && Number(funcOrderInfo.commodityType) === -2) {
let funcDate = funcOrderInfo.expireTime.match(/[0-9]+-[0-9]+-[0-9]+/)[0]
let funcTime = funcOrderInfo.expireTime.match(/[0-9]+:[0-9]+/g)
......
pages/pay/order-input/order-input.js
......@@ -233,7 +233,7 @@ Page({
})
this.setData({
orderType: logicData.option.type,
buyContentCover: this.data.shoppingCartList[0].cover,
buyContentCover: '',
buyContentTitle: this.data.shoppingCartList[0].name,
noticeText: '报名须知',
quantityTitle: '报名人数',
......
pages/play/movie-detail/movie-detail.js
......@@ -156,9 +156,8 @@ Page({
'name': this.data.movieInfo.filmName, // 电影名称
'cover': this.data.movieInfo.cover, // 电影封面
'entryId': event.currentTarget.dataset.item.filmId, // 场次 id
'price': this.data.movieInfo.sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(this.data.movieInfo.sightseerPrice), // 普通价文本格式
'price': this.data.movieInfo.visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(this.data.movieInfo.visitorPrice), // 普通价文本格式
'priceSpecial': this.data.movieInfo.ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(this.data.movieInfo.ownerPrice), // 业主价文本格式
'priceDiscount': this.data.movieInfo.price, // 活动价
......
pages/play/movie/movie.js
......@@ -158,7 +158,7 @@ Page({
let funcItem = {
'id': funcResponse.list[i].activityId,
'entryId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].activityId,
'cover': funcResponse.list[i].cover,
'endTime': funcResponse.list[i].endTime + ' 散场',
'beginTime': funcResponse.list[i].beginTime,
......@@ -167,8 +167,8 @@ Page({
'filmType': funcResponse.list[i].filmType,
'filmDirector': funcResponse.list[i].filmDirector,
'filmLead': funcResponse.list[i].filmLead,
'price': funcResponse.list[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].sightseerPrice),
'price': funcResponse.list[i].visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].visitorPrice),
'priceSpecial': funcResponse.list[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcResponse.list[i].ownerPrice),
'priceDiscount': funcResponse.list[i].price, // 活动价
......@@ -241,7 +241,7 @@ Page({
let funcItem = {
'id': funcResponse.list[i].activityId,
'entryId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].activityId,
'cover': funcResponse.list[i].cover,
'endTime': funcResponse.list[i].endTime + ' 散场',
'beginTime': funcResponse.list[i].beginTime,
......@@ -250,8 +250,8 @@ Page({
'filmType': funcResponse.list[i].filmType,
'filmDirector': funcResponse.list[i].filmDirector,
'filmLead': funcResponse.list[i].filmLead,
'price': funcResponse.list[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].sightseerPrice),
'price': funcResponse.list[i].visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].visitorPrice),
'priceSpecial': funcResponse.list[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcResponse.list[i].ownerPrice),
'priceDiscount': funcResponse.list[i].price, // 活动价
......@@ -306,7 +306,7 @@ Page({
let funcItem = {
'id': funcResponse.list[i].activityId,
'entryId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].filmId,
'activityId': funcResponse.list[i].activityId,
'cover': funcResponse.list[i].cover,
'endTime': funcResponse.list[i].endTime + ' 散场',
'beginTime': funcResponse.list[i].beginTime,
......@@ -315,8 +315,8 @@ Page({
'filmType': funcResponse.list[i].filmType,
'filmDirector': funcResponse.list[i].filmDirector,
'filmLead': funcResponse.list[i].filmLead,
'price': funcResponse.list[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].sightseerPrice),
'price': funcResponse.list[i].visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse.list[i].visitorPrice),
'priceSpecial': funcResponse.list[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcResponse.list[i].ownerPrice),
'priceDiscount': funcResponse.list[i].price, // 活动价
......
pages/play/movie/movie.wxml
......@@ -72,7 +72,8 @@
<view class="movie-free" wx:if="{{item.priceType === 3}}">
<text>{{item.price === 0 ? '免费' : '￥' + item.priceText}}</text>
</view>
<view class="movie-btn" catchtap="onReportMovie" data-item="{{item}}">
<view class="movie-btn" data-item="{{item}}">
<!-- <view class="movie-btn" catchtap="onReportMovie" data-item="{{item}}"> -->
<text>报名观影</text>
</view>
</view>
......@@ -88,7 +89,7 @@
</block>
</view>
<view wx:if="{{statusActive === 1}}">
<block wx:for="{{movieAll}}" wx:for-index="index" wx:for-item="movieList" wx:key="{{index}}" wx:if="{{movieAll.movieWeek.list.length > 0 || movieAll.movieNextWeek.list.length > 0}}">
<block wx:for="{{movieAll}}" wx:for-index="index" wx:for-item="movieList" wx:key="index" wx:if="{{movieAll.movieWeek.list.length > 0 || movieAll.movieNextWeek.list.length > 0}}">
<view class="movie-week row align-c con-c" wx:if="{{movieList.list.length > 0}}">
<view class="line"></view>
<view class="movie-week-title">
......@@ -98,7 +99,7 @@
</view>
<view class="line"></view>
</view>
<block wx:for="{{movieList.list}}" wx:key="{{index}}" wx:for-index="index">
<block wx:for="{{movieList.list}}" wx:key="index" wx:for-index="index">
<view class="all-movie-wrapper" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}">
<view class="all-movie-cover">
<image src="{{item.cover}}"></image>
......@@ -148,7 +149,8 @@
<view class="movie-free" wx:if="{{item.priceType === 3}}">
<text>{{item.price === 0 ? '免费' : '￥' + item.priceText}}</text>
</view>
<view class="movie-btn" catchtap="onReportMovie" data-item="{{item}}">
<!-- <view class="movie-btn" catchtap="onReportMovie" data-item="{{item}}"> -->
<view class="movie-btn" data-item="{{item}}">
<text>报名观影</text>
</view>
</view>
......
read.js
......@@ -15,5 +15,5 @@
* query
*
* js - 列表相关
* 循环一定添加 key index
* 循环一定添加 key index
*/
\ No newline at end of file
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 sign in to comment