From ae6f5113d818c82fe83339d8193a8f90072c3d5f Mon Sep 17 00:00:00 2001 From: shaojing <2901156235@qq.com> Date: Thu, 30 May 2024 16:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=B8=8B=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- images/empty.png | Bin 7496 -> 0 bytes images/empty2.png | Bin 13246 -> 0 bytes pages/order/components/contact/index.js | 297 ++++++++++++++++++-- pages/order/components/contact/index.json | 4 +- pages/order/components/contact/index.wxml | 110 +++++++- pages/order/components/contact/index.wxss | 84 +++++- pages/order/orderList/index.js | 6 +- pages/order/orderList/index.wxml | 19 +- pages/order/scene/index.js | 98 +++++-- pages/order/scene/index.wxml | 10 +- pages/user/order/museumOrderInfo/index.js | 9 +- pages/user/order/museumOrderInfo/index.wxml | 21 +- pages/user/order/sceneOrderInfo/index.js | 2 + pages/user/order/sceneOrderInfo/index.wxml | 33 ++- 15 files changed, 609 insertions(+), 86 deletions(-) delete mode 100755 images/empty.png delete mode 100755 images/empty2.png diff --git a/app.js b/app.js index 99fcdd3..dca3e71 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest115? true : false; + data.isTest = data.isTest116? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/images/empty.png b/images/empty.png deleted file mode 100755 index 7be0cc631b55b6246a6eeebace284539759296ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7496 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%0AN(m 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 diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js index 980d2a3..9699645 100644 --- a/pages/order/components/contact/index.js +++ b/pages/order/components/contact/index.js @@ -1,6 +1,7 @@ // pages/order/components/contact/index.js import userApi from "../../../../utils/https/user" import commonApi from "../../../../utils/https/common" +import util from "../../../../utils/util.js" let app = getApp() Component({ /** @@ -18,6 +19,26 @@ Component({ type:{ type:String, value:"" + }, + productNum:{ + type:Number, + value:1, + observer(nv, ov, path) { + if (nv) { + let num = nv-this.data.selectLinkman.length + this.setData({ + showNum:num + }) + } + } + }, + is_authentication:{// 是否实名，0否1是，默认实名 + type:String, + value:'' + }, + is_real_name:{// 是否是一证一票，0否1是， + type:String, + value:'' } }, @@ -29,11 +50,39 @@ Component({ linkmanList:[], showMask:false, editId:null, - isGroup:null + isGroup:null, + showManList:[], + showNum:0, + showAdd:false, + formData:{}, + types:[], + selectIndex:0, + person:{}, + personId:null, + r:[], + phone:'',//非实名时需要传的电话 }, lifetimes: { attached: function() { // 在组件实例进入页面节点树时执行 + console.log(this.properties.productNum); + console.log(this.properties.is_real_name); + // if (this.properties.is_real_name == '1') { + this.setData({ + showNum:this.properties.productNum + }) + // } + // 不实名时直接获取手机号 + if (this.properties.is_authentication) { + commonApi.user_post("uservice/user/getMyInfo",{}).then(res=>{ + if(res.code==1){ + this.setData({ + phone:res.data.mobile + }) + this.triggerEvent("setLinkman",{phone:this.data.phone}) + } + }) + } // 获取默认联系人 commonApi.user_post("token/check").then(res=>{ this.setData({ @@ -44,8 +93,11 @@ Component({ contactType:"CONTACT" }).then(res=>{ if(res.data){ + let length =[res.data].length this.setData({ - selectLinkman:[res.data] + selectLinkman:[res.data], + showNum:this.data.showNum-length, + showManList:[res.data] }) this.triggerEvent("setLinkman",[res.data]) } @@ -53,6 +105,18 @@ Component({ }) } }) + // 获取证件列表 + userApi.user_post("user/getCardTypeList", {}).then(r => { + console.log(r) + let data = []; + r.data.map(item=>{ + data.push(item.title) + }) + this.setData({ + types: r.data, + typeList:data + }) + }) }, detached: function() { // 在组件实例被从页面节点树移除时执行 @@ -61,7 +125,6 @@ Component({ pageLifetimes: { show: function() { // 页面被展示 - if(this.data.editId){ let editId = this.data.editId; userApi.user_post("user/getContactInfoById",{ @@ -117,16 +180,60 @@ Component({ * 组件的方法列表 */ methods: { + // getPhoneNumber:function(e) { + // console.log(e); + // const code = e.detail.code + // wx.request({ + // url: `https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${app.globalData.appId}&secret=${app.globalData.secret}`, + // method: 'GET', + // success:res=>{ + // if(res.statusCode!==200) return + // const access_token = res.data.access_token + // wx.request({ + // url: `https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=${access_token}`, + // method: 'POST', + // data: { + // code + // }, + // success:data=>{ + // if(data.statusCode!==200) return + // console.log(data.data.phone_info); + // debugger + // const { phoneNumber } = data.data.phone_info // 这里就是获取到的手机号 + // } + // }) + // } + // }) + // }, gotoEdit:function(e){ - this.setData({ - editId:e.currentTarget.dataset.item.id + userApi.user_post("user/getContactInfoById", { id: e.currentTarget.dataset.item.id }).then(res => { + console.log(res); + res.data.isDefault = res.data.is_default == '1' ? true : false; + res.data.username = res.data.name; + res.data.mobile = res.data.tel; + res.data.idNumber = res.data.id_number; + console.log(res.data); + this.setData({ + showMask:!this.data.showMask, + formData: res.data, + idTypeId: res.data.idcard_type, + editId:e.currentTarget.dataset.item.id, + selectIndex:this.data.types.findIndex(item=>item.type == res.data.idcard_type && item.code == res.data.document_type) + }) }) + this.showAddMask() }, showLinkman:function(){ this.setData({ showMask:!this.data.showMask }) }, + showAddMask:function(){ + this.setData({ + showAdd:!this.data.showAdd, + showMask:!this.data.showMask + }) + }, cancel:function(){ let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList; linkmanList.map(linkman=>{ @@ -142,6 +249,116 @@ Component({ }) this.showLinkman() }, + selectType:function(e){ + this.setData({ + selectIndex:e.detail.value + }) + }, + // 保存 + save:function(){ + if (!this.data.formData.username){ + wx.showToast({ + title: '请输入姓名！', + icon:"none" + }) + return false; + } + if (!this.data.formData.mobile) { + wx.showToast({ + title: '请输入手机号码！', + icon: "none" + }) + return false; + } + if (!util.isTel(this.data.formData.mobile)) { + wx.showToast({ + title: '请输入正确的手机号码！', + icon: "none" + }) + return false; + } + // if (!this.data.idTypeId) { + // wx.showToast({ + // title: '请选择证件类型！', + // icon: "none" + // }) + // return false; + // } + // if (!this.data.formData.idNumber) { + // wx.showToast({ + // title: '请输入证件号！', + // icon: "none" + // }) + // return false; + // } + let data = this.data.formData; + data.idcard_type = this.data.types[this.data.selectIndex].type; + data.is_default = data.isDefault?'1':'0'; + data.document_type = this.data.types[this.data.selectIndex].code; + data.id_number = this.data.formData.idNumber; + let service ="addNewContact"; + if(this.data.editId){ + data.contactId = this.data.editId; + service = "editContactById"; + } + userApi.user_post("user/"+service,data).then(res=>{ + if(res.code==1){ + wx.showToast({ + title: '保存成功！', + icon:"success", + success:function(){ + // util.back(); + } + }) + this.setData({ + showAdd:!this.data.showAdd + }) + } + }) + }, + //取消添加出行人 + del:function(){ + this.setData({ + formData:{}, + showAdd:!this.data.showAdd + }) + }, + // 输入监听 不是双向绑定啊 绝望 + nameInput:function(e){ + var formData = this.data.formData; + formData.username = e.detail.value; + this.setData({ + formData: formData + }) + }, + idNumberInput:function(e){ + var formData = this.data.formData; + formData.idNumber = e.detail.value; + this.setData({ + formData: formData + }) + }, + telInput:function(e){ + var formData = this.data.formData; + formData.mobile = e.detail.value; + this.setData({ + formData: formData + }) + }, + phoneInput:function(e){ + this.setData({ + phone: e.detail.value + }) + this.triggerEvent("setLinkman",{phone:this.data.phone}) + }, + // 设为默认 + setAddDefault:function(e){ + var formData = this.data.formData; + formData.isDefault = e.detail.value; + this.setData({ + formData: formData + }) + }, confirm:function(){ let linkmanList = this.data.linkmanList,selectLinkman = []; linkmanList.map(linkman=>{ @@ -149,15 +366,23 @@ Component({ selectLinkman.push(linkman); } }) - if(this.properties.maxNum!=-1 && selectLinkman.length>Number(this.properties.maxNum)){ - wx.showToast({ - title: '最多只能选择'+this.properties.maxNum+"个出行人", - icon:'none' - }) - return; - } + // 需要 改成 根据父组件的购买数量 + let showNum = this.properties.productNum + // let showNum = this.data.showNum + showNum = showNum-selectLinkman.length + let showManList = this.data.showManList + showManList = [...selectLinkman] + // if(this.properties.maxNum!=-1 && selectLinkman.length>Number(this.properties.maxNum)){ + // wx.showToast({ + // title: '最多只能选择'+this.properties.maxNum+"个出行人", + // icon:'none' + // }) + // return; + // } this.setData({ - selectLinkman:selectLinkman + selectLinkman:selectLinkman, + showManList:showManList, + showNum:showNum }) this.triggerEvent("setLinkman",selectLinkman) this.showLinkman() @@ -210,17 +435,55 @@ Component({ wx.showLoading({ title: '加载中', }) - let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman; + let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman,showManList = this.data.showManList; selectLinkman.splice(index,1); + showManList.splice(index,1); this.triggerEvent("setLinkman",selectLinkman) this.setData({ - selectLinkman:selectLinkman + selectLinkman:selectLinkman, + showManList:showManList, + showNum:selectLinkman.length>0?this.data.showNum+1:1 }) wx.hideLoading() }, + select:function(e) { + console.log(e); + let item = e.target.dataset.item + if (this.properties.is_real_name == '1') { // 一证一票 + this.selectIt(item) + } else { + this.selectOne(item) + } + }, + // 一证一票不让他多选 + selectOne:function(e) { + console.log(e); + let item = e,linkmanList = this.data.linkmanList,num = 0 + linkmanList.map(linkman=>{ + if(linkman.selected==1){ + num++; + } + }) + console.log(num); + linkmanList.map(linkman=>{ + if(item.id==linkman.id){ + // linkman.selected = linkman.selected==1?0:1; + linkman.selected = 1 + }else { + linkman.selected = 0 + } + }) + console.log(linkmanList); + this.setData({ + linkmanList + }) + }, + // 可多选 selectIt:function(e){ - console.log(e,app.globalData.product) - let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1); + console.log(e,app.globalData.product) + console.log(e); + // let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1); + let item = e,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1); // 先计算出全部选中的出行人 console.log(111) linkmanList.map(linkman=>{ diff --git a/pages/order/components/contact/index.json b/pages/order/components/contact/index.json index e8cfaaf..da13845 100644 --- a/pages/order/components/contact/index.json +++ b/pages/order/components/contact/index.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "add":"/pages/user/linkman/add" + } } \ No newline at end of file diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml index f3a66b1..42a67e3 100644 --- a/pages/order/components/contact/index.wxml +++ b/pages/order/components/contact/index.wxml @@ -4,11 +4,20 @@ {{isGroup==1?'发起人信息':'出行人信息'}} （*预约发起后前往个人中心-团体预约订单中查看详情） - 添加 + 添加 编辑 - + + + + 手机号 + + + + + + + + + + + + + {{item.name}} + + + + + 更多> + + + + + + {{item.name}} + 手机号{{item.tel}} + {{item.title}}{{item.id_number}} + + + + + + + + + 出行人{{index+1}} + 点击填写1位出行人信息 + + + + + + + + + 出行人1 + 点击填写1位出行人信息 + + + + @@ -43,18 +94,59 @@ 取消 确定 - 添加出行人 + + 添加出行人 - + + {{item.name}} 手机号 {{item.tel}} {{item.title}}： {{item.id_number}} - + 设为默认出行人 + + + + + + + 取消 + {{editId?'编辑':'添加'}}出行人 + 保存 + + + + 姓名 + + + + 证件类型 + + + {{typeList[selectIndex]}} + + + + + + 证件号 + + + + 手机号 + + + + 设为默认 + + + + + \ No newline at end of file diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss index ecbc0b4..ea9490c 100644 --- a/pages/order/components/contact/index.wxss +++ b/pages/order/components/contact/index.wxss @@ -10,11 +10,12 @@ } .contacts-list { border-top: 1rpx solid #ccc; - padding: 0 21rpx; + /* padding: 0 21rpx; */ + padding: 42rpx 20rpx 18rpx; } .contact-item { padding: 30rpx 0; - border-bottom: 1rpx solid #ccc; + /* border-bottom: 1rpx solid #ccc; */ display: flex; align-items: center; justify-content: space-between; @@ -69,6 +70,14 @@ margin-bottom: 10rpx; line-height: 90rpx; } +.btns1 { + display: flex; + justify-content: space-between; + font-size: 31rpx; + color: #000; + margin-bottom: 47.33rpx; + /* line-height: 90rpx; */ +} .add-btn { line-height: 80rpx; background: #FFFFFF; @@ -85,6 +94,13 @@ background: #F7F7F7; max-height: 50%; } +.mask-content1 { + width: 700rpx; + padding: 50rpx 20rpx 112rpx; + overflow-y: auto; + background: #F7F7F7; + max-height: 50%; +} .linkmanlist-item { background: white; margin-bottom: 24rpx; @@ -167,4 +183,68 @@ color: #333333; font-size: 30rpx; justify-content: space-between; +} + +.text1 { + display: flex; + padding: 16rpx 19.33rpx 17.33rpx 20rpx; + background: rgba(11,137,142,.06); + justify-content: space-between; + align-items: center; + font-weight: 400; + font-size: 27rpx; + color: #0B898E; + margin-bottom: 26.67rpx; + border-radius: 13rpx; +} + +.name-box { + flex-shrink: 0; + margin-right: 15.33rpx; + width: 167rpx; + height: 73rpx; + background: rgba(11,137,142,0.06); + border-radius: 11rpx; + border: 2rpx solid #0B898E; + font-weight: 400; + font-size: 29rpx; + color: #000000; + text-align: center; + line-height: 73rpx; + position: relative; +} + +.name-selected-icon { + width: 28rpx; + height: 28rpx; + position: absolute; + bottom: 0; + right: -2rpx; +} + +.tel-input { + display: flex; + padding: 40rpx 20.67rpx 38.67rpx 21.33rpx; + border-top: 1rpx solid #ccc; + font-weight: 400; + font-size: 32rpx; + color: #000000; +} + +.input-text { + margin-right: 70rpx; +} + +.more { + width: 110rpx; + height: 73rpx; + background: #F1F1F1; + border-radius: 11rpx; + font-weight: 400; + font-size: 29rpx; + color: #0B898E; + line-height: 73rpx; + text-align: center; + position: absolute; + right: 0; } \ No newline at end of file diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js index ac9592b..5793f24 100644 --- a/pages/order/orderList/index.js +++ b/pages/order/orderList/index.js @@ -37,7 +37,8 @@ Page({ flag:options.flag, // linkmanList: app.globalData.linkmanList }) - console.log('-------------',app.globalData.list); + console.log('-------------',this.data.ticketList); + // debugger let price = 0, sku_id = [] ,postFee= 0; app.globalData.postProduct.map(item => { if (!app.globalData.kjId && !this.data.gp_id) { @@ -50,7 +51,8 @@ Page({ sku_id.push(item.sku.id) }) app.globalData.list.map(item => { - price = price + item.sku.price * item.linkmanList.length; + // price = price + item.sku.price * item.linkmanList.length; + price = price + item.sku.price * item.num; sku_id.push(item.sku.id) }) this.setData({ diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index 1bffe7b..aa9e7c4 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -42,15 +42,22 @@ {{item.sku.sku_name}} - - X{{item.linkmanList.length}} + X{{item.num}} + 出行人信息 - - 姓名：{{items.name}} - 证件号：{{items.id_number}} - 手机号：{{items.tel}} + + + + 姓名：{{items.name}} + 证件号：{{items.id_number}} + 手机号：{{items.tel}} + + + + + 手机号：{{item.phone}} diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 5066c8f..38c008c 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -33,6 +33,9 @@ Page({ showMask: false, price:0, is_need_idcard:1, + is_authentication:1, // 是否实名，0否1是，默认实名 + phone:'', //不实名时传的手机号 + is_real_name:1, // 是否是一证一票，0否1是， }, /** @@ -50,10 +53,13 @@ Page({ date:null, ticket_type:app.globalData.product.sku.ticket_type || 1, isCar:options.isCar, - is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard + is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard, + is_authentication:app.globalData.product.sku.sku_model.is_authentication, + is_real_name:app.globalData.product.sku.sku_model.is_real_name, }) console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); - console.log('---期票类型----',app.globalData.product.sku.ticket_type); + console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication); + console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name); if (!app.globalData.product) { util.back(); @@ -65,7 +71,7 @@ Page({ }) }else{ this.setData({ - productNum: app.globalData.product.num < 1 ? 1 : app.globalData.product.num + productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num }) } this.setData({ @@ -127,21 +133,27 @@ Page({ }) }, setLinkman: function (e) { - let linkmanList = e.detail; - if (this.data.productNum != linkmanList.length && this.data.coupon) { - wx.showToast({ - title: '订单价格发生变化，请重新选择优惠券', - icon: 'none' + if (e.detail.phone) { + this.setData({ + phone:e.detail.phone }) - // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) { - // this.couponCom.setNullCoupon() - // } - // app.globalData.couponInfo = null; - // this.setData({ - // coupon: null - // }) - } - let productNum = linkmanList.length == 0 ? 1 : this.data.productNum > linkmanList.length ? this.data.productNum : linkmanList.length; + }else { + console.log(e); + let linkmanList = e.detail; + if (this.data.productNum != linkmanList.length && this.data.coupon) { + wx.showToast({ + title: '订单价格发生变化，请重新选择优惠券', + icon: 'none' + }) + // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) { + // this.couponCom.setNullCoupon() + // } + // app.globalData.couponInfo = null; + // this.setData({ + // coupon: null + // }) + } + let productNum = linkmanList.length == 0 ? 1 : this.data.productNum < linkmanList.length ? linkmanList.length : this.data.productNum; if (this.data.gp_id) { productNum = app.globalData.product.maxNum; } @@ -149,7 +161,9 @@ Page({ productNum: productNum, linkmanList: linkmanList }) - this.changePrice() + // this.changePrice() + this.totalPrice(this.data.singlePrice) + } }, add: function () { if (this.data.productNum==undefined) { @@ -190,7 +204,7 @@ Page({ }) } if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') { - this.couponCom.setNullCoupon() + // this.couponCom.setNullCoupon() } app.globalData.couponInfo = null; @@ -276,6 +290,13 @@ Page({ order:function() { let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product; let linkmanIds = []; + if (linkmanList.length==0 && this.data.is_authentication == 1) { + wx.showToast({ + title: '请选择出行人', + icon: 'none' + }) + return + } linkmanList.map(item => { linkmanIds.push(item.id) }) @@ -291,12 +312,13 @@ Page({ use_date: date ? date.date : '', visitors: linkmanIds.join(","), remark: remark, - product_num: app.globalData.product.isGroup == 1 ? 1 : productNum + product_num: app.globalData.product.isGroup == 1 ? 1 : productNum, + phone:this.data.phone,// 不实名的时候传的手机号参数 }], originate_order_id: this.data.kjId, gp_id: app.globalData.gp_id, team_id: app.globalData.team_id, - linkmanList:this.data.linkmanList + linkmanList:this.data.is_authentication == 1?this.data.linkmanList:[] } if (app.globalData.from) { data.system_name = app.globalData.from; @@ -321,8 +343,14 @@ Page({ postData.type = 1; } 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.list[app.globalData.index] = this.data.product + // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList + if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) { + app.globalData.list[app.globalData.index].phone = this.data.phone + app.globalData.list[app.globalData.index].linkmanList = [] + }else { + 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; @@ -331,8 +359,9 @@ Page({ if(app.globalData.createDate){ app.globalData.createDate.product_list.push(data.product_list[0]) }else{ - app.globalData.createDate = data + app.globalData.createDate = data } + console.log(app.globalData.createDate); app.globalData.index = app.globalData.index + 1 app.globalData.product = app.globalData.list[app.globalData.index] wx.redirectTo({ @@ -391,6 +420,20 @@ Page({ }) return } + if (linkmanList.length!=productNum && this.data.is_authentication == 1 && this.data.is_real_name == 1) { + wx.showToast({ + title: '购票数量要和出行人数量一致', + icon: 'none' + }) + return + } + if (!util.isTel(this.data.phone) &&this.data.is_authentication == 0) { + wx.showToast({ + title: '请输入正确的手机号', + icon: 'none' + }) + return + } if (!time && date && date.is_time_stock == true) { wx.showToast({ title: '请选择使用时间', @@ -405,6 +448,13 @@ Page({ }) return; } + // if (this.data.phone) { + // linkmanList.map(item => { + // linkmanIds.push(item.id) + // }) + // } + // console.log(app.globalData); + // debugger this.setData({ showMask:true }) diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index ae82641..cb558a8 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -21,7 +21,7 @@ - + @@ -64,7 +64,7 @@ {{product.product.title}}-{{product.sku.sku_name}} 出行人信息 - + 姓名： @@ -80,6 +80,12 @@ + + + 手机号： + {{phone}} + + 取消 diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js index 582c3d3..a1c91a7 100644 --- a/pages/user/order/museumOrderInfo/index.js +++ b/pages/user/order/museumOrderInfo/index.js @@ -20,7 +20,9 @@ Page({ id:null, minute:"", second:"", - ids:[] + ids:[], + is_authentication:1, // 是否实名0否1是 + phone:'',// 非实名时的电话 }, /** @@ -207,8 +209,11 @@ Page({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, product_model:res.data.order_product_list[0].product_model, - ids: proId.join(",") + ids: proId.join(","), + is_authentication:res.data.order_product_list[0].sku_model.is_authentication, + phone:res.data.order_product_list[0].phone }) + console.log(res.data.order_product_list[0]); this.getCodeImg() // 获取行程规划 let that = this; diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml index be35fec..6fd5664 100644 --- a/pages/user/order/museumOrderInfo/index.wxml +++ b/pages/user/order/museumOrderInfo/index.wxml @@ -71,15 +71,22 @@ 出行人信息 - + - 姓名：{{item.name}} + 手机号：{{phone}} - - {{item.title}}：{{item.id_number}} - - - 手机号：{{item.tel}} + + + + + 姓名：{{item.name}} + + + {{item.title}}：{{item.id_number}} + + + 手机号：{{item.tel}} + diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index e16cd84..b15311c 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -285,6 +285,8 @@ Page({ product_model:"ticket"||res.data.order_product_list[0].product_model, ids: proId.join(",") }) + console.log(res.data); + // debugger console.log('ids',this.data.ids); this.getCodeImg() // 获取行程规划 diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 4bccaf9..f80ffa2 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -88,20 +88,27 @@ 出行人信息 {{cxr1Text}} - - - - 姓名： {{item.name}} - - - - {{cardTypes[item.idcard_type]}}：{{item.id_number}} - - + - 手机号： {{item.tel}} - - + 手机号： {{item.phone}} + + + + + + + 姓名： {{item.name}} + + + + {{cardTypes[item.idcard_type]}}：{{item.id_number}} + + + + 手机号： {{item.tel}} + + +