From b66ee01d81688c8b71f0c9b0d01e1849415ab240 Mon Sep 17 00:00:00 2001 From: youmengting <2080639302@qq.com> Date: Mon, 22 May 2023 09:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utils/physicalObject.js | 4 + components/cart-choose/cart-choose.vue | 66 +-- components/goods-list/goods-list.vue | 1 + components/pick-regions/pick-regions.vue | 7 + .../components/uni-combox/uni-combox.vue | 68 +++- pages.json | 44 +- .../address/addNewAddress/addNewAddress.vue | 377 ++++++++++++------ .../settleAccounts/settleAccounts.vue | 2 +- uni.scss | 11 + .../uni-number-box/uni-number-box.vue | 13 +- 10 files changed, 421 insertions(+), 172 deletions(-) diff --git a/Utils/physicalObject.js b/Utils/physicalObject.js index 22b56ea..37c2d9a 100644 --- a/Utils/physicalObject.js +++ b/Utils/physicalObject.js @@ -71,6 +71,10 @@ export const insertDeliveryAddress = params => { return POST('POST', `${base}/deliveryAddress/insertDeliveryAddress`, params).then(res => res.data); } + +export const baiduApiMapSearch = params => { + return POST('GET', `${base}/common/baiduApiMapSearch`, params).then(res => res.data); +} // 更新收货地址 export const updateDeliveryAddress = params => { return POST('POST', `${base}/deliveryAddress/updateDeliveryAddress`, params).then(res => res.data); diff --git a/components/cart-choose/cart-choose.vue b/components/cart-choose/cart-choose.vue index 64779c8..8b0c642 100644 --- a/components/cart-choose/cart-choose.vue +++ b/components/cart-choose/cart-choose.vue @@ -55,41 +55,49 @@ - + 购买数量 - - - - 暂无库存 + + + + + + 暂无库存 + - - - - - - 加入购物车 + + + + + 加入购物车 + + + 立即购买 + - - 立即购买 + + + 加入购物车 + - - - - 加入购物车 + + + 立即购买 + - - - - 立即购买 + + + 确定选择 + - + @@ -118,9 +126,9 @@ return [] }, }, - // 0,加入购物车。1，加入购物车，领券购买 + // 0,加入购物车。1，加入购物车，领券购买. 2:确定选择（换货） status:{ - type:Number, + type:[Number,String], default:0, }, goodsDetail:{ @@ -128,6 +136,10 @@ default() { return {} } + }, + isShowButton:{ + type:Boolean, + default:true, } }, watch:{ @@ -241,6 +253,12 @@ }, + + // 确定选择 + toSelect(){ + this.$emit('close',this.specificationList[this.chooseIndex]) + }, + //立即购买 toBuy(){ diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 592dbec..111680a 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -595,6 +595,7 @@ .goods-item-bottom .new-price { color: #3DA7E7; font-weight: bold; + font-size: 18px; } .goods-item-bottom .old-price { diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue index 7c067cb..e742f73 100644 --- a/components/pick-regions/pick-regions.vue +++ b/components/pick-regions/pick-regions.vue @@ -83,6 +83,7 @@ }else if(region){ //&®ion.length == 6 this.handleDefaultRegion(region) }else{ + console.log(region) console.warn('defaultRegion非有效格式') } @@ -195,9 +196,15 @@ if(i==0 && j==(children.length-1)){ this.isInitMultiArray = true; } + this.$emit('failreagion') } } } + + + let address = [this.CHINA_REGIONS[this.multiIndex[0]],this.cityArr[this.multiIndex[1]],this.districtArr[this.multiIndex[2]]]; + this.$emit('getRegion',address) + } }, } diff --git a/components/uni-combox/components/uni-combox/uni-combox.vue b/components/uni-combox/components/uni-combox/uni-combox.vue index f0145a4..3fae44f 100644 --- a/components/uni-combox/components/uni-combox/uni-combox.vue +++ b/components/uni-combox/components/uni-combox/uni-combox.vue @@ -4,17 +4,29 @@ {{label}} - - - - + + + + {{emptyTips}} + {{item}} + + + + + + {{emptyTips}} + + + + @@ -56,12 +68,24 @@ }, emptyTips: { type: String, - default: '无匹配项' + default: '暂无匹配项' }, value: { type: [String, Number], default: '' - } + }, + isAddress:{ + type:Boolean, + default:false + }, + isShowIcon:{ + type:Boolean, + default:true + }, + placeholderClass:{ + type: String, + default: '' + }, }, data() { return { @@ -96,13 +120,32 @@ } }, methods: { + location(){ + this.showSelector = !this.showSelector + if(this.isAddress&&this.showSelector){ + this.$emit("location") + } + }, toggleSelector() { this.showSelector = !this.showSelector }, onFocus() { - this.showSelector = true + this.$emit("focus"); + if(this.isAddress){ + this.showSelector = false + }else{ + this.showSelector = true + } + }, onBlur() { + this.$emit("blur") + + if(this.isAddress){ + this.showSelector = false; + return + } + setTimeout(() => { this.showSelector = false }, 153) @@ -169,13 +212,20 @@ background-color: #FFFFFF; border-radius: 6px; box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px; - z-index: 2; + z-index: 100; + .topmore{ + top:52px; + } } .uni-combox__selector-scroll { max-height: 200px; box-sizing: border-box; } + .uni-combox__selector-scroll2 { + max-height:300px; + box-sizing: border-box; + } .uni-combox__selector::before { content: ''; @@ -186,7 +236,7 @@ border-right: solid 6px transparent; border-left: solid 6px transparent; left: 50%; - top: -6px; + top: -4px; margin-left: -6px; } diff --git a/pages.json b/pages.json index 1292d83..053aaf9 100644 --- a/pages.json +++ b/pages.json @@ -1125,7 +1125,7 @@ { "path": "address/addNewAddress/addNewAddress", "style": { - "navigationBarTitleText": "新增地址", + "navigationBarTitleText": "", "enablePullDownRefresh": false } }, @@ -1164,13 +1164,7 @@ "enablePullDownRefresh": false } }, - // { - // "path": "wuliu/wuliu", - // "style": { - // "navigationBarTitleText": "物流信息", - // "enablePullDownRefresh": false - // } - // }, + { "path": "classify/order/pay", "style": { @@ -1189,6 +1183,40 @@ "enablePullDownRefresh": false } } + // , + // { + // "path": "applyRefund/applyRefund", + + // "style": { + // // "navigationBarTitleText": "", + // "enablePullDownRefresh": false + // } + // }, + // { + // "path": "applyRefund/selectApplyRefund", + + // "style": { + // "navigationBarTitleText": "申请售后", + // "enablePullDownRefresh": false + // } + // }, + // { + // "path": "applyRefund/refundDetail", + + // "style": { + // "navigationBarTitleText": "退款详情", + // "enablePullDownRefresh": false + // } + // }, + // { + // "path": "applyRefund/fillRefundWuliu", + + // "style": { + // "navigationBarTitleText": "填写退货物流", + // "enablePullDownRefresh": false + // } + // } + ] } diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue index 2065352..5667c79 100644 --- a/physical-merchants/address/addNewAddress/addNewAddress.vue +++ b/physical-merchants/address/addNewAddress/addNewAddress.vue @@ -1,66 +1,75 @@