1:修改查看卡券详情出现死循环，2:调整样式，3:修改在线加油时显示距离为nullkm

common/share.js

@@ -43,7 +43,7 @@ export default {
 		//获取当前路由
 		getCurrentRouteYm() {
 			let currentRoutes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			console.log(currentRoutes[currentRoutes.length - 1]);
+			// console.log(currentRoutes[currentRoutes.length - 1]);
 			let route = currentRoutes[currentRoutes.length - 1];
 			return decodeURIComponent(route.$page.fullPath)
 		},
@@ -61,7 +61,7 @@ export default {
 				that.shareLink = app.globalData.h5url + '?accountId=0000016&key=&code=' + that.localPath.split('#')[1];
 			}
 			that.$set(this.shareH5,"link",that.shareLink);
-			console.log(that.shareLink,"that.shareLink");
+			// console.log(that.shareLink,"that.shareLink");
 			let wx = require('weixin-js-sdk');
 			
 			if (that.resVerifyWx.return_code == '000000') {
@@ -100,6 +100,7 @@ export default {
 				"/physical-merchants/settleAccounts/settleAccounts",//订单确认
 				"/physical-merchants/classify/order/pay",//收银台页
 				"/physical-merchants/classify/order/paymentResult",//支付结果
+				"/physical-merchants/address/addNewAddress/addNewAddress",//添加地址
 			];
 			
 			// #ifdef H5

components/cart-choose/cart-choose.vue

@@ -126,7 +126,7 @@
 					return []
 				},
 			},
-			// 0,加入购物车。1，加入购物车，领券购买. 2:确定选择（换货）
+			// 0,加入购物车。1，加入购物车，立即购买. 2：立即购买3:确定选择（换货）
 			status:{
 				type:[Number,String],
 				default:0,

components/pick-regions/pick-regions.vue

@@ -84,7 +84,7 @@
                         this.handleDefaultRegion(region)
                     }else{
 						
-						console.log(region)
+						// console.log(region)
                         console.warn('defaultRegion非有效格式')
                     }
                 },
@@ -150,7 +150,7 @@
                 this.$emit('getRegion',address)
             },
             handleDefaultRegion(region){
-				console.log(region,"region")
+				// console.log(region,"region")
                 const isCode = !Array.isArray(region)
                 this.isInitMultiArray = false;
                 let children = this.CHINA_REGIONS;
@@ -160,11 +160,11 @@
 						let condition;
 						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))
+							// 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]);
 							// console.log(String(children[j].code).slice(0,(i+1)*2)==region.slice(0,(i+1)*2))
-							console.log(String(children[j].code).slice(0,(i+1)*2),region.slice(0,(i+1)*2))
+							// console.log(String(children[j].code).slice(0,(i+1)*2),region.slice(0,(i+1)*2))
 						}
 						
 					   if(condition){
@@ -194,7 +194,7 @@
                            break;
                        }else{
                            // 首次匹配失败就用默认的初始化
-                           console.log(i,j,children.length-1,"匹配失败");
+                           // console.log(i,j,children.length-1,"匹配失败");
                            if(i==0 && j==(children.length-1)){
                                this.isInitMultiArray = true;
                            }

pages/goods/coupon-details/coupon-details.vue

@@ -337,9 +337,11 @@
 				let holdTime = 60;
 				that.Timer = setInterval(() => {
 					if (holdTime <= 0) {
+						clearInterval(that.Timer);
 						uni.showModal({
 							title: '提示',
 							content: '当前二维码已失效,请刷新后展示',
+							showCancel:false, /* 不显示取消按钮*/
 							success: function(res) {
 								if (res.confirm) {
 									that.getVerifyQRCode(that.couponDesInfo.highUserCoupon.id);

pages/goods/refuel/refuel.vue

@@ -37,7 +37,7 @@
 						{{item.address}}
 					</view>
 					<view class="width30 flright font13 fcor666 fotct" v-if="item.distance" @click="seeloaction(item)">
-						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
+						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;margin-right: 3px"></image>
 						{{item.distance}}km
 					</view>
 				</view>

pages/goods/store-list/store-details.vue

@@ -16,7 +16,8 @@
 				<view class="width20 flright mart10 fotct" @click="seeloaction">
 					<image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1">
 					</image>
-					<view class="mart5 fcor999 font13">{{distance}}km</view>
+					<view class="mart5 fcor999 font13" v-if="distance!='null'">{{distance}}km</view>
+					<view class="mart5 fcor999 font13" v-else>查看位置</view>
 				</view>
 			</view>
 		</view>