4/28update

components/pick-regions/pick-regions.vue

@@ -80,7 +80,7 @@
                         if(region.join('')!==oldRegion.join('')){
                             this.handleDefaultRegion(region)
                         }
-                    }else if(region&&region.length == 6){
+                    }else if(region){ //&&region.length == 6
                         this.handleDefaultRegion(region)
                     }else{
 						console.log(region)
@@ -108,7 +108,7 @@
         },
 		methods: {
             handleColumnChange(e){
-                // console.log(e);
+                console.log(e,"change");
                 this.isInitMultiArray = false;
                 const that = this;
                 let col = e.detail.column;
@@ -117,14 +117,18 @@
                 try{
                     switch(col){
                         case 0:
+							that.multiIndex[1]=0;
+							that.multiIndex[2]=0;
                             if(this.CHINA_REGIONS[that.multiIndex[0]].childs.length==0){
                                 that.cityArr = that.districtArr = [this.CHINA_REGIONS[that.multiIndex[0]]]
                                 break;
                             }
                             that.cityArr = this.CHINA_REGIONS[that.multiIndex[0]].childs
                             that.districtArr = this.CHINA_REGIONS[that.multiIndex[0]].childs[that.multiIndex[1]].childs
-                            break;
+							
+							break;
                         case 1:
+							that.multiIndex[2]=0;
                             that.districtArr = this.CHINA_REGIONS[that.multiIndex[0]].childs[that.multiIndex[1]].childs
                             break;
                         case 2:
@@ -145,17 +149,29 @@
                 this.$emit('getRegion',address)
             },
             handleDefaultRegion(region){
+				// console.log(region)
                 const isCode = !Array.isArray(region)
                 this.isInitMultiArray = false;
                 let children = this.CHINA_REGIONS
                 for(let i=0;i<3;i++){
                     for(let j=0;j<children.length;j++){
-                       let condition = isCode?String(children[j].code).slice(0,(i+1)*2)==region.slice(0,(i+1)*2):children[j].name.includes(region[i]);
+						let condition;
-                       // console.log(String(children[j].code).slice(0,(i+1)*2),region.slice(0,(i+1)*2))
+						if(i==2){
+							 condition = isCode?String(children[j].code).slice(0)==region.slice(0):children[j].name.includes(region[i]);
+							// console.log(String(children[j].code).slice(0),region.slice(0))
+						}else{
+							 condition = isCode?String(children[j].code).slice(0,(i+1)*2)==region.slice(0,(i+1)*2):children[j].name.includes(region[i]);
+							
+						}
+
 					   if(condition){
                            // 匹配成功进行赋值
                            // console.log(i,j,children.length-1);
-                           children = children[j].childs;
+                           // children = children[j].childs;
+						   if(children[j].childs&&children[j].childs.length>0){
+							   children = children[j].childs;
+						   }
+						   console.log(children,"children")
                            if(i==0){
                                this.cityArr = children
                            }else if(i==1){

pages/tabBar/user/user.vue

@@ -285,9 +285,15 @@
 						url: '',
 						text: '客服',
 						img: '../../../static/img/user/user13.png'
+					},
+					{
+						url:"/physical-merchants/address/address",
+						text: '我的地址',
+						img: '../../../static/img/adresw.png'
 					}
 				]
 				return;
+				
 			}
 			this.czList = [{
 					url: '/pages/goods/recording/recording',
@@ -302,6 +308,11 @@
 					url: '',
 					text: '客服',
 					img: '../../../static/img/user/user13.png'
+				},
+				{
+					url:"/physical-merchants/address/address",
+					text: '我的地址',
+					img: '../../../static/img/adresw.png'
 				}
 			]
 			// #endif
@@ -326,6 +337,11 @@
 						url: '',
 						text: '客服',
 						img: '../../../static/img/user/user13.png'
+					},
+					{
+						url:"/physical-merchants/address/address",
+						text: '我的地址',
+						img: '../../../static/img/adresw.png'
 					}
 				]
 				return;
@@ -349,6 +365,11 @@
 					url: '',
 					text: '客服',
 					img: '../../../static/img/user/user13.png'
+				},
+				{
+					url:"/physical-merchants/address/address",
+					text: '我的地址',
+					img: '../../../static/img/adresw.png'
 				}
 			]
 			// #endif
@@ -647,7 +668,7 @@
 
 	.user {
 		width: 96%;
-		padding: 0 4%;
+		padding: 0 0 0 4%;
 		display: flex;
 		align-items: center;
 		// position: relative;

physical-merchants/classify/order/orderDetail.vue

@@ -21,7 +21,7 @@
 			</view>
 		</view>
 
-		<view class=" marb10 backcorfff height50 fcor333 font15 border-8r">
+		<view v-if="recinfo.orderStatus != 1" class=" marb10 backcorfff height50 fcor333 font15 border-8r">
 			<view class="width94">感谢您信任嗨森逛，欢迎再次消费</view>
 		</view>
 

physical-merchants/settleAccounts/detail-popup/detail-popup.vue

@@ -169,7 +169,7 @@
 					<view v-if="item.discountCondition>totalPrice&&item.discountType == 1"  class="paddtop10  mart10 border-t font14">
 						<view class="fotred  fontwig6 ">不可用原因</view> 
 						<view class="fcor666">
-							使用门槛为{{item.discountCondition}}元，还差{{item.discountCondition-totalPrice}}元才能使用
+							使用门槛为{{item.discountCondition}}元，还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用
 						</view>
 					</view>
 				</view>