Skip to content

严立 / mini-shimao

Go to a project
Commit 9823cf03 by 严立
Options

LL - 下单流程问题修复

parents 72a69f56 c596ff4a
Inline Side-by-side
Showing with 447 additions and 43 deletions
app.json
......@@ -59,29 +59,29 @@
],
"usingComponents": {
"navigation": "../component/navigation/navigation",
"swiper-point": "../component/swiper-point/swiper-point",
"l-avatar": "../miniprogram_npm/lin-ui/avatar/index",
"l-button": "../miniprogram_npm/lin-ui/button/index",
"l-capsule-bar": "../miniprogram_npm/lin-ui/capsule-bar/index",
"l-card": "../miniprogram_npm/lin-ui/card/index",
"l-checkbox": "../miniprogram_npm/lin-ui/checkbox/index",
"l-checkbox-group": "../miniprogram_npm/lin-ui/checkbox-group/index",
"l-dialog": "../miniprogram_npm/lin-ui/dialog/index",
"l-icon": "../miniprogram_npm/lin-ui/icon/index",
"l-list": "../miniprogram_npm/lin-ui/list/index",
"l-price": "../miniprogram_npm/lin-ui/price/index",
"l-tabs": "../miniprogram_npm/lin-ui/tabs/index",
"l-tabpanel": "../miniprogram_npm/lin-ui/tabpanel/index",
"l-toast": "../miniprogram_npm/lin-ui/toast/index",
"l-water-flow": "../miniprogram_npm/lin-ui/water-flow/index",
"l-input": "../miniprogram_npm/lin-ui/input/index",
"l-mask": "../miniprogram_npm/lin-ui/mask/index",
"l-arc-popup": "../miniprogram_npm/lin-ui/arc-popup/index",
"l-collapse": "../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "../miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index",
"navigation": "./component/navigation/navigation",
"swiper-point": "./component/swiper-point/swiper-point",
"l-avatar": "./miniprogram_npm/lin-ui/avatar/index",
"l-button": "./miniprogram_npm/lin-ui/button/index",
"l-capsule-bar": "./miniprogram_npm/lin-ui/capsule-bar/index",
"l-card": "./miniprogram_npm/lin-ui/card/index",
"l-checkbox": "./miniprogram_npm/lin-ui/checkbox/index",
"l-checkbox-group": "./miniprogram_npm/lin-ui/checkbox-group/index",
"l-dialog": "./miniprogram_npm/lin-ui/dialog/index",
"l-icon": "./miniprogram_npm/lin-ui/icon/index",
"l-list": "./miniprogram_npm/lin-ui/list/index",
"l-price": "./miniprogram_npm/lin-ui/price/index",
"l-tabs": "./miniprogram_npm/lin-ui/tabs/index",
"l-tabpanel": "./miniprogram_npm/lin-ui/tabpanel/index",
"l-toast": "./miniprogram_npm/lin-ui/toast/index",
"l-water-flow": "./miniprogram_npm/lin-ui/water-flow/index",
"l-input": "./miniprogram_npm/lin-ui/input/index",
"l-mask": "./miniprogram_npm/lin-ui/mask/index",
"l-arc-popup": "./miniprogram_npm/lin-ui/arc-popup/index",
"l-collapse": "./miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "./miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "./miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar": "./miniprogram_npm/lin-ui/notice-bar/index",
"l-popup": "./miniprogram_npm/lin-ui/popup/index",
"l-image-picker": "./miniprogram_npm/lin-ui/image-picker/index",
"l-rate": "./miniprogram_npm/lin-ui/rate/index"
......
pages/commodity/shopping-cart/shopping-cart.js
......@@ -332,4 +332,9 @@ Page({
isEnough
})
},
onToBuy: function () {
wx.navigateBack({
delta: 1,
})
}
})
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxml
......@@ -2,7 +2,7 @@
<l-toast show="{{winToast}}" icon="error" title="请选购商品后结算"></l-toast>
<view class="container">
<view class="container" wx:if="{{shoppingCart.length > 0}}">
<view class="shop-info row align-c">
<image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="left"></image>
<text>{{shopName}}</text>
......@@ -134,5 +134,15 @@
</view>
</view>
<view class="empty col con-c align-c" wx:else>
<image class="empty-cart" src=""></image>
<view class="empty-title">
<text>购物车还没有商品哦</text>
</view>
<view class="empty-btn" bindtap="onToBuy">
<text>去逛逛</text>
</view>
</view>
<!-- 清空弹窗 -->
<l-dialog l-content-class="l-content" l-cancel-class="l-cancel" title-color="#15191F" cancel-color="#656E7B" confirm-color="#5DB5DD"></l-dialog>
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxss
......@@ -315,4 +315,33 @@
font-size: 30rpx;
color: #fff;
background-color: #86c5e1;
}
.empty {
height: 100vh;
}
.empty-cart {
width: 176rpx;
height: 176rpx;
background-color: #ccc;
}
.empty-title {
margin-top: 64rpx;
color: #959DA9;
font-size: 38rpx;
line-height: 52rpx;
}
.empty-btn {
width: 308rpx;
height: 96rpx;
margin-top: 68rpx;
color: #fff;
font-size: 30rpx;
line-height: 96rpx;
text-align: center;
background: #86C5E1;
border-radius: 4rpx;
}
\ No newline at end of file
pages/home/home/home.js
......@@ -10,6 +10,8 @@ Page({
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
isLogin: false, // 是否登录
// 导航栏相关属性
navigationStyle: {
normal: {
......@@ -53,9 +55,26 @@ Page({
pageNo: 1,
pageSize: 10,
// 底部图片数据
footerImage: [
{
id: 0,
url: ''
},
{
id: 1,
url: ''
},
{
id: 2,
url: ''
}
]
},
onLoad: function (options) {
this.setNavigationLogo()
this.setLogin()
},
onShow: function() {
this.setData({
......@@ -70,7 +89,14 @@ Page({
}
})
},
setLogin: function () {
let funcUserInfo = wx.getStorageSync('userInfo')
if (funcUserInfo.phone && funcUserInfo.name && funcUserInfo.avatar) {
this.setData({
isLogin: true,
})
}
},
onShareAppMessage: function (res) {
if (res.from === 'button') {
// 来自页面内转发按钮
......@@ -326,7 +352,12 @@ Page({
}
})
},
// 跳转到登录
onLogin: function () {
wx.navigateTo({
url: '/pages/login/login',
})
},
onTest: function (event) {
wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=' + event.currentTarget.dataset.index + '&passType=1'
......
pages/home/home/home.wxml
......@@ -21,8 +21,8 @@
<image src="/image/ornament-0.png" mode="widthFix"></image>
</view>
<view class="banner-notice row align-c {{true ? 'login-notice' : ''}}">
<view class="row align-c" bindtap="onNotice">
<view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}">
<view class="row align-c">
<image src="./image/inform.png"></image>
<text>微信登陆</text>
</view>
......@@ -47,7 +47,7 @@
</view>
</view>
<view class="detail">
<view class="detail {{!isLogin ? 'login-detail' : ''}}">
<!-- 预约公告 -->
<view class="night row con-b" bindtap="onAppointmentInto">
<image src="./image/into.png" mode="aspectFit"></image>
......@@ -98,4 +98,10 @@
<button class="test-button" data-index="{{5}}" bindtap="onTest5">券码详情 餐品</button>
<button class="test-button" bindtap="onTest6">评价订单</button>
</view>
<view class="footer">
<block wx:for="{{footerImage}}" wx:key="index">
<image src="{{item.url}}"></image>
</block>
</view>
</view>
\ No newline at end of file
pages/home/home/home.wxss
......@@ -106,11 +106,15 @@
}
.detail {
margin-top: 40rpx;
margin-top: 60rpx;
padding: 0 40rpx;
background: linear-gradient(#ffffff, #F2F2F2);
}
.login-detail {
margin-top: 208rpx;
}
.detail-item {
margin-top: 58rpx;
}
......@@ -312,4 +316,18 @@
display: block;
margin: 20rpx;
background: #808080;
}
.footer {
margin-top: 88rpx;
}
.footer image {
width: 750rpx;
height: 1148rpx;
margin-bottom: 40rpx;
background-color: #ccc;
}
.footer image:last-child {
margin-bottom: 0rpx;
}
\ No newline at end of file
pages/mine/accumulate/accumulate.js
Page({
data: {
showMenu: false
},
onLoad: function (options) {
......
pages/mine/accumulate/accumulate.wxml
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
<navigation class="navigation" titleText="我的积分" color="#FFFFFF" backIcon="/image/back-w.png"></navigation>
<view class="container con-s">
<!-- 积分背景图 -->
<image class="banner" src=""></image>
<view class="my-accumulate">
<text>1888</text>
</view>
<view class="accumulate-tips">
<text>积分用于兑换积分商品，积分商城即将上线，敬请期待</text>
</view>
<view class="banner-menu row align-c">
<text>全部</text>
<image src="/image/icon/arrow-b-2.png"></image>
<view class="banner-menu-down col" wx:if="{{showMenu}}">
<text>全部</text>
<text>获取</text>
<text>已使用</text>
</view>
</view>
<!-- 积分列表 -->
<!-- 无积分 -->
<!-- <view class="accumulate-empty" wx:if="{{true}}">
<text>暂无积分明细</text>
</view> -->
<!-- 有积分 -->
<view class="accumulate-wrapper col align-c">
<block>
<view class="accumulate row con-b align-c">
<view class="accumulate-left col con-b">
<view class="accumulate-type">
<text>消费</text>
</view>
<view class="accumulate-time">
<text>2020-08-26 11:47</text>
</view>
</view>
<view class="accumulate-right {{item.type === '0' ? 'accumulate-type-color' : ''}}">
<text wx:if="{{item.type === '0'}}">+</text>
<text wx:else>-</text>
<text>50</text>
</view>
</view>
<view class="accumulate row con-b align-c">
<view class="accumulate-left col con-b">
<view class="accumulate-type">
<text>消费</text>
</view>
<view class="accumulate-time">
<text>2020-08-26 11:47</text>
</view>
</view>
<view class="accumulate-right {{item.type === '0' ? 'accumulate-type-color' : ''}}">
<text wx:if="{{item.type === '0'}}">+</text>
<text wx:else>-</text>
<text>50</text>
</view>
</view>
</block>
</view>
</view>
\ No newline at end of file
pages/mine/accumulate/accumulate.wxss
/* pages/home/home/home.wxss */
\ No newline at end of file
page {
height: 100vh;
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 100%);
}
.container {
position: relative;
}
.banner {
position: fixed;
z-index: -1;
top: 0;
left: 0;
width: 750rpx;
height: 480rpx;
background: linear-gradient(218deg, rgba(63, 67, 87, 0.8) 0%, #252532 100%);
opacity: 0.84;
}
.my-accumulate {
width: 670rpx;
margin-top: 232rpx;
font-size: 70rpx;
font-weight: 600;
color: #F0DABB;
line-height: 97rpx;
}
.banner-menu {
position: absolute;
top: 254rpx;
right: 40rpx;
width: 140rpx;
height: 56rpx;
padding-left: 24rpx;
color: #000;
font-size: 26rpx;
background: rgba(255, 255, 255, 0.95);
border-radius: 4rpx;
}
.banner-menu image {
width: 32rpx;
height: 32rpx;
margin-left: 8rpx;
}
.banner-menu-down {
position: absolute;
z-index: 99999999;
left: 0;
top: 64rpx;
width: 140rpx;
height: 180rpx;
background: rgba(255, 255, 255, 0.95);
box-shadow: 10px 4px 40px 0px rgba(181,164,164,0.3);
border-radius: 4rpx;
}
.banner-menu-down text{
flex: 1;
padding-left: 24rpx;
color: #959CA8;
font-size: 26rpx;
line-height: 56rpx;
border-radius: 4rpx;
}
.accumulate-tips {
width: 670rpx;
margin-top: 8rpx;
font-size: 22rpx;
color: #FFFFFF;
line-height: 32rpx;
}
.accumulate-empty {
margin-top: 426rpx;
font-size: 38rpx;
font-weight: 500;
color: #959DA9;
line-height: 5r2px;
}
.accumulate-wrapper {
position: absolute;
z-index: 1;
top: 410rpx;
width: 670rpx;
padding: 12rpx 0 14rpx;
background-color: #fff;
border-radius: 4rpx;
}
.accumulate {
width: 606rpx;
height: 120rpx;
padding: 20rpx 0 18rpx;
border-bottom: 1px solid #E2E7EF;
}
.accumulate:last-child {
border-bottom: none;
}
.accumulate-type {
margin-bottom: 8rpx;
font-size: 30rpx;
color: #15191F;
}
.accumulate-time {
font-size: 22rpx;
color: #959DA9;
}
.accumulate-right {
font-size: 30rpx;
color: #E66060;
}
.accumulate-right text {
margin-left: 6rpx;
}
.accumulate-type-color {
color: #959DA9;
}
\ No newline at end of file
pages/pay/order-input/order-input.js
......@@ -85,6 +85,7 @@ Page({
winNoticeDetail: false, // 购买须知详情
},
onLoad: function (options) {
console.log(options)
if (options.type) options.type = Number(options.type)
logicData.option = options
......
pages/play/movie-detail/movie-detail.js
......@@ -46,7 +46,7 @@ Page({
this.setData({
statusList: [
{ 'id': 0, 'name': `今日${month}月${day}日`},
{ 'id': 1, 'name': `今日${month}月${day+1}日`},
{ 'id': 1, 'name': `明日${month}月${day+1}日`},
],
})
},
......
pages/play/movie-detail/movie-detail.wxml
<navigation class="navigation" titleText="龙猫" color="#ffffff" backIcon="/image/back-w.png"></navigation>
<navigation class="navigation" titleText="{{movieInfo.filmName}}" color="#ffffff" backIcon="/image/back-w.png"></navigation>
<view class="container">
<view class="banner">
......@@ -78,7 +78,7 @@
<text>{{item.endTime}}</text>
</view>
<view class="show-free">
<text>{{free}}</text>
<text>{{item.ownerPrice === 0 ? '免费' : item.ownerPrice}}</text>
</view>
<view class="show-btn">
<text>报名观影</text>
......
pages/play/movie/movie.js
......@@ -123,7 +123,7 @@ Page({
onReportMovie: function (event) {
let id = event.currentTarget.dataset.movieid
wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=' + '7' + '&id' + id,
url: '/pages/pay/order-input/order-input?type=' + '7' + '&id=' + id,
})
}
})
\ No newline at end of file
pages/play/movie/movie.wxml
......@@ -13,7 +13,7 @@
<view wx:if="{{statusActive === 0}}">
<block wx:for="{{movieToday}}" wx:key="id">
<view class="movie-wrapper row">
<view class="movie-wrapper row" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}">
<view class="movie-time-wrapper row align-c">
<view class="movie-time-start">
<text>{{item.beginTime}}</text>
......@@ -21,6 +21,7 @@
<view class="movie-time-end">
<text>{{item.endTime}}</text>
</view>
<image class="time-star" src=""></image>
</view>
<view class="row">
<view class="movie-cover">
......@@ -61,7 +62,7 @@
<text>{{item.keyword}}</text>
</view>
<view class="movie-free">
<text>{{item.ownerPrice}}</text>
<text>{{item.ownerPrice === 0 ? '免费' : item.ownerPrice}}</text>
</view>
<view class="movie-btn" catchtap="onReportMovie" data-movieId="{{item.activityId}}">
<text>报名观影</text>
......@@ -118,7 +119,7 @@
<text>{{item.keyword}}</text>
</view>
<view class="movie-free">
<text>{{item.ownerPrice}}</text>
<text>{{item.ownerPrice === 0 ? '免费' : item.ownerPrice}}</text>
</view>
</view>
</view>
......
pages/play/movie/movie.wxss
......@@ -55,6 +55,15 @@ page {
color: #C2C7CF;
font-size: 22rpx;
}
.time-star {
position: absolute;
top: 0;
right: 0;
width: 64rpx;
height: 20rpx;
background-color: #ccc;
}
.movie-cover {
width: 206rpx;
height: 302rpx;
......
pages/play/point-detail/point-detail.js
......@@ -9,6 +9,8 @@ Page({
bannerHeight: 0,
info: {},
// 弹出控制
showPopup: false
},
onLoad: function (options) {
......@@ -16,6 +18,7 @@ Page({
bannerHeight: wx.getSystemInfoSync().windowHeight
})
this.queryDetail(Number(options.id))
// this.queryDetail(1)
},
/**
......@@ -44,6 +47,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-1-4.png',
],
background: 'background: #314f88;',
popupImage: ''
}, {
id: 102,
name: '云之亭',
......@@ -61,6 +65,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-2-4.png',
],
background: 'background: #9d9ee0;',
popupImage: ''
}, {
id: 103,
name: '湿地公园',
......@@ -78,6 +83,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-3-4.png',
],
background: 'background: #8bac7d;',
popupImage: ''
}, {
id: 104,
name: '新月码头',
......@@ -95,6 +101,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-4-4.png',
],
background: 'background: #6fc0d0;',
popupImage: ''
}, {
id: 105,
name: '温泉洋房',
......@@ -112,6 +119,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-5-4.png',
],
background: 'background: #5ca2e2;',
popupImage: ''
}, {
id: 106,
name: '星耀银湖',
......@@ -129,6 +137,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-6-4.png',
],
background: 'background: #82524c;',
popupImage: ''
}, {
id: 107,
name: '奇幻森林',
......@@ -146,6 +155,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-7-4.png',
],
background: 'background: #659b82;',
popupImage: ''
}
]
......@@ -159,6 +169,7 @@ Page({
this.setData({
banner: funcDetail[funcIndex].banner,
bannerWave: funcDetail[funcIndex].ornament,
popupImage: funcDetail[funcIndex].popupImage,
info: {
id: funcDetail[funcIndex].id,
name: funcDetail[funcIndex].name,
......@@ -188,4 +199,20 @@ Page({
bannerIndex: funcEvent.detail.current
})
},
// 点击分享图标
onShare: function () {
this.setData({
showPopup: true
})
},
// 点击取消
onCancel: function () {
this.setData({
showPopup: false
})
},
// 点击下载图片
onDownload: function () {
console.log('download')
}
})
\ No newline at end of file
pages/play/point-detail/point-detail.wxml
......@@ -22,7 +22,23 @@
<block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<image src="{{item}}" mode="aspectFit"></image>
</block>
<image class="icon-share" src="/image/icon/share-3.png" bindtap="onShare"></image>
</view>
<view class="iphonexr-fill" style="{{info.background}}"></view>
<!-- 弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}">
<view class="popupImage">
<image src="popupImage"></image>
</view>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view>
<view class="download" bindtap="onDownload">
<text>下载图片</text>
</view>
</view>
</l-popup>
</view>
\ No newline at end of file
pages/play/point-detail/point-detail.wxss
......@@ -48,6 +48,7 @@ page {
/* 详情样式 */
.describe {
position: relative;
width: 750rpx;
}
......@@ -74,6 +75,13 @@ page {
height: 230rpx;
margin: 56rpx 0 40rpx 40rpx;
}
.icon-share {
position: absolute;
top: 55rpx;
left: 274rpx;
width: 40rpx;
height: 40rpx;
}
/* iphone x 底部颜色填充 */
.iphonexr-fill {
......@@ -83,4 +91,27 @@ page {
left: 0;
width: 750rpx;
height: 100%;
}
.popupImage {
width: 606rpx;
height: 977rpx;
margin-bottom: 64rpx;
background-color: #ccc;
}
.cancel, .download {
width: 288rpx;
height: 96rpx;
text-align: center;
line-height: 96rpx;
border-radius: 4rpx;
}
.cancel {
color: #15191F;
background-color: #fff;
}
.download {
color: #fff;
background-color: #15191F;
}
\ No newline at end of file
project.config.json
......@@ -27,7 +27,7 @@
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": false,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
......@@ -166,6 +166,27 @@
"pathName": "pages/play/service-detail/service-detail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/commodity/shopping-cart/shopping-cart",
"pathName": "pages/commodity/shopping-cart/shopping-cart",
"query": "",
"scene": null
},
{
"id": 15,
"name": "pages/play/point-detail/point-detail",
"pathName": "pages/play/point-detail/point-detail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/mine/accumulate/accumulate",
"pathName": "pages/mine/accumulate/accumulate",
"query": "",
"scene": null
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment