Skip to content

严立 / mini-shimao

Go to a project
Commit f1d53533 by 严立
Options

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

parents db58af97 e48bfde0
Expand all
Inline Side-by-side
Showing with 534 additions and 94 deletions
pages/mine/appointment/appointment.js
// pages/myAppointment/myAppointment.js // pages/myAppointment/myAppointment.js
const app = getApp() const App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back.png',
color: '#000000',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/back.png',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '100rpx',
},
navigationScroll: 0,
navItem: [ navItem: [
// {content:'全部',type:'0'}, {content:'主题活动',type:'0'},
{ {
content: '夜间入园预约', content: '夜间入园预约',
type: '1' type: '1'
...@@ -17,9 +39,79 @@ Page({ ...@@ -17,9 +39,79 @@ Page({
type: '2' type: '2'
}, },
], ],
// 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭)
// 活动状态(0 未开始 1进行中 2 已结束)
activityList: [
// {
// orderId: 0,
// name: '海滩夏日音乐节',
// status: '0',
// activeState: '0',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
// {
// orderId: 1,
// name: '海滩夏日音乐节',
// status: '2',
// activeState: '0',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
// {
// orderId: 2,
// name: '海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节',
// status: '2',
// activeState: '1',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
// {
// orderId: 2,
// name: '海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节',
// status: '3',
// activeState: '2',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
// {
// orderId: 2,
// name: '海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节',
// status: '4',
// activeState: '1',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
// {
// orderId: 2,
// name: '海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节海滩夏日音乐节',
// status: '-1',
// activeState: '1',
// cover: '',
// date: '6月30日 10:00-12:00',
// address: '云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧云之亭广场外侧',
// num: 3,
// amount: '326.00'
// },
],
data: [ // 假数据数组,type=0入园预约,type=1 看房预约 data: [ // 假数据数组,type=0入园预约,type=1 看房预约
// {title:'夜间入园预约',type:'0',time:'6月30日 20:00-24:00',num:3,url:'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'}, {title:'夜间入园预约',type:'0',time:'6月30日 20:00-24:00',num:3,url:'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'},
// {title:'看房预约',type:'1',time:'6月30日',num:3,url:' http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'}, {title:'看房预约',type:'1',time:'6月30日',num:3,url:' http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'},
], ],
active: 0, active: 0,
height: 0, height: 0,
...@@ -27,10 +119,14 @@ Page({ ...@@ -27,10 +119,14 @@ Page({
// 点击导航切换，默认是全部的 // 点击导航切换，默认是全部的
chageNav(e) { chageNav(e) {
let index = e.currentTarget.dataset.index let index = e.currentTarget.dataset.index
if (index === 0) {
this.getActivity()
} else {
this.getList(index)
}
this.setData({ this.setData({
active: index active: index
}) })
this.getList(index)
}, },
//预约凭证 //预约凭证
gohotelAccommodation(e) { gohotelAccommodation(e) {
...@@ -53,11 +149,62 @@ Page({ ...@@ -53,11 +149,62 @@ Page({
this.setData({ this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度 height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
}) })
this.getList(this.data.active) // this.getList(this.data.active)
this.getActivity()
}, },
// 页面滚动
onPageScroll: function (funcEvent) {
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
// 我的活动
getActivity: function () {
let that = this
App.wxRequest({
url: '/api/v1/activity/getMyActivityList',
data: {
activeState: '', //""全部 0 未开始 1进行中 2已结束
pageSize: '10',
pageNo: '1',
type: '1'
},
success: function(res) {
let funcData = res.data.list
let tmpArr = []
funcData.forEach(item => {
let obj = {
orderId: item.orderId,
enrollId: item.enrollId,
name: item.name,
status: item.status, // 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭)
activeState: item.activeState, // 活动状态(0 未开始 1进行中 2 已结束)
cover: item.cover,
date: item.activeDate + ' ' + item.activeTime,
address: item.address,
num: item.number,
amount: item.totalMoney.toFixed(2)
}
tmpArr.push(obj)
})
that.setData({
activityList: tmpArr
})
}
})
},
// 预约列表/我的预约 // 预约列表/我的预约
getList(index) { getList(index) {
index = index - 1
let type = '' let type = ''
switch (index) { switch (index) {
case 0: case 0:
...@@ -68,7 +215,7 @@ Page({ ...@@ -68,7 +215,7 @@ Page({
break; break;
} }
let that = this let that = this
app.wxRequest({ App.wxRequest({
url: '/api/v1/subscribe/getList', url: '/api/v1/subscribe/getList',
data: { data: {
state: '', state: '',
......
pages/mine/appointment/appointment.wxss
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
/* min-height: 1000rpx; */ /* min-height: 1000rpx; */
height: auto; height: auto;
/* background-color: rgb(245, 244, 249); */ /* background-color: rgb(245, 244, 249); */
padding-top: 50rpx; padding-bottom: 132rpx;
} }
.noActive { .noActive {
...@@ -73,8 +73,7 @@ ...@@ -73,8 +73,7 @@
margin: 0 auto; margin: 0 auto;
margin-top: 64rpx; margin-top: 64rpx;
} }
.myAppointment-item{
.myAppointment-item {
width: 670rpx; width: 670rpx;
height: 360rpx; height: 360rpx;
margin: auto; margin: auto;
...@@ -83,39 +82,210 @@ ...@@ -83,39 +82,210 @@
border-radius: 4px; border-radius: 4px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.item-img{
.item-img {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 360rpx; height:360rpx;
} }
.item-content{
.item-content {
width: 610rpx; width: 610rpx;
height: auto; height: auto;
position: absolute; position: absolute;
bottom: 45rpx; bottom: 45rpx;
left: 30rpx; left: 30rpx;
} }
.item-title{
.item-title {
font-size: 36rpx; font-size: 36rpx;
line-height: 70rpx; line-height: 70rpx;
} }
.item-time{
.item-time {
line-height: 48rpx; line-height: 48rpx;
font-size: 28rpx; font-size: 28rpx;
color: rgb(220, 214, 220); color: rgb(220, 214, 220);
} }
.item-num{
.item-num { font-size:28rpx ;
font-size: 28rpx;
color: rgb(220, 214, 220); color: rgb(220, 214, 220);
line-height: 48rpx; line-height: 48rpx;
}
/* 入园标题样式 */
.item-num-1{
color: rgb(244, 254, 255);
}
.item-time-1{
color: rgb(40, 50, 56);
}
.button{
width: 170rpx;
height: 70rpx;
position: absolute;
bottom: 45rpx;
right: 30rpx;
line-height: 70rpx;
text-align: center;
color: white;
background:rgba(255,255,255,0.53);
border-radius: 3px;
font-size: 28rpx;
}
.appointment-wrapper {
position: relative;
width: 670rpx;
height: 360rpx;
margin: 78rpx auto 0;
padding: 24rpx 32rpx 0;
background-color: #FFFFFF;
border-radius: 4rpx;
}
.appointment-time {
position: absolute;
left: 0;
top: -28rpx;
height: 56rpx;
padding: 0 24rpx;
font-size: 26rpx;
color: #fff;
line-height: 56rpx;
font-weight: 600;
background-color: #000;
border-radius: 4rpx;
}
.appintment-activity-status {
color: #86C5E1;
text-align: right;
font-size: 26;
line-height: 36rpx;
}
.appintment-activity-status-pay {
color: #E66060;
font-size: 26;
text-align: right;
line-height: 36rpx;
} }
.appintment-activity-status-cancel {
color: #C2C7CF;
font-size: 26;
text-align: right;
line-height: 36rpx;
}
.appointment-activity-content {
margin-top: 20rpx;
}
.appointment-activity-img image {
width: 140rpx;
height: 136rpx;
background-color: #ccc;
}
.appointment-activity-info {
flex: 1;
margin-left: 32rpx;
}
.appointment-activity-title {
display: -webkit-box;
color: #15191F;
font-size: 30rpx;
font-weight: 600;
line-height: 42rpx;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.appointment-activity-address {
display: -webkit-box;
margin-top: 16rpx;
color: #959DA9;
font-size: 26rpx;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
}
.appointment-activity-num {
margin-left: 32rpx;
color: #959DA9;
font-size: 26rpx;
line-height: 36rpx;
letter-spacing: 2rpx;
}
.appointment-activity-footer {
margin-top: 48rpx;
}
.appointment-activity-price text:nth-child(1) {
color: #15191F;
font-size: 22rpx;
font-weight: 600;
}
.appointment-activity-price text:nth-child(2) {
color: #15191F;
font-size: 30rpx;
font-weight: 600;
}
.cancel-btn {
width: 120rpx;
height: 56rpx;
color: #656E7B;
font-size: 22rpx;
font-weight: 600;
text-align: center;
line-height: 56rpx;
border-radius: 4rpx;
border: 1px solid #C2C7CF;
}
.cancel-overtime {
position: absolute;
z-index: 11;
right: 32rpx;
bottom: 40rpx;
}
.cancel {
position: absolute;
z-index: 11;
right: 172rpx;
bottom: 40rpx;
}
.confirm-btn {
width: 120rpx;
height: 56rpx;
margin-left: 20rpx;
color: #fff;
font-size: 22rpx;
font-weight: 600;
text-align: center;
line-height: 56rpx;
background: #86C5E1;
border-radius: 4rpx;
}
.confirm-once {
position: absolute;
z-index: 11;
right: 32rpx;
bottom: 40rpx;
}
.mask-cancel {
position: absolute;
z-index: 1;
left: 0;
bottom: 0;
width: 670rpx;
height: 332rpx;
background-color: #fff;
opacity: .5;
}
.mask-cancel-time {
background-color: #D9DEE7;
}
/* 入园标题样式 */ /* 入园标题样式 */
.item-num-1 { .item-num-1 {
......
pages/mine/home/home.js
...@@ -473,6 +473,11 @@ Page({ ...@@ -473,6 +473,11 @@ Page({
url: '/pages/mine/order/order' url: '/pages/mine/order/order'
}) })
}, },
onAppointment: function () {
wx.navigateTo({
url: '/pages/mine/appointment/appointment'
})
},
handleToCard: function () { handleToCard: function () {
console.log('onOrder') console.log('onOrder')
wx.navigateTo({ wx.navigateTo({
......
pages/mine/home/home.wxml
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<view class="order-activity-title row align-c"> <view class="order-activity-title row align-c">
<text>我的预约</text> <text>我的预约</text>
</view> </view>
<view class="row align-c" bindtap="onOrder"> <view class="row align-c" bindtap="onAppointment">
<text>查看全部</text> <text>查看全部</text>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
......
pages/mine/order/order.js
...@@ -40,7 +40,26 @@ Page({ ...@@ -40,7 +40,26 @@ Page({
this.setData({ this.setData({
option: options option: options
}) })
console.log('onload-----------');
// App.login({
// timeout: 0,
// success: (result) => {
// this.setOrderType()
// },
// })
},
onShow: function () {
App.login({
timeout: 0,
success: (result) => {
this.setOrderType()
},
})
},
refresh: function () {
App.login({ App.login({
timeout: 0, timeout: 0,
success: (result) => { success: (result) => {
...@@ -223,7 +242,11 @@ Page({ ...@@ -223,7 +242,11 @@ Page({
* @returns * @returns
*/ */
onToBuy: function (event) { onToBuy: function (event) {
this.onOrderAgain(event) let commodityType = this.data.orderType[this.data.orderTypeActive].value
let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`,
})
}, },
/** /**
...@@ -464,11 +487,10 @@ Page({ ...@@ -464,11 +487,10 @@ Page({
* @returns * @returns
*/ */
onOrderEvaluate: function (event) { onOrderEvaluate: function (event) {
console.log(event.currentTarget.dataset, '----------------event.currentTarget.dataset');
let item = JSON.stringify(event.currentTarget.dataset.item) let item = JSON.stringify(event.currentTarget.dataset.item)
wx.navigateTo({ wx.navigateTo({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}`, url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=orderList`,
}) })
}, },
/** /**
......
pages/pay/order-comment/order-comment.js
...@@ -3,6 +3,7 @@ let App = getApp() ...@@ -3,6 +3,7 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
scoreServe: 0, // 服务分数 scoreServe: 0, // 服务分数
scoreServeText: '0.0', scoreServeText: '0.0',
scoreProduct: 0, // 产品分数 scoreProduct: 0, // 产品分数
...@@ -17,12 +18,15 @@ Page({ ...@@ -17,12 +18,15 @@ Page({
amount: '', amount: '',
commodity: [] commodity: []
}, },
fileResults: []
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options, '----------options------');
let orderItem = JSON.parse(options.orderItem) let orderItem = JSON.parse(options.orderItem)
let pageFrom = options.pageFrom
this.setData({ this.setData({
orderInfo: orderItem orderInfo: orderItem,
pageFrom: pageFrom
}) })
}, },
...@@ -78,19 +82,52 @@ Page({ ...@@ -78,19 +82,52 @@ Page({
}) })
}, },
/** /**
* 预览评价图片
* @function
* @param
* @returns
*/
eventImagePreview: function (event) {
// console.log(event.detail)
console.log(9898);
// let imgUrl = event.detail.all[0].url
// let imgUrls = []
// imgUrls.push(imgUrl)
// this.setData({
// imgUrls
// })
},
/**
* 新增评价图片 * 新增评价图片
* @function * @function
* @param * @param
* @returns * @returns
*/ */
eventImageAdd: function (event) { eventImageAdd: function (event) {
console.log(event.detail.all[0]) console.log(event.detail, '新增------')
let that = this
let imgUrl = event.detail.all[0].url let imgUrl = event.detail.all[0].url
let imgUrls = [] let imgUrls = []
imgUrls.push(imgUrl) imgUrls.push(imgUrl)
this.setData({ this.setData({
imgUrls imgUrls
}) })
wx.uploadFile({
url: App.globalData.baseUrl + '/api/v1/common/upload',
filePath: imgUrl,
name: 'file',
header: {
'Content-Type': 'multipart/form-data',
'token': App.globalData.token
},
success: function (res) {
let data = typeof (res.data) == 'string' ? JSON.parse(res.data) : res.data
that.data.fileResults.push(data.data.fileUrl)
}
})
}, },
/** /**
* 移除评价图片 * 移除评价图片
...@@ -99,7 +136,8 @@ Page({ ...@@ -99,7 +136,8 @@ Page({
* @returns * @returns
*/ */
eventImageRemove: function (event) { eventImageRemove: function (event) {
console.log(event.detail.all) let index = event.detail.index
this.data.fileResults.splice(index, 1)
}, },
/** /**
* 提交订单 * 提交订单
...@@ -108,36 +146,38 @@ Page({ ...@@ -108,36 +146,38 @@ Page({
* @returns * @returns
*/ */
onSubmitCommennt: function () { onSubmitCommennt: function () {
console.log('submit') let that = this;
let funcFile = this.data.imgUrls[0] if (this.data.scoreServeText == 0) {
wx.uploadFile({ wx.lin.showToast({
url: App.globalData.baseUrl + '/api/v1/common/upload', image: '/image/error.png',
filePath: funcFile, title: '请对服务进行评价',
name: 'file', })
header: { return
'Content-Type': 'multipart/form-data', }
'token': App.globalData.token if (this.data.scoreProductText == 0) {
}, wx.lin.showToast({
success: (res) => { image: '/image/error.png',
const data = JSON.parse(res.data) title: '请对产品进行评价',
let fileUrls = [] })
if (data.code === 200 && data.success === true) { return
console.log(data.data.fileUrl) }
fileUrls.push(data.data.fileUrl) if (this.data.scoreEnvironmentText == 0) {
} else { wx.lin.showToast({
console.log('上传失败') image: '/image/error.png',
title: '请对环境进行评价',
})
return
} }
// this.setData({
// fileUrls
// })
let formData = {} let formData = {}
formData.orderId = this.data.orderInfo.id formData.orderId = this.data.orderInfo.id
formData.imgUrls = fileUrls, formData.imgUrls = this.data.fileResults
formData.serviceEvaluation = this.data.scoreServeText formData.serviceEvaluation = this.data.scoreServeText //服务评价
formData.productEvaluation = this.data.scoreProductText formData.productEvaluation = this.data.scoreProductText //产品评价
formData.environmentalEvaluation = this.data.scoreEnvironmentText formData.environmentalEvaluation = this.data.scoreEnvironmentText //环境评价
formData.content = this.data.content formData.content = this.data.content
console.log(formData) wx.showLoading({
title: '处理中',
})
App.wxRequest({ App.wxRequest({
url: '/api/v1/order/doAppraise', url: '/api/v1/order/doAppraise',
data: { data: {
...@@ -146,17 +186,38 @@ Page({ ...@@ -146,17 +186,38 @@ Page({
'serviceEvaluation': formData.serviceEvaluation, 'serviceEvaluation': formData.serviceEvaluation,
'productEvaluation': formData.productEvaluation, 'productEvaluation': formData.productEvaluation,
'environmentalEvaluation': formData.productEvaluation, 'environmentalEvaluation': formData.productEvaluation,
'content': formData.content = this.data.content 'content': formData.content
}, },
success: (response) => { success: (response) => {
console.log(response) wx.hideLoading({
wx.navigateBack({ success: (res) => {},
delta: 0,
}) })
} wx.lin.showToast({
image: '/image/success.png',
title: '评价成功',
}) })
setTimeout(() => {
// var pages = getCurrentPages();
// var beforePage = pages[pages.length - 2];
// beforePage.refresh();
let pageFrom = that.data.pageFrom
let url = ''
if (pageFrom == 'orderList') {
//评价列表
url = '/pages/mine/order/order'
} else if (pageFrom == 'orderDetail') {
//评价详情
url = '/pages/pay/order-detail/order-detail?id=' + that.data.orderInfo.id
} else {
url = '/pages/home/home/home'
} }
wx.redirectTo({
url: url,
}) })
}, 2000);
} }
})
}
}) })
\ No newline at end of file
pages/pay/order-comment/order-comment.wxml
...@@ -79,13 +79,16 @@ ...@@ -79,13 +79,16 @@
<text>{{scoreEnvironmentText + '星'}}</text> <text>{{scoreEnvironmentText + '星'}}</text>
</view> </view>
</view> </view>
<view class="order-comment"> <view class="order-comment">
<l-textarea placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200" l-class="l-textarea" border="{{false}}" bind:linblur="eventInputDone" /> <l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200"
l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" />
<view class="order-picker"> <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}}" bind:linchange="eventImageAdd" bind:linremove="eventImageRemove"> <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"
bind:linpreview="eventImagePreview">
<view class="col con-c align-c"> <view class="col con-c align-c">
<image class="icon-img"></image> <image class="icon-img" src="{{resourcesBase+'mine/server/camera_icon.png'}}"></image>
<text>添加图片</text> <text>添加图片</text>
</view> </view>
</l-image-picker> </l-image-picker>
...@@ -98,3 +101,5 @@ ...@@ -98,3 +101,5 @@
</view> </view>
</view> </view>
</view> </view>
<l-toast l-image-class="toast-image"></l-toast>
\ No newline at end of file
pages/pay/order-comment/order-comment.wxss
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
.icon-img { .icon-img {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
background-color: #ccc; /* background-color: #ccc; */
} }
.footer-wrapper { .footer-wrapper {
position: fixed; position: fixed;
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
padding: 30rpx 40rpx 0; padding: 30rpx 40rpx 0;
background-color: #fff; background-color: #fff;
border-top: 1px solid #E2E7EF; border-top: 1px solid #E2E7EF;
z-index: 5; z-index: 100;
} }
.comment-btn { .comment-btn {
width: 670rpx; width: 670rpx;
......
pages/pay/order-detail/order-detail.js
...@@ -82,7 +82,7 @@ Page({ ...@@ -82,7 +82,7 @@ Page({
onOrderEvaluate: function (event) { onOrderEvaluate: function (event) {
let item = JSON.stringify(this.data.orderInfo) let item = JSON.stringify(this.data.orderInfo)
wx.navigateTo({ wx.navigateTo({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}`, url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=orderDetail`,
}) })
}, },
// 删除订单&取消订单 // 删除订单&取消订单
......
pages/pay/order-detail/order-detail.wxml
<navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png" <navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png"
bind:navBack="navBack"></navigation> bind:navBack="navBack"></navigation>
<view class="container"> <view class="container padding-bottom-166">
<!-- 订单状态 --> <!-- 订单状态 -->
<view class="state row con-c"> <view class="state row con-c">
<view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}"> <view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}">
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
<view class="state-content-title row"> <view class="state-content-title row">
<text>订单已取消</text> <text>订单已取消</text>
</view> </view>
<view class="state-content-tip row"> <!-- <view class="state-content-tip row">
<text>下单后15分钟内未付款，自动取消订单</text> <text>下单后15分钟内未付款，自动取消订单</text>
</view> </view> -->
</view> </view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 6}}"> <view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 6}}">
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text> <text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
...@@ -115,7 +116,8 @@ ...@@ -115,7 +116,8 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text> <text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
...@@ -158,7 +160,8 @@ ...@@ -158,7 +160,8 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text> <text class="info-content-item-tip">18030303030</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
...@@ -196,7 +199,8 @@ ...@@ -196,7 +199,8 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text> <text class="info-content-item-tip">18030303030</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
...@@ -262,8 +266,9 @@ ...@@ -262,8 +266,9 @@
<!-- 订单提示 --> <!-- 订单提示 -->
<view class="tip"> <view class="tip">
<view class="tip-pay row con-b align-c"> <view class="tip-pay row con-b align-c">
<view class="tip-pay-title"> <view class="tip-pay-title" wx:if="{{orderInfo.amount!==undefined}}">
<text>实付金额</text> <text wx:if="{{orderInfo.state === 0||orderInfo.state === -1}}">待付金额</text>
<text wx:else>实付金额</text>
</view> </view>
<view class="tip-pay-amount"> <view class="tip-pay-amount">
<text>¥</text> <text>¥</text>
...@@ -291,7 +296,7 @@ ...@@ -291,7 +296,7 @@
<swiper class="code-main" next-margin="64rpx" bindchange="swiperChange"> <swiper class="code-main" next-margin="64rpx" bindchange="swiperChange">
<swiper-item wx:for="{{codeList}}" wx:key="id"> <swiper-item wx:for="{{codeList}}" wx:key="id">
<view class="code-item col con-c align-c {{index === swiperCurrent ? 'item-center' : ''}}"> <view class="code-item col con-c align-c {{index === swiperCurrent ? 'item-center' : ''}}">
<view class="code-item-title">{{item.name}}</view> <view class="code-item-title cord-title">{{item.name}}</view>
<view class="code-img"> <view class="code-img">
<image mode="widthFix" src="{{'data:image/jpg;base64,'+item.qrcode}}"></image> <image mode="widthFix" src="{{'data:image/jpg;base64,'+item.qrcode}}"></image>
</view> </view>
......
pages/pay/order-detail/order-detail.wxss
...@@ -546,6 +546,11 @@ ...@@ -546,6 +546,11 @@
color: #15191F; color: #15191F;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
}
.cord-title {
padding: 0 20rpx;
} }
.code-img { .code-img {
...@@ -791,9 +796,18 @@ ...@@ -791,9 +796,18 @@
line-height: 42rpx; line-height: 42rpx;
} }
.padding-bottom-166 {
padding-bottom: 166rpx;
}
.footer-btn { .footer-btn {
position: fixed;
bottom: 0;
width: 100%;
background: #fff;
padding: 32rpx 20rpx; padding: 32rpx 20rpx;
border-top: 1px solid #E2E7EF; border-top: 1px solid #E2E7EF;
} }
.delete-btn, .delete-btn,
......
pages/pay/order-input/order-input.js
...@@ -91,6 +91,7 @@ Page({ ...@@ -91,6 +91,7 @@ Page({
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options)
if (options.type) options.type = Number(options.type) if (options.type) options.type = Number(options.type)
logicData.option = options logicData.option = options
......
pages/play/home/home.js
...@@ -104,9 +104,10 @@ Page({ ...@@ -104,9 +104,10 @@ Page({
App.wxRequest({ App.wxRequest({
url: '/api/v1/film/getAllFilm', url: '/api/v1/film/getAllFilm',
data: { data: {
'weekType': 0, 'pageNo': '1',
'pageSize': 10, 'pageSize': '-1',
'pageNo': 1, 'weekType': '0',
'tagIds': '102'
}, },
success: (response) => { success: (response) => {
let funcResponse = response.data.list let funcResponse = response.data.list
......
pages/play/home/home.wxml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<swiper class="activity-swiper" next-margin="38rpx" bindchange="swiperRecentChange"> <swiper class="activity-swiper" next-margin="38rpx" bindchange="swiperRecentChange">
<block wx:for="{{activityList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{activityList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="activity-item" data-item="{{item}}" bindtap="onActivityDetail"> <swiper-item class="activity-item" data-item="{{item}}" bindtap="onActivityDetail">
<image class="{{swiperRecentCurrent === index ? 'activity-item-left' : '' }} {{swiperRecentCurrent === banner.length - 1 ? 'activity-item-center' : ''}}" src="{{item.cover}}"></image> <image mode="aspectFill" class="{{swiperRecentCurrent === index ? 'activity-item-left' : '' }} {{swiperRecentCurrent === banner.length - 1 ? 'activity-item-center' : ''}}" src="{{item.cover}}"></image>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<swiper-item class="movie-item col con-e"> <swiper-item class="movie-item col con-e">
<view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}" bindtap="onMovieDetail" data-id="{{item.name}}"> <view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}" bindtap="onMovieDetail" data-id="{{item.name}}">
<view class="movie-cover"> <view class="movie-cover">
<image src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
</view> </view>
<view class="movie-info-wrapper"> <view class="movie-info-wrapper">
<view class="row align-c"> <view class="row align-c">
......
pages/play/home/home.wxss
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
.activity-item image { .activity-item image {
width: 648rpx; width: 648rpx;
height: 720rpx;
background-color: #ccc; background-color: #ccc;
} }
......
pages/play/service-detail/service-detail.wxml
...@@ -357,21 +357,21 @@ ...@@ -357,21 +357,21 @@
<view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}"> <view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate-option row con-b align-c"> <view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/evaluate-1.png'}}"></image> <image src="{{imageBase + 'icon/evaluate-2.png'}}"></image>
<text>服务</text> <text>服务</text>
<text>0.5</text> <text>{{officeServiceText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/shop-1.png'}}"></image> <image src="{{imageBase + 'icon/shop-2.png'}}"></image>
<text>产品</text> <text>产品</text>
<text>0.5</text> <text>{{officeProductText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/album-1.png'}}"></image> <image src="{{imageBase + 'icon/album-2.png'}}"></image>
<text>环境</text> <text>环境</text>
<text>0.5</text> <text>{{officeEnvironmentalText}}</text>
<text>分</text> <text>分</text>
</view> </view>
</view> </view>
......
project.config.json
...@@ -159,6 +159,12 @@ ...@@ -159,6 +159,12 @@
"pathName": "pages/play/activity/activity", "pathName": "pages/play/activity/activity",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "pages/mine/appointment/appointment",
"pathName": "pages/mine/appointment/appointment",
"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