合并分支 'lihongjuan' 到 'master'

修改



查看合并请求 !11

@@ -141,10 +141,6 @@ new Vue({
             var that=this;
             var that=this;
             that.hopedress=true;
             that.hopedress=true;
         },
         },
-		//隐藏遮罩层
-        hidewrap:function(){
-			that.hopedress=false;
-		},
 	//选择打印机
 	//选择打印机
 		selectprinter:function(obj,event){
 		selectprinter:function(obj,event){
 		var that=this;
 		var that=this;

@@ -425,30 +425,32 @@
 
 
 			<!--遮罩-->
 			<!--遮罩-->
 			<div class="wrap" v-if="hopedress" @click="hidewrap()">
 			<div class="wrap" v-if="hopedress" @click="hidewrap()">
-				<!--弹层-->
-				<div class="popup_wrap">
-					<div class="popup">
-						<span class="choose">选择您期望的地址</span>
-						<span class="text">为了后期更好的为您服务</span>
-						<div class="btn" @click="hopeaddress()">
-							确定
+				<!--遮罩-->
+				<div class="wrap" v-if="hopedress">
+					<!--弹层-->
+					<div class="popup_wrap" >
+						<div class="popup">
+							<span class="choose">选择您期望的地址</span>
+							<span class="text">为了后期更好的为您服务</span>
+							<div class="btn" @click="hopeaddress()">
+								确定
+							</div>
 						</div>
 						</div>
 					</div>
 					</div>
-				</div>
-				<!--付款弹层-->
-				<div class="order_pay_popup_wrap" style="display: none;">
-					<div class="order_pay_popup">
-						<div class="pay_details" @click="remain()">
-							<i class="iconfont icon-balance" style="color: #FFA200;"></i>
-							<p>余额支付</p>
-						</div>
-						<div class="pay_details" style="border-top: 1px solid #E4E4E4;" @click="wexinpay()">
-							<i class="iconfont icon-weixinzhifu" style="color: #24BB1E;"></i>
-							<p>微信支付</p>
+					<!--付款弹层-->
+					<div class="order_pay_popup_wrap" style="display: none;">
+						<div class="order_pay_popup">
+							<div class="pay_details" @click="remain()">
+								<i class="iconfont icon-balance" style="color: #FFA200;"></i>
+								<p>余额支付</p>
+							</div>
+							<div class="pay_details" style="border-top: 1px solid #E4E4E4;" @click="wexinpay()">
+								<i class="iconfont icon-weixinzhifu" style="color: #24BB1E;"></i>
+								<p>微信支付</p>
+							</div>
 						</div>
 						</div>
 					</div>
 					</div>
 				</div>
 				</div>
-			</div>