diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue index 47bd9f8..0d92d6f 100644 --- a/components/pick-regions/pick-regions.vue +++ b/components/pick-regions/pick-regions.vue @@ -59,7 +59,7 @@ watch:{ defaultRegion:{ async handler(region,oldRegion){ - + // console.log(region,"region") await getRegional().then(res=>{ this.CHINA_REGIONS = res.return_data; this.CHINA_REGIONS.map(item=>{ @@ -197,8 +197,10 @@ // console.log(i,j,children.length-1,"匹配失败"); if(i==0 && j==(children.length-1)){ this.isInitMultiArray = true; + this.multiIndex = [0,0,0] + this.$emit('failreagion'); } - this.$emit('failreagion') + // this.$emit('failreagion') } } } @@ -208,6 +210,9 @@ this.$emit('getRegion',address) }else{ this.$emit('failureRegion') + this.multiIndex = [0,0,0] + this.isInitMultiArray = true; + } diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index a49e6d7..f709e5c 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -630,6 +630,7 @@ if(this.isFinish){ this.isAgree = true; this.$refs.exchangeInstructions.close(); + this.toPay(); } }, closeInstructions(){