Skip to content

严立 / mini-shimao

Go to a project
Commit 24746212 by 严立
Options

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

parents 4bb5939d ce977ff9
Inline Side-by-side
Showing with 330 additions and 220 deletions
pages/home/home/home.wxml
......@@ -21,6 +21,19 @@
<image src="/image/ornament-0.png" mode="widthFix"></image>
</view>
<view class="banner-notice row align-c {{true ? 'login-notice' : ''}}">
<view class="row align-c" bindtap="onNotice">
<image src="./image/inform.png"></image>
<text>微信登陆</text>
</view>
<view class="row con-b align-c">
<view class="notice-bar row con-e" bind:lintap="noticClick">
<text>消费积分 业主特权</text>
</view>
<image class="banner-image" src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
</view>
</view>
<view class="banner-notice row align-c">
<view class="row align-c" bindtap="onNotice">
<image src="./image/inform.png"></image>
......@@ -28,6 +41,7 @@
</view>
<view class="row con-b align-c">
<l-notice-bar show="{{true}}" type="swip" swip-arr="{{noticeTitles}}" speed="2000" l-class="notice-bar" bind:lintap="noticClick"></l-notice-bar>
<view class="border-right"></view>
<image class="banner-image" src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
</view>
</view>
......
pages/home/home/home.wxss
......@@ -64,7 +64,7 @@
top: 620rpx;
left: 40rpx;
width: 670rpx;
height: 92rpx;
height: 108rpx;
padding: 4rpx 32rpx;
background:rgba(255, 255, 255, 1);
box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .05);
......@@ -72,6 +72,9 @@
overflow: hidden;
justify-content: space-between;
}
.login-notice {
margin-bottom: 40rpx;
}
.banner-notice image:nth-child(1) {
width: 40rpx;
......@@ -271,7 +274,7 @@
}
.notice-bar {
width: 366rpx !important;
width: 308rpx !important;
margin: 0 14rpx 0 4rpx;
line-height: 72rpx;
......@@ -285,6 +288,19 @@
.notice-bar swiper-item {
background-color: #ffffff;
}
.notice-bar text {
color: #8A8C8F;
font-size: 26rpx;
}
.border-right {
width: 1rpx;
height: 40rpx;
margin: 0 34rpx 0 24rpx;
background: #DBDFE5;
box-shadow: 0px 16px 48px 0px rgba(0,0,0,0.05);
}
.banner-image {
......
pages/pay/order-comment/order-comment.js
......@@ -9,7 +9,10 @@ Page({
scoreProductText: '0.0',
scoreEnvironment: 0, // 环境分数
scoreEnvironmentText: '0.0',
content: '', // 评价内容,
imgUrls: [], // 评价图片本地路径
orderInfo: {
orderId: '02aaa9a62d5645c59109218c27d2174a',
name: '精灵鸟理想国年卡',
price: '1680.00',
quantity: 4,
......@@ -18,16 +21,16 @@ Page({
id: 0,
imgUrl: ''
},
// {
// id: 1,
// imgUrl: ''
// },
// {
// id: 2,
// imgUrl: ''
// }
]
{
id: 1,
imgUrl: ''
},
{
id: 2,
imgUrl: ''
}
]
},
},
/**
......@@ -37,6 +40,7 @@ Page({
* @returns
*/
onChangeScore: function (event) {
// type 1: 服务评价 2: 产品评价 3: 环境评价
const { index, type } = event.currentTarget.dataset
console.log(index, type)
let { scoreServe, scoreProduct, scoreEnvironment } = this.data
......@@ -67,6 +71,88 @@ Page({
* @returns
*/
eventInputDone: function (event) {
// console.log(event.detail.value)
let content = event.detail.value
this.setData({
content
})
},
/**
* 新增评价图片
* @function
* @param
* @returns
*/
eventImageAdd: function (event) {
console.log(event.detail.all[0])
let imgUrl = event.detail.all[0].url
let imgUrls = []
imgUrls.push(imgUrl)
this.setData({
imgUrls
})
},
/**
* 移除评价图片
* @function
* @param
* @returns
*/
eventImageRemove: function (event) {
console.log(event.detail.all)
},
/**
* 提交订单
* @function
* @param
* @returns
*/
onSubmitCommennt: function () {
console.log('submit')
let funcFile = this.data.imgUrls[0]
wx.uploadFile({
url: App.globalData.baseUrl + '/api/v1/common/upload',
filePath: funcFile,
name: 'file',
header: {
'Content-Type': 'multipart/form-data',
'token': App.globalData.token
},
success: (res) => {
const data = JSON.parse(res.data)
let fileUrls = []
if (data.code === 200 && data.success === true) {
console.log(data.data.fileUrl)
fileUrls.push(data.data.fileUrl)
} else {
console.log('上传失败')
}
// this.setData({
// fileUrls
// })
let formData = {}
formData.orderId = this.data.orderInfo.orderId
formData.imgUrls = fileUrls,
formData.serviceEvaluation = this.data.scoreServeText
formData.productEvaluation = this.data.scoreProductText
formData.environmentalEvaluation = this.data.scoreEnvironmentText
formData.content = this.data.content
console.log(formData)
App.wxRequest({
url: '/api/v1/order/doAppraise',
data: {
'orderId': formData.orderId,
'imgUrls': formData.imgUrls,
'serviceEvaluation': formData.serviceEvaluation,
'productEvaluation': formData.productEvaluation,
'environmentalEvaluation': formData.productEvaluation,
'content': formData.content = this.data.content
},
success: (response) => {
console.log(response)
}
})
}
})
}
})
\ No newline at end of file
pages/pay/order-comment/order-comment.wxml
......@@ -83,7 +83,7 @@
<view class="order-comment">
<l-textarea placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200" l-class="l-textarea" border="{{false}}" bind:linblur="eventInputDone" />
<view class="order-picker">
<l-image-picker l-item-class="l-image-item" l-class="l-picker" count="9" size="3" size-type="compressed" custom="{{true}}">
<l-image-picker l-item-class="l-image-item" l-class="l-picker" count="9" size="3" size-type="compressed" custom="{{true}}" bind:linchange="eventImageAdd" bind:linremove="eventImageRemove">
<view class="col con-c align-c">
<image class="icon-img"></image>
<text>添加图片</text>
......@@ -93,7 +93,7 @@
</view>
</view>
<view class="footer-wrapper">
<view class="comment-btn">
<view class="comment-btn" bindtap="onSubmitCommennt">
<text>提交评价</text>
</view>
</view>
......
pages/play/movie-detail/movie-detail.js
let App = getApp()
Page({
data: {
movieName: '龙猫',
bannerIndex: 0,
bannerStyle: 1,
isMovieEnd: false,
banner: [
{
id: 0,
img: ''
},
{
id: 1,
img: ''
},
{
id: 2,
img: ''
}
],
statusActive: 0,
statusList: [
{ 'id': 0, 'name': '今日08月12日' },
{ 'id': 1, 'name': '明日08月13日' },
],
movieInfo: {
name: '龙猫',
cover: '',
type: '动画 / 奇幻 / 冒险',
director: '宫崎骏',
dimensional: '5D',
actor: '日高法子 坂本千夏 糸井重里 岛本须美 北林谷荣 高木均 雨笠利 雨笠利'
},
showList: {
0: [
{
id: 0,
timeStart: '09:00',
timeEnd: '11:35散场',
statusList: [],
movieInfo: {},
showList: {},
free: '免费'
},
{
id: 1,
timeStart: '13:00',
timeEnd: '15:35散场',
free: '免费'
onLoad: function (options) {
let activityId = options.id
App.wxRequest({
url: '/api/v1/film/getFilmDetail',
data: {
'activityId': activityId,
},
success: (response) => {
let movieInfo = response.data
let showList = {}
showList[0] = movieInfo.today
showList[1] = movieInfo.tomorrow
this.setData({
movieInfo,
showList
})
}
],
1: [
{
id: 0,
timeStart: '1',
timeEnd: '1',
free: '免费'
})
this.getNowTime()
},
{
id: 1,
timeStart: '1',
timeEnd: '1',
free: '免费'
// 获取标签日期
getNowTime: function () {
let now = new Date()
let month = now.getMonth() + 1
let day = now.getDate()
if (month < 10) {
month = '0' + month
}
]
if (day < 10) {
day = '0' + day
}
console.log(month, day)
this.setData({
statusList: [
{ 'id': 0, 'name': `今日${month}月${day}日`},
{ 'id': 1, 'name': `今日${month}月${day+1}日`},
],
})
},
onLoad: function (options) {
},
// 选择标签页日期
onSelectionStatus: function (event) {
console.log(event.currentTarget.dataset.type)
this.setData({
......
pages/play/movie-detail/movie-detail.wxml
......@@ -3,10 +3,9 @@
<view class="container">
<view class="banner">
<swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="onSwiperChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<block wx:for="{{movieInfo.banners}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="banner-swiper-item" data-item="{{item}}" bindtap="bannerClick">
{{item.id}}
<image class="banner-swiper-image" src="{{item.img}}"></image>
<image class="banner-swiper-image" src="{{item}}"></image>
</swiper-item>
</block>
</swiper>
......@@ -20,15 +19,15 @@
</view>
</view>
<view class="movie-wrapper" bindtap="onToMovieDetail">
<view class="movie-wrapper">
<view class="movie-cover">
<image src="{{item.cover}}"></image>
<image src="{{movieInfo.cover}}"></image>
</view>
<view class="movie-info-wrapper">
<view class="movie-name row">
<text>{{movieInfo.name}}</text>
<text>{{movieInfo.filmName}}</text>
<view class="movie-dimensional">
<text>{{movieInfo.dimensional}}</text>
<text>{{movieInfo.tags}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -36,7 +35,7 @@
<text>类型</text>
</view>
<view class="movie-info-right">
<text>{{movieInfo.type}}</text>
<text>{{movieInfo.filmType}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -44,17 +43,17 @@
<text>导演</text>
</view>
<view class="movie-info-right">
<text>{{movieInfo.director}}</text>
<text>{{movieInfo.filmDirector}}</text>
</view>
</view>
<view class="movie-info-actor">
<text class="movie-actor">主演</text>
<text class="actor">{{movieInfo.actor}}</text>
<text class="actor">{{movieInfo.filmLead}}</text>
</view>
</view>
</view>
<view class="show-end col align-c" wx:if="{{isMovieEnd}}">
<view class="show-end col align-c" wx:if="{{false}}">
<image src=""></image>
<text>观影已结束，请期待后续排片</text>
</view>
......@@ -73,13 +72,13 @@
<block wx:for="{{showList[statusActive]}}" wx:key="id">
<view class="show-wrapper row align-c">
<view class="show-time-start">
<text>{{item.timeStart}}</text>
<text>{{item.beginTime}}</text>
</view>
<view class="show-time-end">
<text>{{item.timeEnd}}</text>
<text>{{item.endTime}}</text>
</view>
<view class="show-free">
<text>{{item.free}}</text>
<text>{{free}}</text>
</view>
<view class="show-btn">
<text>报名观影</text>
......
pages/play/movie/movie.js
let App = getApp()
Page({
data: {
btn: '报名观影',
// 请求参数
queryParams: {
pageNo: '1',
pageSize: '-1'
},
statusActive: 0,
statusList: [
{ 'id': 0, 'name': '今日放映' },
{ 'id': 1, 'name': '全部热映' },
],
movieToday: [
{
id:0,
cover: '',
timeStart: '09:00',
timeEnd: '10:35 散场',
name: '龙猫',
dimensional: '5D',
type: '动画 / 奇幻 / 冒险',
actor: '日高法子 坂本千夏 糸井重里',
director: '宫崎骏',
label: '暖心重映',
free: '免费',
},
{
id:1,
cover: '',
timeStart: '11:00',
timeEnd: '12:35 散场',
name: '千与千寻',
dimensional: '2D',
type: '剧情 / 动画 / 奇幻',
actor: '柊瑠美 入野自由 夏木真理…',
director: '宫崎骏',
label: '学会爱 然后长大',
free: '免费',
},
{
id:2,
cover: '',
timeStart: '09:00',
timeEnd: '10:35 散场',
name: '龙猫',
dimensional: '5D',
type: '动画 / 奇幻 / 冒险',
actor: '日高法子 坂本千夏 糸井重里',
director: '宫崎骏',
label: '暖心重映',
free: '免费',
},{
id:3,
cover: '',
timeStart: '09:00',
timeEnd: '10:35 散场',
name: '龙猫',
dimensional: '5D',
type: '动画 / 奇幻 / 冒险',
actor: '日高法子 坂本千夏 糸井重里',
director: '宫崎骏',
label: '暖心重映',
free: '免费',
}
],
// 今日热映
movieToday: [],
//全部热映
movieAll: {
movieWeek: {
title: '本周热映',
list: [
{
id:0,
cover: '',
name: '龙猫',
dimensional: '5D',
type: '动画 / 奇幻 / 冒险',
actor: '日高法子 坂本千夏 糸井重里',
director: '宫崎骏',
label: '暖心重映',
free: '免费',
},
{
id:1,
cover: '',
name: '龙猫',
dimensional: '5D',
type: '动画 / 奇幻 / 冒险',
actor: '日高法子 坂本千夏 糸井重里',
director: '宫崎骏',
label: '暖心重映',
free: '免费',
}
]
list: []
},
movieNextWeek: {
title: '下周热映',
list: [
{
id:0,
cover: '',
name: '海上钢琴师',
dimensional: '3D',
type: '剧情 / 音乐',
actor: '蒂姆·罗斯 普路特·泰勒…',
director: '朱塞佩·托纳多雷',
label: '琴键有限 人生无限',
free: '免费',
},
{
id:1,
cover: '',
name: '绿皮书',
dimensional: '2D',
type: '剧情 / 喜剧 / 传记',
actor: '维果·莫腾森 马赫沙拉...',
director: '彼得·法雷里',
label: '两种人生 一段旅程',
free: '免费',
list: []
}
}
]
},
onLoad: function () {
this.getTodayFilm()
this.getAllFilm()
},
/**
* 查询今日放映
* @function
* @param
* @returns
*/
getTodayFilm: function () {
App.wxRequest({
url: '/api/v1/film/getTodayFilm',
data: {
'pageNo': this.data.queryParams.pageNo,
'pageSize': this.data.queryParams.pageSize,
},
success: (response) => {
let funcResponse = response.data
let movieToday = funcResponse.list
movieToday.forEach(v => {
v.endTime = v.endTime + ' 散场'
v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ')
})
this.setData({
movieToday
})
}
})
},
getAllFilm: function () {
// weekType: 0本周热映 1下周
let movieWeek = []
let movieNextWeek = []
//本周热映
App.wxRequest({
url: '/api/v1/film/getAllFilm',
data: {
'pageNo': this.data.queryParams.pageNo,
'pageSize': this.data.queryParams.pageSize,
'weekType': '0'
},
success: (response) => {
let funcResponse = response.data
movieWeek = funcResponse.list
movieWeek.forEach(v => {
v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ')
})
this.setData({
'movieAll.movieWeek.list': movieWeek
})
}
})
App.wxRequest({
url: '/api/v1/film/getAllFilm',
data: {
'pageNo': this.data.queryParams.pageNo,
'pageSize': this.data.queryParams.pageSize,
'weekType': '1'
},
onLoad: function (options) {
success: (response) => {
let funcResponse = response.data
movieNextWeek = funcResponse.list
movieNextWeek.forEach(v => {
v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ')
})
this.setData({
'movieAll.movieNextWeek.list': movieNextWeek
})
}
})
},
onSelectionStatus: function (event) {
console.log(event.currentTarget.dataset.type)
this.setData({
statusActive: Number(event.currentTarget.dataset.type)
})
},
// 跳转到电影详情页面
onToMovieDetail: function () {
onToMovieDetail: function (event) {
let movieId = event.currentTarget.dataset.movieid
wx.navigateTo({
url: '/pages/play/movie-detail/movie-detail',
url: '/pages/play/movie-detail/movie-detail?id=' + movieId,
})
},
onReportMovie: function () {
console.log('报名观影')
// 跳转到报名页面
onReportMovie: function (event) {
let id = event.currentTarget.dataset.movieid
wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=' + '7' + '&id' + id,
})
}
})
\ No newline at end of file
pages/play/movie/movie.wxml
......@@ -13,13 +13,13 @@
<view wx:if="{{statusActive === 0}}">
<block wx:for="{{movieToday}}" wx:key="id">
<view class="movie-wrapper row" bindtap="onToMovieDetail">
<view class="movie-wrapper row">
<view class="movie-time-wrapper row align-c">
<view class="movie-time-start">
<text>{{item.timeStart}}</text>
<text>{{item.beginTime}}</text>
</view>
<view class="movie-time-end">
<text>{{item.timeEnd}}</text>
<text>{{item.endTime}}</text>
</view>
</view>
<view class="row">
......@@ -28,9 +28,9 @@
</view>
<view class="movie-info-wrapper">
<view class="movie-name row">
<text>{{item.name}}</text>
<text>{{item.filmName}}</text>
<view class="movie-dimensional">
<text>{{item.dimensional}}</text>
<text>{{item.tags}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -38,7 +38,7 @@
<text>类型</text>
</view>
<view class="movie-info-right">
<text>{{item.type}}</text>
<text>{{item.filmType}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -46,7 +46,7 @@
<text>导演</text>
</view>
<view class="movie-info-right">
<text>{{item.director}}</text>
<text>{{item.filmDirector}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -54,17 +54,17 @@
<text>主演</text>
</view>
<view class="movie-info-right">
<text>{{item.actor}}</text>
<text>{{item.filmLead}}</text>
</view>
</view>
<view>
<text class="movie-label">{{item.label}}</text>
<view class="movie-label">
<text>{{item.keyword}}</text>
</view>
<view class="movie-free">
<text>{{item.free}}</text>
<text>{{item.ownerPrice}}</text>
</view>
<view class="movie-btn" catchtap="onReportMovie">
<text>{{btn}}</text>
<view class="movie-btn" catchtap="onReportMovie" data-movieId="{{item.activityId}}">
<text>报名观影</text>
</view>
</view>
</view>
......@@ -73,19 +73,21 @@
</view>
<view wx:else>
<block wx:for="{{movieAll}}" wx:for-index="key" wx:for-item="movieList" wx:key="key">
<view class="movie-week">
<view class="movie-week" wx:if="{{movieList.list.length > 0}}">
<text>{{movieList.title}}</text>
</view>
<block wx:for="{{movieList.list}}" wx:key="id">
<view class="all-movie-wrapper" bindtap="onToMovieDetail">
<view class="all-movie-wrapper" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}">
<view class="all-movie-cover">
<image src="{{item.cover}}"></image>
</view>
<view class="movie-info-wrapper">
<view class="movie-name row">
<text>{{item.name}}</text>
<view class="movie-name-wrapper row">
<view class="movie-name">
<text>{{item.filmName}}</text>
</view>
<view class="movie-dimensional">
<text>{{item.dimensional}}</text>
<text>{{item.tags}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -93,7 +95,7 @@
<text>类型</text>
</view>
<view class="movie-info-right">
<text>{{item.type}}</text>
<text>{{item.filmType}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -101,7 +103,7 @@
<text>导演</text>
</view>
<view class="movie-info-right">
<text>{{item.director}}</text>
<text>{{item.filmDirector}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -109,14 +111,14 @@
<text>主演</text>
</view>
<view class="movie-info-right">
<text>{{item.actor}}</text>
<text>{{item.filmLead}}</text>
</view>
</view>
<view>
<text class="movie-label">{{item.label}}</text>
<view class="movie-label">
<text>{{item.keyword}}</text>
</view>
<view class="movie-free">
<text>{{item.free}}</text>
<text>{{item.ownerPrice}}</text>
</view>
</view>
</view>
......
pages/play/movie/movie.wxss
......@@ -64,10 +64,15 @@ page {
.movie-info-wrapper {
margin-left: 34rpx;
}
.movie-name {
.movie-name-wrapper {
height: 52rpx;
}
.movie-name {
color: #fff;
font-size: 30rpx;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.movie-dimensional {
width: 52rpx;
......@@ -100,6 +105,8 @@ page {
.movie-label {
height:32rpx;
margin-top: 16rpx;
}
.movie-label text {
padding: 0 8rpx;
color: #86C5E1;
font-size: 22rpx;
......
project.config.json
......@@ -21,17 +21,17 @@
"checkSiteMap": false,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"enableEngineNative": false,
"packNpmManually": false,
"packNpmRelationList": []
},
......@@ -148,8 +148,8 @@
},
{
"id": 11,
"name": "pages/play/movie-detail/movie-detail",
"pathName": "pages/play/movie-detail/movie-detail",
"name": "pages/play/movie/movie",
"pathName": "pages/play/movie/movie",
"query": "",
"scene": null
},
......@@ -159,6 +159,13 @@
"pathName": "pages/play/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/service-detail/service-detail",
"pathName": "pages/play/service-detail/service-detail",
"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 sign in to comment