Skip to content

严立 / mini-shimao

Go to a project
Commit 16e8b28d by 严立
Options

LL - UI 问题修复

parent c5299ab4
Expand all
Inline Side-by-side
Showing with 453 additions and 378 deletions
component/navigation/navigation.js
...@@ -78,7 +78,6 @@ Component({ ...@@ -78,7 +78,6 @@ Component({
// 属性监听 // 属性监听
observers: { observers: {
'scrollStyle': function (funcValue) { 'scrollStyle': function (funcValue) {
console.log(this.data.scrollStyle)
if (JSON.stringify(this.data.scrollStyle) === '{}') return if (JSON.stringify(this.data.scrollStyle) === '{}') return
this.setNavigationStyle() this.setNavigationStyle()
}, },
......
pages/commodity/home/home.wxml
...@@ -113,15 +113,15 @@ ...@@ -113,15 +113,15 @@
<text>准备一份精心的礼物</text> <text>准备一份精心的礼物</text>
</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-3.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image>
<button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button> <button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button>
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendC}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendD}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> <view class="shop-menu-item col con-c align-c" data-id="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -129,15 +129,18 @@ ...@@ -129,15 +129,18 @@
</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-4.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-3.png'}}"></image>
<button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button> <!-- 临时屏蔽购买 -->
<!-- <button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button> -->
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendD}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendC}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> <!-- 临时屏蔽购买 -->
<view class="shop-menu-item col con-c align-c">
<!-- <view class="shop-menu-item col con-c align-c" data-id="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> -->
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
......
pages/commodity/project-detail/project-detail.js
...@@ -60,7 +60,7 @@ Page({ ...@@ -60,7 +60,7 @@ Page({
navbarTitle: '儿童营地入园购票', navbarTitle: '儿童营地入园购票',
banner: 'service/detail-banner-3.png', banner: 'service/detail-banner-3.png',
bgColor: '#F6DADA', bgColor: '#F6DADA',
buyText: '购买门票', buyText: '暂未开售',
unitText: '/人', unitText: '/人',
commodityList: [] commodityList: []
}) })
...@@ -150,7 +150,7 @@ Page({ ...@@ -150,7 +150,7 @@ Page({
'typeId': funcResponse[i].genre, // 商品分类标识 'typeId': funcResponse[i].genre, // 商品分类标识
'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识 'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间 'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': App.modular.miment().format('YYYY.MM.DD'), // 失效时间 'dateInvalid': funcResponse[i].cardNam, // 失效时间
'name': funcResponse[i].name, 'name': funcResponse[i].name,
'cover': funcResponse[i].ticketsImg ? funcResponse[i].ticketsImg : this.data.resourcesBase + 'service/service.png', 'cover': funcResponse[i].ticketsImg ? funcResponse[i].ticketsImg : this.data.resourcesBase + 'service/service.png',
'price': funcResponse[i].sightseerPrice, // 普通价 'price': funcResponse[i].sightseerPrice, // 普通价
...@@ -334,6 +334,8 @@ Page({ ...@@ -334,6 +334,8 @@ Page({
* @returns * @returns
*/ */
onBuy: function (event) { onBuy: function (event) {
if (this.data.shopInfo.appId === 3) return
if (this.data.shopInfo.appId === 7) { if (this.data.shopInfo.appId === 7) {
this.onCommodityDetail(event) this.onCommodityDetail(event)
return return
......
pages/commodity/project/project.js
...@@ -157,7 +157,7 @@ Page({ ...@@ -157,7 +157,7 @@ Page({
'typeId': funcResponse[i].genre, // 商品分类标识 'typeId': funcResponse[i].genre, // 商品分类标识
'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识 'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间 'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': App.modular.miment().format('YYYY.MM.DD'), // 失效时间 'dateInvalid': funcResponse[i].cardNam, // 失效时间
'name': funcResponse[i].name, 'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面 'cover': funcResponse[i].coverImg, // 商品封面
'price': funcResponse[i].sightseerPrice, // 普通价 'price': funcResponse[i].sightseerPrice, // 普通价
......
pages/commodity/project/project.wxml
...@@ -176,7 +176,9 @@ ...@@ -176,7 +176,9 @@
</view> </view>
<view class="commodity-list"> <view class="commodity-list">
<block wx:for="{{shopCommodityData[2]}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopCommodityData[2]}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-item row" data-index="{{2}}" data-itemindex="{{index}}" bindtap="onBuy"> <view class="commodity-item row" data-index="{{2}}" data-itemindex="{{index}}">
<!-- 暂时屏蔽 -->
<!-- <view class="commodity-item row" data-index="{{2}}" data-itemindex="{{index}}" bindtap="onBuy"> -->
<view class="commodity-cover"> <view class="commodity-cover">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
...@@ -226,14 +228,16 @@ ...@@ -226,14 +228,16 @@
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">购买门票</button> <button class="row con-c align-c">暂未开售</button>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<block wx:for="{{shopCommodityData[3]}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopCommodityData[3]}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-item row" data-index="{{3}}" data-itemindex="{{index}}" bindtap="onBuy"> <view class="commodity-item row" data-index="{{3}}" data-itemindex="{{index}}">
<!-- 暂时屏蔽按钮 -->
<!-- <view class="commodity-item row" data-index="{{3}}" data-itemindex="{{index}}" bindtap="onBuy"> -->
<view class="commodity-cover"> <view class="commodity-cover">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
...@@ -283,7 +287,7 @@ ...@@ -283,7 +287,7 @@
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">购买门票</button> <button class="row con-c align-c">暂未开售</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/commodity/room-appointment/room-appointment.js
...@@ -210,12 +210,12 @@ Page({ ...@@ -210,12 +210,12 @@ Page({
}, },
success: (response) => { success: (response) => {
console.log(response) console.log(response)
let funcResponse = response.data let funcResponse = response
if (funcResponse.code === 500) { if (response.data.code === 500) {
wx.lin.hideToast() wx.lin.hideToast()
wx.lin.showToast({ wx.lin.showToast({
image: '/image/error.png', image: '/image/error.png',
title: funcResponse.msg, title: response.data.msg,
}) })
return return
} }
......
pages/mine/accumulate/accumulate.wxss
...@@ -110,6 +110,7 @@ page { ...@@ -110,6 +110,7 @@ page {
.accumulate { .accumulate {
width: 606rpx; width: 606rpx;
height: 120rpx; height: 120rpx;
min-height: 120rpx;
padding: 20rpx 0 18rpx; padding: 20rpx 0 18rpx;
border-bottom: 1px solid #E2E7EF; border-bottom: 1px solid #E2E7EF;
} }
...@@ -131,11 +132,11 @@ page { ...@@ -131,11 +132,11 @@ page {
.accumulate-right { .accumulate-right {
font-size: 30rpx; font-size: 30rpx;
color: #E66060;
} }
.accumulate-right text { .accumulate-right text {
margin-left: 6rpx; margin-left: 6rpx;
color: #E66060;
} }
.accumulate-type-color { .accumulate-type-color {
......
pages/mine/appointment/appointment.js
// pages/myAppointment/myAppointment.js
const App = getApp() const App = getApp()
let logicData = { let logicData = {
...@@ -7,10 +6,6 @@ let logicData = { ...@@ -7,10 +6,6 @@ let logicData = {
} }
Page({ Page({
/**
* 页面的初始数据
*/
data: { data: {
isLoading: false, isLoading: false,
isFinished: false, isFinished: false,
...@@ -50,29 +45,11 @@ Page({ ...@@ -50,29 +45,11 @@ Page({
// 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭) // 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭)
// 活动状态(0 未开始 1进行中 2 已结束) // 活动状态(0 未开始 1进行中 2 已结束)
activityList: [], activityList: [],
data: [ // 假数据数组,type=0入园预约,type=1 看房预约 data: [],
// {
// 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'
// },
],
active: 0, active: 0,
height: 0, height: 0,
}, },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) { onLoad: function (options) {
let type = options.tab ? 1 * options.tab : 0 let type = options.tab ? 1 * options.tab : 0
this.setData({ this.setData({
...@@ -85,12 +62,29 @@ Page({ ...@@ -85,12 +62,29 @@ Page({
} else { } else {
this.getList(type) this.getList(type)
} }
},
onShow: function () {
this.setData({
pageNo: 1,
pageSize: 10,
data: [],
activityList: [],
})
let type = this.data.option.tab ? 1 * this.data.option.tab : 0
if (type === 0) {
this.getActivity()
} else {
this.getList(type)
}
}, },
// 去使用 // 去使用
onOrderUse: function (event) { onOrderUse: function (event) {
this.onOrderDetail(event) this.onOrderDetail(event)
}, },
/** /**
* 订单评价 * 订单评价
* @function * @function
...@@ -103,17 +97,17 @@ Page({ ...@@ -103,17 +97,17 @@ Page({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=activityList`, url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=activityList`,
}) })
}, },
// 跳转详情页面 // 跳转详情页面
onOrderDetail: function (event) { onOrderDetail: function (event) {
let funcItem = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
wx.navigateTo({ wx.navigateTo({
url: '/pages/pay/order-detail/order-detail?id=' + funcItem.orderId, url: '/pages/mine/appointment-detail/appointment-detail?id=' + funcItem.orderId + '&activityId=' + funcItem.enrollId,
}) })
}, },
// 点击导航切换，默认是全部的 // 点击导航切换，默认是全部的
chageNav(e) { chageNav(e) {
let index = e.currentTarget.dataset.index let index = e.currentTarget.dataset.index
console.log(index, 'nav----------');
if (index === 0) { if (index === 0) {
this.setData({ this.setData({
pageNo: 1, pageNo: 1,
...@@ -128,26 +122,18 @@ Page({ ...@@ -128,26 +122,18 @@ Page({
active: index active: index
}) })
}, },
/** /**
* 订单支付 * 订单支付
* @function * @function
* @param * @param
* @returns * @returns
*/ */
onOrderPay: function (event) { onOrderPay: function (event) {
// 数据校验不通过 // 数据校验不通过
let that = this
console.log();
let funcItem = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
console.log(funcItem, 'jjjj');
let wxRequest = funcItem.wxRequest let wxRequest = funcItem.wxRequest
// 待支付返回的wx支付参数 // 待支付返回的wx支付参数
if (wxRequest) { if (wxRequest) {
wx.requestPayment({ wx.requestPayment({
...@@ -157,20 +143,19 @@ Page({ ...@@ -157,20 +143,19 @@ Page({
signType: wxRequest.signType, signType: wxRequest.signType,
paySign: wxRequest.paySign, paySign: wxRequest.paySign,
success(res) { success(res) {
that.setData({ this.setData({
'orderList': [], 'orderList': [],
'orderPages': 1, 'orderPages': 1,
}) })
that.queryOrder() this.queryOrder()
}, },
fail(res) {} fail(res) {}
}) })
} }
}, },
//预约凭证 //预约凭证
gohotelAccommodation(e) { gohotelAccommodation(e) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/mine/appointment-ticket/appointment-ticket?detail=' + JSON.stringify(e.currentTarget.dataset.item), url: '/pages/mine/appointment-ticket/appointment-ticket?detail=' + JSON.stringify(e.currentTarget.dataset.item),
}) })
...@@ -269,12 +254,10 @@ Page({ ...@@ -269,12 +254,10 @@ Page({
} }
} }
}) })
}, },
// 我的活动 // 我的活动
getActivity: function () { getActivity: function () {
if (this.data.isFinished) return if (this.data.isFinished) return
let that = this
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask: true mask: true
...@@ -285,43 +268,43 @@ Page({ ...@@ -285,43 +268,43 @@ Page({
App.wxRequest({ App.wxRequest({
url: '/api/v1/activity/getMyActivityList', url: '/api/v1/activity/getMyActivityList',
data: { data: {
activeState: '', //""全部 0 未开始 1进行中 2已结束 'activeState': '', //""全部 0 未开始 1进行中 2已结束
pageSize: this.data.pageSize, 'pageSize': this.data.pageSize,
pageNo: this.data.pageNo, 'pageNo': this.data.pageNo,
type: '1' 'type': '1'
}, },
success: function (res) { success: (res) => {
that.setData({ this.setData({
isLoading: false isLoading: false
}) })
wx.hideLoading({ wx.hideLoading({
success: (res) => {}, success: (res) => {},
}) })
let funcData = res.data.list let funcData = res.data.list
if (funcData.length < that.data.pageSize) { if (funcData.length < this.data.pageSize) {
that.setData({ this.setData({
isFinished: true isFinished: true
}) })
} }
let tmpArr = [] let tmpArr = []
funcData.forEach(item => { funcData.forEach(item => {
let obj = { let obj = {
orderId: item.orderId, 'orderId': item.orderId,
enrollId: item.enrollId, 'enrollId': item.enrollId,
name: item.name, 'name': item.name,
status: item.status, // 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭) 'status': item.status, // 订单状态(-1已取消, 0未付款, 2待使用, 3已使用, 4已过期 6已关闭)
activeState: item.activeState, // 活动状态(0 未开始 1进行中 2 已结束) 'activeState': item.activeState, // 活动状态(0 未开始 1进行中 2 已结束)
cover: item.cover, 'cover': item.cover,
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.toFixed(2),
wxRequest: item.wxRequest 'wxRequest': item.wxRequest
} }
tmpArr.push(obj) tmpArr.push(obj)
}) })
that.setData({ this.setData({
activityList: that.data.activityList.concat(tmpArr), activityList: this.data.activityList.concat(tmpArr),
isLoading: false isLoading: false
}) })
} }
...@@ -353,8 +336,7 @@ Page({ ...@@ -353,8 +336,7 @@ Page({
state: 1, //未过期 1,其他 空字符"" state: 1, //未过期 1,其他 空字符""
type: type //0 入园预约 1 看房预约 全部 空字符 type: type //0 入园预约 1 看房预约 全部 空字符
}, },
success: function (res) { success: (res) => {
wx.hideLoading({ wx.hideLoading({
success: (res) => {}, success: (res) => {},
}) })
......
pages/mine/appointment/appointment.wxml
<!--pages/myAppointment/myAppointment.wxml--> <!--pages/myAppointment/myAppointment.wxml-->
<navigation class="navigation" titleText="我的预约" backIcon="/image/back.png" scrollStyle="{{navigationStyle}}" <navigation class="navigation" titleText="我的预约" backIcon="/image/back.png" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}" bind:navBack="onNavBack"></navigation>
scrollHeight="{{navigationScroll}}" bind:navBack="onNavBack"></navigation>
<view class="container all"> <view class="container all">
<view class="myActivity-container" style="min-height:{{height}}px;"> <view class="myActivity-container" style="min-height:{{height}}px;">
<view class="myAppointment-nav"> <view class="myAppointment-nav">
<!-- 遍历头部导航 --> <!-- 遍历头部导航 -->
<view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" <view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
</view> </view>
<!-- 主题活动 --> <!-- 主题活动 -->
<view class="myAppointment-body" wx:if="{{activityList.length > 0 && active === 0}}"> <view class="myAppointment-body" wx:if="{{activityList.length > 0 && active === 0}}">
<block wx:for="{{activityList}}" wx:for-item="activity" wx:for-index="indexActivity" wx:key="orderId"> <block wx:for="{{activityList}}" wx:for-item="activity" wx:for-index="indexActivity" wx:key="index">
<!-- 待付款 --> <!-- 待付款 -->
<view class="appointment-wrapper" wx:if="{{activity.status === '0'}}" bindtap="onOrderDetail" <view class="appointment-wrapper" wx:if="{{activity.status === '0'}}" bindtap="onOrderDetail" data-item="{{activity}}">
data-item="{{activity}}">
<view class="appointment-time">{{activity.date}}</view> <view class="appointment-time">{{activity.date}}</view>
<view class="appintment-activity-status-pay"> <view class="appintment-activity-status-pay">
<text>待付款</text> <text>待付款</text>
...@@ -47,8 +44,7 @@ ...@@ -47,8 +44,7 @@
</view> </view>
</view> </view>
<!-- 未开始 --> <!-- 未开始 -->
<view class="appointment-wrapper" wx:if="{{activity.status === '2' && activity.activeState === '0'}}" <view class="appointment-wrapper" wx:if="{{activity.status === '2' && activity.activeState === '0'}}" bindtap="onOrderDetail" data-item="{{activity}}">
bindtap="onOrderDetail" data-item="{{activity}}">
<view class="appointment-time">{{activity.date}}</view> <view class="appointment-time">{{activity.date}}</view>
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>未开始</text> <text>未开始</text>
...@@ -80,8 +76,7 @@ ...@@ -80,8 +76,7 @@
</view> </view>
</view> </view>
<!-- 进行中 --> <!-- 进行中 -->
<view class="appointment-wrapper" wx:if="{{activity.status === '2' && activity.activeState === '1'}}" <view class="appointment-wrapper" wx:if="{{activity.status === '2' && activity.activeState === '1'}}" bindtap="onOrderDetail" data-item="{{activity}}">
bindtap="onOrderDetail" data-item="{{activity}}">
<view class="appointment-time">{{activity.date}}</view> <view class="appointment-time">{{activity.date}}</view>
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>进行中</text> <text>进行中</text>
...@@ -113,8 +108,7 @@ ...@@ -113,8 +108,7 @@
</view> </view>
</view> </view>
<!-- 待评价 --> <!-- 待评价 -->
<view class="appointment-wrapper" wx:if="{{activity.status === '3' && activity.activeState === '2'}}" <view class="appointment-wrapper" wx:if="{{activity.status === '3' && activity.activeState !== '0'}}" bindtap="onOrderDetail" data-item="{{activity}}">
bindtap="onOrderDetail" data-item="{{activity}}">
<view class="appointment-time">{{activity.date}}</view> <view class="appointment-time">{{activity.date}}</view>
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>待评价</text> <text>待评价</text>
...@@ -146,8 +140,8 @@ ...@@ -146,8 +140,8 @@
</view> </view>
</view> </view>
<!-- 已过期 --> <!-- 已过期 -->
<view class="appointment-wrapper" wx:if="{{activity.status === '4'||activity.status === '6'}}"> <view class="appointment-wrapper" wx:if="{{activity.status === '4'||activity.status === '6'}}" bindtap="onOrderDetail" data-item="{{activity}}">
<view wx:if="{{activity.status === '4'}}" class="mask-cancel" bindtap="onOrderDetail" data-item="{{activity}}"></view> <view wx:if="{{activity.status === '4'}}" class="mask-cancel"></view>
<view class="appointment-time mask-cancel-time">{{activity.date}}</view> <view class="appointment-time mask-cancel-time">{{activity.date}}</view>
<view class="appintment-activity-status-cancel"> <view class="appintment-activity-status-cancel">
<text wx:if="{{activity.status === '4'}}">已过期</text> <text wx:if="{{activity.status === '4'}}">已过期</text>
...@@ -218,8 +212,7 @@ ...@@ -218,8 +212,7 @@
</view> </view>
<!-- 夜间入园预约、看房预约 --> <!-- 夜间入园预约、看房预约 -->
<view class="myAppointment-body" wx:if="{{data.length > 0 && active !== 0}}"> <view class="myAppointment-body" wx:if="{{data.length > 0 && active !== 0}}">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index" data-item="{{item}}" <view class="myAppointment-item" wx:for="{{data}}" wx:key="index" data-item="{{item}}" bindtap="gohotelAccommodation">
bindtap="gohotelAccommodation">
<image src="{{item.url}}" class="item-img"></image> <image src="{{item.url}}" class="item-img"></image>
<view class="item-content"> <view class="item-content">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view> <view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
...@@ -251,7 +244,7 @@ ...@@ -251,7 +244,7 @@
<l-toast l-image-class="toast-image"></l-toast> <l-toast l-image-class="toast-image"></l-toast>
<wxs module="m1"> <wxs module="m1">
var getDate = function (date, type) { var getDate = function(date, type) {
return date.substring(5, 11).replace('-', '月').replace(' ', '日') + ((type == 0) ? ' 20:00-24:00' : ''); return date.substring(5, 11).replace('-', '月').replace(' ', '日') + ((type == 0) ? ' 20:00-24:00' : '');
} }
module.exports.getDate = getDate; module.exports.getDate = getDate;
......
pages/mine/home/home.wxss
...@@ -77,9 +77,14 @@ ...@@ -77,9 +77,14 @@
.mine-info view:nth-child(1) text { .mine-info view:nth-child(1) text {
z-index: 11; z-index: 11;
max-width: 260rpx;
margin-right: 20rpx; margin-right: 20rpx;
font-size: 42rpx; font-size: 42rpx;
font-weight: bolder; font-weight: 500;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.padding-l-18 { .padding-l-18 {
...@@ -218,7 +223,7 @@ ...@@ -218,7 +223,7 @@
width: 750rpx; width: 750rpx;
/* margin-top: 16rpx; */ /* margin-top: 16rpx; */
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 0 48rpx; padding: 0 40rpx;
overflow-x: hidden; overflow-x: hidden;
} }
...@@ -744,4 +749,4 @@ image { ...@@ -744,4 +749,4 @@ image {
.logo-box image { .logo-box image {
max-width: 100% !important; max-width: 100% !important;
max-height: 100% !important; max-height: 100% !important;
} }
\ No newline at end of file
pages/mine/info/info.js
...@@ -52,7 +52,7 @@ Page({ ...@@ -52,7 +52,7 @@ Page({
let funcType = event.target.dataset.type let funcType = event.target.dataset.type
let funcValue = event.detail.value let funcValue = event.detail.value
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = this.data.userInfo
switch (funcType) { switch (funcType) {
case 'name': case 'name':
funcUserInfo.name = funcValue funcUserInfo.name = funcValue
...@@ -125,11 +125,10 @@ Page({ ...@@ -125,11 +125,10 @@ Page({
address: this.data.userInfo.address, address: this.data.userInfo.address,
birthday: this.data.userInfo.birthday, birthday: this.data.userInfo.birthday,
} }
console.log(param)
App.wxRequest({ App.wxRequest({
url: '/api/v1/smUser/doUpdateInfo', url: '/api/v1/smUser/doUpdateInfo',
data: param, data: param,
success: function (res) { success: (res) => {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
Object.assign(funcUserInfo, param) Object.assign(funcUserInfo, param)
wx.setStorageSync('userInfo', funcUserInfo) wx.setStorageSync('userInfo', funcUserInfo)
......
pages/mine/info/info.json
{ {
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
pages/mine/info/info.wxss
/* pages/myInfo/myInfo.wxss */ .myInfo {
.myInfo{ width: 750rpx;
width: 750rpx; margin-top: 170rpx;
margin-top: 60rpx;
padding: 0 48rpx; padding: 0 48rpx;
padding-top: 90rpx;
} }
.phone{
color: rgb(177, 176, 182); .phone {
color: rgb(177, 176, 182);
} }
.input-picker{
width: 400rpx; .input-picker {
height: 44rpx; width: 400rpx;
height: 44rpx;
} }
.picker{
text-align: right; .picker {
line-height: 44rpx; text-align: right;
line-height: 44rpx;
} }
\ No newline at end of file
pages/mine/order/order.js
...@@ -43,6 +43,10 @@ Page({ ...@@ -43,6 +43,10 @@ Page({
}) })
}, },
onShow: function () { onShow: function () {
this.setData({
orderPages: 1,
orderList: [],
})
this.setOrderType() this.setOrderType()
}, },
refresh: function () { refresh: function () {
...@@ -170,7 +174,6 @@ Page({ ...@@ -170,7 +174,6 @@ Page({
'type': 'order_good_type', 'type': 'order_good_type',
}, },
success: (response) => { success: (response) => {
let funcResponse = response.data let funcResponse = response.data
let funcList = [{ let funcList = [{
'value': '', 'value': '',
...@@ -201,10 +204,6 @@ Page({ ...@@ -201,10 +204,6 @@ Page({
funcItem.name = "文创" funcItem.name = "文创"
funcList.push(funcItem) funcList.push(funcItem)
} }
} }
let typeTitle = '全部分类' // let typeTitle = '全部分类' //
let orderTypeActive = 0 // let orderTypeActive = 0 //
...@@ -214,7 +213,6 @@ Page({ ...@@ -214,7 +213,6 @@ Page({
typeTitle = item.name typeTitle = item.name
orderTypeActive = index orderTypeActive = index
} }
}) })
// if (filter.length > 0) { // if (filter.length > 0) {
...@@ -224,9 +222,8 @@ Page({ ...@@ -224,9 +222,8 @@ Page({
this.setData({ this.setData({
'orderType': funcList, 'orderType': funcList,
orderTypeTitle: typeTitle, 'orderTypeTitle': typeTitle,
orderTypeActive orderTypeActive
}) })
this.queryOrder() this.queryOrder()
} }
...@@ -560,11 +557,12 @@ Page({ ...@@ -560,11 +557,12 @@ Page({
case 1: case 1:
if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail' if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail' if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 4) funcUrl = '/pages/commodity/menu-food/menu-food'
break break
// 星空影院 // 星空影院
case 2: case 2:
if (funcItem.commodityType === -2) funcUrl = '/pages/play/movie/movie'
break break
// 儿童营地 // 儿童营地
...@@ -572,6 +570,7 @@ Page({ ...@@ -572,6 +570,7 @@ Page({
if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail' if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 2) funcUrl = '/pages/commodity/menu-food/menu-food' if (funcItem.commodityType === 2) funcUrl = '/pages/commodity/menu-food/menu-food'
if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail' if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 4) funcUrl = '/pages/commodity/menu-food/menu-food'
break break
// 原野MOJITO // 原野MOJITO
......
pages/pay/order-comment/order-comment.wxml
<navigation class="navigation" titleText="订单评价" background="#ffffff" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="订单评价" background="#ffffff" backIcon="/image/back.png"></navigation>
<view class="container con-s"> <view class="container con-s">
<view class="order-wrapper"> <view class="order-wrapper">
<view class="order-title"> <view class="order-title">
<text>购买商品</text> <text>购买商品</text>
</view> </view>
<view class="row align-c"> <view class="row align-c">
<block wx:for="{{orderInfo.commodity}}" wx:key="id"> <block wx:for="{{orderInfo.commodity}}" wx:key="id">
<view class="order-cover"> <view class="order-cover">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
</block> </block>
<view class="order-name" wx:if="{{orderInfo.commodity.length === 1}}"> <view class="order-name" wx:if="{{orderInfo.commodity.length === 1}}">
<text>{{orderInfo.commodity[0].name}}</text> <text>{{orderInfo.commodity[0].name}}</text>
</view> </view>
<view class="order-price-wrapper col align-e"> <view class="order-price-wrapper col align-e">
<view class="order-price"> <view class="order-price">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
<text>{{orderInfo.amount}}</text> <text>{{orderInfo.amount}}</text>
</view> </view>
<view class="order-quantity"> <view class="order-quantity">
<text>{{'共' + orderInfo.commodity.length + '件'}}</text> <text>{{'共' + orderInfo.commodity.length + '件'}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="order-comment-wrapper"> <view class="order-comment-wrapper">
<view class="order-comment-title"> <view class="order-comment-title">
<text>订单评价</text> <text>订单评价</text>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row align-c">
<view class="score-left"> <view class="score-left">
<text>服务评价</text> <text>服务评价</text>
</view> </view>
<view class="score-star row"> <view class="score-star row">
<block wx:for="{{5}}" wx:key="index"> <block wx:for="{{5}}" wx:key="index">
<view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{1}}"> <view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{1}}">
<image wx:if="{{scoreServe >= index + 1}}" src="{{imageBase + 'star-yellow.png'}}"></image> <image wx:if="{{scoreServe >= index + 1}}" src="{{imageBase + 'star-yellow.png'}}"></image>
<image wx:elif="{{scoreServe < index + 1}}" src="{{imageBase + 'star-gray.png'}}"></image> <image wx:elif="{{scoreServe < index + 1}}" src="{{imageBase + 'star-gray.png'}}"></image>
</view> </view>
</block> </block>
</view> </view>
<view class="score"> <view class="score">
<text>{{scoreServeText + '星'}}</text> <text>{{scoreServeText + '星'}}</text>
</view> </view>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row align-c">
<view class="score-left"> <view class="score-left">
<text>产品评价</text> <text>产品评价</text>
</view> </view>
<view class="score-star row"> <view class="score-star row">
<block wx:for="{{5}}" wx:key="index"> <block wx:for="{{5}}" wx:key="index">
<view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{2}}"> <view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{2}}">
<image wx:if="{{scoreProduct >= index + 1}}" src="{{imageBase + 'star-yellow.png'}}"></image> <image wx:if="{{scoreProduct >= index + 1}}" src="{{imageBase + 'star-yellow.png'}}"></image>
<image wx:elif="{{scoreProduct < index + 1}}" src="{{imageBase + 'star-gray.png'}}"></image> <image wx:elif="{{scoreProduct < index + 1}}" src="{{imageBase + 'star-gray.png'}}"></image>
</view> </view>
</block> </block>
</view> </view>
<view class="score"> <view class="score">
<text>{{scoreProductText + '星'}}</text> <text>{{scoreProductText + '星'}}</text>
</view> </view>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row align-c">
<view class="score-left"> <view class="score-left">
<text>环境评价</text> <text>环境评价</text>
</view> </view>
<view class="score-star row"> <view class="score-star row">
<block wx:for="{{5}}" wx:key="index"> <block wx:for="{{5}}" wx:key="index">
<view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{3}}"> <view class="star" bindtap="onChangeScore" data-index="{{index}}" data-type="{{3}}">
<image wx:if="{{scoreEnvironment >= (index + 1)}}" src="{{imageBase + 'star-yellow.png'}}"></image> <image wx:if="{{scoreEnvironment >= (index + 1)}}" src="{{imageBase + 'star-yellow.png'}}"></image>
<image wx:elif="{{scoreEnvironment < (index + 1)}}" src="{{imageBase + 'star-gray.png'}}"></image> <image wx:elif="{{scoreEnvironment < (index + 1)}}" src="{{imageBase + 'star-gray.png'}}"></image>
</view> </view>
</block> </block>
</view> </view>
<view class="score"> <view class="score">
<text>{{scoreEnvironmentText + '星'}}</text> <text>{{scoreEnvironmentText + '星'}}</text>
</view> </view>
</view> </view>
<view class="order-comment"> <view class="order-comment">
<!-- <l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200" <!-- <l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200"
l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" /> --> l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" /> -->
<textarea style="padding:24rpx;font-size:26rpx;color:#15191F;line-height:40rpx" cols="30" rows="10" maxlength='200' placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF;font-size:26rpx" <textarea style="padding:24rpx;font-size:26rpx;color:#15191F;line-height:40rpx" cols="30" rows="10" maxlength='200' placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF;font-size:26rpx" bindinput="doInputContent"></textarea>
bindinput="doInputContent"></textarea> <view class="text-length-box " style="padding:16rpx 24rpx;text-align:right;font-size:24rpx;color:#C2C7CF;">{{content.length}}/200</view>
<view class="text-length-box " style="padding:16rpx 24rpx;text-align:right;font-size:24rpx;color:#C2C7CF;">
{{content.length}}/200</view>
<view class="order-picker"> <view class="order-picker">
<l-image-picker size-type="compressed" preview="{{true}}" l-item-class="l-image-item" l-class="l-picker" <l-image-picker mode="aspectFill" size-type="compressed" preview="{{true}}" 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">
count="9" size="3" size-type="compressed" custom="{{true}}" bind:linchange="eventImageAdd" <view class="col con-c align-c">
bind:linremove="eventImageRemove" bind:linpreview="eventImagePreview"> <image class="icon-img" src="{{resourcesBase+'mine/server/camera_icon.png'}}"></image>
<view class="col con-c align-c"> <text>添加图片</text>
<image class="icon-img" src="{{resourcesBase+'mine/server/camera_icon.png'}}"></image> </view>
<text>添加图片</text> </l-image-picker>
</view> </view>
</l-image-picker> </view>
</view> </view>
</view> <view class="footer-wrapper">
</view> <view class="comment-btn" bindtap="onSubmitCommennt">
<view class="footer-wrapper"> <text>提交评价</text>
<view class="comment-btn" bindtap="onSubmitCommennt"> </view>
<text>提交评价</text> </view>
</view>
</view>
</view> </view>
<l-toast l-image-class="toast-image"></l-toast> <l-toast l-image-class="toast-image"></l-toast>
\ No newline at end of file
pages/pay/order-comment/order-comment.wxss
.container { .container {
padding-top: 232rpx; padding-top: 232rpx;
padding-bottom: 260rpx; padding-bottom: 260rpx;
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 100%); background: linear-gradient(180deg, #fff 0%, #f3f4f6 100%);
} }
.order-wrapper { .order-wrapper {
width: 670rpx; width: 670rpx;
height: 288rpx; height: 288rpx;
padding: 40rpx 32rpx; padding: 40rpx 32rpx;
background-color: #FFFFFF; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
} }
.order-title { .order-title {
height: 88rpx; height: 88rpx;
color: #15191F; color: #15191f;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.order-cover { .order-cover {
width: 124rpx; width: 124rpx;
height: 120rpx; height: 120rpx;
margin-right: 16rpx; margin-right: 16rpx;
background-color: #ccc; background-color: #ccc;
} }
.order-name { .order-name {
width: 274rpx; width: 274rpx;
margin-left: 16rpx; margin-left: 16rpx;
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
line-height: 40rpx; line-height: 40rpx;
...@@ -34,21 +38,25 @@ ...@@ -34,21 +38,25 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
} }
.order-price-wrapper { .order-price-wrapper {
flex: 1; flex: 1;
height: 86rpx; height: 86rpx;
} }
.order-price { .order-price {
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
line-height: 42rpx; line-height: 42rpx;
} }
.price-symbol { .price-symbol {
font-size: 22rpx; font-size: 22rpx;
} }
.order-quantity { .order-quantity {
color: #959DA9; color: #959da9;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
letter-spacing: 2rpx; letter-spacing: 2rpx;
...@@ -61,18 +69,21 @@ ...@@ -61,18 +69,21 @@
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
} }
.order-comment-title { .order-comment-title {
height: 77rpx; height: 77rpx;
color: #15191F; color: #15191f;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.score-wrapper { .score-wrapper {
height: 68rpx; height: 68rpx;
} }
.score-left { .score-left {
width: 120rpx; width: 120rpx;
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
} }
...@@ -87,52 +98,63 @@ ...@@ -87,52 +98,63 @@
height: 40rpx; height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.score { .score {
color: #959DA9; color: #959da9;
font-size: 26rpx; font-size: 26rpx;
letter-spacing: 2rpx; letter-spacing: 2rpx;
} }
.order-comment { .order-comment {
margin-top: 27rpx; margin-top: 27rpx;
background-color: #F5F6F8; background-color: #f5f6f8;
border-radius: 4rpx; border-radius: 4rpx;
} }
.l-textarea { .l-textarea {
height: 320rpx; height: 320rpx;
} }
.l-textarea > view { .l-textarea > view {
color: #C2C7CF !important; color: #c2c7cf !important;
} }
.order-picker { .order-picker {
padding: 19rpx 12rpx 8rpx; padding: 19rpx 12rpx 8rpx;
} }
.l-picker { .l-picker {
width: 504rpx !important; width: 504rpx !important;
} }
.l-image-item { .l-image-item {
width: 144rpx !important; width: 144rpx !important;
height: 144rpx !important; height: 144rpx !important;
border: 1px dashed #959DA9 !important; border: 1px dashed #959da9 !important;
margin-bottom: 24rpx !important; margin-bottom: 24rpx !important;
} }
.l-image-item > view { .l-image-item > view {
right: -20rpx; right: -20rpx;
top: -20rpx; top: -20rpx;
} }
.l-image-item > image { .l-image-item > image {
width: 144rpx !important; max-width: 144rpx !important;
height: 144rpx !important; height: 144rpx !important;
border: none !important; border: none !important;
} }
.l-image-item text{
color: #959DA9; .l-image-item text {
color: #959da9;
font-size: 22rpx; font-size: 22rpx;
} }
.icon-img { .icon-img {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
/* background-color: #ccc; */
} }
.footer-wrapper { .footer-wrapper {
position: fixed; position: fixed;
left: 0; left: 0;
...@@ -141,9 +163,10 @@ ...@@ -141,9 +163,10 @@
height: 194rpx; height: 194rpx;
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: 100; z-index: 100;
} }
.comment-btn { .comment-btn {
width: 670rpx; width: 670rpx;
height: 96rpx; height: 96rpx;
...@@ -151,11 +174,11 @@ ...@@ -151,11 +174,11 @@
font-size: 30rpx; font-size: 30rpx;
line-height: 96rpx; line-height: 96rpx;
text-align: center; text-align: center;
background-color: #86C5E1; background-color: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
\ No newline at end of file
pages/pay/order-detail/order-detail.js
...@@ -31,7 +31,6 @@ Page({ ...@@ -31,7 +31,6 @@ Page({
}, },
onLoad: function (options) { onLoad: function (options) {
let funcOrderInfo = this.data.orderInfo let funcOrderInfo = this.data.orderInfo
funcOrderInfo.id = options.id funcOrderInfo.id = options.id
this.setData({ this.setData({
...@@ -45,10 +44,58 @@ Page({ ...@@ -45,10 +44,58 @@ Page({
}, },
// 再次下单 // 再次下单
onOrderAgain: function (event) { onOrderAgain: function (event) {
let commodityType = this.data.orderInfo.commodityType console.log(this.data.orderInfo)
let shopAppId = this.data.shopAppId //wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : "" let funcItem = this.data.orderInfo
funcItem.shopAppId = wx.getStorageSync('shopInfoBuffer').appId
let funcUrl = ''
App.setShopInfo(funcItem.shopAppId, funcItem.commodityType)
switch (funcItem.shopAppId) {
// 海错图
case 1:
if (funcItem.commodityType === -1) funcUrl = '/pages/play/activity/activity'
if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 4) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 星空影院
case 2:
if (funcItem.commodityType === -2) funcUrl = '/pages/play/movie/movie'
break
// 儿童营地
case 3:
if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 2) funcUrl = '/pages/commodity/menu-food/menu-food'
if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 4) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 原野MOJITO
case 4:
if (funcItem.commodityType === 5) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 拾光花坊
case 5:
if (funcItem.commodityType === -1) funcUrl = '/pages/play/activity/activity'
if (funcItem.commodityType === 5) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 原味舒食
case 6:
if (funcItem.commodityType === 5) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 元养水韵SPA
case 7:
if (funcItem.commodityType === 2) funcUrl = '/pages/commodity/project-detail/project-detail'
break
}
wx.navigateTo({ wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`, url: funcUrl,
}) })
}, },
// 去支付 // 去支付
...@@ -65,10 +112,6 @@ Page({ ...@@ -65,10 +112,6 @@ Page({
signType: wxRequest.signType, signType: wxRequest.signType,
paySign: wxRequest.paySign, paySign: wxRequest.paySign,
success(res) { success(res) {
// let state = `orderInfo.state`
// that.setData({
// [state]: 2,
// })
that.queryOrderDetail() that.queryOrderDetail()
}, },
fail(res) {} fail(res) {}
...@@ -120,8 +163,8 @@ Page({ ...@@ -120,8 +163,8 @@ Page({
setTimeout(function () { setTimeout(function () {
if (type == 1) { if (type == 1) {
// 删除操作 // 删除操作
wx.redirectTo({ wx.navigateBack({
url: '/pages/mine/order/order', delta: 1
}) })
} else { } else {
// 取消操作 // 取消操作
...@@ -131,9 +174,7 @@ Page({ ...@@ -131,9 +174,7 @@ Page({
[state]: -1 [state]: -1
}) })
} }
}, 2000) }, 2000)
} }
}) })
......
pages/pay/order-detail/order-detail.wxml
...@@ -173,7 +173,6 @@ ...@@ -173,7 +173,6 @@
<text>{{orderInfo.expireTime}}</text> <text>{{orderInfo.expireTime}}</text>
</view> </view>
</block> </block>
</block> </block>
<!-- 观影 --> <!-- 观影 -->
......
pages/pay/order-detail/order-detail.wxss
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
width: 670rpx; width: 670rpx;
min-height: 206rpx; min-height: 206rpx;
padding: 48rpx 32rpx; padding: 48rpx 32rpx;
background: #f3f4f6; background: #F5F6F8;
border-radius: 4rpx; border-radius: 4rpx;
overflow: hidden; overflow: hidden;
} }
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
.info-line { .info-line {
position: relative; position: relative;
background: #f3f4f6; background: #F5F6F8;
} }
.info-line-line { .info-line-line {
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background: #fff; background: #FFFFFF;
} }
.info-line-point-right { .info-line-point-right {
...@@ -125,13 +125,13 @@ ...@@ -125,13 +125,13 @@
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background: #fff; background: #FFFFFF;
} }
.info-code { .info-code {
width: 670rpx; width: 670rpx;
min-height: 330rpx; min-height: 330rpx;
background: #f3f4f6; background: #F5F6F8;
} }
.info-code text:nth-child(1) { .info-code text:nth-child(1) {
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
color: #fff; color: #FFFFFF;
} }
.info-code text:nth-child(3) { .info-code text:nth-child(3) {
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
margin-top: 40rpx; margin-top: 40rpx;
padding: 40rpx 32rpx 0 32rpx; padding: 40rpx 32rpx 0 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #f3f4f6; background: #F5F6F8;
} }
.commodity-shop-info>image { .commodity-shop-info>image {
...@@ -216,12 +216,12 @@ ...@@ -216,12 +216,12 @@
font-size: 22rpx; font-size: 22rpx;
font-weight: 500; font-weight: 500;
line-height: 32rpx; line-height: 32rpx;
color: #fff; color: #FFFFFF;
} }
.commodity-item-operation>button.btn-disabled { .commodity-item-operation>button.btn-disabled {
background: #c8e1ec; background: #c8e1ec;
color: #fff; color: #FFFFFF;
} }
.commodity-list .commodity-item:last-child { .commodity-list .commodity-item:last-child {
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #fff; color: #FFFFFF;
} }
.code-tip text:nth-child(2) { .code-tip text:nth-child(2) {
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #fff; color: #FFFFFF;
} }
.code-info-qrcode { .code-info-qrcode {
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
height: 666rpx; height: 666rpx;
margin-top: 56rpx; margin-top: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #fff; background: #FFFFFF;
} }
.code-info-copy { .code-info-copy {
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
margin: 64rpx auto 0; margin: 64rpx auto 0;
padding-left: 32rpx; padding-left: 32rpx;
color: #15191f; color: #15191f;
background-color: #ecf4f8; background: #ecf4f8;
} }
.status-text { .status-text {
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
} }
.bgPink { .bgPink {
background-color: #f3e1e1; background: #f3e1e1;
} }
.ticket-wrapper { .ticket-wrapper {
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
position: relative; position: relative;
width: 100%; width: 100%;
padding: 48rpx 32rpx 46rpx; padding: 48rpx 32rpx 46rpx;
background-color: #f3f4f6; background: #F5F6F8;
border-bottom: 1px dashed #e2e7ef; border-bottom: 1px dashed #e2e7ef;
} }
...@@ -479,12 +479,12 @@ ...@@ -479,12 +479,12 @@
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background-color: #fff; background: #FFFFFF;
} }
.ticket-footer { .ticket-footer {
padding: 50rpx 32rpx 24rpx; padding: 50rpx 32rpx 24rpx;
background-color: #f3f4f6; background: #F5F6F8;
} }
.ticket-footer-top { .ticket-footer-top {
...@@ -497,9 +497,9 @@ ...@@ -497,9 +497,9 @@
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
margin: 40rpx 0; margin: 40rpx 0;
color: #fff; color: #FFFFFF;
text-align: center; text-align: center;
background-color: #86c5e1; background: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
...@@ -510,14 +510,14 @@ ...@@ -510,14 +510,14 @@
.code-header { .code-header {
height: 70rpx; height: 70rpx;
color: #fff; color: #FFFFFF;
font-size: 30rpx; font-size: 30rpx;
text-align: center; text-align: center;
} }
.code-tips { .code-tips {
height: 92rpx; height: 92rpx;
color: #fff; color: #FFFFFF;
font-size: 26rpx; font-size: 26rpx;
text-align: center; text-align: center;
} }
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
position: relative; position: relative;
width: 526rpx; width: 526rpx;
height: 666rpx; height: 666rpx;
background-color: #fff; background: #FFFFFF;
border-radius: 4rpx; border-radius: 4rpx;
} }
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
width: 446rpx; width: 446rpx;
height: 96rpx; height: 96rpx;
padding: 0 24rpx; padding: 0 24rpx;
background-color: #f2f3f5; background: #f2f3f5;
border-radius: 4rpx; border-radius: 4rpx;
line-height: 96rpx; line-height: 96rpx;
} }
...@@ -602,7 +602,7 @@ ...@@ -602,7 +602,7 @@
} }
.current-img-num { .current-img-num {
color: #fff; color: #FFFFFF;
font-size: 34rpx; font-size: 34rpx;
} }
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
.notice-popup-wrapper { .notice-popup-wrapper {
padding: 56rpx 40rpx 68rpx; padding: 56rpx 40rpx 68rpx;
background-color: #fff; background: #FFFFFF;
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
} }
...@@ -672,7 +672,7 @@ ...@@ -672,7 +672,7 @@
.goods-list { .goods-list {
margin-top: 40rpx; margin-top: 40rpx;
padding: 0 32rpx 14rpx; padding: 0 32rpx 14rpx;
background-color: #f5f6f8; background: #f5f6f8;
} }
.goods-list-title-wrapper { .goods-list-title-wrapper {
...@@ -743,16 +743,16 @@ ...@@ -743,16 +743,16 @@
height: 56rpx; height: 56rpx;
margin-top: 40rpx; margin-top: 40rpx;
margin-left: 32rpx; margin-left: 32rpx;
color: #fff; color: #FFFFFF;
font-size: 22rpx; font-size: 22rpx;
text-align: center; text-align: center;
line-height: 56rpx; line-height: 56rpx;
background-color: #86c5e1; background: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
.disabled { .disabled {
background-color: #c8e1ec; background: #c8e1ec;
} }
.order-info-wrapper { .order-info-wrapper {
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
background: #fff; background: #FFFFFF;
padding: 32rpx 20rpx; padding: 32rpx 20rpx;
border-top: 1px solid #e2e7ef; border-top: 1px solid #e2e7ef;
} }
...@@ -819,13 +819,13 @@ ...@@ -819,13 +819,13 @@
.delete-btn { .delete-btn {
color: #656e7b; color: #656e7b;
background-color: #fff; background: #FFFFFF;
border: 1px solid #c2c7cf; border: 1px solid #c2c7cf;
} }
.order-btn { .order-btn {
color: #fff; color: #FFFFFF;
background-color: #86c5e1; background: #86c5e1;
} }
image { image {
......
pages/pay/order-input/order-input.js
...@@ -93,8 +93,6 @@ Page({ ...@@ -93,8 +93,6 @@ Page({
onLoad: function (options) { onLoad: function (options) {
if (options.type) options.type = Number(options.type) if (options.type) options.type = Number(options.type)
console.log(options.type)
logicData.option = options logicData.option = options
this.setShopInfo() this.setShopInfo()
...@@ -470,12 +468,6 @@ Page({ ...@@ -470,12 +468,6 @@ Page({
break break
} }
} }
console.log(funcTimetable)
console.log(funcDate)
console.log(funcTimeBegin)
console.log(funcTimeEnd)
this.setData({ this.setData({
buyContentTime: funcDate + ' ' + funcTimeBegin + ' - ' + funcTimeEnd buyContentTime: funcDate + ' ' + funcTimeBegin + ' - ' + funcTimeEnd
}) })
...@@ -813,6 +805,10 @@ Page({ ...@@ -813,6 +805,10 @@ Page({
// 校验数组用户信息 // 校验数组用户信息
let funcRegisterInfo = this.data.registerInfo let funcRegisterInfo = this.data.registerInfo
console.log(funcRegisterInfo)
for (let i = 0, l = funcRegisterInfo.length; i < l; i++) { for (let i = 0, l = funcRegisterInfo.length; i < l; i++) {
if (funcRegisterInfo[i].name === '' || funcRegisterInfo[i].errorName !== '') { if (funcRegisterInfo[i].name === '' || funcRegisterInfo[i].errorName !== '') {
this.setUserInfo('name', funcRegisterInfo[i].name, i, App.modular.rule.item('name', funcRegisterInfo[i].name)) this.setUserInfo('name', funcRegisterInfo[i].name, i, App.modular.rule.item('name', funcRegisterInfo[i].name))
...@@ -1211,10 +1207,16 @@ Page({ ...@@ -1211,10 +1207,16 @@ Page({
break break
} }
} else { } else {
// 取消支付直接进入订单 if ([1, 2, 3, 4, 5, 7].indexOf(logicData.option.type) >= 0) {
wx.reLaunch({ // 取消支付直接进入订单
url: '/pages/mine/order/order?fromPage=pay' wx.reLaunch({
}) url: '/pages/mine/order/order?fromPage=pay'
})
} else {
wx.reLaunch({
url: '/pages/mine/appointment/appointment?fromPage=pay'
})
}
} }
}, },
......
pages/pay/order-input/order-input.wxml
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<!-- winButtonAppointment --> <!-- winButtonAppointment -->
<cover-view class="appointment row con-c align-c" wx:if="{{winButtonAppointment && !winNoticeDetail && !winActivityResult}}"> <cover-view class="appointment row con-c align-c" wx:if="{{winButtonAppointment && !winNoticeDetail && !winActivityResult}}">
<cover-view class="appointment-confirm row con-c align-c" bindtap="paySubmitActivity">确认预约</cover-view> <cover-view class="appointment-confirm row con-c align-c" bindtap="onPaySubmit">确认预约</cover-view>
</cover-view> </cover-view>
<!-- 购买须知详情 --> <!-- 购买须知详情 -->
......
pages/play/activity/activity.js
...@@ -183,11 +183,25 @@ Page({ ...@@ -183,11 +183,25 @@ Page({
}, },
// 活动报名 // 活动报名
onReport: function (event) { onReport: function (event) {
let index = event.currentTarget.dataset.index console.log(event)
let selectedActivity = this.data.selectedActivity
selectedActivity[index].quantity = 1 let funcItem = event.currentTarget.dataset.item
this.setShopInfo(selectedActivity[index].officeId, 2) let funcShopId = funcItem.officeId
wx.setStorageSync('shoppingCartBuffer', [selectedActivity[index]])
let funcShopInfo = App.globalData.shopId
for (let i = 0, l = funcShopInfo.length; i < l; i++) {
if (funcShopId === funcShopInfo[i].id) {
App.setShopInfo(funcShopInfo[i].appId, 2)
break
}
}
funcItem.quantity = 1
funcItem.quantityMin = 1
funcItem.quantityMax = 1
funcItem.isActive = true
wx.setStorageSync('shoppingCartBuffer', [funcItem])
wx.navigateTo({ wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=6' url: '/pages/pay/order-input/order-input?type=6'
}) })
......
pages/play/activity/activity.wxml
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<text>{{item.price == '0' ? '免费' : item.priceText}}</text> <text>{{item.price == '0' ? '免费' : item.priceText}}</text>
</view> </view>
<view> <view>
<button class="row con-c align-c" catchtap="onReport" data-index="{{index}}">报名</button> <button class="row con-c align-c" catchtap="onReport" data-item="{{item}}">报名</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/play/activity/activity.wxss
...@@ -8,42 +8,48 @@ ...@@ -8,42 +8,48 @@
min-height: 100vh; min-height: 100vh;
margin-top: 120rpx; margin-top: 120rpx;
padding-bottom: 100rpx; padding-bottom: 100rpx;
background: linear-gradient(#ffffff, #F2F2F2); background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 6%, #F3F4F6 100%);
} }
/* 状态筛选菜单 */ /* 状态筛选菜单 */
.status { .status {
width: 750rpx; width: 750rpx;
padding: 0 40rpx; padding: 0 40rpx;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #e2e7ef solid;
overflow-x: scroll; overflow-x: scroll;
flex-wrap: nowrap; flex-wrap: nowrap;
background-color: #fff; background-color: #fff;
} }
.status-fixed { .status-fixed {
z-index: 999; z-index: 999;
position: fixed; position: fixed;
left: 0; left: 0;
} }
.status-item { .status-item {
height: 94rpx; height: 94rpx;
margin-right: 80rpx; margin-right: 80rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
color: #959DA9; color: #959da9;
} }
.status-item text { .status-item text {
display: inline-block; display: inline-block;
white-space: nowrap; white-space: nowrap;
} }
.status-item:last-child { .status-item:last-child {
padding-right: 40rpx; padding-right: 40rpx;
} }
.status-item-active { .status-item-active {
height: 94rpx; height: 94rpx;
color: #15191F; color: #15191f;
font-weight: 600; font-weight: 600;
border-bottom: 4rpx #15191F solid; border-bottom: 4rpx #15191f solid;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
...@@ -65,6 +71,7 @@ ...@@ -65,6 +71,7 @@
} }
/* 活动列表 */ /* 活动列表 */
.list { .list {
padding: 0rpx 40rpx 50rpx 40rpx; padding: 0rpx 40rpx 50rpx 40rpx;
} }
...@@ -75,7 +82,7 @@ ...@@ -75,7 +82,7 @@
margin-top: 64rpx; margin-top: 64rpx;
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
background: #ffffff; background: #fff;
} }
.item-info { .item-info {
...@@ -90,28 +97,28 @@ ...@@ -90,28 +97,28 @@
.item-title text:nth-child(1) { .item-title text:nth-child(1) {
font-size: 34rpx; font-size: 34rpx;
font-weight: bold; font-weight: bold;
color: #15191F; color: #15191f;
line-height: 44rpx; line-height: 44rpx;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
white-space: normal; white-space: normal;
text-overflow: ellipsis; text-overflow: ellipsis;
word-wrap: break-word; word-wrap: break-word;
-webkit-line-clamp:1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.item-title text:nth-child(2) { .item-title text:nth-child(2) {
width: 96rpx; width: 96rpx;
height: 32rpx; height: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
border: 1px solid #86C5E1; border: 1px solid #86c5e1;
background: rgba(134, 197, 225, 0.1); background: rgba(134, 197, 225, 0.1);
text-align: center; text-align: center;
font-size: 18rpx; font-size: 18rpx;
font-weight: 500; font-weight: 500;
line-height: 32rpx; line-height: 32rpx;
color: #86C5E1; color: #86c5e1;
} }
.item-date { .item-date {
...@@ -119,7 +126,7 @@ ...@@ -119,7 +126,7 @@
height: 40rpx; height: 40rpx;
margin-top: 8rpx; margin-top: 8rpx;
font-size: 26rpx; font-size: 26rpx;
color: #656E7B; color: #656e7b;
line-height: 40rpx; line-height: 40rpx;
} }
...@@ -134,20 +141,20 @@ ...@@ -134,20 +141,20 @@
height: 80rpx; height: 80rpx;
margin-top: 16rpx; margin-top: 16rpx;
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959da9;
line-height: 40rpx; line-height: 40rpx;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
white-space: normal; white-space: normal;
text-overflow: ellipsis; text-overflow: ellipsis;
word-wrap: break-word; word-wrap: break-word;
-webkit-line-clamp:2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.price-symbol { .price-symbol {
margin-top: 8rpx; margin-top: 8rpx;
color: #15191F; color: #15191f;
font-size: 18rpx; font-size: 18rpx;
font-weight: 600; font-weight: 600;
} }
...@@ -160,14 +167,13 @@ ...@@ -160,14 +167,13 @@
width: 78rpx; width: 78rpx;
height: 32rpx; height: 32rpx;
margin-right: 12rpx; margin-right: 12rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%); background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
border-radius: 4rpx; border-radius: 4rpx;
text-align: center; text-align: center;
font-size: 18rpx; font-size: 18rpx;
font-weight: 500; font-weight: 500;
line-height: 28rpx; line-height: 28rpx;
color: #E8D0AF; color: #e8d0af;
} }
.item-operation text:nth-child(3) { .item-operation text:nth-child(3) {
...@@ -176,7 +182,7 @@ ...@@ -176,7 +182,7 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
.item-operation text:nth-child(4) { .item-operation text:nth-child(4) {
...@@ -184,7 +190,7 @@ ...@@ -184,7 +190,7 @@
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #C2C7CF; color: #c2c7cf;
text-decoration: line-through; text-decoration: line-through;
} }
...@@ -193,8 +199,8 @@ ...@@ -193,8 +199,8 @@
width: 132rpx; width: 132rpx;
height: 56rpx; height: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #86C5E1; background: #86c5e1;
color: #FFFFFF; color: #fff;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
...@@ -206,14 +212,14 @@ ...@@ -206,14 +212,14 @@
} }
/* 往期活动 */ /* 往期活动 */
.route-list { .route-list {
width: 750rpx; width: 750rpx;
margin-top: 48rpx; margin-top: 48rpx;
padding: 0 40rpx; padding: 0 40rpx;
} }
.route-list-left, .route-list-left, .route-list-right {
.route-list-right {
width: 320rpx; width: 320rpx;
} }
...@@ -224,7 +230,7 @@ ...@@ -224,7 +230,7 @@
margin-top: 16rpx; margin-top: 16rpx;
border-radius: 4rpx; border-radius: 4rpx;
overflow: hidden; overflow: hidden;
background: #ffffff; background: #fff;
} }
.route-item image { .route-item image {
...@@ -240,8 +246,7 @@ ...@@ -240,8 +246,7 @@
margin: 32rpx 32rpx 8rpx; margin: 32rpx 32rpx 8rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: bolder; font-weight: bolder;
color: #000000; color: #000;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
line-clamp: 2; line-clamp: 2;
...@@ -252,5 +257,5 @@ ...@@ -252,5 +257,5 @@
.route-item-content { .route-item-content {
margin: 0 32rpx 32rpx 32rpx; margin: 0 32rpx 32rpx 32rpx;
font-size: 22rpx; font-size: 22rpx;
color: #959DA9; color: #959da9;
} }
pages/play/home/home.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!-- 畅玩分类 --> <!-- 畅玩分类 -->
<block wx:if="{{appStatus}}"> <block wx:if="{{appStatus}}">
<view class="banner"> <view class="banner" style="{{'margin-top: ' + (navigationLogoTop + navigationLogoMarginTop + 40) + 'rpx;'}}">
<image src="{{resourcesBase + 'play/home/type.png'}}"></image> <image src="{{resourcesBase + 'play/home/type.png'}}"></image>
<button class="art-button" bindtap="onToArt"></button> <button class="art-button" bindtap="onToArt"></button>
<button class="health-button" bindtap="onToHealth"></button> <button class="health-button" bindtap="onToHealth"></button>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</block> </block>
<block wx:if="{{!appStatus}}"> <block wx:if="{{!appStatus}}">
<view class="banner-occupy"></view> <view class="banner-occupy" style="{{'margin-top: ' + (navigationLogoTop + navigationLogoMarginTop + 40) + 'rpx;'}}"></view>
</block> </block>
<!-- 近期活动 --> <!-- 近期活动 -->
......
pages/play/home/home.wxss
...@@ -36,12 +36,10 @@ ...@@ -36,12 +36,10 @@
/* 畅玩分类 */ /* 畅玩分类 */
.banner-occupy { .banner-occupy {
position: relative; position: relative;
margin-top: 200rpx;
} }
.banner { .banner {
position: relative; position: relative;
margin-top: 200rpx;
width: 750rpx; width: 750rpx;
height: 1200rpx; height: 1200rpx;
} }
......
pages/play/service-detail/service-detail.wxml
...@@ -228,18 +228,17 @@ ...@@ -228,18 +228,17 @@
</view> </view>
<!-- 评论隐藏样式 --> <!-- 评论隐藏样式 -->
<view class="evaluate-item-content" wx:if="{{!item.isMore}}"> <view class="evaluate-item-content" wx:if="{{!item.isDetail}}">
<view class="evaluate-item-content-mark"> <view>
<text>{{item.content}}</text> <text class="evaluate-item-content-mark">{{item.content}}</text>
</view> </view>
<view class="evaluate-item-content-more" data-item="{{item}}" data-index="{{index}}" bindtap="onEvaluateMore"> <view wx:if="{{item.isMore}}" class="evaluate-item-content-more row con-e align-e" data-item="{{item}}" data-index="{{index}}" bindtap="onEvaluateMore">
<text>...　</text>
<text>全文</text> <text>全文</text>
</view> </view>
</view> </view>
<!-- 评论展开样式 --> <!-- 评论展开样式 -->
<view class="evaluate-item-content-whole" wx:if="{{item.isMore}}"> <view class="evaluate-item-content-whole" wx:if="{{item.isDetail}}">
<view> <view>
<text>{{item.content}}</text> <text>{{item.content}}</text>
</view> </view>
...@@ -418,37 +417,48 @@ ...@@ -418,37 +417,48 @@
<view class="evaluate-list col"> <view class="evaluate-list col">
<block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="evaluate-item col"> <view class="evaluate-item col" style="border-bottom: 1rpx solid #3A3A40">
<view class="row"> <view class="row">
<image class="evaluate-item-avatar" src="{{item}}" mode="widthFix"></image> <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
<view class="evaluate-item-info"> <view class="evaluate-item-info">
<view class="evaluate-item-info-text row align-c"> <view class="evaluate-item-info-text row align-c">
<text>{{item.name}}</text> <text style="color: #FFFFFF">{{item.userName}}</text>
<text>业主</text> <text>业主</text>
<text>{{item.date}}</text> <text style="color: #656E7B">{{item.date}}</text>
</view> </view>
<view class="evaluate-item-info-star row align-c"> <view class="evaluate-item-info-star row align-c">
<block wx:for="{{item.star}}" wx:for-index="indexStar" wx:for-item="itemStar" wx:key="indexStar"> <block wx:for="{{item.star}}" wx:for-index="indexStar" wx:for-item="itemStar" wx:key="indexStar">
<image src="{{imageBase + 'icon/star-1.png'}}"></image> <image src="{{imageBase + 'icon/star-1.png'}}" data-item="{{item}}"></image>
</block> </block>
</view> </view>
</view> </view>
</view> </view>
<view class="evaluate-item-content"> <!-- 评论隐藏样式 -->
<view class="evaluate-item-content" wx:if="{{!item.isDetail}}">
<view> <view>
<text class="color-white">{{item.content}}</text> <text class="evaluate-item-content-mark" style="color: #FFFFFF">{{item.content}}</text>
</view> </view>
<view class="evaluate-item-content-more-movie"> <view wx:if="{{item.isMore}}" class="evaluate-item-content-more row con-e align-e" style="background: #1C1C25;" data-item="{{item}}" data-index="{{index}}" bindtap="onEvaluateMore">
<text class="color-white">...　</text>
<text>全文</text> <text>全文</text>
</view> </view>
</view> </view>
<!-- 评论展开样式 -->
<view class="evaluate-item-content-whole" wx:if="{{item.isDetail}}">
<view>
<text style="color: #FFFFFF">{{item.content}}</text>
</view>
</view>
<view class="evaluate-item-album"> <view class="evaluate-item-album">
<block wx:for="{{item.imgUrls}}" wx:for-index="indexAlbum" wx:for-item="itemAlbum" wx:key="indexAlbum"> <block wx:for="{{item.userAlbum}}" wx:for-index="indexAlbum" wx:for-item="itemAlbum" wx:key="indexAlbum">
<image src="{{itemAlbum}}" bindtap="onPreviewImage" data-index="{{index}}" data-url="{{itemAlbum}}"></image> <image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image>
</block> </block>
<view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row con-c align-c" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum">
<text>{{'+' + (item.userAlbum.length - 4)}}</text>
</view>
</view> </view>
</view> </view>
</block> </block>
......
pages/play/service-detail/service-detail.wxss
...@@ -812,7 +812,7 @@ ...@@ -812,7 +812,7 @@
text-align: right; text-align: right;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 32rpx;
} }
.evaluate-item-content-more-movie { .evaluate-item-content-more-movie {
...@@ -828,15 +828,7 @@ ...@@ -828,15 +828,7 @@
line-height: 44rpx; line-height: 44rpx;
} }
.evaluate-item-content-more text:nth-child(1) { .evaluate-item-content-more text {
color: #15191f;
}
.evaluate-item-content-more text:nth-child(2) {
color: #86c5e1;
}
.evaluate-item-content-more-movie text:nth-child(2) {
color: #86c5e1; color: #86c5e1;
} }
......
read.js
...@@ -4,8 +4,13 @@ ...@@ -4,8 +4,13 @@
* win，窗口显隐控制，通常数值为布尔类型。例如 winToast，winDialog。 * win，窗口显隐控制，通常数值为布尔类型。例如 winToast，winDialog。
* func，函数内部变量前缀。 * func，函数内部变量前缀。
* *
* 代码编写规范 - js - 变量命名禁忌
* 避免无意义命名，如 list，data，等等。
*
* 代码编写规范 - js - 常用变量命名 * 代码编写规范 - js - 常用变量命名
* option，页面参数对象 * option，页面参数对象
* userInfo，用户信息对象 * userInfo，用户信息对象
* *
* 代码编写规范 - js - 函数命名
* query
*/ */
\ 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