diff --git a/src/pages/address/addAddress.vue b/src/pages/address/addAddress.vue index 55e324d..54f0ed6 100644 --- a/src/pages/address/addAddress.vue +++ b/src/pages/address/addAddress.vue @@ -77,7 +77,9 @@ 编辑 + class="button" + v-if="addId" + >编辑 { uni.setNavigationBarTitle({ - title: '编辑地址' + title: '编辑地址', }) - const { name, mobile, sex, add_detail: addDetial, default: isDefault,address } = this.$store.state.address.details + const { name, mobile, sex, add_detail: addDetial, default: isDefault, address } = this.$store.state.address.details console.log('---', this.$store.state.address.details) const index = this.$refs.SimpleAddress.queryIndex(this.$store.state.address.details.address.split('-'), 'label') - console.log(index) + console.log(index) this.cityPickerValueDefault = index.index this.name = name this.mobile = Number(mobile) this.sexIndex = sex this.addDetial = addDetial this.isDefalutAddress = !!Number(isDefault) - this.pickerText = address + this.pickerText = address }) } }, components: { - SimpleAddress + SimpleAddress, }, methods: { openAddres () { @@ -155,28 +157,28 @@ export default { if (name === '') { uni.showModal({ content: '请输入姓名', - showCancel: false + showCancel: false, }) return 0 } if (!(/^1[3456789]\d{9}$/.test(mobile))) { uni.showModal({ content: '请输入正确的手机号', - showCancel: false + showCancel: false, }) return 0 } if (this.pickerText === '') { uni.showModal({ content: '请选择收货地区', - showCancel: false + showCancel: false, }) return 0 } if (addDetail === '') { uni.showModal({ content: '请输入收货详细地址', - showCancel: false + showCancel: false, }) return 0 } @@ -196,20 +198,20 @@ export default { default: isDefault ? 1 : 0, add_detail: addDetail, longitude: 1, - latitude: 1 + latitude: 1, } if (this.addId) { params.add_id = this.addId } store.dispatch('address/edit', params).then(() => { - console.log('fanhui') + console.log('fanhui') uni.navigateBack({ - delta: 1 + delta: 1, }) }) } - } - } + }, + }, } @@ -253,7 +255,7 @@ export default { position: fixed; bottom: 0; left: 0; - height: 112rpx; + height: 120rpx; width: 100%; background: #ff6b4a; display: flex; @@ -262,5 +264,10 @@ export default { font-size: 16px; color: #ffffff; letter-spacing: -0.3px; + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ } diff --git a/src/pages/address/addressList.vue b/src/pages/address/addressList.vue index 16a864a..ad9088f 100644 --- a/src/pages/address/addressList.vue +++ b/src/pages/address/addressList.vue @@ -224,7 +224,7 @@ export default { position: fixed; bottom: 0; left: 0; - height: 112rpx; + height: 120rpx; width: 100%; background-color: #ff6b4a; display: flex; @@ -233,6 +233,11 @@ export default { font-size: 16px; color: #ffffff; letter-spacing: -0.3px; + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ } } diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue index c8317c2..4b40e0c 100644 --- a/src/pages/confirmOrder/confirmOrder.vue +++ b/src/pages/confirmOrder/confirmOrder.vue @@ -756,6 +756,11 @@ export default { position: fixed; bottom: 0; z-index: 9999; + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ .footerLeft { display: flex; justify-content: center; diff --git a/src/pages/detailStandard/detailStandard_k.vue b/src/pages/detailStandard/detailStandard_k.vue index 8b2ee51..b8a1da1 100644 --- a/src/pages/detailStandard/detailStandard_k.vue +++ b/src/pages/detailStandard/detailStandard_k.vue @@ -11,7 +11,7 @@ - {{count}} + - + @@ -24,14 +24,14 @@ *{{navData.colour}} - - + @@ -42,7 +42,7 @@ 框架尺寸 - + *{{navData.colour}} @@ -54,7 +54,7 @@ {{details.data.frame_width}}mm {{parameter[0].standard}} - + @@ -64,7 +64,7 @@ {{details.data.glass_width}}mm {{parameter[1].standard}} - + @@ -74,18 +74,18 @@ {{details.data.glass_height}}mm {{parameter[2].standard}} - + - + {{details.data.nose_width}}mm {{parameter[3].standard}} - + @@ -95,7 +95,7 @@ {{details.data.leg_long}}mm {{parameter[4].standard}} - + @@ -110,8 +110,8 @@ *0290 - @@ -137,108 +137,107 @@ import CProgress from '../../components/UniSliper/UniSliper' import store from '@/store' export default { - components: { - CProgress - }, - data(){ - return{ - count: 1, - // colour: '1.56非球面防蓝光_亚黑色', - chooseNum : '', - isNone:[ - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - ], - //传参 - navData:{ - pid: "26", - p_root_index: "2", - name:'', - price:'', - colour: '1.56非球面防蓝光_亚黑色', - }, + components: { + CProgress, + }, + data() { + return { + count: 1, + // colour: '1.56非球面防蓝光_亚黑色', + chooseNum: '', + isNone: [ + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + ], + // 传参 + navData: { + pid: '26', + p_root_index: '2', + name: '', + price: '', + colour: '1.56非球面防蓝光_亚黑色', + }, - //尺寸 - parameter:[ - {key: 0,img:'/static/img/detail/d2.png', standard:'框架宽', slength:139}, - {key: 1,img:'/static/img/detail/d3.png', standard:'镜片宽', slength:51}, - {key: 2,img:'/static/img/detail/d4.png', standard:'镜片高', slength:45}, - {key: 3,img:'/static/img/detail/d5.png', standard:'鼻架宽', slength:19}, - {key: 4,img:'/static/img/detail/d6.png', standard:'框架耳长', slength:138}, - ], - //配饰 - part:[ - {key: 0,img:'/static/img/detail/Kuang/g1.png',is_actived:true}, - {key: 1,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 2,img:'/static/img/detail/Kuang/g2.png',is_actived:false}, - {key: 3,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 4,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 5,img:'/static/img/detail/Kuang/g3.png',is_actived:false}, - {key: 6,img:'/static/img/detail/Kuang/g3.png',is_actived:false}, - {key: 7,img:'/static/img/detail/Kuang/g2.png',is_actived:false}, - ], - } - }, + // 尺寸 + parameter: [ + { key: 0, img: '/static/img/detail/d2.png', standard: '框架宽', slength: 139 }, + { key: 1, img: '/static/img/detail/d3.png', standard: '镜片宽', slength: 51 }, + { key: 2, img: '/static/img/detail/d4.png', standard: '镜片高', slength: 45 }, + { key: 3, img: '/static/img/detail/d5.png', standard: '鼻架宽', slength: 19 }, + { key: 4, img: '/static/img/detail/d6.png', standard: '框架耳长', slength: 138 }, + ], + // 配饰 + part: [ + { key: 0, img: '/static/img/detail/Kuang/g1.png', is_actived: true }, + { key: 1, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 2, img: '/static/img/detail/Kuang/g2.png', is_actived: false }, + { key: 3, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 4, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 5, img: '/static/img/detail/Kuang/g3.png', is_actived: false }, + { key: 6, img: '/static/img/detail/Kuang/g3.png', is_actived: false }, + { key: 7, img: '/static/img/detail/Kuang/g2.png', is_actived: false }, + ], + } + }, - computed: { - details(){ - return this.$store.state.detailStandard_k.list - }, + computed: { + details() { + return this.$store.state.detailStandard_k.list }, - onLoad:function(){ - store.dispatch('detailStandard_k/fetch', { - uid: "1", - pid: "26", - p_root_index: "2" - }); - // console.log(this.$store.state.detailStandard_k.list+'ssss'); + }, + onLoad: function() { + store.dispatch('detailStandard_k/fetch', { + uid: '1', + pid: '26', + p_root_index: '2', + }) + // console.log(this.$store.state.detailStandard_k.list+'ssss'); + }, + methods: { + counter(isadd) { + if (isadd) { + this.count++ + } else { + this.count <= 1 ? this.disabled = true : this.count-- + } }, - methods: { - counter(isadd){ - if(isadd){ - this.count++ - }else{ - this.count <= 1? this.disabled = true:this.count-- - } - }, - xialachange(index){ - this.isNone[index].state = !this.isNone[index].state; - if(this.isNone[index].state){ - this.isNone[index].img = '/static/img/detail/right.png' - }else{ - this.isNone[index].img = '/static/img/detail/xiala.png' - } - }, - colourChange(index,e){ - this.navData.colour = e ; //颜色选择 - console.log(index,this.navData.colour); - - }, - viewChoose(index,e){ - this.chooseNum = index - }, - popArgs(){ - uni.navigateTo({ - url: '../detailsChoiceArgs/detailsChoiceArgs', - success: res => {}, - fail: () => {}, - complete: () => {} - }); - }, - //跳转确认订单页及传参 - popSure(name,price){ - this.navData.name = name; - this.navData.price = price; - var navData = JSON.stringify(this.navData); - uni.navigateTo({ - url: '../confirmOrder/confirmOrder?index='+navData, - }); - console.log(this.navData) - }, - } + xialachange(index) { + this.isNone[index].state = !this.isNone[index].state + if (this.isNone[index].state) { + this.isNone[index].img = '/static/img/detail/right.png' + } else { + this.isNone[index].img = '/static/img/detail/xiala.png' + } + }, + colourChange(index, e) { + this.navData.colour = e // 颜色选择 + console.log(index, this.navData.colour) + }, + viewChoose(index, e) { + this.chooseNum = index + }, + popArgs() { + uni.navigateTo({ + url: '../detailsChoiceArgs/detailsChoiceArgs', + success: res => {}, + fail: () => {}, + complete: () => {}, + }) + }, + // 跳转确认订单页及传参 + popSure(name, price) { + this.navData.name = name + this.navData.price = price + var navData = JSON.stringify(this.navData) + uni.navigateTo({ + url: '../confirmOrder/confirmOrder?index=' + navData, + }) + console.log(this.navData) + }, + }, } @@ -286,11 +285,11 @@ hr{ color: #333333; letter-spacing: -0.26px; line-height: 18px; - overflow:hidden; + overflow:hidden; text-overflow:ellipsis; - display:-webkit-box; + display:-webkit-box; -webkit-box-orient:vertical; - -webkit-line-clamp:2; + -webkit-line-clamp:2; } .detail2_tui{ font-size: 10px; @@ -546,6 +545,11 @@ hr{ width:100%; height: 112rpx; background: #FF6B4A 100%; + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ view{ color: #FFFFFF; height: 100%; @@ -556,4 +560,4 @@ hr{ font-size: 16px; } } - \ No newline at end of file + diff --git a/src/pages/detailStandard/detailStandard_sun.vue b/src/pages/detailStandard/detailStandard_sun.vue index 5198e4b..0fb354c 100644 --- a/src/pages/detailStandard/detailStandard_sun.vue +++ b/src/pages/detailStandard/detailStandard_sun.vue @@ -12,7 +12,7 @@ - {{count}} + - + @@ -25,14 +25,14 @@ *{{navData.colour}} - - + @@ -46,12 +46,12 @@ *BL192345 粉紫色【限时打折】 - - + @@ -66,11 +66,11 @@ *{{navData.split}} - - 框架尺寸 - + *{{navData.colour}} @@ -97,7 +97,7 @@ {{details.data.frame_width}}mm {{parameter[0].standard}} - + @@ -107,7 +107,7 @@ {{details.data.glass_width}}mm {{parameter[1].standard}} - + @@ -117,18 +117,18 @@ {{details.data.glass_height}}mm {{parameter[2].standard}} - + - + {{details.data.nose_width}}mm {{parameter[3].standard}} - + @@ -138,7 +138,7 @@ {{details.data.leg_long}}mm {{parameter[4].standard}} - + @@ -150,8 +150,8 @@ *0290 - @@ -271,8 +271,8 @@ 确认以上输入信息来源于我的验光数据! - - + + 立即结算 @@ -288,7 +288,7 @@ - {{count}} + - + @@ -301,14 +301,14 @@ *{{navData.colour}} - - + @@ -319,7 +319,7 @@ 框架尺寸 - + *{{navData.colour}} @@ -331,7 +331,7 @@ {{details.data.frame_width}}mm {{parameter[0].standard}} - + @@ -341,7 +341,7 @@ {{details.data.glass_width}}mm {{parameter[1].standard}} - + @@ -351,18 +351,18 @@ {{details.data.glass_height}}mm {{parameter[2].standard}} - + - + {{details.data.nose_width}}mm {{parameter[3].standard}} - + @@ -372,7 +372,7 @@ {{details.data.leg_long}}mm {{parameter[4].standard}} - + @@ -387,8 +387,8 @@ *0290 - @@ -415,182 +415,181 @@ import CProgress from '../../components/UniSliper/UniSliper' import store from '@/store' export default { - components: { - CProgress + components: { + CProgress, + }, + data() { + return { + type: 2, + count: 1, + chooseNum: '', + isSplit: '', + isNone: [ + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + { state: false, img: '/static/img/detail/xiala.png' }, + ], + + // 传参 + navData: { + pid: '26', + p_root_index: '4', + name: '', + price: '', + type: '', + split: '1.56非球面防蓝光', + colour: '1.56非球面防蓝光_亚黑色', + }, + + // 尺寸 + parameter: [ + { key: 0, img: '/static/img/detail/d2.png', standard: '框架宽', slength: 139 }, + { key: 1, img: '/static/img/detail/d3.png', standard: '镜片宽', slength: 51 }, + { key: 2, img: '/static/img/detail/d4.png', standard: '镜片高', slength: 45 }, + { key: 3, img: '/static/img/detail/d5.png', standard: '鼻架宽', slength: 19 }, + { key: 4, img: '/static/img/detail/d6.png', standard: '框架耳长', slength: 138 }, + ], + // 镜片颜色 + jp_colour: [ + { img: '/static/img/detail/Kuang/sun_jp.png' }, + { img: '/static/img/detail/Kuang/sun_jp.png' }, + { img: '/static/img/detail/Kuang/sun_jp.png' }, + { img: '/static/img/detail/Kuang/sun_jp.png' }, + { img: '/static/img/detail/Kuang/sun_jp.png' }, + { img: '/static/img/detail/Kuang/sun_jp.png' }, + ], + // 配饰 + part: [ + { key: 0, img: '/static/img/detail/Kuang/g1.png', is_actived: true }, + { key: 1, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 2, img: '/static/img/detail/Kuang/g2.png', is_actived: false }, + { key: 3, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 4, img: '/static/img/detail/Kuang/g1.png', is_actived: false }, + { key: 5, img: '/static/img/detail/Kuang/g3.png', is_actived: false }, + { key: 6, img: '/static/img/detail/Kuang/g3.png', is_actived: false }, + { key: 7, img: '/static/img/detail/Kuang/g2.png', is_actived: false }, + ], + opIsOpen: true, + tablist: { + // read: true, + // seeLong: false, + confirm: false, + }, + tabicon: ['/static/detail-button.png', '/static/detail-button-unselected.png'], + // 度数相关数据 + pickerInfoList: [ + { nameC: '度数', nameE: '(SPH)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 0 }, + { nameC: '散光', nameE: '(CYL)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 1 }, + { nameC: '散光轴位', nameE: '(AXI)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 2 }, + { nameC: '双眼瞳距', nameE: '(PD)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 3 }, + { nameC: '验光日期', nameE: '', nameArray1: [2017, 2018, 2019, 2020, 2021], nameIndex1: 0, nameArray2: [1, 2, 3, 4, 5, 6, 7], nameIndex2: 0, nameArray3: [1, 2, 3, 4, 5, 6], nameIndex3: 0 }, + ], + } + }, + + computed: { + details() { + return this.$store.state.detailStandard_k.list + }, + }, + onLoad: function() { + store.dispatch('detailStandard_k/fetch', { + uid: '1', + pid: '26', + p_root_index: '4', + }) + }, + methods: { + counter(isadd) { + if (isadd) { + this.count++ + } else { + this.count <= 1 ? this.disabled = true : this.count-- + } + }, + xialachange(index) { + this.isNone[index].state = !this.isNone[index].state + if (this.isNone[index].state) { + this.isNone[index].img = '/static/img/detail/right.png' + } else { + this.isNone[index].img = '/static/img/detail/xiala.png' + } + }, + colourChange(index, e) { + this.navData.colour = e // 颜色选择 + }, + viewChoose(index) { + this.chooseNum = index + }, + // 折射率选择 + splitChoose(index, e) { + this.isSplit = index + this.navData.split = e + }, + // 跳转镜片选购页 + popArgs() { + uni.navigateTo({ + url: '../detailsChoiceArgs/detailsChoiceArgs', + success: res => {}, + fail: () => {}, + complete: () => {}, + }) + }, + // 跳转确认订单页及传参 + popSure(name, price) { + this.navData.name = name + this.navData.price = price + this.navData.type = this.type + var navData = JSON.stringify(this.navData) + uni.navigateTo({ + url: '../confirmOrder/confirmOrder?index=' + navData, + }) + console.log(this.navData) + }, + // 验光表 + changeConfirm() { + this.tablist.confirm = !this.tablist.confirm + }, + bindPickerChange01: function(e) { + this.pickerInfoList[0].nameIndex1 = e.target.value + }, + bindPickerChange02: function(e) { + this.pickerInfoList[0].nameIndex2 = e.target.value }, - data(){ - return{ - type: 2, - count: 1, - chooseNum : '', - isSplit: '' , - isNone:[ - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - {state: false ,img: '/static/img/detail/xiala.png'}, - ], - //传参 - navData:{ - pid: "26", - p_root_index: "4", - name:'', - price:'', - type:'', - split: '1.56非球面防蓝光', - colour: '1.56非球面防蓝光_亚黑色', - }, + bindPickerChange11: function(e) { + this.pickerInfoList[1].nameIndex1 = e.target.value + }, + bindPickerChange12: function(e) { + this.pickerInfoList[1].nameIndex2 = e.target.value + }, - //尺寸 - parameter:[ - {key: 0,img:'/static/img/detail/d2.png', standard:'框架宽', slength:139}, - {key: 1,img:'/static/img/detail/d3.png', standard:'镜片宽', slength:51}, - {key: 2,img:'/static/img/detail/d4.png', standard:'镜片高', slength:45}, - {key: 3,img:'/static/img/detail/d5.png', standard:'鼻架宽', slength:19}, - {key: 4,img:'/static/img/detail/d6.png', standard:'框架耳长', slength:138}, - ], - //镜片颜色 - jp_colour:[ - {img:'/static/img/detail/Kuang/sun_jp.png'}, - {img:'/static/img/detail/Kuang/sun_jp.png'}, - {img:'/static/img/detail/Kuang/sun_jp.png'}, - {img:'/static/img/detail/Kuang/sun_jp.png'}, - {img:'/static/img/detail/Kuang/sun_jp.png'}, - {img:'/static/img/detail/Kuang/sun_jp.png'} - ], - //配饰 - part:[ - {key: 0,img:'/static/img/detail/Kuang/g1.png',is_actived:true}, - {key: 1,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 2,img:'/static/img/detail/Kuang/g2.png',is_actived:false}, - {key: 3,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 4,img:'/static/img/detail/Kuang/g1.png',is_actived:false}, - {key: 5,img:'/static/img/detail/Kuang/g3.png',is_actived:false}, - {key: 6,img:'/static/img/detail/Kuang/g3.png',is_actived:false}, - {key: 7,img:'/static/img/detail/Kuang/g2.png',is_actived:false}, - ], - opIsOpen:true, - tablist: { - // read: true, - // seeLong: false, - confirm: false - }, - tabicon:['/static/detail-button.png','/static/detail-button-unselected.png'], - // 度数相关数据 - pickerInfoList:[ - {nameC:"度数",nameE:"(SPH)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:0}, - {nameC:"散光",nameE:"(CYL)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:1}, - {nameC:"散光轴位",nameE:"(AXI)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:2}, - {nameC:"双眼瞳距",nameE:"(PD)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:3}, - {nameC:"验光日期",nameE:'',nameArray1:[2017,2018,2019,2020,2021],nameIndex1:0,nameArray2:[1,2,3,4,5,6,7],nameIndex2:0,nameArray3:[1,2,3,4,5,6],nameIndex3:0} - ], - } + bindPickerChange21: function(e) { + this.pickerInfoList[2].nameIndex1 = e.target.value + }, + bindPickerChange22: function(e) { + this.pickerInfoList[2].nameIndex2 = e.target.value }, - computed: { - details(){ - return this.$store.state.detailStandard_k.list - }, + bindPickerChange31: function(e) { + this.pickerInfoList[3].nameIndex1 = e.target.value }, - onLoad:function(){ - store.dispatch('detailStandard_k/fetch', { - uid: "1", - pid: "26", - p_root_index: "4" - }); + bindPickerChange32: function(e) { + this.pickerInfoList[3].nameIndex2 = e.target.value }, - methods: { - counter(isadd){ - if(isadd){ - this.count++ - }else{ - this.count <= 1? this.disabled = true:this.count-- - } - }, - xialachange(index){ - this.isNone[index].state = !this.isNone[index].state; - if(this.isNone[index].state){ - this.isNone[index].img = '/static/img/detail/right.png' - }else{ - this.isNone[index].img = '/static/img/detail/xiala.png' - } - }, - colourChange(index,e){ - this.navData.colour = e ; //颜色选择 - }, - viewChoose(index){ - this.chooseNum = index - }, - //折射率选择 - splitChoose(index,e){ - this.isSplit = index - this.navData.split = e - }, - //跳转镜片选购页 - popArgs(){ - uni.navigateTo({ - url: '../detailsChoiceArgs/detailsChoiceArgs', - success: res => {}, - fail: () => {}, - complete: () => {} - }); - }, - //跳转确认订单页及传参 - popSure(name,price){ - this.navData.name = name; - this.navData.price = price; - this.navData.type = this.type; - var navData = JSON.stringify(this.navData); - uni.navigateTo({ - url: '../confirmOrder/confirmOrder?index='+navData, - }); - console.log(this.navData) - }, - //验光表 - changeConfirm() { - this.tablist.confirm = !this.tablist.confirm - }, - bindPickerChange01: function(e) { - this.pickerInfoList[0].nameIndex1 = e.target.value - }, - bindPickerChange02: function(e) { - this.pickerInfoList[0].nameIndex2 = e.target.value - }, - - bindPickerChange11: function(e) { - this.pickerInfoList[1].nameIndex1 = e.target.value - }, - bindPickerChange12: function(e) { - this.pickerInfoList[1].nameIndex2 = e.target.value - }, - - bindPickerChange21: function(e) { - this.pickerInfoList[2].nameIndex1 = e.target.value - }, - bindPickerChange22: function(e) { - this.pickerInfoList[2].nameIndex2 = e.target.value - }, - - bindPickerChange31: function(e) { - this.pickerInfoList[3].nameIndex1 = e.target.value - }, - bindPickerChange32: function(e) { - this.pickerInfoList[3].nameIndex2 = e.target.value - }, - - bindPickerChange41: function(e) { - this.pickerInfoList[4].nameIndex1 = e.target.value - }, - bindPickerChange42: function(e) { - this.pickerInfoList[4].nameIndex2 = e.target.value - }, + bindPickerChange41: function(e) { + this.pickerInfoList[4].nameIndex1 = e.target.value + }, + bindPickerChange42: function(e) { + this.pickerInfoList[4].nameIndex2 = e.target.value + }, bindPickerChange43: function(e) { - this.pickerInfoList[4].nameIndex3 = e.target.value + this.pickerInfoList[4].nameIndex3 = e.target.value }, - } + }, } @@ -639,11 +638,11 @@ hr{ color: #333333; letter-spacing: -0.26px; line-height: 18px; - overflow:hidden; + overflow:hidden; text-overflow:ellipsis; - display:-webkit-box; + display:-webkit-box; -webkit-box-orient:vertical; - -webkit-line-clamp:2; + -webkit-line-clamp:2; } .detail2_tui{ font-size: 10px; @@ -745,7 +744,7 @@ hr{ justify-content: start ; grid-column-gap: 10px; grid-row-gap: 10px; - margin-bottom: 14px; + margin-bottom: 14px; .jp_colour2_view{ border: 1px solid #F2F2F2; image{ @@ -950,7 +949,7 @@ hr{ padding-top:20px; padding-bottom:20px; box-sizing: border-box; - + .p1 { font-size: 16px; color: #333333; @@ -1013,8 +1012,7 @@ hr{ text-align: justify; line-height: 24px; } - - + } .p13 { font-size: 10px; @@ -1036,7 +1034,7 @@ hr{ width: 124rpx; border-bottom: 1px solid #CFCFCF; } - + } } } @@ -1046,6 +1044,12 @@ hr{ width:100%; height: 112rpx; background: #FF6B4A 100%; + + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ view{ color: #FFFFFF; height: 100%; @@ -1056,4 +1060,4 @@ hr{ font-size: 16px; } } - \ No newline at end of file + diff --git a/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue b/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue index 5680edd..0a0798c 100644 --- a/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue +++ b/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue @@ -1,601 +1,692 @@ - - - - - 镜片名称型号功能镜片名称型镜片名称型号功能非球面… - 支持7天无理由退货 顺丰发货 - - ¥{{price*count}} - - - - {{count}} - + - - - - - - - - - - - - - 填写验光数据 - + + + + + + 填写验光数据 + 没有验光数据?请到线下眼镜店验光哦~ - + 验光单取名: - + - - - - {{pickerInfoList[0].nameC}} - {{pickerInfoList[0].nameE}} - - 左 (OD) - {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}} - - - - 右 (OS) - {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}} - - - + + + + {{pickerInfoList[0].nameC}} + {{pickerInfoList[0].nameE}} + 左 (OD) + {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}} + + + + 右 (OS) + {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}} + + + + - - - - {{pickerInfoList[1].nameC}} - {{pickerInfoList[1].nameE}} - - 左 (OD) - {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}} - - - - 右 (OS) - {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}} - - - + + + + {{pickerInfoList[1].nameC}} + {{pickerInfoList[1].nameE}} + 左 (OD) + {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}} + + + + 右 (OS) + {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}} + + + + - - - - {{pickerInfoList[2].nameC}} - {{pickerInfoList[2].nameE}} - - 左 (OD) - {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}} - - - - 右 (OS) - {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}} - - - + + + + {{pickerInfoList[2].nameC}} + {{pickerInfoList[2].nameE}} + 左 (OD) + {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}} + + + + 右 (OS) + {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}} + + + + - - - - {{pickerInfoList[3].nameC}} - {{pickerInfoList[3].nameE}} - - 左 (OD) - {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}} - - - - 右 (OS) - {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}} - - - + + + + {{pickerInfoList[3].nameC}} + {{pickerInfoList[3].nameE}} + 左 (OD) + {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}} + + + + 右 (OS) + {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}} + + + + - - - - {{pickerInfoList[4].nameC}} - - 年 (Y) - {{pickerInfoList[4].nameArray1[pickerInfoList[4].nameIndex1]}} - - - - 月 (M) - {{pickerInfoList[4].nameArray2[pickerInfoList[4].nameIndex2]}} - - - - 日 (D) - {{pickerInfoList[4].nameArray3[pickerInfoList[4].nameIndex3]}} - - - + + + + {{pickerInfoList[4].nameC}} + 年 (Y) + {{pickerInfoList[4].nameArray1[pickerInfoList[4].nameIndex1]}} + + + + 月 (M) + {{pickerInfoList[4].nameArray2[pickerInfoList[4].nameIndex2]}} + + + + 日 (D) + {{pickerInfoList[4].nameArray3[pickerInfoList[4].nameIndex3]}} + + + + - - 确认以上输入信息来源于我的验光数据! + + 确认以上输入信息来源于我的验光数据! - - - - - - - {{item.nameC}} - {{item.nameArray1[item.nameIndex1]}}年 - {{item.nameArray2[item.nameIndex2]}}月 - {{item.nameArray3[item.nameIndex2]}}日 - - - - * - - - {{item.nameC}} - 左 {{item.nameArray1[item.nameIndex1]}} - 右 {{item.nameArray2[item.nameIndex2]}} - - - - - - - - - - - - - - - 立即结算 - + + + + + + + {{item.nameC}} + {{item.nameArray1[item.nameIndex1]}}年 + {{item.nameArray2[item.nameIndex2]}}月 + {{item.nameArray3[item.nameIndex2]}}日 + + + + * + + + {{item.nameC}} + 左 {{item.nameArray1[item.nameIndex1]}} + 右 {{item.nameArray2[item.nameIndex2]}} + + + + + + + + + + + + + + + 立即结算 + +export default { + components: { + MyCollapse, + }, + data() { + return { + count: 1, + disabled: false, + price: 180, + // 实用功能参数 + funIsOpen: true, // 默认myCollapse开启 + funList: [ + { name: '防紫外线', isChioce: false, key: 1, type: 'fun' }, + { name: '防蓝光', isChioce: false, key: 2, type: 'fun' }, + { name: '智能变色', isChioce: false, key: 3, type: 'fun' }, + { name: '易清洁', isChioce: false, key: 4, type: 'fun' }, + { name: '防辐射', isChioce: false, key: 5, type: 'fun' }, + { name: '抗疲劳', isChioce: false, key: 6, type: 'fun' }, + ], + funContent: [], + // 镜片种类参数 + kindIsOpen: true, + kindList1: [ + { name: '染色', isChioce: false, key: 1, type: 'kind' }, + { name: '渐变', isChioce: false, key: 2, type: 'kind' }, + ], + kindList2: [ + { name: 'JB234759', isChioce: false, key: 3, type: 'kind' }, + { name: 'JB234759', isChioce: false, key: 4, type: 'kind' }, + { name: 'JB234759', isChioce: false, key: 5, type: 'kind' }, + { name: 'JB234759', isChioce: false, key: 6, type: 'kind' }, + { name: 'JB234759', isChioce: false, key: 7, type: 'kind' }, + ], + kindContent: [], + // 材质选择 + maIsOpen: true, + maList1: [ + { name: '树脂镜片', isChioce: false, key: 1, range: '0-300度', isRange: true }, + { name: '特殊镜片', isChioce: false, key: 2 }, + ], + maList2: [ + { name: '玻璃镜片', isChioce: false, key: 3, range: '300-1000度', isRange: true }, + { name: '玻璃镜片', isChioce: false, key: 4 }, + ], + maContent: [], + // 折射率参数 + reIsOpen: true, + reList1: [ + { name: '1.56(推荐)', isChioce: false, key: 1, range: '0-300度', isRange: true }, + { name: '1.60', isChioce: false, key: 2 }, + ], + reList2: [ + { name: '1.71(推荐)', isChioce: false, key: 3, range: '300-1000度', isRange: true }, + { name: '1.67', isChioce: false, key: 4 }, + { name: '1.71', isChioce: false, key: 5 }, + { name: '1.74', isChioce: false, key: 6 }, + ], + reContent: [], + // 验光参数 + opIsOpen: true, + tablist: { + // read: true, + // seeLong: false, + confirm: false, + }, + tabicon: ['/static/detail-button.png', '/static/detail-button-unselected.png'], + // 度数相关数据 + pickerInfoList: [ + { nameC: '度数', nameE: '(SPH)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 0 }, + { nameC: '散光', nameE: '(CYL)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 1 }, + { nameC: '散光轴位', nameE: '(AXI)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 2 }, + { nameC: '双眼瞳距', nameE: '(PD)', nameArray1: [1.5, 2.5, 3.5, 4.5], nameIndex1: 0, nameArray2: [1.5, 2.5, 3.5, 4.5], nameIndex2: 0, key: 3 }, + { nameC: '验光日期', nameE: '', nameArray1: [2017, 2018, 2019, 2020, 2021], nameIndex1: 0, nameArray2: [1, 2, 3, 4, 5, 6, 7], nameIndex2: 0, nameArray3: [1, 2, 3, 4, 5, 6], nameIndex3: 0 }, + ], - diff --git a/src/pages/frameDetail/components/BottomSheet.vue b/src/pages/frameDetail/components/BottomSheet.vue index 2a281dd..5cf18f8 100644 --- a/src/pages/frameDetail/components/BottomSheet.vue +++ b/src/pages/frameDetail/components/BottomSheet.vue @@ -1188,6 +1188,12 @@ export default { color: #ffffff; line-height: 112rpx; text-align: center; + + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ // position: absolute; bottom: 0; left: 0; diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue index 015e587..f36382c 100644 --- a/src/pages/myOrderPaying/myOrderPaying.vue +++ b/src/pages/myOrderPaying/myOrderPaying.vue @@ -751,6 +751,11 @@ export default { position: fixed; bottom: 0; background: #ffffff; + /* iphonex 等安全区设置,底部安全区适配 */ + /* #ifndef APP-NVUE */ + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ button { width: 204rpx; height: 80rpx; diff --git a/src/pages/purchaseLenses/purchaseLenses.vue b/src/pages/purchaseLenses/purchaseLenses.vue index a71be63..171f7c2 100644 --- a/src/pages/purchaseLenses/purchaseLenses.vue +++ b/src/pages/purchaseLenses/purchaseLenses.vue @@ -36,139 +36,204 @@ - - - - 填写验光数据 - - 没有验光数据?请到线下眼镜店验光哦~ - - - - 验光单取名: - - - - - - - - {{pickerInfoList[0].nameC}} - {{pickerInfoList[0].nameE}} - - 左 (OD) - - - - {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}} - + + + + 填写验光数据 - - - 右 (OS) - - - - {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}} - + 没有验光数据?请到线下眼镜店验光哦~ + + + + 验光单取名: + + + - - - - - - - - {{pickerInfoList[1].nameC}} - {{pickerInfoList[1].nameE}} - - 左 (OD) - - - - {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}} - + + + + {{pickerInfoList[0].nameC}} + {{pickerInfoList[0].nameE}} + + 左 (OD) + + + + {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}} + + + + + 右 (OS) + + + + {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}} + + + + + - - - 右 (OS) - - - - {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}} - + + + + {{pickerInfoList[1].nameC}} + {{pickerInfoList[1].nameE}} + + 左 (OD) + + + + {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}} + + + + + 右 (OS) + + + + {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}} + + + + + - - - - - - - - {{pickerInfoList[2].nameC}} - {{pickerInfoList[2].nameE}} - - 左 (OD) - - - {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}} - + + + + {{pickerInfoList[2].nameC}} + {{pickerInfoList[2].nameE}} + + 左 (OD) + + + {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}} + + + + 右 (OS) + + + + {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}} + + + + + - - 右 (OS) - - - - {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}} - + + + + 瞳距: + + + - - - - - - - - 瞳距: - - - - - - - - {{pickerInfoList[3].nameC}} - - 年 (Y) - - - {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}} - - - - 月 (M) - - - {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}} - + + + + {{pickerInfoList[3].nameC}} + + 年 (Y) + + + {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}} + + + + 月 (M) + + + {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}} + + + + 日 (D) + + + {{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}} + + + + - - 日 (D) - - - {{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}} - + + + 确认以上输入信息来源于我的验光数据! - - - - - - 确认以上输入信息来源于我的验光数据! - - +