From 1d3e68310f43a85ac8aaa83790cb6b31529e062e Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 11 Oct 2023 16:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=89=8D=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/orderList/index.js | 6 ++-
pages/order/orderList/index.wxml | 6 +++
pages/order/orderList/index.wxss | 12 ++++++
pages/order/scene/index.js | 22 +++++++++--
pages/order/scene/index.wxml | 31 +++++++++++++++-
pages/order/scene/index.wxss | 64 ++++++++++++++++++++++++++++++++
6 files changed, 134 insertions(+), 7 deletions(-)
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 0ae9234..12bc3c1 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -21,7 +21,8 @@ Page({
select_allowance: false,
allowance_data: null,
allowance_price: 0,
- flag:null
+ flag:null,
+ linkmanList:[]
},
/**
@@ -33,7 +34,8 @@ Page({
ticketList: app.globalData.list,
kjId: app.globalData.kjId,
gp_id: app.globalData.gp_id || app.globalData.team_id,
- flag:options.flag
+ flag:options.flag,
+ // linkmanList: app.globalData.linkmanList
})
let price = 0, sku_id = [] ,postFee= 0;
app.globalData.postProduct.map(item => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 2e1cc30..56db585 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -45,6 +45,12 @@
X{{item.num}}
+ 出行人信息
+
+ 姓名：{{items.name}}
+ 身份证：{{items.id_number}}
+ 手机号：{{items.tel}}
+
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 17386b9..3f7a203 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -61,4 +61,16 @@ page{
align-items: center;
background-color: #fff;
margin: 30rpx 25rpx;
+}
+
+.text {
+ margin-bottom: 22.67rpx;
+ color: #333;
+ font-size: 28rpx;
+ font-weight: 500;
+ display: flex;
+}
+
+.text-left {
+ color: #999;
}
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 0472109..7546be7 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -29,7 +29,8 @@ Page({
pIndex: 0,
flag:null,
ticket_type:1,
- isCar:'single'
+ isCar:'single',
+ showMask: false
},
/**
@@ -71,6 +72,16 @@ Page({
this.couponCom = this.selectAllComponents("#coupon")[0];
}
},
+ next: function () {
+ this.setData({
+ showMask:true
+ })
+ },
+ cancel: function () {
+ this.setData({
+ showMask:false
+ })
+ },
changeGroupName: function (e) {
this.setData({
groupName: e.detail.value
@@ -250,7 +261,8 @@ Page({
}],
originate_order_id: this.data.kjId,
gp_id: app.globalData.gp_id,
- team_id: app.globalData.team_id
+ team_id: app.globalData.team_id,
+ linkmanList:this.data.linkmanList
}
if (app.globalData.from) {
data.system_name = app.globalData.from;
@@ -276,7 +288,9 @@ Page({
}
if(app.globalData.list){
app.globalData.list[app.globalData.index] = this.data.product
- }
+ app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+ }
+ // app.globalData.linkmanList = this.data.linkmanList
app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
console.log(app.globalData);
if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
@@ -284,7 +298,7 @@ Page({
app.globalData.createDate.product_list.push(data.product_list[0])
}else{
app.globalData.createDate = data
- }
+ }
app.globalData.index = app.globalData.index + 1
app.globalData.product = app.globalData.list[app.globalData.index]
wx.redirectTo({
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index efebf2e..d1e0bbc 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -52,10 +52,39 @@
合计：¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}}
- 下一步
+ 下一步
立即预约
立即预约
+
+
+
+
+ 拙政园-旺季成人票
+ 出行人信息
+
+
+
+ 姓名：
+ {{item.name}}
+
+
+ 身份证：
+ {{item.id_number}}
+
+
+ 手机号：
+ {{item.tel}}
+
+
+
+
+
+ 取消
+ 无问题，去支付
+
+
+
\ No newline at end of file
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index bd1bf08..945fd9b 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -276,4 +276,68 @@ page {
.mask-allowance .mask-content .rule-title {
text-align: center;
margin-bottom: 20rpx;
+}
+
+.dialog-top {
+ color: #999;
+ font-weight: 500;
+ padding: 40rpx 33.33rpx 0;
+}
+
+.scene-title {
+ font-size: 35rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 32.67rpx;
+}
+
+.people-message {
+ margin-bottom: 26.67rpx;
+ /* padding-bottom: 26.67rpx; */
+ /* border-bottom: 1px solid #F0F0F0; */
+ font-weight: bold;
+ font-size: 32rpx;
+}
+
+.people {
+ border-top: 1rpx solid #F0F0F0;
+ padding: 26.67rpx 0 24rpx;
+}
+
+.flex {
+ display: flex;
+}
+
+.bottom-btn {
+ display: flex;
+ border-top: 1rpx solid #F0F0F0;
+ height: 96rpx;
+ /* padding: 32.67rpx 0; */
+}
+
+.cancle {
+ width: 50%;
+ color: #999;
+ text-align: center;
+ line-height: 96rpx;
+}
+
+.confirm {
+ width: 50%;
+ text-align: center;
+ color: #D62828;
+ line-height: 96rpx;
+ border-left: 1rpx solid #F0F0F0;
+}
+
+.mask-content1 {
+ max-height: 710rpx;
+ position: relative;
+ z-index: 1;
+ width: 80%;
+ background: white;
+ border-radius: 12rpx;
+ /* margin-bottom: 45%; */
+ overflow-y: auto;
+ margin: auto;
}
\ No newline at end of file