Skip to content

严立 / mini-shimao

Go to a project
Commit 9baebc4c by 严立
Options

LL - UI 修改

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