Skip to content

严立 / mini-shimao

Go to a project
Commit 0912b5b9 by 严立
Options

LL - 增加全局界面隐藏功能

parent da21f560
Inline Side-by-side
Showing with 1420 additions and 1172 deletions
app.js
...@@ -13,6 +13,7 @@ App({ ...@@ -13,6 +13,7 @@ App({
}, },
globalData: { globalData: {
appStatus: false,
test:'999', test:'999',
appImageBase: '../../../image/', appImageBase: '../../../image/',
appResourcesBase: 'https://sm-web.meiqicloud.com/userfiles/appResourcesS2/', appResourcesBase: 'https://sm-web.meiqicloud.com/userfiles/appResourcesS2/',
...@@ -33,6 +34,7 @@ App({ ...@@ -33,6 +34,7 @@ App({
onLaunch: function () { onLaunch: function () {
this.setUnitProportion() this.setUnitProportion()
this.setAppStatus()
this.login() this.login()
}, },
...@@ -43,11 +45,38 @@ App({ ...@@ -43,11 +45,38 @@ App({
this.queryUserStatus() this.queryUserStatus()
}, },
setAppStatus: function () {
this.wxRequest({
url: '/api/v1/common/getDictByType',
method: 'POST',
data: {
'type': 'is_open'
},
success: (response) => {
let funcResponse = response.data
this.globalData.appStatus = Boolean(Number(funcResponse[0].value))
console.log(this.globalData.appStatus)
}
})
},
/**
* 设置设备像素比
* @function
* @param
* @returns
*/
setUnitProportion: function () { setUnitProportion: function () {
let funcProportion = wx.getSystemInfoSync().windowWidth / 750 let funcProportion = wx.getSystemInfoSync().windowWidth / 750
wx.setStorageSync('unitProportion', funcProportion) wx.setStorageSync('unitProportion', funcProportion)
}, },
/**
* css 样式对象转换 css 字符串
* @function
* @param
* @returns
*/
cssObjectToCssString: function (funcCssObject) { cssObjectToCssString: function (funcCssObject) {
let funcCss = '' let funcCss = ''
let funcObjectKey = Object.keys(funcCssObject) let funcObjectKey = Object.keys(funcCssObject)
...@@ -57,6 +86,12 @@ App({ ...@@ -57,6 +86,12 @@ App({
return funcCss return funcCss
}, },
/**
* 请求封装
* @function
* @param {object} - 请求参数
* @returns
*/
wxRequest: function (obj) { wxRequest: function (obj) {
var token = this.globalData.token var token = this.globalData.token
var param = obj.data ? JSON.stringify(obj.data) : '' var param = obj.data ? JSON.stringify(obj.data) : ''
...@@ -240,8 +275,6 @@ App({ ...@@ -240,8 +275,6 @@ App({
funcUserInfo.userType = 0 funcUserInfo.userType = 0
break break
} }
funcUserInfo.userType = 0
wx.setStorageSync('userInfo', funcUserInfo) wx.setStorageSync('userInfo', funcUserInfo)
// 如果用户身份有更新，则自动跳转到首页 // 如果用户身份有更新，则自动跳转到首页
......
pages/campsite/home/home.js
...@@ -7,8 +7,10 @@ let logicData = { ...@@ -7,8 +7,10 @@ let logicData = {
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
appResourcesBase: App.globalData.appResourcesBase, appResourcesBase: App.globalData.appResourcesBase,
showPopup: false, showPopup: false,
winSide: true, winSide: true,
sideHeight: 1250, sideHeight: 1250,
......
pages/campsite/home/home.wxml
...@@ -66,29 +66,31 @@ ...@@ -66,29 +66,31 @@
</view> </view>
</view> </view>
<!-- 饮品预订 文创周边--> <block wx:if="{{appStatus}}">
<view class="buy-other row con-b"> <!-- 饮品预订 文创周边-->
<!-- 饮品预订 --> <view class="buy-other row con-b">
<view class="buy-snacks row" bindtap="onBuySnacks" data-id="{{3}}"> <!-- 饮品预订 -->
<view class="buy-left col con-c"> <view class="buy-snacks row" bindtap="onBuySnacks" data-id="{{3}}">
<image src="./image/yinpinyuding.png"></image> <view class="buy-left col con-c">
<image src="./image/yinpinyuding.png"></image>
</view>
<view class="buy-right col con-c">
<image src="./image/icon-bg.png"></image>
<image class="snacks-img" src="./image/yinpin.png"></image>
</view>
</view> </view>
<view class="buy-right col con-c"> <!-- 文创周边 -->
<image src="./image/icon-bg.png"></image> <view class="buy-art row" bindtap="onBuyArt" data-id="{{3}}">
<image class="snacks-img" src="./image/yinpin.png"></image> <view class="buy-left col con-c">
<image src="./image/wenchuangzhoubian.png"></image>
</view>
<view class="buy-right col con-c">
<image src="./image/icon-bg.png"></image>
<image class="art-img" src="./image/shanzi.png"></image>
</view>
</view> </view>
</view> </view>
<!-- 文创周边 --> </block>
<view class="buy-art row" bindtap="onBuyArt" data-id="{{3}}">
<view class="buy-left col con-c">
<image src="./image/wenchuangzhoubian.png"></image>
</view>
<view class="buy-right col con-c">
<image src="./image/icon-bg.png"></image>
<image class="art-img" src="./image/shanzi.png"></image>
</view>
</view>
</view>
<!-- 全部活动 --> <!-- 全部活动 -->
<view class="activity" bindtap="onActivityAll"> <view class="activity" bindtap="onActivityAll">
......
pages/commodity/home/home.js
...@@ -2,6 +2,7 @@ const App = getApp() ...@@ -2,6 +2,7 @@ const App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
......
pages/commodity/home/home.wxml
<navigation class="navigation"></navigation> <navigation class="navigation"></navigation>
<view class="container"> <view class="container">
<!-- 问候订制 --> <block wx:if="{{!appStatus}}">
<view class="greeting" style="{{'padding-top:' + cssGreeting + 'px;'}}"> <!-- 问候订制 -->
<text>{{greetingName + '，' + greetingMessage}}</text> <view class="greeting" style="{{'padding-bottom: 0; padding-top:' + cssGreeting + 'px;'}}">
</view> <text>{{greetingName + '，' + greetingMessage}}</text>
<!-- 商店 -->
<view class="shop">
<view class="shop-name">
<image src="{{resourcesBase + 'commodity/home/shop-title-1.png'}}"></image>
</view> </view>
<view class="shop-title col"> </block>
<text>这里有来自大自然的馈赠</text> <block wx:if="{{appStatus}}">
<text>用心烹饪的美食</text> <!-- 问候订制 -->
<view class="greeting" style="{{'padding-top:' + cssGreeting + 'px;'}}">
<text>{{greetingName + '，' + greetingMessage}}</text>
</view> </view>
<swiper indicator-dots="true">
<!-- 原味舒食 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-1.png'}}"></image>
<button class="row con-c align-c" data-id="{{6}}" bindtap="onBuyFood"></button>
</view>
<view class="shop-menu">
<block wx:for="{{shopRecommendA}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{6}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
<!-- 原野mojito -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-2.png'}}"></image>
<button class="row con-c align-c" data-id="{{4}}" bindtap="onBuyFood"></button>
</view>
<view class="shop-menu">
<block wx:for="{{shopRecommendB}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{4}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
</swiper>
</view>
<!-- 项目服务 --> <!-- 商店 -->
<view class="services col align-c"> <view class="shop">
<view class="services-title col"> <view class="shop-name">
<text>您可以用最优惠的价格</text> <image src="{{resourcesBase + 'commodity/home/shop-title-1.png'}}"></image>
<text>享受超级服务</text>
</view>
<view class="services-banner" bindtap="onBuyAll">
<image src="{{resourcesBase + 'commodity/home/services-title.png'}}"></image>
</view>
<view class="services-list col align-c">
<!-- 精灵鸟理想国 -->
<view class="services-list-item col align-c" data-id="{{3}}" bindtap="onBuyMembership">
<image src="{{banner[0]}}"></image>
</view> </view>
<!-- 故宫海洋世界 --> <view class="shop-title col">
<view class="services-list-item col align-c" data-id="{{1}}" bindtap="onBuyPassCheck"> <text>这里有来自大自然的馈赠</text>
<image src="{{banner[1]}}"></image> <text>用心烹饪的美食</text>
</view>
<!-- 元养水韵 -->
<view class="services-list-item col align-c" data-id="{{7}}" bindtap="onBuyService">
<image src="{{banner[2]}}"></image>
</view> </view>
<swiper indicator-dots="true">
<!-- 原味舒食 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-1.png'}}"></image>
<button class="row con-c align-c" data-id="{{6}}" bindtap="onBuyFood"></button>
</view>
<view class="shop-menu">
<block wx:for="{{shopRecommendA}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{6}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
<!-- 原野mojito -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-2.png'}}"></image>
<button class="row con-c align-c" data-id="{{4}}" bindtap="onBuyFood"></button>
</view>
<view class="shop-menu">
<block wx:for="{{shopRecommendB}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{4}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
</swiper>
</view> </view>
</view>
<!-- 能量补给站 --> <!-- 项目服务 -->
<view class="reception col align-c"> <view class="services col align-c">
<view class="reception-title col"> <view class="services-title col">
<text>尽情玩耍</text> <text>您可以用最优惠的价格</text>
<text>随时为你补充能量</text> <text>享受超级服务</text>
</view>
<view class="reception-banner">
<image src="{{resourcesBase + 'commodity/home/reception-title.png'}}"></image>
</view>
<view class="reception-list col align-c">
<view class="reception-list-item col align-c" data-id="{{3}}" bindtap="onBuySupply">
<image src="{{banner[3]}}"></image>
<text>儿童营地接待区</text>
</view> </view>
<view class="reception-list-item col align-c" data-id="{{5}}" bindtap="onBuySupply"> <view class="services-banner" bindtap="onBuyAll">
<image src="{{banner[4]}}"></image> <image src="{{resourcesBase + 'commodity/home/services-title.png'}}"></image>
<text>拾光花坊</text>
</view> </view>
</view> <view class="services-list col align-c">
</view> <!-- 精灵鸟理想国 -->
<view class="services-list-item col align-c" data-id="{{3}}" bindtap="onBuyMembership">
<!-- 商店 --> <image src="{{banner[0]}}"></image>
<view class="shop">
<view class="shop-name">
<image src="{{resourcesBase + 'commodity/home/shop-title-2.png'}}"></image>
</view>
<view class="shop-title col">
<text>可以为家人、朋友</text>
<text>准备一份精心的礼物</text>
</view>
<swiper indicator-dots="true">
<!-- 海错图文创店 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-3.png'}}"></image>
<button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button>
</view> </view>
<view class="shop-menu"> <!-- 故宫海洋世界 -->
<block wx:for="{{shopRecommendC}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <view class="services-list-item col align-c" data-id="{{1}}" bindtap="onBuyPassCheck">
<view class="shop-menu-item col con-c align-c" data-id="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> <image src="{{banner[1]}}"></image>
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view> </view>
</swiper-item> <!-- 元养水韵 -->
<view class="services-list-item col align-c" data-id="{{7}}" bindtap="onBuyService">
<image src="{{banner[2]}}"></image>
</view>
</view>
</view>
<!-- 儿童营地文创店 --> <!-- 能量补给站 -->
<swiper-item> <view class="reception col align-c">
<view class="shop-banner row con-c"> <view class="reception-title col">
<image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image> <text>尽情玩耍</text>
<button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button> <text>随时为你补充能量</text>
</view>
<view class="reception-banner">
<image src="{{resourcesBase + 'commodity/home/reception-title.png'}}"></image>
</view>
<view class="reception-list col align-c">
<view class="reception-list-item col align-c" data-id="{{3}}" bindtap="onBuySupply">
<image src="{{banner[3]}}"></image>
<text>儿童营地接待区</text>
</view> </view>
<view class="shop-menu"> <view class="reception-list-item col align-c" data-id="{{5}}" bindtap="onBuySupply">
<block wx:for="{{shopRecommendD}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <image src="{{banner[4]}}"></image>
<view class="shop-menu-item col con-c align-c" data-id="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> <text>拾光花坊</text>
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view> </view>
</swiper-item> </view>
</swiper> </view>
</view>
<!-- 商店 -->
<view class="shop">
<view class="shop-name">
<image src="{{resourcesBase + 'commodity/home/shop-title-2.png'}}"></image>
</view>
<view class="shop-title col">
<text>可以为家人、朋友</text>
<text>准备一份精心的礼物</text>
</view>
<swiper indicator-dots="true">
<!-- 海错图文创店 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-3.png'}}"></image>
<button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button>
</view>
<view class="shop-menu">
<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="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
<!-- 儿童营地文创店 -->
<swiper-item>
<view class="shop-banner row con-c">
<image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image>
<button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button>
</view>
<view class="shop-menu">
<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="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality">
<image src="{{item.cover}}"></image>
<text>{{item.name}}</text>
</view>
</block>
</view>
</swiper-item>
</swiper>
</view>
</block>
<view class="room-appointment"> <view class="room-appointment">
<view class="shop-title col"> <view class="shop-title col">
......
pages/commodity/menu-food/menu-food.js
...@@ -314,7 +314,7 @@ Page({ ...@@ -314,7 +314,7 @@ Page({
// 获取商品分类高度，用于判断滚动位置自动选择标签 // 获取商品分类高度，用于判断滚动位置自动选择标签
const funcQuery = wx.createSelectorQuery() const funcQuery = wx.createSelectorQuery()
funcQuery.selectAll('.right-content-title').boundingClientRect() funcQuery.selectAll('.menu-list-title').boundingClientRect()
funcQuery.exec((response) => { funcQuery.exec((response) => {
let funcElement = response[0] let funcElement = response[0]
let funcSideBarHeight = [] let funcSideBarHeight = []
...@@ -326,6 +326,8 @@ Page({ ...@@ -326,6 +326,8 @@ Page({
this.setData({ this.setData({
sideBarHeight: funcSideBarHeight sideBarHeight: funcSideBarHeight
}) })
console.log(funcSideBarHeight)
}) })
this.setCommodityDetail() this.setCommodityDetail()
......
pages/commodity/menu-food/menu-food.wxml
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view class="menu-list" scroll-y style="{{'padding-top: ' + sideBarTopPadding + 'px;'}}" scroll-top="{{commoditScroll}}" bindscroll="onCommoditScroll"> <scroll-view class="menu-list" scroll-y style="{{'padding-top: ' + sideBarTopPadding + 'px;'}}" scroll-top="{{commoditScroll}}" bindscroll="onCommoditScroll">
<block wx:for="{{commodityList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{commodityList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<!-- 此处类名关联 js 逻辑标签高度判定，需要统一修改 -->
<view class="menu-list-title">{{item.tab}}</view> <view class="menu-list-title">{{item.tab}}</view>
<!-- 循环商品列表 --> <!-- 循环商品列表 -->
......
pages/home/guide/guide.js
...@@ -8,6 +8,7 @@ let logicData = { ...@@ -8,6 +8,7 @@ let logicData = {
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
...@@ -225,6 +226,17 @@ Page({ ...@@ -225,6 +226,17 @@ Page({
}, },
onPointDetail: function () { onPointDetail: function () {
console.log(this.data.pointDetail)
// 临时屏蔽门店
if (!this.data.appStatus) {
if (this.data.pointDetail === 'guide/card/02.png') return
if (this.data.pointDetail === 'guide/card/03.png') return
if (this.data.pointDetail === 'guide/card/04.png') return
if (this.data.pointDetail === 'guide/card/06.png') return
if (this.data.pointDetail === 'guide/card/07.png') return
if (this.data.pointDetail === 'guide/card/08.png') return
if (this.data.pointDetail === 'guide/card/13.png') return
}
// 当从景点详情进入屏蔽该功能 // 当从景点详情进入屏蔽该功能
if (logicData.option.id) return if (logicData.option.id) return
......
pages/mine/card/card.js
...@@ -4,14 +4,25 @@ const App = getApp() ...@@ -4,14 +4,25 @@ const App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
animation: {},
passListType: 1, // 0为单张卡 1为多张卡 passListType: 1, // 0为单张卡 1为多张卡
privateStatus: true, privateStatus: true,
swiperCurrent: 0, swiperCurrent: 0,
shopConfig: App.globalData.shopId, shopConfig: App.globalData.shopId,
imageResourcesBase: App.globalData.appResourcesBase, imageResourcesBase: App.globalData.appResourcesBase,
passList: [] passList: [],
noticeDetail: '',
winNoticeDetail: false,
}, },
onLoad: function (options) { onLoad: function (options) {
this.animation = wx.createAnimation({
duration: 700,
timingFunction: 'ease'
})
this.getCardList() this.getCardList()
}, },
// 跳转订单详情 // 跳转订单详情
...@@ -36,7 +47,7 @@ Page({ ...@@ -36,7 +47,7 @@ Page({
}, },
//获取卡数据 //获取卡数据
getCardList() { getCardList: function () {
let that = this let that = this
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
...@@ -44,7 +55,7 @@ Page({ ...@@ -44,7 +55,7 @@ Page({
App.wxRequest({ App.wxRequest({
url: '/api/v1/volume/getVolumeList', url: '/api/v1/volume/getVolumeList',
data: { data: {
status: "", //0已过期1待使用2已使用(""全部) status: '', //0已过期1待使用2已使用(""全部)
pageNo: 1, pageNo: 1,
pageSize: -1 pageSize: -1
}, },
...@@ -180,5 +191,53 @@ Page({ ...@@ -180,5 +191,53 @@ Page({
[passList]: !this.data.passList[index].privateStatus [passList]: !this.data.passList[index].privateStatus
}) })
} },
// 使用须知
onNotice: function (event) {
// 初始底部弹出动画
let funcUnitProportion = wx.getStorageSync('unitProportion')
let funcMoveHeight = funcUnitProportion * 950
this.animation.translate(0, 0)
this.setData({
winNoticeDetail: true,
animation: this.animation.export()
})
let funcTimer = setTimeout(() => {
this.animation.translate(0, -funcMoveHeight).step()
this.setData({
animation: this.animation.export()
})
clearTimeout(funcTimer)
}, 100)
let funcItem = event.currentTarget.dataset.item
App.wxRequest({
url: '/api/v1/order/getOrderDetail',
data: {
'orderId': funcItem.orderId
},
success: (response) => {
this.setData({
noticeDetail: response.data.particulars,
winNoticeDetail: true
})
}
})
},
/**
* 关闭须知详情
* @function
* @param
* @returns
*/
onNoticeClose: function () {
this.setData({
winNoticeDetail: false
})
},
}) })
\ No newline at end of file
pages/mine/card/card.wxml
...@@ -4,13 +4,11 @@ ...@@ -4,13 +4,11 @@
<!-- 单张卡 --> <!-- 单张卡 -->
<view class="card-wrapper" wx:if="{{passList.length == 1}}"> <view class="card-wrapper" wx:if="{{passList.length == 1}}">
<view class="card-header"> <view class="card-header">
<image wx:if="{{passList[0].cardType==1}}" class="card-bg year-bg" <image wx:if="{{passList[0].cardType==1}}" class="card-bg year-bg" src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image> <image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg"
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}"> <image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row align-c"> <view class="use-notice row align-c" data-item="{{passList[0]}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
...@@ -77,21 +75,16 @@ ...@@ -77,21 +75,16 @@
</view> </view>
<!-- 多张卡 --> <!-- 多张卡 -->
<swiper class="card-list" wx:else indicator-dots indicator-color="#fff" indicator-active-color="#E57C99" <swiper class="card-list" wx:else indicator-dots indicator-color="#fff" indicator-active-color="#E57C99" next-margin="44rpx" bindchange="eventSwiperChange">
next-margin="44rpx" bindchange="eventSwiperChange">
<block wx:for="{{passList}}" wx:key="id"> <block wx:for="{{passList}}" wx:key="id">
<swiper-item> <swiper-item>
<view <view class="card-wrapper {{index === swiperCurrent ? 'item-right' : ''}} {{swiperCurrent === passList.length-1 ? 'item-center' : ''}}">
class="card-wrapper {{index === swiperCurrent ? 'item-right' : ''}} {{swiperCurrent === passList.length-1 ? 'item-center' : ''}}">
<view class="card-header"> <view class="card-header">
<image wx:if="{{item.cardType==1}}" class="card-bg year-bg" <image wx:if="{{item.cardType==1}}" class="card-bg year-bg" src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image> <image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" <image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg"
src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row align-c"> <view class="use-notice row align-c" data-item="{{item}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
...@@ -162,4 +155,16 @@ ...@@ -162,4 +155,16 @@
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
</view>
<!-- 须知详情 -->
<view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
<view class="notice-item" animation="{{animation}}">
<view class="notice-title">
<text>使用须知</text>
</view>
<view class="notice-rich">
<rich-text nodes="{{noticeDetail}}"></rich-text>
</view>
</view>
</view> </view>
\ No newline at end of file
pages/mine/card/card.wxss
.container { .container {
height: 100vh; height: 100vh;
padding-top: 232rpx; padding-top: 232rpx;
background: linear-gradient(180deg, #FFFCFC 0%, #F6DADA 100%); background: linear-gradient(180deg, #fffcfc 0%, #f6dada 100%);
} }
.card-bg { .card-bg {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: -1; z-index: -1;
} }
.card-list { .card-list {
width: 750rpx; width: 750rpx;
height: 1062rpx; height: 1062rpx;
} }
.card-wrapper { .card-wrapper {
width: 626rpx; width: 626rpx;
height: 992rpx; height: 992rpx;
} }
.item-right { .item-right {
margin: 0 40rpx; margin: 0 40rpx;
} }
.item-center { .item-center {
margin-left: 62rpx; margin-left: 62rpx;
} }
...@@ -33,34 +38,41 @@ ...@@ -33,34 +38,41 @@
border-radius: 4rpx; border-radius: 4rpx;
z-index: 0; z-index: 0;
} }
.use-notice { .use-notice {
position: absolute; position: absolute;
top: 61rpx; top: 61rpx;
right: 34rpx; right: 34rpx;
font-size: 26rpx; font-size: 26rpx;
} }
.use-notice image { .use-notice image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.card-header-title { .card-header-title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: 600;
} }
.card-header-info { .card-header-info {
margin-top: 23rpx; margin-top: 23rpx;
font-size: 26rpx; font-size: 26rpx;
} }
.card-header-info-left { .card-header-info-left {
width: 104rpx; width: 104rpx;
height: 52rpx; height: 52rpx;
line-height: 52rpx; line-height: 52rpx;
} }
.card-header-info-right { .card-header-info-right {
margin-left: 24rpx; margin-left: 24rpx;
height: 52rpx; height: 52rpx;
line-height: 52rpx; line-height: 52rpx;
} }
.card-info-visible { .card-info-visible {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
...@@ -73,47 +85,99 @@ ...@@ -73,47 +85,99 @@
background-color: #fff; background-color: #fff;
border-radius: 0 0 4rpx 4rpx; border-radius: 0 0 4rpx 4rpx;
} }
.code-num-wrapper { .code-num-wrapper {
margin-top: 57rpx; margin-top: 57rpx;
} }
.code-num-title { .code-num-title {
color: #959DA9; color: #959da9;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
font-weight: 600; font-weight: 600;
} }
.code-num { .code-num {
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
line-height: 42rpx; line-height: 42rpx;
} }
.code-copy { .code-copy {
margin-left: 24rpx; margin-left: 24rpx;
color: #86C5E1; color: #86c5e1;
font-size: 26rpx; font-size: 26rpx;
font-weight: 600; font-weight: 600;
line-height: 36rpx; line-height: 36rpx;
} }
.QRcode { .QRcode {
width: 296rpx; width: 296rpx;
height: 296rpx; height: 296rpx;
margin: 57rpx 0; margin: 57rpx 0;
background-color: #ccc; background-color: #ccc;
} }
.code-use-time { .code-use-time {
color: #959DA9; color: #959da9;
font-size: 26rpx; font-size: 26rpx;
} }
.look-order { .look-order {
margin-top: 32rpx; margin-top: 32rpx;
} }
.look-order image{
.look-order image {
margin-left: 8rpx; margin-left: 8rpx;
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
}
/* 使用须知 */
.notice-detail {
z-index: 1700;
position: fixed;
left: 0;
bottom: 0;
width: 750rpx;
height: 100%;
padding-bottom: 48rpx;
background: rgba(0, 0, 0, .6);
}
.notice-item {
position: absolute;
left: 0;
bottom: -950rpx;
width: 750rpx;
height: 70%;
padding: 130rpx 40rpx 50rpx 40rpx;
border-radius: 24px 24px 0px 0px;
background: #FFFFFF;
}
.notice-title {
position: absolute;
top: 50rpx;
width: 670rpx;
height: 130rpx;
}
.notice-title text {
height: 58rpx;
font-size: 42rpx;
font-weight: 500;
line-height: 58rpx;
color: #15191F;
}
.notice-rich {
width: 670rpx;
height: 100%;
overflow-y: scroll;
} }
\ No newline at end of file
pages/mine/home/home.js
...@@ -21,6 +21,8 @@ Page({ ...@@ -21,6 +21,8 @@ Page({
}, },
navigationScroll: 0, navigationScroll: 0,
appStatus: App.globalData.appStatus,
isCheckPermission: false, isCheckPermission: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
imageResourcesBase: App.globalData.appResourcesBase, imageResourcesBase: App.globalData.appResourcesBase,
...@@ -79,7 +81,15 @@ Page({ ...@@ -79,7 +81,15 @@ Page({
authInfo: null, authInfo: null,
goodTypeCountData: {}, goodTypeCountData: {},
enrollSubscribeData: {}, enrollSubscribeData: {},
isLoadingOrder: true isLoadingOrder: true,
},
onLoad: function (options) {
},
onShow: function () {
this.setUserInfo()
}, },
// 去活动预约列表 // 去活动预约列表
...@@ -111,16 +121,6 @@ Page({ ...@@ -111,16 +121,6 @@ Page({
}) })
}, },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
onShow: function () {
this.setUserInfo()
},
// 查看积分明细 // 查看积分明细
goIntegralDetail(event) { goIntegralDetail(event) {
let integral = event.currentTarget.dataset.integral let integral = event.currentTarget.dataset.integral
...@@ -510,17 +510,28 @@ Page({ ...@@ -510,17 +510,28 @@ Page({
// 二期代码 // 二期代码
onOrder: function () { onOrder: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
if (!funcUserInfo.isSignIn) return if (funcUserInfo.isSignIn) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/mine/order/order' url: '/pages/mine/order/order'
}) })
} else {
wx.navigateTo({
url: '/pages/login/login'
})
}
}, },
onAppointment: function () { onAppointment: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
if (!funcUserInfo.isSignIn) return if (funcUserInfo.isSignIn) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/mine/appointment/appointment' url: '/pages/mine/appointment/appointment'
}) })
} else {
wx.navigateTo({
url: '/pages/login/login'
})
}
}, },
handleToCard: function () { handleToCard: function () {
console.log('onOrder') console.log('onOrder')
......
pages/mine/home/home.wxml
...@@ -84,138 +84,141 @@ ...@@ -84,138 +84,141 @@
</view> </view>
<view class="menu"> <view class="menu">
<!-- 订单 --> <block wx:if="{{appStatus}}">
<view class="order-activity"> <!-- 订单 -->
<view class="order-activity-title-wrapper row con-b align-c"> <view class="order-activity">
<view class="order-activity-title row align-c"> <view class="order-activity-title-wrapper row con-b align-c">
<text>我的订单</text> <view class="order-activity-title row align-c">
</view> <text>我的订单</text>
<view class="order-activity-all row align-c" bindtap="onOrder">
<text>查看全部</text>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</view>
<!-- 订单分类icno -->
<view class="order-activity-icon-list row con-b">
<view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['3'] > 0}}">
{{goodTypeCountData['3'] > 99 ? '···' : goodTypeCountData['3']}}</view>
</view>
<text>门票</text>
</view>
<view class="order-activity-icon-wrapper col align-c" data-type="5" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['5'] > 0}}">
{{goodTypeCountData['5'] > 99 ? '···' : goodTypeCountData['5']}}</view>
</view> </view>
<text>餐饮</text> <view class="order-activity-all row align-c" bindtap="onOrder">
</view> <text>查看全部</text>
<view class="order-activity-icon-wrapper col align-c" data-type="-2" bindtap="goOrderByclass"> <image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['-2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['-2'] > 0}}">
{{goodTypeCountData['-2'] > 99 ? '···' : goodTypeCountData['-2']}}</view>
</view> </view>
<text>影票</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c" data-type="2" bindtap="goOrderByclass"> <!-- 订单分类icno -->
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon-list row con-b">
<image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image> <view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-icon row con-c align-c">
wx:if="{{goodTypeCountData['2'] > 0}}"> <image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image>
{{goodTypeCountData['2'] > 99 ? '···' : goodTypeCountData['2']}}</view> <view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}"
</view> wx:if="{{goodTypeCountData['3'] > 0}}">
<text>SPA</text> {{goodTypeCountData['3'] > 99 ? '···' : goodTypeCountData['3']}}</view>
</view>
<view class="order-activity-icon-wrapper col align-c" data-type="4" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['4'] > 0}}">
{{goodTypeCountData['4'] > 99 ? '···' : goodTypeCountData['4']}}</view>
</view>
<text>文创</text>
</view>
</view>
<view class="more-wrapper" wx:if="{{myOrder}}}">
<!-- 订单卡片 -->
<!-- 年卡 -->
<view class="pass-wrapper" wx:if="{{myOrder.passOrder&&myOrder.passOrder.length>0}}"
bindtap="handleToCard">
<image wx:if="{{ myOrder.passOrder[0].cardType==1}}" class="card-bg year-bg"
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
<image wx:elif="{{myOrder.passOrder[0].cardType==2}}" class="card-bg month-bg"
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image>
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ myOrder.passOrder[0].logo}}"></image>
</view> </view>
<text>门票</text>
<text>{{myOrder.passOrder[0].officeName}}</text>
</view> </view>
<view class="pass-title"> <view class="order-activity-icon-wrapper col align-c" data-type="5" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].name}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['5'] > 0}}">
{{goodTypeCountData['5'] > 99 ? '···' : goodTypeCountData['5']}}</view>
</view>
<text>餐饮</text>
</view> </view>
<view class="pass-time"> <view class="order-activity-icon-wrapper col align-c" data-type="-2" bindtap="goOrderByclass">
<text>有效期至{{myOrder.passOrder[0].expireTime}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['-2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['-2'] > 0}}">
{{goodTypeCountData['-2'] > 99 ? '···' : goodTypeCountData['-2']}}</view>
</view>
<text>影票</text>
</view> </view>
<view class="pass-name"> <view class="order-activity-icon-wrapper col align-c" data-type="2" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].personName}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['2'] > 0}}">
{{goodTypeCountData['2'] > 99 ? '···' : goodTypeCountData['2']}}</view>
</view>
<text>SPA</text>
</view> </view>
<view class="pass-idNum"> <view class="order-activity-icon-wrapper col align-c" data-type="4" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].identityCard}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['4'] > 0}}">
{{goodTypeCountData['4'] > 99 ? '···' : goodTypeCountData['4']}}</view>
</view>
<text>文创</text>
</view> </view>
</view> </view>
<view class="more-wrapper" wx:if="{{myOrder}}}">
<!-- 商品 --> <!-- 订单卡片 -->
<block wx:if="myOrder.artOrder.orderList.length>0"> <!-- 年卡 -->
<view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this" <view class="pass-wrapper" wx:if="{{myOrder.passOrder&&myOrder.passOrder.length>0}}"
data-item="{{item}}" bindtap="onOrderDetail"> bindtap="handleToCard">
<view class="goods-logo-wrapper row align-c"> <image wx:if="{{ myOrder.passOrder[0].cardType==1}}" class="card-bg year-bg"
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
<image wx:elif="{{myOrder.passOrder[0].cardType==2}}" class="card-bg month-bg"
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image>
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box"> <view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image> <image mode="aspectFit" src="{{imageResourcesBase+ myOrder.passOrder[0].logo}}"></image>
</view> </view>
<text>{{item.officeName}}</text>
</view>
<view class="goods-content row align-c">
<block wx:if="{{item.smOrderDetails.length>3}}">
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<block wx:else>
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text> <text>{{myOrder.passOrder[0].officeName}}</text>
</view> </view>
<view class="goods-footer row align-c con-b"> <view class="pass-title">
<text>有效期{{item.expireTimeEnd}}</text> <text>{{myOrder.passOrder[0].name}}</text>
<text>共{{item.smOrderDetails.length}}件</text> </view>
<view class="pass-time">
<text>有效期至{{myOrder.passOrder[0].expireTime}}</text>
</view>
<view class="pass-name">
<text>{{myOrder.passOrder[0].personName}}</text>
</view>
<view class="pass-idNum">
<text>{{myOrder.passOrder[0].identityCard}}</text>
</view> </view>
</view> </view>
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder&&orderListBackup.length>1}}"> <!-- 商品 -->
<text wx:if="{{!showMoreOrder}}">展开更多</text> <block wx:if="myOrder.artOrder.orderList.length>0">
<text wx:else>收起</text> <view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this"
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image> data-item="{{item}}" bindtap="onOrderDetail">
<image wx:else src="{{imageBase + 'up.png'}}"></image> <view class="goods-logo-wrapper row align-c">
</view> <view class="logo-box">
</block> <image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image>
</view>
<text>{{item.officeName}}</text>
</view>
<view class="goods-content row align-c">
<block wx:if="{{item.smOrderDetails.length>3}}">
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<block wx:else>
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view>
<view class="goods-footer row align-c con-b">
<text>有效期{{item.expireTimeEnd}}</text>
<text>共{{item.smOrderDetails.length}}件</text>
</view>
</view>
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder&&orderListBackup.length>1}}">
<text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:else>收起</text>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
<image wx:else src="{{imageBase + 'up.png'}}"></image>
</view>
</block>
</view>
</view> </view>
</view> </block>
<!-- 预约 --> <!-- 预约 -->
<view class="order-activity"> <view class="order-activity">
<view class="order-activity-title-wrapper row con-b align-c"> <view class="order-activity-title-wrapper row con-b align-c">
......
pages/mine/order/order.js
...@@ -550,15 +550,53 @@ Page({ ...@@ -550,15 +550,53 @@ Page({
* @returns * @returns
*/ */
onOrderAgain: function (event) { onOrderAgain: function (event) {
let item = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
console.log(funcItem)
let funcUrl = ''
App.setShopInfo(funcItem.shopAppId, funcItem.commodityType)
switch (funcItem.shopAppId) {
// 海错图
case 1:
if (funcItem.commodityType === 1) funcUrl = '/pages/commodity/project-detail/project-detail'
if (funcItem.commodityType === 3) funcUrl = '/pages/commodity/project-detail/project-detail'
break
// 星空影院
case 2:
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'
break
// 原野MOJITO
case 4:
if (funcItem.commodityType === 5) funcUrl = '/pages/commodity/menu-food/menu-food'
break
// 拾光花坊
case 5:
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
}
console.log(item, '再次下单')
let commodityType = item.commodityType
let shopAppId = item.shopAppId// wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
console.log(commodityType, 'commodityType------------------------');
console.log(shopAppId, 'shopAppId------------------------');
wx.navigateTo({ wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`, url: funcUrl,
}) })
}, },
......
pages/mine/order/order.wxml
<!-- 订单分类选择 --> <!-- 订单分类选择 -->
<view class="navigation-order row con-b align-c"> <view class="navigation-order row con-b align-c">
<image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></image> <image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></image>
<view class="order-type row con-c align-c" bindtap="onOrderType"> <view class="order-type row con-c align-c" bindtap="onOrderType">
<text>{{orderTypeTitle}}</text> <text>{{orderTypeTitle}}</text>
<image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
</view> </view>
<image src=""></image> <image src=""></image>
</view> </view>
<!-- 订单状态选择 --> <!-- 订单状态选择 -->
<view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType"> <view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType">
<view> <view>
<view class="order-type-row row con-b align-c"> <view class="order-type-row row con-b align-c">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{index < 3}}" <view wx:if="{{index < 3}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}" class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection"> data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</block> </block>
</view> </view>
<view class="order-type-row row con-b align-c"> <view class="order-type-row row con-b align-c">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{3 <= index && index < 6}}" <view wx:if="{{3 <= index && index < 6}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}" class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection"> data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</block> </block>
</view> </view>
<!-- <view class="order-type-row row con-b align-c"> </view>
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{6 <= index && index < 9}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
<text>{{item.name}}</text>
</view>
</block>
</view> -->
</view>
</view> </view>
<!-- 订单列表 --> <!-- 订单列表 -->
<view class="container-order"> <view class="container-order">
<view class="status row con-b align-c fixed-tab"> <view class="status row con-b align-c fixed-tab">
<block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="status-item row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}" <view class="status-item row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}"
data-type="{{index}}" bindtap="onSelectionStatus"> data-type="{{index}}" bindtap="onSelectionStatus">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</block> </block>
</view> </view>
<block wx:if="{{orderList.length>0}}"> <block wx:if="{{orderList.length>0}}">
<view class="order-list col con-c align-c"> <view class="order-list col con-c align-c">
<block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="order-list-item col align-c" data-item="{{item}}" bindtap="onOrderDetail"> <view class="order-list-item col align-c" data-item="{{item}}" bindtap="onOrderDetail">
<view class="order-list-item-title row con-b align-c"> <view class="order-list-item-title row con-b align-c">
<view class="row align-c"> <view class="row align-c">
<view class="logo-box"> <view class="logo-box">
<image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image> <image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image>
</view> </view>
<text>{{item.shopName}}</text> <text>{{item.shopName}}</text>
</view> </view>
<view> <view>
<text class="warning" wx:if="{{item.status === 0}}">待付款</text> <text class="warning" wx:if="{{item.status === 0}}">待付款</text>
<text class="warning" wx:if="{{item.status === 2}}">待使用</text> <text class="warning" wx:if="{{item.status === 2}}">待使用</text>
<text class="warning" wx:if="{{item.status === 3}}">待评价</text> <text class="warning" wx:if="{{item.status === 3}}">待评价</text>
<text class="message" wx:if="{{item.status === -1}}">已取消</text> <text class="message" wx:if="{{item.status === -1}}">已取消</text>
<text class="message" wx:if="{{item.status === 4}}">已过期</text> <text class="message" wx:if="{{item.status === 4}}">已过期</text>
<text class="message" wx:if="{{item.status === 6}}">已评价</text> <text class="message" wx:if="{{item.status === 6}}">已评价</text>
</view> </view>
</view> </view>
<!-- 商品数量样式一 --> <!-- 商品数量样式一 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length === 1}}"> <view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length === 1}}">
<image class="cover" src="{{item.commodity[0].cover}}"></image> <image class="cover" src="{{item.commodity[0].cover}}"></image>
<text class="name">{{item.commodity[0].name}}</text> <text class="name">{{item.commodity[0].name}}</text>
<text class="total">{{'x ' + item.total}}</text> <text class="total">{{'x ' + item.total}}</text>
</view> </view>
<!-- 商品数量样式二 --> <!-- 商品数量样式二 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}"> <view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}">
<block wx:if="{{item.commodity.length>3}}"> <block wx:if="{{item.commodity.length>3}}">
<block wx:for="{{item.commoditySlice3}}" wx:for-index="commodityIndex" wx:for-item="commodityItem" <block wx:for="{{item.commoditySlice3}}" wx:for-index="commodityIndex" wx:for-item="commodityItem"
wx:key="commodityIndex"> wx:key="commodityIndex">
<image class="cover" src="{{commodityItem.cover}}"></image> <image class="cover" src="{{commodityItem.cover}}"></image>
</block> </block>
</block> </block>
<block wx:else> <block wx:else>
<block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem" <block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem"
wx:key="commodityIndex"> wx:key="commodityIndex">
<image class="cover" src="{{commodityItem.cover}}"></image> <image class="cover" src="{{commodityItem.cover}}"></image>
</block> </block>
</block> </block>
<text class="total">{{'共 ' + item.commodityBackup.length + ' 件'}}</text> <text class="total">{{'共 ' + item.commodityBackup.length + ' 件'}}</text>
</view> </view>
<view class="order-list-item-operation row con-b align-c"> <view class="order-list-item-operation row con-b align-c">
<view class="row align-c"> <view class="row align-c">
<text class="amount">实付:</text> <text class="amount">实付:</text>
<text class="amount">¥{{item.amount}}</text> <text class="amount">¥{{item.amount}}</text>
</view> </view>
<view class="row align-c"> <view class="row align-c">
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-index="{{index}}" <button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button> <button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}" <button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button> <button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c align-c" <button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
data-item="{{item}}" catchtap="onOrderPay">去支付</button> <button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c align-c" </view>
data-item="{{item}}" catchtap="onOrderUse">去使用</button> </view>
<button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c align-c" </view>
data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button> </block>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c align-c" </view>
data-item="{{item}}" catchtap="onOrderAgain">再次下单</button> </block>
</view> <block wx:else>
</view> <view class="empty col con-c align-c" wx:if="{{!isLoading}}">
</view> <image class="empty-cart" src=""></image>
</block> <view class="empty-title">
</view> <text>{{ statusActive!=0? '暂无相关订单':'暂无订单'}}</text>
</block> </view>
<block wx:else> <view class="empty-btn" bindtap="onToBuy" wx:if="{{statusActive===0}}">
<view class="empty col con-c align-c" wx:if="{{!isLoading}}"> <text>去逛逛</text>
<image class="empty-cart" src=""></image> </view>
<view class="empty-title"> </view>
<text>{{ statusActive!=0? '暂无相关订单':'暂无订单'}}</text> </block>
</view>
<view class="empty-btn" bindtap="onToBuy" wx:if="{{statusActive===0}}">
<text>去逛逛</text>
</view>
</view>
</block>
</view> </view>
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<view class="code-mask row con-c align-c" wx:if="{{winCode}}"> <view class="code-mask row con-c align-c" wx:if="{{winCode}}">
<view class="code col con-c align-c"> <view class="code col con-c align-c">
<view class="code-tip col con-c align-c"> <view class="code-tip col con-c align-c">
<text>{{'请将券码出示给门店核销人员'}}</text> <text>{{'请将券码出示给门店核销人员'}}</text>
<text>{{'请将券码出示给门店核销人员'}}</text> <text>{{'请将券码出示给门店核销人员'}}</text>
</view> </view>
<view class="code-info col con-c align-c"> <view class="code-info col con-c align-c">
<view class="code-info-title"> <view class="code-info-title">
<text>{{'《 阿凡达 》电影票'}}</text> <text>{{'《 阿凡达 》电影票'}}</text>
</view> </view>
<view class="code-info-qrcode"> <view class="code-info-qrcode">
<image src="{{'data:image/png;base64,' + code.codeBase64}}"></image> <image src="{{'data:image/png;base64,' + code.codeBase64}}"></image>
</view> </view>
<view class="code-info-copy row con-b align-c"> <view class="code-info-copy row con-b align-c">
<text>券码</text> <text>券码</text>
<text>{{'2719 7092 0925'}}</text> <text>{{'2719 7092 0925'}}</text>
<text>复制</text> <text>复制</text>
</view> </view>
</view> </view>
<view class="code-close row con-c align-c" bindtap="onCodeClose"> <view class="code-close row con-c align-c" bindtap="onCodeClose">
<image src="{{imageBase + 'icon/close-1.png'}}"></image> <image src="{{imageBase + 'icon/close-1.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
<!-- 确认框 --> <!-- 确认框 -->
<l-dialog /> <l-dialog />
\ No newline at end of file
pages/mine/order/order.wxss
page { page {
min-height: 100vh; min-height: 100vh;
background: #F3F4F6; background: #f3f4f6;
} }
.fixed-tab { .fixed-tab {
...@@ -8,7 +8,6 @@ page { ...@@ -8,7 +8,6 @@ page {
background: #fff; background: #fff;
top: 176rpx; top: 176rpx;
z-index: 99; z-index: 99;
} }
.navigation-order { .navigation-order {
...@@ -18,7 +17,7 @@ page { ...@@ -18,7 +17,7 @@ page {
left: 0; left: 0;
width: 750rpx; width: 750rpx;
height: 176rpx; height: 176rpx;
background: #FFFFFF; background: #fff;
} }
.navigation-order image { .navigation-order image {
...@@ -30,7 +29,7 @@ page { ...@@ -30,7 +29,7 @@ page {
width: 200rpx; width: 200rpx;
height: 64rpx; height: 64rpx;
border-radius: 32rpx; border-radius: 32rpx;
border: 1px solid #E2E7EF; border: 1px solid #e2e7ef;
} }
.order-type text { .order-type text {
...@@ -44,6 +43,7 @@ page { ...@@ -44,6 +43,7 @@ page {
} }
/* 订单类型选择 */ /* 订单类型选择 */
.order-type-selection { .order-type-selection {
z-index: 1700; z-index: 1700;
position: fixed; position: fixed;
...@@ -51,20 +51,19 @@ page { ...@@ -51,20 +51,19 @@ page {
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, .65); background: rgba(0, 0, 0, 0.65);
} }
.order-type-selection>view { .order-type-selection > view {
width: 750rpx; width: 750rpx;
min-height: 240rpx; min-height: 240rpx;
padding-top: 10rpx; padding-top: 10rpx;
border-radius: 0px 0px 24rpx 24rpx; border-radius: 0px 0px 24rpx 24rpx;
background: #FFFFFF; background: #fff;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #959DA9; color: #959da9;
} }
.order-type-row { .order-type-row {
...@@ -77,18 +76,17 @@ page { ...@@ -77,18 +76,17 @@ page {
width: 192rpx; width: 192rpx;
height: 64rpx; height: 64rpx;
border-radius: 32rpx; border-radius: 32rpx;
background: #F2F3F5; background: #f2f3f5;
} }
.order-type-item-active { .order-type-item-active {
background: #86C5E1; background: #86c5e1;
color: #FFFFFF; color: #fff;
} }
.container-order { .container-order {
/* margin-top: 170rpx; */ /* margin-top: 170rpx; */
padding-top: 288rpx; padding-top: 288rpx;
} }
.container { .container {
...@@ -96,11 +94,12 @@ page { ...@@ -96,11 +94,12 @@ page {
} }
/* 状态筛选菜单 */ /* 状态筛选菜单 */
.status { .status {
width: 750rpx; width: 750rpx;
height: 112rpx; height: 112rpx;
padding: 0 34rpx 1rpx 64rpx; padding: 0 34rpx 1rpx 64rpx;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #e2e7ef solid;
} }
.status-item { .status-item {
...@@ -108,17 +107,18 @@ page { ...@@ -108,17 +107,18 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
border-bottom: 4px #FFFFFF solid; border-bottom: 4px #fff solid;
color: #959DA9; color: #959da9;
} }
.status-item-active { .status-item-active {
height: 112rpx; height: 112rpx;
border-bottom: 4px #000000 solid; border-bottom: 4px #000 solid;
color: #000000; color: #000;
} }
/* 订单列表 */ /* 订单列表 */
.order-list { .order-list {
width: 750rpx; width: 750rpx;
height: 100%; height: 100%;
...@@ -131,7 +131,7 @@ page { ...@@ -131,7 +131,7 @@ page {
margin-top: 48rpx; margin-top: 48rpx;
padding: 20rpx 0 40rpx 0; padding: 20rpx 0 40rpx 0;
border-radius: 4rpx; border-radius: 4rpx;
background: #FFFFFF; background: #fff;
} }
.order-list-item>view { .order-list-item>view {
...@@ -140,12 +140,12 @@ page { ...@@ -140,12 +140,12 @@ page {
.order-list-item-title .warning { .order-list-item-title .warning {
font-weight: 800; font-weight: 800;
color: #E66060; color: #e66060;
} }
.order-list-item-title .message { .order-list-item-title .message {
font-weight: 800; font-weight: 800;
color: #C2C7CF; color: #c2c7cf;
} }
.order-list-item-title image { .order-list-item-title image {
...@@ -165,7 +165,7 @@ page { ...@@ -165,7 +165,7 @@ page {
height: 140rpx; height: 140rpx;
margin-right: 20rpx; margin-right: 20rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #999999; background: #999;
} }
.order-list-item-service .name { .order-list-item-service .name {
...@@ -181,7 +181,7 @@ page { ...@@ -181,7 +181,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
color: #959DA9; color: #959da9;
} }
.order-list-item-operation .amount { .order-list-item-operation .amount {
...@@ -189,19 +189,18 @@ page { ...@@ -189,19 +189,18 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
.order-list-item-operation .delete { .order-list-item-operation .delete {
width: 120rpx; width: 120rpx;
height: 56rpx; height: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
border: 1px solid #C2C7CF; border: 1px solid #c2c7cf;
font-size: 22rpx; font-size: 22rpx;
font-weight: 500; font-weight: 500;
line-height: 32rpx; line-height: 32rpx;
color: #656E7B; color: #656e7b;
} }
.order-list-item-operation .again { .order-list-item-operation .again {
...@@ -209,22 +208,22 @@ page { ...@@ -209,22 +208,22 @@ page {
height: 56rpx; height: 56rpx;
margin-left: 20rpx; margin-left: 20rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #86C5E1; background: #86c5e1;
font-size: 22rpx; font-size: 22rpx;
font-weight: 500; font-weight: 500;
line-height: 32rpx; line-height: 32rpx;
color: #FFFFFF; color: #fff;
} }
/* 券码 */ /* 券码 */
.code-mask { .code-mask {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, .6); background: rgba(0, 0, 0, 0.6);
} }
.code { .code {
...@@ -236,7 +235,7 @@ page { ...@@ -236,7 +235,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #FFFFFF; color: #fff;
} }
.code-tip text:nth-child(2) { .code-tip text:nth-child(2) {
...@@ -245,7 +244,7 @@ page { ...@@ -245,7 +244,7 @@ page {
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #FFFFFF; color: #fff;
} }
.code-info-qrcode { .code-info-qrcode {
...@@ -263,7 +262,7 @@ page { ...@@ -263,7 +262,7 @@ page {
height: 666rpx; height: 666rpx;
margin-top: 56rpx; margin-top: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #FFFFFF; background: #fff;
} }
.code-info-copy { .code-info-copy {
...@@ -272,7 +271,7 @@ page { ...@@ -272,7 +271,7 @@ page {
margin-top: 56rpx; margin-top: 56rpx;
padding: 0 24rpx; padding: 0 24rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #F2F3F5; background: #f2f3f5;
} }
.code-info-copy text:nth-child(1) { .code-info-copy text:nth-child(1) {
...@@ -280,7 +279,7 @@ page { ...@@ -280,7 +279,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #959DA9; color: #959da9;
} }
.code-info-copy text:nth-child(2) { .code-info-copy text:nth-child(2) {
...@@ -288,7 +287,7 @@ page { ...@@ -288,7 +287,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
.code-info-copy text:nth-child(3) { .code-info-copy text:nth-child(3) {
...@@ -296,7 +295,7 @@ page { ...@@ -296,7 +295,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #5DB5DD; color: #5db5dd;
} }
.code-close { .code-close {
...@@ -304,7 +303,7 @@ page { ...@@ -304,7 +303,7 @@ page {
height: 80rpx; height: 80rpx;
margin-top: 48rpx; margin-top: 48rpx;
border-radius: 50%; border-radius: 50%;
background: #A9A8A7; background: #a9a8a7;
} }
.code-close>image { .code-close>image {
...@@ -312,8 +311,6 @@ page { ...@@ -312,8 +311,6 @@ page {
height: 48rpx; height: 48rpx;
} }
.empty-cart { .empty-cart {
width: 176rpx; width: 176rpx;
height: 176rpx; height: 176rpx;
...@@ -322,7 +319,7 @@ page { ...@@ -322,7 +319,7 @@ page {
.empty-title { .empty-title {
margin-top: 64rpx; margin-top: 64rpx;
color: #959DA9; color: #959da9;
font-size: 38rpx; font-size: 38rpx;
line-height: 52rpx; line-height: 52rpx;
} }
...@@ -335,7 +332,7 @@ page { ...@@ -335,7 +332,7 @@ page {
font-size: 30rpx; font-size: 30rpx;
line-height: 96rpx; line-height: 96rpx;
text-align: center; text-align: center;
background: #86C5E1; background: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
...@@ -348,6 +345,6 @@ page { ...@@ -348,6 +345,6 @@ page {
} }
.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/pay/order-detail/order-detail.wxss
/* 订单状态 */ /* 订单状态 */
.state { .state {
width: 750rpx; width: 750rpx;
} }
.container { .container {
margin-top: 160rpx; margin-top: 160rpx;
} }
.state-content { .state-content {
width: 670rpx; width: 670rpx;
height: 240rpx; height: 240rpx;
padding: 0 32rpx; padding: 0 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #F3E1E1; background: #f3e1e1;
} }
.state-content-invalid { .state-content-invalid {
background: #ECF4F8; background: #ecf4f8;
} }
.state-content-title text { .state-content-title text {
height: 76rpx; height: 76rpx;
font-size: 54rpx; font-size: 54rpx;
font-weight: 500; font-weight: 500;
line-height: 76rpx; line-height: 76rpx;
color: #15191F; color: #15191f;
} }
.state-content-tip { .state-content-tip {
margin-top: 24rpx; margin-top: 24rpx;
} }
.state-content-tip text { .state-content-tip text {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
/* 订单信息 */ /* 订单信息 */
.info { .info {
margin-top: 50rpx; margin-top: 50rpx;
} }
.info-content { .info-content {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
min-height: 206rpx; min-height: 206rpx;
padding: 48rpx 32rpx; padding: 48rpx 32rpx;
background: #F3F4F6; background: #f3f4f6;
border-radius: 4rpx; border-radius: 4rpx;
overflow: hidden; overflow: hidden;
} }
.info-content-item { .info-content-item {
position: relative; position: relative;
margin-top: 16rpx; margin-top: 16rpx;
} }
.info-content-item-label { .info-content-item-label {
width: 104rpx; width: 104rpx;
height: 36rpx; height: 36rpx;
margin-right: 48rpx; margin-right: 48rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
color: #959DA9; color: #959da9;
} }
.info-content-item-title { .info-content-item-title {
position: relative; position: relative;
top: -8rpx; top: -8rpx;
width: 454rpx; width: 454rpx;
min-height: 52rpx; min-height: 52rpx;
word-wrap: break-word;
word-wrap: break-word; font-size: 38rpx;
font-size: 38rpx; font-weight: 500;
font-weight: 500; line-height: 52rpx;
line-height: 52rpx; color: #15191f;
color: #15191F;
} }
.info-content-item-describe { .info-content-item-describe {
height: 42rpx; height: 42rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
color: #15191F; color: #15191f;
} }
.info-content-item-tip { .info-content-item-tip {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
.info-line { .info-line {
position: relative; position: relative;
background: #F3F4F6; background: #f3f4f6;
} }
.info-line-line { .info-line-line {
width: 670rpx; width: 670rpx;
height: 1px; height: 1px;
border: 1px #E2E7EF dashed; border: 1px #e2e7ef dashed;
} }
.info-line-point-left { .info-line-point-left {
position: absolute; position: absolute;
left: -18rpx; left: -18rpx;
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background: #FFFFFF; background: #fff;
} }
.info-line-point-right { .info-line-point-right {
position: absolute; position: absolute;
right: -18rpx; right: -18rpx;
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background: #FFFFFF; background: #fff;
} }
.info-code { .info-code {
width: 670rpx; width: 670rpx;
min-height: 330rpx; min-height: 330rpx;
background: #F3F4F6; background: #f3f4f6;
} }
.info-code text:nth-child(1) { .info-code text:nth-child(1) {
height: 48rpx; height: 48rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
line-height: 48rpx; line-height: 48rpx;
color: #15191F; color: #15191f;
} }
.info-code button { .info-code button {
width: 606rpx; width: 606rpx;
height: 96rpx; height: 96rpx;
margin-top: 40rpx; margin-top: 40rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #86C5E1; background: #86c5e1;
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) {
height: 36rpx; height: 36rpx;
margin-top: 40rpx; margin-top: 40rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 36rpx; line-height: 36rpx;
color: #959DAA; color: #959daa;
} }
/* 商品信息 */ /* 商品信息 */
.commodity { .commodity {
margin: 64rpx 40rpx 0 40rpx; margin: 64rpx 40rpx 0 40rpx;
} }
.commodity-title { .commodity-title {
height: 48rpx; height: 48rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
line-height: 48rpx; line-height: 48rpx;
color: #15191F; color: #15191f;
} }
.commodity-list { .commodity-list {
width: 670rpx; width: 670rpx;
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: #f3f4f6;
} }
.commodity-shop-info>image { .commodity-shop-info>image {
max-width: 62rpx; max-width: 62rpx;
max-height: 62rpx; max-height: 62rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.commodity-item { .commodity-item {
width: 606rpx; width: 606rpx;
height: 184rpx; height: 184rpx;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #e2e7ef solid;
} }
.commodity-item>image { .commodity-item>image {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
margin-right: 24rpx; margin-right: 24rpx;
} }
.commodity-item-info { .commodity-item-info {
width: 290rpx; width: 290rpx;
margin-right: 32rpx; margin-right: 32rpx;
} }
.commodity-item-operation>button { .commodity-item-operation>button {
width: 120rpx; width: 120rpx;
height: 56rpx; height: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #86C5E1; background: #86c5e1;
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: #FFFFFF; color: #fff;
} }
.commodity-list .commodity-item:last-child { .commodity-list .commodity-item:last-child {
border: none; border: none;
} }
/* 订单提示 */ /* 订单提示 */
.tip { .tip {
margin: 74rpx 40rpx 70rpx 40rpx; margin: 74rpx 40rpx 70rpx 40rpx;
} }
.tip-pay { .tip-pay {
width: 670rpx; width: 670rpx;
} }
.tip-pay-title text { .tip-pay-title text {
height: 48rpx; height: 48rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 800; font-weight: 800;
line-height: 48rpx; line-height: 48rpx;
color: #15191F; color: #15191f;
} }
.tip-pay-amount text:nth-child(1) { .tip-pay-amount text:nth-child(1) {
height: 58rpx; height: 58rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
line-height: 48rpx; line-height: 48rpx;
color: #5DB5DD; color: #5db5dd;
} }
.tip-pay-amount text:nth-child(2) { .tip-pay-amount text:nth-child(2) {
height: 58rpx; height: 58rpx;
font-size: 42rpx; font-size: 42rpx;
font-weight: 500; font-weight: 500;
line-height: 48rpx; line-height: 48rpx;
color: #5DB5DD; color: #5db5dd;
} }
.tip-describe { .tip-describe {
width: 670rpx; width: 670rpx;
height: 168rpx; height: 168rpx;
margin-top: 32rpx; margin-top: 32rpx;
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #959DA9; color: #959da9;
} }
/* 券码 */ /* 券码 */
.code-mask { .code-mask {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, .6); background: rgba(0, 0, 0, 0.6);
} }
.code { .code {
padding: 56rpx 40rpx 64rpx 40rpx; padding: 56rpx 40rpx 64rpx 40rpx;
} }
.code-tip text:nth-child(1) { .code-tip text:nth-child(1) {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #FFFFFF; color: #fff;
} }
.code-tip text:nth-child(2) { .code-tip text:nth-child(2) {
height: 42rpx; height: 42rpx;
margin-top: 28rpx; margin-top: 28rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #FFFFFF; color: #fff;
} }
.code-info-qrcode { .code-info-qrcode {
margin-top: 56rpx; margin-top: 56rpx;
} }
.code-info-qrcode>image { .code-info-qrcode>image {
display: block; display: block;
width: 296rpx; width: 296rpx;
height: 296rpx; height: 296rpx;
} }
.code-info { .code-info {
width: 526rpx; width: 526rpx;
height: 666rpx; height: 666rpx;
margin-top: 56rpx; margin-top: 56rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #FFFFFF; background: #fff;
} }
.code-info-copy { .code-info-copy {
width: 446rpx; width: 446rpx;
height: 96rpx; height: 96rpx;
margin-top: 56rpx; margin-top: 56rpx;
padding: 0 24rpx; padding: 0 24rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #F2F3F5; background: #f2f3f5;
} }
.code-info-copy text:nth-child(1) { .code-info-copy text:nth-child(1) {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #959DA9; color: #959da9;
} }
.code-info-copy text:nth-child(2) { .code-info-copy text:nth-child(2) {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #15191F; color: #15191f;
} }
.code-info-copy text:nth-child(3) { .code-info-copy text:nth-child(3) {
height: 36rpx; height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
color: #5DB5DD; color: #5db5dd;
} }
.code-close { .code-close {
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
margin-top: 48rpx; margin-top: 48rpx;
border-radius: 50%; border-radius: 50%;
background: #A9A8A7; background: #a9a8a7;
} }
.code-close>image { .code-close>image {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
} }
/* 印章图 */ /* 印章图 */
.seal-shot { .seal-shot {
width: 166rpx; width: 166rpx;
height: 166rpx; height: 166rpx;
position: absolute; position: absolute;
right: -30rpx; right: -30rpx;
bottom: -30rpx; bottom: -30rpx;
} }
.seal-long { .seal-long {
width: 166rpx; width: 166rpx;
height: 200rpx; height: 200rpx;
position: absolute; position: absolute;
right: 0; right: 0;
bottom: -30rpx; bottom: -30rpx;
} }
.p-relative { .p-relative {
position: relative; position: relative;
} }
/* 扫码弹窗 */ /* 扫码弹窗 */
.order-status { .order-status {
width: 670rpx; width: 670rpx;
height: 240rpx; height: 240rpx;
margin: 64rpx auto 0; margin: 64rpx auto 0;
padding-left: 32rpx; padding-left: 32rpx;
color: #15191F; color: #15191f;
background-color: #ECF4F8; background-color: #ecf4f8;
} }
.status-text { .status-text {
font-size: 54rpx; font-size: 54rpx;
font-weight: 600; font-weight: 600;
} }
.status-tips { .status-tips {
margin-top: 24rpx; margin-top: 24rpx;
} }
.bgPink { .bgPink {
background-color: #F3E1E1; background-color: #f3e1e1;
} }
.ticket-wrapper { .ticket-wrapper {
width: 670rpx; width: 670rpx;
margin: 64rpx auto 0; margin: 64rpx auto 0;
} }
.ticket-main { .ticket-main {
position: relative; position: relative;
width: 100%; width: 100%;
padding: 48rpx 32rpx 46rpx; padding: 48rpx 32rpx 46rpx;
background-color: #F3F4F6; background-color: #f3f4f6;
border-bottom: 1px dashed #E2E7EF; border-bottom: 1px dashed #e2e7ef;
} }
.ticket-left { .ticket-left {
width: 152rpx; width: 152rpx;
display: table-cell; display: table-cell;
vertical-align: bottom; vertical-align: bottom;
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959da9;
} }
.ticket-right { .ticket-right {
flex: 1; flex: 1;
font-size: 26rpx; font-size: 26rpx;
} }
.ticket-store { .ticket-store {
font-size: 38rpx; font-size: 38rpx;
color: #15191F; color: #15191f;
font-weight: 600; font-weight: 600;
} }
.ticket-row-time, .ticket-row-time, .ticket-row-phone {
.ticket-row-phone { margin-top: 16rpx;
margin-top: 16rpx;
} }
.ticket-time, .ticket-time, .ticket-address, .ticket-date {
.ticket-address, font-size: 30rpx;
.ticket-date { line-height: 42rpx;
font-size: 30rpx;
line-height: 42rpx;
} }
.ticket-info { .ticket-info {
margin-top: 48rpx; margin-top: 48rpx;
} }
.seal-wrapper { .seal-wrapper {
position: absolute; position: absolute;
right: 0; right: 0;
bottom: -32rpx; bottom: -32rpx;
width: 166rpx; width: 166rpx;
height: 200rpx; height: 200rpx;
} }
.seal { .seal {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.circle { .circle {
position: absolute; position: absolute;
left: -18rpx; left: -18rpx;
bottom: -18rpx; bottom: -18rpx;
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
background-color: #fff; background-color: #fff;
} }
.ticket-footer { .ticket-footer {
padding: 50rpx 32rpx 24rpx; padding: 50rpx 32rpx 24rpx;
background-color: #F3F4F6; background-color: #f3f4f6;
} }
.ticket-footer-top { .ticket-footer-top {
font-size: 34rpx; font-size: 34rpx;
color: #15191F; color: #15191f;
} }
.ticket-footer-middle { .ticket-footer-middle {
width: 606rpx; width: 606rpx;
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
margin: 40rpx 0; margin: 40rpx 0;
color: #fff; color: #fff;
text-align: center; text-align: center;
background-color: #86C5E1; background-color: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
.ticket-footer-bottom { .ticket-footer-bottom {
font-size: 26rpx; font-size: 26rpx;
color: #959DAA; color: #959daa;
} }
.code-header { .code-header {
height: 70rpx; height: 70rpx;
color: #fff; color: #fff;
font-size: 30rpx; font-size: 30rpx;
text-align: center; text-align: center;
} }
.code-tips { .code-tips {
height: 92rpx; height: 92rpx;
color: #fff; color: #fff;
font-size: 26rpx; font-size: 26rpx;
text-align: center; text-align: center;
} }
.code-main { .code-main {
width: 750rpx; width: 750rpx;
height: 666rpx; height: 666rpx;
} }
.code-item { .code-item {
position: relative; position: relative;
width: 526rpx; width: 526rpx;
height: 666rpx; height: 666rpx;
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
} }
.item-center { .item-center {
margin-left: 112rpx; margin-left: 112rpx;
} }
.notice-popup-content { .notice-popup-content {
max-height: 896rpx; max-height: 896rpx;
} }
.code-item-title { .code-item-title {
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
} }
.cord-title { .cord-title {
padding: 0 20rpx; padding: 0 20rpx;
} }
.code-img { .code-img {
width: 296rpx; width: 296rpx;
height: 296rpx; height: 296rpx;
margin: 56rpx 0; margin: 56rpx 0;
} }
.code-num-wrapper { .code-num-wrapper {
width: 446rpx; width: 446rpx;
height: 96rpx; height: 96rpx;
padding: 0 24rpx; padding: 0 24rpx;
background-color: #F2F3F5; background-color: #f2f3f5;
border-radius: 4rpx; border-radius: 4rpx;
line-height: 96rpx; line-height: 96rpx;
} }
.code-num-title { .code-num-title {
color: #959DA9; color: #959da9;
text-decoration: none !important; text-decoration: none !important;
font-size: 26rpx; font-size: 26rpx;
} }
.code-num { .code-num {
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
} }
.code-used { .code-used {
color: #C2C7CF; color: #c2c7cf;
text-decoration: line-through; text-decoration: line-through;
} }
.num-copy { .num-copy {
color: #5DB5DD; color: #5db5dd;
font-size: 26rpx; font-size: 26rpx;
} }
.code-used-seal { .code-used-seal {
position: absolute; position: absolute;
right: -68rpx; right: -68rpx;
transform: translateY(56rpx); transform: translateY(56rpx);
width: 254rpx; width: 254rpx;
height: 254rpx; height: 254rpx;
} }
.img-num { .img-num {
margin-top: 54rpx; margin-top: 54rpx;
} }
.current-img-num { .current-img-num {
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
.symbol-img-num, .symbol-img-num, .total-img-num {
.total-img-num { color: #979797;
color: #979797; font-size: 26rpx;
font-size: 26rpx;
} }
.code-close-btn { .code-close-btn {
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
margin-top: 35rpx; margin-top: 35rpx;
background: rgba(254, 252, 249, 0.5); background: rgba(254, 252, 249, 0.5);
border-radius: 50%; border-radius: 50%;
} }
.code-close-btn image { .code-close-btn image {
width: 60%; width: 60%;
} }
.l-popup-bg { .l-popup-bg {
background: rgba(0, 0, 0, .4); background: rgba(0, 0, 0, 0.4);
} }
.tips-wrapper { .tips-wrapper {
margin: 40rpx 40rpx 0; margin: 40rpx 40rpx 0;
} }
.notice-wrapper { .notice-wrapper {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
padding: 0 40rpx; padding: 0 40rpx;
line-height: 100rpx; line-height: 100rpx;
} }
.notice { .notice {
margin-right: 8rpx; margin-right: 8rpx;
color: #15191F; color: #15191f;
font-size: 26rpx; font-size: 26rpx;
} }
.notice-popup-wrapper { .notice-popup-wrapper {
padding: 56rpx 40rpx 68rpx; padding: 56rpx 40rpx 68rpx;
background-color: #fff; background-color: #fff;
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
} }
.notice-popup-title { .notice-popup-title {
width: 100%; width: 100%;
height: 90rpx; height: 90rpx;
} }
.notice-content { .notice-content {
max-height: 896rpx; max-height: 896rpx;
} }
.goods-wrapper { .goods-wrapper {
padding: 32rpx 40rpx 0; padding: 32rpx 40rpx 0;
} }
.goods-title { .goods-title {
color: #15191F; color: #15191f;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.goods-list { .goods-list {
margin-top: 40rpx; margin-top: 40rpx;
padding: 0 32rpx 14rpx; padding: 0 32rpx 14rpx;
background-color: #F5F6F8; background-color: #f5f6f8;
} }
.goods-list-title-wrapper { .goods-list-title-wrapper {
width: 100%; width: 100%;
height: 132rpx; height: 132rpx;
} }
.goods-list-title-img { .goods-list-title-img {
min-width: 40rpx; min-width: 40rpx;
min-height: 54rpx; min-height: 54rpx;
max-width: 74rpx; max-width: 74rpx;
max-height: 74rpx; max-height: 74rpx;
} }
.goods-list-title { .goods-list-title {
margin-left: 16rpx; margin-left: 16rpx;
color: #15191F; color: #15191f;
font-size: 26rpx; font-size: 26rpx;
font-weight: 600; font-weight: 600;
} }
.goods-item { .goods-item {
margin-bottom: 22rpx; margin-bottom: 22rpx;
padding-bottom: 22rpx; padding-bottom: 22rpx;
border-bottom: 1px solid #E2E7EF; border-bottom: 1px solid #e2e7ef;
} }
.goods-item:last-child { .goods-item:last-child {
margin-bottom: 0rpx; margin-bottom: 0rpx;
border-bottom: none; border-bottom: none;
} }
.goods-item-img { .goods-item-img {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
} }
.goods-item-info { .goods-item-info {
flex: 1; flex: 1;
padding-left: 24rpx; padding-left: 24rpx;
} }
.goods-item-info-text { .goods-item-info-text {
color: #15191F; color: #15191f;
font-size: 26rpx; font-size: 26rpx;
font-weight: 600; font-weight: 600;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
} }
.goods-item-info-price { .goods-item-info-price {
color: #15191F; color: #15191f;
font-weight: 600; font-weight: 600;
} }
.price-symbol { .price-symbol {
font-size: 22rpx; font-size: 22rpx;
} }
.price { .price {
font-size: 26rpx; font-size: 26rpx;
} }
.goods-item-btn { .goods-item-btn {
width: 120rpx; width: 120rpx;
height: 56rpx; height: 56rpx;
margin-top: 40rpx; margin-top: 40rpx;
margin-left: 32rpx; margin-left: 32rpx;
color: #fff; color: #fff;
font-size: 22rpx; font-size: 22rpx;
text-align: center; text-align: center;
line-height: 56rpx; line-height: 56rpx;
background-color: #86C5E1; background-color: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
.disabled { .disabled {
background-color: #C8E1EC; background-color: #c8e1ec;
} }
.order-info-wrapper { .order-info-wrapper {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
margin: 64rpx 40rpx 64rpx; margin: 64rpx 40rpx 64rpx;
} }
.order-price { .order-price {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
width: 134rpx; width: 134rpx;
height: 58rpx; height: 58rpx;
color: #5DB5DD; color: #5db5dd;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.order-price-symbol { .order-price-symbol {
font-size: 30rpx; font-size: 30rpx;
} }
.order-title { .order-title {
width: 100%; width: 100%;
line-height: 68rpx; line-height: 68rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.order-info { .order-info {
margin-top: 22rpx; margin-top: 22rpx;
} }
.order-item { .order-item {
width: 100%; width: 100%;
color: #959DA9; color: #959da9;
font-size: 22rpx; font-size: 22rpx;
line-height: 42rpx; line-height: 42rpx;
} }
.padding-bottom-166 { .padding-bottom-166 {
padding-bottom: 166rpx; padding-bottom: 166rpx;
} }
.footer-btn { .footer-btn {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 32rpx 20rpx; padding: 32rpx 20rpx;
border-top: 1px solid #E2E7EF; border-top: 1px solid #e2e7ef;
} }
.delete-btn, .delete-btn, .order-btn {
.order-btn { width: 200rpx;
width: 200rpx; line-height: 96rpx;
line-height: 96rpx; margin-right: 24rpx;
margin-right: 24rpx; border-radius: 4rpx;
border-radius: 4rpx; font-size: 30rpx;
font-size: 30rpx; font-weight: 600;
font-weight: 600; text-align: center;
text-align: center;
} }
.delete-btn { .delete-btn {
color: #656E7B; color: #656e7b;
background-color: #fff; background-color: #fff;
border: 1px solid #C2C7CF; border: 1px solid #c2c7cf;
} }
.order-btn { .order-btn {
color: #fff; color: #fff;
background-color: #86C5E1; background-color: #86c5e1;
} }
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.logo-box { .logo-box {
width: 100rpx; width: 100rpx;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
margin-right: 20rpx; margin-right: 20rpx;
} }
.logo-box image { .logo-box image {
max-width: 100%; max-width: 100%;
max-height: 100%; max-height: 100%;
} }
\ No newline at end of file
pages/pay/order-input/order-input.js
...@@ -857,6 +857,15 @@ Page({ ...@@ -857,6 +857,15 @@ Page({
* @returns * @returns
*/ */
onPaySubmit: function () { onPaySubmit: function () {
// 优先检查用户是否已经注册，如果没有则跳转登录
let funcUserInfo = wx.getStorageSync('userInfo')
if (!funcUserInfo.isSignIn) {
wx.navigateTo({
url: '/pages/login/login'
})
return
}
// 数据校验不通过 // 数据校验不通过
if (!this.inspectData()) return if (!this.inspectData()) return
// 支付正在进行 // 支付正在进行
......
pages/play/home/home.js
...@@ -5,6 +5,7 @@ Page({ ...@@ -5,6 +5,7 @@ Page({
option: {}, option: {},
data: { data: {
appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
...@@ -246,7 +247,8 @@ Page({ ...@@ -246,7 +247,8 @@ Page({
url: '/api/v1/strategy/getList', url: '/api/v1/strategy/getList',
data: { data: {
'pageSize': this.data.pageSize + '', 'pageSize': this.data.pageSize + '',
'pageNo': this.data.pageNo + '' }, 'pageNo': this.data.pageNo + ''
},
success: (response) => { success: (response) => {
let funcResponse = response.data let funcResponse = response.data
let funcList = [] let funcList = []
...@@ -269,6 +271,8 @@ Page({ ...@@ -269,6 +271,8 @@ Page({
this.setData({ this.setData({
touristRouteList: this.data.touristRouteList.concat(funcList) touristRouteList: this.data.touristRouteList.concat(funcList)
}) })
console.log(this.data.touristRouteList)
}, },
fail: (err) => { fail: (err) => {
......
pages/play/home/home.wxml
...@@ -7,14 +7,20 @@ ...@@ -7,14 +7,20 @@
</view> </view>
<!-- 畅玩分类 --> <!-- 畅玩分类 -->
<view class="banner"> <block wx:if="{{appStatus}}">
<image src="{{resourcesBase + 'play/home/type.png'}}"></image> <view class="banner">
<button class="art-button" bindtap="onToArt"></button> <image src="{{resourcesBase + 'play/home/type.png'}}"></image>
<button class="health-button" bindtap="onToHealth"></button> <button class="art-button" bindtap="onToArt"></button>
<button class="food-button" bindtap="onToFood"></button> <button class="health-button" bindtap="onToHealth"></button>
<button class="leisure-button" bindtap="onToLeisure"></button> <button class="food-button" bindtap="onToFood"></button>
<button class="hotel-button" bindtap="onToHotel"></button> <button class="leisure-button" bindtap="onToLeisure"></button>
</view> <button class="hotel-button" bindtap="onToHotel"></button>
</view>
</block>
<block wx:if="{{!appStatus}}">
<view class="banner-occupy"></view>
</block>
<!-- 近期活动 --> <!-- 近期活动 -->
<view class="title row con-b align-c"> <view class="title row con-b align-c">
......
pages/play/home/home.wxss
...@@ -34,6 +34,11 @@ ...@@ -34,6 +34,11 @@
} }
/* 畅玩分类 */ /* 畅玩分类 */
.banner-occupy {
position: relative;
margin-top: 200rpx;
}
.banner { .banner {
position: relative; position: relative;
margin-top: 200rpx; margin-top: 200rpx;
......
pages/play/service-detail/service-detail.js
...@@ -8,6 +8,7 @@ let logicData = { ...@@ -8,6 +8,7 @@ let logicData = {
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
...@@ -85,6 +86,8 @@ Page({ ...@@ -85,6 +86,8 @@ Page({
winCommodity: false, // 商品列表 winCommodity: false, // 商品列表
winCommodityMenu: false, winCommodityMenu: false,
winEvaluateAlbum: false, winEvaluateAlbum: false,
winHidden: false, // 海错图临时隐藏内容控制
}, },
onLoad: function (options) { onLoad: function (options) {
...@@ -101,6 +104,7 @@ Page({ ...@@ -101,6 +104,7 @@ Page({
this.queryActivity() this.queryActivity()
this.setData({ this.setData({
commodityTitle: '文创商品', commodityTitle: '文创商品',
winHidden: true
}) })
break break
......
pages/play/service-detail/service-detail.wxml
...@@ -37,23 +37,9 @@ ...@@ -37,23 +37,9 @@
</view> </view>
</view> </view>
<!-- 下载图片反馈 --> <!-- 下载图片反馈 -->
<l-toast <l-toast l-class="toast" l-image-class="toast-icon" show="{{winToastSuccess}}" image="../../../image/icon/success-3.png" title="图片已保存" duration="3000"></l-toast>
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 --> <!-- 下载图片反馈 -->
<l-toast <l-toast l-class="toast" l-image-class="toast-icon" show="{{winToastFail}}" image="../../../image/icon/war-3.png" title="图片保存失败" duration="3000"></l-toast>
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 开放时间信息 --> <!-- 开放时间信息 -->
<view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c"> <view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
<image src="./image/time.png"></image> <image src="./image/time.png"></image>
...@@ -120,8 +106,13 @@ ...@@ -120,8 +106,13 @@
<view class="commodity-card" wx:if="{{winCommodity}}"> <view class="commodity-card" wx:if="{{winCommodity}}">
<view class="commodity-card-title row con-b align-e"> <view class="commodity-card-title row con-b align-e">
<text>{{commodityTitle}}</text> <text>{{commodityTitle}}</text>
<text bindtap="onCommodityAll">查看全部</text> <text wx:if="{{!winHidden}}" bindtap="onCommodityAll">查看全部</text>
<view wx:if="{{winHidden}}" class="row align-c">
<image src="{{imageBase + 'icon/warning-2.png'}}"></image>
<text>请到线下门店购买</text>
</view>
</view> </view>
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col"> <view class="commodity-card-item col">
...@@ -134,32 +125,35 @@ ...@@ -134,32 +125,35 @@
<view class="commodity-card-item-date row align-c"> <view class="commodity-card-item-date row align-c">
<text>{{item.describe}}</text> <text>{{item.describe}}</text>
</view> </view>
<view class="commodity-card-item-operation row con-b align-c">
<!-- 活动价样式 -->
<view class="row align-c" wx:if="{{item.priceType === 1}}">
<text class="detail-price-discount">活动价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceDiscountText == '0' ? '免费' : item.priceDiscountText}}</text>
<text>{{'￥' + item.priceText}}</text>
</view>
<!-- 业主价样式 --> <block wx:if="{{!winHidden}}">
<view class="row align-c" wx:if="{{item.priceType === 2}}"> <view class="commodity-card-item-operation row con-b align-c">
<text class="detail-price-special">业主价</text> <!-- 活动价样式 -->
<text class="price-symbol">￥</text> <view class="row align-c" wx:if="{{item.priceType === 1}}">
<text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text> <text class="detail-price-discount">活动价</text>
<text>{{'￥' + item.priceText}}</text> <text class="price-symbol">￥</text>
</view> <text>{{item.priceDiscountText == '0' ? '免费' : item.priceDiscountText}}</text>
<!-- 普通价样式 --> <text>{{'￥' + item.priceText}}</text>
<view class="row align-c" wx:if="{{item.priceType === 3}}"> </view>
<text class="">业主价</text>
<text class="price-symbol">￥</text> <!-- 业主价样式 -->
<text>{{item.priceText == '0' ? '免费' : item.priceText}}</text> <view class="row align-c" wx:if="{{item.priceType === 2}}">
</view> <text class="detail-price-special">业主价</text>
<view> <text class="price-symbol">￥</text>
<button class="row con-c align-c" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button> <text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{'￥' + item.priceText}}</text>
</view>
<!-- 普通价样式 -->
<view class="row align-c" wx:if="{{item.priceType === 3}}">
<text class="">业主价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceText == '0' ? '免费' : item.priceText}}</text>
</view>
<view>
<button class="row con-c align-c" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button>
</view>
</view> </view>
</view> </block>
</view> </view>
</block> </block>
<view class="commodity-card-item col"></view> <view class="commodity-card-item col"></view>
...@@ -319,23 +313,9 @@ ...@@ -319,23 +313,9 @@
</view> </view>
</view> </view>
<!-- 下载图片反馈 --> <!-- 下载图片反馈 -->
<l-toast <l-toast l-class="toast" l-image-class="toast-icon" show="{{winToastSuccess}}" image="../../../image/icon/success-3.png" title="图片已保存" duration="3000"></l-toast>
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 --> <!-- 下载图片反馈 -->
<l-toast <l-toast l-class="toast" l-image-class="toast-icon" show="{{winToastFail}}" image="../../../image/icon/war-3.png" title="图片保存失败" duration="3000"></l-toast>
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 开放时间信息 --> <!-- 开放时间信息 -->
<view class="commodity-other movie-border row align-c"> <view class="commodity-other movie-border row align-c">
<image src="./image/time.png"></image> <image src="./image/time.png"></image>
...@@ -395,7 +375,7 @@ ...@@ -395,7 +375,7 @@
<view class="movie-footer"> <view class="movie-footer">
<image src="/image/movie-bottom.png"></image> <image src="/image/movie-bottom.png"></image>
</view> </view>
<!-- 简介，评价 --> <!-- 简介，评价 -->
<view class="selection-content movie-border row"> <view class="selection-content movie-border row">
<view class="row align-c {{contentType === 'detail' ? 'selection-content-item-active-movie' : 'selection-content-item'}}" data-type="detail" bindtap="onSelectionContent"> <view class="row align-c {{contentType === 'detail' ? 'selection-content-item-active-movie' : 'selection-content-item'}}" data-type="detail" bindtap="onSelectionContent">
...@@ -489,7 +469,7 @@ ...@@ -489,7 +469,7 @@
</view> </view>
<!-- 查看相册 --> <!-- 查看相册 -->
<view class="full-screen-album" wx:if="{{winEvaluateAlbum}}" bindtap="onHiddenEvaluateAlbum" > <view class="full-screen-album" wx:if="{{winEvaluateAlbum}}" bindtap="onHiddenEvaluateAlbum">
<swiper circular current="{{evaluateAlbumActive}}" class="full-screen-album-swiper" duration="500"> <swiper circular current="{{evaluateAlbumActive}}" class="full-screen-album-swiper" duration="500">
<block wx:for="{{evaluateAlbum}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{evaluateAlbum}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="album-item row con-c align-c"> <swiper-item class="album-item row con-c align-c">
......
pages/play/service-detail/service-detail.wxss
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.movie { .movie {
color: #fff; color: #fff;
background-color: #1C1C25; background-color: #1c1c25;
} }
.banner { .banner {
...@@ -25,12 +25,10 @@ ...@@ -25,12 +25,10 @@
position: relative; position: relative;
width: 750rpx; width: 750rpx;
height: 800rpx; height: 800rpx;
background: #ffffff; background: #fff;
} }
.banner-swiper, .banner-swiper, .banner-swiper-item, .banner-swiper-image {
.banner-swiper-item,
.banner-swiper-image {
position: absolute; position: absolute;
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
...@@ -60,7 +58,7 @@ ...@@ -60,7 +58,7 @@
} }
.title-black { .title-black {
color: #FFFFFF; color: #fff;
} }
.other-black { .other-black {
...@@ -68,7 +66,7 @@ ...@@ -68,7 +66,7 @@
} }
.other-black view text:nth-child(3) { .other-black view text:nth-child(3) {
color: #FFFFFF; color: #fff;
} }
.commodity-describe { .commodity-describe {
...@@ -82,11 +80,12 @@ ...@@ -82,11 +80,12 @@
} }
.black { .black {
color: #FFFFFF !important; color: #fff !important;
background: #1C1C25; background: #1c1c25;
} }
/* 立即报名 */ /* 立即报名 */
.operation { .operation {
position: fixed; position: fixed;
left: 0; left: 0;
...@@ -94,8 +93,8 @@ ...@@ -94,8 +93,8 @@
width: 750rpx; width: 750rpx;
height: 160rpx; height: 160rpx;
padding: 32rpx 40rpx; padding: 32rpx 40rpx;
border-top: 1rpx #E2E7EF solid; border-top: 1rpx #e2e7ef solid;
background: #ffffff; background: #fff;
} }
.operation-black { .operation-black {
...@@ -107,16 +106,16 @@ ...@@ -107,16 +106,16 @@
width: 670rpx; width: 670rpx;
height: 96rpx; height: 96rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
background: #86C5E1; background: #86c5e1;
border-radius: 2px; border-radius: 2px;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #fff;
line-height: 42rpx; line-height: 42rpx;
} }
/* 侧边返回顶部 */ /* 侧边返回顶部 */
.appointment-side { .appointment-side {
z-index: 1900; z-index: 1900;
position: fixed; position: fixed;
...@@ -130,7 +129,7 @@ ...@@ -130,7 +129,7 @@
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
border-radius: 50%; border-radius: 50%;
background: #ffffff; background: #fff;
box-shadow: 0rpx 16rpx 48rpx 0rpx rgba(0, 0, 0, 0.1); box-shadow: 0rpx 16rpx 48rpx 0rpx rgba(0, 0, 0, 0.1);
} }
...@@ -140,12 +139,8 @@ ...@@ -140,12 +139,8 @@
margin: 16rpx; margin: 16rpx;
} }
/* 二期整理样式 */ /* 二期整理样式 */
.commodity-movie { .commodity-movie {
position: relative; position: relative;
height: 1380rpx; height: 1380rpx;
...@@ -157,18 +152,19 @@ ...@@ -157,18 +152,19 @@
margin: 60rpx 40rpx 0 40rpx; margin: 60rpx 40rpx 0 40rpx;
font-size: 54rpx; font-size: 54rpx;
font-weight: bold; font-weight: bold;
color: #15191F; color: #15191f;
line-height: 76rpx; line-height: 76rpx;
} }
.movie-title { .movie-title {
color: #fff; color: #fff;
} }
.commodity-title text { .commodity-title text {
flex: 1; flex: 1;
white-space:nowrap; white-space: nowrap;
overflow:hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow: ellipsis;
} }
.commodity-title image { .commodity-title image {
...@@ -180,14 +176,14 @@ ...@@ -180,14 +176,14 @@
.commodity-other { .commodity-other {
margin: 0 40rpx; margin: 0 40rpx;
padding: 50rpx 0; padding: 50rpx 0;
border-bottom: 1rpx #E2E7EF solid; border-bottom: 1rpx #e2e7ef solid;
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
} }
.movie-border { .movie-border {
border-bottom: 1rpx #3A3A40 solid !important; border-bottom: 1rpx #3a3a40 solid !important;
} }
.commodity-other image { .commodity-other image {
...@@ -198,10 +194,11 @@ ...@@ -198,10 +194,11 @@
.commodity-other text:nth-child(2) { .commodity-other text:nth-child(2) {
margin-right: 16rpx; margin-right: 16rpx;
color: #959DA9; color: #959da9;
} }
/* 近期活动，文创商品 */ /* 近期活动，文创商品 */
.commodity-movie-card { .commodity-movie-card {
position: absolute; position: absolute;
top: 420rpx; top: 420rpx;
...@@ -211,33 +208,41 @@ ...@@ -211,33 +208,41 @@
margin-top: 80rpx; margin-top: 80rpx;
padding: 0 40rpx; padding: 0 40rpx;
} }
.movie-bg image{
.commodity-card-title image {
width: 34rpx;
height: 34rpx;
margin-right: 8rpx;
}
.commodity-card-title text:nth-child(1) {
font-size: 40rpx;
font-weight: 800;
}
.commodity-card-title text:nth-child(2) {
font-size: 26rpx;
color: #959da9;
}
.movie-bg image {
width: 750rpx; width: 750rpx;
height: 620rpx; height: 620rpx;
} }
.movie-card-title { .movie-card-title {
margin-top:160rpx; margin-top: 160rpx;
padding: 0 40rpx; padding: 0 40rpx;
} }
.commodity-card-title text:nth-child(1) {
font-size: 40rpx;
font-weight: 800;
}
.movie-card-title text:nth-child(1) { .movie-card-title text:nth-child(1) {
font-size: 40rpx; font-size: 40rpx;
font-weight: 800; font-weight: 800;
} }
.commodity-card-title text:nth-child(2) {
font-size: 26rpx;
color: #959DA9;
}
.movie-card-title text:nth-child(2) { .movie-card-title text:nth-child(2) {
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959da9;
} }
.commodity-card-list { .commodity-card-list {
...@@ -254,6 +259,7 @@ ...@@ -254,6 +259,7 @@
width: 1rpx !important; width: 1rpx !important;
min-width: 1rpx !important; min-width: 1rpx !important;
} }
.movie-card-item:last-child { .movie-card-item:last-child {
width: 1rpx !important; width: 1rpx !important;
min-width: 1rpx !important; min-width: 1rpx !important;
...@@ -272,7 +278,7 @@ ...@@ -272,7 +278,7 @@
.commodity-card-item-nothing text { .commodity-card-item-nothing text {
margin-top: 42rpx; margin-top: 42rpx;
font-size: 30rpx; font-size: 30rpx;
color: #959DA9; color: #959da9;
line-height: 42rpx; line-height: 42rpx;
font-weight: 600; font-weight: 600;
} }
...@@ -290,7 +296,7 @@ ...@@ -290,7 +296,7 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
color: #959DA9; color: #959da9;
} }
.commodity-card-item { .commodity-card-item {
...@@ -299,12 +305,13 @@ ...@@ -299,12 +305,13 @@
padding-bottom: 32rpx; padding-bottom: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
} }
.movie-card-item { .movie-card-item {
width: 300rpx; width: 300rpx;
margin-right: 24rpx; margin-right: 24rpx;
padding-bottom: 32rpx; padding-bottom: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background:#303041; background: #303041;
} }
.commodity-card-item > image { .commodity-card-item > image {
...@@ -321,6 +328,7 @@ ...@@ -321,6 +328,7 @@
max-width: 562rpx; max-width: 562rpx;
height: 316rpx; height: 316rpx;
} }
.movie-card-item > image { .movie-card-item > image {
width: 300rpx; width: 300rpx;
height: 369rpx; height: 369rpx;
...@@ -331,6 +339,7 @@ ...@@ -331,6 +339,7 @@
margin-top: 32rpx; margin-top: 32rpx;
padding: 0 32rpx; padding: 0 32rpx;
} }
.movie-card-item-title { .movie-card-item-title {
height: 37rpx; height: 37rpx;
margin-top: 21rpx; margin-top: 21rpx;
...@@ -341,11 +350,12 @@ ...@@ -341,11 +350,12 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191f;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.movie-card-item-title text:nth-child(1) { .movie-card-item-title text:nth-child(1) {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
...@@ -360,14 +370,13 @@ ...@@ -360,14 +370,13 @@
width: 96rpx; width: 96rpx;
height: 32rpx; height: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
border: 1px solid #86C5E1; border: 1px solid #86c5e1;
background: #EAF0F5; background: #eaf0f5;
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;
} }
.commodity-card-item-date { .commodity-card-item-date {
...@@ -388,13 +397,14 @@ ...@@ -388,13 +397,14 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
color: #656E7B; color: #656e7b;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
/* 能量补给跳转 */ /* 能量补给跳转 */
.commodity-menu { .commodity-menu {
width: 750rpx; width: 750rpx;
padding: 0 40rpx; padding: 0 40rpx;
...@@ -407,13 +417,12 @@ ...@@ -407,13 +417,12 @@
font-weight: 800; font-weight: 800;
} }
.commodity-menu image{ .commodity-menu image {
width: 670rpx; width: 670rpx;
height: 256rpx; height: 256rpx;
margin-top: 48rpx; margin-top: 48rpx;
} }
.movie-card-item-info { .movie-card-item-info {
height: 33rpx; height: 33rpx;
margin-top: 10rpx; margin-top: 10rpx;
...@@ -425,17 +434,17 @@ ...@@ -425,17 +434,17 @@
height: 33rpx; height: 33rpx;
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
color: #959DA9; color: #959da9;
line-height: 32rpx; line-height: 32rpx;
} }
.movie-card-item-info-right { .movie-card-item-info-right {
flex: 1; flex: 1;
height: 33rpx; height: 33rpx;
margin-left: 8rpx; margin-left: 8rpx;
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
color: #C2C7CF; color: #c2c7cf;
line-height: 32rpx; line-height: 32rpx;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -446,6 +455,7 @@ ...@@ -446,6 +455,7 @@
margin-top: 16rpx; margin-top: 16rpx;
padding: 0 32rpx; padding: 0 32rpx;
} }
.movie-card-item-operation { .movie-card-item-operation {
margin-top: 16rpx; margin-top: 16rpx;
padding: 0 20rpx; padding: 0 20rpx;
...@@ -455,21 +465,20 @@ ...@@ -455,21 +465,20 @@
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: 32rpx; line-height: 32rpx;
color: #E8D0AF; color: #e8d0af;
} }
.movie-card-item-operation text:nth-child(1) { .movie-card-item-operation text:nth-child(1) {
width: 52px; width: 52px;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #fff;
line-height: 40rpx; line-height: 40rpx;
} }
...@@ -477,24 +486,22 @@ ...@@ -477,24 +486,22 @@
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: 32rpx; line-height: 32rpx;
color: #E8D0AF; color: #e8d0af;
} }
.commodity-card-item-operation text:nth-child(3) { .commodity-card-item-operation text:nth-child(3) {
margin-right: 16rpx; margin-right: 16rpx;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
line-height: 40rpx; line-height: 40rpx;
color: #15191F; color: #15191f;
} }
.commodity-card-item-operation text:nth-child(4) { .commodity-card-item-operation text:nth-child(4) {
...@@ -502,13 +509,13 @@ ...@@ -502,13 +509,13 @@
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;
} }
.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;
} }
...@@ -518,8 +525,8 @@ ...@@ -518,8 +525,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;
...@@ -530,12 +537,13 @@ ...@@ -530,12 +537,13 @@
width: 152rpx; width: 152rpx;
height: 57rpx; height: 57rpx;
border-radius: 4rpx; border-radius: 4rpx;
background:#595967; background: #595967;
color: #FFFFFF; color: #fff;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
} }
.movie-footer image { .movie-footer image {
width: 750rpx; width: 750rpx;
height: 150rpx; height: 150rpx;
...@@ -543,6 +551,7 @@ ...@@ -543,6 +551,7 @@
} }
/* 分享弹窗 */ /* 分享弹窗 */
.container-share { .container-share {
z-index: 1700; z-index: 1700;
position: fixed; position: fixed;
...@@ -567,34 +576,32 @@ ...@@ -567,34 +576,32 @@
width: 288rpx; width: 288rpx;
height: 96rpx; height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #FFFFFF; background: #fff;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 96rpx; line-height: 96rpx;
color: #15191F; color: #15191f;
} }
.share-operation button:nth-child(2) { .share-operation button:nth-child(2) {
width: 288rpx; width: 288rpx;
height: 96rpx; height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #15191F; background: #15191f;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 96rpx; line-height: 96rpx;
color: #FFFFFF; color: #fff;
} }
.toast { .toast {
width: 262rpx; width: 262rpx;
height: 262rpx; height: 262rpx;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16); box-shadow: 0px 0px 68px 0px rgba(0, 0, 0, 0.16);
background: #1F252E; background: #1f252e;
} }
.toast-icon { .toast-icon {
...@@ -603,41 +610,40 @@ ...@@ -603,41 +610,40 @@
} }
/* 简介，评论 */ /* 简介，评论 */
.selection-content { .selection-content {
width: 750rpx; width: 750rpx;
height: 64rpx; height: 64rpx;
margin-top: 80rpx; margin-top: 80rpx;
padding: 0 40rpx; padding: 0 40rpx;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #e2e7ef solid;
} }
.selection-content-item { .selection-content-item {
width: 60rpx; width: 60rpx;
height: 64rpx; height: 64rpx;
margin-right: 64rpx; margin-right: 64rpx;
border-bottom: 4rpx rgba(0, 0, 0, 0) solid; border-bottom: 4rpx rgba(0, 0, 0, 0) solid;
font-size: 30rpx; font-size: 30rpx;
line-height: 44rpx; line-height: 44rpx;
color: #656E7B; color: #656e7b;
} }
.selection-content-item-active { .selection-content-item-active {
width: 60rpx; width: 60rpx;
height: 64rpx; height: 64rpx;
margin-right: 64rpx; margin-right: 64rpx;
border-bottom: 4rpx #15191f solid;
border-bottom: 4rpx #15191F solid;
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191f;
} }
.selection-content-item-active-movie { .selection-content-item-active-movie {
width: 60rpx; width: 60rpx;
height: 64rpx; height: 64rpx;
margin-right: 64rpx; margin-right: 64rpx;
border-bottom: 4rpx #fff solid; border-bottom: 4rpx #fff solid;
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
...@@ -646,6 +652,7 @@ ...@@ -646,6 +652,7 @@
} }
/* 详情 */ /* 详情 */
.detail { .detail {
margin-top: 62rpx; margin-top: 62rpx;
padding-bottom: 160rpx; padding-bottom: 160rpx;
...@@ -657,6 +664,7 @@ ...@@ -657,6 +664,7 @@
} }
/* 评论 */ /* 评论 */
.evaluate { .evaluate {
padding-bottom: 160rpx; padding-bottom: 160rpx;
} }
...@@ -680,7 +688,7 @@ ...@@ -680,7 +688,7 @@
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #959DA9; color: #959da9;
} }
.evaluate-option-item text:nth-child(3) { .evaluate-option-item text:nth-child(3) {
...@@ -688,7 +696,7 @@ ...@@ -688,7 +696,7 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
line-height: 40rpx; line-height: 40rpx;
color: #15191F; color: #15191f;
} }
.evaluate-option-item text:nth-child(4) { .evaluate-option-item text:nth-child(4) {
...@@ -696,17 +704,19 @@ ...@@ -696,17 +704,19 @@
font-size: 20rpx; font-size: 20rpx;
font-weight: 500; font-weight: 500;
line-height: 40rpx; line-height: 40rpx;
color: #15191F; color: #15191f;
} }
/* 评论详情 */ /* 评论详情 */
.evaluate-item { .evaluate-item {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
min-height: 292rpx; min-height: 292rpx;
margin: 48rpx 40rpx 0 40rpx; margin: 48rpx 40rpx 0 40rpx;
border-bottom: 1rpx solid #E2E7EF; border-bottom: 1rpx solid #e2e7ef;
} }
.evaluate-item:last-child { .evaluate-item:last-child {
border-bottom: none; border-bottom: none;
} }
...@@ -716,7 +726,7 @@ ...@@ -716,7 +726,7 @@
height: 80rpx; height: 80rpx;
margin-right: 16rpx; margin-right: 16rpx;
border-radius: 50%; border-radius: 50%;
background: #999999; background: #999;
} }
.evaluate-item-info-text { .evaluate-item-info-text {
...@@ -729,20 +739,19 @@ ...@@ -729,20 +739,19 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191f;
} }
.evaluate-item-info-text text:nth-child(2) { .evaluate-item-info-text text:nth-child(2) {
width: 60rpx; width: 60rpx;
height: 32rpx; height: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%); background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
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: #E8D0AF; color: #e8d0af;
} }
.evaluate-item-info-text text:nth-child(3) { .evaluate-item-info-text text:nth-child(3) {
...@@ -752,7 +761,7 @@ ...@@ -752,7 +761,7 @@
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #959DA9; color: #959da9;
} }
.evaluate-item-info-star { .evaluate-item-info-star {
...@@ -775,7 +784,7 @@ ...@@ -775,7 +784,7 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191f;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
overflow: hidden; overflow: hidden;
...@@ -786,11 +795,10 @@ ...@@ -786,11 +795,10 @@
width: 670rpx; width: 670rpx;
min-height: 132rpx; min-height: 132rpx;
margin-top: 32rpx; margin-top: 32rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191f;
} }
.evaluate-item-content-more { .evaluate-item-content-more {
...@@ -799,21 +807,20 @@ ...@@ -799,21 +807,20 @@
right: 18rpx; right: 18rpx;
width: 106rpx; width: 106rpx;
height: 44rpx; height: 44rpx;
background: #FFFFFF; background: #fff;
text-align: right; text-align: right;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
} }
.evaluate-item-content-more-movie { .evaluate-item-content-more-movie {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 18rpx; right: 18rpx;
width: 106rpx; width: 106rpx;
height: 44rpx; height: 44rpx;
background: #1C1C25; background: #1c1c25;
text-align: right; text-align: right;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
...@@ -821,15 +828,15 @@ ...@@ -821,15 +828,15 @@
} }
.evaluate-item-content-more text:nth-child(1) { .evaluate-item-content-more text:nth-child(1) {
color: #15191F; color: #15191f;
} }
.evaluate-item-content-more text:nth-child(2) { .evaluate-item-content-more text:nth-child(2) {
color: #86C5E1; color: #86c5e1;
} }
.evaluate-item-content-more-movie text:nth-child(2) { .evaluate-item-content-more-movie text:nth-child(2) {
color: #86C5E1; color: #86c5e1;
} }
.evaluate-item-album { .evaluate-item-album {
...@@ -839,7 +846,7 @@ ...@@ -839,7 +846,7 @@
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
padding: 32rpx 0 48rpx 0; padding: 32rpx 0 48rpx 0;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #e2e7ef solid;
} }
.evaluate-item-album:last-child { .evaluate-item-album:last-child {
...@@ -851,7 +858,7 @@ ...@@ -851,7 +858,7 @@
height: 160rpx; height: 160rpx;
margin: 0 10rpx 10rpx 0; margin: 0 10rpx 10rpx 0;
border-radius: 4rpx; border-radius: 4rpx;
background: #999999; background: #999;
} }
.evaluate-item-album image:nth-child(4n) { .evaluate-item-album image:nth-child(4n) {
...@@ -865,7 +872,7 @@ ...@@ -865,7 +872,7 @@
height: 160rpx; height: 160rpx;
margin: 0 0 10rpx 0; margin: 0 0 10rpx 0;
border-radius: 4rpx; border-radius: 4rpx;
background: rgba(0, 0, 0, .4); background: rgba(0, 0, 0, 0.4);
} }
.evaluate-item-album-more text { .evaluate-item-album-more text {
...@@ -873,10 +880,11 @@ ...@@ -873,10 +880,11 @@
font-size: 38rpx; font-size: 38rpx;
font-weight: 400; font-weight: 400;
line-height: 52rpx; line-height: 52rpx;
color: #FFFFFF; color: #fff;
} }
/* 评论相册样式 */ /* 评论相册样式 */
.full-screen-album { .full-screen-album {
z-index: 2000; z-index: 2000;
position: fixed; position: fixed;
...@@ -884,11 +892,10 @@ ...@@ -884,11 +892,10 @@
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #000000; background: #000;
} }
.full-screen-album-swiper, .full-screen-album-swiper, .album-item {
.album-item {
width: 750rpx; width: 750rpx;
height: 100%; height: 100%;
} }
...@@ -899,18 +906,18 @@ ...@@ -899,18 +906,18 @@
} }
/* 价格样式 */ /* 价格样式 */
.detail-price-discount { .detail-price-discount {
width: 90rpx; width: 90rpx;
height: 36rpx; height: 36rpx;
margin-right: 16rpx; margin-right: 16rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #FAEDEA; background: #faedea;
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: #EF4E4E; color: #ef4e4e;
} }
.detail-price-special { .detail-price-special {
...@@ -918,15 +925,14 @@ ...@@ -918,15 +925,14 @@
height: 36rpx; height: 36rpx;
margin-right: 16rpx; margin-right: 16rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%); background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
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: #E8D0AF; color: #e8d0af;
} }
.color-white { .color-white {
color: #fff !important; color: #fff !important;
} }
\ No newline at end of file
pages/play/strategy-detail/strategy-detail.js
...@@ -24,7 +24,7 @@ Page({ ...@@ -24,7 +24,7 @@ Page({
navigationScroll: 0, navigationScroll: 0,
isNavigationWhite: false, isNavigationWhite: false,
appStatus: App.globalData.appStatus,
banner: [], banner: [],
......
pages/play/strategy-detail/strategy-detail.wxml
...@@ -24,22 +24,25 @@ ...@@ -24,22 +24,25 @@
<text>{{date}}</text> <text>{{date}}</text>
</view> </view>
</view> </view>
<view class="relation" wx:if="{{relation.length>0}}">
<view class="relation-title"> <block wx:if="{{appStatus}}">
<text>文中提及</text> <view class="relation" wx:if="{{relation.length > 0}}">
</view> <view class="relation-title">
<block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <text>文中提及</text>
<view class="relation-item row con-b align-c" data-id="{{item.id}}" bindtap="onRelation">
<image mode="widthFix" src="{{item.cover}}"></image>
<view class="relation-item-info col">
<text>{{item.title}}</text>
<text>{{item.time}}</text>
<text>{{item.price}}</text>
</view>
<view class="relation-item-more row align-c">
<image src="/image/more-g.png"></image>
</view>
</view> </view>
</block> <block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index">
</view> <view class="relation-item row con-b align-c" data-id="{{item.id}}" bindtap="onRelation">
<image mode="widthFix" src="{{item.cover}}"></image>
<view class="relation-item-info col">
<text>{{item.title}}</text>
<text>{{item.time}}</text>
<text>{{item.price}}</text>
</view>
<view class="relation-item-more row align-c">
<image src="/image/more-g.png"></image>
</view>
</view>
</block>
</view>
</block>
</view> </view>
read.js 0 → 100644
/**
* 代码编写规范 - js - 变量命名
* is，状态类变量，通常数值为布尔类型。例如用户登录状态，isSignIn。
* win，窗口显隐控制，通常数值为布尔类型。例如 winToast，winDialog。
* func，函数内部变量前缀。
*
* 代码编写规范 - js - 常用变量命名
* option，页面参数对象
* userInfo，用户信息对象
*
*/
\ 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